Zikkio - Version 1.0.3

Version Notes

First stable release.

Download this release

Release Info

Developer Zikkio
Extension Zikkio
Version 1.0.3
Comparing to
See all releases


Code changes from version 1.0.2 to 1.0.3

Files changed (10) hide show
  1. app/code/community/Zikkio/.DS_Store +0 -0
  2. app/code/community/Zikkio/{ZikkioAdminController → Zikkio}/Model/Observer.php +7 -7
  3. app/code/community/Zikkio/{ZikkioAdminController → Zikkio}/controllers/.DS_Store +0 -0
  4. app/code/community/Zikkio/{ZikkioAdminController → Zikkio}/controllers/Adminhtml/CustomController.php +0 -0
  5. app/code/community/Zikkio/{ZikkioAdminController → Zikkio}/etc/config.xml +9 -9
  6. app/code/community/Zikkio/{ZikkioAdminController → Zikkio}/etc/system.xml +0 -0
  7. app/code/community/Zikkio/ZikkioAdminController/.DS_Store +0 -0
  8. app/etc/modules/{Zikkio_ZikkioAdminController.xml → Zikkio_Zikkio.xml} +2 -2
  9. bridge2cart/bridge.php +18 -2
  10. package.xml +4 -4
app/code/community/Zikkio/.DS_Store DELETED
Binary file
app/code/community/Zikkio/{ZikkioAdminController → Zikkio}/Model/Observer.php RENAMED
@@ -1,35 +1,35 @@
1
  <?php
