Version Notes
Thirteenth release of social login
Download this release
Release Info
Developer | LoginRadius Team |
Extension | LoginRadius |
Version | 3.7.0 |
Comparing to | |
See all releases |
Code changes from version 3.6.0 to 3.7.0
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/Block/Auth.php +0 -0
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/Block/Sociallogin.php +5 -1
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/Block/horizontalsharing.php +0 -0
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/Block/verticalsharing.php +0 -0
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/Helper/Data.php +0 -0
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Mysql4/Sociallogin.php +0 -0
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Mysql4/Sociallogin/Collection.php +0 -0
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Sociallogin.php +0 -0
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Source/HorizontalSharing.php +0 -0
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Source/Iconsize.php +0 -0
- app/code/community/LoginRadius/Sociallogin/Model/Source/LoginPopup.php +10 -0
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Source/SharingVerticalAlignment.php +0 -0
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Source/Uihover.php +0 -0
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Source/Uihover2.php +0 -0
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Source/VerticalSharing.php +0 -0
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/System/Config/Info.php +3 -3
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/controllers/IndexController.php +100 -47
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/controllers/Popup.php +1 -1
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/etc/config.xml +2 -1
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/etc/system.xml +10 -0
- app/code/community/{Loginradius → LoginRadius}/Sociallogin/etc/widget.xml +0 -0
- app/code/community/{Loginradius/Sociallogin/sql/sociallogin_setup/mysql4-install-3.6.0.php → LoginRadius/Sociallogin/sql/sociallogin_setup/mysql4-install-3.7.0.php} +1 -1
- app/design/adminhtml/default/default/layout/loginradius_sociallogin.xml +1 -1
- app/design/frontend/default/default/layout/sociallogin.xml +1 -1
- app/design/frontend/default/default/template/sociallogin/socialshare_head.phtml +1 -1
- package.xml +5 -5
- skin/frontend/base/default/Loginradius/Sociallogin/css/admin-ui.css +3 -0
- skin/frontend/base/default/Loginradius/Sociallogin/js/admin-ui.js +2 -0
app/code/community/{Loginradius → LoginRadius}/Sociallogin/Block/Auth.php
RENAMED
File without changes
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/Block/Sociallogin.php
RENAMED
@@ -64,9 +64,13 @@ class Loginradius_Sociallogin_Block_Sociallogin extends Mage_Core_Block_Template
|
|
64 |
{
|
65 |
return Mage::getStoreConfig('sociallogin_options/messages/appkey');
|
66 |
}
|
67 |
-
|
68 |
{
|
69 |
return Mage::getStoreConfig('sociallogin_options/messages/loginradius_title');
|
|
|
|
|
|
|
|
|
70 |
}
|
71 |
public function iconSize()
|
72 |
{
|
64 |
{
|
65 |
return Mage::getStoreConfig('sociallogin_options/messages/appkey');
|
66 |
}
|
67 |
+
public function getLoginRadiusTitle()
|
68 |
{
|
69 |
return Mage::getStoreConfig('sociallogin_options/messages/loginradius_title');
|
70 |
+
}
|
71 |
+
public function getLoginWindow()
|
72 |
+
{
|
73 |
+
return Mage::getStoreConfig('sociallogin_options/messages/sameWindow');
|
74 |
}
|
75 |
public function iconSize()
|
76 |
{
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/Block/horizontalsharing.php
RENAMED
File without changes
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/Block/verticalsharing.php
RENAMED
File without changes
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/Helper/Data.php
RENAMED
File without changes
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Mysql4/Sociallogin.php
RENAMED
File without changes
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Mysql4/Sociallogin/Collection.php
RENAMED
File without changes
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Sociallogin.php
RENAMED
File without changes
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Source/HorizontalSharing.php
RENAMED
File without changes
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Source/Iconsize.php
RENAMED
File without changes
|
app/code/community/LoginRadius/Sociallogin/Model/Source/LoginPopup.php
ADDED
@@ -0,0 +1,10 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
class Loginradius_Sociallogin_Model_Source_Loginpopup
|
3 |
+
{
|
4 |
+
public function toOptionArray(){
|
5 |
+
$result = array();
|
6 |
+
$result[] = array('value' => '1', 'label'=>__('Yes').'<br/>');
|
7 |
+
$result[] = array('value' => '0', 'label'=>__('No').'<br/>');
|
8 |
+
return $result;
|
9 |
+
}
|
10 |
+
}
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Source/SharingVerticalAlignment.php
RENAMED
File without changes
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Source/Uihover.php
RENAMED
File without changes
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Source/Uihover2.php
RENAMED
File without changes
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/Source/VerticalSharing.php
RENAMED
File without changes
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/Model/System/Config/Info.php
RENAMED
@@ -18,7 +18,7 @@ class Loginradius_Sociallogin_Model_System_Config_Info extends Mage_Adminhtml_Bl
|
|
18 |
<h4 style="color:#000"><strong><?php echo $this -> __('Thank you for installing the LoginRadius Social Plugin!') ?></strong></h4>
|
19 |
<p><?php echo $this -> __('To activate the extension, you will need to first configure it (manage your desired social networks, etc.) from your LoginRadius account. If you do not have an account, click') ?> <a target="_blank" href="http://www.loginradius.com/"><?php echo $this -> __('here') ?></a> <?php echo $this -> __('and create one for FREE!') ?></p>
|
20 |
<p>
|
21 |
-
<?php echo $this -> __('We also offer Social Plugins for') ?> <a href="https://www.loginradius.com/loginradius-for-developers/loginRadius-cms#
|
22 |
</p>
|
23 |
<div style="margin-top:10px">
|
24 |
<a style="text-decoration:none;" href="https://www.loginradius.com/" target="_blank">
|
@@ -30,7 +30,7 @@ class Loginradius_Sociallogin_Model_System_Config_Info extends Mage_Adminhtml_Bl
|
|
30 |
<!-- Get Updates -->
|
31 |
<fieldset class="loginRadiusFieldset" style="width:26%; background-color: rgb(231, 255, 224); border: 1px solid rgb(191, 231, 176); padding-bottom:6px;">
|
32 |
<h4 style="border-bottom:#d7d7d7 1px solid;"><strong><?php echo $this -> __('Get Updates') ?></strong></h4>
|
33 |
-
<p><?php echo $this -> __('To receive updates on new features, future releases, etc, please connect with us via Facebook
|
34 |
<div>
|
35 |
<div style="float:left">
|
36 |
<iframe rel="tooltip" scrolling="no" frameborder="0" allowtransparency="true" style="border: none; overflow: hidden; width: 46px;
|
@@ -50,7 +50,7 @@ class Loginradius_Sociallogin_Model_System_Config_Info extends Mage_Adminhtml_Bl
|
|
50 |
</ul>
|
51 |
<ul style="float:left; margin-right:43px">
|
52 |
<li><a target="_blank" href="http://community.loginradius.com/"><?php echo $this -> __('Discussion Forum') ?></a></li>
|
53 |
-
<li><a target="_blank" href="
|
54 |
<li><a target="_blank" href="https://www.loginradius.com/loginradius-for-developers/loginRadius-cms"><?php echo $this -> __('Social Plugins') ?></a></li>
|
55 |
<li><a target="_blank" href="https://www.loginradius.com/loginradius-for-developers/loginRadius-sdks"><?php echo $this -> __('Social SDKs') ?></a></li>
|
56 |
</ul>
|
18 |
<h4 style="color:#000"><strong><?php echo $this -> __('Thank you for installing the LoginRadius Social Plugin!') ?></strong></h4>
|
19 |
<p><?php echo $this -> __('To activate the extension, you will need to first configure it (manage your desired social networks, etc.) from your LoginRadius account. If you do not have an account, click') ?> <a target="_blank" href="http://www.loginradius.com/"><?php echo $this -> __('here') ?></a> <?php echo $this -> __('and create one for FREE!') ?></p>
|
20 |
<p>
|
21 |
+
<?php echo $this -> __('We also offer Social Plugins for') ?> <a href="https://www.loginradius.com/loginradius-for-developers/loginRadius-cms#wordpress-plugin" target="_blank">Wordpress</a>, <a href="https://www.loginradius.com/loginradius-for-developers/loginRadius-cms#joomla-extension" target="_blank">Joomla</a>, <a href="https://www.loginradius.com/loginradius-for-developers/loginRadius-cms#drupal-module" target="_blank">Drupal</a>, <a href="https://www.loginradius.com/loginradius-for-developers/loginRadius-cms#vbullentin-plugin" target="_blank">vBulletin</a>, <a href="https://www.loginradius.com/loginradius-for-developers/loginRadius-cms#vanilla-add-ons" target="_blank">VanillaForum</a>, <a href="https://www.loginradius.com/loginradius-for-developers/loginRadius-cms#oscommerce-add-ons" target="_blank">osCommerce</a>, <a href="https://www.loginradius.com/loginradius-for-developers/loginRadius-cms#prestashop-module" target="_blank">PrestaShop</a>, <a href="https://www.loginradius.com/loginradius-for-developers/loginRadius-cms#xcart-extension" target="_blank">X-Cart</a>, <a href="https://www.loginradius.com/loginradius-for-developers/loginRadius-cms#zencart-plugin" target="_blank">Zen-Cart</a>, <a href="https://www.loginradius.com/loginradius-for-developers/loginRadius-cms#dotnetnuke-module" target="_blank">DotNetNuke</a>, <a href="https://www.loginradius.com/loginradius-for-developers/loginRadius-cms/#smf" target="_blank">SMF</a> <?php echo $this -> __('and') ?> <a href="https://www.loginradius.com/loginradius-for-developers/loginRadius-cms/#phpbb" target="_blank">phpBB</a> !
|
22 |
</p>
|
23 |
<div style="margin-top:10px">
|
24 |
<a style="text-decoration:none;" href="https://www.loginradius.com/" target="_blank">
|
30 |
<!-- Get Updates -->
|
31 |
<fieldset class="loginRadiusFieldset" style="width:26%; background-color: rgb(231, 255, 224); border: 1px solid rgb(191, 231, 176); padding-bottom:6px;">
|
32 |
<h4 style="border-bottom:#d7d7d7 1px solid;"><strong><?php echo $this -> __('Get Updates') ?></strong></h4>
|
33 |
+
<p><?php echo $this -> __('To receive updates on new features, future releases, etc, please connect with us via Facebook') ?></p>
|
34 |
<div>
|
35 |
<div style="float:left">
|
36 |
<iframe rel="tooltip" scrolling="no" frameborder="0" allowtransparency="true" style="border: none; overflow: hidden; width: 46px;
|
50 |
</ul>
|
51 |
<ul style="float:left; margin-right:43px">
|
52 |
<li><a target="_blank" href="http://community.loginradius.com/"><?php echo $this -> __('Discussion Forum') ?></a></li>
|
53 |
+
<li><a target="_blank" href="https://www.loginradius.com/loginradius/team"><?php echo $this -> __('About LoginRadius') ?></a></li>
|
54 |
<li><a target="_blank" href="https://www.loginradius.com/loginradius-for-developers/loginRadius-cms"><?php echo $this -> __('Social Plugins') ?></a></li>
|
55 |
<li><a target="_blank" href="https://www.loginradius.com/loginradius-for-developers/loginRadius-sdks"><?php echo $this -> __('Social SDKs') ?></a></li>
|
56 |
</ul>
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/controllers/IndexController.php
RENAMED
@@ -11,6 +11,21 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
11 |
var $blockObj;
|
12 |
private $loginRadiusPopMsg;
|
13 |
private $loginRadiusPopErr;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
14 |
protected function _getSession(){
|
15 |
return Mage::getSingleton('sociallogin/session');
|
16 |
}
|
@@ -22,23 +37,23 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
22 |
if(is_object($user_obj) && isset($user_obj->ID)){
|
23 |
$id = $user_obj->ID;
|
24 |
}else{
|
25 |
-
|
26 |
-
exit();
|
27 |
}
|
28 |
if(empty($id)){
|
29 |
//invalid user
|
30 |
-
|
31 |
exit();
|
32 |
}
|
33 |
// social linking variable
|
34 |
$socialLinking = false;
|
35 |
// social linking
|
36 |
-
if(isset($_GET['
|
37 |
$socialLinking = true;
|
38 |
}
|
39 |
//valid user, checking if user in sociallogin table
|
40 |
$socialLoginIdResult = $this->loginRadiusRead( "sociallogin", "get user", array($id), true );
|
41 |
$socialLoginIds = $socialLoginIdResult->fetchAll();
|
|
|
42 |
// variable to hold user id of the logged in user
|
43 |
$sociallogin_id = '';
|
44 |
foreach( $socialLoginIds as $socialLoginId ){
|
@@ -47,12 +62,12 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
47 |
if($rowArray = $select->fetch()){
|
48 |
if( $socialLoginId['verified'] == "0" ){
|
49 |
if(!$socialLinking){
|
50 |
-
|
51 |
-
|
52 |
}else{
|
53 |
// link account
|
54 |
$this->loginRadiusSocialLinking(Mage::getSingleton("customer/session")->getCustomer()->getId(), $user_obj->ID, $user_obj->Provider, $user_obj->ThumbnailImageUrl);
|
55 |
-
|
56 |
die;
|
57 |
}
|
58 |
}
|
@@ -74,14 +89,14 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
74 |
}
|
75 |
}else{
|
76 |
// account already exists
|
77 |
-
|
78 |
die;
|
79 |
}
|
80 |
}
|
81 |
// social linking
|
82 |
if($socialLinking){
|
83 |
$this->loginRadiusSocialLinking(Mage::getSingleton("customer/session")->getCustomer()->getId(), $user_obj->ID, $user_obj->Provider, $user_obj->ThumbnailImageUrl, true);
|
84 |
-
|
85 |
die;
|
86 |
}
|
87 |
// initialize email
|
@@ -113,8 +128,9 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
113 |
if($this->blockObj->getProfileFieldsRequired() == 1){
|
114 |
$id = $user_obj->ID;
|
115 |
$this->setInSession($id, $socialloginProfileData);
|
|
|
116 |
// show a popup to fill required profile fields
|
117 |
-
|
118 |
return;
|
119 |
}
|
120 |
$this->socialLoginAddNewUser( $socialloginProfileData );
|
@@ -130,8 +146,9 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
130 |
$id = $user_obj->ID;
|
131 |
//$socialloginProfileData = $this->socialLoginFilterData( $email, $user_obj );
|
132 |
$this->setInSession($id, $socialloginProfileData);
|
|
|
133 |
// show a popup to fill required profile fields
|
134 |
-
|
135 |
return;
|
136 |
}
|
137 |
// create new user
|
@@ -143,9 +160,11 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
143 |
$this->setInSession($id, $socialloginProfileData);
|
144 |
if($this->blockObj->getProfileFieldsRequired() == 1){
|
145 |
// show a popup to fill required profile fields
|
146 |
-
|
|
|
147 |
}else{
|
148 |
-
|
|
|
149 |
}
|
150 |
return;
|
151 |
}
|
@@ -171,7 +190,7 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
171 |
function loginRadiusSocialLinking($entityId, $socialId, $provider, $thumbnail, $unique = false){
|
172 |
// check if any account from this provider is already linked
|
173 |
if($unique && $this->loginRadiusRead( "sociallogin", "provider exists in sociallogin", array($entityId, $provider))){
|
174 |
-
|
175 |
die;
|
176 |
}
|
177 |
$socialLoginLinkData = array();
|
@@ -212,20 +231,26 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
212 |
$socialloginProfileData['Country'] = "";
|
213 |
}
|
214 |
$socialloginProfileData['thumbnail'] = $this->socialLoginFilterAvatar( $user_obj->ID, $user_obj->ThumbnailImageUrl, $socialloginProfileData['Provider'] );
|
215 |
-
|
216 |
-
|
217 |
-
|
218 |
-
|
219 |
-
|
220 |
-
|
221 |
-
$socialloginProfileData['
|
222 |
-
|
223 |
-
|
224 |
-
$
|
225 |
-
|
226 |
-
|
|
|
|
|
|
|
|
|
|
|
227 |
}
|
228 |
}
|
|
|
229 |
$socialloginProfileData['Gender'] = (!empty($user_obj->Gender) ? $user_obj->Gender : '');
|
230 |
if( strtolower(substr($socialloginProfileData['Gender'], 0, 1)) == 'm' ){
|
231 |
$socialloginProfileData['Gender'] = '1';
|
@@ -283,20 +308,20 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
283 |
$url = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK);
|
284 |
// check if logged in from callback page
|
285 |
if(isset($_GET['loginradiuscheckout'])){
|
286 |
-
|
287 |
exit();
|
288 |
return;
|
289 |
}
|
290 |
if($Hover == 'account'){
|
291 |
-
|
292 |
exit();
|
293 |
return;
|
294 |
}elseif($Hover == 'index' ){
|
295 |
-
|
296 |
exit();
|
297 |
return;
|
298 |
}elseif( $Hover == 'custom' && $write_url != '' ) {
|
299 |
-
|
300 |
exit();
|
301 |
return;
|
302 |
}else{
|
@@ -305,7 +330,7 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
305 |
}else{
|
306 |
$currentUrl = $url;
|
307 |
}
|
308 |
-
|
309 |
exit();
|
310 |
return;
|
311 |
}
|
@@ -316,6 +341,15 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
316 |
Mage::getSingleton('core/session')->setSocialLoginData( $socialloginProfileData );
|
317 |
}
|
318 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
319 |
function loginRadiusEmail( $subject, $message, $to, $toName ){
|
320 |
$storeName = Mage::app()->getStore()->getGroup()->getName();
|
321 |
$mail = new Zend_Mail('UTF-8'); //class for mail
|
@@ -401,18 +435,18 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
401 |
if(($update && !$matched) || !$update){
|
402 |
$address->firstname = $customer->firstname;
|
403 |
$address->lastname = $customer->lastname;
|
404 |
-
$address->country_id =
|
405 |
if(isset($socialloginProfileData['Zipcode'])){
|
406 |
$address->postcode = $socialloginProfileData['Zipcode'];
|
407 |
}
|
408 |
-
$address->city = ucfirst(
|
409 |
// If country is USA, set up province
|
410 |
if(isset($socialloginProfileData['Province'])){
|
411 |
$address->region = $socialloginProfileData['Province'];
|
412 |
}
|
413 |
-
$address->telephone = $socialloginProfileData['PhoneNumber'];
|
414 |
-
$address->company = ucfirst(
|
415 |
-
$address->street = ucfirst(
|
416 |
// set default billing, shipping address and save in address book
|
417 |
$address -> setIsDefaultShipping('1') -> setIsDefaultBilling('1') -> setSaveInAddressBook('1');
|
418 |
$address->save();
|
@@ -435,7 +469,7 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
435 |
if( $this->blockObj->notifyUser() == "1" ){
|
436 |
$loginRadiusMessage = $this->blockObj->notifyUserText();
|
437 |
if( $loginRadiusMessage == "" ){
|
438 |
-
$loginRadiusMessage = __("Welcome to ").$store->getGroup()->getName().". ".__("You can login to the store using following e-mail address and password
|
439 |
}
|
440 |
$loginRadiusMessage .= "<br/>".
|
441 |
"Email : ".$socialloginProfileData['Email'].
|
@@ -449,7 +483,7 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
449 |
$loginRadiusAdminName = Mage::getStoreConfig('trans_email/ident_general/name');
|
450 |
$loginRadiusMessage = trim($this->blockObj->notifyAdminText());
|
451 |
if( $loginRadiusMessage == "" ){
|
452 |
-
$loginRadiusMessage = __("New customer has been registered to your store with following details
|
453 |
}
|
454 |
$loginRadiusMessage .= "<br/>".
|
455 |
__("Name")." : ".$loginRadiusUsername."<br/>".
|
@@ -545,12 +579,13 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
545 |
// send verification mail
|
546 |
$message = __(Mage::helper('core')->htmlEscape(trim($this->blockObj->verificationText())));
|
547 |
if( $message == "" ){
|
548 |
-
$message = __("Please click on the following link or paste it in browser to verify your email
|
549 |
}
|
550 |
$message .= "<br/>".Mage::getBaseUrl()."sociallogin/?loginRadiusKey=".$vKey;
|
551 |
$this->loginRadiusEmail( __("Email verification"), $message, $email, $email);
|
|
|
552 |
// show popup message
|
553 |
-
|
554 |
$this->SocialLoginShowLayout();
|
555 |
return;
|
556 |
}
|
@@ -578,7 +613,8 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
578 |
$tempUpdate = array("verified" => '1', "vkey" => '');
|
579 |
$tempUpdate2 = array("vkey = ?" => $loginRadiusVkey);
|
580 |
$this->SocialLoginInsert( "sociallogin", $tempUpdate, true, $tempUpdate2 );
|
581 |
-
|
|
|
582 |
|
583 |
// check if verification for same provider is still pending on this entity_id
|
584 |
if( $this->loginRadiusRead( "sociallogin", "verification2", array( $temp['entity_id'], $temp['provider'] ) ) ){
|
@@ -593,7 +629,12 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
593 |
$session_user_id = $socialLoginProfileData['lrId'];
|
594 |
$loginRadiusPopProvider = $socialLoginProfileData['Provider'];
|
595 |
$loginRadiusAvatar = $socialLoginProfileData['thumbnail'];
|
596 |
-
|
|
|
|
|
|
|
|
|
|
|
597 |
if(isset($_POST['LoginRadiusRedSliderClick'])) {
|
598 |
if(!empty($session_user_id) ){
|
599 |
$loginRadiusProfileData = array();
|
@@ -626,7 +667,8 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
626 |
}else{
|
627 |
$hideZipCountry = true;
|
628 |
}
|
629 |
-
|
|
|
630 |
$this->SocialLoginShowLayout();
|
631 |
return false;
|
632 |
}
|
@@ -643,14 +685,16 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
643 |
$this->socialLoginUserLogin( $rowArray['entity_id'], $rowArray2['sociallogin_id'] );
|
644 |
return;
|
645 |
}else{
|
646 |
-
|
|
|
647 |
$this->SocialLoginShowLayout();
|
648 |
return;
|
649 |
}
|
650 |
}else{
|
651 |
// check sociallogin id
|
652 |
if( $rowArray2['sociallogin_id'] == $session_user_id ){
|
653 |
-
|
|
|
654 |
$this->SocialLoginShowLayout();
|
655 |
return;
|
656 |
}else{
|
@@ -668,7 +712,8 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
668 |
}
|
669 |
// validate other profile fields
|
670 |
if((isset($profileAddress) && $profileAddress == "") || (isset($profileCity) && $profileCity == "") || (isset($profileCountry) && $profileCountry == "") || (isset($profilePhone) && $profilePhone == "")){
|
671 |
-
|
|
|
672 |
$this->SocialLoginShowLayout();
|
673 |
return false;
|
674 |
}
|
@@ -710,8 +755,16 @@ class Loginradius_Sociallogin_IndexController extends Mage_Core_Controller_Front
|
|
710 |
}
|
711 |
}elseif( isset($_POST['LoginRadiusPopupCancel']) ) { // popup cancelled
|
712 |
Mage::getSingleton('core/session')->unsSocialLoginData(); // unset session
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
713 |
$url = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK);
|
714 |
-
|
715 |
}
|
716 |
$this->SocialLoginShowLayout();
|
717 |
}
|
11 |
var $blockObj;
|
12 |
private $loginRadiusPopMsg;
|
13 |
private $loginRadiusPopErr;
|
14 |
+
|
15 |
+
function redirect($url){
|
16 |
+
?>
|
17 |
+
<script>
|
18 |
+
if(window.opener){
|
19 |
+
window.opener.location.href = "<?php echo $url; ?>";
|
20 |
+
window.close();
|
21 |
+
}else{
|
22 |
+
window.location.href = "<?php echo $url; ?>";
|
23 |
+
}
|
24 |
+
</script>
|
25 |
+
<?php
|
26 |
+
die;
|
27 |
+
}
|
28 |
+
|
29 |
protected function _getSession(){
|
30 |
return Mage::getSingleton('sociallogin/session');
|
31 |
}
|
37 |
if(is_object($user_obj) && isset($user_obj->ID)){
|
38 |
$id = $user_obj->ID;
|
39 |
}else{
|
40 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK));
|
|
|
41 |
}
|
42 |
if(empty($id)){
|
43 |
//invalid user
|
44 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK));
|
45 |
exit();
|
46 |
}
|
47 |
// social linking variable
|
48 |
$socialLinking = false;
|
49 |
// social linking
|
50 |
+
if(isset($_GET['loginRadiusLinking']) && trim($_GET['loginRadiusLinking']) == 1){
|
51 |
$socialLinking = true;
|
52 |
}
|
53 |
//valid user, checking if user in sociallogin table
|
54 |
$socialLoginIdResult = $this->loginRadiusRead( "sociallogin", "get user", array($id), true );
|
55 |
$socialLoginIds = $socialLoginIdResult->fetchAll();
|
56 |
+
|
57 |
// variable to hold user id of the logged in user
|
58 |
$sociallogin_id = '';
|
59 |
foreach( $socialLoginIds as $socialLoginId ){
|
62 |
if($rowArray = $select->fetch()){
|
63 |
if( $socialLoginId['verified'] == "0" ){
|
64 |
if(!$socialLinking){
|
65 |
+
$this -> setTmpSession("Please verify your email to login.", "", false);
|
66 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK)."sociallogin?loginradiuspopup=1");
|
67 |
}else{
|
68 |
// link account
|
69 |
$this->loginRadiusSocialLinking(Mage::getSingleton("customer/session")->getCustomer()->getId(), $user_obj->ID, $user_obj->Provider, $user_obj->ThumbnailImageUrl);
|
70 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK)."customer/account/?LoginRadiusLinked=1");
|
71 |
die;
|
72 |
}
|
73 |
}
|
89 |
}
|
90 |
}else{
|
91 |
// account already exists
|
92 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK)."customer/account/?LoginRadiusLinked=0");
|
93 |
die;
|
94 |
}
|
95 |
}
|
96 |
// social linking
|
97 |
if($socialLinking){
|
98 |
$this->loginRadiusSocialLinking(Mage::getSingleton("customer/session")->getCustomer()->getId(), $user_obj->ID, $user_obj->Provider, $user_obj->ThumbnailImageUrl, true);
|
99 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK)."customer/account/?LoginRadiusLinked=1");
|
100 |
die;
|
101 |
}
|
102 |
// initialize email
|
128 |
if($this->blockObj->getProfileFieldsRequired() == 1){
|
129 |
$id = $user_obj->ID;
|
130 |
$this->setInSession($id, $socialloginProfileData);
|
131 |
+
$this -> setTmpSession("Please provide following details", "", true, $socialloginProfileData, false);
|
132 |
// show a popup to fill required profile fields
|
133 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK)."sociallogin?loginradiuspopup=1");
|
134 |
return;
|
135 |
}
|
136 |
$this->socialLoginAddNewUser( $socialloginProfileData );
|
146 |
$id = $user_obj->ID;
|
147 |
//$socialloginProfileData = $this->socialLoginFilterData( $email, $user_obj );
|
148 |
$this->setInSession($id, $socialloginProfileData);
|
149 |
+
$this -> setTmpSession("Please provide following details", "", true, $socialloginProfileData, false);
|
150 |
// show a popup to fill required profile fields
|
151 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK)."sociallogin?loginradiuspopup=1");
|
152 |
return;
|
153 |
}
|
154 |
// create new user
|
160 |
$this->setInSession($id, $socialloginProfileData);
|
161 |
if($this->blockObj->getProfileFieldsRequired() == 1){
|
162 |
// show a popup to fill required profile fields
|
163 |
+
$this -> setTmpSession("Please provide following details", "", true, $socialloginProfileData, true);
|
164 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK)."sociallogin?loginradiuspopup=1");
|
165 |
}else{
|
166 |
+
$this -> setTmpSession($this->loginRadiusPopMsg, "", true, array(), true, true);
|
167 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK)."sociallogin?loginradiuspopup=1");
|
168 |
}
|
169 |
return;
|
170 |
}
|
190 |
function loginRadiusSocialLinking($entityId, $socialId, $provider, $thumbnail, $unique = false){
|
191 |
// check if any account from this provider is already linked
|
192 |
if($unique && $this->loginRadiusRead( "sociallogin", "provider exists in sociallogin", array($entityId, $provider))){
|
193 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK)."customer/account/?LoginRadiusLinked=2");
|
194 |
die;
|
195 |
}
|
196 |
$socialLoginLinkData = array();
|
231 |
$socialloginProfileData['Country'] = "";
|
232 |
}
|
233 |
$socialloginProfileData['thumbnail'] = $this->socialLoginFilterAvatar( $user_obj->ID, $user_obj->ThumbnailImageUrl, $socialloginProfileData['Provider'] );
|
234 |
+
|
235 |
+
|
236 |
+
if(empty($socialloginProfileData['FirstName'])){
|
237 |
+
if(!empty($socialloginProfileData['FullName'])){
|
238 |
+
$socialloginProfileData['FirstName'] = $socialloginProfileData['FullName'];
|
239 |
+
}
|
240 |
+
elseif(!empty($socialloginProfileData['ProfileName'])){
|
241 |
+
$socialloginProfileData['FirstName'] = $socialloginProfileData['ProfileName'];
|
242 |
+
}
|
243 |
+
elseif(!empty($socialloginProfileData['NickName'])){
|
244 |
+
$socialloginProfileData['FirstName'] = $socialloginProfileData['NickName'];
|
245 |
+
}elseif(!empty($email)){
|
246 |
+
$user_name = explode('@', $email);
|
247 |
+
$username = $user_name[0];
|
248 |
+
$socialloginProfileData['FirstName'] = str_replace("_", " ", $user_name[0]);
|
249 |
+
}else{
|
250 |
+
$socialloginProfileData['FirstName'] = $user_obj->ID;
|
251 |
}
|
252 |
}
|
253 |
+
|
254 |
$socialloginProfileData['Gender'] = (!empty($user_obj->Gender) ? $user_obj->Gender : '');
|
255 |
if( strtolower(substr($socialloginProfileData['Gender'], 0, 1)) == 'm' ){
|
256 |
$socialloginProfileData['Gender'] = '1';
|
308 |
$url = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK);
|
309 |
// check if logged in from callback page
|
310 |
if(isset($_GET['loginradiuscheckout'])){
|
311 |
+
$this -> redirect( Mage::helper('checkout/url')->getCheckoutUrl() );
|
312 |
exit();
|
313 |
return;
|
314 |
}
|
315 |
if($Hover == 'account'){
|
316 |
+
$this -> redirect( $url.'customer/account' );
|
317 |
exit();
|
318 |
return;
|
319 |
}elseif($Hover == 'index' ){
|
320 |
+
$this -> redirect( $url.'') ;
|
321 |
exit();
|
322 |
return;
|
323 |
}elseif( $Hover == 'custom' && $write_url != '' ) {
|
324 |
+
$this -> redirect( $write_url.'' );
|
325 |
exit();
|
326 |
return;
|
327 |
}else{
|
330 |
}else{
|
331 |
$currentUrl = $url;
|
332 |
}
|
333 |
+
$this -> redirect( $currentUrl);
|
334 |
exit();
|
335 |
return;
|
336 |
}
|
341 |
Mage::getSingleton('core/session')->setSocialLoginData( $socialloginProfileData );
|
342 |
}
|
343 |
|
344 |
+
function setTmpSession($loginRadiusPopupTxt = '', $socialLoginMsg = "", $loginRadiusShowForm = true, $profileData = array(), $emailRequired = true, $hideZipcode = false){
|
345 |
+
Mage::getSingleton('core/session')->setTmpPopupTxt( $loginRadiusPopupTxt );
|
346 |
+
Mage::getSingleton('core/session')->setTmpPopupMsg( $socialLoginMsg );
|
347 |
+
Mage::getSingleton('core/session')->setTmpShowForm( $loginRadiusShowForm );
|
348 |
+
Mage::getSingleton('core/session')->setTmpProfileData( $profileData );
|
349 |
+
Mage::getSingleton('core/session')->setTmpEmailRequired( $emailRequired );
|
350 |
+
Mage::getSingleton('core/session')->setTmpHideZipcode( $hideZipcode );
|
351 |
+
}
|
352 |
+
|
353 |
function loginRadiusEmail( $subject, $message, $to, $toName ){
|
354 |
$storeName = Mage::app()->getStore()->getGroup()->getName();
|
355 |
$mail = new Zend_Mail('UTF-8'); //class for mail
|
435 |
if(($update && !$matched) || !$update){
|
436 |
$address->firstname = $customer->firstname;
|
437 |
$address->lastname = $customer->lastname;
|
438 |
+
$address->country_id = isset($socialloginProfileData['Country']) ? ucfirst($socialloginProfileData['Country']) : '';
|
439 |
if(isset($socialloginProfileData['Zipcode'])){
|
440 |
$address->postcode = $socialloginProfileData['Zipcode'];
|
441 |
}
|
442 |
+
$address->city = isset($socialloginProfileData['City']) ? ucfirst($socialloginProfileData['City']) : '';
|
443 |
// If country is USA, set up province
|
444 |
if(isset($socialloginProfileData['Province'])){
|
445 |
$address->region = $socialloginProfileData['Province'];
|
446 |
}
|
447 |
+
$address->telephone = isset($socialloginProfileData['PhoneNumber']) ? ucfirst($socialloginProfileData['PhoneNumber']) : '';
|
448 |
+
$address->company = isset($socialloginProfileData['Industry']) ? ucfirst($socialloginProfileData['Industry']) : '';
|
449 |
+
$address->street = isset($socialloginProfileData['Address']) ? ucfirst($socialloginProfileData['Address']) : '';
|
450 |
// set default billing, shipping address and save in address book
|
451 |
$address -> setIsDefaultShipping('1') -> setIsDefaultBilling('1') -> setSaveInAddressBook('1');
|
452 |
$address->save();
|
469 |
if( $this->blockObj->notifyUser() == "1" ){
|
470 |
$loginRadiusMessage = $this->blockObj->notifyUserText();
|
471 |
if( $loginRadiusMessage == "" ){
|
472 |
+
$loginRadiusMessage = __("Welcome to ").$store->getGroup()->getName().". ".__("You can login to the store using following e-mail address and password");
|
473 |
}
|
474 |
$loginRadiusMessage .= "<br/>".
|
475 |
"Email : ".$socialloginProfileData['Email'].
|
483 |
$loginRadiusAdminName = Mage::getStoreConfig('trans_email/ident_general/name');
|
484 |
$loginRadiusMessage = trim($this->blockObj->notifyAdminText());
|
485 |
if( $loginRadiusMessage == "" ){
|
486 |
+
$loginRadiusMessage = __("New customer has been registered to your store with following details");
|
487 |
}
|
488 |
$loginRadiusMessage .= "<br/>".
|
489 |
__("Name")." : ".$loginRadiusUsername."<br/>".
|
579 |
// send verification mail
|
580 |
$message = __(Mage::helper('core')->htmlEscape(trim($this->blockObj->verificationText())));
|
581 |
if( $message == "" ){
|
582 |
+
$message = __("Please click on the following link or paste it in browser to verify your email");
|
583 |
}
|
584 |
$message .= "<br/>".Mage::getBaseUrl()."sociallogin/?loginRadiusKey=".$vKey;
|
585 |
$this->loginRadiusEmail( __("Email verification"), $message, $email, $email);
|
586 |
+
$this -> setTmpSession( "Confirmation link has been sent to your email address. Please verify your email by clicking on confirmation link.", "", false );
|
587 |
// show popup message
|
588 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK)."sociallogin?loginradiuspopup=1");
|
589 |
$this->SocialLoginShowLayout();
|
590 |
return;
|
591 |
}
|
613 |
$tempUpdate = array("verified" => '1', "vkey" => '');
|
614 |
$tempUpdate2 = array("vkey = ?" => $loginRadiusVkey);
|
615 |
$this->SocialLoginInsert( "sociallogin", $tempUpdate, true, $tempUpdate2 );
|
616 |
+
$this -> setTmpSession("Your email has been verified. Now you can login to your account.", "", false );
|
617 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK)."sociallogin?loginradiuspopup=1");
|
618 |
|
619 |
// check if verification for same provider is still pending on this entity_id
|
620 |
if( $this->loginRadiusRead( "sociallogin", "verification2", array( $temp['entity_id'], $temp['provider'] ) ) ){
|
629 |
$session_user_id = $socialLoginProfileData['lrId'];
|
630 |
$loginRadiusPopProvider = $socialLoginProfileData['Provider'];
|
631 |
$loginRadiusAvatar = $socialLoginProfileData['thumbnail'];
|
632 |
+
// popup check
|
633 |
+
if(isset($_GET['loginradiuspopup'])){
|
634 |
+
SL_popUpWindow( Mage::getSingleton('core/session')->getTmpPopupTxt(), Mage::getSingleton('core/session')->getTmpPopupMsg(), Mage::getSingleton('core/session')->getTmpShowForm(), Mage::getSingleton('core/session')->getTmpProfileData(), Mage::getSingleton('core/session')->getTmpEmailRequired(), Mage::getSingleton('core/session')->getTmpHideZipcode());
|
635 |
+
$this -> SocialLoginShowLayout();
|
636 |
+
return;
|
637 |
+
}
|
638 |
if(isset($_POST['LoginRadiusRedSliderClick'])) {
|
639 |
if(!empty($session_user_id) ){
|
640 |
$loginRadiusProfileData = array();
|
667 |
}else{
|
668 |
$hideZipCountry = true;
|
669 |
}
|
670 |
+
$this -> setTmpSession($this->loginRadiusPopMsg, $this->loginRadiusPopErr, true, $loginRadiusProfileData, true, $hideZipCountry);
|
671 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK)."sociallogin?loginradiuspopup=1");
|
672 |
$this->SocialLoginShowLayout();
|
673 |
return false;
|
674 |
}
|
685 |
$this->socialLoginUserLogin( $rowArray['entity_id'], $rowArray2['sociallogin_id'] );
|
686 |
return;
|
687 |
}else{
|
688 |
+
$this -> setTmpSession($this->loginRadiusPopMsg, $this->loginRadiusPopErr, true, array(), true, true);
|
689 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK)."sociallogin?loginradiuspopup=1");
|
690 |
$this->SocialLoginShowLayout();
|
691 |
return;
|
692 |
}
|
693 |
}else{
|
694 |
// check sociallogin id
|
695 |
if( $rowArray2['sociallogin_id'] == $session_user_id ){
|
696 |
+
$this -> setTmpSession("Please provide following details", "", true, $socialloginProfileData, false);
|
697 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK)."sociallogin?loginradiuspopup=1");
|
698 |
$this->SocialLoginShowLayout();
|
699 |
return;
|
700 |
}else{
|
712 |
}
|
713 |
// validate other profile fields
|
714 |
if((isset($profileAddress) && $profileAddress == "") || (isset($profileCity) && $profileCity == "") || (isset($profileCountry) && $profileCountry == "") || (isset($profilePhone) && $profilePhone == "")){
|
715 |
+
$this -> setTmpSession("", "Please fill all the fields", true, $loginRadiusProfileData, true);
|
716 |
+
$this -> redirect(Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK)."sociallogin?loginradiuspopup=1");
|
717 |
$this->SocialLoginShowLayout();
|
718 |
return false;
|
719 |
}
|
755 |
}
|
756 |
}elseif( isset($_POST['LoginRadiusPopupCancel']) ) { // popup cancelled
|
757 |
Mage::getSingleton('core/session')->unsSocialLoginData(); // unset session
|
758 |
+
|
759 |
+
Mage::getSingleton('core/session')->unsTmpPopupTxt();
|
760 |
+
Mage::getSingleton('core/session')->unsTmpPopupMsg();
|
761 |
+
Mage::getSingleton('core/session')->unsTmpShowForm();
|
762 |
+
Mage::getSingleton('core/session')->unsTmpProfileData();
|
763 |
+
Mage::getSingleton('core/session')->unsTmpEmailRequired();
|
764 |
+
Mage::getSingleton('core/session')->unsTmpHideZipcode();
|
765 |
+
|
766 |
$url = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK);
|
767 |
+
$this -> redirect($url); // redirect to index page
|
768 |
}
|
769 |
$this->SocialLoginShowLayout();
|
770 |
}
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/controllers/Popup.php
RENAMED
@@ -190,7 +190,7 @@ function SL_popUpWindow( $loginRadiusPopupTxt, $socialLoginMsg = "", $loginRadiu
|
|
190 |
<?php
|
191 |
if( $loginRadiusShowForm ){
|
192 |
?>
|
193 |
-
<form id="loginRadiusForm" method="post" action="" onSubmit="return loginRadiusValidateForm()">
|
194 |
<?php
|
195 |
if($emailRequired){
|
196 |
?>
|
190 |
<?php
|
191 |
if( $loginRadiusShowForm ){
|
192 |
?>
|
193 |
+
<form id="loginRadiusForm" method="post" action="<?php echo Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_LINK) . 'sociallogin' ?>" onSubmit="return loginRadiusValidateForm()">
|
194 |
<?php
|
195 |
if($emailRequired){
|
196 |
?>
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/etc/config.xml
RENAMED
@@ -11,6 +11,7 @@
|
|
11 |
<redirect>account</redirect>
|
12 |
<aboveLogin>1</aboveLogin>
|
13 |
<aboveRegister>1</aboveRegister>
|
|
|
14 |
</messages>
|
15 |
<email_settings>
|
16 |
<profileFieldsRequired>0</profileFieldsRequired>
|
@@ -46,7 +47,7 @@
|
|
46 |
</default>
|
47 |
<modules>
|
48 |
<Loginradius_Sociallogin>
|
49 |
-
<version>3.
|
50 |
</Loginradius_Sociallogin>
|
51 |
</modules>
|
52 |
<frontend>
|
11 |
<redirect>account</redirect>
|
12 |
<aboveLogin>1</aboveLogin>
|
13 |
<aboveRegister>1</aboveRegister>
|
14 |
+
<sameWindow>1</sameWindow>
|
15 |
</messages>
|
16 |
<email_settings>
|
17 |
<profileFieldsRequired>0</profileFieldsRequired>
|
47 |
</default>
|
48 |
<modules>
|
49 |
<Loginradius_Sociallogin>
|
50 |
+
<version>3.7.0</version>
|
51 |
</Loginradius_Sociallogin>
|
52 |
</modules>
|
53 |
<frontend>
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/etc/system.xml
RENAMED
@@ -68,6 +68,16 @@
|
|
68 |
<show_in_website>1</show_in_website>
|
69 |
<show_in_store>1</show_in_store>
|
70 |
</loginradius_title>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
71 |
<iconSize translate="label">
|
72 |
<label>Social Login icons size</label>
|
73 |
<frontend_type>radios</frontend_type>
|
68 |
<show_in_website>1</show_in_website>
|
69 |
<show_in_store>1</show_in_store>
|
70 |
</loginradius_title>
|
71 |
+
<sameWindow translate="label">
|
72 |
+
<label>Release authentication response in ID provider pop-up?</label>
|
73 |
+
<frontend_type>radios</frontend_type>
|
74 |
+
<comment><![CDATA[This is used for better user experience.]]></comment>
|
75 |
+
<source_model>sociallogin/source_loginPopup</source_model>
|
76 |
+
<sort_order>18</sort_order>
|
77 |
+
<show_in_default>1</show_in_default>
|
78 |
+
<show_in_website>1</show_in_website>
|
79 |
+
<show_in_store>1</show_in_store>
|
80 |
+
</sameWindow>
|
81 |
<iconSize translate="label">
|
82 |
<label>Social Login icons size</label>
|
83 |
<frontend_type>radios</frontend_type>
|
app/code/community/{Loginradius → LoginRadius}/Sociallogin/etc/widget.xml
RENAMED
File without changes
|
app/code/community/{Loginradius/Sociallogin/sql/sociallogin_setup/mysql4-install-3.6.0.php → LoginRadius/Sociallogin/sql/sociallogin_setup/mysql4-install-3.7.0.php}
RENAMED
@@ -4,7 +4,7 @@ $installer->startSetup();
|
|
4 |
$installer->run("
|
5 |
DROP TABLE IF EXISTS {$this->getTable('sociallogin')};
|
6 |
CREATE TABLE IF NOT EXISTS {$this->getTable('sociallogin')} (
|
7 |
-
`sociallogin_id` varchar(
|
8 |
`entity_id` int(11) default NULL,
|
9 |
`avatar` varchar(1000) default NULL,
|
10 |
`verified` enum('0','1') default NULL,
|
4 |
$installer->run("
|
5 |
DROP TABLE IF EXISTS {$this->getTable('sociallogin')};
|
6 |
CREATE TABLE IF NOT EXISTS {$this->getTable('sociallogin')} (
|
7 |
+
`sociallogin_id` varchar(200) default NULL,
|
8 |
`entity_id` int(11) default NULL,
|
9 |
`avatar` varchar(1000) default NULL,
|
10 |
`verified` enum('0','1') default NULL,
|
app/design/adminhtml/default/default/layout/loginradius_sociallogin.xml
CHANGED
@@ -1,5 +1,5 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
-
<layout version="3.
|
3 |
<default>
|
4 |
<reference name="head">
|
5 |
<action method="addJs"><script>../skin/frontend/base/default/Loginradius/Sociallogin/js/jquery.js</script></action>
|
1 |
<?xml version="1.0"?>
|
2 |
+
<layout version="3.7.0">
|
3 |
<default>
|
4 |
<reference name="head">
|
5 |
<action method="addJs"><script>../skin/frontend/base/default/Loginradius/Sociallogin/js/jquery.js</script></action>
|
app/design/frontend/default/default/layout/sociallogin.xml
CHANGED
@@ -1,5 +1,5 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
-
<layout version="3.
|
3 |
<default>
|
4 |
<reference name="right">
|
5 |
<block type="sociallogin/sociallogin" name="sociallogin" template="sociallogin/sociallogin.phtml" before="-" />
|
1 |
<?xml version="1.0"?>
|
2 |
+
<layout version="3.7.0">
|
3 |
<default>
|
4 |
<reference name="right">
|
5 |
<block type="sociallogin/sociallogin" name="sociallogin" template="sociallogin/sociallogin.phtml" before="-" />
|
app/design/frontend/default/default/template/sociallogin/socialshare_head.phtml
CHANGED
@@ -149,7 +149,7 @@ if( $this->loginEnable() == "1" ){
|
|
149 |
}
|
150 |
?>
|
151 |
<script src="//hub.loginradius.com/include/js/LoginRadius.js" ></script>
|
152 |
-
<script type="text/javascript"> var options={}; options.login=true; LoginRadius_SocialLogin.util.ready(function () { $ui = LoginRadius_SocialLogin.lr_login_settings;$ui.interfacesize = "<?php echo $this->iconSize() == 'small' ? 'small' : '' ?>"; <?php if(trim($this->iconsPerRow()) != ''){ echo '$ui.noofcolumns = '.trim($this->iconsPerRow()).';'; } ?> $ui.apikey = "<?php echo trim($this->getApikey()) ?>";$ui.callback = "<?php echo $loginRadiusCallback ?>"; $ui.lrinterfacebackground = "<?php if(trim($this->backgroundColor()) != ''){ echo trim($this->backgroundColor()); } ?>"; $ui.lrinterfacecontainer ="interfacecontainerdiv"; LoginRadius_SocialLogin.init(options); });
|
153 |
</script>
|
154 |
<?php
|
155 |
}
|
149 |
}
|
150 |
?>
|
151 |
<script src="//hub.loginradius.com/include/js/LoginRadius.js" ></script>
|
152 |
+
<script type="text/javascript"> var options={}; options.login=true; LoginRadius_SocialLogin.util.ready(function () { $ui = LoginRadius_SocialLogin.lr_login_settings;$ui.interfacesize = "<?php echo $this->iconSize() == 'small' ? 'small' : '' ?>"; <?php if(trim($this->iconsPerRow()) != ''){ echo '$ui.noofcolumns = '.trim($this->iconsPerRow()).';'; } ?> $ui.apikey = "<?php echo trim($this->getApikey()) ?>";$ui.callback = "<?php echo $loginRadiusCallback ?>"; $ui.lrinterfacebackground = "<?php if(trim($this->backgroundColor()) != ''){ echo trim($this->backgroundColor()); } ?>"; $ui.lrinterfacecontainer ="interfacecontainerdiv"; $ui.samewindow = <?php if(trim($this->getLoginWindow()) != ''){ echo trim($this->getLoginWindow()); } ?>; LoginRadius_SocialLogin.init(options); });
|
153 |
</script>
|
154 |
<?php
|
155 |
}
|
package.xml
CHANGED
@@ -1,18 +1,18 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>LoginRadius</name>
|
4 |
-
<version>3.
|
5 |
<stability>stable</stability>
|
6 |
<license>GNU General Public License (GPL)</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Social Login and Sharing for Magento</summary>
|
10 |
<description>Add Social Login and Sharing to your Magento website and also get accurate User Profile Data and Social Analytics.</description>
|
11 |
-
<notes>
|
12 |
<authors><author><name>LoginRadius Team</name><user>LoginRadius</user><email>developers@loginradius.com</email></author></authors>
|
13 |
-
<date>
|
14 |
-
<time>03:
|
15 |
-
<contents><target name="
|
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>LoginRadius</name>
|
4 |
+
<version>3.7.0</version>
|
5 |
<stability>stable</stability>
|
6 |
<license>GNU General Public License (GPL)</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Social Login and Sharing for Magento</summary>
|
10 |
<description>Add Social Login and Sharing to your Magento website and also get accurate User Profile Data and Social Analytics.</description>
|
11 |
+
<notes>Thirteenth release of social login</notes>
|
12 |
<authors><author><name>LoginRadius Team</name><user>LoginRadius</user><email>developers@loginradius.com</email></author></authors>
|
13 |
+
<date>2014-01-08</date>
|
14 |
+
<time>03:54:00</time>
|
15 |
+
<contents><target name="magecommunity"><dir name="LoginRadius"><dir name="Sociallogin"><dir name="Block"><file name="Auth.php" hash="7ec44bd9926175c0bc40662116050252"/><file name="Sociallogin.php" hash="918df09944a385e68485fdd0224d69b6"/><file name="horizontalsharing.php" hash="daee7f72d53fd2492740cf546c897c37"/><file name="verticalsharing.php" hash="e2322a53ba7c97abbf495506d078e0fb"/></dir><dir name="Helper"><file name="Data.php" hash="7fe10f157031a33dd5c312f61f36f650"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Sociallogin"><file name="Collection.php" hash="b4632ab82692843577c985a3ed23981f"/></dir><file name="Sociallogin.php" hash="8c8d5d266c57ea0400d5a560a943ea14"/></dir><file name="Sociallogin.php" hash="a49fc157930cd09fcbe522aabb1d986b"/><dir name="Source"><file name="HorizontalSharing.php" hash="5e1c18d133cd3117e0eb0c732544177c"/><file name="Iconsize.php" hash="072bf28bd0d145829cbbae420b898d36"/><file name="LoginPopup.php" hash="8ba2cc068b1589bf324a0e4309ef0f9f"/><file name="SharingVerticalAlignment.php" hash="be293d7c6bddf42341be05ff092f857d"/><file name="Uihover.php" hash="6115effdefc9b9a870a03c79b56557aa"/><file name="Uihover2.php" hash="eea7208694113c353853ee5838bd9449"/><file name="VerticalSharing.php" hash="01788a41fea1546ddd334bf9c3f9d7f4"/></dir><dir name="System"><dir name="Config"><file name="Info.php" hash="02f7a69cd622726884ac8c58fc8d4100"/></dir></dir></dir><dir name="controllers"><file name="IndexController.php" hash="2fa4ef51fd0cadcbdaed9301b14f96ef"/><file name="Popup.php" hash="9799c22186dc85d31625b83c7731196d"/></dir><dir name="etc"><file name="config.xml" hash="fa596d8e4275e37155362c1922190006"/><file name="system.xml" hash="1090c3ee11f131fb99cdebb40ecb605b"/><file name="widget.xml" hash="f6e8a254aa3a9ff86f958710c4e8edca"/></dir><dir name="sql"><dir name="sociallogin_setup"><file name="mysql4-install-3.7.0.php" hash="3d30d28a993571d91575763bdb23b566"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="sociallogin.xml" hash="5229d542baee5cbfe8f0e677de5b711e"/></dir><dir name="template"><dir name="sociallogin"><file name="abovelogin.phtml" hash="76260ae94bc50ba7c2cd750f529747b4"/><file name="aboveregister.phtml" hash="fcc579c2bd34b2bc9877e61f6abfd0d5"/><file name="belowlogin.phtml" hash="cb854a34b1a5ef7262ffb1de3ff0f247"/><file name="belowregister.phtml" hash="b9a31437aa487f28f24cb046ad7a5239"/><file name="linking.phtml" hash="607c388e2d168b92978fb7978abcf54b"/><file name="linkingscript.phtml" hash="77f0e6348fed90c6cb24f064a8fac2e9"/><file name="sociallogin.phtml" hash="0b3979470d8dabde7f03fc09cde9ba90"/><file name="sociallogincustom.phtml" hash="04daac1337596641b2b3bdd38aad0dba"/><file name="socialshare_head.phtml" hash="9b310030dc65a958a216e45336fe3fcc"/><file name="socialshareproduct.phtml" hash="d4b16132913796507de4d2820b3302d2"/><file name="socialsharesuccess.phtml" hash="38e93ea63416c7fa84d498a994bcaf40"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="loginradius_sociallogin.xml" hash="ced3198b921c3eb2f125a250eb9155d6"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Loginradius_Sociallogin.xml" hash="6c5bb03c460936006692aa1d01d142ba"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="Loginradius"><dir name="Sociallogin"><dir name="css"><file name="admin-ui.css" hash="a2822df004eabad62380a827c7b415fd"/><file name="lrshare_iconsprite32.png" hash="a016ded3f25653acf2fa9dfab8a38103"/></dir><dir name="images"><dir name="Linking"><file name="amazon.png" hash="961d0082ed4b433d8e0274c133072e2c"/><file name="aol.png" hash="4e51f60c1b8750c5b9dfa94f56fe13b1"/><file name="facebook.png" hash="141309628c58912076f00954b3fd19a6"/><file name="foursquare.png" hash="de2f4fcf5b3c1156f22ed546f5c3f0c5"/><file name="github.png" hash="45f8e1436fc5c5803ed9d4edb7cb59b6"/><file name="google.png" hash="ffeddc7d14c9b4de2efb6b8ea0f5f652"/><file name="hyves.png" hash="3c77fd2243b22c61915a950c3910f37c"/><file name="kaixin.png" hash="bc84991a5c9d15e20946fae5e9c27f4d"/><file name="linkedin.png" hash="7a9bc12ec91ab2a30442c56a9f70e9ea"/><file name="live.png" hash="9d747bae72fc0f2e3a04f32896d62fbc"/><file name="livejournal.png" hash="e21f34630444412ab3dd197884e0c2e6"/><file name="mixi.png" hash="909e7edc76e59b448d56043eee5e1412"/><file name="myopenid.png" hash="c8295969044cb9d99f8348091ba75319"/><file name="myspace.png" hash="42cd07decb5f4a1fba604ef8df32ef2e"/><file name="odnoklassniki.png" hash="34cd7d239583b015cdd1adb5b7fec085"/><file name="openid.png" hash="92bd4471ef1d5dd04855887806db74f0"/><file name="orange.png" hash="9b9b8f2da956a238e7d58c241423af8a"/><file name="paypal.png" hash="082f0b50411b1dfb1bfd86cfdeb92cea"/><file name="persona.png" hash="e0d926f89e9c428aece1e0f9dbb1f8f2"/><file name="qq.png" hash="8e6dc34bdf03f07277e0aadf8706a4a7"/><file name="renren.png" hash="040a0af8119b7f85bfc2df41ec56f915"/><file name="salesforce.png" hash="e41bcac63438bb04af3a9745b816a675"/><file name="stackexchange.png" hash="8ab952fe75d4a96d6752792ffdcbf0c3"/><file name="steamcommunity.png" hash="ad05c57a4ee01ebc01428b0da905d6b6"/><file name="twitter.png" hash="48044aca3a1d4864361f78c02ba86848"/><file name="verisign.png" hash="7a15fd820171218d803d26e7a3ec46a3"/><file name="virgilio.png" hash="f5c3b6e19c38903a192954934000f60a"/><file name="vkontakte.png" hash="ae1e98911fe9ea6da8a50a568c082133"/><file name="wordpress.png" hash="8ce8b46a2233b8497dd10d9c4d535e22"/><file name="yahoo.png" hash="5c159cc8fed73621b2c12600f8dac288"/></dir><dir name="Sharing"><dir name="Horizontal"><file name="horizonSharing16.png" hash="64188c128c8263c052153cf9708ac218"/><file name="horizonSharing32.png" hash="5e85ac81864885bcef5cc9691a9eba49"/><file name="horizontal.png" hash="6bb8038603bbf9cc70bac8365eebd7ba"/><file name="single-image-theme-large.png" hash="e6ff4a26149b631639b601d95e2dc361"/><file name="single-image-theme-small.png" hash="8c2b20fa0f276e33f3876783eb2cbd74"/><file name="vertical.png" hash="9c71cfb83ffb121a0ef89e263d474387"/></dir><dir name="Vertical"><file name="16VerticlewithBox.png" hash="73b3abf54889144e9188ffaa76cbb11f"/><file name="32VerticlewithBox.png" hash="37060e164ca4f7c00f430d5f1ab7eddd"/><file name="verticalhorizontal.png" hash="469ce5302d294dc987bdb070ef448446"/><file name="verticalvertical.png" hash="f59288edc8c87dde216b6616027aa72b"/></dir></dir></dir><dir name="js"><file name="admin-ui.js" hash="5a13f39c431397e4fc5f8488dd4e072f"/><file name="jquery.js" hash="5654b0561c66ca9c0ad2a1dd75e5d9b8"/><file name="jquery.ui.sortable.min.js" hash="b847eafb05bcc6ef0908ff07dcd2b0f1"/></dir></dir></dir></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|
skin/frontend/base/default/Loginradius/Sociallogin/css/admin-ui.css
CHANGED
@@ -63,6 +63,9 @@ loginradius_radio{
|
|
63 |
#row_sociallogin_options_messages_iconSize td input{
|
64 |
margin-right:2px
|
65 |
}
|
|
|
|
|
|
|
66 |
#row_sociallogin_options_verticalSharing_verticalSharingTheme td input{
|
67 |
float:left !important;
|
68 |
margin-left:4px
|
63 |
#row_sociallogin_options_messages_iconSize td input{
|
64 |
margin-right:2px
|
65 |
}
|
66 |
+
#row_sociallogin_options_messages_sameWindow td input{
|
67 |
+
margin-right:2px
|
68 |
+
}
|
69 |
#row_sociallogin_options_verticalSharing_verticalSharingTheme td input{
|
70 |
float:left !important;
|
71 |
margin-left:4px
|
skin/frontend/base/default/Loginradius/Sociallogin/js/admin-ui.js
CHANGED
@@ -83,6 +83,8 @@ function loginRadiusPrepareAdminUI(){
|
|
83 |
document.getElementById('sociallogin_options_messages_iconSizemedium').style.marginLeft = '6px';
|
84 |
// set left margin for first radio button in Horizontal counter
|
85 |
document.getElementById('sociallogin_options_horizontalSharing_horizontalSharingTheme32').style.marginLeft = '6px';
|
|
|
|
|
86 |
// set left margin for first radio button in login redirection
|
87 |
var loginRadiusRedirectionOptions = document.getElementById('row_sociallogin_options_messages_redirect').getElementsByTagName('input');
|
88 |
loginRadiusRedirectionOptions[0].style.marginLeft = '6px';
|
83 |
document.getElementById('sociallogin_options_messages_iconSizemedium').style.marginLeft = '6px';
|
84 |
// set left margin for first radio button in Horizontal counter
|
85 |
document.getElementById('sociallogin_options_horizontalSharing_horizontalSharingTheme32').style.marginLeft = '6px';
|
86 |
+
// set left margin for first radio button in Horizontal counter
|
87 |
+
document.getElementById('sociallogin_options_messages_sameWindow1').style.marginLeft = '6px';
|
88 |
// set left margin for first radio button in login redirection
|
89 |
var loginRadiusRedirectionOptions = document.getElementById('row_sociallogin_options_messages_redirect').getElementsByTagName('input');
|
90 |
loginRadiusRedirectionOptions[0].style.marginLeft = '6px';
|