Plumrocket_Twitter_Facebook_Login - Version 1.0.1

Version Notes

Made minor modifications

Download this release

Release Info

Developer Plumrocket Team
Extension Plumrocket_Twitter_Facebook_Login
Version 1.0.1
Comparing to
See all releases


Code changes from version 1.0.0 to 1.0.1

Files changed (14) hide show
  1. app/code/community/Plumrocket/SocialLogin/Block/Buttons.php +1 -1
  2. app/code/community/Plumrocket/SocialLogin/Block/Page/Html/Welcome.php +1 -12
  3. app/code/community/Plumrocket/SocialLogin/Helper/Data.php +23 -5
  4. app/code/community/Plumrocket/SocialLogin/Model/Account.php +14 -12
  5. app/code/community/Plumrocket/SocialLogin/Model/Facebook.php +2 -2
  6. app/code/community/Plumrocket/SocialLogin/Model/Observer.php +5 -1
  7. app/code/community/Plumrocket/SocialLogin/Model/Twitter.php +1 -1
  8. app/code/community/Plumrocket/SocialLogin/controllers/AccountController.php +2 -1
  9. app/code/community/Plumrocket/SocialLogin/etc/config.xml +1 -1
  10. app/code/community/Plumrocket/SocialLogin/etc/system.xml +3 -3
  11. app/design/frontend/base/default/layout/pslogin.xml +15 -0
  12. app/etc/modules/Plumrocket_SocialLogin.xml +1 -1
  13. package.xml +6 -6
  14. skin/frontend/base/default/js/plumrocket/pslogin/pslogin.js +5 -5
app/code/community/Plumrocket/SocialLogin/Block/Buttons.php CHANGED
@@ -96,7 +96,7 @@ class Plumrocket_SocialLogin_Block_Buttons extends Mage_Core_Block_Template
96
  public function showLoginFullButtons()
97
  {
98
  $visible = $this->getPreparedButtons('visible');
99
- return count($visible) <= 3;
100
  }
101
 
102
  public function showRegisterFullButtons()
96
  public function showLoginFullButtons()
97
  {
98
  $visible = $this->getPreparedButtons('visible');
99
+ return count($visible) <= 6;
100
  }
101
 
102
  public function showRegisterFullButtons()
app/code/community/Plumrocket/SocialLogin/Block/Page/Html/Welcome.php CHANGED
@@ -36,18 +36,7 @@ class Plumrocket_SocialLogin_Block_Page_Html_Welcome extends Mage_Page_Block_Htm
36
 
37
  public function getPhotoPath()
38
  {
39
- if(!$customerId = Mage::getSingleton('customer/session')->getCustomerId()) {
40
- return false;
41
- }
42
-
43
- $path = Mage::getBaseDir(Mage_Core_Model_Store::URL_TYPE_MEDIA) . DS .'pslogin'. DS .'photo'. DS . $customerId .'.'. Plumrocket_SocialLogin_Model_Account::PHOTO_FILE_EXT;
44
- $pathUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_MEDIA) .'pslogin/photo/' . $customerId .'.'. Plumrocket_SocialLogin_Model_Account::PHOTO_FILE_EXT;
45
-
46
- if(!file_exists($path)) {
47
- return false;
48
- }
49
-
50
- return $pathUrl;
51
  }
52
 
53
  }
36
 
37
  public function getPhotoPath()
38
  {
39
+ return Mage::helper('pslogin')->getPhotoPath(false);
 
 
 
 
 
 
 
 
 
 
 
40
  }
41
 
42
  }
app/code/community/Plumrocket/SocialLogin/Helper/Data.php CHANGED
@@ -59,6 +59,26 @@ class Plumrocket_SocialLogin_Helper_Data extends Mage_Core_Helper_Abstract
59
  return $this->moduleEnabled() && Mage::getStoreConfig('pslogin/general/enable_photo');
60
  }
61
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
62
  public function isGlobalScope()
