Merge branch 'hotfix/htmlentities'

doofinder · Nov 4, 2015 · 1236812 · 1236812
2 parents 8b9f3da + 675942a
commit 1236812
Show file tree

Hide file tree

Showing 47 changed files with 70 additions and 86 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 localconfig.json
 node_modules
-var/connect/*.tgz
+var/connect/*.tgz
+tmp
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.5.9
+ * @version    1.5.10
  */
 
 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.5.9
+ * @version    1.5.10
  */
 
 class Doofinder_Feed_Block_Adminhtml_Map_Additional extends Mage_Adminhtml_Block_System_Config_Form_Field

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.5.9
+ * @version    1.5.10
  */
 
 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.5.9
+ * @version    1.5.10
  */
 
 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.5.9
+ * @version    1.5.10
  */
 
 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/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.5.9
+ * @version    1.5.10
  */
 
 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.5.9
+ * @version    1.5.10
  */
 
 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/File.php b/app/code/community/Doofinder/Feed/Block/Settings/Panel/File.php
@@ -6,7 +6,7 @@
 /**
  * @category   blocks
  * @package    Doofinder_Feed
- * @version    1.5.9
+ * @version    1.5.10
  */
 
 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.5.9
+ * @version    1.5.10
  */
 
 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.5.9
+ * @version    1.5.10
  */
 
 class Doofinder_Feed_Block_Settings_Panel_Message extends Mage_Adminhtml_Block_System_Config_Form_Field

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.5.9
+ * @version    1.5.10
  */
 
 /**
  * Data helper for Doofinder Feed
  *
- * @version    1.5.9
+ * @version    1.5.10
  * @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.5.9
+ * @version    1.5.10
  */
 
 /**
  * Log helper for Doofinder Feed
  *
- * @version    1.5.9
+ * @version    1.5.10
  * @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,13 +6,13 @@
 /**
  * @category   Helpers
  * @package    Doofinder_Feed
- * @version    1.5.9
+ * @version    1.5.10
  */
 
 /**
  * Tax helper for Doofinder Feed
  *
- * @version    1.5.9
+ * @version    1.5.10
  * @package    Doofinder_Feed
  */
 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.5.9
+ * @version    1.5.10
  */
 
 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.5.9
+ * @version    1.5.10
  */
 
 /**
  * Config model for Doofinder Feed
  *
- * @version    1.5.9
+ * @version    1.5.10
  * @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.5.9
+ * @version    1.5.10
  */
 
 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.5.9
+ * @version    1.5.10
  */
 
 /**
  * Generator model for Doofinder Feed
  *
- * @version    1.5.9
+ * @version    1.5.10
  * @package    Doofinder_Feed
  */
 if (!defined('DS'))
@@ -736,19 +736,6 @@ protected function _getFieldsMap()
         return $this->_fieldMap;
     }
 
