diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-09-16 18:33:22 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-09-16 18:33:22 +0000 |
| commit | 2fa463cdeb5d8e4f2373aa834154ca27ea21c97a (patch) | |
| tree | 87059418d9b487f76bf1c99ae7ec3184a62cd8ef /phpBB/includes/ucp | |
| parent | d80f8d577ebdc1489b2dcf49bdb9a266d29d1ef1 (diff) | |
| download | forums-2fa463cdeb5d8e4f2373aa834154ca27ea21c97a.tar forums-2fa463cdeb5d8e4f2373aa834154ca27ea21c97a.tar.gz forums-2fa463cdeb5d8e4f2373aa834154ca27ea21c97a.tar.bz2 forums-2fa463cdeb5d8e4f2373aa834154ca27ea21c97a.tar.xz forums-2fa463cdeb5d8e4f2373aa834154ca27ea21c97a.zip | |
- more updates, mostly bugfixes to the bbcode parser
- changed current_user in sessions (please review)
- give more flexibility to style authors in regard to the pagination elements
- profile fields updates (included a sample constuct into viewtopic_body.html - have to be documented extensivly)
- code optimizations (use of strpos, sizeof, loops not iterating functions on every call, memory savings...)
- and last but not least --- hopefully not introduced more bugs than healthy (*cough*)
git-svn-id: file:///svn/phpbb/trunk@4984 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewfolder.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 11 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 4 |
3 files changed, 13 insertions, 9 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index 990bcc09d5..d0bf1384ba 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -71,7 +71,6 @@ function view_folder($id, $mode, $folder_id, $folder, $type) $recipient_list = $address_list = $address = array(); if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) { - foreach ($folder_info['rowset'] as $message_id => $row) { $address[$message_id] = rebuild_header(array('to' => $row['to_address'], 'bcc' => $row['bcc_address'])); @@ -122,8 +121,8 @@ function view_folder($id, $mode, $folder_id, $folder, $type) foreach ($folder_info['pm_list'] as $message_id) { - $row =& $folder_info['rowset'][$message_id]; - + $row = &$folder_info['rowset'][$message_id]; + $folder_img = ($row['unread']) ? 'folder_new' : 'folder'; $folder_alt = ($row['unread']) ? 'NEW_MESSAGES' : 'NO_NEW_MESSAGES'; @@ -167,8 +166,8 @@ function view_folder($id, $mode, $folder_id, $folder, $type) // 'U_MCP_QUEUE' => "mcp.$phpEx?sid={$user->session_id}&mode=mod_queue&t=$topic_id") ); - unset($folder_info['rowset'][$message_id]); } + unset($folder_info['rowset']); $template->assign_vars(array( 'S_SHOW_RECIPIENTS' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? true : false, diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index e89ce7947f..f4e963daae 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -252,9 +252,14 @@ class ucp_profile extends module unset($data); // validate custom profile fields - $cp->submit_cp_field('profile', $cp_data, $cp_error); + $cp->submit_cp_field('profile', $user->get_iso_lang_id(), $cp_data, $cp_error); - if (!sizeof($error) && !sizeof($cp_error)) + if (sizeof($cp_error)) + { + $error = array_merge($error, $cp_error); + } + + if (!sizeof($error)) { $sql_ary = array( 'user_icq' => $icq, @@ -351,7 +356,7 @@ class ucp_profile extends module // Get additional profile fields and assign them to the template block var 'profile_fields' $user->get_profile_fields($user->data['user_id']); - $cp->generate_profile_fields('profile', $user->get_iso_lang_id(), $cp_error); + $cp->generate_profile_fields('profile', $user->get_iso_lang_id()); break; diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index a6a55df546..cd188cd383 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -111,7 +111,7 @@ class ucp_register extends module $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); // validate custom profile fields - $cp->submit_cp_field('register', $cp_data, $error); + $cp->submit_cp_field('register', $user->get_iso_lang_id(), $cp_data, $error); // Visual Confirmation handling $wrong_confirm = false; @@ -438,7 +438,7 @@ class ucp_register extends module $user->profile_fields = array(); // Generate profile fields -> Template Block Variable profile_fields - $cp->generate_profile_fields('register', $user->get_iso_lang_id(), $cp_error); + $cp->generate_profile_fields('register', $user->get_iso_lang_id()); // $this->display($user->lang['REGISTER'], 'ucp_register.html'); |