eBay_Enterprise_Display_Extension - Version 1.0.3

Version Notes

DE1435 Remove CR/LF Characters Using Regex
US12310 Update Versioning Scheme

Download this release

Release Info

Developer Michael A. Smith
Extension eBay_Enterprise_Display_Extension
Version 1.0.3
Comparing to
See all releases


Code changes from version 1.0.2 to 1.0.3

Files changed (3) hide show
  1. app/code/community/EbayEnterprise/Display/Helper/Data.php +9 -0
  2. app/code/community/EbayEnterprise/Display/Model/Products.php +3 -2
  3. package.xml +6 -5
app/code/community/EbayEnterprise/Display/Helper/Data.php CHANGED
@@ -40,4 +40,13 @@ class EbayEnterprise_Display_Helper_Data extends Mage_Core_Helper_Abstract
40
  }
41
  return preg_split("/$sep/", $field);
42
  }
 
 
 
 
 
 
 
 
 
43
  }
40
  }
41
  return preg_split("/$sep/", $field);
42
  }
43
+ /**
44
+ * Strip out Carriage Return (CR) and Line Feed (LF) characters from a string
45
+ * @param string $content
46
+ * @param string
47
+ */
48
+ public function cleanString($content)
49
+ {
50
+ return trim(preg_replace("/\s*[\r\n]+\s*/", ' ', $content));
51
+ }
52
  }
