Merge branch 'release/v1.8.29'

doofinder · Jul 16, 2019 · 8513b58 · 8513b58
2 parents 7b10ceb + 4ca6202
commit 8513b58
Show file tree

Hide file tree

Showing 55 changed files with 105 additions and 91 deletions.
diff --git a/app/code/community/Doofinder/Feed/Block/Adminhtml/Log/View.php b/app/code/community/Doofinder/Feed/Block/Adminhtml/Log/View.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Block_Adminhtml_Log_View extends Mage_Adminhtml_Block_Widget_Grid

diff --git a/app/code/community/Doofinder/Feed/Block/Adminhtml/Map/Additional.php b/app/code/community/Doofinder/Feed/Block/Adminhtml/Map/Additional.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Block_Adminhtml_Map_Additional extends Mage_Adminhtml_Block_System_Config_Form_Field

diff --git a/app/code/community/Doofinder/Feed/Block/Banner.php b/app/code/community/Doofinder/Feed/Block/Banner.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Block_Banner extends Mage_Core_Block_Template

diff --git a/app/code/community/Doofinder/Feed/Block/Integration.php b/app/code/community/Doofinder/Feed/Block/Integration.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Block_Integration extends Mage_Core_Block_Abstract

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Buttons/Generate.php b/app/code/community/Doofinder/Feed/Block/Settings/Buttons/Generate.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Block_Settings_Buttons_Generate extends Mage_Adminhtml_Block_System_Config_Form_Field

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Buttons/ViewLog.php b/app/code/community/Doofinder/Feed/Block/Settings/Buttons/ViewLog.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Block_Settings_Buttons_ViewLog extends Mage_Adminhtml_Block_System_Config_Form_Field

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Locks.php b/app/code/community/Doofinder/Feed/Block/Settings/Locks.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Block_Settings_Locks extends Mage_Adminhtml_Block_System_Config_Form_Field

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/AtomicUpdates.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/AtomicUpdates.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Block_Settings_Panel_AtomicUpdates extends Mage_Adminhtml_Block_System_Config_Form_Field

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Crondescription.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Crondescription.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Block_Settings_Panel_CronDescription extends Doofinder_Feed_Block_Settings_Panel_Description

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Datetime.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Datetime.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Block_Settings_Panel_Datetime extends Mage_Adminhtml_Block_System_Config_Form_Field

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Description.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Description.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Block_Settings_Panel_Description extends Mage_Adminhtml_Block_System_Config_Form_Field

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/DynamicFeedUrl.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/DynamicFeedUrl.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Block_Settings_Panel_DynamicFeedUrl extends Mage_Adminhtml_Block_System_Config_Form_Field

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/File.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/File.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Block_Settings_Panel_File extends Mage_Adminhtml_Block_System_Config_Form_Field

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Layerdescription.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Layerdescription.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Block_Settings_Panel_LayerDescription extends Doofinder_Feed_Block_Settings_Panel_Description

diff --git a/app/code/community/Doofinder/Feed/Block/Settings/Panel/Message.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/Message.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Block_Settings_Panel_Message extends Mage_Adminhtml_Block_System_Config_Form_Field

diff --git a/app/code/community/Doofinder/Feed/Helper/Banner.php b/app/code/community/Doofinder/Feed/Helper/Banner.php
@@ -6,13 +6,13 @@
 /**
  * @category   Helpers
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 /**
  * Data helper for Doofinder Feed
  *
- * @version    1.8.28
+ * @version    1.8.29
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Helper_Banner extends Mage_Core_Helper_Abstract

diff --git a/app/code/community/Doofinder/Feed/Helper/Data.php b/app/code/community/Doofinder/Feed/Helper/Data.php
@@ -6,13 +6,13 @@
 /**
  * @category   Helpers
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 /**
  * Data helper for Doofinder Feed
  *
- * @version    1.8.28
+ * @version    1.8.29
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Helper_Data extends Mage_Core_Helper_Abstract

diff --git a/app/code/community/Doofinder/Feed/Helper/Log.php b/app/code/community/Doofinder/Feed/Helper/Log.php
@@ -6,13 +6,13 @@
 /**
  * @category   Helpers
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 /**
  * Log helper for Doofinder Feed
  *
- * @version    1.8.28
+ * @version    1.8.29
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Helper_Log extends Mage_Core_Helper_Abstract

diff --git a/app/code/community/Doofinder/Feed/Helper/Tax.php b/app/code/community/Doofinder/Feed/Helper/Tax.php
@@ -6,7 +6,7 @@
 /**
  * @category   Helpers
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Helper_Tax extends Mage_Tax_Helper_Data

diff --git a/app/code/community/Doofinder/Feed/Model/Adminhtml/System/Config/Backend/Cron.php b/app/code/community/Doofinder/Feed/Model/Adminhtml/System/Config/Backend/Cron.php
@@ -6,7 +6,7 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Model_Adminhtml_System_Config_Backend_Cron extends Mage_Core_Model_Config_Data

diff --git a/app/code/community/Doofinder/Feed/Model/Config.php b/app/code/community/Doofinder/Feed/Model/Config.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 /**
  * Config model for Doofinder Feed
  *
- * @version    1.8.28
+ * @version    1.8.29
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Config extends Mage_Core_Model_Config_Data

diff --git a/app/code/community/Doofinder/Feed/Model/Cron.php b/app/code/community/Doofinder/Feed/Model/Cron.php
@@ -6,7 +6,7 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Model_Cron extends Mage_Core_Model_Abstract

diff --git a/app/code/community/Doofinder/Feed/Model/Generator.php b/app/code/community/Doofinder/Feed/Model/Generator.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 /**
  * Generator model for Doofinder Feed
  *
- * @version    1.8.28
+ * @version    1.8.29
  * @package    Doofinder_Feed
  */
 if (!defined('DS'))

