mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-29 17:19:56 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2597 from yesszus/patch-1

Browse Source 
Update lan_user.php
This commit is contained in:
Cameron
2017-04-29 14:18:39 -07:00
committed by GitHub
parent c2f076a73f 8d5cf9add7
commit da48916cbf
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e107_core/controllers/system/xup.php
View File

@@ -14,6 +14,7 @@
* $Author: e107coders $ * $Author: e107coders $
*/ */
e107::coreLan('user');
class core_system_xup_controller extends eController class core_system_xup_controller extends eController
{ {
@@ -82,11 +83,11 @@ class core_system_xup_controller extends eController
public function actionTest() public function actionTest()
{ {
echo '<h3>Social Login Tester</h3>'; echo '<h3>'.LAN_XUP_ERRM_07.'</h3>';
if(getperms('0')) if(getperms('0'))
{ {
echo e107::getMessage()->addError("Please logout of e107 before testing the new-user login/signup procedure.")->render(); echo e107::getMessage()->addError(LAN_XUP_ERRM_08)->render();
return; return;
} }
@@ -109,7 +110,7 @@ class core_system_xup_controller extends eController
} }
echo 'Logged in: '.(e107::getUser()->isUser() && !empty($profileData) ? '<span class="label label-success">true</span>' : '<span class="label label-danger">false</span>'); echo ' '.LAN_XUP_ERRM_11.' '.(e107::getUser()->isUser() && !empty($profileData) ? '<span class="label label-success">true</span>' : '<span class="label label-danger">false</span>');
$testUrl = SITEURL."?route=system/xup/test"; $testUrl = SITEURL."?route=system/xup/test";
@@ -120,8 +121,8 @@ class core_system_xup_controller extends eController
if($var['enabled'] == 1) if($var['enabled'] == 1)
{ {
echo '<h3>'.$key.'</h3><ul>'; echo '<h3>'.$key.'</h3><ul>';
echo '<li><a class="btn btn-default" href="'.e107::getUrl()->create('system/xup/login?provider='.$key.'&back='.base64_encode($testUrl)).'">Test login only with '.$key.'</a></li>'; echo '<li><a class="btn btn-default" href="'.e107::getUrl()->create('system/xup/login?provider='.$key.'&back='.base64_encode($testUrl)).'">'.e107::getParser()->lanVars(LAN_XUP_ERRM_09, array('x'=>$key)).'</a></li>';
echo '<li><a class="btn btn-default" href="'.e107::getUrl()->create('system/xup/signup?provider='.$key.'&back='.base64_encode($testUrl)).'">Test signup/login with '.$key.'</a></li>'; echo '<li><a class="btn btn-default" href="'.e107::getUrl()->create('system/xup/signup?provider='.$key.'&back='.base64_encode($testUrl)).'">'.e107::getParser()->lanVars(LAN_XUP_ERRM_10, array('x'=>$key)).'</a></li>';
echo "</ul>"; echo "</ul>";
} }
@@ -129,7 +130,7 @@ class core_system_xup_controller extends eController
// print_a($var); // print_a($var);
} }
echo '<br /><br /><a class="btn btn-default" href="'.e107::getUrl()->create('system/xup/test?lgt').'">Test logout</a>'; echo '<br /><br /><a class="btn btn-default" href="'.e107::getUrl()->create('system/xup/test?lgt').'">'.LAN_XUP_ERRM_12.'</a>';
/* /*
echo '<h3>Facebook</h3>'; echo '<h3>Facebook</h3>';

7
e107_languages/English/lan_user.php
View File

@@ -123,7 +123,12 @@ define("LAN_XUP_ERRM_03", "Log in Failed! Wrong provider.");
define("LAN_XUP_ERRM_04", "Signup failed! User already signed in."); define("LAN_XUP_ERRM_04", "Signup failed! User already signed in.");
define("LAN_XUP_ERRM_05", "Signup failed! User already exists. Please use 'login' instead."); define("LAN_XUP_ERRM_05", "Signup failed! User already exists. Please use 'login' instead.");
define("LAN_XUP_ERRM_06", "Signup failed! Can't access user email - registration without an email is impossible."); define("LAN_XUP_ERRM_06", "Signup failed! Can't access user email - registration without an email is impossible.");
define("LAN_XUP_ERRM_07", "Social Login Tester");
define("LAN_XUP_ERRM_08", "Please logout of e107 before testing the new-user login/signup procedure.");
define("LAN_XUP_ERRM_09", "Test login only with [x]");
define("LAN_XUP_ERRM_10", "Test signup/login with [x]");
define("LAN_XUP_ERRM_11", "Logged in:");
define("LAN_XUP_ERRM_12", "Test logout");
// Error messages for when user data is missing. Done this way so that other code can override the default messages // Error messages for when user data is missing. Done this way so that other code can override the default messages