Version Notes
- Added an API, allowing to integrate twitter & facebook login into any third-party extension, allowing to use twitter & facebook login to import customer's data from social networks automatically (e.g. email address, etc.)
- Fixed customer login verification, that was previously causing issues on some Magento stores
- Fixed issue with registration success email for a multi-language store, when customer was receiving emails from the default store view only
Download this release
Release Info
| Developer | Plumrocket Team |
| Extension | Plumrocket_Twitter_Facebook_Login |
| Version | 1.2.5 |
| Comparing to | |
| See all releases | |
Code changes from version 1.2.4 to 1.2.5
- app/code/community/Plumrocket/SocialLogin/Block/General.php +1 -1
- app/code/community/Plumrocket/SocialLogin/Helper/Data.php +20 -1
- app/code/community/Plumrocket/SocialLogin/Model/Account.php +1 -1
- app/code/community/Plumrocket/SocialLogin/controllers/AccountController.php +34 -4
- app/code/community/Plumrocket/SocialLogin/etc/config.xml +1 -1
- app/code/community/Plumrocket/SocialLogin/etc/system.xml +1 -1
- app/design/frontend/base/default/template/pslogin/customer/form/login/buttons.phtml +1 -1
- app/design/frontend/base/default/template/pslogin/customer/form/register/buttons.phtml +1 -1
- app/etc/modules/Plumrocket_SocialLogin.xml +1 -1
- package.xml +7 -8
- skin/frontend/base/default/js/plumrocket/pslogin/pslogin.js +55 -51
app/code/community/Plumrocket/SocialLogin/Block/General.php
CHANGED
|
@@ -34,7 +34,7 @@ class Plumrocket_SocialLogin_Block_General extends Mage_Core_Block_Template
|
|
| 34 |
}
|
| 35 |
|
| 36 |
// Set referer.
|
| 37 |
-
if(
|
| 38 |
$skipModules = $helper->getRefererLinkSkipModules();
|
| 39 |
if($this->getRequest()->getActionName() != 'noRoute' && !in_array($moduleName, $skipModules)) {
|
| 40 |
$referer = $this->helper('core/url')->getCurrentBase64Url();
|
| 34 |
}
|
| 35 |
|
| 36 |
// Set referer.
|
| 37 |
+
if(!Mage::getSingleton('customer/session')->isLoggedIn()) {
|
| 38 |
$skipModules = $helper->getRefererLinkSkipModules();
|
| 39 |
if($this->getRequest()->getActionName() != 'noRoute' && !in_array($moduleName, $skipModules)) {
|
| 40 |
$referer = $this->helper('core/url')->getCurrentBase64Url();
|
app/code/community/Plumrocket/SocialLogin/Helper/Data.php
CHANGED
|
@@ -21,6 +21,7 @@ class Plumrocket_SocialLogin_Helper_Data extends Plumrocket_SocialLogin_Helper_M
|
|
| 21 |
const REFERER_QUERY_PARAM_NAME = 'pslogin_referer';
|
| 22 |
const REFERER_STORE_PARAM_NAME = 'pslogin_referer_store';
|
| 23 |
const SHOW_POPUP_PARAM_NAME = 'pslogin_show_popup';
|
|
|
|
| 24 |
const FAKE_EMAIL_PREFIX = 'temp-email-ps';
|
| 25 |
const TIME_TO_EDIT = 300;
|
| 26 |
const DEBUG_MODE = false;
|
|
@@ -89,7 +90,7 @@ class Plumrocket_SocialLogin_Helper_Data extends Plumrocket_SocialLogin_Helper_M
|
|
| 89 |
return false;
|
| 90 |
}
|
| 91 |
|
| 92 |
-
if(
|
| 93 |
return false;
|
| 94 |
}
|
| 95 |
|
|
@@ -102,6 +103,10 @@ class Plumrocket_SocialLogin_Helper_Data extends Plumrocket_SocialLogin_Helper_M
|
|
| 102 |
return false;
|
| 103 |
}
|
| 104 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 105 |
if(!$customerId = Mage::getSingleton('customer/session')->getCustomerId()) {
|
| 106 |
return false;
|
| 107 |
}
|
|
@@ -328,6 +333,20 @@ class Plumrocket_SocialLogin_Helper_Data extends Plumrocket_SocialLogin_Helper_M
|
|
| 328 |
return $show;
|
| 329 |
}
|
| 330 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 331 |
public function getRedirectUrl($after = 'login')
|
| 332 |
{
|
| 333 |
$redirectUrl = null;
|
| 21 |
const REFERER_QUERY_PARAM_NAME = 'pslogin_referer';
|
| 22 |
const REFERER_STORE_PARAM_NAME = 'pslogin_referer_store';
|
| 23 |
const SHOW_POPUP_PARAM_NAME = 'pslogin_show_popup';
|
| 24 |
+
const API_CALL_PARAM_NAME = 'pslogin_api_call';
|
| 25 |
const FAKE_EMAIL_PREFIX = 'temp-email-ps';
|
| 26 |
const TIME_TO_EDIT = 300;
|
| 27 |
const DEBUG_MODE = false;
|
| 90 |
return false;
|
| 91 |
}
|
| 92 |
|
| 93 |
+
if(Mage::getSingleton('customer/session')->isLoggedIn()) {
|
| 94 |
return false;
|
| 95 |
}
|
| 96 |
|
| 103 |
return false;
|
| 104 |
}
|
| 105 |
|
| 106 |
+
if(!Mage::getSingleton('customer/session')->isLoggedIn()) {
|
| 107 |
+
return false;
|
| 108 |
+
}
|
| 109 |
+
|
| 110 |
if(!$customerId = Mage::getSingleton('customer/session')->getCustomerId()) {
|
| 111 |
return false;
|
| 112 |
}
|
| 333 |
return $show;
|
| 334 |
}
|
| 335 |
|
| 336 |
+
public function apiCall($params = null)
|
| 337 |
+
{
|
| 338 |
+
$session = Mage::getSingleton('customer/session');
|
| 339 |
+
$show = $session->getData(self::API_CALL_PARAM_NAME);
|
| 340 |
+
|
| 341 |
+
if($params) {
|
| 342 |
+
$session->setData(self::API_CALL_PARAM_NAME, $params);
|
| 343 |
+
}else{
|
| 344 |
+
$session->unsetData(self::API_CALL_PARAM_NAME);
|
| 345 |
+
}
|
| 346 |
+
|
| 347 |
+
return $show;
|
| 348 |
+
}
|
| 349 |
+
|
| 350 |
public function getRedirectUrl($after = 'login')
|
| 351 |
{
|
| 352 |
$redirectUrl = null;
|
app/code/community/Plumrocket/SocialLogin/Model/Account.php
CHANGED
|
@@ -353,7 +353,7 @@ class Plumrocket_SocialLogin_Model_Account extends Mage_Core_Model_Abstract
|
|
| 353 |
public function postToMail()
|
| 354 |
{
|
| 355 |
if(!Mage::helper('pslogin')->isFakeMail( $this->getUserData('email') )) {
|
| 356 |
-
Mage::getSingleton('customer/customer')->sendNewAccountEmail();
|
| 357 |
}
|
| 358 |
|
| 359 |
return true;
|
| 353 |
public function postToMail()
|
| 354 |
{
|
| 355 |
if(!Mage::helper('pslogin')->isFakeMail( $this->getUserData('email') )) {
|
| 356 |
+
Mage::getSingleton('customer/customer')->sendNewAccountEmail('registered', '', Mage::app()->getStore()->getId());
|
| 357 |
}
|
| 358 |
|
| 359 |
return true;
|
app/code/community/Plumrocket/SocialLogin/controllers/AccountController.php
CHANGED
|
@@ -22,7 +22,7 @@ class Plumrocket_SocialLogin_AccountController extends Mage_Core_Controller_Fron
|
|
| 22 |
public function useAction()
|
| 23 |
{
|
| 24 |
$session = $this->_getSession();
|
| 25 |
-
if ($session->isLoggedIn()) {
|
| 26 |
return $this->_windowClose();
|
| 27 |
}
|
| 28 |
|
|
@@ -37,7 +37,15 @@ class Plumrocket_SocialLogin_AccountController extends Mage_Core_Controller_Fron
|
|
| 37 |
return $this->_windowClose();
|
| 38 |
}
|
| 39 |
|
| 40 |
-
$
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 41 |
switch($model->getProtocol()) {
|
| 42 |
|
| 43 |
case 'OAuth':
|
|
@@ -59,12 +67,27 @@ class Plumrocket_SocialLogin_AccountController extends Mage_Core_Controller_Fron
|
|
| 59 |
public function loginAction()
|
| 60 |
{
|
| 61 |
$session = $this->_getSession();
|
| 62 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 63 |
return $this->_windowClose();
|
| 64 |
// $this->_redirect('.');
|
| 65 |
}
|
| 66 |
|
| 67 |
-
$type = $this->getRequest()->getParam('type');
|
| 68 |
$className = 'Plumrocket_SocialLogin_Model_'. ucfirst($type);
|
| 69 |
if(!$type || !class_exists($className)) {
|
| 70 |
return $this->_windowClose();
|
|
@@ -98,6 +121,13 @@ class Plumrocket_SocialLogin_AccountController extends Mage_Core_Controller_Fron
|
|
| 98 |
Mage::app()->setCurrentStore($storeId);
|
| 99 |
}
|
| 100 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 101 |
if($customerId = $model->getCustomerIdByUserId()) {
|
| 102 |
# Do auth.
|
| 103 |
$redirectUrl = $this->_getHelper()->getRedirectUrl();
|
| 22 |
public function useAction()
|
| 23 |
{
|
| 24 |
$session = $this->_getSession();
|
| 25 |
+
if ($session->isLoggedIn() && !$this->getRequest()->getParam('call')) {
|
| 26 |
return $this->_windowClose();
|
| 27 |
}
|
| 28 |
|
| 37 |
return $this->_windowClose();
|
| 38 |
}
|
| 39 |
|
| 40 |
+
if($call = $this->getRequest()->getParam('call')) {
|
| 41 |
+
$this->_getHelper()->apiCall(array(
|
| 42 |
+
'type' => $type,
|
| 43 |
+
'action' => $call,
|
| 44 |
+
));
|
| 45 |
+
}else{
|
| 46 |
+
$this->_getHelper()->apiCall(null);
|
| 47 |
+
}
|
| 48 |
+
|
| 49 |
switch($model->getProtocol()) {
|
| 50 |
|
| 51 |
case 'OAuth':
|
| 67 |
public function loginAction()
|
| 68 |
{
|
| 69 |
$session = $this->_getSession();
|
| 70 |
+
$type = $this->getRequest()->getParam('type');
|
| 71 |
+
|
| 72 |
+
// API.
|
| 73 |
+
$callTarget = false;
|
| 74 |
+
if($call = $this->_getHelper()->apiCall()) {
|
| 75 |
+
if(isset($call['type']) && $call['type'] == $type && !empty($call['action'])) {
|
| 76 |
+
$_target = explode('.', $call['action'], 3);
|
| 77 |
+
if(count($_target) === 3) {
|
| 78 |
+
$callTarget = $_target;
|
| 79 |
+
}else{
|
| 80 |
+
$this->_windowClose();
|
| 81 |
+
return;
|
| 82 |
+
}
|
| 83 |
+
}
|
| 84 |
+
}
|
| 85 |
+
|
| 86 |
+
if ($session->isLoggedIn() && !$callTarget) {
|
| 87 |
return $this->_windowClose();
|
| 88 |
// $this->_redirect('.');
|
| 89 |
}
|
| 90 |
|
|
|
|
| 91 |
$className = 'Plumrocket_SocialLogin_Model_'. ucfirst($type);
|
| 92 |
if(!$type || !class_exists($className)) {
|
| 93 |
return $this->_windowClose();
|
| 121 |
Mage::app()->setCurrentStore($storeId);
|
| 122 |
}
|
| 123 |
|
| 124 |
+
// API.
|
| 125 |
+
if($callTarget) {
|
| 126 |
+
list($module, $controller, $action) = $callTarget;
|
| 127 |
+
$this->_forward($action, $controller, $module, array('pslogin' => $model->getUserData()));
|
| 128 |
+
return;
|
| 129 |
+
}
|
| 130 |
+
|
| 131 |
if($customerId = $model->getCustomerIdByUserId()) {
|
| 132 |
# Do auth.
|
| 133 |
$redirectUrl = $this->_getHelper()->getRedirectUrl();
|
app/code/community/Plumrocket/SocialLogin/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Plumrocket_SocialLogin>
|
| 5 |
-
<version>1.2.
|
| 6 |
</Plumrocket_SocialLogin>
|
| 7 |
</modules>
|
| 8 |
<frontend>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Plumrocket_SocialLogin>
|
| 5 |
+
<version>1.2.5</version>
|
| 6 |
</Plumrocket_SocialLogin>
|
| 7 |
</modules>
|
| 8 |
<frontend>
|
app/code/community/Plumrocket/SocialLogin/etc/system.xml
CHANGED
|
@@ -909,7 +909,7 @@
|
|
| 909 |
</mydigipass>
|
| 910 |
|
| 911 |
<qq>
|
| 912 |
-
<label>QQ</label>
|
| 913 |
<sort_order>320</sort_order>
|
| 914 |
<frontend_type>text</frontend_type>
|
| 915 |
<show_in_default>1</show_in_default>
|
| 909 |
</mydigipass>
|
| 910 |
|
| 911 |
<qq>
|
| 912 |
+
<label>QQ / QZone</label>
|
| 913 |
<sort_order>320</sort_order>
|
| 914 |
<frontend_type>text</frontend_type>
|
| 915 |
<show_in_default>1</show_in_default>
|
app/design/frontend/base/default/template/pslogin/customer/form/login/buttons.phtml
CHANGED
|
@@ -27,7 +27,7 @@
|
|
| 27 |
<ul class="pslogin-clearfix">
|
| 28 |
<?php foreach ($this->getPreparedButtons() as $button) : ?>
|
| 29 |
<li class="pslogin-button <?php echo $button['type']; ?> <?php echo empty($button['visible'])? 'pslogin-hidden' : 'pslogin-visible'; ?>" <?php echo empty($button['visible'])? 'style="display: none;"' : ''; ?> title="<?php echo $this->escapeHtml($button['login_text']); ?>">
|
| 30 |
-
<a class="pslogin-button-link" rel="nofollow" href="<?php echo $button['href']; ?>
|
| 31 |
|
| 32 |
<?php if($this->showLoginFullButtons() && !empty($button['image']['login'])) : ?>
|
| 33 |
<img class="pslogin-button-image" src="<?php echo $this->escapeHtml($button['image']['login']); ?>" />
|
| 27 |
<ul class="pslogin-clearfix">
|
| 28 |
<?php foreach ($this->getPreparedButtons() as $button) : ?>
|
| 29 |
<li class="pslogin-button <?php echo $button['type']; ?> <?php echo empty($button['visible'])? 'pslogin-hidden' : 'pslogin-visible'; ?>" <?php echo empty($button['visible'])? 'style="display: none;"' : ''; ?> title="<?php echo $this->escapeHtml($button['login_text']); ?>">
|
| 30 |
+
<a class="pslogin-button-link" rel="nofollow" href="javascript:void(0);" onclick="psLogin('<?php echo $button['href']; ?>', '<?php echo $button['popup_width']; ?>', '<?php echo $button['popup_height']; ?>');" >
|
| 31 |
|
| 32 |
<?php if($this->showLoginFullButtons() && !empty($button['image']['login'])) : ?>
|
| 33 |
<img class="pslogin-button-image" src="<?php echo $this->escapeHtml($button['image']['login']); ?>" />
|
app/design/frontend/base/default/template/pslogin/customer/form/register/buttons.phtml
CHANGED
|
@@ -31,7 +31,7 @@
|
|
| 31 |
<ul>
|
| 32 |
<?php foreach ($this->getPreparedButtons() as $button) : ?>
|
| 33 |
<li class="pslogin-button <?php echo $button['type']; ?>" title="<?php echo $this->escapeHtml($button['register_text']); ?>">
|
| 34 |
-
<a class="pslogin-button-link" rel="nofollow" href="<?php echo $button['href']; ?>"
|
| 35 |
|
| 36 |
<?php if($this->showRegisterFullButtons()) : ?>
|
| 37 |
<?php if(!empty($button['image']['register'])) : ?>
|
| 31 |
<ul>
|
| 32 |
<?php foreach ($this->getPreparedButtons() as $button) : ?>
|
| 33 |
<li class="pslogin-button <?php echo $button['type']; ?>" title="<?php echo $this->escapeHtml($button['register_text']); ?>">
|
| 34 |
+
<a class="pslogin-button-link" rel="nofollow" href="<?php echo $button['href']; ?>" onclick="psLogin('<?php echo $button['href']; ?>', '<?php echo $button['popup_width']; ?>', '<?php echo $button['popup_height']; ?>');" >
|
| 35 |
|
| 36 |
<?php if($this->showRegisterFullButtons()) : ?>
|
| 37 |
<?php if(!empty($button['image']['register'])) : ?>
|
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.2.
|
| 8 |
<name>Twitter & 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.2.5</version>
|
| 8 |
<name>Twitter & 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,21 +1,20 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Plumrocket_Twitter_Facebook_Login</name>
|
| 4 |
-
<version>1.2.
|
| 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 & Facebook Login v1.x was designed to help online store owners reach as many customers as possible. Increase sales, allow clients to use Magento Facebook Login & Twitter Login free to quickly register & place order.</summary>
|
| 10 |
<description>Plumrocket Twitter & 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>-
|
| 12 |
-
-
|
| 13 |
-
-
|
| 14 |
-
- Minor bugfixes</notes>
|
| 15 |
<authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
|
| 16 |
-
<date>2015-
|
| 17 |
-
<time>
|
| 18 |
-
<contents><target name="mageetc"><dir name="modules"><file name="Plumrocket_SocialLogin.xml" hash="
|
| 19 |
<compatible/>
|
| 20 |
<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>
|
| 21 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Plumrocket_Twitter_Facebook_Login</name>
|
| 4 |
+
<version>1.2.5</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 & Facebook Login v1.x was designed to help online store owners reach as many customers as possible. Increase sales, allow clients to use Magento Facebook Login & Twitter Login free to quickly register & place order.</summary>
|
| 10 |
<description>Plumrocket Twitter & 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>- Added an API, allowing to integrate twitter & facebook login into any third-party extension, allowing to use twitter & facebook login to import customer's data from social networks automatically (e.g. email address, etc.)
|
| 12 |
+
- Fixed customer login verification, that was previously causing issues on some Magento stores
|
| 13 |
+
- Fixed issue with registration success email for a multi-language store, when customer was receiving emails from the default store view only</notes>
|
|
|
|
| 14 |
<authors><author><name>Plumrocket Team</name><user>plumrocket</user><email>support@plumrocket.com</email></author></authors>
|
| 15 |
+
<date>2015-11-13</date>
|
| 16 |
+
<time>15:39:13</time>
|
| 17 |
+
<contents><target name="mageetc"><dir name="modules"><file name="Plumrocket_SocialLogin.xml" hash="7f9b0cf22579c4cf6c308852d65875f7"/></dir></target><target name="magecommunity"><dir name="Plumrocket"><dir name="SocialLogin"><dir name="Block"><file name="Buttons.php" hash="01e4058d3a9d2886d3d299108df5e39e"/><file name="General.php" hash="b91d1eec3ee0f4d70164230d8fcdf73c"/><dir name="Page"><dir name="Html"><file name="Header.php" hash="8d7513864ffa02b4b5c888fd11de9ebb"/><file name="Welcome.php" hash="af7adad8c6c05dc6b51eb40e7d345519"/></dir></dir><file name="Share.php" hash="8447182219873dee7caaf620950157e4"/><dir name="System"><dir name="Config"><file name="Callbackurl.php" hash="18db5ba86eba4692530d674c556d198c"/><file name="Comingsoon.php" hash="dd6c106da378297ab6dd6724fe014281"/><file name="Notinstalled.php" hash="c263ec689c84b028dc4abdf06c7f0e5d"/><file name="Sortable.php" hash="2ae8f2236270e459223e10a84e123e07"/><file name="Version.php" hash="dcbf01e3752a5beb030b3aec752af6dd"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="28e3bac2c502f10c586b75595facaafb"/><file name="Main.php" hash="91b6f4aec64610bca0254a3bf196f208"/></dir><dir name="Model"><file name="Account.php" hash="8e37efd5e819b93d0ce0b90b96baea05"/><file name="Facebook.php" hash="03385dd53fa1acac970f146ab86187db"/><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="1edb8fc92e3db12f7869eb102cb3d75e"/><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="3dec05ac8d4ace4c9b0f57779c6b7b82"/></dir><dir name="controllers"><file name="AccountController.php" hash="9a67c323bcff0ecf8ba47dd6316d3d87"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0aa82ee4ebe19c26943b496f45ce590d"/><file name="config.xml" hash="85b122d9da9c6cd67d717687870a26f0"/><file name="system.xml" hash="a039266d94bee81b50b36726b639ee5f"/></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="7f6dface7e33a1e667a568deb5aea0ec"/></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="180b5cc113f7d0e813de3752e55f8128"/></dir><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="562672a22d4f81e06938ca325a108596"/><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="28e38c06e2d833ff469e2c50f89d922c"/></dir><dir name="login"><file name="buttons.phtml" hash="8b861b6891438a4cf30a97d6084f0208"/></dir><file name="login.phtml" hash="8d95198607fdc776865eb0647d7743cd"/><dir name="register"><file name="buttons.phtml" hash="07551c9a37d9a6c8f304ce7a886c7018"/><file name="sharedata.phtml" hash="21e3d413a95289b676033f6ca254f018"/><file name="sharepopup.phtml" hash="834dd13f11319f5fc58931463fdbd4f0"/></dir><file name="register.phtml" hash="d914b51eae8a9bd78434db2405f09494"/></dir></dir><file name="js.phtml" hash="4f1716f6f3b5401a6b29865a189b4aec"/><dir name="page"><dir name="html"><file name="welcome.phtml" hash="de89796d6555f732aaad8099c012d3bb"/></dir></dir></dir></dir></dir></dir><dir name="ultimo"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="b32e87c2acc4789ebf81787a638bde04"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="cf337e019cbe443f9d1cd0dbe3a145ad"/><file name="register.phtml" hash="0cdc7384765164c7bff706c26807b76e"/></dir></dir></dir></dir></dir></dir><dir name="shopper"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="f997943ede058c7a674829c018fd5bb2"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="072d3a2449ca53d90153719ac01c8aae"/><file name="register.phtml" hash="43f21dc78b4881f46cb3cb933352fabc"/></dir></dir></dir></dir></dir></dir><dir name="fortis"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="eab5eda2fa564092fa49b2bf587d0f97"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="249520a604a0220b6646506ebe573011"/><file name="register.phtml" hash="0cdc7384765164c7bff706c26807b76e"/></dir></dir></dir></dir></dir></dir><dir name="default"><dir name="blanco"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="34ffb2d3f9f0de19bd57f4627e2ff822"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="887c951966ab3540093c4c3a3832b331"/><file name="register.phtml" hash="ad929d70e5db32f0b752715bad15b3ee"/></dir></dir></dir></dir></dir><dir name="buyshop"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="59890e19c4c8871e12ed8674c3733e55"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="1f7c8854dba5149030bc61b14d644614"/><file name="register.phtml" hash="ad929d70e5db32f0b752715bad15b3ee"/></dir></dir></dir></dir></dir><dir name="milano"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="34ffb2d3f9f0de19bd57f4627e2ff822"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="887c951966ab3540093c4c3a3832b331"/><file name="register.phtml" hash="ad929d70e5db32f0b752715bad15b3ee"/></dir></dir></dir></dir></dir></dir><dir name="gravdept"><dir name="acumen"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="bc101f24339c14b985c8ab7db8ae4fac"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="bde5923d16bf48ca0aeb5a824ea6bbff"/><file name="register.phtml" hash="8700cdff2dc11a6dfa362f7aabf7d734"/></dir></dir></dir></dir></dir></dir><dir name="blacknwhite"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="customer"><dir name="form"><file name="login.phtml" hash="ef1349603e09651ac66755546dab3116"/><file name="register.phtml" hash="ad929d70e5db32f0b752715bad15b3ee"/></dir></dir><dir name="onepagecheckout"><file name="login.phtml" hash="d304d5fc8e6201fc308f44dcd801199c"/></dir></dir></dir></dir></dir><dir name="venedor"><dir name="default"><dir name="template"><dir name="pslogin"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="83264c009f73da95a42965308edff8a4"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="e5f3a79f1cc36d88807561bdd3461a8c"/><file name="register.phtml" hash="55b4cf0a29a95ea89751a1aa99008fb0"/></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="95705a45617d301f3fb6b98559375512"/></dir></dir></dir><dir name="images"><dir name="plumrocket"><dir name="pslogin"><file name="social_admin.png" hash="66f08533a09ac02e7fcaf7042cfb66c8"/></dir></dir></dir><dir name="js"><dir name="plumrocket"><dir name="pslogin"><file name="config.js" hash="a2c074dcd3c228afc2f144b8de8103c8"/><file name="jquery-1.10.2.min.js" hash="73042c373edc5879d6cdd9f569b9a234"/><file name="jquery-ui.min.js" hash="a0e434a17ebc022fb565e08fd446baef"/><file name="pslogin.js" hash="4770ef59857cd6eca2534d74e1dcf67c"/></dir></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-custom.css" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="pslogin.css" hash="2289d637dce2618814c6b5c1b15fad45"/></dir></dir></dir><dir name="images"><dir name="plumrocket"><dir name="pslogin"><file name="loader.gif" hash="013fe7725d917198766631696bbe40d1"/><file name="social.png" hash="7f9ce7fa30dde5dbb53b469eb0f300f6"/><file name="social_retina.png" hash="89e0ccef83342de0f100c22b740619e0"/></dir></dir></dir><dir name="js"><dir name="plumrocket"><dir name="pslogin"><file name="jquery-1.10.2.min.js" hash="73042c373edc5879d6cdd9f569b9a234"/><file name="pslogin.js" hash="fe0f64ab37951d5229aaea132cb73915"/></dir></dir></dir></dir></dir><dir name="shopper"><dir name="default"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin-custom.css" hash="56be3d4ce52002b666072f42515b12d8"/></dir></dir></dir></dir></dir><dir name="default"><dir name="buyshop"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin-custom.css" hash="08ae88742d436464733e060c95e50569"/></dir></dir></dir></dir></dir><dir name="venedor"><dir name="default"><dir name="css"><dir name="plumrocket"><dir name="pslogin"><file name="pslogin-custom.css" hash="2f95248995f04c7b831fd81bcc16b6d8"/></dir></dir></dir></dir></dir></dir></target></contents>
|
| 18 |
<compatible/>
|
| 19 |
<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>
|
| 20 |
</package>
|
skin/frontend/base/default/js/plumrocket/pslogin/pslogin.js
CHANGED
|
@@ -33,57 +33,6 @@ pjQuery_1_10_2(document).ready(function() {
|
|
| 33 |
}
|
| 34 |
});
|
| 35 |
|
| 36 |
-
// Open login window.
|
| 37 |
-
var win = null;
|
| 38 |
-
pjQuery_1_10_2('.pslogin-buttons').on('click', 'a', function() {
|
| 39 |
-
var $link = pjQuery_1_10_2(this);
|
| 40 |
-
|
| 41 |
-
var width = $link.data('width');
|
| 42 |
-
var height = $link.data('height');
|
| 43 |
-
var left = parseInt((pjQuery_1_10_2(window).width() - width) / 2);
|
| 44 |
-
var top = parseInt((pjQuery_1_10_2(window).height() - height) / 2);
|
| 45 |
-
|
| 46 |
-
var params = [
|
| 47 |
-
'resizable=yes',
|
| 48 |
-
'scrollbars=no',
|
| 49 |
-
'toolbar=no',
|
| 50 |
-
'menubar=no',
|
| 51 |
-
'location=no',
|
| 52 |
-
'directories=no',
|
| 53 |
-
'status=yes',
|
| 54 |
-
'width='+ width,
|
| 55 |
-
'height='+ height,
|
| 56 |
-
'left='+ left,
|
| 57 |
-
'top='+ top
|
| 58 |
-
];
|
| 59 |
-
|
| 60 |
-
if(win) {
|
| 61 |
-
win.close();
|
| 62 |
-
}
|
| 63 |
-
// win = window.open('#', 'pslogin_popup', params.join(','));
|
| 64 |
-
if($link.attr('href')) {
|
| 65 |
-
win = window.open($link.attr('href'), 'pslogin_popup', params.join(','));
|
| 66 |
-
win.focus();
|
| 67 |
-
|
| 68 |
-
if($link.data('loader')) {
|
| 69 |
-
pjQuery_1_10_2(win.document).ready(function() {
|
| 70 |
-
|
| 71 |
-
var loaderText = 'Loading...';
|
| 72 |
-
var html = '<!DOCTYPE html><html style="height: 100%;"><head><meta name="viewport" content="width=device-width, initial-scale=1"><title>'+ loaderText +'</title></head>';
|
| 73 |
-
html += '<body style="height: 100%; margin: 0; padding: 0;">';
|
| 74 |
-
//html += '<div style="text-align: center; height: 100%;"><img src="'+ $link.data('loader') +'" alt="Please Wait" class="loader" style="top: 50%; position: relative; margin-top: -64px; display: none;" /></div>';
|
| 75 |
-
html += '<div style="text-align: center; height: 100%;"><div id="loader" style="top: 50%; position: relative; margin-top: -50px; color: #646464; height:25px; font-size: 25px; text-align: center; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;">'+ loaderText +'</div></div>';
|
| 76 |
-
html += '</body></html>';
|
| 77 |
-
|
| 78 |
-
pjQuery_1_10_2(win.document).contents().html(html);
|
| 79 |
-
});
|
| 80 |
-
}
|
| 81 |
-
}else{
|
| 82 |
-
alert('This Login Application was not configured correctly. Please contact our customer support.');
|
| 83 |
-
}
|
| 84 |
-
return false;
|
| 85 |
-
});
|
| 86 |
-
|
| 87 |
// Share.
|
| 88 |
pjQuery_1_10_2('.prpop-close-btn').on('click', function() {
|
| 89 |
pjQuery_1_10_2('.pslogin-addedoverlay, .pslogin-pop-up-form').hide();
|
|
@@ -102,6 +51,61 @@ pjQuery_1_10_2(document).ready(function() {
|
|
| 102 |
|
| 103 |
});
|
| 104 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 105 |
function customerEditFakeEmail() {
|
| 106 |
pjQuery_1_10_2("#email").removeClass("validation-passed").addClass("validation-failed").after('<div class="validation-advice pslogin-fake-email" id="advice-required-entry-email">Please enter valid email address.</div>');
|
| 107 |
|
| 33 |
}
|
| 34 |
});
|
| 35 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 36 |
// Share.
|
| 37 |
pjQuery_1_10_2('.prpop-close-btn').on('click', function() {
|
| 38 |
pjQuery_1_10_2('.pslogin-addedoverlay, .pslogin-pop-up-form').hide();
|
| 51 |
|
| 52 |
});
|
| 53 |
|
| 54 |
+
|
| 55 |
+
function psLogin(href,width,height)
|
| 56 |
+
{
|
| 57 |
+
var win = null;
|
| 58 |
+
if (!width) {
|
| 59 |
+
width = 650;
|
| 60 |
+
}
|
| 61 |
+
|
| 62 |
+
if(!height) {
|
| 63 |
+
height = 350;
|
| 64 |
+
}
|
| 65 |
+
|
| 66 |
+
var left = parseInt((pjQuery_1_10_2(window).width() - width) / 2);
|
| 67 |
+
var top = parseInt((pjQuery_1_10_2(window).height() - height) / 2);
|
| 68 |
+
|
| 69 |
+
var params = [
|
| 70 |
+
'resizable=yes',
|
| 71 |
+
'scrollbars=no',
|
| 72 |
+
'toolbar=no',
|
| 73 |
+
'menubar=no',
|
| 74 |
+
'location=no',
|
| 75 |
+
'directories=no',
|
| 76 |
+
'status=yes',
|
| 77 |
+
'width='+ width,
|
| 78 |
+
'height='+ height,
|
| 79 |
+
'left='+ left,
|
| 80 |
+
'top='+ top
|
| 81 |
+
];
|
| 82 |
+
|
| 83 |
+
if(win) {
|
| 84 |
+
win.close();
|
| 85 |
+
}
|
| 86 |
+
// win = window.open('#', 'pslogin_popup', params.join(','));
|
| 87 |
+
if(href) {
|
| 88 |
+
win = window.open(href, 'pslogin_popup', params.join(','));
|
| 89 |
+
win.focus();
|
| 90 |
+
|
| 91 |
+
pjQuery_1_10_2(win.document).ready(function() {
|
| 92 |
+
|
| 93 |
+
var loaderText = 'Loading...';
|
| 94 |
+
var html = '<!DOCTYPE html><html style="height: 100%;"><head><meta name="viewport" content="width=device-width, initial-scale=1"><title>'+ loaderText +'</title></head>';
|
| 95 |
+
html += '<body style="height: 100%; margin: 0; padding: 0;">';
|
| 96 |
+
//html += '<div style="text-align: center; height: 100%;"><img src="'+ $link.data('loader') +'" alt="Please Wait" class="loader" style="top: 50%; position: relative; margin-top: -64px; display: none;" /></div>';
|
| 97 |
+
html += '<div style="text-align: center; height: 100%;"><div id="loader" style="top: 50%; position: relative; margin-top: -50px; color: #646464; height:25px; font-size: 25px; text-align: center; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;">'+ loaderText +'</div></div>';
|
| 98 |
+
html += '</body></html>';
|
| 99 |
+
|
| 100 |
+
pjQuery_1_10_2(win.document).contents().html(html);
|
| 101 |
+
});
|
| 102 |
+
|
| 103 |
+
}else{
|
| 104 |
+
alert('This Login Application was not configured correctly. Please contact our customer support.');
|
| 105 |
+
}
|
| 106 |
+
return false;
|
| 107 |
+
}
|
| 108 |
+
|
| 109 |
function customerEditFakeEmail() {
|
| 110 |
pjQuery_1_10_2("#email").removeClass("validation-passed").addClass("validation-failed").after('<div class="validation-advice pslogin-fake-email" id="advice-required-entry-email">Please enter valid email address.</div>');
|
| 111 |
|
