From 1063ffe5436510b25cbe6b1f09db4a2d54dc5f3b Mon Sep 17 00:00:00 2001 From: Cameron Date: Mon, 6 Nov 2017 17:32:00 -0800 Subject: [PATCH] Issue #2846 LAN vars cleanup --- e107_admin/lancheck.php | 5 +++-- e107_admin/users.php | 2 +- e107_languages/English/admin/lan_users.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/e107_admin/lancheck.php b/e107_admin/lancheck.php index 780a982ab..60ad4e302 100644 --- a/e107_admin/lancheck.php +++ b/e107_admin/lancheck.php @@ -1058,13 +1058,14 @@ class lancheck $kom_start = chr(47)."*"; $kom_end = "*".chr(47); - if(vartrue($_SESSION['lancheck-edit-file'])) + if(!empty($_SESSION['lancheck-edit-file'])) { $writeit = $_SESSION['lancheck-edit-file']; } else { - return; + e107::getMessage()->addError("There is a problem with sessions"); + return; } $old_kom = ""; diff --git a/e107_admin/users.php b/e107_admin/users.php index dcf946d84..2c2813939 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -2335,7 +2335,7 @@ class users_admin_ui extends e_admin_ui $ed = $sql->db_Update('user',"user_ban=3 WHERE (`user_id` IN (".$all_ids.") OR `user_email` IN (".$all_emails.")) AND user_sess !='' "); if (!$ed) $ed = '0'; - $this->show_message(str_replace(array('{TOTAL}','{DELCOUNT}','{DELUSER}','{FOUND}'),array($tot,$del_count,$ed,$found),USRLAN_155).$text); + $this->show_message(str_replace(array('[w]','[x]','[y]','[z]'),array($tot,$del_count,$ed,$found),USRLAN_155).$text); } // ------- FIXME Prune Users move to cron -------------- diff --git a/e107_languages/English/admin/lan_users.php b/e107_languages/English/admin/lan_users.php index 6e6608488..9c06f0783 100644 --- a/e107_languages/English/admin/lan_users.php +++ b/e107_languages/English/admin/lan_users.php @@ -156,7 +156,7 @@ define("USRLAN_151", "Clear bounce, require Activation"); define("USRLAN_152", "Clear bounce and Activate"); define("USRLAN_153", "Delete non-bounce emails"); define("USRLAN_154", "Clear email for checked"); -define("USRLAN_155", "Total {TOTAL} emails found. {DELCOUNT} deleted through options.
{DELUSER} users marked as 'bounced' (out of {FOUND} emails)"); +define("USRLAN_155", "Total [w] emails found. [x] deleted through options.[br][y] users marked as 'bounced' (out of [z] emails)"); define("USRLAN_156", "Email address is already in use"); // define("USRLAN_160", "Total [x] users of type --TYPE-- pruned");