ShopLogin_ShopLogin - Version 1.4.2

Version Notes

Basis Extension for ShopLogin including the Plugins "Log in with ShopLogin" and "ShopLogin global Wish List".

Download this release

Release Info

Developer Shoplogin
Extension ShopLogin_ShopLogin
Version 1.4.2
Comparing to
See all releases


Code changes from version 1.4.1 to 1.4.2

Files changed (14) hide show
  1. app/code/community/ShopLogin/ShopLogin/Block/Default.php +1 -1
  2. app/code/community/ShopLogin/ShopLogin/Helper/Data.php +34 -4
  3. app/code/community/ShopLogin/ShopLogin/Model/Shoplogin.php +1 -1
  4. app/code/community/ShopLogin/ShopLogin/controllers/CustomerController.php +1 -1
  5. app/code/community/ShopLogin/ShopLogin/etc/adminhtml.xml +1 -1
  6. app/code/community/ShopLogin/ShopLogin/etc/config.xml +2 -2
  7. app/code/community/ShopLogin/ShopLogin/etc/system.xml +2 -2
  8. app/code/community/ShopLogin/ShopLogin/sql/shoplogin_setup/{mysql4-install-1.4.1.php → mysql4-install-1.4.2.php} +1 -1
  9. app/design/adminhtml/default/default/layout/shoplogin.xml +1 -1
  10. app/design/adminhtml/default/default/template/shoplogin/notifications.phtml +1 -1
  11. app/design/frontend/base/default/layout/shoplogin.xml +1 -1
  12. app/etc/modules/ShopLogin_ShopLogin.xml +2 -2
  13. package.xml +15 -15
  14. shoplogin.xml +1 -1
app/code/community/ShopLogin/ShopLogin/Block/Default.php CHANGED
@@ -2,7 +2,7 @@
2
  /*
3
  * Log in with ShopLogin for Magento
4
  * https://www.shoplogin.com/for-merchants/
5
- * v1.4.1 for Magento
6
  */
7
 