63
  {
64
  return Mage::getSingleton('customer/customer')->getSharingConfig()->isGlobalScope();
@@ -184,17 +204,15 @@ class Plumrocket_SocialLogin_Helper_Data extends Mage_Core_Helper_Abstract
184
 
185
  public function isUrlInternal($url)
186
  {
187
- if (strpos($url, 'http') !== false) {
188
- /**
189
- * Url must start from base secure or base unsecure url
190
- */
191
  if ((strpos($url, Mage::app()->getStore()->getBaseUrl()) === 0)
192
  || (strpos($url, Mage::app()->getStore()->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK, true)) === 0)
193
  ) {
194
  return true;
195
  }
196
  }
197
- return false;
198
  }
199
 
200
  public function moduleInvitationsEnabled()
59
  return $this->moduleEnabled() && Mage::getStoreConfig('pslogin/general/enable_photo');
60
  }
61
 
62
+ public function getPhotoPath($checkIsEnabled = true)
63
+ {
64
+ if($checkIsEnabled && !$this->photoEnabled()) {
65
+ return false;
66
+ }
67
+
68
+ if(!$customerId = Mage::getSingleton('customer/session')->getCustomerId()) {
69
+ return false;
70
+ }
71
+
72
+ $path = Mage::getBaseDir(Mage_Core_Model_Store::URL_TYPE_MEDIA) . DS .'pslogin'. DS .'photo'. DS . $customerId .'.'. Plumrocket_SocialLogin_Model_Account::PHOTO_FILE_EXT;
73
+ $pathUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_MEDIA) .'pslogin/photo/' . $customerId .'.'. Plumrocket_SocialLogin_Model_Account::PHOTO_FILE_EXT;
74
+
75
+ if(!file_exists($path)) {
76
+ return false;
77
+ }
78
+
79
+ return $pathUrl;
80
+ }
81
+
82
  public function isGlobalScope()
