aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/modules/ucp
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/modules/ucp')
-rw-r--r--phpBB/modules/ucp/ucp_attachments.php14
-rw-r--r--phpBB/modules/ucp/ucp_groups.php58
-rw-r--r--phpBB/modules/ucp/ucp_main.php44
-rw-r--r--phpBB/modules/ucp/ucp_pm.php26
-rw-r--r--phpBB/modules/ucp/ucp_pm_compose.php26
-rw-r--r--phpBB/modules/ucp/ucp_pm_options.php64
-rw-r--r--phpBB/modules/ucp/ucp_pm_viewfolder.php32
-rw-r--r--phpBB/modules/ucp/ucp_pm_viewmessage.php14
-rw-r--r--phpBB/modules/ucp/ucp_prefs.php24
-rw-r--r--phpBB/modules/ucp/ucp_profile.php30
-rw-r--r--phpBB/modules/ucp/ucp_register.php14
-rw-r--r--phpBB/modules/ucp/ucp_remind.php2
-rw-r--r--phpBB/modules/ucp/ucp_resend.php2
-rw-r--r--phpBB/modules/ucp/ucp_zebra.php4
14 files changed, 176 insertions, 178 deletions
diff --git a/phpBB/modules/ucp/ucp_attachments.php b/phpBB/modules/ucp/ucp_attachments.php
index a4610c6a98..055b0c0b94 100644
--- a/phpBB/modules/ucp/ucp_attachments.php
+++ b/phpBB/modules/ucp/ucp_attachments.php
@@ -130,7 +130,7 @@ class ucp_attachments
$row_count = 0;
if ($row = phpbb::$db->sql_fetchrow($result))
{
- $template->assign_var('S_ATTACHMENT_ROWS', true);
+ phpbb::$template->assign_var('S_ATTACHMENT_ROWS', true);
do
{
@@ -143,7 +143,7 @@ class ucp_attachments
$view_topic = append_sid('viewtopic', "t={$row['topic_id']}&p={$row['post_msg_id']}") . "#p{$row['post_msg_id']}";
}
- $template->assign_block_vars('attachrow', array(
+ phpbb::$template->assign_block_vars('attachrow', array(
'ROW_NUMBER' => $row_count + ($start + 1),
'FILENAME' => $row['real_filename'],
'COMMENT' => bbcode_nl2br($row['attach_comment']),
@@ -160,8 +160,8 @@ class ucp_attachments
'S_IN_MESSAGE' => $row['in_message'],
'U_VIEW_ATTACHMENT' => append_sid('download/file', 'id=' . $row['attach_id']),
- 'U_VIEW_TOPIC' => $view_topic)
- );
+ 'U_VIEW_TOPIC' => $view_topic,
+ ));
$row_count++;
}
@@ -169,7 +169,7 @@ class ucp_attachments
}
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'PAGE_NUMBER' => on_page($num_attachments, phpbb::$config['topics_per_page'], $start),
'PAGINATION' => generate_pagination($this->u_action . "&sk=$sort_key&sd=$sort_dir", $num_attachments, phpbb::$config['topics_per_page'], $start),
'TOTAL_ATTACHMENTS' => $num_attachments,
@@ -188,8 +188,8 @@ class ucp_attachments
'S_DISPLAY_PAGINATION' => ($num_attachments) ? true : false,
'S_UCP_ACTION' => $this->u_action,
'S_SORT_OPTIONS' => $s_sort_key,
- 'S_ORDER_SELECT' => $s_sort_dir)
- );
+ 'S_ORDER_SELECT' => $s_sort_dir,
+ ));
$this->tpl_name = 'ucp_attachments';
$this->page_title = 'UCP_ATTACHMENTS';
diff --git a/phpBB/modules/ucp/ucp_groups.php b/phpBB/modules/ucp/ucp_groups.php
index 97446f4d97..98ca194a68 100644
--- a/phpBB/modules/ucp/ucp_groups.php
+++ b/phpBB/modules/ucp/ucp_groups.php
@@ -323,7 +323,7 @@ class ucp_groups
break;
}
- $template->assign_block_vars($block, array(
+ phpbb::$template->assign_block_vars($block, array(
'GROUP_ID' => $row['group_id'],
'GROUP_NAME' => ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'],
'GROUP_DESC' => ($row['group_type'] <> GROUP_SPECIAL) ? generate_text_for_display($row['group_desc'], $row['group_desc_uid'], $row['group_desc_bitfield'], $row['group_desc_options']) : phpbb::$user->lang['GROUP_IS_SPECIAL'],
@@ -333,8 +333,8 @@ class ucp_groups
'U_VIEW_GROUP' => append_sid('memberlist', 'mode=group&amp;g=' . $row['group_id']),
- 'S_GROUP_DEFAULT' => ($row['group_id'] == phpbb::$user->data['group_id']) ? true : false)
- );
+ 'S_GROUP_DEFAULT' => ($row['group_id'] == phpbb::$user->data['group_id']) ? true : false,
+ ));
$group_id_ary[] = $row['group_id'];
}
@@ -375,7 +375,7 @@ class ucp_groups
break;
}
- $template->assign_block_vars('nonmember', array(
+ phpbb::$template->assign_block_vars('nonmember', array(
'GROUP_ID' => $row['group_id'],
'GROUP_NAME' => ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'],
'GROUP_DESC' => ($row['group_type'] <> GROUP_SPECIAL) ? generate_text_for_display($row['group_desc'], $row['group_desc_uid'], $row['group_desc_bitfield'], $row['group_desc_options']) : phpbb::$user->lang['GROUP_IS_SPECIAL'],
@@ -385,20 +385,20 @@ class ucp_groups
'S_CAN_JOIN' => ($row['group_type'] == GROUP_OPEN || $row['group_type'] == GROUP_FREE) ? true : false,
'GROUP_COLOUR' => $row['group_colour'],
- 'U_VIEW_GROUP' => append_sid('memberlist', 'mode=group&amp;g=' . $row['group_id']))
- );
+ 'U_VIEW_GROUP' => append_sid('memberlist', 'mode=group&amp;g=' . $row['group_id']),
+ ));
}
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_CHANGE_DEFAULT' => (phpbb::$acl->acl_get('u_chggrp')) ? true : false,
'S_LEADER_COUNT' => $leader_count,
'S_MEMBER_COUNT' => $member_count,
'S_PENDING_COUNT' => $pending_count,
'S_NONMEMBER_COUNT' => $nonmember_count,
- 'S_UCP_ACTION' => $this->u_action)
- );
+ 'S_UCP_ACTION' => $this->u_action,
+ ));
break;
@@ -437,7 +437,7 @@ class ucp_groups
$avatar_img = (!empty($group_row['group_avatar'])) ? get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR') : '<img src="' . PHPBB_ROOT_PATH . phpbb::$base_config['admin_folder'] . '/images/no_avatar.gif" alt="" />';
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'GROUP_NAME' => ($group_type == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $group_name] : $group_name,
'GROUP_INTERNAL_NAME' => $group_name,
'GROUP_COLOUR' => (isset($group_row['group_colour'])) ? $group_row['group_colour'] : '',
@@ -675,7 +675,7 @@ class ucp_groups
$avatars_enabled = ($can_upload || (phpbb::$config['allow_avatar_local'] || phpbb::$config['allow_avatar_remote'])) ? true : false;
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_EDIT' => true,
'S_INCLUDE_SWATCH' => true,
'S_CAN_UPLOAD' => $can_upload,
@@ -749,7 +749,7 @@ class ucp_groups
while ($row = phpbb::$db->sql_fetchrow($result))
{
- $template->assign_block_vars('leader', array(
+ phpbb::$template->assign_block_vars('leader', array(
'USERNAME' => $row['username'],
'USERNAME_COLOUR' => $row['user_colour'],
'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
@@ -757,8 +757,8 @@ class ucp_groups
'S_GROUP_DEFAULT' => ($row['group_id'] == $group_id) ? true : false,
'JOINED' => ($row['user_regdate']) ? phpbb::$user->format_date($row['user_regdate']) : ' - ',
'USER_POSTS' => $row['user_posts'],
- 'USER_ID' => $row['user_id'])
- );
+ 'USER_ID' => $row['user_id'],
+ ));
}
phpbb::$db->sql_freeresult($result);
@@ -787,24 +787,24 @@ class ucp_groups
{
if ($row['user_pending'] && !$pending)
{
- $template->assign_block_vars('member', array(
- 'S_PENDING' => true)
- );
- $template->assign_var('S_PENDING_SET', true);
+ phpbb::$template->assign_block_vars('member', array(
+ 'S_PENDING' => true,
+ ));
+ phpbb::$template->assign_var('S_PENDING_SET', true);
$pending = true;
}
else if (!$row['user_pending'] && !$approved)
{
- $template->assign_block_vars('member', array(
- 'S_APPROVED' => true)
- );
- $template->assign_var('S_APPROVED_SET', true);
+ phpbb::$template->assign_block_vars('member', array(
+ 'S_APPROVED' => true,
+ ));
+ phpbb::$template->assign_var('S_APPROVED_SET', true);
$approved = true;
}
- $template->assign_block_vars('member', array(
+ phpbb::$template->assign_block_vars('member', array(
'USERNAME' => $row['username'],
'USERNAME_COLOUR' => $row['user_colour'],
'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
@@ -812,8 +812,8 @@ class ucp_groups
'S_GROUP_DEFAULT' => ($row['group_id'] == $group_id) ? true : false,
'JOINED' => ($row['user_regdate']) ? phpbb::$user->format_date($row['user_regdate']) : ' - ',
'USER_POSTS' => $row['user_posts'],
- 'USER_ID' => $row['user_id'])
- );
+ 'USER_ID' => $row['user_id'],
+ ));
}
phpbb::$db->sql_freeresult($result);
@@ -825,7 +825,7 @@ class ucp_groups
$s_action_options .= '<option value="' . $option . '">' . phpbb::$user->lang['GROUP_' . $lang] . '</option>';
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_LIST' => true,
'S_ACTION_OPTIONS' => $s_action_options,
'S_ON_PAGE' => on_page($total_members, phpbb::$config['topics_per_page'], $start),
@@ -1061,7 +1061,7 @@ class ucp_groups
while ($value = phpbb::$db->sql_fetchrow($result))
{
- $template->assign_block_vars('leader', array(
+ phpbb::$template->assign_block_vars('leader', array(
'GROUP_NAME' => ($value['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $value['group_name']] : $value['group_name'],
'GROUP_DESC' => generate_text_for_display($value['group_desc'], $value['group_desc_uid'], $value['group_desc_bitfield'], $value['group_desc_options']),
'GROUP_TYPE' => $value['group_type'],
@@ -1069,8 +1069,8 @@ class ucp_groups
'GROUP_COLOUR' => $value['group_colour'],
'U_LIST' => $this->u_action . "&amp;action=list&amp;g={$value['group_id']}",
- 'U_EDIT' => $this->u_action . "&amp;action=edit&amp;g={$value['group_id']}")
- );
+ 'U_EDIT' => $this->u_action . "&amp;action=edit&amp;g={$value['group_id']}",
+ ));
}
phpbb::$db->sql_freeresult($result);
diff --git a/phpBB/modules/ucp/ucp_main.php b/phpBB/modules/ucp/ucp_main.php
index 37a1037e2d..587ebe2dd9 100644
--- a/phpBB/modules/ucp/ucp_main.php
+++ b/phpBB/modules/ucp/ucp_main.php
@@ -130,7 +130,7 @@ class ucp_main
$folder_img .= '_mine';
}
- $template->assign_block_vars('topicrow', array(
+ phpbb::$template->assign_block_vars('topicrow', array(
'FORUM_ID' => $forum_id,
'TOPIC_ID' => $topic_id,
'TOPIC_AUTHOR' => get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
@@ -157,8 +157,8 @@ class ucp_main
'U_LAST_POST' => append_sid('viewtopic', "f=$g_forum_id&amp;t=$topic_id&amp;p=" . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'],
'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']),
'U_NEWEST_POST' => append_sid('viewtopic', "f=$g_forum_id&amp;t=$topic_id&amp;view=unread") . '#unread',
- 'U_VIEW_TOPIC' => append_sid('viewtopic', "f=$g_forum_id&amp;t=$topic_id"))
- );
+ 'U_VIEW_TOPIC' => append_sid('viewtopic', "f=$g_forum_id&amp;t=$topic_id"),
+ ));
}
if (phpbb::$config['load_user_activity'])
@@ -175,7 +175,7 @@ class ucp_main
$posts_per_day = phpbb::$user->data['user_posts'] / $memberdays;
$percentage = (phpbb::$config['num_posts']) ? min(100, (phpbb::$user->data['user_posts'] / phpbb::$config['num_posts']) * 100) : 0;
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'USER_COLOR' => (!empty(phpbb::$user->data['user_colour'])) ? phpbb::$user->data['user_colour'] : '',
'JOINED' => phpbb::$user->format_date(phpbb::$user->data['user_regdate']),
'VISITED' => (empty($last_visit)) ? ' - ' : phpbb::$user->format_date($last_visit),
@@ -330,7 +330,7 @@ class ucp_main
$last_post_time = $last_post_url = '';
}
- $template->assign_block_vars('forumrow', array(
+ phpbb::$template->assign_block_vars('forumrow', array(
'FORUM_ID' => $forum_id,
'FORUM_FOLDER_IMG' => phpbb::$user->img($folder_image, $folder_alt),
'FORUM_FOLDER_IMG_SRC' => phpbb::$user->img($folder_image, $folder_alt, 'src'),
@@ -347,8 +347,8 @@ class ucp_main
'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
'U_LAST_POST' => $last_post_url,
- 'U_VIEWFORUM' => append_sid('viewforum', 'f=' . $row['forum_id']))
- );
+ 'U_VIEWFORUM' => append_sid('viewforum', 'f=' . $row['forum_id']),
+ ));
}
phpbb::$db->sql_freeresult($result);
}
@@ -364,7 +364,7 @@ class ucp_main
$this->assign_topiclist('subscribed', $forbidden_forums);
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_TOPIC_NOTIFY' => phpbb::$config['allow_topic_notify'],
'S_FORUM_NOTIFY' => phpbb::$config['allow_forum_notify'],
));
@@ -375,9 +375,9 @@ class ucp_main
if (!phpbb::$config['allow_bookmarks'])
{
- $template->assign_vars(array(
- 'S_NO_DISPLAY_BOOKMARKS' => true)
- );
+ phpbb::$template->assign_vars(array(
+ 'S_NO_DISPLAY_BOOKMARKS' => true,
+ ));
break;
}
@@ -427,7 +427,7 @@ class ucp_main
case 'drafts':
$pm_drafts = ($this->p_master->p_name == 'pm') ? true : false;
- $template->assign_var('S_SHOW_DRAFTS', true);
+ phpbb::$template->assign_var('S_SHOW_DRAFTS', true);
phpbb::$user->add_lang('posting');
@@ -491,12 +491,12 @@ class ucp_main
}
else
{
- $template->assign_var('ERROR', ($draft_message == '') ? phpbb::$user->lang['EMPTY_DRAFT'] : (($draft_subject == '') ? phpbb::$user->lang['EMPTY_DRAFT_TITLE'] : ''));
+ phpbb::$template->assign_var('ERROR', ($draft_message == '') ? phpbb::$user->lang['EMPTY_DRAFT'] : (($draft_subject == '') ? phpbb::$user->lang['EMPTY_DRAFT_TITLE'] : ''));
}
}
else
{
- $template->assign_var('ERROR', phpbb::$user->lang['FORM_INVALID']);
+ phpbb::$template->assign_var('ERROR', phpbb::$user->lang['FORM_INVALID']);
}
}
@@ -547,7 +547,7 @@ class ucp_main
}
unset($topic_ids);
- $template->assign_var('S_EDIT_DRAFT', $edit);
+ phpbb::$template->assign_var('S_EDIT_DRAFT', $edit);
$row_count = 0;
foreach ($draftrows as $draft)
@@ -598,19 +598,19 @@ class ucp_main
);
$row_count++;
- ($edit) ? $template->assign_vars($template_row) : $template->assign_block_vars('draftrow', $template_row);
+ ($edit) ? phpbb::$template->assign_vars($template_row) : phpbb::$template->assign_block_vars('draftrow', $template_row);
}
if (!$edit)
{
- $template->assign_var('S_DRAFT_ROWS', $row_count);
+ phpbb::$template->assign_var('S_DRAFT_ROWS', $row_count);
}
break;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_TITLE' => phpbb::$user->lang['UCP_MAIN_' . strtoupper($mode)],
'S_DISPLAY_MARK_ALL' => ($mode == 'watched' || ($mode == 'drafts' && !phpbb_request::is_set('edit', phpbb_request::GET))) ? true : false,
@@ -653,11 +653,11 @@ class ucp_main
if ($topics_count)
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'PAGINATION' => generate_pagination($this->u_action, $topics_count, phpbb::$config['topics_per_page'], $start),
'PAGE_NUMBER' => on_page($topics_count, phpbb::$config['topics_per_page'], $start),
- 'TOTAL_TOPICS' => ($topics_count == 1) ? phpbb::$user->lang['VIEW_FORUM_TOPIC'] : sprintf(phpbb::$user->lang['VIEW_FORUM_TOPICS'], $topics_count))
- );
+ 'TOTAL_TOPICS' => ($topics_count == 1) ? phpbb::$user->lang['VIEW_FORUM_TOPIC'] : sprintf(phpbb::$user->lang['VIEW_FORUM_TOPICS'], $topics_count),
+ ));
}
if ($mode == 'subscribed')
@@ -775,7 +775,7 @@ class ucp_main
$view_topic_url = append_sid('viewtopic', "f=$forum_id&amp;t=$topic_id");
// Send vars to template
- $template->assign_block_vars('topicrow', array(
+ phpbb::$template->assign_block_vars('topicrow', array(
'FORUM_ID' => $forum_id,
'TOPIC_ID' => $topic_id,
'FIRST_POST_TIME' => phpbb::$user->format_date($row['topic_time']),
diff --git a/phpBB/modules/ucp/ucp_pm.php b/phpBB/modules/ucp/ucp_pm.php
index 794649d199..707573d31e 100644
--- a/phpBB/modules/ucp/ucp_pm.php
+++ b/phpBB/modules/ucp/ucp_pm.php
@@ -55,7 +55,7 @@ class ucp_pm
}
phpbb::$user->add_lang('posting');
- $template->assign_var('S_PRIVMSGS', true);
+ phpbb::$template->assign_var('S_PRIVMSGS', true);
// Folder directly specified?
$folder_specified = request_var('folder', '');
@@ -98,13 +98,13 @@ class ucp_pm
}
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'MESSAGE' => $l_new_message,
'S_NOT_LOGGED_IN' => phpbb::$user->is_guest,
'CLICK_TO_VIEW' => sprintf(phpbb::$user->lang['CLICK_VIEW_PRIVMSG'], '<a href="' . append_sid('ucp', 'i=pm&amp;folder=inbox') . '" onclick="jump_to_inbox(this.href); return false;">', '</a>'),
'U_INBOX' => append_sid('ucp', 'i=pm&amp;folder=inbox'),
- 'UA_INBOX' => append_sid('ucp', 'i=pm&folder=inbox', false))
- );
+ 'UA_INBOX' => append_sid('ucp', 'i=pm&folder=inbox', false),
+ ));
$tpl_file = 'ucp_pm_popup';
break;
@@ -330,7 +330,7 @@ class ucp_pm
// Header for message view - folder and so on
$folder_status = get_folder_status($folder_id, $folder);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'CUR_FOLDER_ID' => $folder_id,
'CUR_FOLDER_NAME' => $folder_status['folder_name'],
'NUM_NOT_MOVED' => $num_not_moved,
@@ -358,8 +358,8 @@ class ucp_pm
'FOLDER_MAX_MESSAGES' => $folder_status['max'],
'FOLDER_CUR_MESSAGES' => $folder_status['cur'],
'FOLDER_REMAINING_MESSAGES' => $folder_status['remaining'],
- 'FOLDER_PERCENT' => $folder_status['percent'])
- );
+ 'FOLDER_PERCENT' => $folder_status['percent'],
+ ));
if ($action == 'view_folder')
{
@@ -370,10 +370,10 @@ class ucp_pm
}
else if ($action == 'view_message')
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_VIEW_MESSAGE' => true,
- 'MSG_ID' => $msg_id)
- );
+ 'MSG_ID' => $msg_id,
+ ));
if (!$msg_id)
{
@@ -393,10 +393,10 @@ class ucp_pm
break;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_TITLE' => phpbb::$user->lang['UCP_PM_' . strtoupper($mode)],
- 'S_UCP_ACTION' => $this->u_action . ((isset($action)) ? "&amp;action=$action" : ''))
- );
+ 'S_UCP_ACTION' => $this->u_action . ((isset($action)) ? "&amp;action=$action" : ''),
+ ));
// Set desired template
$this->tpl_name = $tpl_file;
diff --git a/phpBB/modules/ucp/ucp_pm_compose.php b/phpBB/modules/ucp/ucp_pm_compose.php
index 931efefdd4..507ff2bdc2 100644
--- a/phpBB/modules/ucp/ucp_pm_compose.php
+++ b/phpBB/modules/ucp/ucp_pm_compose.php
@@ -109,7 +109,7 @@ function compose_pm($id, $mode, $action)
phpbb::$db->sql_freeresult($result);
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_SHOW_PM_BOX' => true,
'S_ALLOW_MASS_PM' => (phpbb::$config['allow_mass_pm'] && phpbb::$acl->acl_get('u_masspm')) ? true : false,
'S_GROUP_OPTIONS' => (phpbb::$config['allow_mass_pm'] && phpbb::$acl->acl_get('u_masspm_group')) ? $group_options : '',
@@ -366,7 +366,7 @@ function compose_pm($id, $mode, $action)
if ($action == 'post')
{
- $template->assign_var('S_NEW_MESSAGE', true);
+ phpbb::$template->assign_var('S_NEW_MESSAGE', true);
}
if (!isset($icon_id))
@@ -609,7 +609,7 @@ function compose_pm($id, $mode, $action)
$message_parser->message = $row['draft_message'];
$message_subject = $row['draft_subject'];
- $template->assign_var('S_DRAFT_LOADED', true);
+ phpbb::$template->assign_var('S_DRAFT_LOADED', true);
}
else
{
@@ -762,7 +762,7 @@ function compose_pm($id, $mode, $action)
// Attachment Preview
if (sizeof($message_parser->attachment_data))
{
- $template->assign_var('S_HAS_ATTACHMENTS', true);
+ phpbb::$template->assign_var('S_HAS_ATTACHMENTS', true);
$update_count = array();
$attachment_data = $message_parser->attachment_data;
@@ -771,9 +771,9 @@ function compose_pm($id, $mode, $action)
foreach ($attachment_data as $i => $attachment)
{
- $template->assign_block_vars('attachment', array(
- 'DISPLAY_ATTACHMENT' => $attachment)
- );
+ phpbb::$template->assign_block_vars('attachment', array(
+ 'DISPLAY_ATTACHMENT' => $attachment,
+ ));
}
unset($attachment_data);
}
@@ -782,13 +782,13 @@ function compose_pm($id, $mode, $action)
if (!sizeof($error))
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'PREVIEW_SUBJECT' => $preview_subject,
'PREVIEW_MESSAGE' => $preview_message,
'PREVIEW_SIGNATURE' => $preview_signature,
- 'S_DISPLAY_PREVIEW' => true)
- );
+ 'S_DISPLAY_PREVIEW' => true,
+ ));
}
unset($message_text);
}
@@ -965,7 +965,7 @@ function compose_pm($id, $mode, $action)
));
}
- $template->assign_block_vars($field . '_recipient', $tpl_ary);
+ phpbb::$template->assign_block_vars($field . '_recipient', $tpl_ary);
}
}
}
@@ -1017,7 +1017,7 @@ function compose_pm($id, $mode, $action)
$form_enctype = (@ini_get('file_uploads') == '0' || strtolower(@ini_get('file_uploads')) == 'off' || !phpbb::$config['allow_pm_attach'] || !phpbb::$acl->acl_get('u_pm_attach')) ? '' : ' enctype="multipart/form-data"';
// Start assigning vars for main posting page ...
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_POST_A' => $page_title,
'L_ICON' => phpbb::$user->lang['PM_ICON'],
'L_MESSAGE_BODY_EXPLAIN' => (intval(phpbb::$config['max_post_chars'])) ? sprintf(phpbb::$user->lang['MESSAGE_BODY_EXPLAIN'], intval(phpbb::$config['max_post_chars'])) : '',
@@ -1076,7 +1076,7 @@ function compose_pm($id, $mode, $action)
{
if (message_history($msg_id, phpbb::$user->data['user_id'], $post, array(), true))
{
- $template->assign_var('S_DISPLAY_HISTORY', true);
+ phpbb::$template->assign_var('S_DISPLAY_HISTORY', true);
}
}
}
diff --git a/phpBB/modules/ucp/ucp_pm_options.php b/phpBB/modules/ucp/ucp_pm_options.php
index 4319cd2c38..bb363069c9 100644
--- a/phpBB/modules/ucp/ucp_pm_options.php
+++ b/phpBB/modules/ucp/ucp_pm_options.php
@@ -463,7 +463,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
}
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_FULL_FOLDER_OPTIONS' => $s_full_folder_options,
'S_TO_FOLDER_OPTIONS' => $s_to_folder_options,
'S_FOLDER_OPTIONS' => $s_folder_options,
@@ -537,7 +537,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
if (!isset($global_rule_conditions[$rule_option]))
{
$cond_option = 'none';
- $template->assign_var('NONE_CONDITION', true);
+ phpbb::$template->assign_var('NONE_CONDITION', true);
}
else
{
@@ -567,13 +567,13 @@ function define_check_option($hardcoded, $check_option, $check_lang)
}
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_CHECK_DEFINED' => true,
'S_CHECK_SELECT' => ($hardcoded) ? false : true,
'CHECK_CURRENT' => isset($check_lang[$check_option]) ? $check_lang[$check_option] : '',
'S_CHECK_OPTIONS' => $s_check_options,
- 'CHECK_OPTION' => $check_option)
- );
+ 'CHECK_OPTION' => $check_option,
+ ));
}
/**
@@ -612,13 +612,13 @@ function define_action_option($hardcoded, $action_option, $action_lang, $folder)
}
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_ACTION_DEFINED' => true,
'S_ACTION_SELECT' => ($hardcoded) ? false : true,
'ACTION_CURRENT' => $l_action,
'S_ACTION_OPTIONS' => $s_action_options,
- 'ACTION_OPTION' => $action_option)
- );
+ 'ACTION_OPTION' => $action_option,
+ ));
}
/**
@@ -635,13 +635,13 @@ function define_rule_option($hardcoded, $rule_option, $rule_lang, $check_ary)
}
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_RULE_DEFINED' => true,
'S_RULE_SELECT' => !$hardcoded,
'RULE_CURRENT' => isset($rule_lang[$rule_option]) ? $rule_lang[$rule_option] : '',
'S_RULE_OPTIONS' => $s_rule_options,
- 'RULE_OPTION' => $rule_option)
- );
+ 'RULE_OPTION' => $rule_option,
+ ));
}
/**
@@ -649,18 +649,18 @@ function define_rule_option($hardcoded, $rule_option, $rule_lang, $check_ary)
*/
function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule_conditions)
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_COND_DEFINED' => true,
- 'S_COND_SELECT' => (!$hardcoded && isset($global_rule_conditions[$rule_option])) ? true : false)
- );
+ 'S_COND_SELECT' => (!$hardcoded && isset($global_rule_conditions[$rule_option])) ? true : false,
+ ));
// Define COND_OPTION
if (!isset($global_rule_conditions[$rule_option]))
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'COND_OPTION' => 'none',
- 'COND_CURRENT' => false)
- );
+ 'COND_CURRENT' => false,
+ ));
return;
}
@@ -673,12 +673,12 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
case 'text':
$rule_string = utf8_normalize_nfc(request_var('rule_string', '', true));
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_TEXT_CONDITION' => true,
'CURRENT_STRING' => $rule_string,
'CURRENT_USER_ID' => 0,
- 'CURRENT_GROUP_ID' => 0)
- );
+ 'CURRENT_GROUP_ID' => 0,
+ ));
$current_value = $rule_string;
break;
@@ -716,12 +716,12 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
}
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_USER_CONDITION' => true,
'CURRENT_STRING' => $rule_string,
'CURRENT_USER_ID' => $rule_user_id,
- 'CURRENT_GROUP_ID' => 0)
- );
+ 'CURRENT_GROUP_ID' => 0,
+ ));
$current_value = $rule_string;
break;
@@ -769,13 +769,13 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
}
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_GROUP_CONDITION' => true,
'S_GROUP_OPTIONS' => $s_group_options,
'CURRENT_STRING' => $rule_string,
'CURRENT_USER_ID' => 0,
- 'CURRENT_GROUP_ID' => $rule_group_id)
- );
+ 'CURRENT_GROUP_ID' => $rule_group_id,
+ ));
$current_value = $rule_string;
break;
@@ -784,10 +784,10 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
return;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'COND_OPTION' => $condition,
- 'COND_CURRENT' => $current_value)
- );
+ 'COND_CURRENT' => $current_value,
+ ));
}
/**
@@ -804,15 +804,15 @@ function show_defined_rules($user_id, $check_lang, $rule_lang, $action_lang, $fo
$count = 0;
while ($row = phpbb::$db->sql_fetchrow($result))
{
- $template->assign_block_vars('rule', array(
+ phpbb::$template->assign_block_vars('rule', array(
'COUNT' => ++$count,
'RULE_ID' => $row['rule_id'],
'CHECK' => $check_lang[$row['rule_check']],
'RULE' => $rule_lang[$row['rule_connection']],
'STRING' => $row['rule_string'],
'ACTION' => $action_lang[$row['rule_action']],
- 'FOLDER' => ($row['rule_action'] == ACTION_PLACE_INTO_FOLDER) ? $folder[$row['rule_folder_id']]['folder_name'] : '')
- );
+ 'FOLDER' => ($row['rule_action'] == ACTION_PLACE_INTO_FOLDER) ? $folder[$row['rule_folder_id']]['folder_name'] : '',
+ ));
}
phpbb::$db->sql_freeresult($result);
}
diff --git a/phpBB/modules/ucp/ucp_pm_viewfolder.php b/phpBB/modules/ucp/ucp_pm_viewfolder.php
index 35d9336c16..3d4c9d2f0b 100644
--- a/phpBB/modules/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/modules/ucp/ucp_pm_viewfolder.php
@@ -53,11 +53,11 @@ function view_folder($id, $mode, $folder_id, $folder)
foreach ($color_rows as $var)
{
- $template->assign_block_vars('pm_colour_info', array(
+ phpbb::$template->assign_block_vars('pm_colour_info', array(
'IMG' => phpbb::$user->img("pm_{$var}", ''),
'CLASS' => "pm_{$var}_colour",
- 'LANG' => phpbb::$user->lang[strtoupper($var) . '_MESSAGE'])
- );
+ 'LANG' => phpbb::$user->lang[strtoupper($var) . '_MESSAGE'],
+ ));
}
$mark_options = array('mark_important', 'delete_marked');
@@ -99,10 +99,10 @@ function view_folder($id, $mode, $folder_id, $folder)
}
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_MARK_OPTIONS' => $s_mark_options,
- 'S_MOVE_MARKED_OPTIONS' => $s_folder_move_options)
- );
+ 'S_MOVE_MARKED_OPTIONS' => $s_folder_move_options,
+ ));
// Okay, lets dump out the page ...
if (sizeof($folder_info['pm_list']))
@@ -212,7 +212,7 @@ function view_folder($id, $mode, $folder_id, $folder)
}
// Send vars to template
- $template->assign_block_vars('messagerow', array(
+ phpbb::$template->assign_block_vars('messagerow', array(
'PM_CLASS' => ($row_indicator) ? 'pm_' . $row_indicator . '_colour' : '',
'MESSAGE_AUTHOR_FULL' => get_username_string('full', $row['author_id'], $row['username'], $row['user_colour'], $row['username']),
@@ -238,17 +238,17 @@ function view_folder($id, $mode, $folder_id, $folder)
'U_VIEW_PM' => ($row['pm_deleted']) ? '' : $view_message_url,
'U_REMOVE_PM' => ($row['pm_deleted']) ? $remove_message_url : '',
- 'RECIPIENTS' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? implode(', ', $address_list[$message_id]) : '')
- );
+ 'RECIPIENTS' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? implode(', ', $address_list[$message_id]) : '',
+ ));
}
unset($folder_info['rowset']);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_SHOW_RECIPIENTS' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? true : false,
'S_SHOW_COLOUR_LEGEND' => true,
- 'S_PM_ICONS' => (phpbb::$config['enable_pm_icons']) ? true : false)
- );
+ 'S_PM_ICONS' => (phpbb::$config['enable_pm_icons']) ? true : false,
+ ));
}
}
else
@@ -259,7 +259,7 @@ function view_folder($id, $mode, $folder_id, $folder)
if ($export_type == 'CSV' && ($delimiter === '' || $enclosure === ''))
{
- $template->assign_var('PROMPT', true);
+ phpbb::$template->assign_var('PROMPT', true);
}
else
{
@@ -492,7 +492,7 @@ function get_pm_from($folder_id, $folder, $user_id)
$sql_limit_time = '';
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'PAGINATION' => generate_pagination(append_sid('ucp', "i=pm&amp;mode=view&amp;action=view_folder&amp;f=$folder_id&amp;$u_sort_param"), $pm_count, phpbb::$config['topics_per_page'], $start),
'PAGE_NUMBER' => on_page($pm_count, phpbb::$config['topics_per_page'], $start),
'TOTAL_MESSAGES' => (($pm_count == 1) ? phpbb::$user->lang['VIEW_PM_MESSAGE'] : sprintf(phpbb::$user->lang['VIEW_PM_MESSAGES'], $pm_count)),
@@ -507,8 +507,8 @@ function get_pm_from($folder_id, $folder, $user_id)
'S_TOPIC_ICONS' => (phpbb::$config['enable_pm_icons']) ? true : false,
'U_POST_NEW_TOPIC' => (phpbb::$acl->acl_get('u_sendpm')) ? append_sid('ucp', 'i=pm&amp;mode=compose') : '',
- 'S_PM_ACTION' => append_sid('ucp', "i=pm&amp;mode=view&amp;action=view_folder&amp;f=$folder_id" . (($start !== 0) ? "&amp;start=$start" : '')))
- );
+ 'S_PM_ACTION' => append_sid('ucp', "i=pm&amp;mode=view&amp;action=view_folder&amp;f=$folder_id" . (($start !== 0) ? "&amp;start=$start" : '')),
+ ));
// Grab all pm data
$rowset = $pm_list = array();
diff --git a/phpBB/modules/ucp/ucp_pm_viewmessage.php b/phpBB/modules/ucp/ucp_pm_viewmessage.php
index 0a0ba0ed94..02fdf2dd11 100644
--- a/phpBB/modules/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/modules/ucp/ucp_pm_viewmessage.php
@@ -167,7 +167,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
$url = append_sid('ucp', 'i=pm');
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'MESSAGE_AUTHOR_FULL' => get_username_string('full', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
'MESSAGE_AUTHOR_COLOUR' => get_username_string('colour', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
'MESSAGE_AUTHOR' => get_username_string('username', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']),
@@ -220,17 +220,17 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'S_SPECIAL_FOLDER' => in_array($folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX)),
'U_PRINT_PM' => (phpbb::$config['print_pm'] && phpbb::$acl->acl_get('u_pm_printpm')) ? "$url&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] . "&amp;view=print" : '',
- 'U_FORWARD_PM' => (phpbb::$config['forward_pm'] && phpbb::$acl->acl_get('u_sendpm') && phpbb::$acl->acl_get('u_pm_forward')) ? "$url&amp;mode=compose&amp;action=forward&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '')
- );
+ 'U_FORWARD_PM' => (phpbb::$config['forward_pm'] && phpbb::$acl->acl_get('u_sendpm') && phpbb::$acl->acl_get('u_pm_forward')) ? "$url&amp;mode=compose&amp;action=forward&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '',
+ ));
// Display not already displayed Attachments for this post, we already parsed them. ;)
if (isset($attachments) && sizeof($attachments))
{
foreach ($attachments as $attachment)
{
- $template->assign_block_vars('attachment', array(
- 'DISPLAY_ATTACHMENT' => $attachment)
- );
+ phpbb::$template->assign_block_vars('attachment', array(
+ 'DISPLAY_ATTACHMENT' => $attachment,
+ ));
}
}
@@ -239,7 +239,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
// Message History
if (message_history($msg_id, phpbb::$user->data['user_id'], $message_row, $folder))
{
- $template->assign_var('S_DISPLAY_HISTORY', true);
+ phpbb::$template->assign_var('S_DISPLAY_HISTORY', true);
}
}
}
diff --git a/phpBB/modules/ucp/ucp_prefs.php b/phpBB/modules/ucp/ucp_prefs.php
index d288df8082..966f8bb8a8 100644
--- a/phpBB/modules/ucp/ucp_prefs.php
+++ b/phpBB/modules/ucp/ucp_prefs.php
@@ -125,7 +125,7 @@ class ucp_prefs
}
$dateformat_options .= '>' . phpbb::$user->lang['CUSTOM_DATEFORMAT'] . '</option>';
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'S_NOTIFY_EMAIL' => ($data['notifymethod'] == NOTIFY_EMAIL) ? true : false,
@@ -150,8 +150,8 @@ class ucp_prefs
'S_STYLE_OPTIONS' => (phpbb::$config['override_user_style']) ? '' : style_select($data['style']),
'S_TZ_OPTIONS' => tz_select($data['tz'], true),
'S_CAN_HIDE_ONLINE' => (phpbb::$acl->acl_get('u_hideonline')) ? true : false,
- 'S_SELECT_NOTIFY' => (phpbb::$config['jab_enable'] && phpbb::$user->data['user_jabber'] && @extension_loaded('xml')) ? true : false)
- );
+ 'S_SELECT_NOTIFY' => (phpbb::$config['jab_enable'] && phpbb::$user->data['user_jabber'] && @extension_loaded('xml')) ? true : false,
+ ));
break;
@@ -270,7 +270,7 @@ class ucp_prefs
${'s_sort_' . $sort_option . '_dir'} .= '</select>';
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'S_IMAGES' => $data['images'],
@@ -287,8 +287,8 @@ class ucp_prefs
'S_TOPIC_SORT_DIR' => $s_sort_topic_dir,
'S_POST_SORT_DAYS' => $s_limit_post_days,
'S_POST_SORT_KEY' => $s_sort_post_key,
- 'S_POST_SORT_DIR' => $s_sort_post_dir)
- );
+ 'S_POST_SORT_DIR' => $s_sort_post_dir,
+ ));
break;
@@ -331,21 +331,21 @@ class ucp_prefs
trigger_error($message);
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_BBCODE' => $data['bbcode'],
'S_SMILIES' => $data['smilies'],
'S_SIG' => $data['sig'],
- 'S_NOTIFY' => $data['notify'])
- );
+ 'S_NOTIFY' => $data['notify'],
+ ));
break;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_TITLE' => phpbb::$user->lang['UCP_PREFS_' . strtoupper($mode)],
'S_HIDDEN_FIELDS' => $s_hidden_fields,
- 'S_UCP_ACTION' => $this->u_action)
- );
+ 'S_UCP_ACTION' => $this->u_action,
+ ));
$this->tpl_name = 'ucp_prefs_' . $mode;
$this->page_title = 'UCP_PREFS_' . strtoupper($mode);
diff --git a/phpBB/modules/ucp/ucp_profile.php b/phpBB/modules/ucp/ucp_profile.php
index 2369b9eac3..7bd748dcad 100644
--- a/phpBB/modules/ucp/ucp_profile.php
+++ b/phpBB/modules/ucp/ucp_profile.php
@@ -242,7 +242,7 @@ class ucp_profile
$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'USERNAME' => $data['username'],
@@ -257,8 +257,8 @@ class ucp_profile
'S_FORCE_PASSWORD' => (phpbb::$acl->acl_get('u_chgpasswd') && phpbb::$config['chg_passforce'] && phpbb::$user->data['user_passchg'] < time() - (phpbb::$config['chg_passforce'] * 86400)) ? true : false,
'S_CHANGE_USERNAME' => (phpbb::$config['allow_namechange'] && phpbb::$acl->acl_get('u_chgname')) ? true : false,
'S_CHANGE_EMAIL' => (phpbb::$acl->acl_get('u_chgemail')) ? true : false,
- 'S_CHANGE_PASSWORD' => (phpbb::$acl->acl_get('u_chgpasswd')) ? true : false)
- );
+ 'S_CHANGE_PASSWORD' => (phpbb::$acl->acl_get('u_chgpasswd')) ? true : false,
+ ));
break;
case 'profile_info':
@@ -433,7 +433,7 @@ class ucp_profile
}
unset($now);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_BIRTHDAY_DAY_OPTIONS' => $s_birthday_day_options,
'S_BIRTHDAY_MONTH_OPTIONS' => $s_birthday_month_options,
'S_BIRTHDAY_YEAR_OPTIONS' => $s_birthday_year_options,
@@ -441,7 +441,7 @@ class ucp_profile
));
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'ICQ' => $data['icq'],
@@ -533,7 +533,7 @@ class ucp_profile
decode_message($signature, phpbb::$user->data['user_sig_bbcode_uid']);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'SIGNATURE' => $signature,
'SIGNATURE_PREVIEW' => $signature_preview,
@@ -554,8 +554,8 @@ class ucp_profile
'S_SMILIES_ALLOWED' => phpbb::$config['allow_sig_smilies'],
'S_BBCODE_IMG' => (phpbb::$config['allow_sig_img']) ? true : false,
'S_BBCODE_FLASH' => (phpbb::$config['allow_sig_flash']) ? true : false,
- 'S_LINKS_ALLOWED' => (phpbb::$config['allow_sig_links']) ? true : false)
- );
+ 'S_LINKS_ALLOWED' => (phpbb::$config['allow_sig_links']) ? true : false,
+ ));
// Build custom bbcodes array
display_custom_bbcodes();
@@ -593,7 +593,7 @@ class ucp_profile
$error = preg_replace('#^([A-Z_]+)$#e', "phpbb::\$user->lang('\\1')", $error);
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'AVATAR' => get_user_avatar(phpbb::$user->data['user_avatar'], phpbb::$user->data['user_avatar_type'], phpbb::$user->data['user_avatar_width'], phpbb::$user->data['user_avatar_height']),
'AVATAR_SIZE' => phpbb::$config['avatar_filesize'],
@@ -613,7 +613,7 @@ class ucp_profile
{
$avatars_enabled = ($can_upload || (phpbb::$acl->acl_get('u_chgavatar') && (phpbb::$config['allow_avatar_local'] || phpbb::$config['allow_avatar_remote']))) ? true : false;
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'AVATAR_WIDTH' => request_var('width', phpbb::$user->data['user_avatar_width']),
'AVATAR_HEIGHT' => request_var('height', phpbb::$user->data['user_avatar_height']),
@@ -621,19 +621,19 @@ class ucp_profile
'S_UPLOAD_AVATAR_FILE' => $can_upload,
'S_UPLOAD_AVATAR_URL' => $can_upload,
'S_LINK_AVATAR' => (phpbb::$acl->acl_get('u_chgavatar') && phpbb::$config['allow_avatar_remote']) ? true : false,
- 'S_DISPLAY_GALLERY' => (phpbb::$acl->acl_get('u_chgavatar') && phpbb::$config['allow_avatar_local']) ? true : false)
- );
+ 'S_DISPLAY_GALLERY' => (phpbb::$acl->acl_get('u_chgavatar') && phpbb::$config['allow_avatar_local']) ? true : false,
+ ));
}
break;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_TITLE' => phpbb::$user->lang['UCP_PROFILE_' . strtoupper($mode)],
'S_HIDDEN_FIELDS' => $s_hidden_fields,
- 'S_UCP_ACTION' => $this->u_action)
- );
+ 'S_UCP_ACTION' => $this->u_action,
+ ));
// Set desired template
$this->tpl_name = 'ucp_profile_' . $mode;
diff --git a/phpBB/modules/ucp/ucp_register.php b/phpBB/modules/ucp/ucp_register.php
index fc0a832839..20402883cf 100644
--- a/phpBB/modules/ucp/ucp_register.php
+++ b/phpBB/modules/ucp/ucp_register.php
@@ -119,7 +119,7 @@ class ucp_register
$coppa_birthday = phpbb::$user->format_date(mktime($now['hours'] + phpbb::$user->data['user_dst'], $now['minutes'], $now['seconds'], $now['mon'], $now['mday'] - 1, $now['year'] - 13), phpbb::$user->lang['DATE_FORMAT']);
unset($now);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_COPPA_NO' => sprintf(phpbb::$user->lang['UCP_COPPA_BEFORE'], $coppa_birthday),
'L_COPPA_YES' => sprintf(phpbb::$user->lang['UCP_COPPA_ON_AFTER'], $coppa_birthday),
@@ -133,15 +133,14 @@ class ucp_register
}
else
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_TERMS_OF_USE' => sprintf(phpbb::$user->lang['TERMS_OF_USE_CONTENT'], phpbb::$config['sitename'], generate_board_url()),
'S_SHOW_COPPA' => false,
'S_REGISTRATION' => true,
'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields),
'S_UCP_ACTION' => append_sid('ucp', 'mode=register' . $add_lang . $add_coppa),
- )
- );
+ ));
}
$this->tpl_name = 'ucp_agreement';
@@ -434,7 +433,7 @@ class ucp_register
$str = '';
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_CONFIRM_EXPLAIN' => sprintf(phpbb::$user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars(phpbb::$config['board_contact']) . '">', '</a>'),
'S_CAPTCHA' => $captcha->get_template(),
));
@@ -453,7 +452,7 @@ class ucp_register
break;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'USERNAME' => $data['username'],
'PASSWORD' => $data['new_password'],
@@ -470,8 +469,7 @@ class ucp_register
'S_COPPA' => $coppa,
'S_HIDDEN_FIELDS' => $s_hidden_fields,
'S_UCP_ACTION' => append_sid('ucp', 'mode=register'),
- )
- );
+ ));
//
phpbb::$user->profile_fields = array();
diff --git a/phpBB/modules/ucp/ucp_remind.php b/phpBB/modules/ucp/ucp_remind.php
index 63ce234ab4..82f8de0af6 100644
--- a/phpBB/modules/ucp/ucp_remind.php
+++ b/phpBB/modules/ucp/ucp_remind.php
@@ -108,7 +108,7 @@ class ucp_remind
trigger_error($message);
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'USERNAME' => $username,
'EMAIL' => $email,
'S_PROFILE_ACTION' => append_sid('ucp', 'mode=sendpassword'),
diff --git a/phpBB/modules/ucp/ucp_resend.php b/phpBB/modules/ucp/ucp_resend.php
index 3d70485739..1ee8a976ea 100644
--- a/phpBB/modules/ucp/ucp_resend.php
+++ b/phpBB/modules/ucp/ucp_resend.php
@@ -148,7 +148,7 @@ class ucp_resend
trigger_error($message);
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'USERNAME' => $username,
'EMAIL' => $email,
'S_PROFILE_ACTION' => append_sid('ucp', 'mode=resend_act'),
diff --git a/phpBB/modules/ucp/ucp_zebra.php b/phpBB/modules/ucp/ucp_zebra.php
index 1ac6888ca4..f78c0709c0 100644
--- a/phpBB/modules/ucp/ucp_zebra.php
+++ b/phpBB/modules/ucp/ucp_zebra.php
@@ -202,7 +202,7 @@ class ucp_zebra
}
else
{
- $template->assign_var('ERROR', implode('<br />', $error));
+ phpbb::$template->assign_var('ERROR', implode('<br />', $error));
}
}
else
@@ -233,7 +233,7 @@ class ucp_zebra
}
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_TITLE' => phpbb::$user->lang['UCP_ZEBRA_' . $l_mode],
'U_FIND_USERNAME' => append_sid('memberlist', 'mode=searchuser&amp;form=ucp&amp;field=add'),