diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2005-03-21 23:10:11 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-03-21 23:10:11 +0000 |
commit | e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c (patch) | |
tree | 8b687905d08d6af99c3396fa5c0470c7bbef4ccb /phpBB/includes/ucp | |
parent | a4e51c9699c7a09bea32ad832a9818abba008801 (diff) | |
download | forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar.gz forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar.bz2 forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar.xz forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.zip |
- and my second attempt
git-svn-id: file:///svn/phpbb/trunk@5109 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
-rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 8 | ||||
-rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 8 | ||||
-rw-r--r-- | phpBB/includes/ucp/ucp_prefs.php | 4 | ||||
-rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 9 |
4 files changed, 17 insertions, 12 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index aef5e0c9eb..10d6d6baae 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -296,7 +296,7 @@ function compose_pm($id, $mode, $action) if (!in_array($action, array('quote', 'edit', 'delete', 'forward'))) { $enable_sig = ($config['allow_sig'] && $auth->acl_get('u_sig') && $user->optionget('attachsig')); - $enable_smilies = ($config['allow_smilies'] && $auth->acl_get('u_pm_smilies') && $user->optionget('smile')); + $enable_smilies = ($config['allow_smilies'] && $auth->acl_get('u_pm_smilies') && $user->optionget('smilies')); $enable_bbcode = ($config['allow_bbcode'] && $auth->acl_get('u_pm_bbcode') && $user->optionget('bbcode')); $enable_urls = true; } @@ -424,7 +424,7 @@ function compose_pm($id, $mode, $action) } // Parse Attachments - before checksum is calculated - $message_parser->parse_attachments($action, $msg_id, $submit, $preview, $refresh, true); + $message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true); // Grab md5 'checksum' of new message $message_md5 = md5($message_parser->message); @@ -597,7 +597,7 @@ function compose_pm($id, $mode, $action) // MAIN PM PAGE BEGINS HERE - // Generate smilie listing + // Generate smiley listing generate_smilies('inline', 0); // Generate PM Icons @@ -684,7 +684,7 @@ function compose_pm($id, $mode, $action) $html_checked = (isset($enable_html)) ? !$enable_html : (($config['allow_html'] && $auth->acl_get('u_pm_html')) ? !$user->optionget('html') : 1); $bbcode_checked = (isset($enable_bbcode)) ? !$enable_bbcode : (($config['allow_bbcode'] && $auth->acl_get('u_pm_bbcode')) ? !$user->optionget('bbcode') : 1); - $smilies_checked = (isset($enable_smilies)) ? !$enable_smilies : (($config['allow_smilies'] && $auth->acl_get('u_pm_smilies')) ? !$user->optionget('smile') : 1); + $smilies_checked = (isset($enable_smilies)) ? !$enable_smilies : (($config['allow_smilies'] && $auth->acl_get('u_pm_smilies')) ? !$user->optionget('smilies') : 1); $urls_checked = (isset($enable_urls)) ? !$enable_urls : 0; $sig_checked = $enable_sig; diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 8fb13a18ac..217e0a646b 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -62,7 +62,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) } // Always process smilies after parsing bbcodes - $message = smilie_text($message); + $message = smiley_text($message); // Replace naughty words such as farty pants $message_row['message_subject'] = censor_text($message_row['message_subject']); @@ -147,7 +147,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) $bbcode->bbcode_second_pass($signature, $user_info['user_sig_bbcode_uid'], $user_info['user_sig_bbcode_bitfield']); } - $signature = smilie_text($signature); + $signature = smiley_text($signature); $signature = str_replace("\n", '<br />', censor_text($signature)); } @@ -314,7 +314,7 @@ function message_history($msg_id, $user_id, $message_row, $folder) $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); } - $message = smilie_text($message, !$row['enable_smilies']); + $message = smiley_text($message, !$row['enable_smilies']); $subject = censor_text($subject); $message = censor_text($message); @@ -421,7 +421,7 @@ function get_user_informations($user_id, $user_row) } else { - if(isset($ranks['normal'])) + if (isset($ranks['normal'])) { foreach ($ranks['normal'] as $rank) { diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 2464df2164..e90b28c46d 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -347,7 +347,7 @@ class ucp_prefs extends module $user->optionset('bbcode', $bbcode); $user->optionset('html', $html); - $user->optionset('smile', $smilies); + $user->optionset('smilies', $smilies); $user->optionset('attachsig', $sig); if (!sizeof($error)) @@ -377,7 +377,7 @@ class ucp_prefs extends module $html = (isset($html)) ? $html : $user->optionget('html'); $html_yes = ($html) ? ' checked="checked"' : ''; $html_no = (!$html) ? ' checked="checked"' : ''; - $smilies = (isset($smilies)) ? $smilies : $user->optionget('smile'); + $smilies = (isset($smilies)) ? $smilies : $user->optionget('smilies'); $smilies_yes = ($smilies) ? ' checked="checked"' : ''; $smilies_no = (!$smilies) ? ' checked="checked"' : ''; $sig = (isset($sig)) ? $sig : $user->optionget('attachsig'); diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 034ba66c73..a558e4b2b2 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -380,7 +380,7 @@ class ucp_profile extends module $enable_html = ($config['allow_sig_html']) ? request_var('enable_html', false) : false; $enable_bbcode = ($config['allow_sig_bbcode']) ? request_var('enable_bbcode', $user->optionget('bbcode')) : false; - $enable_smilies = ($config['allow_sig_smilies']) ? request_var('enable_smilies', $user->optionget('smile')) : false; + $enable_smilies = ($config['allow_sig_smilies']) ? request_var('enable_smilies', $user->optionget('smilies')) : false; $enable_urls = request_var('enable_urls', true); $signature = request_var('signature', $user->data['user_sig']); @@ -462,6 +462,11 @@ class ucp_profile extends module $category = request_var('category', ''); $delete = (isset($_POST['delete'])) ? true : false; $avatarselect = request_var('avatarselect', ''); + $avatarselect = str_replace(array('../', '..\\', './', '.\\'), '', $avatarselect); + if ($avatarselect && ($avatarselect{0} == '/' || $avatarselect{0} == "\\")) + { + $avatarselect = ''; + } // 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') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false; @@ -492,7 +497,7 @@ class ucp_profile extends module if (!sizeof($error)) { $data['user_id'] = $user->data['user_id']; - if ( (!empty($_FILES['uploadfile']['name']) || $data['uploadurl']) && $can_upload) + if ((!empty($_FILES['uploadfile']['name']) || $data['uploadurl']) && $can_upload) { list($type, $filename, $width, $height) = avatar_upload($data, $error); } |