Swift_Swiftplugin - Version 1.8.0

Version Notes

Added further php 5.2 support

Download this release

Release Info

Developer Simon Cooper
Extension Swift_Swiftplugin
Version 1.8.0
Comparing to
See all releases


Code changes from version 1.7.3 to 1.8.0

Files changed (8) hide show
  1. app/code/community/Swift/Swiftplugin/Block/Swiftblock.php +1 -1
  2. app/code/community/Swift/Swiftplugin/Helper/Data.php +19 -2
  3. app/code/community/Swift/Swiftplugin/Model/XmlProduct.php +1 -1
  4. app/code/community/Swift/Swiftplugin/controllers/Adminhtml/IndexController.php +1 -1
  5. app/code/community/Swift/Swiftplugin/controllers/MailController.php +1 -1
  6. app/code/community/Swift/Swiftplugin/controllers/OrdersController.php +1 -1
  7. app/code/community/Swift/Swiftplugin/etc/config.xml +1 -1
  8. package.xml +5 -5
app/code/community/Swift/Swiftplugin/Block/Swiftblock.php CHANGED
@@ -118,7 +118,7 @@ class Swift_Swiftplugin_Block_Swiftblock extends Mage_Core_Block_Template {
118
  */
119
  public function scriptResponse() {
120
  if($this->request) {
121
- $key = hex2bin($this->swiftData);
122
  return SwiftAPI::Script($this->request, $key);
123
  }
124
  return '';
118
  */
119
  public function scriptResponse() {
120
  if($this->request) {
121
+ $key = Mage::helper('swift/Data')->_hex2bin($this->swiftData);
122
  return SwiftAPI::Script($this->request, $key);
123
  }
124
  return '';
app/code/community/Swift/Swiftplugin/Helper/Data.php CHANGED
@@ -73,14 +73,31 @@ class Swift_Swiftplugin_Helper_Data extends Mage_Core_Helper_Abstract {
73
  $arr['modules'] = $module_output;
74
 
75
  $api_version = new SwiftAPI_Request_Version($_SERVER['HTTP_HOST'],$arr);
76
- $key = hex2bin(Mage::helper('swift/Data')->getSwiftPrivateKey());
77
  if (!is_bool($key) && !is_null($key)) {
78
- echo SwiftAPI::Encode($api_version, hex2bin(Mage::helper('swift/Data')->getSwiftPrivateKey()));
79
  }
80
  else {
81
  json_encode($arr);
82
  }
83
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
84
  }
85
 
86
  ?>
73
  $arr['modules'] = $module_output;
74
 
75
  $api_version = new SwiftAPI_Request_Version($_SERVER['HTTP_HOST'],$arr);
76
+ $key = Mage::helper('swift/Data')->_hex2bin(Mage::helper('swift/Data')->getSwiftPrivateKey());
77
  if (!is_bool($key) && !is_null($key)) {
78
+ echo SwiftAPI::Encode($api_version, Mage::helper('swift/Data')->_hex2bin(Mage::helper('swift/Data')->getSwiftPrivateKey()));
79
  }
80
  else {
81
  json_encode($arr);
82
  }
83
  }
84
+
85
+ public function _hex2bin($str) {
86
+
87
+ if (function_exists( 'hex2bin' )) {
88
+ return hex2bin($str);
89
+ }
90
+ else {
91
+ $sbin = "";
92
+ $len = strlen( $str );
93
+ for ( $i = 0; $i < $len; $i += 2 ) {
94
+ $sbin .= pack( "H*", substr( $str, $i, 2 ) );
95
+ }
96
+
97
+ return $sbin;
98
+ }
99
+
100
+ }
101
  }
102
 
103
  ?>
app/code/community/Swift/Swiftplugin/Model/XmlProduct.php CHANGED
@@ -39,7 +39,7 @@ class Swift_Swiftplugin_Model_XmlProduct {
39
  //limit the data parsed
40
  $productCollection = Mage::getModel('catalog/product')->getCollection()
41
  ->addAttributeToSelect(array('product_id','name','description', 'short_description','price','url_path','image','thumbnail', 'small_image','special_price','sku','special_to_date', 'special_from_date'))
42
- ->addAttributeToFilter('visibility', array('in' => [Mage_Catalog_Model_Product_Visibility::VISIBILITY_IN_CATALOG, Mage_Catalog_Model_Product_Visibility::VISIBILITY_IN_SEARCH, Mage_Catalog_Model_Product_Visibility::VISIBILITY_BOTH]))
43
  ->addAttributeToFilter('status', array('in' => Mage::getSingleton('catalog/product_status')->getSaleableStatusIds()))
44
  ->setCurPage($this->offset)
45
  ->setPageSize($this->limit);
39
  //limit the data parsed
40
  $productCollection = Mage::getModel('catalog/product')->getCollection()
41
  ->addAttributeToSelect(array('product_id','name','description', 'short_description','price','url_path','image','thumbnail', 'small_image','special_price','sku','special_to_date', 'special_from_date'))
42
+ ->addAttributeToFilter('visibility', array('in' => array(Mage_Catalog_Model_Product_Visibility::VISIBILITY_IN_CATALOG, Mage_Catalog_Model_Product_Visibility::VISIBILITY_IN_SEARCH, Mage_Catalog_Model_Product_Visibility::VISIBILITY_BOTH)))
43
  ->addAttributeToFilter('status', array('in' => Mage::getSingleton('catalog/product_status')->getSaleableStatusIds()))
44
  ->setCurPage($this->offset)
45
  ->setPageSize($this->limit);
app/code/community/Swift/Swiftplugin/controllers/Adminhtml/IndexController.php CHANGED
@@ -111,7 +111,7 @@ class Swift_Swiftplugin_Adminhtml_IndexController extends Mage_Adminhtml_Control
111
  'http' => array(
112
  'header' => "Content-type: application/x-www-form-urlencoded\r\n",
113
  'method' => 'POST',
114
- 'content' => SwiftAPI::Query($request, hex2bin($key))
115
  )
116
  );
117
 
111
  'http' => array(
112
  'header' => "Content-type: application/x-www-form-urlencoded\r\n",
113
  'method' => 'POST',
114
+ 'content' => SwiftAPI::Query($request, Mage::helper('swift/Data')->_hex2bin($key))
115
  )
116
  );
