mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

'quick add user': Option to send email to user, better vetting on parameters. Admin log all changes

Browse Source
This commit is contained in:
e107steved
2008-01-01 12:38:05 +00:00
parent 5b8fdb9ca1
commit 6ab55eec3d
3 changed files with 475 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

343
e107_admin/users.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/users.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/users.php,v $
| $Revision: 1.9 $ | $Revision: 1.10 $
| $Date: 2007-12-26 13:21:34 $ | $Date: 2008-01-01 12:37:58 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -55,16 +55,17 @@ require_once(e_HANDLER."userclass_class.php");
$rs = new form; $rs = new form;
if (e_QUERY) { if (e_QUERY)
{
$tmp = explode(".", e_QUERY); $tmp = explode(".", e_QUERY);
$action = $tmp[0]; $action = $tmp[0];
$sub_action = $tmp[1]; $sub_action = varset($tmp[1],'');
$id = $tmp[2]; $id = varset($tmp[2],0);
$from = ($tmp[3] ? $tmp[3] : 0); $from = varset($tmp[3],0);
unset($tmp); unset($tmp);
} }
$from = (isset($from)) ? $from : 0; $from = varset($from, 0);
$amount = 30; $amount = 30;
@@ -148,6 +149,7 @@ if (isset($_POST['update_options']))
$pref['force_userupdate'] = $_POST['force_userupdate']; $pref['force_userupdate'] = $_POST['force_userupdate'];
$pref['memberlist_access'] = $_POST['memberlist_access']; $pref['memberlist_access'] = $_POST['memberlist_access'];
save_prefs(); save_prefs();
$admin_log->log_event('LAN_ADMIN_LOG_005',implode('; ',$_POST),E_LOG_INFORMATIVE,'USET_03');
$user->show_message(USRLAN_1); $user->show_message(USRLAN_1);
} }
@@ -168,6 +170,7 @@ if (isset($_POST['prune']))
$sql->db_Delete("user", "user_id='{$u['user_id']}' "); $sql->db_Delete("user", "user_id='{$u['user_id']}' ");
$sql->db_Delete("user_extended", "user_extended_id='{$u['user_id']}' "); $sql->db_Delete("user_extended", "user_extended_id='{$u['user_id']}' ");
} }
$admin_log->log_event('LAN_ADMIN_LOG_006',str_replace(array('--COUNT--','--TYPE--'),array(count($uList),$bantype),USRLAN_160),E_LOG_INFORMATIVE,'USET_04');
} }
$ns->tablerender(USRLAN_57, "<div style='text-align:center'><b>".$text."</b></div>"); $ns->tablerender(USRLAN_57, "<div style='text-align:center'><b>".$text."</b></div>");
unset($text); unset($text);
@@ -175,60 +178,128 @@ if (isset($_POST['prune']))
// ------- Quick Add User -------------- // ------- Quick Add User --------------
if (isset($_POST['adduser'])) { if (isset($_POST['adduser']))
{
$e107cache->clear("online_menu_member_total"); $e107cache->clear("online_menu_member_total");
$e107cache->clear("online_menu_member_newest"); $e107cache->clear("online_menu_member_newest");
if (!$_POST['ac'] == md5(ADMINPWCHANGE)) { if (!$_POST['ac'] == md5(ADMINPWCHANGE))
{
exit; exit;
} }
$user_data = array(); // Assemble the data into an array
require_once(e_HANDLER."message_handler.php"); require_once(e_HANDLER."message_handler.php");
if (strstr($_POST['name'], "#") || strstr($_POST['name'], "=")) { $displayname = strip_tags($_POST['name']);
if (($displayname != strip_tags($_POST['name'])) || (strstr($_POST['name'], "#") || strstr($_POST['name'], "=")))
{
message_handler("P_ALERT", USRLAN_92); message_handler("P_ALERT", USRLAN_92);
$error = TRUE; $error = TRUE;
} }
$_POST['name'] = trim(str_replace("&nbsp;", "", $_POST['name'])); $displayname = trim(str_replace("&nbsp;", "", $displayname));
if ($_POST['name'] == "Anonymous") { if ($displayname == "Anonymous")
{
message_handler("P_ALERT", USRLAN_65); message_handler("P_ALERT", USRLAN_65);
$error = TRUE; $error = TRUE;
} }
if ($sql->db_Count("user", "(*)", "WHERE user_name='".$_POST['name']."' ")) { if ((strlen($displayname) > varset($pref['displayname_maxlength'],15)) || (strlen($displayname) < 2))
{
message_handler('P_ALERT',USRLAN_154);
$error = TRUE;
}
if ($sql->db_Count("user", "(*)", "WHERE user_name='".$displayname."' "))
{
message_handler("P_ALERT", USRLAN_66); message_handler("P_ALERT", USRLAN_66);
$error = TRUE; $error = TRUE;
} }
if ($_POST['password1'] != $_POST['password2']) {
$loginname = trim(preg_replace('/&nbsp;|\#|\=|\$/', "", strip_tags($_POST['loginname'])));
if ($loginname != $_POST['loginname'])
{
message_handler('P_ALERT',USRLAN_152);
$error = TRUE;
}
if ((strlen($loginname) > varset($pref['loginname_maxlength'],30)) || (strlen($loginname) < 3))
{
message_handler('P_ALERT',USRLAN_154);
$error = TRUE;
}
if ($sql->db_Count("user", "(*)", "WHERE user_loginname='".$loginname."' "))
{
message_handler("P_ALERT", USRLAN_153);
$error = TRUE;
}
if ($_POST['password1'] != $_POST['password2'])
{
message_handler("P_ALERT", USRLAN_67); message_handler("P_ALERT", USRLAN_67);
$error = TRUE; $error = TRUE;
} }
if ($_POST['name'] == "" || $_POST['password1'] == "" || $_POST['password2'] = "") { if ($_POST['name'] == "" || $_POST['password1'] == "" || $_POST['password2'] = "")
{
message_handler("P_ALERT", USRLAN_68); message_handler("P_ALERT", USRLAN_68);
$error = TRUE; $error = TRUE;
} }
if (!preg_match('/^[-!#$%&\'*+\\.\/0-9=?A-Z^_`{|}~]+@([-0-9A-Z]+\.)+([0-9A-Z]){2,4}$/i', $_POST['email'])) { if (!check_email($_POST['email']))
{
message_handler("P_ALERT", USRLAN_69); message_handler("P_ALERT", USRLAN_69);
$error = TRUE; $error = TRUE;
} }
if ($sql->db_Count("user", "(*)", "WHERE user_email='".$_POST['email']."' AND user_ban='1' ")) { if ($sql->db_Count("user", "(*)", "WHERE user_email='".$_POST['email']."' AND user_ban='1' "))
{
message_handler("P_ALERT", USRLAN_147); message_handler("P_ALERT", USRLAN_147);
$error = TRUE; $error = TRUE;
} }
if ($sql->db_Count("banlist", "(*)", "WHERE banlist_ip='".$_POST['email']."'")) { if ($sql->db_Count("banlist", "(*)", "WHERE banlist_ip='".$_POST['email']."'"))
{
message_handler("P_ALERT", USRLAN_148); message_handler("P_ALERT", USRLAN_148);
$error = TRUE; $error = TRUE;
} }
if (!$error) { if (!$error)
{
$user_data['user_name'] = $displayname;
$user_data['user_loginname'] = $loginname;
$user_data['user_class'] = implode(",", $_POST['userclass']);
$user_data['user_password'] = md5($_POST['password1']);
$user_data['user_email'] = $tp->toDB($_POST['email']);
$user_data['user_hideemail'] = 1;
$user_data['user_join'] = time();
$user_data['user_lastvisit'] = time();
$user_data['user_currentvisit'] = time();
$user_data['user_pwchange'] = time();
$user_data['user_login'] = $tp->toDB($_POST['realname']);
$username = strip_tags($_POST['name']); if (admin_update($sql -> db_Insert("user", $user_data), 'insert', USRLAN_70))
$loginname = strip_tags($_POST['loginname']); {
// Add to admin log
$svar = implode(",", $_POST['userclass']); $admin_log->log_event('LAN_ADMIN_LOG_004',"UName: {$user_data['user_name']}; Email: {$user_data['user_email']}",E_LOG_INFORMATIVE,'USET_02');
admin_update($sql -> db_Insert("user", "0, '$username', '$loginname', '', '".md5($_POST['password1'])."', '$key', '".$_POST['email']."', '".$_POST['signature']."', '".$_POST['image']."', '".$_POST['timezone']."', '1', '".time()."', '".time()."', '".time()."', '0', '0', '0', '0', '0', '0', '0', '', '', '0', '0', '".$_POST['realname']."', '".$svar."', '', '', '".time()."', ''"), 'insert', USRLAN_70); // Add to user audit trail
$admin_log->user_audit(USER_AUDIT_ADD_ADMIN,$user_data, 0,$user_data['user_loginname']);
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'],'',''))
{
$message = USRLAN_158;
} }
else
{
$message = USRLAN_159;
}
}
}
}
if (isset($message)) $user->show_message($message);
} }
// ------- Bounce --> Unverified -------------- // ------- Bounce --> Unverified --------------
if (isset($_POST['useraction']) && $_POST['useraction'] == "reqverify") if (isset($_POST['useraction']) && $_POST['useraction'] == "reqverify")
{ {
@@ -257,6 +328,7 @@ if (isset($_POST['useraction']) && $_POST['useraction'] == "ban")
{ {
if($sql->db_Update("user", "user_ban='1' WHERE user_id='".$_POST['userid']."' ")) if($sql->db_Update("user", "user_ban='1' WHERE user_id='".$_POST['userid']."' "))
{ {
$admin_log->log_event('LAN_ADMIN_LOG_007',str_replace(array('--UID--','--NAME--'),array($row['user_id'],$row['user_name']),USRLAN_161),E_LOG_INFORMATIVE,'USET_05');
$user->show_message(USRLAN_8); $user->show_message(USRLAN_8);
} }
if(trim($row['user_ip']) == "") if(trim($row['user_ip']) == "")
@@ -288,18 +360,21 @@ if (isset($_POST['useraction']) && $_POST['useraction'] == "ban")
// ------- Unban User -------------- // ------- Unban User --------------
if (isset($_POST['useraction']) && $_POST['useraction'] == "unban") { if (isset($_POST['useraction']) && $_POST['useraction'] == "unban")
$sql->db_Select("user", "user_ip", "user_id='".$_POST['userid']."'"); {
$sql->db_Select("user", "user_name,user_ip", "user_id='".$_POST['userid']."'");
$row = $sql->db_Fetch(); $row = $sql->db_Fetch();
$sql->db_Update("user", "user_ban='0' WHERE user_id='".$_POST['userid']."' "); $sql->db_Update("user", "user_ban='0' WHERE user_id='".$_POST['userid']."' ");
$sql -> db_Delete("banlist", " banlist_ip='{$row['user_ip']}' "); $sql -> db_Delete("banlist", " banlist_ip='{$row['user_ip']}' ");
$admin_log->log_event('LAN_ADMIN_LOG_008',str_replace(array('--UID--','--NAME--'),array($_POST['userid'],$row['user_name']),USRLAN_162),E_LOG_INFORMATIVE,'USET_06');
$user->show_message(USRLAN_9); $user->show_message(USRLAN_9);
$action = "main"; $action = "main";
if(!$sub_action){$sub_action = "user_id"; } if(!$sub_action){$sub_action = "user_id"; }
} }
// ------- Resend Email Confirmation. -------------- // ------- Resend Email Confirmation. --------------
if (isset($_POST['useraction']) && $_POST['useraction'] == 'resend') { if (isset($_POST['useraction']) && $_POST['useraction'] == 'resend')
{
$qry = (e_QUERY) ? "?".e_QUERY : ""; $qry = (e_QUERY) ? "?".e_QUERY : "";
if ($sql->db_Select("user", "*", "user_id='".$_POST['userid']."' ")) { if ($sql->db_Select("user", "*", "user_id='".$_POST['userid']."' ")) {
$resend = $sql->db_Fetch(); $resend = $sql->db_Fetch();
@@ -317,8 +392,13 @@ if (isset($_POST['useraction']) && $_POST['useraction'] == 'resend') {
exit; exit;
} }
} }
// ------- TEst Email confirmation. -------------- // ------- TEst Email confirmation. --------------
if (isset($_POST['useraction']) && $_POST['useraction'] == 'test') { if (isset($_POST['useraction']) && $_POST['useraction'] == 'test')
{
$qry = (e_QUERY) ? "?".e_QUERY : ""; $qry = (e_QUERY) ? "?".e_QUERY : "";
if ($sql->db_Select("user", "*", "user_id='".$_POST['userid']."' ")) { if ($sql->db_Select("user", "*", "user_id='".$_POST['userid']."' ")) {
$test = $sql->db_Fetch(); $test = $sql->db_Fetch();
@@ -333,17 +413,26 @@ if (isset($_POST['useraction']) && $_POST['useraction'] == 'test') {
exit; exit;
} }
} }
// ------- Delete User -------------- // ------- Delete User --------------
if (isset($_POST['useraction']) && $_POST['useraction'] == 'deluser') { if (isset($_POST['useraction']) && $_POST['useraction'] == 'deluser')
if ($_POST['confirm']) { {
if ($sql->db_Delete("user", "user_id='".$_POST['userid']."' AND user_perms != '0' AND user_perms != '0.'")) { if ($_POST['confirm'])
{
if ($sql->db_Delete("user", "user_id='".$_POST['userid']."' AND user_perms != '0' AND user_perms != '0.'"))
{
$sql->db_Delete("user_extended", "user_extended_id='".$_POST['userid']."' "); $sql->db_Delete("user_extended", "user_extended_id='".$_POST['userid']."' ");
$admin_log->log_event('LAN_ADMIN_LOG_009',str_replace('--UID--',$_POST['userid'],USRLAN_163),E_LOG_INFORMATIVE,'USET_07');
$user->show_message(USRLAN_10); $user->show_message(USRLAN_10);
} }
if(!$sub_action){ $sub_action = "user_id"; } if(!$sub_action){ $sub_action = "user_id"; }
if(!$id){ $id = "DESC"; } if(!$id){ $id = "DESC"; }
}
} else { else
{ // Put up confirmation
if ($sql->db_Select("user", "*", "user_id='".$_POST['userid']."' ")) { if ($sql->db_Select("user", "*", "user_id='".$_POST['userid']."' ")) {
$row = $sql->db_Fetch(); $row = $sql->db_Fetch();
$qry = (e_QUERY) ? "?".e_QUERY : ""; $qry = (e_QUERY) ? "?".e_QUERY : "";
@@ -365,26 +454,40 @@ if (isset($_POST['useraction']) && $_POST['useraction'] == 'deluser') {
} }
} }
} }
// ------- Make Admin.. --------------
if (isset($_POST['useraction']) && $_POST['useraction'] == "admin" && getperms('3')) {
// ------- Make Admin --------------
if (isset($_POST['useraction']) && $_POST['useraction'] == "admin" && getperms('3'))
{
$sql->db_Select("user", "user_id, user_name", "user_id='".$_POST['userid']."'"); $sql->db_Select("user", "user_id, user_name", "user_id='".$_POST['userid']."'");
$row = $sql->db_Fetch(); $row = $sql->db_Fetch();
$sql->db_Update("user", "user_admin='1' WHERE user_id='".$_POST['userid']."' "); $sql->db_Update("user", "user_admin='1' WHERE user_id='".$_POST['userid']."' ");
$admin_log->log_event('LAN_ADMIN_LOG_010',str_replace(array('--UID--','--NAME--'),array($row['user_id'],$row['user_name']),USRLAN_164),E_LOG_INFORMATIVE,'USET_08');
$user->show_message($row['user_name']." ".USRLAN_3." <a href='".e_ADMIN."administrator.php?edit.{$row['user_id']}'>".USRLAN_4."</a>"); $user->show_message($row['user_name']." ".USRLAN_3." <a href='".e_ADMIN."administrator.php?edit.{$row['user_id']}'>".USRLAN_4."</a>");
$action = "main"; $action = "main";
if(!$sub_action){ $sub_action = "user_id"; } if(!$sub_action){ $sub_action = "user_id"; }
if(!$id){ $id = "DESC"; } if(!$id){ $id = "DESC"; }
} }
// ------- Remove Admin -------------- // ------- Remove Admin --------------
if (isset($_POST['useraction']) && $_POST['useraction'] == "unadmin" && getperms('3')) { if (isset($_POST['useraction']) && $_POST['useraction'] == "unadmin" && getperms('3'))
{
$sql->db_Select("user", "*", "user_id='".$_POST['userid']."'"); $sql->db_Select("user", "*", "user_id='".$_POST['userid']."'");
$row = $sql->db_Fetch(); $row = $sql->db_Fetch();
extract($row); extract($row);
if ($user_perms == "0") { if ($user_perms == "0")
{
$user->show_message(USRLAN_5); $user->show_message(USRLAN_5);
} else { }
else
{
$sql->db_Update("user", "user_admin='0', user_perms='' WHERE user_id='".$_POST['userid']."'"); $sql->db_Update("user", "user_admin='0', user_perms='' WHERE user_id='".$_POST['userid']."'");
$admin_log->log_event('LAN_ADMIN_LOG_011',str_replace(array('--UID--','--NAME--'),array($row['user_id'],$row['user_name']),USRLAN_165),E_LOG_INFORMATIVE,'USET_09');
$user->show_message($user_name." ".USRLAN_6); $user->show_message($user_name." ".USRLAN_6);
$action = "main"; $action = "main";
if(!$sub_action){ $sub_action = "user_id"; } if(!$sub_action){ $sub_action = "user_id"; }
@@ -392,6 +495,9 @@ if (isset($_POST['useraction']) && $_POST['useraction'] == "unadmin" && getperms
} }
} }
// ------- Approve User. -------------- // ------- Approve User. --------------
if (isset($_POST['useraction']) && $_POST['useraction'] == "verify") if (isset($_POST['useraction']) && $_POST['useraction'] == "verify")
{ {
@@ -413,6 +519,7 @@ if (isset($_POST['useraction']) && $_POST['useraction'] == "verify")
} }
} }
$sql->db_Update("user", "user_ban='0'{$init_classes} WHERE user_id='".$uid."' "); $sql->db_Update("user", "user_ban='0'{$init_classes} WHERE user_id='".$uid."' ");
$admin_log->log_event('LAN_ADMIN_LOG_012',str_replace(array('--UID--','--NAME--'),array($row['user_id'],$row['user_name']),USRLAN_166),E_LOG_INFORMATIVE,'USET_10');
// $e_event->trigger("userveri", $row); // We do this from signup.php - should we do it here? // $e_event->trigger("userveri", $row); // We do this from signup.php - should we do it here?
$user->show_message(USRLAN_86); $user->show_message(USRLAN_86);
@@ -444,12 +551,14 @@ if (isset($_POST['useraction']) && $_POST['useraction'] == "verify")
} }
} }
if (isset($action) && $action == "uset") { if (isset($action) && $action == "uset")
{
$user->show_message(USRLAN_87); $user->show_message(USRLAN_87);
$action = "main"; $action = "main";
} }
if (isset($action) && $action == "cu") { if (isset($action) && $action == "cu")
{
$user->show_message(USRLAN_88); $user->show_message(USRLAN_88);
$action = "main"; $action = "main";
// $sub_action = "user_id"; // $sub_action = "user_id";
@@ -466,25 +575,29 @@ echo "amount= ".$amount."<br />";
$unverified = $sql -> db_Count("user", "(*)", "WHERE user_ban = 2"); $unverified = $sql -> db_Count("user", "(*)", "WHERE user_ban = 2");
if (!e_QUERY || ($action == "main")) { if (!e_QUERY) $action = "main";
switch ($action)
{
case "unverified" :
$user->show_existing_users($action, $sub_action, $id, $from, $amount); $user->show_existing_users($action, $sub_action, $id, $from, $amount);
} break;
if (isset($action) && $action == "unverified") { case "options" :
$user->show_existing_users($action, $sub_action, $id, $from, $amount);
}
if (isset($action) && $action == "options") {
$user->show_prefs(); $user->show_prefs();
} break;
if (isset($action) && $action == "prune") { case "prune" :
$user->show_prune(); $user->show_prune();
break;
case "create" :
$user->add_user();
break;
default :
$user->show_existing_users($action, $sub_action, $id, $from, $amount);
} }
if (isset($action) && $action == "create") {
$user->add_user();
}
require_once("footer.php"); require_once("footer.php");
@@ -829,8 +942,10 @@ class users
} }
function show_options($action) {
function show_options($action)
{
global $unverified; global $unverified;
// ##### Display options // ##### Display options
if ($action == "") if ($action == "")
@@ -861,7 +976,11 @@ class users
show_admin_menu(USRLAN_76, $action, $var); show_admin_menu(USRLAN_76, $action, $var);
} }
function show_prefs() {
function show_prefs()
{
global $ns, $pref; global $ns, $pref;
$pref['memberlist_access'] = varset($pref['memberlist_access'], e_UC_MEMBER); $pref['memberlist_access'] = varset($pref['memberlist_access'], e_UC_MEMBER);
$text = "<div style='text-align:center'> $text = "<div style='text-align:center'>
@@ -940,12 +1059,19 @@ class users
$ns->tablerender(USRLAN_52, $text); $ns->tablerender(USRLAN_52, $text);
} }
function show_message($message) {
function show_message($message)
{
global $ns; global $ns;
$ns->tablerender("", "<div style='text-align:center'><b>".$message."</b></div>"); $ns->tablerender("", "<div style='text-align:center'><b>".$message."</b></div>");
} }
function show_prune() {
function show_prune()
{
global $ns, $sql; global $ns, $sql;
$unactive = $sql->db_Count("user", "(*)", "WHERE user_ban=2"); $unactive = $sql->db_Count("user", "(*)", "WHERE user_ban=2");
@@ -974,8 +1100,12 @@ class users
$ns->tablerender(USRLAN_55, $text); $ns->tablerender(USRLAN_55, $text);
} }
function add_user() {
global $rs, $ns;
function add_user()
{
global $rs, $ns, $pref, $e_userclass;
if (!is_object($e_userclass)) $e_userclass = new user_class;
$text = "<div style='text-align:center'>". $rs->form_open("post", e_SELF, "adduserform")." $text = "<div style='text-align:center'>". $rs->form_open("post", e_SELF, "adduserform")."
<table style='".ADMIN_WIDTH."' class='fborder'> <table style='".ADMIN_WIDTH."' class='fborder'>
<tr> <tr>
@@ -992,6 +1122,13 @@ class users
</td> </td>
</tr> </tr>
<tr>
<td style='width:30%' class='forumheader3'>".USRLAN_129."</td>
<td style='width:70%' class='forumheader3'>
".$rs->form_text("realname", 40, "", 30)."
</td>
</tr>
<tr> <tr>
<td style='width:30%' class='forumheader3'>".USRLAN_62."</td> <td style='width:30%' class='forumheader3'>".USRLAN_62."</td>
<td style='width:70%' class='forumheader3'> <td style='width:70%' class='forumheader3'>
@@ -1012,30 +1149,22 @@ class users
</tr>\n"; </tr>\n";
if (!is_object($sql)) $sql = new db; $temp = $e_userclass->vetted_tree('userclass[]',array($e_userclass,'checkbox_desc'), varset($pref['initial_user_classes'],''), 'classes');
if ($sql->db_Select("userclass_classes")) {
$text .= "<tr style='vertical-align:top'>
<td colspan='2' style='text-align:center' class='forumheader'> if ($temp)
".USRLAN_120."
</td>
</tr>\n";
$c = 0;
while ($row = $sql->db_Fetch()) {
$class[$c][0] = $row['userclass_id'];
$class[$c][1] = $row['userclass_name'];
$class[$c][2] = $row['userclass_description'];
$c++;
}
$init_classes = explode(',',varset($pref['initial_user_classes'],''));
for($a = 0; $a <= (count($class)-1); $a++)
{ {
$selected = in_array($class[$a][0],$init_classes) ? " checked='checked'" : ""; $text .= "<tr style='vertical-align:top'>
$text .= "<tr><td style='width:30%' class='forumheader'> <td class='forumheader3'>
<input type='checkbox' name='userclass[]' value='".$class[$a][0]."'{$selected} />".$class[$a][1]." ".USRLAN_120."
</td><td style='width:70%' class='forumheader3'> ".$class[$a][2]."</td></tr>\n"; </td><td class='forumheader3'>{$temp}</td>
} </tr>\n";
} }
$text .= " $text .= "
<tr style='vertical-align:top'>
<td colspan='2' style='text-align:center' class='forumheader'>
<input class='button' type='checkbox' name='sendconfemail' value='1' />".USRLAN_151."
</td></tr>
<tr style='vertical-align:top'> <tr style='vertical-align:top'>
<td colspan='2' style='text-align:center' class='forumheader'> <td colspan='2' style='text-align:center' class='forumheader'>
<input class='button' type='submit' name='adduser' value='".USRLAN_60."' /> <input class='button' type='submit' name='adduser' value='".USRLAN_60."' />
@@ -1051,20 +1180,26 @@ class users
} }
function resend($id,$key,$name,$email,$lfile=''){ function resend($id,$key,$name,$email,$lfile='')
global $sql,$mailheader_e107id; {
global $sql,$mailheader_e107id, $admin_log;
// Check for a Language field, and if present, send the email in the user's language. // Check for a Language field, and if present, send the email in the user's language.
if($lfile == ""){ if($lfile == "")
if($sql -> db_Select("user_extended", "user_language", "user_extended_id = '$id'")){ {
if($sql -> db_Select("user_extended", "user_language", "user_extended_id = '$id'"))
{
$row = $sql -> db_Fetch(); $row = $sql -> db_Fetch();
$lfile = e_LANGUAGEDIR.$row['user_language']."/lan_signup.php"; $lfile = e_LANGUAGEDIR.$row['user_language']."/lan_signup.php";
} }
} }
if(is_readable($lfile)){ if(is_readable($lfile))
{
require_once($lfile); require_once($lfile);
}else{ }
else
{
$row['user_language'] = e_LANGUAGE; $row['user_language'] = e_LANGUAGE;
require_once(e_LANGUAGEDIR.e_LANGUAGE."/lan_signup.php"); require_once(e_LANGUAGEDIR.e_LANGUAGE."/lan_signup.php");
} }
@@ -1081,42 +1216,55 @@ class users
if(sendemail($email, LAN_404." ".SITENAME, $message)) if(sendemail($email, LAN_404." ".SITENAME, $message))
{ {
// echo str_replace("\n","<br>",$message); // echo str_replace("\n","<br>",$message);
$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.": <a href='mailto:".$email."?body=".$return_address."' title=\"".DUSRLAN_7."\" >".$name."</a> (".$row['user_language'].") "); $this->show_message(USRLAN_140.": <a href='mailto:".$email."?body=".$return_address."' title=\"".DUSRLAN_7."\" >".$name."</a> (".$row['user_language'].") ");
} }
else else
{ {
$this->show_message(USRLAN_141.": ".$name); $this->show_message(USRLAN_141.": ".$name);
} }
} }
function resend_to_all(){ function resend_to_all()
global $sql,$pref,$sql3; {
global $sql,$pref,$sql3, $admin_log;
$count = 0;
$pause_count = 1; $pause_count = 1;
$pause_amount = ($pref['mail_pause']) ? $pref['mail_pause'] : 10; $pause_amount = ($pref['mail_pause']) ? $pref['mail_pause'] : 10;
$pause_time = ($pref['mail_pausetime']) ? $pref['mail_pausetime'] : 1; $pause_time = ($pref['mail_pausetime']) ? $pref['mail_pausetime'] : 1;
if($sql -> db_Select_gen("SELECT user_language FROM #user_extended LIMIT 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"; $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{ }
else
{
$query = "SELECT * FROM #user WHERE user_ban='2'"; $query = "SELECT * FROM #user WHERE user_ban='2'";
} }
if(!is_object($sql3)){ if(!is_object($sql3))
{
$sql3 = new db; $sql3 = new db;
} }
$sql3 -> db_Select_gen($query); $sql3 -> db_Select_gen($query);
while($row = $sql3-> db_Fetch()){ while($row = $sql3-> db_Fetch())
{
echo $row['user_id']." ".$row['user_sess']." ".$row['user_name']." ".$row['user_email']."<br />"; echo $row['user_id']." ".$row['user_sess']." ".$row['user_name']." ".$row['user_email']."<br />";
$this->resend($row['user_id'],$row['user_sess'],$row['user_name'],$row['user_email'],$row['user_language']); $this->resend($row['user_id'],$row['user_sess'],$row['user_name'],$row['user_email'],$row['user_language']);
if($pause_count > $pause_amount){ if($pause_count > $pause_amount)
{
sleep($pause_time); sleep($pause_time);
$pause_count = 1; $pause_count = 1;
} }
sleep(1); sleep(1);
$pause_count++; $pause_count++;
$count++;
}
if ($count)
{
$admin_log->log_event('LAN_ADMIN_LOG_014',str_replace('--COUNT--',$count,USRLAN_168),E_LOG_INFORMATIVE,'USET_12');
} }
} }
@@ -1189,6 +1337,7 @@ class users
} }
} // End - Delete one email } // End - Delete one email
$obj->close_mailbox(); // This actually deletes the emails $obj->close_mailbox(); // This actually deletes the emails
} // End of email deletion } // End of email deletion
@@ -1202,7 +1351,6 @@ class users
<tr><td class='fcaption' style='width:5%'>#</td><td class='fcaption'>e107-id</td><td class='fcaption'>email</td><td class='fcaption'>Subject</td><td class='fcaption'>Bounce</td></tr>\n"; <tr><td class='fcaption' style='width:5%'>#</td><td class='fcaption'>e107-id</td><td class='fcaption'>email</td><td class='fcaption'>Subject</td><td class='fcaption'>Bounce</td></tr>\n";
for($i=1;$i<=$tot;$i++) for($i=1;$i<=$tot;$i++)
{ {
$head=$obj->getHeaders($i); $head=$obj->getHeaders($i);
@@ -1255,6 +1403,11 @@ class users
} }
if ($del_count)
{
$admin_log->log_event('LAN_ADMIN_LOG_015',str_replace('--COUNT--',$del_count,USRLAN_169),E_LOG_INFORMATIVE,'USET_13');
}
if ($tot) if ($tot)
{ // Option to delete emails - only if there are some in the list { // Option to delete emails - only if there are some in the list
@@ -1285,9 +1438,7 @@ class users
if (!$ed) $ed = '0'; if (!$ed) $ed = '0';
$this->show_message(str_replace(array('{TOTAL}','{DELCOUNT}','{DELUSER}','{FOUND}'), $this->show_message(str_replace(array('{TOTAL}','{DELCOUNT}','{DELUSER}','{FOUND}'),
array($tot,$del_count,$ed,$found),USRLAN_155).$text); array($tot,$del_count,$ed,$found),USRLAN_155).$text);
} }
} // End class users } // End class users

