Zikkio - Version 1.0.1

Version Notes

First stable release.

Download this release

Release Info

Developer Zikkio
Extension Zikkio
Version 1.0.1
Comparing to
See all releases


Code changes from version 1.0.0 to 1.0.1

Files changed (10) hide show
  1. app/code/community/Zikkio/.DS_Store +0 -0
  2. app/code/community/Zikkio/ZikkioAdminController/.DS_Store +0 -0
  3. app/code/{local/HPO → community/Zikkio}/ZikkioAdminController/Model/Observer.php +39 -39
  4. app/code/community/Zikkio/ZikkioAdminController/controllers/.DS_Store +0 -0
  5. app/code/{local/HPO → community/Zikkio}/ZikkioAdminController/controllers/Adminhtml/CustomController.php +19 -19
  6. app/code/{local/HPO → community/Zikkio}/ZikkioAdminController/etc/config.xml +31 -31
  7. app/code/{local/HPO → community/Zikkio}/ZikkioAdminController/etc/system.xml +26 -26
  8. app/etc/modules/Zikkio_ZikkioAdminController.xml +9 -0
  9. bridge2cart/bridge.php +8 -2
  10. package.xml +6 -6
app/code/community/Zikkio/.DS_Store ADDED
Binary file
app/code/community/Zikkio/ZikkioAdminController/.DS_Store ADDED
Binary file
app/code/{local/HPO → community/Zikkio}/ZikkioAdminController/Model/Observer.php RENAMED
@@ -1,40 +1,40 @@
1
- <?php
2
- class HPO_ZikkioAdminController_Model_Observer {
3
-
4
- public function saveApiKey() {
5
- Mage::log('HPOAdminZikkio_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
-
36
- fclose($fh);
37
-
38
- }
39
- }
40
  ?>
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
+
36
+ fclose($fh);
37
+
38
+ }
39
+ }
40
  ?>
app/code/community/Zikkio/ZikkioAdminController/controllers/.DS_Store ADDED
Binary file
app/code/{local/HPO → community/Zikkio}/ZikkioAdminController/controllers/Adminhtml/CustomController.php RENAMED
@@ -1,20 +1,20 @@
1
- <?php
2
-
3
- class HPOAdminZikkio_CreateAdminController_Adminhtml_CustomController extends Mage_Adminhtml_Controller_Action
4
- {
5
- public function indexAction()
6
- {
7
- $this->loadLayout();
8
- $this->_setActiveMenu('simpleadmin/simple_one');
9
- $leftBlock=$this->getLayout()
10
- ->createBlock('core/text', 'left-admin-block')
11
- ->setText('<h1>Blocco di sinistra</h1>');
12
- $contentBlock=$this->getLayout()
13
- ->createBlock('core/text', 'content-admin-block')
14
- ->setText('<h1>Blocco centrale</h1>');
15
- $this->_addLeft($leftBlock);
16
- $this->_addContent($contentBlock);
17
- $this->renderLayout();
18
- }
19
-
20
  }
1
+ <?php
2
+
3
+ class ZikkioAdminZikkio_CreateAdminController_Adminhtml_CustomController extends Mage_Adminhtml_Controller_Action
4
+ {
5
+ public function indexAction()
6
+ {
7
+ $this->loadLayout();
8
+ $this->_setActiveMenu('simpleadmin/simple_one');
9
+ $leftBlock=$this->getLayout()
10
+ ->createBlock('core/text', 'left-admin-block')
11
+ ->setText('<h1>Blocco di sinistra</h1>');
12
+ $contentBlock=$this->getLayout()
13
+ ->createBlock('core/text', 'content-admin-block')
14
+ ->setText('<h1>Blocco centrale</h1>');
15
+ $this->_addLeft($leftBlock);
16
+ $this->_addContent($contentBlock);
17
+ $this->renderLayout();
18
+ }
19
+
20
  }
app/code/{local/HPO → community/Zikkio}/ZikkioAdminController/etc/config.xml RENAMED
@@ -1,32 +1,32 @@
1
- <?xml version="1.0"?>
2
- <config>
3
- <modules>
4
- <HPO_ZikkioAdminController>
5
- <version>1.0.0</version>
6
- <depends>
7
- <!-- no dependencies -->
8
- </depends>
9
- </HPO_ZikkioAdminController>
10
- </modules>
11
- <global>
12
- <events>
13
- <admin_system_config_section_save_after>
14
- <observers>
15
- <HPO_ZikkioAdminController_save_api_zikkio>
16
- <type>singleton</type>
17
- <class>HPO_ZikkioAdminController_Model_Observer</class>
18
- <method>saveApiKey</method>
19
- </HPO_ZikkioAdminController_save_api_zikkio>
20
- </observers>
21
- </admin_system_config_section_save_after>
22
- </events>
23
- <models>
24
- <ZikkioAdminController>
25
- <class>HPO_ZikkioAdminController_Model</class>
26
- </ZikkioAdminController>
27
- </models>
28
- <resources />
29
- <extraconfig />
30
- <blocks />
31
- </global>
32
  </config>
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 />
30
+ <blocks />
31
+ </global>
32
  </config>