117
 
app/code/community/Swift/Swiftplugin/controllers/MailController.php CHANGED
@@ -17,7 +17,7 @@ class Swift_Swiftplugin_MailController extends Mage_Core_Controller_Front_Action
17
 
18
  //We time this regardless of whether debug is set as we can't yet tell if we want the debug or not
19
  $fetchKeyTimeStart = microtime(true);
20
- $key = hex2bin(Mage::helper('swift/Data')->getSwiftPrivateKey());
21
  $fetchKeyTimeEnd = microtime(true);
22
 
23
 
17
 
18
  //We time this regardless of whether debug is set as we can't yet tell if we want the debug or not
19
  $fetchKeyTimeStart = microtime(true);
20
+ $key = Mage::helper('swift/Data')->_hex2bin(Mage::helper('swift/Data')->getSwiftPrivateKey());
21
  $fetchKeyTimeEnd = microtime(true);
22
 
23
 
app/code/community/Swift/Swiftplugin/controllers/OrdersController.php CHANGED
@@ -11,7 +11,7 @@ class Swift_Swiftplugin_OrdersController extends Mage_Core_Controller_Front_Acti
11
 
12
  public function pastordersAction() {
13
 
14
- $key = hex2bin(Mage::helper('swift/Data')->getSwiftPrivateKey());
15
 
16
  if (!is_bool($key) && !is_null($key)) {
17
 
11
 
12
  public function pastordersAction() {
13
 
14
+ $key = Mage::helper('swift/Data')->_hex2bin(Mage::helper('swift/Data')->getSwiftPrivateKey());
15
 
16
  if (!is_bool($key) && !is_null($key)) {
17
 
app/code/community/Swift/Swiftplugin/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Swift_Swiftplugin>
5
- <version>1.7.3</version>
6
  </Swift_Swiftplugin>
7
  </modules>
8
  <frontend>
2
  <config>
3
  <modules>
4
  <Swift_Swiftplugin>
5
+ <version>1.8.0</version>
6
  </Swift_Swiftplugin>
7
  </modules>
8
  <frontend>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Swift_Swiftplugin</name>
4
- <version>1.7.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/LGPL-3.0">LGPL</license>
7
  <channel>community</channel>
@@ -18,11 +18,11 @@ The extension uses background JavaScript calls to collect and store the customer
18
  &lt;p&gt;&#xD;
19
  The extension is easy to set up and uses Magento&#x2019;s built in features to collect information and send emails to the customers. Visit swiftcrm.net for prices and free trails.&#xD;
20
  &lt;/p&gt;</description>
21
- <notes>Fixed an issue with magento not collecting orders relevant to the right store.</notes>
22
  <authors><author><name>Simon Cooper</name><user>Netready</user><email>simon@netready.biz</email></author></authors>
23
- <date>2017-02-09</date>
24
- <time>16:28:54</time>
25
- <contents><target name="magelib"><dir name="libXML"><file name="xml.php" hash="c20ca4a39971acf4605247712186b9ec"/></dir><dir name="SwiftAPI"><file name="SwiftAPI.php" hash="8bb2f97586dbd62da6fd0d6781b67ae6"/><file name="SwiftAPI_Exception.php" hash="879b899a7961f4de1212b7296ccafb16"/><file name="SwiftAPI_Product.php" hash="063922cccb485d81c6022de5c4e8e044"/><file name="SwiftAPI_Request.php" hash="f072a4c42fe3767d769f8e9f9c824ecd"/><file name="SwiftAPI_Request_Cart.php" hash="f8955c78200ddb0512adb5214fd64bb2"/><file name="SwiftAPI_Request_EmailPackage.php" hash="a23bdf7699540ece514ec5a6f53ecb12"/><file name="SwiftAPI_Request_Home.php" hash="9268da121dd10db50d5c2675afd1c65e"/><file name="SwiftAPI_Request_Order.php" hash="49ff0d4c501b075f11ef94727d729a75"/><file name="SwiftAPI_Request_OrderPackage.php" hash="45ad4af3b24bfab66f96b493c830ceab"/><file name="SwiftAPI_Request_PastOrder.php" hash="90ac5fb44bd1ad61f39d277d268e3575"/><file name="SwiftAPI_Request_Ping.php" hash="e5e13b71682f8230711d5d2f28f9a534"/><file name="SwiftAPI_Request_Product.php" hash="e5fab27bb2dd45946ed8c143a18fe3c4"/><file name="SwiftAPI_Request_SendMail.php" hash="ba04382a3df6b3e179aed5fe3e809de7"/><file name="SwiftAPI_Request_Subscription.php" hash="5545738b941d8ca4dca69b6059a0cce4"/><file name="SwiftAPI_Request_Unsubscribe.php" hash="78aa37cc0ecb98d501674350a4a409c9"/><file name="SwiftAPI_Request_Version.php" hash="21cebd7eb59698bb0aae55bdeaa23660"/><file name="SwiftAPI_Request_ViewMail.php" hash="f0eb0236c7f6e1fa194d8f05f865a7d8"/><dir name="doc"><file name="SwiftAPI-Specification.html" hash="a31d6c9f13198d017f9f50ac787bea23"/><file name="SwiftAPI-Specification_v3.html" hash="17f8207291313730a72286901c61e44f"/></dir><file name="index.php" hash="82886bb98883bd5868ea04c7d8c88ba5"/><file name="php.ini" hash="ef29c923925a1d1bbc8879c22297daa4"/></dir></target><target name="magecommunity"><dir name="Swift"><dir name="Swiftplugin"><dir name="Block"><dir name="Adminhtml"><dir name="Swift"><dir name="Edit"><file name="Form.php" hash="bd80ab8170f7f2286f13ac579e5249d9"/><dir name="Tab"><file name="Form.php" hash="3d15c45cb2205acabc20376f41a9bd5b"/><file name="Instruct.php" hash="9f34075cc9cdfa92b7876c33fda514de"/></dir><file name="Tabs.php" hash="993769f682fad7d28df79ff3acea97cc"/></dir><file name="Edit.php" hash="d93f75dbaaa7266d91e828b3208fbf2d"/></dir></dir><file name="Swiftblock.php" hash="8b4f72297c8af67374c695b44003867d"/></dir><dir name="Helper"><file name="Data.php" hash="08be234d9cbc17ed98f67a5fd0ca9002"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Swift"><file name="Collection.php" hash="82de0fe56cd875d3e78c8fc690424ee1"/></dir><file name="Swift.php" hash="252d5f2ecb1119804b415758d2db6800"/><dir name="Swiftorders"><file name="Collection.php" hash="a9e75003a18fcedc8badf1ab3ae79719"/></dir><file name="Swiftorders.php" hash="881185eb5fa8af8fe385c1bfaaeb94e0"/></dir><file name="Observer.php" hash="8bb4dd498a57f1166ed1c85a2b8ab0e0"/><file name="Swift.php" hash="1f9e49d4db7f8987cfd8858061fedc6a"/><file name="Swiftorders.php" hash="e3f2d23f00e0ad8309a958a24b613678"/><file name="XmlProduct.php" hash="7b1a4715c6f3f217f868d723de74d0db"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="IndexController.php" hash="92604a30880c89fbe7885780520096cc"/></dir><file name="MailController.php" hash="cecc1f1806a0da398cdf6ef7b7bdaec0"/><file name="OrdersController.php" hash="9cd9b56e0d1264e812b9c2a6e7a5e4ea"/><file name="VersionController.php" hash="b9bebb51f946430a2dc7bfc82f96bf36"/><file name="XmlController.php" hash="e78cc03f619a75d43752e8bde42b0798"/></dir><dir name="etc"><file name="config.xml" hash="2940e8c40fd5028c462984c736da56a5"/></dir><dir name="sql"><dir name="swift_setup"><file name="install-1.1.13.php" hash="2447b5645fc36738373678473cec88dc"/><file name="install-1.1.2.php" hash="00832a00c34cb4c997a96330cb28cbfb"/><file name="install-1.7.0.php" hash="13788c22d8b0ad31c68a775f06333d47"/><file name="upgrade-1.1.12-1.7.1.php" hash="979794d8258b7f3840e9699139505823"/><file name="upgrade-1.1.2-1.1.12.php" hash="cbe3c3fa07facb7b720d7dd518acbeca"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="swift.xml" hash="d80a5229e30cf4b76f5a5150ac1c27c3"/></dir><dir name="template"><dir name="swift"><file name="swiftplugin.phtml" hash="d4d25148e09529e457b6436d7655627b"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Swift_all.xml" hash="0ae5a788c805a9fc79b402fe7a02e54d"/></dir></target></contents>
26
  <compatible/>
27
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><extension><name>mcrypt</name><min/><max/></extension></required></dependencies>
28
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Swift_Swiftplugin</name>
4
+ <version>1.8.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/LGPL-3.0">LGPL</license>
7
  <channel>community</channel>
18
  &lt;p&gt;&#xD;
19
  The extension is easy to set up and uses Magento&#x2019;s built in features to collect information and send emails to the customers. Visit swiftcrm.net for prices and free trails.&#xD;
20
  &lt;/p&gt;</description>
21
+ <notes>Added further php 5.2 support</notes>
22
  <authors><author><name>Simon Cooper</name><user>Netready</user><email>simon@netready.biz</email></author></authors>
23
+ <date>2017-03-07</date>
24
+ <time>14:12:11</time>
25
+ <contents><target name="magelib"><dir name="libXML"><file name="xml.php" hash="c20ca4a39971acf4605247712186b9ec"/></dir><dir name="SwiftAPI"><file name="SwiftAPI.php" hash="8bb2f97586dbd62da6fd0d6781b67ae6"/><file name="SwiftAPI_Exception.php" hash="879b899a7961f4de1212b7296ccafb16"/><file name="SwiftAPI_Product.php" hash="063922cccb485d81c6022de5c4e8e044"/><file name="SwiftAPI_Request.php" hash="f072a4c42fe3767d769f8e9f9c824ecd"/><file name="SwiftAPI_Request_Cart.php" hash="f8955c78200ddb0512adb5214fd64bb2"/><file name="SwiftAPI_Request_EmailPackage.php" hash="a23bdf7699540ece514ec5a6f53ecb12"/><file name="SwiftAPI_Request_Home.php" hash="9268da121dd10db50d5c2675afd1c65e"/><file name="SwiftAPI_Request_Order.php" hash="49ff0d4c501b075f11ef94727d729a75"/><file name="SwiftAPI_Request_OrderPackage.php" hash="45ad4af3b24bfab66f96b493c830ceab"/><file name="SwiftAPI_Request_PastOrder.php" hash="90ac5fb44bd1ad61f39d277d268e3575"/><file name="SwiftAPI_Request_Ping.php" hash="e5e13b71682f8230711d5d2f28f9a534"/><file name="SwiftAPI_Request_Product.php" hash="e5fab27bb2dd45946ed8c143a18fe3c4"/><file name="SwiftAPI_Request_SendMail.php" hash="ba04382a3df6b3e179aed5fe3e809de7"/><file name="SwiftAPI_Request_Subscription.php" hash="5545738b941d8ca4dca69b6059a0cce4"/><file name="SwiftAPI_Request_Unsubscribe.php" hash="78aa37cc0ecb98d501674350a4a409c9"/><file name="SwiftAPI_Request_Version.php" hash="21cebd7eb59698bb0aae55bdeaa23660"/><file name="SwiftAPI_Request_ViewMail.php" hash="f0eb0236c7f6e1fa194d8f05f865a7d8"/><dir name="doc"><file name="SwiftAPI-Specification.html" hash="a31d6c9f13198d017f9f50ac787bea23"/><file name="SwiftAPI-Specification_v3.html" hash="17f8207291313730a72286901c61e44f"/></dir><file name="index.php" hash="82886bb98883bd5868ea04c7d8c88ba5"/><file name="php.ini" hash="ef29c923925a1d1bbc8879c22297daa4"/></dir></target><target name="magecommunity"><dir name="Swift"><dir name="Swiftplugin"><dir name="Block"><dir name="Adminhtml"><dir name="Swift"><dir name="Edit"><file name="Form.php" hash="bd80ab8170f7f2286f13ac579e5249d9"/><dir name="Tab"><file name="Form.php" hash="3d15c45cb2205acabc20376f41a9bd5b"/><file name="Instruct.php" hash="9f34075cc9cdfa92b7876c33fda514de"/></dir><file name="Tabs.php" hash="993769f682fad7d28df79ff3acea97cc"/></dir><file name="Edit.php" hash="d93f75dbaaa7266d91e828b3208fbf2d"/></dir></dir><file name="Swiftblock.php" hash="35b83bdbc2f43cd79d8ef4706128e306"/></dir><dir name="Helper"><file name="Data.php" hash="87fbf46bdb679010f005a042e7d9aecb"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Swift"><file name="Collection.php" hash="82de0fe56cd875d3e78c8fc690424ee1"/></dir><file name="Swift.php" hash="252d5f2ecb1119804b415758d2db6800"/><dir name="Swiftorders"><file name="Collection.php" hash="a9e75003a18fcedc8badf1ab3ae79719"/></dir><file name="Swiftorders.php" hash="881185eb5fa8af8fe385c1bfaaeb94e0"/></dir><file name="Observer.php" hash="8bb4dd498a57f1166ed1c85a2b8ab0e0"/><file name="Swift.php" hash="1f9e49d4db7f8987cfd8858061fedc6a"/><file name="Swiftorders.php" hash="e3f2d23f00e0ad8309a958a24b613678"/><file name="XmlProduct.php" hash="349444e751c37dae8e1e825ee581861b"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="IndexController.php" hash="95b0dc1e9bbdfeb684bac64a3bd653dc"/></dir><file name="MailController.php" hash="b1126e2aa65b11890dd83e12f8d46056"/><file name="OrdersController.php" hash="03622462f2de0a7829228522015985e9"/><file name="VersionController.php" hash="b9bebb51f946430a2dc7bfc82f96bf36"/><file name="XmlController.php" hash="e78cc03f619a75d43752e8bde42b0798"/></dir><dir name="etc"><file name="config.xml" hash="58e3c6c26633b115e70307c0ec596415"/></dir><dir name="sql"><dir name="swift_setup"><file name="install-1.1.13.php" hash="2447b5645fc36738373678473cec88dc"/><file name="install-1.1.2.php" hash="00832a00c34cb4c997a96330cb28cbfb"/><file name="install-1.7.0.php" hash="13788c22d8b0ad31c68a775f06333d47"/><file name="upgrade-1.1.12-1.7.1.php" hash="979794d8258b7f3840e9699139505823"/><file name="upgrade-1.1.2-1.1.12.php" hash="cbe3c3fa07facb7b720d7dd518acbeca"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="swift.xml" hash="d80a5229e30cf4b76f5a5150ac1c27c3"/></dir><dir name="template"><dir name="swift"><file name="swiftplugin.phtml" hash="d4d25148e09529e457b6436d7655627b"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Swift_all.xml" hash="0ae5a788c805a9fc79b402fe7a02e54d"/></dir></target></contents>
26
  <compatible/>
27
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><extension><name>mcrypt</name><min/><max/></extension></required></dependencies>
28
  </package>