diff options
author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-07-07 23:43:57 +0000 |
---|---|---|
committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-07-07 23:43:57 +0000 |
commit | ff58fc5e7c66ea43a292c48ffb58061b0d1c52a8 (patch) | |
tree | 240bff2ffdcb13b25c811f073653e4cc18ee01e6 /phpBB/includes/ucp | |
parent | 4cc4867c972efb5914059a53d6297ddd0eea4690 (diff) | |
download | forums-ff58fc5e7c66ea43a292c48ffb58061b0d1c52a8.tar forums-ff58fc5e7c66ea43a292c48ffb58061b0d1c52a8.tar.gz forums-ff58fc5e7c66ea43a292c48ffb58061b0d1c52a8.tar.bz2 forums-ff58fc5e7c66ea43a292c48ffb58061b0d1c52a8.tar.xz forums-ff58fc5e7c66ea43a292c48ffb58061b0d1c52a8.zip |
Move certain methods out of ucp class, move ucp class into ucp, break half a dozen other features, introduce x hundred new, exciting bugs
git-svn-id: file:///svn/phpbb/trunk@4213 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
-rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 29 | ||||
-rw-r--r-- | phpBB/includes/ucp/ucp_prefs.php | 34 | ||||
-rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 17 | ||||
-rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 6 |
4 files changed, 53 insertions, 33 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 4e5e5bbd58..13921c776d 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -31,7 +31,7 @@ class ucp_main extends ucp $submodules['FRONT'] = "i=$id&mode=front"; $submodules['WATCHED'] = "i=$id&mode=watched"; - $this->subsection($submodules, $submode); + $this->menu($id, $submodules, $submode); unset($submodules); switch ($submode) @@ -152,8 +152,8 @@ class ucp_main extends ucp 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt), 'ATTACH_ICON_IMG' => ($auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_attach', '') : '', - 'S_ROW_COUNT' => $i, - 'S_USER_POSTED' => (!empty($row['mark_type'])) ? true : false, + 'S_ROW_COUNT' => $i, + 'S_USER_POSTED' => (!empty($row['mark_type'])) ? true : false, 'U_VIEW_TOPIC' => $view_topic_url) ); @@ -163,7 +163,6 @@ class ucp_main extends ucp $db->sql_freeresult($result); //TODO -/* $sql_and = ''; $sql = 'SELECT COUNT(post_id) AS total_posts FROM ' . POSTS_TABLE . ' @@ -184,7 +183,7 @@ class ucp_main extends ucp $post_count_sql"; $result = $db->sql_query($sql); - $num_real_posts = min($row['user_posts'], $db->sql_fetchfield('num_posts', 0, $result)); + $num_real_posts = min($user->data['user_posts'], $db->sql_fetchfield('num_posts', 0, $result)); $db->sql_freeresult($result); $sql = "SELECT f.forum_id, f.forum_name, COUNT(post_id) AS num_posts @@ -237,9 +236,15 @@ class ucp_main extends ucp } unset($active_t_row); - $template->assign_vars(show_profile($row)); +// $template->assign_vars(show_profile($row)); $template->assign_vars(array( + 'USER_COLOR' => (!empty($user->data['user_colour'])) ? $user->data['user_colour'] : '', + 'RANK_TITLE' => $rank_title, + 'KARMA' => (!empty($row['user_karma'])) ? $user->data['user_karma'] : 0, + 'JOINED' => $user->format_date($user->data['user_regdate'], $user->lang['DATE_FORMAT']), + 'VISITED' => (empty($last_visit)) ? ' - ' : $user->format_date($last_visit, $user->lang['DATE_FORMAT']), + 'POSTS' => ($data['user_posts']) ? $data['user_posts'] : 0, 'POSTS_DAY' => sprintf($user->lang['POST_DAY'], $posts_per_day), 'POSTS_PCT' => sprintf($user->lang['POST_PCT'], $percentage), 'ACTIVE_FORUM' => $active_f_name, @@ -252,13 +257,12 @@ class ucp_main extends ucp 'OCCUPATION' => (!empty($row['user_occ'])) ? $row['user_occ'] : '', 'INTERESTS' => (!empty($row['user_interests'])) ? $row['user_interests'] : '', - 'S_PROFILE_ACTION' => "groupcp.$phpEx$SID", 'S_GROUP_OPTIONS' => $group_options, 'U_ACTIVE_FORUM' => "viewforum.$phpEx$SID&f=$active_f_id", 'U_ACTIVE_TOPIC' => "viewtopic.$phpEx$SID&t=$active_t_id",) ); -*/ + break; case 'watched': @@ -385,15 +389,14 @@ class ucp_main extends ucp // Subscribed Topics - $sql_t_tracking = ($config['load_db_lastread'] || $config['load_db_track']) ? 'LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id'] . ')' : ''; - $sql_f_tracking = ($config['load_db_lastread']) ? 'LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.forum_id = t.forum_id AND ft.user_id = ' . $user->data['user_id'] . ')' : ''; + $sql_from = ($config['load_db_lastread'] || $config['load_db_track']) ? '(' . TOPICS_TABLE . ' t LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id'] . '))' : TOPICS_TABLE . ' t'; +// $sql_f_tracking = ($config['load_db_lastread']) ? 'LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.forum_id = t.forum_id AND ft.user_id = ' . $user->data['user_id'] . ')' : ''; $sql_t_select = ($config['load_db_lastread'] || $config['load_db_track']) ? ', tt.mark_type, tt.mark_time' : ''; - $sql_f_select = ($config['load_db_lastread']) ? ', ft.mark_time AS forum_mark_time' : ''; +// $sql_f_select = ($config['load_db_lastread']) ? ', ft.mark_time AS forum_mark_time' : ''; $sql = "SELECT t.* $sql_f_select $sql_t_select - FROM ((" . TOPICS_TABLE . " t - $sql_f_tracking) $sql_t_tracking), " . TOPICS_WATCH_TABLE . ' tw + FROM $sql_from, " . TOPICS_WATCH_TABLE . ' tw WHERE tw.user_id = ' . $user->data['user_id'] . ' AND t.topic_id = tw.topic_id ORDER BY t.topic_last_post_time DESC'; diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 1df28f80f8..c6e2e52328 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -32,7 +32,7 @@ class ucp_prefs extends ucp $submodules['VIEW'] = "i=$id&mode=view"; $submodules['POST'] = "i=$id&mode=post"; - $this->subsection($submodules, $submode); + $this->menu($id, $submodules, $submode); unset($submodules); switch($submode) @@ -49,7 +49,7 @@ class ucp_prefs extends ucp ), 'int' => array('dst', 'style'), 'float' => array('tz'), - 'bool' => array('viewemail', 'hideonline', 'notifypm', 'popuppm') + 'bool' => array('viewemail', 'massemail', 'hideonline', 'notifypm', 'popuppm') ); $data = $this->normalise_data($_POST, $normalise); @@ -64,8 +64,9 @@ class ucp_prefs extends ucp if (!sizeof($this->error)) { $sql_ary = array( - 'user_allow_viewemail' => $data['viewemail'], - 'user_allow_viewonline' => !$data['hideonline'], + 'user_allow_viewemail' => $data['viewemail'], + 'user_allow_massemail' => $data['massemail'], + 'user_allow_viewonline' => ($auth->acl_get('u_hideonline')) ? !$data['hideonline'] : $user->data['user_allow_viewonline'], 'user_notify_pm' => $data['notifypm'], 'user_popup_pm' => $data['popuppm'], 'user_dst' => $data['dst'], @@ -90,9 +91,12 @@ class ucp_prefs extends ucp unset($data); } - $view_email = (isset($viewemail)) ? $viewemail : $user->data['user_allow_viewemail']; + $viewemail = (isset($viewemail)) ? $viewemail : $user->data['user_allow_viewemail']; $view_email_yes = ($viewemail) ? ' checked="checked"' : ''; $view_email_no = (!$viewemail) ? ' checked="checked"' : ''; + $massemail = (isset($massemail)) ? $massemail : $user->data['user_allow_massemail']; + $mass_email_yes = ($massemail) ? ' checked="checked"' : ''; + $mass_email_no = (!$massemail) ? ' checked="checked"' : ''; $hideonline = (isset($hideonline)) ? $hideonline : !$user->data['user_allow_viewonline']; $hide_online_yes = ($hideonline) ? ' checked="checked"' : ''; $hide_online_no = (!$hideonline) ? ' checked="checked"' : ''; @@ -116,6 +120,8 @@ class ucp_prefs extends ucp 'VIEW_EMAIL_YES' => $view_email_yes, 'VIEW_EMAIL_NO' => $view_email_no, + 'ADMIN_EMAIL_YES' => $mass_email_yes, + 'ADMIN_EMAIL_NO' => $mass_email_no, 'HIDE_ONLINE_YES' => $hide_online_yes, 'HIDE_ONLINE_NO' => $hide_online_no, 'NOTIFY_PM_YES' => $notify_pm_yes, @@ -129,7 +135,9 @@ class ucp_prefs extends ucp 'S_LANG_OPTIONS' => language_select($lang), 'S_STYLE_OPTIONS' => style_select($style), - 'S_TZ_OPTIONS' => tz_select($tz)) + 'S_TZ_OPTIONS' => tz_select($tz), + 'S_CAN_HIDE_ONLINE' => true, + ) ); break; @@ -143,7 +151,7 @@ class ucp_prefs extends ucp 'sk' => '1,1', 'sd' => '1,1', ), - 'int' => array('st'), + 'int' => array('st', 'minkarma'), 'bool' => array('images', 'flash', 'smilies', 'sigs', 'avatars', 'wordcensor'), ); $data = $this->normalise_data($_POST, $normalise); @@ -159,7 +167,8 @@ class ucp_prefs extends ucp 'user_viewcensors' => ($auth->acl_get('u_chgcensors')) ? $data['wordcensor'] : $user->data['user_viewcensors'], 'user_sortby_type' => $data['sk'], 'user_sortby_dir' => $data['sd'], - 'user_show_days' => $data['st'], + 'user_show_days' => $data['st'], + 'user_min_karma' => $data['minkarma'], ); $sql = 'UPDATE ' . USERS_TABLE . ' @@ -190,6 +199,14 @@ class ucp_prefs extends ucp $s_limit_days = $s_sort_key = $s_sort_dir = ''; gen_sort_selects($limit_days, $sort_by_text, $st, $sk, $sd, &$s_limit_days, &$s_sort_key, &$s_sort_dir); + $s_min_karma_options = ''; + $minkarma = (isset($minkarma)) ? $minkarma : $user->data['user_min_karma']; + for ($i = -5; $i < 6; $i++) + { + $selected = ($i == $minkarma) ? ' selected="selected"' : ''; + $s_min_karma_options .= "<option value=\"$i\"$selected>$i</option>"; + } + $images = (isset($images)) ? $images : $user->data['user_viewimg']; $images_yes = ($images) ? ' checked="checked"' : ''; $images_no = (!$images) ? ' checked="checked"' : ''; @@ -225,6 +242,7 @@ class ucp_prefs extends ucp 'DISABLE_CENSORS_YES' => $wordcensor_yes, 'DISABLE_CENSORS_NO' => $wordcensor_no, + 'S_MIN_KARMA_OPTIONS' => $s_min_karma_options, 'S_CHANGE_CENSORS' => ($auth->acl_get('u_chgcensors')) ? true : false, 'S_SELECT_SORT_DAYS' => $s_limit_days, 'S_SELECT_SORT_KEY' => $s_sort_key, diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index f08f30d947..beafc0ace1 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -25,7 +25,7 @@ class ucp_profile extends ucp { global $censors, $config, $db, $user, $auth, $SID, $template, $phpbb_root_path, $phpEx; - $submode = ($_REQUEST['mode']) ? htmlspecialchars($_REQUEST['mode']) : 'reg_details'; + $submode = (isset($_GET['mode'])) ? htmlspecialchars($_GET['mode']) : 'reg_details'; $error = ''; $submodules['REG_DETAILS'] = "i=$id&mode=reg_details"; @@ -33,7 +33,7 @@ class ucp_profile extends ucp $submodules['SIGNATURE'] = "i=$id&mode=signature"; $submodules['AVATAR'] = "i=$id&mode=avatar"; - $this->subsection($submodules, $submode); + $this->menu($id, $submodules, $submode); unset($submodules); switch ($submode) @@ -66,7 +66,7 @@ class ucp_profile extends ucp 'email_confirm' => ($data['email'] != $user->data['user_email']) ? $data['email'] : '', ), 'match' => array( - 'username' => ($data['username'] != $user->data['username']) ? '#^' . str_replace('\\\\', '\\', $config['allow_name_chars']) . '$#iu' : '', + 'username' => ($data['username'] != $user->data['username']) ? '#^' . preg_replace('#/{1}#', '\\', $config['allow_name_chars']) . '$#iu' : '', ), 'function' => array( 'username' => ($data['username'] != $user->data['username']) ? 'validate_username' : '', @@ -91,7 +91,7 @@ class ucp_profile extends ucp // Need to update config, forum, topic, posting, messages, etc. if ($data['username'] != $user->data['username'] && $auth->acl_get('u_chgname') & $config['allow_namechange']) { - $this->update_username($user->data['username'], $data['username']); + update_username($user->data['username'], $data['username']); } meta_refresh(3, "ucp.$phpEx$SID&i=$id&mode=$submode"); @@ -349,13 +349,12 @@ class ucp_profile extends ucp // Can we upload? $can_upload = ($config['allow_avatar_upload'] && file_exists($phpbb_root_path . $config['avatar_path']) && is_writeable($phpbb_root_path . $config['avatar_path']) && $auth->acl_get('u_chgavatar') && (@ini_get('file_uploads') || @ini_get('file_uploads') == 'On')) ? true : false; - if (isset($_POST['submit'])) { $data = array(); if (!empty($_FILES['uploadfile']['tmp_name']) && $can_upload) { - $this->avatar_upload($data); + avatar_upload($data); } else if (!empty($_POST['uploadurl']) && $can_upload) { @@ -366,7 +365,7 @@ class ucp_profile extends ucp ); $data = $this->normalise_data($_POST, $normalise); - $this->avatar_upload($data); + avatar_upload($data); } else if (!empty($_POST['remotelink']) && $auth->acl_get('u_chgavatar') && $config['allow_avatar_remote']) { @@ -379,7 +378,7 @@ class ucp_profile extends ucp ); $data = $this->normalise_data($_POST, $normalise); - $this->avatar_remote($data); + avatar_remote($data); } else if (!empty($_POST['delete']) && $auth->acl_get('u_chgavatar')) { @@ -406,7 +405,7 @@ class ucp_profile extends ucp // Delete old avatar if present if ($user->data['user_avatar'] != '' && $data['filename'] != $user->data['user_avatar']) { - $this->avatar_delete(); + avatar_delete(); } } diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index b217455cb9..f6b9b51330 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -92,7 +92,7 @@ class ucp_register extends ucp 'email_confirm' => $data['email'], ), 'match' => array( - 'username' => '#^' . str_replace('\\\\', '\\', $config['allow_name_chars']) . '$#iu', + 'username' => '#^' . preg_replace('#/{1}#', '\\', $config['allow_name_chars']) . '$#iu', ), 'function' => array( 'username' => 'validate_username', @@ -146,7 +146,7 @@ class ucp_register extends ucp $config['require_activation'] == USER_ACTIVATION_SELF || $config['require_activation'] == USER_ACTIVATION_ADMIN) && $config['email_enable']) { - $user_actkey = $this->gen_rand_string(10); + $user_actkey = 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); @@ -324,7 +324,7 @@ class ucp_register extends ucp } $db->sql_freeresult($result); - $code = $this->gen_rand_string(6); + $code = gen_rand_string(6); $confirm_id = md5(uniqid($user_ip)); $sql = 'INSERT INTO ' . CONFIRM_TABLE . " (confirm_id, session_id, code) |