83
  {
84
  return Mage::getSingleton('customer/customer')->getSharingConfig()->isGlobalScope();
204
 
205
  public function isUrlInternal($url)
206
  {
207
+ return (stripos($url, 'http') === 0);
208
+ /*if (strpos($url, 'http') !== false) {
 
 
209
  if ((strpos($url, Mage::app()->getStore()->getBaseUrl()) === 0)
210
  || (strpos($url, Mage::app()->getStore()->getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK, true)) === 0)
211
  ) {
212
  return true;
213
  }
214
  }
215
+ return false;*/
216
  }
217
 
218
  public function moduleInvitationsEnabled()
app/code/community/Plumrocket/SocialLogin/Model/Account.php CHANGED
@@ -40,7 +40,7 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
40
  {
41
  $this->_init('pslogin/account');
42
  $this->_websiteId = Mage::app()->getStore()->getWebsiteId();
43
- $this->_redirectUri = Mage::getBaseUrl() .'pslogin/account/login/type/'. $this->_type;
44
  $this->_photoDir = Mage::getBaseDir('media') . DS .'pslogin'. DS .'photo';
45
 
46
  $this->_applicationId = trim(Mage::getStoreConfig('pslogin/'. $this->_type .'/application_id'));
@@ -214,7 +214,7 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
214
  return $result;
215
  }
216
 
217
- protected function _prepareData(array $data)
218
  {
219
  $_data = array();
220
  foreach ($this->_fields as $customerField => $userField) {
@@ -291,14 +291,14 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
291
  return;
292
  }
293
 
294
- try{
295
- if($content = file_get_contents($fileUrl)) {
296
- $tmpPath = $this->_photoDir . DS . $customerId .'.tmp';
297
-
298
- $io = new Varien_Io_File();
299
- $io->mkdir($this->_photoDir);
300
 
301
- if(file_put_contents($tmpPath, $content) > 0) {
 
 
 
 
302
  $image = new Varien_Image($tmpPath);
303
  $image->resize($this->_photoSize);
304
 
@@ -307,10 +307,12 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
307
 
308
  $upload = true;
309
  }
310
-
311
- $io->rm($tmpPath);
312
  }
313
- } catch(Exception $e) {}
 
 
 
 
314
 
315
  return $upload;
316
  }
40
  {
41
  $this->_init('pslogin/account');
42
  $this->_websiteId = Mage::app()->getStore()->getWebsiteId();
43
+ $this->_redirectUri = Mage::getUrl('pslogin/account/login', array('type' => $this->_type, '_nosid' => true));
44
  $this->_photoDir = Mage::getBaseDir('media') . DS .'pslogin'. DS .'photo';
45
 
46
  $this->_applicationId = trim(Mage::getStoreConfig('pslogin/'. $this->_type .'/application_id'));
214
  return $result;
215
  }
216
 
217
+ protected function _prepareData($data)
218
  {
219
  $_data = array();
220
  foreach ($this->_fields as $customerField => $userField) {
291
  return;
292
  }
293
 
294
+ $tmpPath = $this->_photoDir . DS . $customerId .'.tmp';
295
+ $io = new Varien_Io_File();
 
 
 
 
296
 
297
+ try{
298
+ $io->mkdir($this->_photoDir);
299
+ if($file = file_get_contents($fileUrl)) {
300
+ if(file_put_contents($tmpPath, $file) > 0) {
301
+
302
  $image = new Varien_Image($tmpPath);
303
  $image->resize($this->_photoSize);
304
 
307
 
308
  $upload = true;
309
  }
 
 
310
  }
311
+ }catch(Exception $e) {}
312
+
313
+ if(file_exists($tmpPath)) {
314
+ $io->rm($tmpPath);
315
+ }
316
 
317
  return $upload;
318
  }
app/code/community/Plumrocket/SocialLogin/Model/Facebook.php CHANGED
@@ -52,7 +52,7 @@ class Plumrocket_SocialLogin_Model_Facebook extends Plumrocket_SocialLogin_Model
52
 
53
  public function loadUserData($response)
54
  {
55
- if(!trim($response)) {
56
  return false;
57
  }
58
 
@@ -95,7 +95,7 @@ class Plumrocket_SocialLogin_Model_Facebook extends Plumrocket_SocialLogin_Model
95
  return true;
96
  }
97
 
98
- protected function _prepareData(array $data)
99
  {
100
  if(empty($data['id'])) {
101
  return false;
52
 
53
  public function loadUserData($response)
54
  {
55
+ if(empty($response)) {
56
  return false;
57
  }
58
 
95
  return true;
96
  }
97
 
98
+ protected function _prepareData($data)
99
  {
100
  if(empty($data['id'])) {
101
  return false;
app/code/community/Plumrocket/SocialLogin/Model/Observer.php CHANGED
@@ -78,7 +78,11 @@ class Plumrocket_SocialLogin_Model_Observer
78
  if(!empty($data['provider']) && !empty($data['timeout']) && $data['timeout'] > time()) {
79
  $model = Mage::getSingleton("pslogin/{$data['provider']}");
80
 
81
- $customerId = $observer->getCustomer()->getId();
 
 
 
 
82
  if($customerId) {
83
  $model->setUserData($data);
84
 
78
  if(!empty($data['provider']) && !empty($data['timeout']) && $data['timeout'] > time()) {
79
  $model = Mage::getSingleton("pslogin/{$data['provider']}");
80
 
81
+ $customerId = null;
82
+ if($customer = $observer->getCustomer()) {
83
+ $customerId = $customer->getId();
84
+ }
85
+
86
  if($customerId) {
87
  $model->setUserData($data);
88
 
app/code/community/Plumrocket/SocialLogin/Model/Twitter.php CHANGED
@@ -193,7 +193,7 @@ class Plumrocket_SocialLogin_Model_Twitter extends Plumrocket_SocialLogin_Model_
193
  return $result;
194
  }
195
 
196
- protected function _prepareData(array $data)
197
  {
198
  if(empty($data['id'])) {
199
  return false;
193
  return $result;
194
  }
195
 
196
+ protected function _prepareData($data)
197
  {
198
  if(empty($data['id'])) {
199
  return false;
app/code/community/Plumrocket/SocialLogin/controllers/AccountController.php CHANGED
@@ -138,7 +138,8 @@ class Plumrocket_SocialLogin_AccountController extends Mage_Core_Controller_Fron
138
 
139
  protected function _windowClose()
140
  {
141
- $this->getResponse()->setBody('<script type="text/javascript">if(window.name == "pslogin_popup") { window.close(); }</script>');
 
142
  return true;
143
  }
144
 
138
 
139
  protected function _windowClose()
140
  {
141
+ $this->getResponse()->setBody('<script type="text/javascript">window.close();</script>');
142
+ // $this->getResponse()->setBody('<script type="text/javascript">if(window.name == "pslogin_popup") { window.close(); }</script>');
143
  return true;
144
  }
145
 
app/code/community/Plumrocket/SocialLogin/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Plumrocket_SocialLogin>
5
- <version>1.0.0</version>
6
  </Plumrocket_SocialLogin>
7
  </modules>
8
  <frontend>
2
  <config>
3
  <modules>
4
  <Plumrocket_SocialLogin>
5
+ <version>1.0.1</version>
6
  </Plumrocket_SocialLogin>
7
  </modules>
8
  <frontend>
app/code/community/Plumrocket/SocialLogin/etc/system.xml CHANGED
@@ -237,7 +237,7 @@
237
  <show_in_default>1</show_in_default>
238
  <show_in_website>1</show_in_website>
239
  <show_in_store>1</show_in_store>
240
- <comment>For configuration instructions, please &lt;a href="http://wiki.plumrocket.com/wiki/Magento_Twitter_and_Facebook_Login_v1.x_Facebook_Login_Configuration" target="_blank"&gt;click here&lt;/a&gt;.</comment>
241
  </enable>
242
  <application_id translate="label">
243
  <label>Application ID</label>
@@ -327,7 +327,7 @@
327
  <show_in_default>1</show_in_default>
328
  <show_in_website>1</show_in_website>
329
  <show_in_store>1</show_in_store>
330
- <comment>For configuration instructions, please &lt;a href="http://wiki.plumrocket.com/wiki/Magento_Twitter_and_Facebook_Login_v1.x_Twitter_Login_Configuration" target="_blank"&gt;click here&lt;/a&gt;.</comment>
331
  </enable>
332
  <application_id translate="label">
333
  <label>Consumer key (API Key)</label>
@@ -600,7 +600,7 @@
600
  </foursquare>
601
 
602
  <dropbox>
603
- <label>DropBox</label>
604
  <sort_order>170</sort_order>
605
  <frontend_type>text</frontend_type>
606
  <show_in_default>1</show_in_default>
237
  <show_in_default>1</show_in_default>
238
  <show_in_website>1</show_in_website>
239
  <show_in_store>1</show_in_store>
240
+ <comment>For configuration instructions, please &lt;a href="http://wiki.plumrocket.com/wiki/Magento_Facebook_Login_Configuration" target="_blank"&gt;click here&lt;/a&gt;.</comment>
241
  </enable>
242
  <application_id translate="label">
243
  <label>Application ID</label>
327
  <show_in_default>1</show_in_default>
328
  <show_in_website>1</show_in_website>
329
  <show_in_store>1</show_in_store>
330
+ <comment>For configuration instructions, please &lt;a href="http://wiki.plumrocket.com/wiki/Magento_Twitter_Login_Configuration" target="_blank"&gt;click here&lt;/a&gt;.</comment>
331
  </enable>
332
  <application_id translate="label">
333
  <label>Consumer key (API Key)</label>
600
  </foursquare>
601
 
602
  <dropbox>
603
+ <label>Dropbox</label>
604
  <sort_order>170</sort_order>
605
  <frontend_type>text</frontend_type>
606
  <show_in_default>1</show_in_default>
app/design/frontend/base/default/layout/pslogin.xml CHANGED
@@ -11,6 +11,12 @@
11
  <block type="pslogin/share" name="pslogin.customer.form.register.sharepopup" as="pslogin_sharepopup" template="pslogin/customer/form/register/sharepopup.phtml" before="content" />
12
  <block type="pslogin/general" name="pslogin_general" />
13
  </reference>
 
 
 
 
 
 
14
  </default>
15
 
16
  <customer_account_login translate="label">
@@ -44,6 +50,15 @@
44
  </reference>
45
  </checkout_onepage_index>
46
 
 
 
 
 
 
 
 
 
 
47
  <!-- <pslogin_account_sharedata>
48
  <reference name="root">
49
  <action ifconfig="pslogin/general/enable" method="setTemplate"><template>pslogin/customer/form/register/sharedata.phtml</template></action>
11
  <block type="pslogin/share" name="pslogin.customer.form.register.sharepopup" as="pslogin_sharepopup" template="pslogin/customer/form/register/sharepopup.phtml" before="content" />
12
  <block type="pslogin/general" name="pslogin_general" />
13
  </reference>
14
+ <reference name="popuplogin_form_login">
15
+ <block type="pslogin/buttons" name="pslogin.customer.form.login.buttons" as="pslogin_buttons" template="pslogin/customer/form/login/buttons.phtml" />
16
+ </reference>
17
+ <reference name="popuplogin_form_register">
18
+ <block type="pslogin/buttons" name="pslogin.customer.form.register.buttons" as="pslogin_buttons" template="pslogin/customer/form/register/buttons.phtml" />
19
+ </reference>
20
  </default>
21
 
22
  <customer_account_login translate="label">
50
  </reference>
51
  </checkout_onepage_index>
52
 
53
+ <privatesales_splashpage_login translate="label">
54
+ <reference name="splashpage_form_login">
55
+ <block type="pslogin/buttons" name="pslogin.customer.form.login.buttons" as="pslogin_buttons" template="pslogin/customer/form/login/buttons.phtml" />
56
+ </reference>
57
+ <reference name="splashpage_form_register">
58
+ <block type="pslogin/buttons" name="pslogin.customer.form.register.buttons" as="pslogin_buttons" template="pslogin/customer/form/register/buttons.phtml" />
59
+ </reference>
60
+ </privatesales_splashpage_login>
61
+
62
  <!-- <pslogin_account_sharedata>
63
  <reference name="root">
64
  <action ifconfig="pslogin/general/enable" method="setTemplate"><template>pslogin/customer/form/register/sharedata.phtml</template></action>
app/etc/modules/Plumrocket_SocialLogin.xml CHANGED
@@ -4,7 +4,7 @@
4
  <Plumrocket_SocialLogin>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
- <version>1.0.0</version>
8
  <name>Twitter &amp; Facebook Login</name>
9
  <wiki>http://wiki.plumrocket.com/wiki/Magento_Twitter_and_Facebook_Login_v1.x_Extension</wiki>
10
  <depends>
4
  <Plumrocket_SocialLogin>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
+ <version>1.0.1</version>
8
  <name>Twitter &amp; Facebook Login</name>
9
  <wiki>http://wiki.plumrocket.com/wiki/Magento_Twitter_and_Facebook_Login_v1.x_Extension</wiki>
10
  <depends>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Plumrocket_Twitter_Facebook_Login</name>
4
- <version>1.0.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://wiki.plumrocket.net/wiki/EULA">End-user License Agreement</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Plumrocket Twitter &amp; Facebook Login v1.x was designed to help online store owners reach as many customers as possible. Offering facebook login or twitter login as registration options is a proven tool to increase the number of clients.</summary>
10
- <description>Facebook login &amp;amp; Twitter Login is a free magento extension that will let online store owners benefit from all the social media advantages. It helps to increase conversion rates by allowing your customers quickly login and place order.</description>
11
- <notes>Provide a combination of both Magento Facebook login extension and magento Twitter login extension completely free of charge.</notes>
12
  <authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
13
- <date>2014-11-25</date>
14
- <time>10:00:12</time>
15
- <contents><target name="mageetc"><dir name="modules"><file name="Plumrocket_SocialLogin.xml" hash="10a122334d6d10f73376eeebeba05699"/></dir></target><target name="magecommunity"><dir name="Plumrocket"><dir name="SocialLogin"><dir name="Block"><file name="Buttons.php" hash="788d98adb37d7e32a3e7c7ebfe84a7db"/><file name="General.php" hash="d259fedff67cc632b9847783a0d77326"/><dir name="Page"><dir name="Html"><file name="Welcome.php" hash="06638b250f672343e2e5c5f717775a88"/></dir></dir><file name="Share.php" hash="8447182219873dee7caaf620950157e4"/><dir name="System"><dir name="Config"><file name="Notinstalled.php" hash="c263ec689c84b028dc4abdf06c7f0e5d"/><file name="Sortable.php" hash="f3e5916d09c5f9801547b543942e77bd"/><file name="Version.php" hash="335b5d09fe18e3e2a83869ef15a43e87"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="2d9b54902bd83d4093ef471f8678f219"/></dir><dir name="Model"><file name="Account.php" hash="742b75e701e090a04422fb5b8da6b84a"/><file name="Facebook.php" hash="f488a2b96b945c29a7bf10326fc7d16f"/><dir name="Mysql4"><dir name="Account"><file name="Collection.php" hash="ca4211392ef934ce33391408092a9737"/></dir><file name="Account.php" hash="3fd0a1c891d31577d873247e17ce01ce"/></dir><file name="Observer.php" hash="87d2514a6bb6d4b9e910acf324c24973"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Redirectto.php" hash="c2bcb34b36ae88ce3bfdfe242463ba9a"/><file name="Shareurl.php" hash="a28729927bf70baa36ebade8e3919d3b"/></dir></dir></dir><file name="Twitter.php" hash="9858dfa5473b42cfa98ffd00be31a1c4"/></dir><dir name="controllers"><file name="AccountController.php" hash="596099414bf1a9c2bd9f7dfb2782cf16"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0aa82ee4ebe19c26943b496f45ce590d"/><file name="config.xml" hash="9841972e69f854b8482596c3155010e6"/><file name="system.xml" hash="5d91c53042dfbc1c9f8c046dedf3670c"/></dir><dir name="sql"><dir name="pslogin_setup"><file name="install-1.0.0.php" hash="553fa30329657c4ae11cd85e8abd9784"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="pslogin.xml" hash="6298940d5f26d8a8c27ccb10ca87614f"/></dir><dir name="template"><dir name="pslogin"><dir name="system"><dir name="config"><file name="sortable.phtml" hash="398697865280d2f7d516645d62b1569d"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="pslogin.xml" hash="e152281f10ea553cef98950f2c9b15df"/></dir><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="4b8042863efcd50c38f4a47b7bc79265"/><dir name="message"><file name="fake_email.phtml" hash="4df9c4f220333606f758d730b9246942"/></dir></dir></dir><dir name="customer"><dir name="form"><dir name="edit"><file name="fake_email.phtml" hash="acb5c4fb1792f5a327a47c4196c78d65"/></dir><dir name="login"><file name="buttons.phtml" hash="1512630095d53cb70e4e709a100edea7"/></dir><file name="login.phtml" hash="b0f6ddf92c8ec22faedb9b5213a0a6ad"/><dir name="register"><file name="buttons.phtml" hash="d4d79e57af7daf2561f37601e5d0bb39"/><file name="sharedata.phtml" hash="21e3d413a95289b676033f6ca254f018"/><file name="sharepopup.phtml" hash="834dd13f11319f5fc58931463fdbd4f0"/></dir><file name="register.phtml" hash="353707dcf76c56be0612d050c5453b51"/></dir></dir><dir name="page"><dir name="html"><file name="welcome.phtml" hash="d310025c812db6a4e7409b5b4cbe29e1"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Plumrocket_SocialLogin.csv" hash="7572e6085fbc927180c11c7fcb060389"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin.css" hash="00847482b79dcf88220b97bcd22dc6e2"/></dir></dir></dir><dir name="images"><dir name="plumrocket"><dir name="pslogin"><file name="social_admin.png" hash="0ed6a34c0b5863a5539def39b76945ca"/></dir></dir></dir><dir name="js"><dir name="plumrocket"><dir name="pslogin"><file name="config.js" hash="a2c074dcd3c228afc2f144b8de8103c8"/><file name="jquery-ui.min.js" hash="a0e434a17ebc022fb565e08fd446baef"/><file name="pslogin.js" hash="17dc0bca630d2d73b39de328f007342e"/></dir><file name="jquery-1.10.2.min.js" hash="0b211fb723c7e6cfa4da5ca4ee10a836"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin.css" hash="2479013667aebc0b424603a46233cd28"/></dir></dir></dir><dir name="images"><dir name="plumrocket"><dir name="pslogin"><file name="loader.gif" hash="013fe7725d917198766631696bbe40d1"/><file name="social.png" hash="3eb0769eb3997729b3e8d71d47800105"/><file name="social_retina.png" hash="ef02e6bad12ac5dcacb2c92ca15932c4"/></dir></dir></dir><dir name="js"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin.js" hash="9d53e0f43c122cf6b48c2676d5782456"/></dir><file name="jquery-1.10.2.min.js" hash="0b211fb723c7e6cfa4da5ca4ee10a836"/></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Plumrocket_Base</name><channel>community</channel><min></min><max></max></package></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Plumrocket_Twitter_Facebook_Login</name>
4
+ <version>1.0.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://wiki.plumrocket.net/wiki/EULA">End-user License Agreement</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Plumrocket Twitter &amp; Facebook Login v1.x was designed to help online store owners reach as many customers as possible. Offering facebook login or twitter login as registration options is a proven tool to increase the number of clients.</summary>
10
+ <description>Plumrocket Twitter &amp; Facebook Login is a free magento extension that will let online store owners benefit from all the social media advantages. It helps to increase conversion rates by allowing your customers quickly login and place order.</description>
11
+ <notes>Made minor modifications</notes>
12
  <authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
13
+ <date>2014-12-04</date>
14
+ <time>09:50:49</time>
15
+ <contents><target name="mageetc"><dir name="modules"><file name="Plumrocket_SocialLogin.xml" hash="d75c0c7c3a8ac85357622bb7b4c70f63"/></dir></target><target name="magecommunity"><dir name="Plumrocket"><dir name="SocialLogin"><dir name="Block"><file name="Buttons.php" hash="2e91c65903a712f37d56752a5e38855f"/><file name="General.php" hash="d259fedff67cc632b9847783a0d77326"/><dir name="Page"><dir name="Html"><file name="Welcome.php" hash="af7adad8c6c05dc6b51eb40e7d345519"/></dir></dir><file name="Share.php" hash="8447182219873dee7caaf620950157e4"/><dir name="System"><dir name="Config"><file name="Notinstalled.php" hash="c263ec689c84b028dc4abdf06c7f0e5d"/><file name="Sortable.php" hash="f3e5916d09c5f9801547b543942e77bd"/><file name="Version.php" hash="335b5d09fe18e3e2a83869ef15a43e87"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="4b9f3b8b3b35846c634307070ca3eb63"/></dir><dir name="Model"><file name="Account.php" hash="20680f4913664e26bb6d8bb864c7db7f"/><file name="Facebook.php" hash="fb55c26c8a6d0506b7b68f3a3696000a"/><dir name="Mysql4"><dir name="Account"><file name="Collection.php" hash="ca4211392ef934ce33391408092a9737"/></dir><file name="Account.php" hash="3fd0a1c891d31577d873247e17ce01ce"/></dir><file name="Observer.php" hash="2becd4a67561bd4924e7c189783dca89"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Redirectto.php" hash="c2bcb34b36ae88ce3bfdfe242463ba9a"/><file name="Shareurl.php" hash="a28729927bf70baa36ebade8e3919d3b"/></dir></dir></dir><file name="Twitter.php" hash="29fe872e9e0055915c51b1331840b7c4"/></dir><dir name="controllers"><file name="AccountController.php" hash="c0058014b396bc6661ca947db730b282"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0aa82ee4ebe19c26943b496f45ce590d"/><file name="config.xml" hash="1b7250010fb3027c7b231d9cd0e072c2"/><file name="system.xml" hash="1d5ae17a21dca149e8e8d5c2bd1987fb"/></dir><dir name="sql"><dir name="pslogin_setup"><file name="install-1.0.0.php" hash="553fa30329657c4ae11cd85e8abd9784"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="pslogin.xml" hash="6298940d5f26d8a8c27ccb10ca87614f"/></dir><dir name="template"><dir name="pslogin"><dir name="system"><dir name="config"><file name="sortable.phtml" hash="398697865280d2f7d516645d62b1569d"/></dir></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="pslogin.xml" hash="c5b5c0d35b4c7f41c9f484140ef0a76f"/></dir><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="4b8042863efcd50c38f4a47b7bc79265"/><dir name="message"><file name="fake_email.phtml" hash="4df9c4f220333606f758d730b9246942"/></dir></dir></dir><dir name="customer"><dir name="form"><dir name="edit"><file name="fake_email.phtml" hash="acb5c4fb1792f5a327a47c4196c78d65"/></dir><dir name="login"><file name="buttons.phtml" hash="1512630095d53cb70e4e709a100edea7"/></dir><file name="login.phtml" hash="b0f6ddf92c8ec22faedb9b5213a0a6ad"/><dir name="register"><file name="buttons.phtml" hash="d4d79e57af7daf2561f37601e5d0bb39"/><file name="sharedata.phtml" hash="21e3d413a95289b676033f6ca254f018"/><file name="sharepopup.phtml" hash="834dd13f11319f5fc58931463fdbd4f0"/></dir><file name="register.phtml" hash="353707dcf76c56be0612d050c5453b51"/></dir></dir><dir name="page"><dir name="html"><file name="welcome.phtml" hash="d310025c812db6a4e7409b5b4cbe29e1"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Plumrocket_SocialLogin.csv" hash="7572e6085fbc927180c11c7fcb060389"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin.css" hash="00847482b79dcf88220b97bcd22dc6e2"/></dir></dir></dir><dir name="images"><dir name="plumrocket"><dir name="pslogin"><file name="social_admin.png" hash="0ed6a34c0b5863a5539def39b76945ca"/></dir></dir></dir><dir name="js"><dir name="plumrocket"><dir name="pslogin"><file name="config.js" hash="a2c074dcd3c228afc2f144b8de8103c8"/><file name="jquery-ui.min.js" hash="a0e434a17ebc022fb565e08fd446baef"/><file name="pslogin.js" hash="17dc0bca630d2d73b39de328f007342e"/></dir><file name="jquery-1.10.2.min.js" hash="0b211fb723c7e6cfa4da5ca4ee10a836"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin.css" hash="2479013667aebc0b424603a46233cd28"/></dir></dir></dir><dir name="images"><dir name="plumrocket"><dir name="pslogin"><file name="loader.gif" hash="013fe7725d917198766631696bbe40d1"/><file name="social.png" hash="3eb0769eb3997729b3e8d71d47800105"/><file name="social_retina.png" hash="ef02e6bad12ac5dcacb2c92ca15932c4"/></dir></dir></dir><dir name="js"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin.js" hash="5fb7f1feee6ae1982905b38662522f01"/></dir><file name="jquery-1.10.2.min.js" hash="0b211fb723c7e6cfa4da5ca4ee10a836"/></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Plumrocket_Base</name><channel>community</channel><min></min><max></max></package></required></dependencies>
18
  </package>
skin/frontend/base/default/js/plumrocket/pslogin/pslogin.js CHANGED
@@ -72,14 +72,14 @@ pjQuery_1_10_2(document).ready(function() {
72
  });
73
 
74
  // Share.
75
- jQuery('.prpop-close-btn').on('click', function() {
76
- jQuery('.pslogin-addedoverlay, .pslogin-pop-up-form').hide();
77
- jQuery('html').css('overflow', 'auto');
78
  return false;
79
  });
80
 
81
- if(jQuery('.pslogin-pop-up-form').is(':visible')) {
82
- jQuery('html').css('overflow', 'hidden');
83
  }
84
 
85
  // Fake email message.
72
  });
73
 
74
  // Share.
75
+ pjQuery_1_10_2('.prpop-close-btn').on('click', function() {
76
+ pjQuery_1_10_2('.pslogin-addedoverlay, .pslogin-pop-up-form').hide();
77
+ pjQuery_1_10_2('html').css('overflow', 'auto');
78
  return false;
79
  });
80
 
81
+ if(pjQuery_1_10_2('.pslogin-pop-up-form').is(':visible')) {
82
+ pjQuery_1_10_2('html').css('overflow', 'hidden');
83
  }
84
 
85
  // Fake email message.