diff --git a/class2.php b/class2.php
index 935f76673..3884e5d7c 100644
--- a/class2.php
+++ b/class2.php
@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/class2.php,v $
-| $Revision: 1.86 $
-| $Date: 2008-12-19 22:56:22 $
+| $Revision: 1.87 $
+| $Date: 2008-12-21 11:07:58 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@@ -1446,7 +1446,6 @@ function init_session()
define('USEREMAIL', $result['user_email']);
define('USER', true);
define('USERCLASS', $result['user_class']);
- define('USERREALM', $result['user_realm']);
define('USERVIEWED', $result['user_viewed']);
define('USERIMAGE', $result['user_image']);
define('USERPHOTO', $result['user_sess']);
diff --git a/e107_admin/users.php b/e107_admin/users.php
index ed8a4f262..8d70a8216 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -1,20 +1,18 @@
localuser= $adminuser;
@@ -141,20 +141,27 @@ if (isset($_POST['test_mail']))
// ------- Update Options. --------------
if (isset($_POST['update_options']))
{
- $pref['avatar_upload'] = (FILE_UPLOADS ? $_POST['avatar_upload'] : 0);
- $pref['im_width'] = $_POST['im_width'];
- $pref['im_height'] = $_POST['im_height'];
- $pref['photo_upload'] = (FILE_UPLOADS ? $_POST['photo_upload'] : 0);
- $pref['del_unv'] = $_POST['del_unv'];
- $pref['profile_rate'] = $_POST['profile_rate'];
- $pref['profile_comments'] = $_POST['profile_comments'];
- $pref['track_online'] = $_POST['track_online'];
- $pref['force_userupdate'] = $_POST['force_userupdate'];
- $pref['memberlist_access'] = $_POST['memberlist_access'];
- save_prefs();
- unset($_POST['update_options']); // So we don't log it
- $admin_log->log_event('USET_03',$tp->toDB(implode('; ',$_POST)),E_LOG_INFORMATIVE);
- $user->show_message(USRLAN_1);
+ $temp = array();
+ $temp['avatar_upload'] = (FILE_UPLOADS ? $_POST['avatar_upload'] : 0);
+ $temp['im_width'] = $_POST['im_width'];
+ $temp['im_height'] = $_POST['im_height'];
+ $temp['photo_upload'] = (FILE_UPLOADS ? $_POST['photo_upload'] : 0);
+ $temp['del_unv'] = $_POST['del_unv'];
+ $temp['profile_rate'] = $_POST['profile_rate'];
+ $temp['profile_comments'] = $_POST['profile_comments'];
+ $temp['track_online'] = $_POST['track_online'];
+ $temp['force_userupdate'] = $_POST['force_userupdate'];
+ $temp['memberlist_access'] = $_POST['memberlist_access'];
+ $temp['user_new_period'] = $_POST['user_new_period'];
+ if ($admin_log->logArrayDiffs($temp, $pref, 'USET_03'))
+ {
+ save_prefs(); // Only save if changes
+ $user->show_message(USRLAN_1);
+ }
+ else
+ {
+ $user->show_message(USRLAN_193);
+ }
}
@@ -184,136 +191,89 @@ if (isset($_POST['prune']))
// ------- Quick Add User --------------
if (isset($_POST['adduser']))
{
- $e107cache->clear("online_menu_member_total");
- $e107cache->clear("online_menu_member_newest");
if (!$_POST['ac'] == md5(ADMINPWCHANGE))
{
exit;
}
- $user_data = array(); // Assemble the data into an array
-
- require_once(e_HANDLER."message_handler.php");
- $displayname = strip_tags($_POST['name']);
- if (($displayname != strip_tags($_POST['name'])) || (strstr($_POST['name'], "#") || strstr($_POST['name'], "=")))
- {
- message_handler("P_ALERT", USRLAN_92);
- $error = TRUE;
- }
- $displayname = trim(str_replace(" ", "", $displayname));
- if ($displayname == "Anonymous")
- {
- message_handler("P_ALERT", USRLAN_65);
- $error = TRUE;
- }
- 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);
- $error = TRUE;
- }
+ $e107cache->clear('online_menu_member_total');
+ $e107cache->clear('online_menu_member_newest');
+ $error = FALSE;
if (isset($_POST['generateloginname']))
{
- $loginname = $user_info->generateUserLogin($pref['predefinedLoginName']);
+ $_POST['loginname'] = $userMethods->generateUserLogin($pref['predefinedLoginName']);
}
- else
- {
- $loginname = trim(preg_replace('/ |\#|\=|\$/', "", 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 (isset($_POST['generatepassword']))
{
- $_POST['password1'] = $user_info->generateRandomString('**********'); // 10-char password should be enough
- }
- else
- {
- if ($_POST['password1'] != $_POST['password2'])
- {
- message_handler("P_ALERT", USRLAN_67);
- $error = TRUE;
- }
+ $_POST['password1'] = $userMethods->generateRandomString('**********'); // 10-char password should be enough
+ $_POST['password2'] = $_POST['password1'];
}
- if ($_POST['name'] == "" || $_POST['password1'] == "" || $_POST['password2'] = "")
+ // Now validate everything
+ $allData = validatorClass::validateFields($_POST,$userMethods->userVettingInfo, TRUE); // Do basic validation
+ validatorClass::checkMandatory('user_name,user_loginname', $allData); // Check for missing fields (email done in userValidation() )
+ validatorClass::dbValidateArray($allData, $userMethods->userVettingInfo, 'user', 0); // Do basic DB-related checks
+ $userMethods->userValidation($allData); // Do user-specific DB checks
+ if (($_POST['password1'] != $_POST['password2']) && !isset($allData['errors']['user_password']))
{
- message_handler("P_ALERT", USRLAN_68);
- $error = TRUE;
+ $allData['errors']['user_password'] = ERR_PASSWORDS_DIFFERENT;
}
- if (!check_email($_POST['email']))
+ if (!check_class($pref['displayname_class'], $allData['validate']['user_class']))
{
- message_handler("P_ALERT", USRLAN_69);
- $error = TRUE;
+ if ($allData['validate']['user_name'] != $allData['validate']['user_loginname'])
+ {
+ $allData['errors']['user_name'] = ERR_FIELDS_DIFFERENT;
+ }
}
- if ($sql->db_Count("user", "(*)", "WHERE user_email='".$_POST['email']."' AND user_ban='1' "))
+
+ if (count($allData['errors']))
{
- message_handler("P_ALERT", USRLAN_147);
- $error = TRUE;
- }
- if ($sql->db_Count("banlist", "(*)", "WHERE banlist_ip='".$_POST['email']."'"))
- {
- message_handler("P_ALERT", USRLAN_148);
- $error = TRUE;
+ require_once(e_HANDLER."message_handler.php");
+ $temp = validatorClass::makeErrorList($allData,'USER_ERR_','%n - %x - %t: %v', '
-
- ID ".USRLAN_79."
+ ID ".USRLAN_79." ".$display_lan[$disp]." ".ucwords(str_replace("_"," ",$disp))." ".LAN_OPTIONS."
- ";
-
- while ($row = $sql->db_Fetch()) {
+ ";
+
+ while ($row = $sql->db_Fetch())
+ {
extract($row);
$text .= "
-
+
";
-
-
-
- // Display Chosen options -------------------------------------
-
- $datefields = array("user_lastpost","user_lastvisit","user_join","user_currentvisit");
- $boleanfields = array("user_admin","user_hideemail","user_ban");
-
- foreach($search_display as $disp)
- {
- $text .= "";
+ $prev[$disp] = $row[$disp];
}
- }
- else
- {
- $text .= " ";
- }
- }elseif(in_array($disp,$boleanfields))
- {
- $text .= ($row[$disp]) ? ADMIN_TRUE_ICON : "";
- }
- elseif(in_array($disp,$datefields))
- {
- $text .= ($row[$disp]) ? strftime($pref['shortdate'],$row[$disp])." " : " ";
- }
- elseif($disp == "user_name")
- {
- $text .= "{$row['user_name']} ";
- }
- else
- {
- $text .= $row[$disp]." ";
- }
- if(!in_array($disp,$boleanfields) && isset($prev[$disp]) && $row[$disp] == $prev[$disp] && $prev[$disp] != "")
- { // show matches
- $text .= " * ";
- }
-
- $text .= "";
- $prev[$disp] = $row[$disp];
- }
-// -------------------------------------------------------------
+ // -------------------------------------------------------------
$qry = (e_QUERY) ? "?".e_QUERY : "";
$text .= "
";
}
- if($action == "unverified"){
+ if($action == "unverified")
+ {
$text .= "
";
-
}
$users = (e_QUERY != "unverified") ? $sql->db_Count("user"): $unverified;
- if ($users > $amount && !$_POST['searchquery']) {
+ if ($users > $amount && !$_POST['searchquery'])
+ {
$parms = "{$users},{$amount},{$from},".e_SELF."?".(e_QUERY ? "$action.$sub_action.$id." : "main.user_id.desc.")."[FROM]";
$text .= "".LAN_DISPLAYOPT."
";
$text .= "
@@ -1008,72 +943,83 @@ class users
$text = "