diff options
Diffstat (limited to 'phpBB/includes')
-rw-r--r-- | phpBB/includes/captcha/plugins/captcha_abstract.php | 20 | ||||
-rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | 5 | ||||
-rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 15 | ||||
-rw-r--r-- | phpBB/includes/functions.php | 42 | ||||
-rw-r--r-- | phpBB/includes/functions_display.php | 48 | ||||
-rw-r--r-- | phpBB/includes/functions_posting.php | 66 | ||||
-rw-r--r-- | phpBB/includes/functions_privmsgs.php | 18 | ||||
-rw-r--r-- | phpBB/includes/functions_profile_fields.php | 40 | ||||
-rw-r--r-- | phpBB/includes/functions_user.php | 20 |
9 files changed, 138 insertions, 136 deletions
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php index 8170b69356..621fea414a 100644 --- a/phpBB/includes/captcha/plugins/captcha_abstract.php +++ b/phpBB/includes/captcha/plugins/captcha_abstract.php @@ -72,30 +72,30 @@ abstract class phpbb_default_captcha implements phpbb_captcha_plugin function get_template() { - $template->set_filenames(array( - 'captcha' => 'captcha_default.html') - ); + phpbb::$template->set_filenames(array( + 'captcha' => 'captcha_default.html', + )); - $template->assign_vars(array( + phpbb::$template->assign_vars(array( 'CONFIRM_IMAGE' => append_sid('ucp', 'mode=confirm&confirm_id=' . $this->confirm_id . '&type=' . $this->type), 'CONFIRM_ID' => $this->confirm_id, )); - return $template->assign_display('captcha'); + return phpbb::$template->assign_display('captcha'); } function get_demo_template($id) { - $template->set_filenames(array( - 'captcha_demo' => 'captcha_default_acp_demo.html') - ); + phpbb::$template->set_filenames(array( + 'captcha_demo' => 'captcha_default_acp_demo.html', + )); // acp_captcha has a delivery function; let's use it - $template->assign_vars(array( + phpbb::$template->assign_vars(array( 'CONFIRM_IMAGE' => append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'captcha_demo=1&mode=visual&i=' . $id . '&select_captcha=' . $this->get_class_name()), 'CONFIRM_ID' => $this->confirm_id, )); - return $template->assign_display('captcha_demo'); + return phpbb::$template->assign_display('captcha_demo'); } function get_hidden_fields() diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php index bb4d550903..f795349f3d 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php @@ -86,9 +86,10 @@ class phpbb_captcha_gd extends phpbb_default_captcha implements phpbb_captcha_pl foreach ($captcha_vars as $captcha_var => $template_var) { $var = request_var($captcha_var, (int) phpbb::$config[$captcha_var]); - $template->assign_var($template_var, $var); + phpbb::$template->assign_var($template_var, $var); } - $template->assign_vars(array( + + phpbb::$template->assign_vars(array( 'CAPTCHA_PREVIEW' => $this->get_demo_template($id), 'CAPTCHA_NAME' => $this->get_class_name(), )); diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php index e70500e797..a27909baee 100644 --- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php @@ -92,9 +92,10 @@ class phpbb_recaptcha extends phpbb_default_captcha implements phpbb_captcha_plu foreach ($captcha_vars as $captcha_var => $template_var) { $var = request_var($captcha_var, (isset(phpbb::$config[$captcha_var])) ? (string) phpbb::$config[$captcha_var] : ''); - $template->assign_var($template_var, $var); + phpbb::$template->assign_var($template_var, $var); } - $template->assign_vars(array( + + phpbb::$template->assign_vars(array( 'CAPTCHA_PREVIEW' => $this->get_demo_template($id), 'CAPTCHA_NAME' => $this->get_class_name(), )); @@ -117,18 +118,18 @@ class phpbb_recaptcha extends phpbb_default_captcha implements phpbb_captcha_plu function get_template() { - $template->set_filenames(array( - 'captcha' => 'captcha_recaptcha.html') - ); + phpbb::$template->set_filenames(array( + 'captcha' => 'captcha_recaptcha.html', + )); - $template->assign_vars(array( + phpbb::$template->assign_vars(array( 'RECAPTCHA_SERVER' => self::recaptcha_server, 'RECAPTCHA_PUBKEY' => isset(phpbb::$config['recaptcha_pubkey']) ? phpbb::$config['recaptcha_pubkey'] : '', 'RECAPTCHA_ERRORGET' => '', 'S_RECAPTCHA_AVAILABLE' => self::is_available(), )); - return $template->assign_display('captcha'); + return phpbb::$template->assign_display('captcha'); } function get_demo_template($id) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 48314467de..921c17e957 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1002,7 +1002,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add } } - $template->assign_vars(array( + phpbb::$template->assign_vars(array( $tpl_prefix . 'BASE_URL' => $base_url, 'A_' . $tpl_prefix . 'BASE_URL' => addslashes($base_url), $tpl_prefix . 'PER_PAGE' => $per_page, @@ -1026,9 +1026,9 @@ function on_page($num_items, $per_page, $start) $on_page = floor($start / $per_page) + 1; - $template->assign_vars(array( - 'ON_PAGE' => $on_page) - ); + phpbb::$template->assign_vars(array( + 'ON_PAGE' => $on_page, + )); return phpbb::$user->lang('PAGE_OF', $on_page, max(ceil($num_items / $per_page), 1)); } @@ -1054,7 +1054,7 @@ function add_form_key($form_name) 'form_token' => $token, )); - $template->assign_vars(array( + phpbb::$template->assign_vars(array( 'S_FORM_TOKEN' => $s_fields, )); } @@ -1167,9 +1167,9 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo page_header((!isset(phpbb::$user->lang[$title])) ? phpbb::$user->lang['CONFIRM'] : phpbb::$user->lang[$title]); - $template->set_filenames(array( - 'body' => $html_body) - ); + phpbb::$template->set_filenames(array( + 'body' => $html_body, + )); // If activation key already exist, we better do not re-use the key (something very strange is going on...) if (request_var('confirm_key', '')) @@ -1183,14 +1183,14 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo $u_action = reapply_sid($use_page); $u_action .= ((strpos($u_action, '?') === false) ? '?' : '&') . 'confirm_key=' . $confirm_key; - $template->assign_vars(array( + phpbb::$template->assign_vars(array( 'MESSAGE_TITLE' => (!isset(phpbb::$user->lang[$title])) ? phpbb::$user->lang['CONFIRM'] : phpbb::$user->lang[$title], 'MESSAGE_TEXT' => (!isset(phpbb::$user->lang[$title . '_CONFIRM'])) ? $title : phpbb::$user->lang[$title . '_CONFIRM'], 'YES_VALUE' => phpbb::$user->lang['YES'], 'S_CONFIRM_ACTION' => $u_action, - 'S_HIDDEN_FIELDS' => $hidden . $s_hidden_fields) - ); + 'S_HIDDEN_FIELDS' => $hidden . $s_hidden_fields, + )); $sql = 'UPDATE ' . USERS_TABLE . " SET user_last_confirm_key = '" . phpbb::$db->sql_escape($confirm_key) . "' WHERE user_id = " . phpbb::$user->data['user_id']; @@ -1321,7 +1321,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa $captcha->init(CONFIRM_LOGIN); $captcha->reset(); - $template->assign_vars(array( + phpbb::$template->assign_vars(array( 'S_CONFIRM_CODE' => true, 'CONFIRM' => $captcha->get_template(''), )); @@ -1405,8 +1405,8 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa )); phpbb::$template->set_filenames(array( - 'body' => 'login_body.html') - ); + 'body' => 'login_body.html', + )); page_header(phpbb::$user->lang['LOGIN'], false); make_jumpbox('viewforum'); @@ -1473,18 +1473,18 @@ function login_forum_box($forum_data) return true; } - $template->assign_var('LOGIN_ERROR', phpbb::$user->lang['WRONG_PASSWORD']); + phpbb::$template->assign_var('LOGIN_ERROR', phpbb::$user->lang['WRONG_PASSWORD']); } page_header(phpbb::$user->lang['LOGIN']); - $template->assign_vars(array( - 'S_HIDDEN_FIELDS' => build_hidden_fields(array('f' => $forum_data['forum_id']))) - ); + phpbb::$template->assign_vars(array( + 'S_HIDDEN_FIELDS' => build_hidden_fields(array('f' => $forum_data['forum_id'])), + )); - $template->set_filenames(array( - 'body' => 'login_forum.html') - ); + phpbb::$template->set_filenames(array( + 'body' => 'login_forum.html', + )); page_footer(); } diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index d5045dfb12..19f9716c77 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -286,8 +286,8 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod 'FORUM_FOLDER_IMG_SRC' => '', 'FORUM_IMAGE' => ($row['forum_image']) ? '<img src="' . PHPBB_ROOT_PATH . $row['forum_image'] . '" alt="' . phpbb::$user->lang['FORUM_CAT'] . '" />' : '', 'FORUM_IMAGE_SRC' => ($row['forum_image']) ? PHPBB_ROOT_PATH . $row['forum_image'] : '', - 'U_VIEWFORUM' => phpbb::$url->append_sid('viewforum', 'f=' . $row['forum_id'])) - ); + 'U_VIEWFORUM' => phpbb::$url->append_sid('viewforum', 'f=' . $row['forum_id']), + )); continue; } @@ -457,8 +457,8 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod phpbb::$template->assign_block_vars('forumrow.subforum', array( 'U_SUBFORUM' => $subforum['link'], 'SUBFORUM_NAME' => $subforum['name'], - 'S_UNREAD' => $subforum['unread']) - ); + 'S_UNREAD' => $subforum['unread'], + )); } $last_catless = $catless; @@ -468,8 +468,8 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod 'U_MARK_FORUMS' => (phpbb::$user->is_registered || phpbb::$config['load_anon_lastread']) ? phpbb::$url->append_sid('viewforum', 'hash=' . generate_link_hash('global') . '&f=' . $root_data['forum_id'] . '&mark=forums') : '', 'S_HAS_SUBFORUM' => ($visible_forums) ? true : false, 'L_SUBFORUM' => phpbb::$user->lang('SUBFORUMS', $visible_forums), - 'LAST_POST_IMG' => phpbb::$user->img('icon_topic_latest', 'VIEW_LATEST_POST')) - ); + 'LAST_POST_IMG' => phpbb::$user->img('icon_topic_latest', 'VIEW_LATEST_POST'), + )); if ($return_moderators) { @@ -494,11 +494,11 @@ function generate_forum_rules(&$forum_data) $forum_data['forum_rules'] = generate_text_for_display($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], $forum_data['forum_rules_options']); } - $template->assign_vars(array( + phpbb::$template->assign_vars(array( 'S_FORUM_RULES' => true, 'U_FORUM_RULES' => $forum_data['forum_rules_link'], - 'FORUM_RULES' => $forum_data['forum_rules']) - ); + 'FORUM_RULES' => $forum_data['forum_rules'], + )); } /** @@ -528,31 +528,31 @@ function generate_forum_nav(&$forum_data) continue; } - $template->assign_block_vars('navlinks', array( + phpbb::$template->assign_block_vars('navlinks', array( 'S_IS_CAT' => ($parent_type == FORUM_CAT) ? true : false, 'S_IS_LINK' => ($parent_type == FORUM_LINK) ? true : false, 'S_IS_POST' => ($parent_type == FORUM_POST) ? true : false, 'FORUM_NAME' => $parent_name, 'FORUM_ID' => $parent_forum_id, - 'U_VIEW_FORUM' => phpbb::$url->append_sid('viewforum', 'f=' . $parent_forum_id)) - ); + 'U_VIEW_FORUM' => phpbb::$url->append_sid('viewforum', 'f=' . $parent_forum_id), + )); } } - $template->assign_block_vars('navlinks', array( + phpbb::$template->assign_block_vars('navlinks', array( 'S_IS_CAT' => ($forum_data['forum_type'] == FORUM_CAT) ? true : false, 'S_IS_LINK' => ($forum_data['forum_type'] == FORUM_LINK) ? true : false, 'S_IS_POST' => ($forum_data['forum_type'] == FORUM_POST) ? true : false, 'FORUM_NAME' => $forum_data['forum_name'], 'FORUM_ID' => $forum_data['forum_id'], - 'U_VIEW_FORUM' => phpbb::$url->append_sid('viewforum', 'f=' . $forum_data['forum_id'])) - ); + 'U_VIEW_FORUM' => phpbb::$url->append_sid('viewforum', 'f=' . $forum_data['forum_id']), + )); - $template->assign_vars(array( + phpbb::$template->assign_vars(array( 'FORUM_ID' => $forum_data['forum_id'], 'FORUM_NAME' => $forum_data['forum_name'], - 'FORUM_DESC' => generate_text_for_display($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options'])) - ); + 'FORUM_DESC' => generate_text_for_display($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options']), + )); return; } @@ -741,7 +741,7 @@ function gen_forum_auth_level($mode, $forum_id, $forum_status) foreach ($rules as $rule) { - $template->assign_block_vars('rules', array('RULE' => $rule)); + phpbb::$template->assign_block_vars('rules', array('RULE' => $rule)); } return; @@ -838,7 +838,7 @@ function display_custom_bbcodes() $i = 0; while ($row = phpbb::$db->sql_fetchrow($result)) { - $template->assign_block_vars('custom_tags', array( + phpbb::$template->assign_block_vars('custom_tags', array( 'BBCODE_NAME' => "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'", 'BBCODE_ID' => $num_predefined_bbcodes + ($i * 2), 'BBCODE_TAG' => $row['bbcode_tag'], @@ -870,12 +870,12 @@ function display_reasons($reason_id = 0) $row['reason_title'] = phpbb::$user->lang['report_reasons']['TITLE'][strtoupper($row['reason_title'])]; } - $template->assign_block_vars('reason', array( + phpbb::$template->assign_block_vars('reason', array( 'ID' => $row['reason_id'], 'TITLE' => $row['reason_title'], 'DESCRIPTION' => $row['reason_description'], - 'S_SELECTED' => ($row['reason_id'] == $reason_id) ? true : false) - ); + 'S_SELECTED' => ($row['reason_id'] == $reason_id) ? true : false, + )); } phpbb::$db->sql_freeresult($result); } @@ -974,7 +974,7 @@ function display_user_activity(&$userdata) $l_active_pct = ($userdata['user_id'] != ANONYMOUS && $userdata['user_id'] == phpbb::$user->data['user_id']) ? phpbb::$user->lang['POST_PCT_ACTIVE_OWN'] : phpbb::$user->lang['POST_PCT_ACTIVE']; - $template->assign_vars(array( + phpbb::$template->assign_vars(array( 'ACTIVE_FORUM' => $active_f_name, 'ACTIVE_FORUM_POSTS' => ($active_f_count == 1) ? sprintf(phpbb::$user->lang['USER_POST'], 1) : sprintf(phpbb::$user->lang['USER_POSTS'], $active_f_count), 'ACTIVE_FORUM_PCT' => sprintf($l_active_pct, $active_f_pct), diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index c5659c1451..13018e47f5 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -41,9 +41,9 @@ function generate_smilies($mode, $forum_id) page_header(phpbb::$user->lang['SMILIES']); - $template->set_filenames(array( - 'body' => 'posting_smilies.html') - ); + phpbb::$template->set_filenames(array( + 'body' => 'posting_smilies.html', + )); } $display_link = false; @@ -83,23 +83,23 @@ function generate_smilies($mode, $forum_id) { foreach ($smilies as $row) { - $template->assign_block_vars('smiley', array( + phpbb::$template->assign_block_vars('smiley', array( 'SMILEY_CODE' => $row['code'], 'A_SMILEY_CODE' => addslashes($row['code']), 'SMILEY_IMG' => PHPBB_ROOT_PATH . phpbb::$config['smilies_path'] . '/' . $row['smiley_url'], 'SMILEY_WIDTH' => $row['smiley_width'], 'SMILEY_HEIGHT' => $row['smiley_height'], - 'SMILEY_DESC' => $row['emotion']) - ); + 'SMILEY_DESC' => $row['emotion'], + )); } } if ($mode == 'inline' && $display_link) { - $template->assign_vars(array( + phpbb::$template->assign_vars(array( 'S_SHOW_SMILEY_LINK' => true, - 'U_MORE_SMILIES' => append_sid('posting', 'mode=smilies&f=' . $forum_id)) - ); + 'U_MORE_SMILIES' => append_sid('posting', 'mode=smilies&f=' . $forum_id), + )); } if ($mode == 'window') @@ -246,7 +246,7 @@ function posting_gen_topic_icons($mode, $icon_id) if (!$icon_id) { - $template->assign_var('S_NO_ICON_CHECKED', ' checked="checked"'); + phpbb::$template->assign_var('S_NO_ICON_CHECKED', ' checked="checked"'); } if (sizeof($icons)) @@ -255,15 +255,15 @@ function posting_gen_topic_icons($mode, $icon_id) { if ($data['display']) { - $template->assign_block_vars('topic_icon', array( + phpbb::$template->assign_block_vars('topic_icon', array( 'ICON_ID' => $id, 'ICON_IMG' => PHPBB_ROOT_PATH . phpbb::$config['icons_path'] . '/' . $data['img'], 'ICON_WIDTH' => $data['width'], 'ICON_HEIGHT' => $data['height'], 'S_CHECKED' => ($id == $icon_id) ? true : false, - 'S_ICON_CHECKED' => ($id == $icon_id) ? ' checked="checked"' : '') - ); + 'S_ICON_CHECKED' => ($id == $icon_id) ? ' checked="checked"' : '', + )); } } @@ -319,13 +319,13 @@ function posting_gen_topic_types($forum_id, $cur_topic_type = POST_NORMAL) foreach ($topic_type_array as $array) { - $template->assign_block_vars('topic_type', $array); + phpbb::$template->assign_block_vars('topic_type', $array); } - $template->assign_vars(array( + phpbb::$template->assign_vars(array( 'S_TOPIC_TYPE_STICKY' => (phpbb::$acl->acl_get('f_sticky', $forum_id)), - 'S_TOPIC_TYPE_ANNOUNCE' => (phpbb::$acl->acl_get('f_announce', $forum_id))) - ); + 'S_TOPIC_TYPE_ANNOUNCE' => (phpbb::$acl->acl_get('f_announce', $forum_id)), + )); } return $toggle; @@ -738,7 +738,7 @@ function posting_gen_inline_attachments(&$attachment_data) $s_inline_attachment_options .= '<option value="' . $i . '">' . basename($attachment['real_filename']) . '</option>'; } - $template->assign_var('S_INLINE_ATTACHMENT_OPTIONS', $s_inline_attachment_options); + phpbb::$template->assign_var('S_INLINE_ATTACHMENT_OPTIONS', $s_inline_attachment_options); return true; } @@ -752,7 +752,7 @@ function posting_gen_inline_attachments(&$attachment_data) function posting_gen_attachment_entry($attachment_data, &$filename_data, $show_attach_box = true) { // Some default template variables - $template->assign_vars(array( + phpbb::$template->assign_vars(array( 'S_SHOW_ATTACH_BOX' => $show_attach_box, 'S_HAS_ATTACHMENTS' => sizeof($attachment_data), 'FILESIZE' => phpbb::$config['max_filesize'], @@ -776,7 +776,7 @@ function posting_gen_attachment_entry($attachment_data, &$filename_data, $show_a $download_link = append_sid('download/file', 'mode=view&id=' . (int) $attach_row['attach_id'], true, ($attach_row['is_orphan']) ? phpbb::$user->session_id : false); - $template->assign_block_vars('attach_row', array( + phpbb::$template->assign_block_vars('attach_row', array( 'FILENAME' => basename($attach_row['real_filename']), 'A_FILENAME' => addslashes(basename($attach_row['real_filename'])), 'FILE_COMMENT' => $attach_row['attach_comment'], @@ -785,8 +785,8 @@ function posting_gen_attachment_entry($attachment_data, &$filename_data, $show_a 'ASSOC_INDEX' => $count, 'U_VIEW_ATTACHMENT' => $download_link, - 'S_HIDDEN' => $hidden) - ); + 'S_HIDDEN' => $hidden, + )); } } @@ -856,7 +856,7 @@ function load_drafts($topic_id = 0, $forum_id = 0, $id = 0) } unset($topic_ids); - $template->assign_var('S_SHOW_DRAFTS', true); + phpbb::$template->assign_var('S_SHOW_DRAFTS', true); foreach ($draft_rows as $draft) { @@ -893,7 +893,7 @@ function load_drafts($topic_id = 0, $forum_id = 0, $id = 0) $insert_url = append_sid('ucp', "i=$id&mode=compose&d={$draft['draft_id']}"); } - $template->assign_block_vars('draftrow', array( + phpbb::$template->assign_block_vars('draftrow', array( 'DRAFT_ID' => $draft['draft_id'], 'DATE' => phpbb::$user->format_date($draft['save_time']), 'DRAFT_SUBJECT' => $draft['draft_subject'], @@ -904,8 +904,8 @@ function load_drafts($topic_id = 0, $forum_id = 0, $id = 0) 'S_LINK_PM' => $link_pm, 'S_LINK_TOPIC' => $link_topic, - 'S_LINK_FORUM' => $link_forum) - ); + 'S_LINK_FORUM' => $link_forum, + )); } } @@ -1037,7 +1037,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id $post_subject = censor_text($post_subject); - $template->assign_block_vars($mode . '_row', array( + phpbb::$template->assign_block_vars($mode . '_row', array( 'POST_AUTHOR_FULL' => get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), 'POST_AUTHOR_COLOUR' => get_username_string('colour', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), 'POST_AUTHOR' => get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), @@ -1053,17 +1053,17 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id 'POST_ID' => $row['post_id'], 'U_MINI_POST' => append_sid('viewtopic', 'p=' . $row['post_id']) . '#p' . $row['post_id'], 'U_MCP_DETAILS' => (phpbb::$acl->acl_get('m_info', $forum_id)) ? append_sid('mcp', 'i=main&mode=post_details&f=' . $forum_id . '&p=' . $row['post_id'], true, phpbb::$user->session_id) : '', - 'POSTER_QUOTE' => ($show_quote_button && phpbb::$acl->acl_get('f_reply', $forum_id)) ? addslashes(get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '') - ); + 'POSTER_QUOTE' => ($show_quote_button && phpbb::$acl->acl_get('f_reply', $forum_id)) ? addslashes(get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '', + )); // Display not already displayed Attachments for this post, we already parsed them. ;) if (!empty($attachments[$row['post_id']])) { foreach ($attachments[$row['post_id']] as $attachment) { - $template->assign_block_vars($mode . '_row.attachment', array( - 'DISPLAY_ATTACHMENT' => $attachment) - ); + phpbb::$template->assign_block_vars($mode . '_row.attachment', array( + 'DISPLAY_ATTACHMENT' => $attachment, + )); } } @@ -1072,7 +1072,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id if ($mode == 'topic_review') { - $template->assign_var('QUOTE_IMG', phpbb::$user->img('icon_post_quote', 'REPLY_WITH_QUOTE')); + phpbb::$template->assign_var('QUOTE_IMG', phpbb::$user->img('icon_post_quote', 'REPLY_WITH_QUOTE')); } return true; diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 591eefdaba..523a688a6b 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -191,7 +191,7 @@ function get_folder($user_id, $folder_id = false) { $folder_id_name = ($f_id == PRIVMSGS_INBOX) ? 'inbox' : (($f_id == PRIVMSGS_OUTBOX) ? 'outbox' : 'sentbox'); - $template->assign_block_vars('folder', array( + phpbb::$template->assign_block_vars('folder', array( 'FOLDER_ID' => $f_id, 'FOLDER_NAME' => $folder_ary['folder_name'], 'NUM_MESSAGES' => $folder_ary['num_messages'], @@ -201,8 +201,8 @@ function get_folder($user_id, $folder_id = false) 'S_CUR_FOLDER' => ($f_id === $folder_id) ? true : false, 'S_UNREAD_MESSAGES' => ($folder_ary['unread_messages']) ? true : false, - 'S_CUSTOM_FOLDER' => ($f_id > 0) ? true : false) - ); + 'S_CUSTOM_FOLDER' => ($f_id > 0) ? true : false, + )); } if ($folder_id !== false && !isset($folder[$folder_id])) @@ -1189,7 +1189,7 @@ function write_pm_addresses($check_ary, $author_id, $plaintext = false) if (sizeof($address) && !$plaintext) { - $template->assign_var('S_' . strtoupper($check_type) . '_RECIPIENT', true); + phpbb::$template->assign_var('S_' . strtoupper($check_type) . '_RECIPIENT', true); foreach ($address as $type => $adr_ary) { @@ -1218,7 +1218,7 @@ function write_pm_addresses($check_ary, $author_id, $plaintext = false) )); } - $template->assign_block_vars($check_type . '_recipient', $tpl_ary); + phpbb::$template->assign_block_vars($check_type . '_recipient', $tpl_ary); } } } @@ -1768,7 +1768,7 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode $previous_history_pm = $prev_id; } - $template->assign_block_vars('history_row', array( + phpbb::$template->assign_block_vars('history_row', array( 'MESSAGE_AUTHOR_QUOTE' => (($decoded_message) ? addslashes(get_username_string('username', $author_id, $row['username'], $row['user_colour'], $row['username'])) : ''), 'MESSAGE_AUTHOR_FULL' => get_username_string('full', $author_id, $row['username'], $row['user_colour'], $row['username']), 'MESSAGE_AUTHOR_COLOUR' => get_username_string('colour', $author_id, $row['username'], $row['user_colour'], $row['username']), @@ -1788,13 +1788,13 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode 'MSG_ID' => $row['msg_id'], 'U_VIEW_MESSAGE' => "$url&f=$folder_id&p=" . $row['msg_id'], 'U_QUOTE' => (!$in_post_mode && phpbb::$acl->acl_get('u_sendpm') && $author_id != ANONYMOUS && $author_id != phpbb::$user->data['user_id']) ? "$url&mode=compose&action=quote&f=" . $folder_id . "&p=" . $row['msg_id'] : '', - 'U_POST_REPLY_PM' => ($author_id != phpbb::$user->data['user_id'] && $author_id != ANONYMOUS && phpbb::$acl->acl_get('u_sendpm')) ? "$url&mode=compose&action=reply&f=$folder_id&p=" . $row['msg_id'] : '') - ); + 'U_POST_REPLY_PM' => ($author_id != phpbb::$user->data['user_id'] && $author_id != ANONYMOUS && phpbb::$acl->acl_get('u_sendpm')) ? "$url&mode=compose&action=reply&f=$folder_id&p=" . $row['msg_id'] : '', + )); unset($rowset[$id]); $prev_id = $id; } - $template->assign_vars(array( + phpbb::$template->assign_vars(array( 'QUOTE_IMG' => phpbb::$user->img('icon_post_quote', 'REPLY_WITH_QUOTE'), 'HISTORY_TITLE' => $title, diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php index 12cecbf486..0c4aed73e7 100644 --- a/phpBB/includes/functions_profile_fields.php +++ b/phpBB/includes/functions_profile_fields.php @@ -71,13 +71,13 @@ class custom_profile // Some types are multivalue, we can't give them a field_id as we would not know which to pick $type = (int) $row['field_type']; - $template->assign_block_vars('profile_fields', array( + phpbb::$template->assign_block_vars('profile_fields', array( 'LANG_NAME' => $row['lang_name'], 'LANG_EXPLAIN' => $row['lang_explain'], 'FIELD' => $tpl_snippet, 'FIELD_ID' => ($type == FIELD_DATE || ($type == FIELD_BOOL && $row['field_length'] == '1')) ? '' : 'pf_' . $row['field_ident'], - 'S_REQUIRED' => ($row['field_required']) ? true : false) - ); + 'S_REQUIRED' => ($row['field_required']) ? true : false, + )); } phpbb::$db->sql_freeresult($result); } @@ -602,7 +602,7 @@ class custom_profile private function generate_int($profile_row, $preview = false) { $profile_row['field_value'] = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview); - $template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); + phpbb::$template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); } /** @@ -659,7 +659,7 @@ class custom_profile unset($now); $profile_row['field_value'] = 0; - $template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); + phpbb::$template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); } /** @@ -671,7 +671,7 @@ class custom_profile $value = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview); $profile_row['field_value'] = $value; - $template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); + phpbb::$template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); if ($profile_row['field_length'] == 1) { @@ -682,11 +682,11 @@ class custom_profile foreach ($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']] as $option_id => $option_value) { - $template->assign_block_vars('bool.options', array( + phpbb::$template->assign_block_vars('bool.options', array( 'OPTION_ID' => $option_id, 'CHECKED' => ($value == $option_id) ? ' checked="checked"' : '', - 'VALUE' => $option_value) - ); + 'VALUE' => $option_value, + )); } } } @@ -698,7 +698,7 @@ class custom_profile private function generate_string($profile_row, $preview = false) { $profile_row['field_value'] = $this->get_var('string', $profile_row, $profile_row['lang_default_value'], $preview); - $template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); + phpbb::$template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); } /** @@ -712,7 +712,7 @@ class custom_profile $profile_row['field_cols'] = $field_length[1]; $profile_row['field_value'] = $this->get_var('string', $profile_row, $profile_row['lang_default_value'], $preview); - $template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); + phpbb::$template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); } /** @@ -729,15 +729,15 @@ class custom_profile } $profile_row['field_value'] = $value; - $template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); + phpbb::$template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); foreach ($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']] as $option_id => $option_value) { - $template->assign_block_vars('dropdown.options', array( + phpbb::$template->assign_block_vars('dropdown.options', array( 'OPTION_ID' => $option_id, 'SELECTED' => ($value == $option_id) ? ' selected="selected"' : '', - 'VALUE' => $option_value) - ); + 'VALUE' => $option_value, + )); } } @@ -751,14 +751,14 @@ class custom_profile $preview = ($mode == 'preview') ? true : false; // set template filename - $template->set_filenames(array( - 'cp_body' => 'custom_profile_fields.html') - ); + phpbb::$template->set_filenames(array( + 'cp_body' => 'custom_profile_fields.html', + )); // empty previously filled blockvars foreach (self::$profile_types as $field_case => $field_type) { - $template->destroy_block_vars($field_type); + phpbb::$template->destroy_block_vars($field_type); } // Assign template variables @@ -766,7 +766,7 @@ class custom_profile $this->$type_func($profile_row, $preview); // Return templated data - return $template->assign_display('cp_body'); + return phpbb::$template->assign_display('cp_body'); } /** diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index cfed078b3b..d4bd9a78a8 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1980,30 +1980,30 @@ function avatar_gallery($category, $avatar_select, $items_per_column, $block_var $s_category_options .= '<option value="' . $cat . '"' . (($cat == $category) ? ' selected="selected"' : '') . '>' . $cat . '</option>'; } - $template->assign_vars(array( + phpbb::$template->assign_vars(array( 'S_AVATARS_ENABLED' => true, 'S_IN_AVATAR_GALLERY' => true, - 'S_CAT_OPTIONS' => $s_category_options) - ); + 'S_CAT_OPTIONS' => $s_category_options, + )); $avatar_list = (isset($avatar_list[$category])) ? $avatar_list[$category] : array(); foreach ($avatar_list as $avatar_row_ary) { - $template->assign_block_vars($block_var, array()); + phpbb::$template->assign_block_vars($block_var, array()); foreach ($avatar_row_ary as $avatar_col_ary) { - $template->assign_block_vars($block_var . '.avatar_column', array( + phpbb::$template->assign_block_vars($block_var . '.avatar_column', array( 'AVATAR_IMAGE' => PHPBB_ROOT_PATH . phpbb::$config['avatar_gallery_path'] . '/' . $avatar_col_ary['file'], 'AVATAR_NAME' => $avatar_col_ary['name'], - 'AVATAR_FILE' => $avatar_col_ary['filename']) - ); + 'AVATAR_FILE' => $avatar_col_ary['filename'], + )); - $template->assign_block_vars($block_var . '.avatar_option_column', array( + phpbb::$template->assign_block_vars($block_var . '.avatar_option_column', array( 'AVATAR_IMAGE' => PHPBB_ROOT_PATH . phpbb::$config['avatar_gallery_path'] . '/' . $avatar_col_ary['file'], - 'S_OPTIONS_AVATAR' => $avatar_col_ary['filename']) - ); + 'S_OPTIONS_AVATAR' => $avatar_col_ary['filename'], + )); } } |