Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/includes session.php,1.64,1.65
|
From: Paul S. O. <ps...@us...> - 2003-03-18 22:23:00
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv28131/includes
Modified Files:
session.php
Log Message:
Here I am going on about minimising new includes and I go and create one ... probably better off as a seperate include though than adding ~500 lines of code to session.php
Index: session.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/session.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** session.php 9 Mar 2003 16:10:56 -0000 1.64
--- session.php 18 Mar 2003 22:22:56 -0000 1.65
***************
*** 425,434 ****
$this->lang = &$lang;
! /*
! if (is_array($lang_set))
{
include($this->lang_path . '/common.' . $phpEx);
- $lang_set = explode(',', $lang_set);
foreach ($lang_set as $lang_file)
{
--- 425,432 ----
$this->lang = &$lang;
! /* if (is_array($lang_set))
{
include($this->lang_path . '/common.' . $phpEx);
foreach ($lang_set as $lang_file)
{
***************
*** 441,453 ****
include($this->lang_path . '/common.' . $phpEx);
include($this->lang_path . '/' . $lang_set . '.' . $phpEx);
! }
! */
// Set up style
$style = ($style) ? $style : ((!$config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $config['default_style']);
! $sql = "SELECT t.template_path, t.poll_length, t.pm_box_length, c.css_data, c.css_external, i.*
FROM " . STYLES_TABLE . " s, " . STYLES_TPL_TABLE . " t, " . STYLES_CSS_TABLE . " c, " . STYLES_IMAGE_TABLE . " i
! WHERE s.style_id = $style
AND t.template_id = s.template_id
AND c.theme_id = s.style_id
--- 439,450 ----
include($this->lang_path . '/common.' . $phpEx);
include($this->lang_path . '/' . $lang_set . '.' . $phpEx);
! }*/
// Set up style
$style = ($style) ? $style : ((!$config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $config['default_style']);
! $sql = "SELECT DISTINCT t.template_path, t.poll_length, t.pm_box_length, c.css_data, c.css_external, i.*
FROM " . STYLES_TABLE . " s, " . STYLES_TPL_TABLE . " t, " . STYLES_CSS_TABLE . " c, " . STYLES_IMAGE_TABLE . " i
! WHERE s.style_id IN ($style, " . $config['default_style'] . ")
AND t.template_id = s.template_id
AND c.theme_id = s.style_id
***************
*** 495,973 ****
return $imgs[$img];
}
- }
-
- // Handles manipulation of user data. Primary used in registration
- // and user profile manipulation
- class userdata extends user
- {
- var $error = false;
- var $error_msg;
-
- function add_new_user($userdata, $coppa)
- {
- global $config, $db, $user;
-
- $userdata = $this->prepare_data($userdata, TRUE);
-
- if (!$this->error)
- {
- if (($coppa) && ($config['require_activation'] == USER_ACTIVATION_SELF || $config['require_activation'] == USER_ACTIVATION_ADMIN))
- {
- $user_actkey = $this->gen_png_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_viewemail' => $userdata['viewemail'],
- 'user_attachsig' => $userdata['attachsig'],
- 'user_allowsmile' => $userdata['allowsmilies'],
- 'user_allowhtml' => $userdata['allowhtml'],
- 'user_allowbbcode' => $userdata['allowbbcode'],
- 'user_allow_viewonline' => $userdata['allowviewonline'],
- 'user_allow_pm' => 1,
- 'user_notify' => $userdata['notifyreply'],
- 'user_allow_viewonline' => $userdata['hideonline'],
- 'user_notify_pm'=> $userdata['notifypm'],
- 'user_popup_pm' => $userdata['popup_pm'],
- 'user_timezone' => (float) $userdata['timezone'],
- 'user_dateformat' => $userdata['dateformat'],
- 'user_lang' => $userdata['language'],
- 'user_style' => $userdata['style'],
- 'user_active' => $user_active,
- 'user_actkey' => $user_actkey
- );
- // 'user_avatar' => $avatar_sql['data'],
- // 'user_avatar_type' => $avatar_sql['type'],
-
- $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['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('<br />', "\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('<br />', "\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('<br />', "\n", "-- \n" . $config['board_email_sig']),
-
- 'U_ACTIVATE' => $server_url . '?mode=activate&act_key=' . $user_actkey)
- );
- $emailer->send();
- $emailer->reset();
- }
- */
- $message = $message . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . "index.$phpEx$SID" . '">', '</a>');
-
- $return = array('user_id' => $user_id,
- 'username' => $userdata['username'],
- 'message' => $message);
-
- return($return);
-
-
- }
- else
- {
- return(array('user_id' => 0,
- 'username' => NULL,
- 'message' => $this->error_msg));
- }
-
- }
-
- function prepare_data($userdata, $registration = FALSE)
- {
- global $db, $user, $config;
-
- $strip_var_list = array('username' => 'username', 'email' => 'email');
-
- foreach ($strip_var_list as $var => $param)
- {
- 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 = true;
- $this->error_msg = $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 = TRUE;
- $this->error_msg .= ((isset($this->error_msg)) ? '<br />' : '') . $user->lang['Fields_empty'];
- }
-
- if (!empty($userdata['password']) && !empty($userdata['password_confirm']))
- {
- if ($userdata['password'] != $userdata['password_confirm'])
- {
- $this->error = TRUE;
- $this->error_msg .= ((isset($this->error_msg)) ? '<br />' : '') . $user->lang['Password_mismatch'];
- }
- else if (strlen($userdata['password']) > 32)
- {
- $this->error = TRUE;
- $this->error_msg .= ((isset($this->error_msg)) ? '<br />' : '') . $user->lang['Password_long'];
- }
- else
- {
- if (!$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 = TRUE;
- $this->error_msg .= ((isset($this->error_msg)) ? '<br />' : '') . $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'];
-
- $this->error = TRUE;
- $this->error_msg .= ((isset($this->error_msg)) ? '<br />' : '') . $result;
- }
- }
-
- if (empty($userdata['username']))
- {
- $this->error = TRUE;
- $this->error_msg .= ((isset($this->error_msg)) ? '<br />' : '') . $user->lang['Username_disallowed'];
- }
- else
- {
- if (($result = $this->validate_username($userdata['username'])) != false)
- {
- $this->error = TRUE;
- $this->error_msg .= ((isset($this->error_msg)) ? '<br />' : '') . $result;
- }
- }
-
- // Visual Confirmation handling
- if ($config['enable_confirm'] && $registration)
- {
- if (empty($userdata['confirm_id']))
- {
- $this->error = TRUE;
- $this->error_msg .= ((isset($this->error_msg)) ? '<br />' : '') . $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))
- {
- if ($row['code'] != $userdata['confirm_code'])
- {
- $this->error = TRUE;
- $this->error_msg .= ((isset($this->error_msg)) ? '<br />' : '') . $user->lang['Confirm_code_wrong'];
- }
- }
- else
- {
- $this->error = TRUE;
- $this->error_msg .= ((isset($this->error_msg)) ? '<br />' : '') . $user->lang['Confirm_code_wrong'];
- }
-
- $sql = "DELETE FROM " . CONFIRM_TABLE . "
- WHERE confirm_id = '" . $userdata['confirm_id'] . "'
- AND session_id = '" . $user->data['session_id'] . "'";
- $db->sql_query($sql);
- }
- }
- return($userdata);
- }
-
- function modify_userdata($userdata)
- {
-
-
- }
-
- function gen_png_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++)
- {
- $rand_str .= $chars[mt_rand(0, $max_chars)];
- }
-
- return $rand_str;
- }
-
- // Check to see if the username has been taken, or if it is disallowed.
- // Also checks if it includes the " character, which we don't allow in usernames.
- // Used for registering, changing names, and posting anonymously with a username
- function validate_username($username)
- {
- global $db, $user;
-
- $username = $db->sql_escape($username);
-
- $sql = "SELECT username
- FROM " . USERS_TABLE . "
- WHERE LOWER(username) = '" . strtolower($username) . "'";
- $result = $db->sql_query($sql);
-
- if (($row = $db->sql_fetchrow($result)) && $row['username'] != $user->data['username'])
- {
- return $user->lang['Username_taken'];
- }
-
- $sql = "SELECT group_name
- FROM " . GROUPS_TABLE . "
- WHERE LOWER(group_name) = '" . strtolower($username) . "'";
- $result = $db->sql_query($sql);
-
- if ($row = $db->sql_fetchrow($result))
- {
- return $user->lang['Username_taken'];
- }
-
- $sql = "SELECT disallow_username
- FROM " . DISALLOW_TABLE;
- $result = $db->sql_query($sql);
-
- while ($row = $db->sql_fetchrow($result))
- {
- if (preg_match('#\b(' . str_replace('\*', '.*?', preg_quote($row['disallow_username'], '#')) . ')\b#i', $username))
- {
- return $user->lang['Username_disallowed'];
- }
- }
-
- $sql = "SELECT word
- FROM " . WORDS_TABLE;
- $result = $db->sql_query($sql);
-
- while ($row = $db->sql_fetchrow($result))
- {
- if (preg_match('#\b(' . str_replace('\*', '.*?', preg_quote($row['word'], '#')) . ')\b#i', $username))
- {
- return $user->lang['Username_disallowed'];
- }
- }
-
- // Don't allow " in username.
- if (strstr($username, '"'))
- {
- return $user->lang['Username_invalid'];
- }
-
- return false;
- }
-
- // Check to see if email address is banned or already present in the DB
- function validate_email($email)
- {
- global $db, $user;
-
- if ($email != '')
- {
- if (preg_match('/^[a-z0-9\.\-_\+]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$/is', $email))
- {
- $sql = "SELECT ban_email
- FROM " . BANLIST_TABLE;
- $result = $db->sql_query($sql);
-
- while ($row = $db->sql_fetchrow($result))
- {
- if (preg_match('#^' . str_replace('*', '.*?', $row['ban_email']) . '$#is', $email))
- {
- return $user->lang['Email_banned'];
- }
- }
-
- $sql = "SELECT user_email
- FROM " . USERS_TABLE . "
- WHERE user_email = '" . $db->sql_escape($email) . "'";
- $result = $db->sql_query($sql);
-
- if ($row = $db->sql_fetchrow($result))
- {
- return $user->lang['Email_taken'];
- }
-
- return false;
- }
- }
-
- return $user->lang['Email_invalid'];
- }
-
-
}
--- 492,495 ----
|
