Changeset 2000847

Timestamp:

12/24/2018 07:50:23 AM (6 years ago)

Author:

mixar

Message:

tagging version 2.1.3

Location:

perelink

Files:

• tags/2.1.3 (copied) (copied from perelink/trunk)
• tags/2.1.3/PerelinkPlugin.php (copied) (copied from perelink/trunk/PerelinkPlugin.php)
• tags/2.1.3/PerelinkPluginAdmin.php (copied) (copied from perelink/trunk/PerelinkPluginAdmin.php)
• tags/2.1.3/PerelinkPluginBaseClass.php (copied) (copied from perelink/trunk/PerelinkPluginBaseClass.php)
• tags/2.1.3/PerelinkPluginImages.php (copied) (copied from perelink/trunk/PerelinkPluginImages.php)
• tags/2.1.3/PerelinkPluginOptions.php (copied) (copied from perelink/trunk/PerelinkPluginOptions.php) (2 diffs)
• tags/2.1.3/PerelinkPluginSource.php (copied) (copied from perelink/trunk/PerelinkPluginSource.php)
• tags/2.1.3/PerelinkPluginWork.php (copied) (copied from perelink/trunk/PerelinkPluginWork.php) (2 diffs)
• tags/2.1.3/PerelinkPluginWorkAfterText.php (copied) (copied from perelink/trunk/PerelinkPluginWorkAfterText.php)
• tags/2.1.3/PerelinkPluginWorkInContent.php (copied) (copied from perelink/trunk/PerelinkPluginWorkInContent.php) (3 diffs)
• tags/2.1.3/functions.php (copied) (copied from perelink/trunk/functions.php)
• tags/2.1.3/helpers (copied) (copied from perelink/trunk/helpers)
• tags/2.1.3/img (copied) (copied from perelink/trunk/img)
• tags/2.1.3/perelink.php (copied) (copied from perelink/trunk/perelink.php) (1 diff)
• tags/2.1.3/readme.txt (copied) (copied from perelink/trunk/readme.txt) (2 diffs)
• tags/2.1.3/views (copied) (copied from perelink/trunk/views)
• tags/2.1.3/views/admin.php (modified) (1 diff)
• tags/2.1.3/views/admin_after_text_main.php (copied) (copied from perelink/trunk/views/admin_after_text_main.php)
• tags/2.1.3/views/admin_main.php (copied) (copied from perelink/trunk/views/admin_main.php) (1 diff)
• tags/2.1.3/views/after_text_auto_horizontal.php (modified) (1 diff)
• tags/2.1.3/views/after_text_auto_vertical.php (modified) (1 diff)
• tags/2.1.3/views/after_text_manual.php (modified) (1 diff)
• trunk/PerelinkPluginOptions.php (modified) (2 diffs)
• trunk/PerelinkPluginWork.php (modified) (2 diffs)
• trunk/PerelinkPluginWorkInContent.php (modified) (3 diffs)
• trunk/perelink.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)
• trunk/views/admin.php (modified) (1 diff)
• trunk/views/admin_main.php (modified) (1 diff)
• trunk/views/after_text_auto_horizontal.php (modified) (1 diff)
• trunk/views/after_text_auto_vertical.php (modified) (1 diff)
• trunk/views/after_text_manual.php (modified) (1 diff)

perelink/tags/2.1.3/PerelinkPluginOptions.php

@@ -14 +14 @@
  * @property string $protectionCode
  * @property array  $pageType
+ * @property string $wrapperType
+ * @property string $targetBlank
  * @property string $inContentTitleSource
  * @property bool   $afterTextEnabled
@@ -125 +127 @@
     public $protectionCode                = '';
     public $pageType                      = [ 'post', 'page' ];
+    public $wrapperType                   = 'new';
+    public $targetBlank                   = 'no';
     public $inContentTitleSource          = '';
     public $afterTextEnabled              = true;

perelink/tags/2.1.3/PerelinkPluginWork.php