2
- class Zikkio_ZikkioAdminController_Model_Observer {
3
 
4
  public function saveApiKey() {
5
- Mage::log('ZikkioAdminZikkio_CreateAdminController_Model_Options -> saveApiKey()', null, 'HPO_LOG.log');
6
 
7
  $zikkio_api_key = Mage::getStoreConfig('catalog/zikkio/zikkio_api', Mage::app()->getStore());
8
- //Mage::log($zikkio_api_key, null, 'HPO_LOG.log');
9
 
10
  $content_file = '';
11
 
12
  $root_magento = Mage::getBaseDir();
13
 
14
- //Mage::log($root_magento, null, 'HPO_LOG.log');
15
 
16
  $file = $root_magento."/bridge2cart/bridge.php";
17
  $fh = fopen($file, 'r');
18
 
19
  while (($row_file = fgets($fh)) !== false) {
20
 
21
- //Mage::log($row_file, null, 'HPO_LOG.log');
22
 
23
  if(preg_match('/M1_TOKEN/i', $row_file)) {
24
  $content_file = $content_file . "\n".'define("M1_TOKEN", "'.$zikkio_api_key.'");'."\n";
25
- //Mage::log($row_file, null, 'HPO_LOG.log');
26
  }else{
27
  $content_file = $content_file . $row_file;
28
  }
29
 
30
  }
31
 
32
- //Mage::log($content_file, null, 'HPO_LOG.log');
33
 
34
  file_put_contents($file, $content_file);
35
 
1
  <?php
2
+ class Zikkio_Zikkio_Model_Observer {
3
 
4
  public function saveApiKey() {
5
+ Mage::log('ZikkioAdminZikkio_CreateAdminController_Model_Options -> saveApiKey()', null, 'zikkio_LOG.log');
6
 
7
  $zikkio_api_key = Mage::getStoreConfig('catalog/zikkio/zikkio_api', Mage::app()->getStore());
8
+ //Mage::log($zikkio_api_key, null, 'zikkio_LOG.log');
9
 
10
  $content_file = '';
11
 
12
  $root_magento = Mage::getBaseDir();
13
 
14
+ //Mage::log($root_magento, null, 'zikkio_LOG.log');
15
 
16
  $file = $root_magento."/bridge2cart/bridge.php";
17
  $fh = fopen($file, 'r');
18
 
19
  while (($row_file = fgets($fh)) !== false) {
20
 
21
+ //Mage::log($row_file, null, 'zikkio_LOG.log');
22
 
23
  if(preg_match('/M1_TOKEN/i', $row_file)) {
24
  $content_file = $content_file . "\n".'define("M1_TOKEN", "'.$zikkio_api_key.'");'."\n";
25
+ //Mage::log($row_file, null, 'zikkio_LOG.log');
26
  }else{
27
  $content_file = $content_file . $row_file;
28
  }
29
 
30
  }
31
 
32
+ //Mage::log($content_file, null, 'zikkio_LOG.log');
33
 
34
  file_put_contents($file, $content_file);
35
 
app/code/community/Zikkio/{ZikkioAdminController → Zikkio}/controllers/.DS_Store RENAMED
File without changes
app/code/community/Zikkio/{ZikkioAdminController → Zikkio}/controllers/Adminhtml/CustomController.php RENAMED
File without changes
app/code/community/Zikkio/{ZikkioAdminController → Zikkio}/etc/config.xml RENAMED
@@ -1,29 +1,29 @@
1
  <?xml version="1.0"?>
2
  <config>
3
  <modules>
4
- <Zikkio_ZikkioAdminController>
5
- <version>1.0.0</version>
6
  <depends>
7
  <!-- no dependencies -->
8
  </depends>
9
- </Zikkio_ZikkioAdminController>
10
  </modules>
11
  <global>
12
  <events>
13
  <admin_system_config_section_save_after>
14
  <observers>
15
- <Zikkio_ZikkioAdminController_save_api_zikkio>
16
  <type>singleton</type>
17
- <class>Zikkio_ZikkioAdminController_Model_Observer</class>
18
  <method>saveApiKey</method>
19
- </Zikkio_ZikkioAdminController_save_api_zikkio>
20
  </observers>
21
  </admin_system_config_section_save_after>
22
  </events>
23
  <models>
24
- <ZikkioAdminController>
25
- <class>Zikkio_ZikkioAdminController_Model</class>
26
- </ZikkioAdminController>
27
  </models>
28
  <resources />
29
  <extraconfig />
1
  <?xml version="1.0"?>
2
  <config>
3
  <modules>
4
+ <Zikkio_Zikkio>
5
+ <version>1.0.3</version>
6
  <depends>
7
  <!-- no dependencies -->
8
  </depends>
9
+ </Zikkio_Zikkio>
10
  </modules>
11
  <global>
12
  <events>
13
  <admin_system_config_section_save_after>
14
  <observers>
15
+ <Zikkio_Zikkio_save_api_zikkio>
16
  <type>singleton</type>
17
+ <class>Zikkio_Zikkio_Model_Observer</class>
18
  <method>saveApiKey</method>
19
+ </Zikkio_Zikkio_save_api_zikkio>
20
  </observers>
21
  </admin_system_config_section_save_after>
22
  </events>
23
  <models>
24
+ <Zikkio>
25
+ <class>Zikkio_Zikkio_Model</class>
26
+ </Zikkio>
27
  </models>
28
  <resources />
29
  <extraconfig />
app/code/community/Zikkio/{ZikkioAdminController → Zikkio}/etc/system.xml RENAMED
File without changes
app/code/community/Zikkio/ZikkioAdminController/.DS_Store DELETED
Binary file
app/etc/modules/{Zikkio_ZikkioAdminController.xml → Zikkio_Zikkio.xml} RENAMED
@@ -1,9 +1,9 @@
1
  <?xml version="1.0"?>
2
  <config>
3
  <modules>
4
- <Zikkio_ZikkioAdminController>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
- </Zikkio_ZikkioAdminController>
8
  </modules>
9
  </config>
1
  <?xml version="1.0"?>
2
  <config>
3
  <modules>
4
+ <Zikkio_Zikkio>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
+ </Zikkio_Zikkio>
8
  </modules>
9
  </config>
bridge2cart/bridge.php CHANGED
@@ -3755,7 +3755,15 @@ class M1_Bridge
3755
 
3756
 
3757
 
3758
- define("M1_TOKEN", "");
 
 
 
 
 
 
 
 
3759
  // good :)
3760
  } else {
3761
  die('ERROR_INVALID_TOKEN');
@@ -3832,7 +3840,15 @@ if (substr(phpversion(), 0, 1) == 5) {
3832
 
3833
 
3834
 
3835
- define("M1_TOKEN", "");
 
 
 
 
 
 
 
 
3836
 
3837
  function stripslashes_array($array) {
3838
  return is_array($array) ? array_map('stripslashes_array', $array) : stripslashes($array);
3755
 
3756
 
3757
 
3758
+
3759
+
3760
+
3761
+
3762
+
3763
+
3764
+
3765
+
3766
+ define("M1_TOKEN", "sadsadsadsadsadsa");
3767
  // good :)
3768
  } else {
3769
  die('ERROR_INVALID_TOKEN');
3840
 
3841
 
3842
 
3843
+
3844
+
3845
+
3846
+
3847
+
3848
+
3849
+
3850
+
3851
+ define("M1_TOKEN", "sadsadsadsadsadsa");
3852
 
3853
  function stripslashes_array($array) {
3854
  return is_array($array) ? array_map('stripslashes_array', $array) : stripslashes($array);
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Zikkio</name>
4
- <version>1.0.2</version>
5
  <stability>stable</stability>
6
  <license>Open Software License (OSL)</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>Zikkio module is the connector between your Magento and Zikkio service. With Zikkio module active you can import/export orders and products to Zikkio.</description>
11
  <notes>First stable release.</notes>
12
  <authors><author><name>Zikkio</name><user>Zikkio</user><email>account@zikkio.com</email></author></authors>
13
- <date>2016-04-15</date>
14
- <time>07:52:13</time>
15
- <contents><target name="magecommunity"><dir name="Zikkio"><dir name="ZikkioAdminController"><dir name="Model"><file name="Observer.php" hash="1a2bf834077f9377cfacb295b1af221e"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="CustomController.php" hash="2f7f538aca59cdda4d82441881aa2d40"/></dir><file name=".DS_Store" hash="0047fe0bc161a58c6088a4e959de43a4"/></dir><dir name="etc"><file name="config.xml" hash="7bee71259c06630a9a8cbfb3daa94fe5"/><file name="system.xml" hash="0f3fea48c17814d138e4da30576464b2"/></dir><file name=".DS_Store" hash="617e535c77d4a97817504842ee12608f"/></dir><file name=".DS_Store" hash="cd16bac5d4234d29433d501ef6df7fb7"/></dir></target><target name="mageetc"><dir name="modules"><file name="Zikkio_ZikkioAdminController.xml" hash="c27aab592c5b97e25fa80c58a821c44b"/></dir></target><target name="mage"><dir name="bridge2cart"><file name="bridge.php" hash="948af9e608bfa310f0c8b3e175218858"/><file name="index.html" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Zikkio</name>
4
+ <version>1.0.3</version>
5
  <stability>stable</stability>
6
  <license>Open Software License (OSL)</license>
7
  <channel>community</channel>
10
  <description>Zikkio module is the connector between your Magento and Zikkio service. With Zikkio module active you can import/export orders and products to Zikkio.</description>
11
  <notes>First stable release.</notes>
12
  <authors><author><name>Zikkio</name><user>Zikkio</user><email>account@zikkio.com</email></author></authors>
13
+ <date>2016-04-27</date>
14
+ <time>08:13:45</time>
15
+ <contents><target name="magecommunity"><dir name="Zikkio"><dir name="Zikkio"><dir name="Model"><file name="Observer.php" hash="20bba3d0281a9530f6e52943280a4c40"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="CustomController.php" hash="2f7f538aca59cdda4d82441881aa2d40"/></dir><file name=".DS_Store" hash="0047fe0bc161a58c6088a4e959de43a4"/></dir><dir name="etc"><file name="config.xml" hash="b264918fd5b938f262f0ca61e1b96895"/><file name="system.xml" hash="0f3fea48c17814d138e4da30576464b2"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Zikkio_Zikkio.xml" hash="c1139e2f96cfa49d2c4c910adcb08051"/></dir></target><target name="mage"><dir name="bridge2cart"><file name="bridge.php" hash="69aa3dc57467c42bc1660ed1d1202d98"/><file name="index.html" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>