From 639414618ec41f7d46587a02ee7c7bcdf81a571d Mon Sep 17 00:00:00 2001
From: MikeyGMT <mikeygmt@gmail.com>
Date: Sun, 4 Dec 2016 19:41:14 +0000
Subject: [PATCH 1/3] Lans Cleanup auth.php #6
Lans Cleanup auth.php #6
---
e107_admin/auth.php | 8 ++++----
e107_languages/English/admin/lan_admin.php | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/e107_admin/auth.php b/e107_admin/auth.php
index 4c10da17b..410b09d2f 100644
--- a/e107_admin/auth.php
+++ b/e107_admin/auth.php
@@ -66,9 +66,9 @@ if (ADMIN)
// XXX LOGIN AS Temporary solution, we need something smarter, e.g. reserved message stack 'admin' which will be always printed
// inside admin area
if(e107::getUser()->getSessionDataAs())
- { // TODO - lan
+ { // TODO - lan [logout]?
$asuser = e107::getSystemUser(e107::getUser()->getSessionDataAs(), false);
- e107::getMessage()->addInfo('Successfully logged in as '.($asuser->getId() ? $asuser->getName().' ('.$asuser->getValue('email').')' : 'unknown'). ' <a href="'.e_ADMIN_ABS.'users.php?mode=main&action=logoutas">[logout]</a>');
+ e107::getMessage()->addInfo(ADLAN_164.' '.($asuser->getId() ? $asuser->getName().' ('.$asuser->getValue('email').')' : 'unknown'). ' <a href="'.e_ADMIN_ABS.'users.php?mode=main&action=logoutas">[logout]</a>');
}
// NEW, legacy 3rd party code fix, header called inside the footer o.O
if(deftrue('e_ADMIN_UI'))
@@ -297,7 +297,7 @@ class auth
$text = "<form id='admin-login' method='post' action='".e_SELF."' {$incChap} >
- <div id='logo' ><img src='".e_IMAGE."logo_template_large.png' alt='login' /></div>
+ <div id='logo' ><img src='".e_IMAGE."logo_template_large.png' alt='".LAN_LOGIN."' /></div>
<div id='login-admin' class='center'>
<div>";
@@ -360,7 +360,7 @@ class auth
e107::getRender()->tablerender("", $text, 'admin-login');
echo "<div class='row-fluid'>
- <div class='center' style='margin-top:25%; color:silver'><span style='padding:0 40px 0 0px;'><a href='http://e107.org'>Powered by e107</a></span> <a href='".e_BASE."index.php'>Return to Website</a></div>
+ <div class='center' style='margin-top:25%; color:silver'><span style='padding:0 40px 0 0px;'><a href='http://e107.org'>".ADLAN_165."</a></span> <a href='".e_BASE."index.php'>".ADLAN_166."</a></div>
</div>";
}
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index 530924f8e..0d9aeaeb0 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -182,6 +182,9 @@ define("ADLAN_160", "Configure Site URLs");
define("ADLAN_161", "Custom Fields?");
define("ADLAN_162", "A newer version of your site-theme is available:");
define("ADLAN_163", "A newer version of an installed plugin is available:");
+define("ADLAN_164", "Successfully logged in as");
+define("ADLAN_165", "Powered by e107");
+define("ADLAN_166", "Return to Website");
// define("ADLAN_CL_1", "Settings");
define("ADLAN_CL_2", "Users");
From edfbf0a80e0f3ed0f9863591cfc882425307d553 Mon Sep 17 00:00:00 2001
From: MikeyGMT <mikeygmt@gmail.com>
Date: Mon, 5 Dec 2016 00:36:10 +0000
Subject: [PATCH 2/3] Successfully logged in as x #2109
Successfully logged in as x #2109
---
e107_admin/auth.php | 7 +++++--
e107_languages/English/admin/lan_admin.php | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/e107_admin/auth.php b/e107_admin/auth.php
index 410b09d2f..3a417fa25 100644
--- a/e107_admin/auth.php
+++ b/e107_admin/auth.php
@@ -2,7 +2,7 @@
/*
* e107 website system
*
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2016 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
@@ -68,7 +68,10 @@ if (ADMIN)
if(e107::getUser()->getSessionDataAs())
{ // TODO - lan [logout]?
$asuser = e107::getSystemUser(e107::getUser()->getSessionDataAs(), false);
- e107::getMessage()->addInfo(ADLAN_164.' '.($asuser->getId() ? $asuser->getName().' ('.$asuser->getValue('email').')' : 'unknown'). ' <a href="'.e_ADMIN_ABS.'users.php?mode=main&action=logoutas">[logout]</a>');
+
+ $lanVars = array ('x' => ($asuser->getId() ? $asuser->getName().' ('.$asuser->getValue('email').')' : 'unknown')) ;
+ e107::getMessage()->addInfo($tp->lanVars(ADLAN_164, $lanVar).' <a href="'.e_ADMIN_ABS.'users.php?mode=main&action=logoutas">['.LAN_LOGOUT.']</a>');
+
}
// NEW, legacy 3rd party code fix, header called inside the footer o.O
if(deftrue('e_ADMIN_UI'))
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index 0d9aeaeb0..afd87811e 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -182,7 +182,7 @@ define("ADLAN_160", "Configure Site URLs");
define("ADLAN_161", "Custom Fields?");
define("ADLAN_162", "A newer version of your site-theme is available:");
define("ADLAN_163", "A newer version of an installed plugin is available:");
-define("ADLAN_164", "Successfully logged in as");
+define("ADLAN_164", "Successfully logged in as [x].");
define("ADLAN_165", "Powered by e107");
define("ADLAN_166", "Return to Website");
From 0ec94ce80089b53563333eed1a1926492d1b36d1 Mon Sep 17 00:00:00 2001
From: MikeyGMT <mikeygmt@gmail.com>
Date: Mon, 5 Dec 2016 01:18:15 +0000
Subject: [PATCH 3/3] Further Correction to conversion to lanVars #2109
Further Correction to conversion to lanVars #2109
Note that similar messages are coming from user.php - some duplication.
---
e107_admin/auth.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/e107_admin/auth.php b/e107_admin/auth.php
index 3a417fa25..fe9f01099 100644
--- a/e107_admin/auth.php
+++ b/e107_admin/auth.php
@@ -66,11 +66,11 @@ if (ADMIN)
// XXX LOGIN AS Temporary solution, we need something smarter, e.g. reserved message stack 'admin' which will be always printed
// inside admin area
if(e107::getUser()->getSessionDataAs())
- { // TODO - lan [logout]?
+ {
$asuser = e107::getSystemUser(e107::getUser()->getSessionDataAs(), false);
$lanVars = array ('x' => ($asuser->getId() ? $asuser->getName().' ('.$asuser->getValue('email').')' : 'unknown')) ;
- e107::getMessage()->addInfo($tp->lanVars(ADLAN_164, $lanVar).' <a href="'.e_ADMIN_ABS.'users.php?mode=main&action=logoutas">['.LAN_LOGOUT.']</a>');
+ e107::getMessage()->addInfo($tp->lanVars(ADLAN_164, $lanVars).' <a href="'.e_ADMIN_ABS.'users.php?mode=main&action=logoutas">['.LAN_LOGOUT.']</a>');
}
// NEW, legacy 3rd party code fix, header called inside the footer o.O