@@ -14 +14 @@
 class PerelinkPluginWork extends PerelinkPluginBaseClass {
 
-    const START_TAG = '<!--start_content-->';
-    const END_TAG   = '<!--end_content-->';
+    const OLD_START_TAG = '<!--start_content-->';
+    const OLD_END_TAG   = '<!--end_content-->';
+    const NEW_START_TAG = '<index>';
+    const NEW_END_TAG   = '</index>';
 
     /**
@@ -45 +47 @@
         }
         if ( $this->needWorkInContent() ) {
-            $content = self::START_TAG . $this->workInContent( $content ) . self::END_TAG;
+            if ( $this->options->wrapperType !== 'old' ) {
+                $content = self::NEW_START_TAG . $this->workInContent( $content ) . self::NEW_END_TAG;
+            } else {
+                $content = self::OLD_START_TAG . $this->workInContent( $content ) . self::OLD_END_TAG;
+            }
         }
         if ( $this->needWorkAfterText() ) {

perelink/tags/2.1.3/PerelinkPluginWorkInContent.php

@@ -147 +147 @@
             $title  = $post->post_title;
         }
-        return '<a href="' . $this->item->url . '" ' . ( empty( $title ) ? '' : 'title="' . $title . '"' ) . ' class="binet-perelink">';
+        return '<a href="' . $this->item->url . '"' . ( empty( $title ) ? '' : ' title="' . $title . '"' ) . ' class="perelink"' . ( $this->options->targetBlank === 'yes' ? ' target="_blank"' : '' ) . '>';
     }
 
@@ -155 +155 @@
         $this->clearImages();
         $this->clearHeaders();
+        $this->clearIndex();
         $this->clearNoIndex();
         $this->clearChars();
@@ -173 +174 @@
             $this->clearTag( $tag );
         }
+    }
+
+    private function clearIndex() {
+        $this->clearTag( 'index' );
     }
 

perelink/tags/2.1.3/perelink.php

@@ -9 +9 @@
  * Plugin URI:  https://perelink.pro
  * Description: Плагин для вывода перелинковки в тексте и после текста, сгенерированной в сервисе perelink.pro
- * Version:     2.1.2
+ * Version:     2.1.3
  * License:     GPL v3
  *

perelink/tags/2.1.3/readme.txt

@@ -3 +3 @@
 Tags: perelink, related, posts
 Requires at least: 4.9.6
-Tested up to: 5.0.0
+Tested up to: 5.0.2
 Requires PHP: 5.6
 Stable tag: trunk
@@ -22 +22 @@
 == Changelog ==
 
+= 2.1.3 =
+
+* Добавлена опция открытия ссылок в новом окне
+
+* Добавлена поддержка новых тегов <index></index> для автоматической пометки области страницы в которой искать связи для перелинковки
+
 = 2.1.2 =
 

perelink/tags/2.1.3/views/admin.php

@@ -69 +69 @@
     <?php echo $this->render( 'admin_in_content', compact( 'options' ) ); ?>
     <?php echo $this->render( 'admin_after_text', compact( 'options' ) ); ?>
+    <?php echo $this->render( 'admin_expert', compact( 'options' ) ); ?>
     <br />
     <input type="submit" value="Сохранить" />

perelink/tags/2.1.3/views/admin_main.php

@@ -12 +12 @@
 <h2>Общие настройки</h2>
 <ul class="perelink-block">
-    <li>Код защиты <input type="text" name="protectionCode" value="<?php echo $options->protectionCode; ?>" /><br /><em>Для генерации кода защиты посетите настройки проекта в сервисе</em></li>
+    <li>Код защиты <input type="text" name="protectionCode" value="<?php echo $options->protectionCode; ?>" /><br /><em style="color:gray;">Для генерации кода защиты посетите настройки проекта в сервисе</em></li>
     <li>Типы страниц учавствующие в перелинковке
         <ul class="subitem">

perelink/tags/2.1.3/views/after_text_auto_horizontal.php

@@ -38 +38 @@
     <?php foreach ( $data as $item ) { ?>
         <div class="perelink-horizontal-item">
-            <a href="<?php echo $item->url; ?>">
+            <a href="<?php echo $item->url; ?>"<?php echo $options->targetBlank === 'yes' ? ' target="_blank"' : ''; ?>>
                 <img src="<?php echo $this->getImageByPostUrl( $item->url ); ?>" height="<?php echo $options->afterTextOutputImageSizeY; ?>" width="<?php echo $options->afterTextOutputImageSizeX; ?>">
                 <span><?php echo mb_ucfirst( $item->anchor ); ?></span>

perelink/tags/2.1.3/views/after_text_auto_vertical.php

@@ -53 +53 @@
     <?php foreach ( $data as $item ) { ?>
         <div class="perelink-vertical-item">
-            <a href="<?php echo $item->url; ?>">
+            <a href="<?php echo $item->url; ?>"<?php echo $options->targetBlank === 'yes' ? ' target="_blank"' : ''; ?>>
                 <div class="perelink-image">
                     <img src="<?php echo $this->getImageByPostUrl( $item->url ); ?>" height="<?php echo $options->afterTextOutputImageSizeY; ?>" width="<?php echo $options->afterTextOutputImageSizeX; ?>">

perelink/tags/2.1.3/views/after_text_manual.php

@@ -19 +19 @@
     switch ( $options->afterTextOutputMode ) {
         case 'list':
-            echo '<a href="' . $item->url . '">' . mb_ucfirst( $item->anchor ) . '</a>';
+            echo '<a href="' . $item->url . '"' . ( $options->targetBlank === 'yes' ? ' target="_blank"' : '' ) . '>' . mb_ucfirst( $item->anchor ) . '</a>';
             break;
         case 'image':

perelink/trunk/PerelinkPluginOptions.php

@@ -14 +14 @@
  * @property string $protectionCode
  * @property array  $pageType
+ * @property string $wrapperType
+ * @property string $targetBlank
  * @property string $inContentTitleSource
  * @property bool   $afterTextEnabled
@@ -125 +127 @@
     public $protectionCode                = '';
     public $pageType                      = [ 'post', 'page' ];
+    public $wrapperType                   = 'new';
+    public $targetBlank                   = 'no';
     public $inContentTitleSource          = '';
     public $afterTextEnabled              = true;

perelink/trunk/PerelinkPluginWork.php

@@ -14 +14 @@
 class PerelinkPluginWork extends PerelinkPluginBaseClass {
 
-    const START_TAG = '<!--start_content-->';
-    const END_TAG   = '<!--end_content-->';
+    const OLD_START_TAG = '<!--start_content-->';
+    const OLD_END_TAG   = '<!--end_content-->';
+    const NEW_START_TAG = '<index>';
+    const NEW_END_TAG   = '</index>';
 
     /**
@@ -45 +47 @@
         }
         if ( $this->needWorkInContent() ) {
-            $content = self::START_TAG . $this->workInContent( $content ) . self::END_TAG;
+            if ( $this->options->wrapperType !== 'old' ) {
+                $content = self::NEW_START_TAG . $this->workInContent( $content ) . self::NEW_END_TAG;
+            } else {
+                $content = self::OLD_START_TAG . $this->workInContent( $content ) . self::OLD_END_TAG;
+            }
         }
         if ( $this->needWorkAfterText() ) {

perelink/trunk/PerelinkPluginWorkInContent.php

@@ -147 +147 @@
             $title  = $post->post_title;
         }
-        return '<a href="' . $this->item->url . '" ' . ( empty( $title ) ? '' : 'title="' . $title . '"' ) . ' class="binet-perelink">';
+        return '<a href="' . $this->item->url . '"' . ( empty( $title ) ? '' : ' title="' . $title . '"' ) . ' class="perelink"' . ( $this->options->targetBlank === 'yes' ? ' target="_blank"' : '' ) . '>';
     }
 
@@ -155 +155 @@
         $this->clearImages();
         $this->clearHeaders();
+        $this->clearIndex();
         $this->clearNoIndex();
         $this->clearChars();
@@ -173 +174 @@
             $this->clearTag( $tag );
         }
+    }
+
+    private function clearIndex() {
+        $this->clearTag( 'index' );
     }
 

perelink/trunk/perelink.php

@@ -9 +9 @@
  * Plugin URI:  https://perelink.pro
  * Description: Плагин для вывода перелинковки в тексте и после текста, сгенерированной в сервисе perelink.pro
- * Version:     2.1.2
+ * Version:     2.1.3
  * License:     GPL v3
  *

perelink/trunk/readme.txt

@@ -3 +3 @@
 Tags: perelink, related, posts
 Requires at least: 4.9.6
-Tested up to: 5.0.0
+Tested up to: 5.0.2
 Requires PHP: 5.6
 Stable tag: trunk
@@ -22 +22 @@
 == Changelog ==
 
+= 2.1.3 =
+
+* Добавлена опция открытия ссылок в новом окне
+
+* Добавлена поддержка новых тегов <index></index> для автоматической пометки области страницы в которой искать связи для перелинковки
+
 = 2.1.2 =
 

perelink/trunk/views/admin.php

@@ -69 +69 @@
     <?php echo $this->render( 'admin_in_content', compact( 'options' ) ); ?>
     <?php echo $this->render( 'admin_after_text', compact( 'options' ) ); ?>
+    <?php echo $this->render( 'admin_expert', compact( 'options' ) ); ?>
     <br />
     <input type="submit" value="Сохранить" />

perelink/trunk/views/admin_main.php

@@ -12 +12 @@
 <h2>Общие настройки</h2>
 <ul class="perelink-block">
-    <li>Код защиты <input type="text" name="protectionCode" value="<?php echo $options->protectionCode; ?>" /><br /><em>Для генерации кода защиты посетите настройки проекта в сервисе</em></li>
+    <li>Код защиты <input type="text" name="protectionCode" value="<?php echo $options->protectionCode; ?>" /><br /><em style="color:gray;">Для генерации кода защиты посетите настройки проекта в сервисе</em></li>
     <li>Типы страниц учавствующие в перелинковке
         <ul class="subitem">

perelink/trunk/views/after_text_auto_horizontal.php

@@ -38 +38 @@
     <?php foreach ( $data as $item ) { ?>
         <div class="perelink-horizontal-item">
-            <a href="<?php echo $item->url; ?>">
+            <a href="<?php echo $item->url; ?>"<?php echo $options->targetBlank === 'yes' ? ' target="_blank"' : ''; ?>>
                 <img src="<?php echo $this->getImageByPostUrl( $item->url ); ?>" height="<?php echo $options->afterTextOutputImageSizeY; ?>" width="<?php echo $options->afterTextOutputImageSizeX; ?>">
                 <span><?php echo mb_ucfirst( $item->anchor ); ?></span>

perelink/trunk/views/after_text_auto_vertical.php

@@ -53 +53 @@
     <?php foreach ( $data as $item ) { ?>
         <div class="perelink-vertical-item">
-            <a href="<?php echo $item->url; ?>">
+            <a href="<?php echo $item->url; ?>"<?php echo $options->targetBlank === 'yes' ? ' target="_blank"' : ''; ?>>
                 <div class="perelink-image">
                     <img src="<?php echo $this->getImageByPostUrl( $item->url ); ?>" height="<?php echo $options->afterTextOutputImageSizeY; ?>" width="<?php echo $options->afterTextOutputImageSizeX; ?>">

perelink/trunk/views/after_text_manual.php

@@ -19 +19 @@
     switch ( $options->afterTextOutputMode ) {
         case 'list':
-            echo '<a href="' . $item->url . '">' . mb_ucfirst( $item->anchor ) . '</a>';
+            echo '<a href="' . $item->url . '"' . ( $options->targetBlank === 'yes' ? ' target="_blank"' : '' ) . '>' . mb_ucfirst( $item->anchor ) . '</a>';
             break;
         case 'image':