44
e107_languages/English/admin/lan_log_messages.php
View File

@@ -1,6 +1,6 @@
<?php <?php
// e107 Language File. // e107 Language File.
// $Id: lan_log_messages.php,v 1.4 2007-12-29 22:07:49 e107steved Exp $ // $Id: lan_log_messages.php,v 1.5 2008-01-01 12:38:05 e107steved Exp $
/* /*
The definitions in this file are for standard 'explanatory' messages which might be entered The definitions in this file are for standard 'explanatory' messages which might be entered
@@ -29,9 +29,9 @@ define('LAN_AUDIT_LOG_014', 'User logged out');
define('LAN_AUDIT_LOG_015', 'User changed display name'); define('LAN_AUDIT_LOG_015', 'User changed display name');
define('LAN_AUDIT_LOG_016', 'User changed password'); define('LAN_AUDIT_LOG_016', 'User changed password');
define('LAN_AUDIT_LOG_017', 'User changed email address'); define('LAN_AUDIT_LOG_017', 'User changed email address');
define('LAN_AUDIT_LOG_018', ''); define('LAN_AUDIT_LOG_018', 'User password reset');
define('LAN_AUDIT_LOG_019', 'User changed settings'); define('LAN_AUDIT_LOG_019', 'User changed settings');
define('LAN_AUDIT_LOG_020', ""); define('LAN_AUDIT_LOG_020', 'User added by admin');
// Admin log events // Admin log events
@@ -39,14 +39,22 @@ define('LAN_AUDIT_LOG_020', "");
define('LAN_ADMIN_LOG_001', 'Admin edited user data'); define('LAN_ADMIN_LOG_001', 'Admin edited user data');
define('LAN_ADMIN_LOG_002', 'Admin log - delete old data'); define('LAN_ADMIN_LOG_002', 'Admin log - delete old data');
define('LAN_ADMIN_LOG_003', 'User Audit log - delete old data'); define('LAN_ADMIN_LOG_003', 'User Audit log - delete old data');
define('LAN_ADMIN_LOG_004', ''); define('LAN_ADMIN_LOG_004', 'User added by Admin');
define('LAN_ADMIN_LOG_005', ''); define('LAN_ADMIN_LOG_005', 'User options updated');
define('LAN_ADMIN_LOG_006', ''); define('LAN_ADMIN_LOG_006', 'Users pruned');
define('LAN_ADMIN_LOG_007', ''); define('LAN_ADMIN_LOG_007', 'User banned');
define('LAN_ADMIN_LOG_008', ''); define('LAN_ADMIN_LOG_008', 'User unbanned');
define('LAN_ADMIN_LOG_009', ''); define('LAN_ADMIN_LOG_009', 'User deleted');
define('LAN_ADMIN_LOG_010', ''); define('LAN_ADMIN_LOG_010', 'User made admin');
define('LAN_ADMIN_LOG_011', ''); define('LAN_ADMIN_LOG_011', 'User admin status revoked');
define('LAN_ADMIN_LOG_012', 'User approved');
define('LAN_ADMIN_LOG_013', 'Resend validation email');
define('LAN_ADMIN_LOG_014', 'Resend all validation emails');
define('LAN_ADMIN_LOG_015', 'Bounced emails deleted');
define('LAN_ADMIN_LOG_016', '');
define('LAN_ADMIN_LOG_017', '');
define('LAN_ADMIN_LOG_018', '');
define('LAN_ADMIN_LOG_019', '');
// Userclass events // Userclass events
//------------------ //------------------
@@ -74,4 +82,18 @@ define('AL_BAN_LAN_10','Whitelist entry edited');
define('AL_BAN_LAN_11','Whitelist hit for ban entry'); define('AL_BAN_LAN_11','Whitelist hit for ban entry');
// Rolling log events
//-------------------
define('LAN_ROLL_LOG_01','Empty username and/or password');
define('LAN_ROLL_LOG_02','Incorrect image code entered');
define('LAN_ROLL_LOG_03','Invalid username/password combination');
define('LAN_ROLL_LOG_04','Invalid username entered');
define('LAN_ROLL_LOG_05','Login attempt by user not fully signed up');
define('LAN_ROLL_LOG_06','Login blocked by event trigger handler');
define('LAN_ROLL_LOG_07','Multiple logins from same address');
define('LAN_ROLL_LOG_08','');
define('LAN_ROLL_LOG_09','');
define('LAN_ROLL_LOG_10','');
?> ?>

28
e107_languages/English/admin/lan_users.php
View File

@@ -4,8 +4,8 @@
| e107 website system - Language File. | e107 website system - Language File.
| |
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_users.php,v $ | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_users.php,v $
| $Revision: 1.8 $ | $Revision: 1.9 $
| $Date: 2007-12-26 13:21:34 $ | $Date: 2008-01-01 12:38:05 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -120,8 +120,8 @@ define("USRLAN_125", "From");
define("USRLAN_126", "Allow users to rate users"); define("USRLAN_126", "Allow users to rate users");
define("USRLAN_127", "Allow comments in user profile"); 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_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_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"); 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_148", "Email address is banned");
define('USRLAN_149', "User banned: "); define('USRLAN_149', "User banned: ");
define('USRLAN_150', "IP address of {IP} appears on whitelist; IP not 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:<br />Login Name: --LOGIN--<br />Password: --PASSWORD--<br/><br />');
define('USRLAN_156', 'Please go to the site as soon as possible and log in, then change your password using the \'Settings\' option.<br /><br />
You can also change other settings at the same time.<br /><br />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_MAINADMIN","Main Admin");
define("LAN_ADMIN","Admin"); define("LAN_ADMIN","Admin");