app/code/{local/HPO → community/Zikkio}/ZikkioAdminController/etc/system.xml RENAMED
@@ -1,27 +1,27 @@
1
- <config>
2
- <sections>
3
- <catalog>
4
- <groups>
5
- <zikkio translate="label">
6
- <label>Zikkio</label>
7
- <frontend_type>text</frontend_type>
8
- <sort_order>50</sort_order>
9
- <show_in_default>1</show_in_default>
10
- <show_in_website>1</show_in_website>
11
- <show_in_store>1</show_in_store>
12
- <fields>
13
- <zikkio_api translate="label">
14
- <label>Please enter here your Zikkio API KEY</label>
15
- <frontend_type>text</frontend_type>
16
- <sort_order>50</sort_order>
17
- <show_in_default>1</show_in_default>
18
- <show_in_website>1</show_in_website>
19
- <show_in_store>1</show_in_store>
20
- <comment>Insert here the API KEY</comment>
21
- </zikkio_api>
22
- </fields>
23
- </zikkio>
24
- </groups>
25
- </catalog>
26
- </sections>
27
  </config>
1
+ <config>
2
+ <sections>
3
+ <catalog>
4
+ <groups>
5
+ <zikkio translate="label">
6
+ <label>Zikkio</label>
7
+ <frontend_type>text</frontend_type>
8
+ <sort_order>50</sort_order>
9
+ <show_in_default>1</show_in_default>
10
+ <show_in_website>1</show_in_website>
11
+ <show_in_store>1</show_in_store>
12
+ <fields>
13
+ <zikkio_api translate="label">
14
+ <label>Please enter here your Zikkio API KEY</label>
15
+ <frontend_type>text</frontend_type>
16
+ <sort_order>50</sort_order>
17
+ <show_in_default>1</show_in_default>
18
+ <show_in_website>1</show_in_website>
19
+ <show_in_store>1</show_in_store>
20
+ <comment>Insert here the API KEY</comment>
21
+ </zikkio_api>
22
+ </fields>
23
+ </zikkio>
24
+ </groups>
25
+ </catalog>
26
+ </sections>
27
  </config>
app/etc/modules/Zikkio_ZikkioAdminController.xml ADDED
@@ -0,0 +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>
bridge2cart/bridge.php CHANGED
@@ -3752,7 +3752,10 @@ class M1_Bridge
3752
 
3753
 
3754
 
3755
- define("M1_TOKEN", "ciao");
 
 
 
3756
  // good :)
3757
  } else {
3758
  die('ERROR_INVALID_TOKEN');
@@ -3826,7 +3829,10 @@ if (substr(phpversion(), 0, 1) == 5) {
3826
 
3827
 
3828
 
3829
- define("M1_TOKEN", "ciao");
 
 
 
3830
 
3831
  function stripslashes_array($array) {
3832
  return is_array($array) ? array_map('stripslashes_array', $array) : stripslashes($array);
3752
 
3753
 
3754
 
3755
+
3756
+
3757
+
3758
+ define("M1_TOKEN", "");
3759
  // good :)
3760
  } else {
3761
  die('ERROR_INVALID_TOKEN');
3829
 
3830
 
3831
 
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);
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Zikkio</name>
4
- <version>1.0.0</version>
5
  <stability>stable</stability>
6
  <license>Open Software License (OSL)</license>
7
  <channel>community</channel>
8
  <extends/>
9
- <summary>Zikkio module is the connector between your Magento and Zikkio service.</summary>
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>Paolo Morello</name><user>Zikkio</user><email>account@zikkio.com</email></author></authors>
13
- <date>2016-03-31</date>
14
- <time>08:55:58</time>
15
- <contents><target name="magelocal"><dir><dir name="HPO"><dir name="ZikkioAdminController"><dir name="Model"><file name="Observer.php" hash="ee1c1193342460e490b70e7b74c57b56"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="CustomController.php" hash="394222c6ca973beb16af93e18822f559"/></dir></dir><dir name="etc"><file name="config.xml" hash="8a092726d039eda632d0797679b9c92e"/><file name="system.xml" hash="256c0d51bb6fb236fbf9b314d0be6389"/></dir></dir></dir></dir></target><target name="mageweb"><dir name="bridge2cart"><file name="bridge.php" hash="7bbfb93ce76daf59f1214c9ebdf5dac8"/><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.1</version>
5
  <stability>stable</stability>
6
  <license>Open Software License (OSL)</license>
7
  <channel>community</channel>
8
  <extends/>
9
+ <summary>Import millions of products with a click and start trading with the power of drop-shipping.</summary>
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-14</date>
14
+ <time>14:30:34</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>