| ".USRLAN_129." | ++ ".$rs->form_text("realname", 40, "", 30)." + | +
| ".USRLAN_62." | @@ -1012,30 +1149,22 @@ class users |
| + $temp = $e_userclass->vetted_tree('userclass[]',array($e_userclass,'checkbox_desc'), varset($pref['initial_user_classes'],''), 'classes'); + + + if ($temp) + { + $text .= " | |
| ".USRLAN_120." - | +{$temp} |
| - ".$class[$a][1]." - | ".$class[$a][2]." |
| + ".USRLAN_151." + | |
|
@@ -1051,73 +1180,92 @@ class users
}
- function resend($id,$key,$name,$email,$lfile=''){
- global $sql,$mailheader_e107id;
+ function resend($id,$key,$name,$email,$lfile='')
+ {
+ global $sql,$mailheader_e107id, $admin_log;
// Check for a Language field, and if present, send the email in the user's language.
- if($lfile == ""){
- if($sql -> db_Select("user_extended", "user_language", "user_extended_id = '$id'")){
- $row = $sql -> db_Fetch();
- $lfile = e_LANGUAGEDIR.$row['user_language']."/lan_signup.php";
- }
- }
- if(is_readable($lfile)){
- require_once($lfile);
- }else{
- $row['user_language'] = e_LANGUAGE;
- require_once(e_LANGUAGEDIR.e_LANGUAGE."/lan_signup.php");
- }
-
-
- $return_address = (substr(SITEURL, -1) == "/") ? SITEURL."signup.php?activate.".$id.".".$key : SITEURL."/signup.php?activate.".$id.".".$key;
-
- $message = LAN_EMAIL_01." ".$name."\n\n".LAN_SIGNUP_24." ".SITENAME.".\n".LAN_SIGNUP_21."...\n\n";
- $message .= $return_address . "\n\n".SITENAME."\n".SITEURL;
-
- $mailheader_e107id = $id;
-
- require_once(e_HANDLER."mail.php");
- if(sendemail($email, LAN_404." ".SITENAME, $message))
+ if($lfile == "")
+ {
+ if($sql -> db_Select("user_extended", "user_language", "user_extended_id = '$id'"))
{
+ $row = $sql -> db_Fetch();
+ $lfile = e_LANGUAGEDIR.$row['user_language']."/lan_signup.php";
+ }
+ }
+ if(is_readable($lfile))
+ {
+ require_once($lfile);
+ }
+ else
+ {
+ $row['user_language'] = e_LANGUAGE;
+ require_once(e_LANGUAGEDIR.e_LANGUAGE."/lan_signup.php");
+ }
+
+
+ $return_address = (substr(SITEURL, -1) == "/") ? SITEURL."signup.php?activate.".$id.".".$key : SITEURL."/signup.php?activate.".$id.".".$key;
+
+ $message = LAN_EMAIL_01." ".$name."\n\n".LAN_SIGNUP_24." ".SITENAME.".\n".LAN_SIGNUP_21."...\n\n";
+ $message .= $return_address . "\n\n".SITENAME."\n".SITEURL;
+
+ $mailheader_e107id = $id;
+
+ require_once(e_HANDLER."mail.php");
+ if(sendemail($email, LAN_404." ".SITENAME, $message))
+ {
// echo str_replace("\n"," ",$message); - $this->show_message(USRLAN_140.": ".$name." (".$row['user_language'].") "); - } - else - { - $this->show_message(USRLAN_141.": ".$name); - } - + $admin_log->log_event('LAN_ADMIN_LOG_013',str_replace(array('--ID--','--NAME--','--EMAIL--'),array($id,$name,$email),USRLAN_167),E_LOG_INFORMATIVE,'USET_11'); + $this->show_message(USRLAN_140.": ".$name." (".$row['user_language'].") "); + } + else + { + $this->show_message(USRLAN_141.": ".$name); + } } - function resend_to_all(){ - global $sql,$pref,$sql3; - $pause_count = 1; - $pause_amount = ($pref['mail_pause']) ? $pref['mail_pause'] : 10; - $pause_time = ($pref['mail_pausetime']) ? $pref['mail_pausetime'] : 1; + function resend_to_all() + { + global $sql,$pref,$sql3, $admin_log; + $count = 0; + $pause_count = 1; + $pause_amount = ($pref['mail_pause']) ? $pref['mail_pause'] : 10; + $pause_time = ($pref['mail_pausetime']) ? $pref['mail_pausetime'] : 1; - if($sql -> db_Select_gen("SELECT user_language FROM #user_extended LIMIT 1")){ - $query = "SELECT u.*, ue.* FROM #user AS u LEFT JOIN #user_extended AS ue ON ue.user_extended_id = u.user_id WHERE u.user_ban = 2 ORDER BY u.user_id DESC"; - }else{ - $query = "SELECT * FROM #user WHERE user_ban='2'"; - } + if($sql -> db_Select_gen("SELECT user_language FROM #user_extended LIMIT 1")) + { + $query = "SELECT u.*, ue.* FROM #user AS u LEFT JOIN #user_extended AS ue ON ue.user_extended_id = u.user_id WHERE u.user_ban = 2 ORDER BY u.user_id DESC"; + } + else + { + $query = "SELECT * FROM #user WHERE user_ban='2'"; + } - if(!is_object($sql3)){ - $sql3 = new db; - } + if(!is_object($sql3)) + { + $sql3 = new db; + } - $sql3 -> db_Select_gen($query); - while($row = $sql3-> db_Fetch()){ - echo $row['user_id']." ".$row['user_sess']." ".$row['user_name']." ".$row['user_email']." "; - $this->resend($row['user_id'],$row['user_sess'],$row['user_name'],$row['user_email'],$row['user_language']); - if($pause_count > $pause_amount){ - sleep($pause_time); - $pause_count = 1; - } - sleep(1); - $pause_count++; - } + $sql3 -> db_Select_gen($query); + while($row = $sql3-> db_Fetch()) + { + echo $row['user_id']." ".$row['user_sess']." ".$row['user_name']." ".$row['user_email']." "; + $this->resend($row['user_id'],$row['user_sess'],$row['user_name'],$row['user_email'],$row['user_language']); + if($pause_count > $pause_amount) + { + sleep($pause_time); + $pause_count = 1; + } + sleep(1); + $pause_count++; + $count++; + } + if ($count) + { + $admin_log->log_event('LAN_ADMIN_LOG_014',str_replace('--COUNT--',$count,USRLAN_168),E_LOG_INFORMATIVE,'USET_12'); + } } @@ -1134,22 +1282,22 @@ class users function check_bounces($bounce_act='first_check', $bounce_arr = '') { - global $sql,$pref; - include(e_HANDLER."pop3_class.php"); + global $sql,$pref; + include(e_HANDLER."pop3_class.php"); if (!trim($bounce_act)) $bounce_act='first_check'; // echo "Check bounces. Action: {$bounce_act}; Entries: {$bounce_arr} "; - $obj= new receiveMail($pref['mail_bounce_user'],$pref['mail_bounce_pass'],$pref['mail_bounce_email'],$pref['mail_bounce_pop3'],'pop3','110'); + $obj= new receiveMail($pref['mail_bounce_user'],$pref['mail_bounce_pass'],$pref['mail_bounce_email'],$pref['mail_bounce_pop3'],'pop3','110'); $del_count = 0; - if ($bounce_act !='first_check') - { // Must do some deleting + if ($bounce_act !='first_check') + { // Must do some deleting $obj->connect(); $tot=$obj->getTotalMails(); $del_array = explode(',',$bounce_arr); for($i=1;$i<=$tot;$i++) - { // Scan all emails; delete current one if meets the criteria + { // Scan all emails; delete current one if meets the criteria $dodel = FALSE; switch ($bounce_act) { @@ -1187,31 +1335,31 @@ class users $obj->deleteMails($i); $del_count++; // Keep track of number of emails deleted } - } // End - Delete one email + } // End - Delete one email $obj->close_mailbox(); // This actually deletes the emails + } // End of email deletion // Now list the emails that are left - $obj->connect(); - $tot=$obj->getTotalMails(); - $found = FALSE; - $DEL = ($pref['mail_bounce_delete']) ? TRUE : FALSE; + $obj->connect(); + $tot=$obj->getTotalMails(); + $found = FALSE; + $DEL = ($pref['mail_bounce_delete']) ? TRUE : FALSE; - $text = " "; - array_unique($id); - array_unique($emails); + array_unique($id); + array_unique($emails); - $all_ids = implode(",",$id); - $all_emails = implode(",",$emails); + $all_ids = implode(",",$id); + $all_emails = implode(",",$emails); - $obj->close_mailbox(); // This will actually delete emails + $obj->close_mailbox(); // This will actually delete emails // $tot has total number of emails in the mailbox - $found = count($emails); // $found - Number of bounce emails found + $found = count($emails); // $found - Number of bounce emails found // $del_count has number of emails deleted // Update bounce status for users - $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}'), + $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); - } - } // End class users diff --git a/e107_languages/English/admin/lan_log_messages.php b/e107_languages/English/admin/lan_log_messages.php index 046ec9517..1b091b130 100644 --- a/e107_languages/English/admin/lan_log_messages.php +++ b/e107_languages/English/admin/lan_log_messages.php @@ -1,6 +1,6 @@ diff --git a/e107_languages/English/admin/lan_users.php b/e107_languages/English/admin/lan_users.php index f0661829b..c1022e25f 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.8 $ -| $Date: 2007-12-26 13:21:34 $ +| $Revision: 1.9 $ +| $Date: 2008-01-01 12:38:05 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -120,8 +120,8 @@ define("USRLAN_125", "From"); define("USRLAN_126", "Allow users to rate users"); define("USRLAN_127", "Allow comments in user profile"); -define("USRLAN_128", "Username"); - +define("USRLAN_128", "Username (login name)"); +define("USRLAN_129", "Real Name"); define("USRLAN_130", "Enable online user tracking"); define("USRLAN_131", "You must enable this option to use online user tracking options, like online.php, forum online info and online menus"); define("USRLAN_132", "Enable"); @@ -149,6 +149,26 @@ 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_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'); +define('USRLAN_163', 'User ID --UID-- deleted'); +define('USRLAN_164', 'User ID --UID-- name --NAME-- made admin'); +define('USRLAN_165', 'User ID --UID-- name --NAME-- admin status revoked'); +define('USRLAN_166', 'User ID --UID-- name --NAME-- approved'); +define('USRLAN_167', 'Validation email ID --ID-- resent to --NAME-- at --EMAIL--'); +define('USRLAN_168', 'Re-send --COUNT-- validation emails'); +define('USRLAN_169', 'Total --COUNT-- bounced emails deleted'); define("LAN_MAINADMIN","Main Admin"); define("LAN_ADMIN","Admin"); | |