app/code/community/EbayEnterprise/Display/Model/Products.php CHANGED
@@ -113,12 +113,13 @@ class EbayEnterprise_Display_Model_Products extends Mage_Core_Model_Abstract
113
  {
114
  $data = array();
115
  $products = $this->_getProductCollection($storeId);
 
116
  foreach($products as $collectedProduct) {
117
  $product = Mage::getModel('catalog/product')->setStoreId($storeId)->load($collectedProduct->getId());
118
  $data[] = array(
119
  $product->getSku(),
120
- $product->getName(),
121
- $product->getShortDescription(),
122
  $product->getPrice(),
123
  $this->_getResizedImage($product, $storeId),
124
  $product->getProductUrl(),
113
  {
114
  $data = array();
115
  $products = $this->_getProductCollection($storeId);
116
+ $helper = Mage::helper('eems_display');
117
  foreach($products as $collectedProduct) {
118
  $product = Mage::getModel('catalog/product')->setStoreId($storeId)->load($collectedProduct->getId());
119
  $data[] = array(
120
  $product->getSku(),
121
+ $helper->cleanString($product->getName()),
122
+ $helper->cleanString($product->getShortDescription()),
123
  $product->getPrice(),
124
  $this->_getResizedImage($product, $storeId),
125
  $product->getProductUrl(),
package.xml CHANGED
@@ -1,18 +1,19 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>eBay_Enterprise_Display_Extension</name>
4
- <version>1.0.2</version>
5
  <stability>stable</stability>
6
  <license>OSL</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>eBay Enterprise Display Extension.</summary>
10
  <description>eBay Enterprise Display Extension.</description>
11
- <notes>DE1411 Fix missing package file</notes>
 
12
  <authors><author><name>Michael A. Smith</name><user>msmith3</user><email>msmith3@ebay.com</email></author><author><name>Michael Phang</name><user>mphang</user><email>mphang@ebay.com</email></author><author><name>Scott van Brug</name><user>svanbrug</user><email>svanbrug@ebay.com</email></author><author><name>Mike West</name><user>micwest</user><email>micwest@ebay.com</email></author><author><name>Reginald Gabriel</name><user>rgabriel</user><email>rgabriel@ebay.com</email></author></authors>
13
- <date>2014-05-27</date>
14
- <time>20:49:46</time>
15
- <contents><target name="magecommunity"><dir name="EbayEnterprise"><dir name="Display"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Feedurl.php" hash="82241e7e509b9c27dc734c8728e501f5"/></dir></dir></dir></dir></dir><file name="Beacon.php" hash="b272092167ffa1f7f08be5b3715b7968"/></dir><dir name="controllers"><file name="IndexController.php" hash="197cb073d339eb76e6dbcf2167107a93"/></dir><dir name="etc"><file name="adminhtml.xml" hash="e1208b50586829c2e6c6536dd062ef0c"/><file name="config.xml" hash="5c8237485eb9c7c77fea466e26f41bd9"/><file name="system.xml" hash="55731b868ba01e966120cd53235b4407"/></dir><dir name="Helper"><file name="Config.php" hash="f831ae412417e253a57f37d6d3423e50"/><file name="Data.php" hash="3a5312fe107714d34267c72ce2910f40"/></dir><dir name="Model"><file name="Email.php" hash="2252c80035c9515650cd49e2c52e3645"/><file name="Products.php" hash="63129b2a0bd7f790ffbd96473c7d2c31"/><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><file name="Feedurl.php" hash="aa1810a7c67e0b35e732ff5155f81a6b"/><file name="Siteidchecksum.php" hash="f72b7dc6d0294faafcfc51e8ec46a222"/></dir></dir></dir></dir><dir name="Error"><file name="Exception.php" hash="65df9f687c4746431f9316baca3b5495"/></dir></dir><dir name="sql"><dir name="eemsdisplay_setup"><file name="install-1.0.0.0.php" hash="a9c02c7e94cdad9965ffa62571276ba2"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="eems_display.xml" hash="7f823afa4c46cc316e198d5ff80eaa6b"/></dir><dir name="template"><dir name="eems_display"><file name="beacon.phtml" hash="4937e1a21b75f436b6a013fdcea59be9"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="EbayEnterprise_Display.xml" hash="ae74ae5088d96d6300c544a031d4c0c6"/></dir></target><target name="magelocale"><dir name="en_US"><dir name="template"><dir name="email"><file name="eemsdisplay_installed.html" hash="609fa6fc13a7a3f444bd0c256e207e7f"/></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.3.0</min><max>5.3.99</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>eBay_Enterprise_Display_Extension</name>
4
+ <version>1.0.3</version>
5
  <stability>stable</stability>
6
  <license>OSL</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>eBay Enterprise Display Extension.</summary>
10
  <description>eBay Enterprise Display Extension.</description>
11
+ <notes>DE1435 Remove CR/LF Characters Using Regex&#xD;
12
+ US12310 Update Versioning Scheme</notes>
13
  <authors><author><name>Michael A. Smith</name><user>msmith3</user><email>msmith3@ebay.com</email></author><author><name>Michael Phang</name><user>mphang</user><email>mphang@ebay.com</email></author><author><name>Scott van Brug</name><user>svanbrug</user><email>svanbrug@ebay.com</email></author><author><name>Mike West</name><user>micwest</user><email>micwest@ebay.com</email></author><author><name>Reginald Gabriel</name><user>rgabriel</user><email>rgabriel@ebay.com</email></author></authors>
14
+ <date>2014-06-06</date>
15
+ <time>16:50:49</time>
16
+ <contents><target name="magecommunity"><dir name="EbayEnterprise"><dir name="Display"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Feedurl.php" hash="82241e7e509b9c27dc734c8728e501f5"/></dir></dir></dir></dir></dir><file name="Beacon.php" hash="b272092167ffa1f7f08be5b3715b7968"/></dir><dir name="controllers"><file name="IndexController.php" hash="197cb073d339eb76e6dbcf2167107a93"/></dir><dir name="etc"><file name="adminhtml.xml" hash="e1208b50586829c2e6c6536dd062ef0c"/><file name="config.xml" hash="5c8237485eb9c7c77fea466e26f41bd9"/><file name="system.xml" hash="55731b868ba01e966120cd53235b4407"/></dir><dir name="Helper"><file name="Config.php" hash="f831ae412417e253a57f37d6d3423e50"/><file name="Data.php" hash="47cdce2767164d8400a1b22d60afb3f0"/></dir><dir name="Model"><file name="Email.php" hash="2252c80035c9515650cd49e2c52e3645"/><file name="Products.php" hash="49b8beb5bdfe7359424353f9d1fc1045"/><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><file name="Feedurl.php" hash="aa1810a7c67e0b35e732ff5155f81a6b"/><file name="Siteidchecksum.php" hash="f72b7dc6d0294faafcfc51e8ec46a222"/></dir></dir></dir></dir><dir name="Error"><file name="Exception.php" hash="65df9f687c4746431f9316baca3b5495"/></dir></dir><dir name="sql"><dir name="eemsdisplay_setup"><file name="install-1.0.0.0.php" hash="a9c02c7e94cdad9965ffa62571276ba2"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="eems_display.xml" hash="7f823afa4c46cc316e198d5ff80eaa6b"/></dir><dir name="template"><dir name="eems_display"><file name="beacon.phtml" hash="4937e1a21b75f436b6a013fdcea59be9"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="EbayEnterprise_Display.xml" hash="ae74ae5088d96d6300c544a031d4c0c6"/></dir></target><target name="magelocale"><dir name="en_US"><dir name="template"><dir name="email"><file name="eemsdisplay_installed.html" hash="609fa6fc13a7a3f444bd0c256e207e7f"/></dir></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.3.0</min><max>5.3.99</max></php></required></dependencies>
19
  </package>