diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index b12e131d3f..6a4bea7b6d 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1,6 +1,6 @@
prepare_data(true);
-
- if (!sizeof($this->error))
+ if (!class_exists('ucp_' . $module_name))
{
- if ($coppa && ($config['require_activation'] == USER_ACTIVATION_SELF ||
- $config['require_activation'] == USER_ACTIVATION_ADMIN))
- {
- $user_actkey = ucp::gen_rand_string(10);
- $key_len = 54 - (strlen($server_url));
- $key_len = ($key_len > 6) ? $key_len : 6;
-
- $user_actkey = substr($user_actkey, 0, $key_len);
- $user_active = 0;
-
- if ($user->data['user_id'] != ANONYMOUS)
- {
- $user->destroy();
- }
- }
- else
- {
- $user_active = 1;
- $user_actkey = '';
- }
-
- // Begin transaction ... should this screw up we can rollback
- $db->sql_transaction();
-
- $sql_ary = array(
- 'user_ip' => $user->ip,
- 'user_regdate' => time(),
- 'username' => $userdata['username'],
- 'user_password' => $userdata['password'],
- 'user_email' => $userdata['email'],
- 'user_allow_pm' => 1,
- 'user_timezone' => (float) $userdata['timezone'],
- 'user_lang' => $userdata['language'],
- 'user_active' => $user_active,
- 'user_actkey' => $user_actkey
- );
-
- $sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
- $db->sql_query($sql);
-
- $user_id = $db->sql_nextid();
-
- // Place into appropriate group, either REGISTERED or INACTIVE depending on config
- $group_name = ($config['require_activation'] == USER_ACTIVATION_NONE) ? 'REGISTERED' : 'INACTIVE';
- $sql = "INSERT INTO " . USER_GROUP_TABLE . " (user_id, group_id, user_pending)
- SELECT $user_id, group_id, 0
- FROM " . GROUPS_TABLE . "
- WHERE group_name = '$group_name'
- AND group_type = " . GROUP_SPECIAL;
- $result = $db->sql_query($sql);
-
- $db->sql_transaction('commit');
-
- if ($coppa)
- {
- $message = $user->lang['ACCOUNT_COPPA'];
- $email_template = 'coppa_welcome_inactive';
- }
- else if ($config['require_activation'] == USER_ACTIVATION_SELF)
- {
- $message = $user->lang['ACCOUNT_INACTIVE'];
- $email_template = 'user_welcome_inactive';
- }
- else if ($config['require_activation'] == USER_ACTIVATION_ADMIN)
- {
- $message = $user->lang['ACCOUNT_INACTIVE_ADMIN'];
- $email_template = 'admin_welcome_inactive';
- }
- else
- {
- $message = $user->lang['ACCOUNT_ADDED'];
- $email_template = 'user_welcome';
- }
-
- /*
- include($phpbb_root_path . 'includes/emailer.'.$phpEx);
- $emailer = new emailer($config['smtp_delivery']);
-
- // Should we just define this within the email class?
- $email_headers = "From: " . $config['board_email'] . "\nReturn-Path: " . $config['board_email'] . "\r\n";
-
- $emailer->use_template($email_template, $user->data['user_lang']);
- $emailer->email_address($email);
- $emailer->set_subject();//sprintf($user->lang['Welcome_subject'], $config['sitename'])
- $emailer->extra_headers($email_headers);
-
- if ($coppa)
- {
- $emailer->assign_vars(array(
- 'SITENAME' => $config['sitename'],
- 'WELCOME_MSG' => sprintf($user->lang['Welcome_subject'], $config['sitename']),
- 'USERNAME' => $username,
- 'PASSWORD' => $password_confirm,
- 'EMAIL_SIG' => str_replace('
', "\n", "-- \n" . $config['board_email_sig']),
-
- 'U_ACTIVATE' => $server_url . '?mode=activate&act_key=' . $user_actkey,
- 'FAX_INFO' => $config['coppa_fax'],
- 'MAIL_INFO' => $config['coppa_mail'],
- 'EMAIL_ADDRESS' => $email,
- 'SITENAME' => $config['sitename']));
- }
- else
- {
- $emailer->assign_vars(array(
- 'SITENAME' => $config['sitename'],
- 'WELCOME_MSG' => sprintf($user->lang['Welcome_subject'], $config['sitename']),
- 'USERNAME' => $username,
- 'PASSWORD' => $password_confirm,
- 'EMAIL_SIG' => str_replace('
', "\n", "-- \n" . $config['board_email_sig']),
- 'U_ACTIVATE' => $server_url . '?mode=activate&act_key=' . $user_actkey)
- );
- }
-
- $emailer->send();
- $emailer->reset();
-
- if ($config['require_activation'] == USER_ACTIVATION_ADMIN)
- {
- $emailer->use_template('admin_activate', stripslashes($user_lang));
- $emailer->email_address($config['board_email']);
- $emailer->set_subject(); //$user->lang['New_account_subject']
- $emailer->extra_headers($email_headers);
-
- $emailer->assign_vars(array(
- 'USERNAME' => $username,
- 'EMAIL_SIG' => str_replace('
', "\n", "-- \n" . $config['board_email_sig']),
-
- 'U_ACTIVATE' => $server_url . '?mode=activate&act_key=' . $user_actkey)
- );
- $emailer->send();
- $emailer->reset();
- }
- */
-
- if ($config['require_activation'] == USER_ACTIVATION_NONE)
- {
- set_config('newest_user_id', $user_id);
- set_config('newest_username', $userdata['username']);
- set_config('num_users', $config['num_users'] + 1, TRUE);
- }
- unset($userdata);
+ global $phpbb_root_path, $phpEx;
- return $message;
+ require_once($phpbb_root_path . 'includes/ucp/ucp_' . $module_name . '.'.$phpEx);
+ eval('$this->module[' . $module_name . '] = new ucp_' . $module_name . '();');
+
+ if (method_exists($this->module[$module_name], 'init'))
+ {
+ $this->module[$module_name]->init();
+ }
}
+ }
+ // This is replaced by the loaded module
+ function main($module_id = false)
+ {
return false;
}
-
- function prepare_data($registration = FALSE)
+
+ // This generates the block template variable for outputting the list
+ // of submodules, should be called with an associative array of modules
+ // in the form 'LANG_STRING' => 'LINK'
+ function subsection(&$module_ary, &$selected_module)
{
- global $db, $user, $config;
-
- $userdata = &$_POST;
+ global $template, $user, $phpEx, $SID;
- $strip_var_list = array('username' => 'username', 'email' => 'email');
-
- foreach ($strip_var_list as $var => $param)
+ foreach($module_ary as $section_title => $module_link)
{
- if (!empty($userdata[$param]))
- {
- $userdata[$var] = trim(strip_tags($userdata[$param]));
- }
- }
-
- $trim_var_list = array('password_current' => 'cur_password', 'password' => 'new_password', 'password_confirm' => 'password_confirm');
-
- foreach ($trim_var_list as $var => $param)
- {
- if (!empty($userdata[$param]))
- {
- $userdata[$var] = trim($userdata[$param]);
- }
- }
-
- $userdata['username'] = str_replace(' ', '', $userdata['username']);
- $userdata['email'] = htmlspecialchars($userdata['email']);
-
- // Run some validation on the optional fields. These are pass-by-ref, so they'll be changed to
- // empty strings if they fail.
- //validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature);
-
- $userdata['viewemail'] = (isset($userdata['viewemail'])) ? (($userdata['viewemail']) ? TRUE : 0) : 0;
- $userdata['hideonline'] = (isset($userdata['hideonline'])) ? (($userdata['hideonline']) ? 0 : TRUE) : TRUE;
- $userdata['notifyreply'] = (isset($userdata['notifyreply'])) ? (($userdata['notifyreply']) ? TRUE : 0) : 0;
- $userdata['notifypm'] = (isset($userdata['notifypm'])) ? (($userdata['notifypm']) ? TRUE : 0) : TRUE;
- $userdata['popup_pm'] = (isset($userdata['popup_pm'])) ? (($userdata['popup_pm']) ? TRUE : 0) : TRUE;
-
- $userdata['attachsig'] = (isset($userdata['attachsig'])) ? (($userdata['attachsig']) ? TRUE : 0) : $config['allow_sig'];
-
- $userdata['allowhtml'] = (isset($userdata['allowhtml'])) ? (($userdata['allowhtml']) ? TRUE : 0) : $config['allow_html'];
- $userdata['allowbbcode'] = (isset($userdata['allowbbcode'])) ? (($userdata['allowbbcode']) ? TRUE : 0) : $config['allow_bbcode'];
- $userdata['allowsmilies'] = (isset($userdata['allowsmilies'])) ? (($userdata['allowsmilies']) ? TRUE : 0) : $config['allow_smilies'];
-
- $userdata['style'] = (isset($userdata['style'])) ? intval($userdata['style']) : $config['default_style'];
-
- if (!empty($userdata['language']))
- {
- if (preg_match('#^[a-z_]+$#i', $userdata['language']))
- {
- $userdata['language'] = $userdata['language'];
- }
- else
- {
- $this->error[] = $user->lang['Fields_empty'];
- }
- }
- else
- {
- $userdata['language'] = $config['default_lang'];
- }
-
- $userdata['timezone'] = (isset($userdata['timezone'])) ? doubleval($userdata['timezone']) : $config['board_timezone'];
- $userdata['dateformat'] = (!empty($userdata['dateformat'])) ? trim($userdata['dateformat']) : $config['default_dateformat'];
-
- if (empty($userdata['username']) || empty($userdata['password']) || empty($userdata['password_confirm']) || empty($userdata['email']))
- {
- $this->error[] = $user->lang['Fields_empty'];
- }
-
- if (!empty($userdata['password']) && !empty($userdata['password_confirm']))
- {
- if ($userdata['password'] != $userdata['password_confirm'])
- {
- $this->error[] = $user->lang['Password_mismatch'];
- }
- else if (strlen($userdata['password']) > 32)
- {
- $this->error[] = $user->lang['Password_long'];
- }
- else
- {
- if (!sizeof($this->error))
- {
- $userdata['password'] = md5($userdata['password']);
- $passwd_sql = "user_password = '$password', ";
- }
- }
- }
- else if ((empty($userdata['password']) && !empty($userdata['password_confirm'])) || (!empty($userdata['password']) && empty($userdata['password_confirm'])))
- {
- $this->error[] = $user->lang['Password_mismatch'];
- }
- else
- {
- $userdata['password'] = $user->data['user_password'];
- }
-
- // Do a ban check on this email address
- if ($userdata['email'] != $user->data['user_email'] || $registration)
- {
- if (($result = $this->validate_email($userdata['email'])) != false)
- {
- $userdata['email'] = $user->data['user_email'];
+ $template->assign_block_vars('ucp_subsection', array(
+ 'L_TITLE' => $user->lang['UCP_' . $section_title],
- $this->error[] = $result;
- }
+ 'S_SELECTED'=> ($section_title == strtoupper($selected_module)) ? true : false,
+
+ 'U_TITLE' => "ucp.$phpEx$SID&$module_link")
+ );
}
-
- if (empty($userdata['username']))
+ }
+
+ // Displays the appropriate template with the given title
+ function display(&$page_title, $tpl_name)
+ {
+ global $template, $phpEx;
+
+ page_header($page_title);
+
+ $template->set_filenames(array(
+ 'body' => $tpl_name)
+ );
+ make_jumpbox('viewforum.'.$phpEx);
+
+ page_footer();
+ }
+
+ // Generates list of additional fields, their type, appropriate data
+ // etc. for admin defined fields
+ function extra_fields($page)
+ {
+ return false;
+ }
+
+ // Generates an alphanumeric random string of given length
+ function gen_rand_string($num_chars)
+ {
+ $chars = array('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '1', '2', '3', '4', '5', '6', '7', '8', '9');
+
+ list($usec, $sec) = explode(' ', microtime());
+ mt_srand($sec * $usec);
+
+ $max_chars = count($chars) - 1;
+ $rand_str = '';
+ for ($i = 0; $i < $num_chars; $i++)
{
- $this->error[] = $user->lang['Username_disallowed'];
+ $rand_str .= $chars[mt_rand(0, $max_chars)];
}
- else
+
+ return $rand_str;
+ }
+
+ // Normalises supplied data dependant on required type/length, errors
+ // on incorrect data
+ function normalise_data(&$data, &$normalise)
+ {
+ $valid_data = array();
+ foreach ($normalise as $var_type => $var_ary)
{
- if (($result = $this->validate_username($userdata['username'])) != false)
+ foreach ($var_ary as $var_name => $var_limits)
{
- $this->error[] = $result;
- }
- }
-
- // Visual Confirmation handling
- if ($config['enable_confirm'] && $registration)
- {
- if (empty($userdata['confirm_id']))
- {
- $this->error[] = $user->lang['CONFIRM_CODE_WRONG'];
- }
- else
- {
- $sql = "SELECT code
- FROM " . CONFIRM_TABLE . "
- WHERE confirm_id = '" . $userdata['confirm_id'] . "'
- AND session_id = '" . $user->data['session_id'] . "'";
- $result = $db->sql_query($sql);
-
- if ($row = $db->sql_fetchrow($result))
+ $var_name = (is_string($var_name)) ? $var_name : $var_limits;
+
+ if (isset($data[$var_name]))
{
- if ($row['code'] != $userdata['confirm_code'])
- {
- $this->error[] = $user->lang['CONFIRM_CODE_WRONG'];
+ switch ($var_type)
+ {
+ case 'int':
+ $valid_data[$var_name] = (int) $data[$var_name];
+ break;
+
+ case 'float':
+ $valid_data[$var_name] = (double) $data[$var_name];
+ break;
+
+ case 'bool':
+ $valid_data[$var_name] = ($data[$var_name] < 0) ? 0 : 1;
+ break;
+
+ case 'string':
+ // Cleanup data, remove excess spaces, run entites
+ $valid_data[$var_name] = htmlentities(strtr(trim(preg_replace('#\s{2,}#s', ' ', (string) $data[$var_name])), array_flip(get_html_translation_table(HTML_ENTITIES))));
+
+ // How should we check this data?
+ if (!is_array($var_limits))
+ {
+ // Is the match a string? If it is, process it further, else we'll
+ // assume it's a maximum length
+ if (is_string($var_limits))
+ {
+ if (strstr($var_limits, ','))
+ {
+ list($min_value, $max_value) = explode(',', $var_limits);
+ if (!empty($valid_data[$var_name]) && strlen($valid_data[$var_name]) < $min_value)
+ {
+ $this->error[] = strtoupper($var_name) . '_TOO_SHORT';
+ }
+
+ if (strlen($valid_data[$var_name]) > $max_value)
+ {
+ $this->error[] = strtoupper($var_name) . '_TOO_LONG';
+ }
+ }
+ }
+ else
+ {
+ if (strlen($valid_data[$var_name]) > $var_limits)
+ {
+ $this->error[] = strtoupper($var_name) . '_TOO_LONG';
+ }
+ }
+ }
+ break;
}
}
- else
- {
- $this->error[] = $user->lang['CONFIRM_CODE_WRONG'];
- }
- $db->sql_freeresult($result);
-
- $sql = "DELETE FROM " . CONFIRM_TABLE . "
- WHERE confirm_id = '" . $userdata['confirm_id'] . "'
- AND session_id = '" . $user->data['session_id'] . "'";
- $db->sql_query($sql);
}
}
- return $userdata;
+ return $valid_data;
}
-
- function modify_userdata($userdata)
+
+ // Validates data subject to supplied requirements, errors appropriately
+ function validate_data(&$data, &$validate)
{
-
-
+ global $db, $user, $config;
+
+ foreach ($validate as $operation => $var_ary)
+ {
+ foreach ($var_ary as $var_name => $compare)
+ {
+ if (!empty($compare))
+ {
+ switch ($operation)
+ {
+ case 'match':
+ if (is_array($compare))
+ {
+ foreach ($compare as $match)
+ {
+ if (!preg_match($match, $data[$var_name]))
+ {
+ $this->error[] = strtoupper($var_name) . '_WRONG_DATA';
+ }
+ }
+ }
+ else if (!preg_match($compare, $data[$var_name]))
+ {
+ $this->error[] = strtoupper($var_name) . '_WRONG_DATA';
+ }
+ break;
+
+ case 'compare':
+ if (is_array($compare))
+ {
+ if (!in_array($data[$var_name], $compare))
+ {
+ $this->error[] = strtoupper($var_name) . '_MISMATCH';
+ }
+ }
+ else if ($data[$var_name] != $compare)
+ {
+ $this->error[] = strtoupper($var_name) . '_MISMATCH';
+ }
+ break;
+
+ case 'function':
+ if ($result = $this->$compare($data[$var_name]))
+ {
+ $this->error[] = $result;
+ }
+
+ break;
+
+ case 'reqd':
+ if (!isset($data[$compare]) || (is_string($data[$compare]) && $data[$compare] === ''))
+ {
+ $this->error[] = strtoupper($compare) . '_MISSING_DATA';
+ }
+ break;
+ }
+ }
+ }
+ }
}
// Check to see if the username has been taken, or if it is disallowed.
@@ -393,31 +248,13 @@ class userdata extends user
function validate_username($username)
{
global $db, $user;
-
- // Clean up username ... convert any entities into normal
- // text, remove excess spaces, then escape it
- $username = strtr(trim($username), array_flip(get_html_translation_table(HTML_ENTITIES)));
- $username = preg_replace('#\s{2,}#', '', $username);
-
- if (strlen(htmlspecialchars($username)) > 60)
- {
- return 'USERNAME_LONG';
- }
-
- // Don't allow " in username.
- if (strstr($username, '"'))
- {
- return 'USERNAME_INVALID';
- }
-
- $username = $db->sql_escape($username);
$sql = "SELECT username
FROM " . USERS_TABLE . "
- WHERE LOWER(username) = '" . strtolower($username) . "'";
+ WHERE LOWER(username) = '" . strtolower($db->sql_escape($username)) . "'";
$result = $db->sql_query($sql);
- if (($row = $db->sql_fetchrow($result)) && $row['username'] != $user->data['username'])
+ if ($row = $db->sql_fetchrow($result))
{
return 'USERNAME_TAKEN';
}
@@ -425,7 +262,7 @@ class userdata extends user
$sql = "SELECT group_name
FROM " . GROUPS_TABLE . "
- WHERE LOWER(group_name) = '" . strtolower($username) . "'";
+ WHERE LOWER(group_name) = '" . strtolower($db->sql_escape($username)) . "'";
$result = $db->sql_query($sql);
if ($row = $db->sql_fetchrow($result))
@@ -470,7 +307,7 @@ class userdata extends user
if ($email != '')
{
- if (preg_match('#^[a-z0-9\.\-_\+]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$#is', $email))
+ if (preg_match('#^[a-z0-9\.\-_\+]+@(.*?\.)*?[a-z0-9\-_]+\.[a-z]+$#is', $email))
{
$sql = "SELECT ban_email
FROM " . BANLIST_TABLE;
@@ -502,6 +339,35 @@ class userdata extends user
return 'EMAIL_INVALID';
}
+
+ function update_user($userdata)
+ {
+
+
+ }
+
+ function check_image_type(&$type)
+ {
+ global $user;
+
+ switch ($type)
+ {
+ case 'jpeg':
+ case 'pjpeg':
+ case 'jpg':
+ return '.jpg';
+ case 'gif':
+ return '.gif';
+ case 'png':
+ return '.png';
+ case 'bmp':
+ return '.bmp';
+ }
+
+ $this->error[] = $user->lang['INVALID_IMAGETYPE'];
+ return false;
+ }
+
}
?>
\ No newline at end of file