-    protected function _cleanFieldValue($field)
-    {
-        // http://stackoverflow.com/questions/4224141/php-removing-invalid-utf-8-characters-in-xml-using-filter
-        $valid_utf8 = '/([\x09\x0A\x0D\x20-\x7E]|[\xC2-\xDF][\x80-\xBF]|\xE0[\xA0-\xBF][\x80-\xBF]|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}|\xED[\x80-\x9F][\x80-\xBF]|\xF0[\x90-\xBF][\x80-\xBF]{2}|[\xF1-\xF3][\x80-\xBF]{3}|\xF4[\x80-\x8F][\x80-\xBF]{2})|./x';
-
-        $field = preg_replace('#<br(\s?/)?>#i', ' ', $field);
-        $field = strip_tags($field);
-        $field = preg_replace('/[ ]{2,}/', ' ', $field);
-        $field = trim($field);
-
-        return preg_replace($valid_utf8, '$1', $field);
-    }
-
     protected function _stopOnException(Exception $e)
     {
         Mage::logError($e->getMessage());

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.5.9
+ * @version    1.5.10
  */
 
 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.5.9
+ * @version    1.5.10
  */
 
 /**
  * Abstract Product Map Model for Doofinder Feed
  *
- * @version    1.5.9
+ * @version    1.5.10
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Abstract extends Varien_Object

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.5.9
+ * @version    1.5.10
  */
 
 /**
  * Associated Product Map Model for Doofinder Feed
  *
- * @version    1.5.9
+ * @version    1.5.10
  * @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.5.9
+ * @version    1.5.10
  */
 
 /**
  * Bundle Product Map Model for Doofinder Feed
  *
- * @version    1.5.9
+ * @version    1.5.10
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Bundle

diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Configurable.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Configurable.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.9
+ * @version    1.5.10
  */
 
 /**
  * Configurable Product Map Model for Doofinder Feed
  *
- * @version    1.5.9
+ * @version    1.5.10
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Configurable

diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Downloadable.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Downloadable.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.9
+ * @version    1.5.10
  */
 
 /**
  * Downloadable Product Map Model for Doofinder Feed
  *
- * @version    1.5.9
+ * @version    1.5.10
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Downloadable

diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Grouped.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Grouped.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.9
+ * @version    1.5.10
  */
 
 /**
  * Grouped Product Map Model for Doofinder Feed
  *
- * @version    1.5.9
+ * @version    1.5.10
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Grouped

diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Simple.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Simple.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.9
+ * @version    1.5.10
  */
 
 /**
  * Simple Product Map Model for Doofinder Feed
  *
- * @version    1.5.9
+ * @version    1.5.10
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Simple

diff --git a/app/code/community/Doofinder/Feed/Model/Map/Product/Virtual.php b/app/code/community/Doofinder/Feed/Model/Map/Product/Virtual.php
@@ -6,13 +6,13 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.9
+ * @version    1.5.10
  */
 
 /**
  * Virtual Product Map Model for Doofinder Feed
  *
- * @version    1.5.9
+ * @version    1.5.10
  * @package    Doofinder_Feed
  */
 class Doofinder_Feed_Model_Map_Product_Virtual

diff --git a/app/code/community/Doofinder/Feed/Model/Mysql4/Cron.php b/app/code/community/Doofinder/Feed/Model/Mysql4/Cron.php
@@ -6,7 +6,7 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.9
+ * @version    1.5.10
  */
 
 class Doofinder_Feed_Model_Mysql4_Cron extends Mage_Core_Model_Mysql4_Abstract {

diff --git a/app/code/community/Doofinder/Feed/Model/Mysql4/Cron/Collection.php b/app/code/community/Doofinder/Feed/Model/Mysql4/Cron/Collection.php
@@ -6,7 +6,7 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.9
+ * @version    1.5.10
  */
 
 class Doofinder_Feed_Model_Mysql4_Cron_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract {

diff --git a/app/code/community/Doofinder/Feed/Model/Mysql4/Log.php b/app/code/community/Doofinder/Feed/Model/Mysql4/Log.php
@@ -6,7 +6,7 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.9
+ * @version    1.5.10
  */
 
 class Doofinder_Feed_Model_Mysql4_Log extends Mage_Core_Model_Mysql4_Abstract {

diff --git a/app/code/community/Doofinder/Feed/Model/Mysql4/Log/Collection.php b/app/code/community/Doofinder/Feed/Model/Mysql4/Log/Collection.php
@@ -6,7 +6,7 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.9
+ * @version    1.5.10
  */
 
 class Doofinder_Feed_Model_Mysql4_Log_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract

diff --git a/app/code/community/Doofinder/Feed/Model/Observers/Feed.php b/app/code/community/Doofinder/Feed/Model/Observers/Feed.php
@@ -6,7 +6,7 @@
 /**
  * @category   Models
  * @package    Doofinder_Feed
- * @version    1.5.9
+ * @version    1.5.10
  */
 
 class Doofinder_Feed_Model_Observers_Feed