From 5557e844deaef5299d3e8718299dac29e4cf7b5d Mon Sep 17 00:00:00 2001 From: e107steved Date: Thu, 3 Jul 2008 21:23:47 +0000 Subject: [PATCH] Bugtracker #4449 - update LANs --- e107_admin/users.php | 24 ++++++------ e107_languages/English/admin/lan_users.php | 44 +++++++++++++--------- 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/e107_admin/users.php b/e107_admin/users.php index 0b1402c83..ed8a4f262 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/users.php,v $ -| $Revision: 1.16 $ -| $Date: 2008-06-13 20:20:20 $ +| $Revision: 1.17 $ +| $Date: 2008-07-03 21:23:39 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -301,14 +301,14 @@ if (isset($_POST['adduser'])) if (isset($_POST['sendconfemail'])) { // Send confirmation email to user require_once(e_HANDLER.'mail.php'); - $e_message = str_replace(array('--SITE--','--LOGIN--','--PASSWORD--'),array(SITEURL,$loginname,$_POST['password1']),USRLAN_155).USRLAN_156; - if (sendemail($user_data['user_email'],USRLAN_157.SITEURL,$e_message,$user_data['user_login'],'','')) + $e_message = str_replace(array('--SITE--','--LOGIN--','--PASSWORD--'),array(SITEURL,$loginname,$_POST['password1']),USRLAN_185).USRLAN_186; + if (sendemail($user_data['user_email'],USRLAN_187.SITEURL,$e_message,$user_data['user_login'],'','')) { - $message = USRLAN_158; + $message = USRLAN_188; } else { - $message = USRLAN_159; + $message = USRLAN_189; } } if (isset($_POST['generateloginname'])) $message .= '

'.USRLAN_173.': '.$loginname; @@ -853,8 +853,8 @@ class users break; case 3 : // Bounced $text .= " - - + + "; break; default : @@ -1440,10 +1440,10 @@ class users if ($tot) { // Option to delete emails - only if there are some in the list $text .= " - \n - \n - \n - \n + \n + \n + \n + \n "; } $text .= "
"; diff --git a/e107_languages/English/admin/lan_users.php b/e107_languages/English/admin/lan_users.php index a2310bd84..6651611d6 100644 --- a/e107_languages/English/admin/lan_users.php +++ b/e107_languages/English/admin/lan_users.php @@ -4,8 +4,8 @@ | e107 website system - Language File. | | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_users.php,v $ -| $Revision: 1.10 $ -| $Date: 2008-06-13 20:20:21 $ +| $Revision: 1.11 $ +| $Date: 2008-07-03 21:23:47 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -147,18 +147,15 @@ define("USRLAN_146", "Member information is available to"); define("USRLAN_147", "Email address is already used by a banned user"); define("USRLAN_148", "Email address is banned"); -define('USRLAN_149', "User banned: "); -define('USRLAN_150', "IP address of {IP} appears on whitelist; IP not banned."); -define('USRLAN_151', "Send confirmation email with password to new user"); -define('USRLAN_152', 'Invalid characters in login name'); -define('USRLAN_153', 'That login name already in use'); -define('USRLAN_154', 'Length of login name outside limits'); -define('USRLAN_155', 'A user account has been created for you at --SITE-- with the following login:
Login Name: --LOGIN--
Password: --PASSWORD--

'); -define('USRLAN_156', 'Please go to the site as soon as possible and log in, then change your password using the \'Settings\' option.

- You can also change other settings at the same time.

Note that your password cannot be recovered if you lose it.'); -define('USRLAN_157', 'Access to website: '); -define('USRLAN_158', 'Email sent successfully'); -define('USRLAN_159', 'Error sending email'); + +define("USRLAN_149", "Delete checked emails"); +define("USRLAN_150", "Delete all emails"); +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_160', 'Total --COUNT-- users of type --TYPE-- pruned'); define('USRLAN_161', 'User ID --UID-- name --NAME-- banned'); define('USRLAN_162', 'User ID --UID-- name --NAME-- unbanned'); @@ -176,6 +173,19 @@ define('USRLAN_173', 'Login name set'); define('USRLAN_174', ''); define('USRLAN_175', ''); +define('USRLAN_179', "User banned: "); +define('USRLAN_180', "IP address of {IP} appears on whitelist; IP not banned."); +define('USRLAN_181', "Send confirmation email with password to new user"); +define('USRLAN_182', 'Invalid characters in login name'); +define('USRLAN_183', 'That login name already in use'); +define('USRLAN_184', 'Length of login name outside limits'); +define('USRLAN_185', 'A user account has been created for you at --SITE-- with the following login:
Login Name: --LOGIN--
Password: --PASSWORD--

'); +define('USRLAN_186', 'Please go to the site as soon as possible and log in, then change your password using the \'Settings\' option.

+ You can also change other settings at the same time.

Note that your password cannot be recovered if you lose it.'); +define('USRLAN_187', 'Access to website: '); +define('USRLAN_188', 'Email sent successfully'); +define('USRLAN_189', 'Error sending email'); + define("LAN_MAINADMIN","Main Admin"); define("LAN_ADMIN","Admin"); define("LAN_NOTVERIFIED","Not Verified"); @@ -187,7 +197,7 @@ define("DUSRLAN_2", "Display Name"); define("DUSRLAN_3", "Username"); define("DUSRLAN_4", "Custom Title"); define("DUSRLAN_5", "Password"); -define("DUSRLAN_6", "Session"); +define("DUSRLAN_6", "Photo"); define("DUSRLAN_7", "Email"); define("DUSRLAN_8", "Website"); define("DUSRLAN_9", "ICQ"); @@ -196,7 +206,7 @@ define("DUSRLAN_11", "MSN"); define("DUSRLAN_12", "Location"); define("DUSRLAN_13", "Birthday"); define("DUSRLAN_14", "Signature"); -define("DUSRLAN_15", "Image"); +define("DUSRLAN_15", "Avatar"); define("DUSRLAN_16", "Timezone"); define("DUSRLAN_17", "Hide Email"); define("DUSRLAN_18", "Join Date"); @@ -216,7 +226,7 @@ define("DUSRLAN_31", "Admin"); define("DUSRLAN_32", "Real Name"); define("DUSRLAN_33", "User Class"); define("DUSRLAN_34", "Perms"); -define("DUSRLAN_35", "Picture"); +define("DUSRLAN_35", "Tracked threads"); define("DUSRLAN_36", "Password Change"); define("DUSRLAN_37", "XUP");