diff --git a/app/code/community/Doofinder/Feed/Model/Log.php b/app/code/community/Doofinder/Feed/Model/Log.php
@@ -6,7 +6,7 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 class Doofinder_Feed_Model_Log extends Mage_Core_Model_Abstract

diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Abstract.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Abstract.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 /**
  * Abstract Product Map Model for Doofinder Feed
  *
- * @version    1.8.28
+ * @version    1.8.29
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Abstract extends Varien_Object
@@ -26,6 +26,15 @@ class Doofinder_Feed_Model_Map_Product_Abstract extends Varien_Object
      */
     protected $_log;
 
+    // Default attributes which shouldn't be escaped from slash
+    private $defaultNonEscapedSlash = [
+        'name',
+        'description',
+        'short_description',
+        'sku',
+        'id',
+    ];
+
     /**
      * Initialize log
      */
@@ -144,7 +153,7 @@ protected function mapAttribute($params = array())
 
         $fieldData = $this->getAttributeValue($product, $attribute);
 
-        return $this->cleanField($fieldData);
+        return $this->cleanField($fieldData, $attribute->getAttributeCode());
     }
 
     protected function mapAttributeDescription($params = array())
@@ -160,7 +169,7 @@ protected function mapAttributeDescription($params = array())
 
         $description = $this->getAttributeValue($product, $attribute);
 
-        return $this->cleanField($description);
+        return $this->cleanField($description, $attribute->getAttributeCode());
     }
 
     protected function mapDirectiveId()
@@ -425,15 +434,15 @@ public function loadAssocIds($product, $storeId)
         return $assocIds;
     }
 
-    protected function cleanField($field)
+    protected function cleanField($field, $code = '')
     {
         if (is_array($field)) {
             foreach ($field as &$value) {
-                $value = $this->cleanFieldValue($value);
+                $value = $this->cleanFieldValue($value, $code);
                 unset($value);
             }
         } else {
-            $field = $this->cleanFieldValue($field);
+            $field = $this->cleanFieldValue($field, $code);
         }
 
         return $field;
@@ -443,22 +452,23 @@ protected function cleanField($field)
      * Cleans invalid utf8 characters, strips tags and trims
      *
      * @param string|array $field
+     * @param string $code
      */
-    protected function cleanFieldValue($field)
+    protected function cleanFieldValue($field, $code = '')
     {
         // Do nothing if field is empty
         if (!$field) return $field;
 
-        $cleaned = $this->cleanFieldValueArray((array) $field);
+        $cleaned = $this->cleanFieldValueArray((array) $field, (array) $code);
         return is_array($field) ? $cleaned : $cleaned[0];
     }
 
-    protected function cleanFieldValueArray($fields)
+    protected function cleanFieldValueArray($fields, $code)
     {
-        return array_map(array($this, '_cleanFieldValue'), $fields);
+        return array_map(array($this, '_cleanFieldValue'), $fields, $code);
     }
 
-    protected function _cleanFieldValue($field)
+    protected function _cleanFieldValue($field, $code)
     {
         // http://stackoverflow.com/questions/4224141/php-removing-invalid-utf-8-characters-in-xml-using-filter
         $validUtf = '/([\x09\x0A\x0D\x20-\x7E]|[\xC2-\xDF][\x80-\xBF]|' .
@@ -470,8 +480,12 @@ protected function _cleanFieldValue($field)
         $field = strip_tags($field);
         $field = preg_replace('/[ ]{2,}/', ' ', $field);
         $field = trim($field);
-        // Use a double slash to prevent the doofinder from treating it as a separator
-        $field = str_replace('/', '//', $field);
+
+        if (!in_array($code, $this->defaultNonEscapedSlash)) {
+            // Use a double slash to prevent the doofinder from treating it as a separator
+            $field = str_replace('/', '//', $field);
+        }
+
         // @codingStandardsIgnoreStart
         $field = html_entity_decode($field, null, 'UTF-8');
         // @codingStandardsIgnoreEnd

diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Associated.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Associated.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 /**
  * Associated Product Map Model for Doofinder Feed
  *
- * @version    1.8.28
+ * @version    1.8.29
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Associated

diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Bundle.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Bundle.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.8.28
+ * @version    1.8.29
  */
 
 /**
  * Bundle Product Map Model for Doofinder Feed
  *
- * @version    1.8.28
+ * @version    1.8.29
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Bundle