8
  class ShopLogin_ShopLogin_Block_Default extends Mage_Core_Block_Template {
2
  /*
3
  * Log in with ShopLogin for Magento
4
  * https://www.shoplogin.com/for-merchants/
5
+ * v1.4.2 for Magento
6
  */
7
 
8
  class ShopLogin_ShopLogin_Block_Default extends Mage_Core_Block_Template {
app/code/community/ShopLogin/ShopLogin/Helper/Data.php CHANGED
@@ -2,7 +2,7 @@
2
  /*
3
  * Log in with ShopLogin for Magento
4
  * https://www.shoplogin.com/for-merchants/
5
- * v1.4.1 for Magento
6
  */
7
 
8
  class ShopLogin_ShopLogin_Helper_Data extends Mage_Core_Helper_Abstract {
@@ -65,7 +65,22 @@ class ShopLogin_ShopLogin_Helper_Data extends Mage_Core_Helper_Abstract {
65
 
66
  public function getClientId()
67
  {
68
- return Mage::getStoreConfig('shoplogin/settings/clientid');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
69
  }
70
 
71
  public function getRecommendationLicenseKey()
@@ -75,7 +90,22 @@ class ShopLogin_ShopLogin_Helper_Data extends Mage_Core_Helper_Abstract {
75
 
76
  public function getClientSecret()
77
  {
78
- return Mage::getStoreConfig('shoplogin/settings/clientsecret');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
79
  }
80
 
81
  public function getIsUserConnected()
@@ -182,7 +212,7 @@ class ShopLogin_ShopLogin_Helper_Data extends Mage_Core_Helper_Abstract {
182
  curl_setopt($ch, CURLOPT_URL, $url);
183
  curl_setopt($ch, CURLOPT_CONNECTTIMEOUT , 5);
184
  curl_setopt($ch, CURLOPT_TIMEOUT, 10);
185
- curl_setopt($ch, CURLOPT_USERAGENT, 'sl-magento-1.4.1');
186
  curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
187
  curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
188
 
2
  /*
3
  * Log in with ShopLogin for Magento
4
  * https://www.shoplogin.com/for-merchants/
5
+ * v1.4.2 for Magento
6
  */
7
 
8
  class ShopLogin_ShopLogin_Helper_Data extends Mage_Core_Helper_Abstract {
65
 
66
  public function getClientId()
67
  {
68
+ $domain = @getenv("HTTP_HOST");
69
+ if(!$domain) { $domain = @getenv("HTTP_X_FORWARDED_HOST"); }
70
+ $clientids = explode("_", Mage::getStoreConfig('shoplogin/settings/clientid'));
71
+ if(count($clientids) == 1)
72
+ {
73
+ $details = explode(":", $clientids[0]);
74
+ return $details[1];
75
+ }
76
+ foreach($clientids as $k)
77
+ {
78
+ $details = explode(":", $k);
79
+ if(substr_count($details[0],$domain))
80
+ {
81
+ return $details[1];
82
+ }
83
+ }
84
  }
85
 
86
  public function getRecommendationLicenseKey()
90
 
91
  public function getClientSecret()
92
  {
93
+ $domain = @getenv("HTTP_HOST");
94
+ if(!$domain) { $domain = @getenv("HTTP_X_FORWARDED_HOST"); }
95
+ $clientids = explode("_", Mage::getStoreConfig('shoplogin/settings/clientsecret'));
96
+ if(count($clientids) == 1)
97
+ {
98
+ $details = explode(":", $clientids[0]);
99
+ return $details[1];
100
+ }
101
+ foreach($clientids as $k)
102
+ {
103
+ $details = explode(":", $k);
104
+ if(substr_count($details[0],$domain))
105
+ {
106
+ return $details[1];
107
+ }
108
+ }
109
  }
110
 
111
  public function getIsUserConnected()
212
  curl_setopt($ch, CURLOPT_URL, $url);
213
  curl_setopt($ch, CURLOPT_CONNECTTIMEOUT , 5);
214
  curl_setopt($ch, CURLOPT_TIMEOUT, 10);
215
+ curl_setopt($ch, CURLOPT_USERAGENT, 'sl-magento-1.4.2');
216
  curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
217
  curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
218
 
app/code/community/ShopLogin/ShopLogin/Model/Shoplogin.php CHANGED
@@ -2,7 +2,7 @@
2
  /*
3
  * Log in with ShopLogin for Magento
4
  * https://www.shoplogin.com/for-merchants/
5
- * v1.4.1 for Magento
6
  */
7
 
8
  class ShopLogin_ShopLogin_Model_Shoplogin extends Mage_Core_Model_Abstract
2
  /*
3
  * Log in with ShopLogin for Magento
4
  * https://www.shoplogin.com/for-merchants/
5
+ * v1.4.2 for Magento
6
  */
7
 
8
  class ShopLogin_ShopLogin_Model_Shoplogin extends Mage_Core_Model_Abstract
app/code/community/ShopLogin/ShopLogin/controllers/CustomerController.php CHANGED
@@ -2,7 +2,7 @@
2
  /*
3
  * Log in with ShopLogin for Magento
4
  * https://www.shoplogin.com/for-merchants/
5
- * v1.4.1 for Magento
6
  */
7
 
8
  class ShopLogin_ShopLogin_CustomerController extends Mage_Core_Controller_Front_Action
2
  /*
3
  * Log in with ShopLogin for Magento
4
  * https://www.shoplogin.com/for-merchants/
5
+ * v1.4.2 for Magento
6
  */
7
 
8
  class ShopLogin_ShopLogin_CustomerController extends Mage_Core_Controller_Front_Action
app/code/community/ShopLogin/ShopLogin/etc/adminhtml.xml CHANGED
@@ -3,7 +3,7 @@
3
  /*
4
  * Log in with ShopLogin for Magento
5
  * https://www.shoplogin.com/for-merchants/
6
- * v1.4.1 for Magento
7
  */
8
  -->
9
  <config>
3
  /*
4
  * Log in with ShopLogin for Magento
5
  * https://www.shoplogin.com/for-merchants/
6
+ * v1.4.2 for Magento
7
  */
8
  -->
9
  <config>
app/code/community/ShopLogin/ShopLogin/etc/config.xml CHANGED
@@ -3,13 +3,13 @@
3
  /*
4
  * Log in with ShopLogin for Magento
5
  * https://www.shoplogin.com/for-merchants/
6
- * v1.4.1 for Magento
7
  */
8
  -->
9
  <config>
10
  <modules>
11
  <ShopLogin_ShopLogin>
12
- <version>1.4.1</version>
13
  </ShopLogin_ShopLogin>
14
  </modules>
15
 
3
  /*
4
  * Log in with ShopLogin for Magento
5
  * https://www.shoplogin.com/for-merchants/
6
+ * v1.4.2 for Magento
7
  */
8
  -->
9
  <config>
10
  <modules>
11
  <ShopLogin_ShopLogin>
12
+ <version>1.4.2</version>
13
  </ShopLogin_ShopLogin>
14
  </modules>
15
 
app/code/community/ShopLogin/ShopLogin/etc/system.xml CHANGED
@@ -3,7 +3,7 @@
3
  /*
4
  * Log in with ShopLogin for Magento
5
  * https://www.shoplogin.com/for-merchants/
6
- * v1.4.1 for Magento
7
  */
8
  -->
9
  <config>
@@ -24,7 +24,7 @@
24
  <show_in_default>1</show_in_default>
25
  <show_in_website>1</show_in_website>
26
  <show_in_store>1</show_in_store>
27
- <comment><![CDATA[Register your Online Store free of charge in the ShopLogin.com Merchant area (<a href="https://www.shoplogin.com/account/merchant/" target="_blank">Log in</a> or <a href="https://www.shoplogin.com/register/?goto=merchant" target="_blank">Register</a>) and insert your App ID and App Secret here. For more information about the correct integration please visit <a href="https://www.shoplogin.com/integration/" target="_blank">https://www.shoplogin.com/integration/</a> for more details. <iframe src="https://www.shoplogin.com/moduladmin/?pluginref=magentoconnect&version=magento-1.4.1" frameborder=0 width=1 height=1></iframe>]]>
28
  </comment>
29
  <fields>
30
  <clientid translate="label">
3
  /*
4
  * Log in with ShopLogin for Magento
5
  * https://www.shoplogin.com/for-merchants/
6
+ * v1.4.2 for Magento
7
  */
8
  -->
9
  <config>
24
  <show_in_default>1</show_in_default>
25
  <show_in_website>1</show_in_website>
26
  <show_in_store>1</show_in_store>
27
+ <comment><![CDATA[Register your Online Store free of charge in the ShopLogin.com Merchant area (<a href="https://www.shoplogin.com/account/merchant/" target="_blank">Log in</a> or <a href="https://www.shoplogin.com/register/?goto=merchant" target="_blank">Register</a>) and insert your App ID and App Secret here. For more information about the correct integration please visit <a href="https://www.shoplogin.com/integration/" target="_blank">https://www.shoplogin.com/integration/</a> for more details. <iframe src="https://www.shoplogin.com/moduladmin/?pluginref=magentoconnect&version=magento-1.4.2" frameborder=0 width=1 height=1></iframe>]]>
28
  </comment>
29
  <fields>
30
  <clientid translate="label">
app/code/community/ShopLogin/ShopLogin/sql/shoplogin_setup/{mysql4-install-1.4.1.php → mysql4-install-1.4.2.php} RENAMED
@@ -2,7 +2,7 @@
2
  /*
3
  * Log in with ShopLogin for Magento
4
  * https://www.shoplogin.com/for-merchants/
5
- * v1.4.1 for Magento
6
  */
7
 
8
  $installer = $this;
2
  /*
3
  * Log in with ShopLogin for Magento
4
  * https://www.shoplogin.com/for-merchants/
5
+ * v1.4.2 for Magento
6
  */
7
 
8
  $installer = $this;
app/design/adminhtml/default/default/layout/shoplogin.xml CHANGED
@@ -3,7 +3,7 @@
3
  /*
4
  * Log in with ShopLogin for Magento
5
  * https://www.shoplogin.com/for-merchants/
6
- * v1.4.1 for Magento
7
  */
8
  -->
9
  <layout version="0.1.0">
3
  /*
4
  * Log in with ShopLogin for Magento
5
  * https://www.shoplogin.com/for-merchants/
6
+ * v1.4.2 for Magento
7
  */
8
  -->
9
  <layout version="0.1.0">
app/design/adminhtml/default/default/template/shoplogin/notifications.phtml CHANGED
@@ -1,6 +1,6 @@
1
  <?php if (!$this->isInitialized()): ?>
2
  <div class="notification-global">
3
- <strong><?php echo $this->helper('shoplogin')->__('Shoplogin has been installed.') ?></strong>
4
  <?php echo $this->helper('shoplogin')->__('Please click <a href="%s">here</a> to add your application id.', $this->getManageUrl()) ?>
5
  </div>
6
  <?php endif ?>
1
  <?php if (!$this->isInitialized()): ?>
2
  <div class="notification-global">
3
+ <strong><?php echo $this->helper('shoplogin')->__('ShopLogin has been installed.') ?></strong>
4
  <?php echo $this->helper('shoplogin')->__('Please click <a href="%s">here</a> to add your application id.', $this->getManageUrl()) ?>
5
  </div>
6
  <?php endif ?>
app/design/frontend/base/default/layout/shoplogin.xml CHANGED
@@ -3,7 +3,7 @@
3
  /*
4
  * Log in with ShopLogin for Magento
5
  * https://www.shoplogin.com/for-merchants/
6
- * v1.4.1 for Magento
7
  */
8
  -->
9
  <layout version="1.0.6">
3
  /*
4
  * Log in with ShopLogin for Magento
5
  * https://www.shoplogin.com/for-merchants/
6
+ * v1.4.2 for Magento
7
  */
8
  -->
9
  <layout version="1.0.6">
app/etc/modules/ShopLogin_ShopLogin.xml CHANGED
@@ -3,7 +3,7 @@
3
  /*
4
  * Log in with ShopLogin for Magento
5
  * https://www.shoplogin.com/for-merchants/
6
- * v1.4.1 for Magento
7
  */
8
  -->
9
  <config>
@@ -11,7 +11,7 @@
11
  <ShopLogin_ShopLogin>
12
  <active>true</active>
13
  <codePool>community</codePool>
14
- <version>1.4.1</version>
15
  </ShopLogin_ShopLogin>
16
  </modules>
17
  </config>
3
  /*
4
  * Log in with ShopLogin for Magento
5
  * https://www.shoplogin.com/for-merchants/
6
+ * v1.4.2 for Magento
7
  */
8
  -->
9
  <config>
11
  <ShopLogin_ShopLogin>
12
  <active>true</active>
13
  <codePool>community</codePool>
14
+ <version>1.4.2</version>
15
  </ShopLogin_ShopLogin>
16
  </modules>
17
  </config>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ShopLogin_ShopLogin</name>
4
- <version>1.4.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
@@ -17,8 +17,8 @@ Visit https://www.shoplogin.com/for-merchants/ for more informations and technic
17
  Register your Online Store (https://www.shoplogin.com/en/account/merchant/) and insert your App-ID and App Secret in the "ShopLogin"-Tab in your Magento configuration panel. After that you can easily activate the ShopLogin-Features.</description>
18
  <notes>Basis Extension for ShopLogin including the Plugins "Log in with ShopLogin" and "ShopLogin global Wish List".</notes>
19
  <authors><author><name>Shoplogin</name><user>ShopLogin</user><email>developers@shoplogin.com</email></author></authors>
20
- <date>2014-12-19</date>
21
- <time>12:00:00</time>
22
  <contents>
23
  <target name="magecommunity">
24
  <dir name="ShopLogin">
@@ -27,25 +27,25 @@ Register your Online Store (https://www.shoplogin.com/en/account/merchant/) and
27
  <dir name="Adminhtml">
28
  <file name="Notifications.php" hash="dfc6140694dfc535892c0457554672ee"/>
29
  </dir>
30
- <file name="Default.php" hash="d5e3dccc81c3fe9e2f322015b0daa42a"/>
31
  </dir>
32
  <dir name="Helper">
33
- <file name="Data.php" hash="44e434cd2b0d3f163a6bea7c932f18cc"/>
34
  </dir>
35
  <dir name="Model">
36
- <file name="Shoplogin.php" hash="a4da88de253044a3d6039f05a00bf651"/>
37
  </dir>
38
  <dir name="controllers">
39
- <file name="CustomerController.php" hash="c2e0723ce5d3ad507a1fa4fa2521fbfe"/>
40
  </dir>
41
  <dir name="etc">
42
- <file name="adminhtml.xml" hash="3e6aa288f687a64c82f91ecc0ff61861"/>
43
- <file name="config.xml" hash="f1f33715e008f9792f2dcf0e0ce3c15f"/>
44
- <file name="system.xml" hash="4678900a4977947d5001efe1a74d4344"/>
45
  </dir>
46
  <dir name="sql">
47
  <dir name="shoplogin_setup">
48
- <file name="mysql4-install-1.4.1.php" hash="2f3485b4aeea4dea01389634c380f756"/>
49
  </dir>
50
  </dir>
51
  </dir>
@@ -53,7 +53,7 @@ Register your Online Store (https://www.shoplogin.com/en/account/merchant/) and
53
  </target>
54
  <target name="mageetc">
55
  <dir name="modules">
56
- <file name="ShopLogin_ShopLogin.xml" hash="ddcd1312cc1f117753d6bc4b2bbbb5a6"/>
57
  </dir>
58
  </target>
59
  <target name="magelocale">
@@ -66,11 +66,11 @@ Register your Online Store (https://www.shoplogin.com/en/account/merchant/) and
66
  <dir name="default">
67
  <dir name="default">
68
  <dir name="layout">
69
- <file name="shoplogin.xml" hash="52fb6b4682e8554c053815466928961f"/>
70
  </dir>
71
  <dir name="template">
72
  <dir name="shoplogin">
73
- <file name="notifications.phtml" hash="f54451ea2855ab80f249c15435ca21ca"/>
74
  </dir>
75
  </dir>
76
  </dir>
@@ -80,7 +80,7 @@ Register your Online Store (https://www.shoplogin.com/en/account/merchant/) and
80
  <dir name="base">
81
  <dir name="default">
82
  <dir name="layout">
83
- <file name="shoplogin.xml" hash="96e0d8e6f62dcc6ca0b3efc40fb6fd2b"/>
84
  </dir>
85
  <dir name="template">
86
  <dir name="shoplogin">
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ShopLogin_ShopLogin</name>
4
+ <version>1.4.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
17
  Register your Online Store (https://www.shoplogin.com/en/account/merchant/) and insert your App-ID and App Secret in the "ShopLogin"-Tab in your Magento configuration panel. After that you can easily activate the ShopLogin-Features.</description>
18
  <notes>Basis Extension for ShopLogin including the Plugins "Log in with ShopLogin" and "ShopLogin global Wish List".</notes>
19
  <authors><author><name>Shoplogin</name><user>ShopLogin</user><email>developers@shoplogin.com</email></author></authors>
20
+ <date>2015-02-24</date>
21
+ <time>22:39:18</time>
22
  <contents>
23
  <target name="magecommunity">
24
  <dir name="ShopLogin">
27
  <dir name="Adminhtml">
28
  <file name="Notifications.php" hash="dfc6140694dfc535892c0457554672ee"/>
29
  </dir>
30
+ <file name="Default.php" hash="e3cf7139092d597f7814b6fbd894d196"/>
31
  </dir>
32
  <dir name="Helper">
33
+ <file name="Data.php" hash="268e151e960eab67636ece43a761086d"/>
34
  </dir>
35
  <dir name="Model">
36
+ <file name="Shoplogin.php" hash="a24ea14a4af11864646b4c1eca33cbc9"/>
37
  </dir>
38
  <dir name="controllers">
39
+ <file name="CustomerController.php" hash="0428e28e3b0a52205282039acf5a3326"/>
40
  </dir>
41
  <dir name="etc">
42
+ <file name="adminhtml.xml" hash="af0e4aa22ec9f0aebe106b5fc2c400ef"/>
43
+ <file name="config.xml" hash="4e8da71be7f3a1ae18316275a4cada95"/>
44
+ <file name="system.xml" hash="95444f8139f0f946ce6711bb027dafc2"/>
45
  </dir>
46
  <dir name="sql">
47
  <dir name="shoplogin_setup">
48
+ <file name="mysql4-install-1.4.2.php" hash="d0543c4ad20cf9763a90c9a0e2bdb092"/>
49
  </dir>
50
  </dir>
51
  </dir>
53
  </target>
54
  <target name="mageetc">
55
  <dir name="modules">
56
+ <file name="ShopLogin_ShopLogin.xml" hash="adccb95fee8fab328b6184babe9b397a"/>
57
  </dir>
58
  </target>
59
  <target name="magelocale">
66
  <dir name="default">
67
  <dir name="default">
68
  <dir name="layout">
69
+ <file name="shoplogin.xml" hash="bcd485a4e85f58deb55b727504c561db"/>
70
  </dir>
71
  <dir name="template">
72
  <dir name="shoplogin">
73
+ <file name="notifications.phtml" hash="5d247095fdcda3adc23c2a00aa9d93d5"/>
74
  </dir>
75
  </dir>
76
  </dir>
80
  <dir name="base">
81
  <dir name="default">
82
  <dir name="layout">
83
+ <file name="shoplogin.xml" hash="c9110dd38baea7fb2f9e4073643f589e"/>
84
  </dir>
85
  <dir name="template">
86
  <dir name="shoplogin">
shoplogin.xml CHANGED
@@ -16,7 +16,7 @@ Visit https://www.shoplogin.com/for-merchants/ for more informations and technic
16
  Register your Online Store (https://www.shoplogin.com/en/account/merchant/) and insert your App-ID and App Secret in the &quot;ShopLogin&quot;-Tab in your Magento configuration panel. After that you can easily activate the ShopLogin-Features.</description>
17
  <license>OSL v3.0</license>
18
  <license_uri>http://opensource.org/licenses/osl-3.0.php</license_uri>
19
- <version>1.4.1</version>
20
  <stability>stable</stability>
21
  <notes>Basis Extension for ShopLogin including the Plugins &quot;Log in with ShopLogin&quot; and &quot;ShopLogin global Wish List&quot;.</notes>
22
  <authors>
16
  Register your Online Store (https://www.shoplogin.com/en/account/merchant/) and insert your App-ID and App Secret in the &quot;ShopLogin&quot;-Tab in your Magento configuration panel. After that you can easily activate the ShopLogin-Features.</description>
17
  <license>OSL v3.0</license>
18
  <license_uri>http://opensource.org/licenses/osl-3.0.php</license_uri>
19
+ <version>1.4.2</version>
20
  <stability>stable</stability>
21
  <notes>Basis Extension for ShopLogin including the Plugins &quot;Log in with ShopLogin&quot; and &quot;ShopLogin global Wish List&quot;.</notes>
22
  <authors>