aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/modules/acp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-02-22 18:56:09 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-02-22 18:56:09 +0000
commitb27add94f8eb36d5e740afadf5306c48873736f9 (patch)
treec6cfecef18aea66c956a8a36606014ec483b2ec4 /phpBB/modules/acp
parent84f795e9fbd172924280593d575bf4587c9b40e5 (diff)
downloadforums-b27add94f8eb36d5e740afadf5306c48873736f9.tar
forums-b27add94f8eb36d5e740afadf5306c48873736f9.tar.gz
forums-b27add94f8eb36d5e740afadf5306c48873736f9.tar.bz2
forums-b27add94f8eb36d5e740afadf5306c48873736f9.tar.xz
forums-b27add94f8eb36d5e740afadf5306c48873736f9.zip
$template to phpbb::$template
git-svn-id: file:///svn/phpbb/trunk@9337 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/modules/acp')
-rw-r--r--phpBB/modules/acp/acp_attachments.php94
-rw-r--r--phpBB/modules/acp/acp_ban.php14
-rw-r--r--phpBB/modules/acp/acp_bbcodes.php24
-rw-r--r--phpBB/modules/acp/acp_board.php25
-rw-r--r--phpBB/modules/acp/acp_bots.php17
-rw-r--r--phpBB/modules/acp/acp_captcha.php4
-rw-r--r--phpBB/modules/acp/acp_database.php28
-rw-r--r--phpBB/modules/acp/acp_disallow.php6
-rw-r--r--phpBB/modules/acp/acp_email.php2
-rw-r--r--phpBB/modules/acp/acp_forums.php74
-rw-r--r--phpBB/modules/acp/acp_groups.php43
-rw-r--r--phpBB/modules/acp/acp_icons.php29
-rw-r--r--phpBB/modules/acp/acp_inactive.php8
-rw-r--r--phpBB/modules/acp/acp_jabber.php2
-rw-r--r--phpBB/modules/acp/acp_language.php64
-rw-r--r--phpBB/modules/acp/acp_logs.php16
-rw-r--r--phpBB/modules/acp/acp_modules.php39
-rw-r--r--phpBB/modules/acp/acp_permission_roles.php55
-rw-r--r--phpBB/modules/acp/acp_permissions.php102
-rw-r--r--phpBB/modules/acp/acp_php_info.php2
-rw-r--r--phpBB/modules/acp/acp_profile.php66
-rw-r--r--phpBB/modules/acp/acp_prune.php30
-rw-r--r--phpBB/modules/acp/acp_ranks.php18
-rw-r--r--phpBB/modules/acp/acp_reasons.php16
-rw-r--r--phpBB/modules/acp/acp_search.php44
-rw-r--r--phpBB/modules/acp/acp_styles.php118
-rw-r--r--phpBB/modules/acp/acp_update.php2
-rw-r--r--phpBB/modules/acp/acp_users.php104
-rw-r--r--phpBB/modules/acp/acp_words.php18
-rw-r--r--phpBB/modules/acp/auth.php62
30 files changed, 551 insertions, 575 deletions
diff --git a/phpBB/modules/acp/acp_attachments.php b/phpBB/modules/acp/acp_attachments.php
index 738e90e6c7..580490d472 100644
--- a/phpBB/modules/acp/acp_attachments.php
+++ b/phpBB/modules/acp/acp_attachments.php
@@ -66,11 +66,11 @@ class acp_attachments
$this->tpl_name = 'acp_attachments';
$this->page_title = $l_title;
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_TITLE' => phpbb::$user->lang[$l_title],
'L_TITLE_EXPLAIN' => phpbb::$user->lang[$l_title . '_EXPLAIN'],
- 'U_ACTION' => $this->u_action)
- );
+ 'U_ACTION' => $this->u_action,
+ ));
switch ($mode)
{
@@ -175,7 +175,7 @@ class acp_attachments
}
}
- $template->assign_var('S_ATTACHMENT_SETTINGS', true);
+ phpbb::$template->assign_var('S_ATTACHMENT_SETTINGS', true);
if ($action == 'imgmagick')
{
@@ -204,10 +204,10 @@ class acp_attachments
$this->new_config['img_create_thumbnail'] = 0;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_SEARCH_IMAGICK' => $this->u_action . '&amp;action=imgmagick',
- 'S_THUMBNAIL_SUPPORT' => (!$this->new_config['img_imagick'] && (!isset($supported_types['format']) || !sizeof($supported_types['format']))) ? false : true)
- );
+ 'S_THUMBNAIL_SUPPORT' => (!$this->new_config['img_imagick'] && (!isset($supported_types['format']) || !sizeof($supported_types['format']))) ? false : true,
+ ));
// Secure Download Options - Same procedure as with banning
$allow_deny = ($this->new_config['secure_allow_deny']) ? 'ALLOWED' : 'DISALLOWED';
@@ -230,7 +230,7 @@ class acp_attachments
}
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_SECURE_DOWNLOADS' => $this->new_config['secure_downloads'],
'S_DEFINED_IPS' => ($defined_ips != '') ? true : false,
'S_WARNING' => (sizeof($error)) ? true : false,
@@ -240,8 +240,8 @@ class acp_attachments
'L_SECURE_TITLE' => phpbb::$user->lang['DEFINE_' . $allow_deny . '_IPS'],
'L_IP_EXCLUDE' => phpbb::$user->lang['EXCLUDE_FROM_' . $allow_deny . '_IP'],
- 'L_REMOVE_IPS' => phpbb::$user->lang['REMOVE_' . $allow_deny . '_IPS'])
- );
+ 'L_REMOVE_IPS' => phpbb::$user->lang['REMOVE_' . $allow_deny . '_IPS'],
+ ));
// Output relevant options
foreach ($display_vars['vars'] as $config_key => $vars)
@@ -253,10 +253,10 @@ class acp_attachments
if (strpos($config_key, 'legend') !== false)
{
- $template->assign_block_vars('options', array(
+ phpbb::$template->assign_block_vars('options', array(
'S_LEGEND' => true,
- 'LEGEND' => (isset(phpbb::$user->lang[$vars])) ? phpbb::$user->lang[$vars] : $vars)
- );
+ 'LEGEND' => (isset(phpbb::$user->lang[$vars])) ? phpbb::$user->lang[$vars] : $vars,
+ ));
continue;
}
@@ -279,14 +279,13 @@ class acp_attachments
continue;
}
- $template->assign_block_vars('options', array(
+ phpbb::$template->assign_block_vars('options', array(
'KEY' => $config_key,
'TITLE' => phpbb::$user->lang[$vars['lang']],
'S_EXPLAIN' => $vars['explain'],
'TITLE_EXPLAIN' => $l_explain,
'CONTENT' => $content,
- )
- );
+ ));
unset($display_vars['vars'][$config_key]);
}
@@ -397,11 +396,11 @@ class acp_attachments
phpbb::$acm->destroy('extensions');
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_EXTENSIONS' => true,
'ADD_EXTENSION' => (isset($add_extension)) ? $add_extension : '',
- 'GROUP_SELECT_OPTIONS' => (phpbb_request::is_set_post('add_extension_check')) ? $this->group_select('add_group_select', $add_extension_group, 'extension_group') : $this->group_select('add_group_select', false, 'extension_group'))
- );
+ 'GROUP_SELECT_OPTIONS' => (phpbb_request::is_set_post('add_extension_check')) ? $this->group_select('add_group_select', $add_extension_group, 'extension_group') : $this->group_select('add_group_select', false, 'extension_group'),
+ ));
$sql = 'SELECT *
FROM ' . EXTENSIONS_TABLE . '
@@ -422,12 +421,12 @@ class acp_attachments
$old_group_id = $current_group_id;
}
- $template->assign_block_vars('extensions', array(
+ phpbb::$template->assign_block_vars('extensions', array(
'S_SPACER' => $s_spacer,
'EXTENSION_ID' => $row['extension_id'],
'EXTENSION' => $row['extension'],
- 'GROUP_OPTIONS' => $this->group_select('group_select[]', $row['group_id']))
- );
+ 'GROUP_OPTIONS' => $this->group_select('group_select[]', $row['group_id']),
+ ));
}
while ($row = phpbb::$db->sql_fetchrow($result));
}
@@ -437,7 +436,7 @@ class acp_attachments
case 'ext_groups':
- $template->assign_var('S_EXTENSION_GROUPS', true);
+ phpbb::$template->assign_var('S_EXTENSION_GROUPS', true);
if ($submit)
{
@@ -738,7 +737,7 @@ class acp_attachments
$s_extension_options .= '<option' . ((!$row['group_id']) ? ' class="disabled"' : '') . ' value="' . $row['extension_id'] . '"' . (($row['group_id'] == $group_id && $group_id) ? ' selected="selected"' : '') . '>' . $row['extension'] . '</option>';
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'PHPBB_ROOT_PATH' => PHPBB_ROOT_PATH,
'IMG_PATH' => $img_path,
'ACTION' => $action,
@@ -761,8 +760,8 @@ class acp_attachments
'U_EXTENSIONS' => append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=$id&amp;mode=extensions"),
'U_BACK' => $this->u_action,
- 'L_LEGEND' => phpbb::$user->lang[strtoupper($action) . '_EXTENSION_GROUP'])
- );
+ 'L_LEGEND' => phpbb::$user->lang[strtoupper($action) . '_EXTENSION_GROUP'],
+ ));
$s_forum_id_options = '';
@@ -833,9 +832,9 @@ class acp_attachments
phpbb::$db->sql_freeresult($result);
unset($padding_store);
- $template->assign_vars(array(
- 'S_FORUM_ID_OPTIONS' => $s_forum_id_options)
- );
+ phpbb::$template->assign_vars(array(
+ 'S_FORUM_ID_OPTIONS' => $s_forum_id_options,
+ ));
break;
}
@@ -850,7 +849,7 @@ class acp_attachments
{
$s_add_spacer = ($old_allow_group != $row['allow_group'] || $old_allow_pm != $row['allow_in_pm']) ? true : false;
- $template->assign_block_vars('groups', array(
+ phpbb::$template->assign_block_vars('groups', array(
'S_ADD_SPACER' => $s_add_spacer,
'S_ALLOWED_IN_PM' => ($row['allow_in_pm']) ? true : false,
'S_GROUP_ALLOWED' => ($row['allow_group']) ? true : false,
@@ -860,8 +859,7 @@ class acp_attachments
'GROUP_NAME' => $row['group_name'],
'CATEGORY' => $cat_lang[$row['cat_id']],
- )
- );
+ ));
$old_allow_group = $row['allow_group'];
$old_allow_pm = $row['allow_in_pm'];
@@ -923,7 +921,7 @@ class acp_attachments
if (sizeof($upload_list))
{
- $template->assign_var('S_UPLOADING_FILES', true);
+ phpbb::$template->assign_var('S_UPLOADING_FILES', true);
$sql = 'SELECT forum_id, forum_name
FROM ' . FORUMS_TABLE;
@@ -960,11 +958,11 @@ class acp_attachments
{
$post_row = $post_info[$upload_list[$row['attach_id']]];
- $template->assign_block_vars('upload', array(
+ phpbb::$template->assign_block_vars('upload', array(
'FILE_INFO' => sprintf(phpbb::$user->lang['UPLOADING_FILE_TO'], $row['real_filename'], $post_row['post_id']),
'S_DENIED' => (!phpbb::$acl->acl_get('f_attach', $post_row['forum_id'])) ? true : false,
- 'L_DENIED' => (!phpbb::$acl->acl_get('f_attach', $post_row['forum_id'])) ? sprintf(phpbb::$user->lang['UPLOAD_DENIED_FORUM'], $forum_names[$row['forum_id']]) : '')
- );
+ 'L_DENIED' => (!phpbb::$acl->acl_get('f_attach', $post_row['forum_id'])) ? sprintf(phpbb::$user->lang['UPLOAD_DENIED_FORUM'], $forum_names[$row['forum_id']]) : '',
+ ));
if (!phpbb::$acl->acl_get('f_attach', $post_row['forum_id']))
{
@@ -1010,9 +1008,9 @@ class acp_attachments
}
}
- $template->assign_vars(array(
- 'S_ORPHAN' => true)
- );
+ phpbb::$template->assign_vars(array(
+ 'S_ORPHAN' => true,
+ ));
// Just get the files with is_orphan set and older than 3 hours
$sql = 'SELECT *
@@ -1024,15 +1022,15 @@ class acp_attachments
while ($row = phpbb::$db->sql_fetchrow($result))
{
- $template->assign_block_vars('orphan', array(
+ phpbb::$template->assign_block_vars('orphan', array(
'FILESIZE' => get_formatted_filesize($row['filesize']),
'FILETIME' => phpbb::$user->format_date($row['filetime']),
'REAL_FILENAME' => basename($row['real_filename']),
'PHYSICAL_FILENAME' => basename($row['physical_filename']),
'ATTACH_ID' => $row['attach_id'],
'POST_IDS' => (!empty($post_ids[$row['attach_id']])) ? $post_ids[$row['attach_id']] : '',
- 'U_FILE' => append_sid('download/file', 'mode=view&amp;id=' . $row['attach_id']))
- );
+ 'U_FILE' => append_sid('download/file', 'mode=view&amp;id=' . $row['attach_id']),
+ ));
}
phpbb::$db->sql_freeresult($result);
@@ -1041,18 +1039,18 @@ class acp_attachments
if (sizeof($error))
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_WARNING' => true,
- 'WARNING_MSG' => implode('<br />', $error))
- );
+ 'WARNING_MSG' => implode('<br />', $error),
+ ));
}
if (sizeof($notify))
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_NOTIFY' => true,
- 'NOTIFY_MSG' => implode('<br />', $notify))
- );
+ 'NOTIFY_MSG' => implode('<br />', $notify),
+ ));
}
}
diff --git a/phpBB/modules/acp/acp_ban.php b/phpBB/modules/acp/acp_ban.php
index 85a03439fa..d8d9a9d24c 100644
--- a/phpBB/modules/acp/acp_ban.php
+++ b/phpBB/modules/acp/acp_ban.php
@@ -97,7 +97,7 @@ class acp_ban
self::display_ban_options($mode);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_TITLE' => $this->page_title,
'L_EXPLAIN' => $l_ban_explain,
'L_UNBAN_TITLE' => $l_unban_title,
@@ -187,7 +187,7 @@ class acp_ban
{
foreach ($ban_length as $ban_id => $length)
{
- $template->assign_block_vars('ban_length', array(
+ phpbb::$template->assign_block_vars('ban_length', array(
'BAN_ID' => (int) $ban_id,
'LENGTH' => $length,
'A_LENGTH' => addslashes($length),
@@ -199,7 +199,7 @@ class acp_ban
{
foreach ($ban_reasons as $ban_id => $reason)
{
- $template->assign_block_vars('ban_reason', array(
+ phpbb::$template->assign_block_vars('ban_reason', array(
'BAN_ID' => $ban_id,
'REASON' => $reason,
'A_REASON' => addslashes(htmlspecialchars_decode($reason)),
@@ -211,7 +211,7 @@ class acp_ban
{
foreach ($ban_give_reasons as $ban_id => $reason)
{
- $template->assign_block_vars('ban_give_reason', array(
+ phpbb::$template->assign_block_vars('ban_give_reason', array(
'BAN_ID' => $ban_id,
'REASON' => $reason,
'A_REASON' => addslashes(htmlspecialchars_decode($reason)),
@@ -219,11 +219,11 @@ class acp_ban
}
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_BAN_END_OPTIONS' => $ban_end_options,
'S_BANNED_OPTIONS' => ($banned_options) ? true : false,
- 'BANNED_OPTIONS' => $banned_options)
- );
+ 'BANNED_OPTIONS' => $banned_options,
+ ));
}
}
diff --git a/phpBB/modules/acp/acp_bbcodes.php b/phpBB/modules/acp/acp_bbcodes.php
index fdbefb9c55..e93043fda6 100644
--- a/phpBB/modules/acp/acp_bbcodes.php
+++ b/phpBB/modules/acp/acp_bbcodes.php
@@ -94,7 +94,7 @@ class acp_bbcodes
case 'edit':
case 'add':
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_EDIT_BBCODE' => true,
'U_BACK' => $this->u_action,
'U_ACTION' => $this->u_action . '&amp;action=' . (($action == 'add') ? 'create' : 'modify') . (($bbcode_id) ? "&amp;bbcode=$bbcode_id" : ''),
@@ -103,15 +103,15 @@ class acp_bbcodes
'BBCODE_MATCH' => $bbcode_match,
'BBCODE_TPL' => $bbcode_tpl,
'BBCODE_HELPLINE' => $bbcode_helpline,
- 'DISPLAY_ON_POSTING' => $display_on_posting)
- );
+ 'DISPLAY_ON_POSTING' => $display_on_posting,
+ ));
foreach (phpbb::$user->lang['tokens'] as $token => $token_explain)
{
- $template->assign_block_vars('token', array(
+ phpbb::$template->assign_block_vars('token', array(
'TOKEN' => '{' . $token . '}',
- 'EXPLAIN' => $token_explain)
- );
+ 'EXPLAIN' => $token_explain,
+ ));
}
return;
@@ -269,9 +269,9 @@ class acp_bbcodes
break;
}
- $template->assign_vars(array(
- 'U_ACTION' => $this->u_action . '&amp;action=add')
- );
+ phpbb::$template->assign_vars(array(
+ 'U_ACTION' => $this->u_action . '&amp;action=add',
+ ));
$sql = 'SELECT *
FROM ' . BBCODES_TABLE . '
@@ -280,11 +280,11 @@ class acp_bbcodes
while ($row = phpbb::$db->sql_fetchrow($result))
{
- $template->assign_block_vars('bbcodes', array(
+ phpbb::$template->assign_block_vars('bbcodes', array(
'BBCODE_TAG' => $row['bbcode_tag'],
'U_EDIT' => $this->u_action . '&amp;action=edit&amp;bbcode=' . $row['bbcode_id'],
- 'U_DELETE' => $this->u_action . '&amp;action=delete&amp;bbcode=' . $row['bbcode_id'])
- );
+ 'U_DELETE' => $this->u_action . '&amp;action=delete&amp;bbcode=' . $row['bbcode_id'],
+ ));
}
phpbb::$db->sql_freeresult($result);
}
diff --git a/phpBB/modules/acp/acp_board.php b/phpBB/modules/acp/acp_board.php
index beb6009cf9..a888bcc4a3 100644
--- a/phpBB/modules/acp/acp_board.php
+++ b/phpBB/modules/acp/acp_board.php
@@ -514,15 +514,15 @@ class acp_board
$this->tpl_name = 'acp_board';
$this->page_title = $display_vars['title'];
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_TITLE' => phpbb::$user->lang[$display_vars['title']],
'L_TITLE_EXPLAIN' => phpbb::$user->lang[$display_vars['title'] . '_EXPLAIN'],
'S_ERROR' => (sizeof($error)) ? true : false,
'ERROR_MSG' => implode('<br />', $error),
- 'U_ACTION' => $this->u_action)
- );
+ 'U_ACTION' => $this->u_action,
+ ));
// Output relevant page
foreach ($display_vars['vars'] as $config_key => $vars)
@@ -534,10 +534,10 @@ class acp_board
if (strpos($config_key, 'legend') !== false)
{
- $template->assign_block_vars('options', array(
+ phpbb::$template->assign_block_vars('options', array(
'S_LEGEND' => true,
- 'LEGEND' => (isset(phpbb::$user->lang[$vars])) ? phpbb::$user->lang[$vars] : $vars)
- );
+ 'LEGEND' => (isset(phpbb::$user->lang[$vars])) ? phpbb::$user->lang[$vars] : $vars,
+ ));
continue;
}
@@ -561,21 +561,20 @@ class acp_board
continue;
}
- $template->assign_block_vars('options', array(
+ phpbb::$template->assign_block_vars('options', array(
'KEY' => $config_key,
'TITLE' => (isset(phpbb::$user->lang[$vars['lang']])) ? phpbb::$user->lang[$vars['lang']] : $vars['lang'],
'S_EXPLAIN' => $vars['explain'],
'TITLE_EXPLAIN' => $l_explain,
'CONTENT' => $content,
- )
- );
+ ));
unset($display_vars['vars'][$config_key]);
}
if ($mode == 'auth')
{
- $template->assign_var('S_AUTH', true);
+ phpbb::$template->assign_var('S_AUTH', true);
foreach ($auth_plugins as $method)
{
@@ -588,9 +587,9 @@ class acp_board
if ($fields['tpl'])
{
- $template->assign_block_vars('auth_tpl', array(
- 'TPL' => $fields['tpl'])
- );
+ phpbb::$template->assign_block_vars('auth_tpl', array(
+ 'TPL' => $fields['tpl'],
+ ));
}
unset($fields);
}
diff --git a/phpBB/modules/acp/acp_bots.php b/phpBB/modules/acp/acp_bots.php
index bb94abb480..da56be624b 100644
--- a/phpBB/modules/acp/acp_bots.php
+++ b/phpBB/modules/acp/acp_bots.php
@@ -328,7 +328,7 @@ class acp_bots
$l_title = ($action == 'edit') ? 'EDIT' : 'ADD';
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_TITLE' => phpbb::$user->lang['BOT_' . $l_title],
'U_ACTION' => $this->u_action . "&amp;id=$bot_id&amp;action=$action",
'U_BACK' => $this->u_action,
@@ -343,8 +343,7 @@ class acp_bots
'S_STYLE_OPTIONS' => $style_select,
'S_LANG_OPTIONS' => $lang_select,
'S_ERROR' => (sizeof($error)) ? true : false,
- )
- );
+ ));
return;
@@ -358,10 +357,10 @@ class acp_bots
$s_options .= '<option value="' . $value . '">' . phpbb::$user->lang[$lang] . '</option>';
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_ACTION' => $this->u_action,
- 'S_BOT_OPTIONS' => $s_options)
- );
+ 'S_BOT_OPTIONS' => $s_options,
+ ));
$sql = 'SELECT b.bot_id, b.bot_name, b.bot_active, u.user_lastvisit
FROM ' . BOTS_TABLE . ' b, ' . USERS_TABLE . ' u
@@ -374,7 +373,7 @@ class acp_bots
$active_lang = (!$row['bot_active']) ? 'BOT_ACTIVATE' : 'BOT_DEACTIVATE';
$active_value = (!$row['bot_active']) ? 'activate' : 'deactivate';
- $template->assign_block_vars('bots', array(
+ phpbb::$template->assign_block_vars('bots', array(
'BOT_NAME' => $row['bot_name'],
'BOT_ID' => $row['bot_id'],
'LAST_VISIT' => ($row['user_lastvisit']) ? phpbb::$user->format_date($row['user_lastvisit']) : phpbb::$user->lang['BOT_NEVER'],
@@ -382,8 +381,8 @@ class acp_bots
'U_ACTIVATE_DEACTIVATE' => $this->u_action . "&amp;id={$row['bot_id']}&amp;action=$active_value",
'L_ACTIVATE_DEACTIVATE' => phpbb::$user->lang[$active_lang],
'U_EDIT' => $this->u_action . "&amp;id={$row['bot_id']}&amp;action=edit",
- 'U_DELETE' => $this->u_action . "&amp;id={$row['bot_id']}&amp;action=delete")
- );
+ 'U_DELETE' => $this->u_action . "&amp;id={$row['bot_id']}&amp;action=delete",
+ ));
}
phpbb::$db->sql_freeresult($result);
}
diff --git a/phpBB/modules/acp/acp_captcha.php b/phpBB/modules/acp/acp_captcha.php
index df265ee877..e4a269aaed 100644
--- a/phpBB/modules/acp/acp_captcha.php
+++ b/phpBB/modules/acp/acp_captcha.php
@@ -107,10 +107,10 @@ class acp_captcha
foreach ($config_vars as $config_var => $template_var)
{
- $template->assign_var($template_var, request_var($config_var, phpbb::$config[$config_var])) ;
+ phpbb::$template->assign_var($template_var, request_var($config_var, phpbb::$config[$config_var])) ;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'CAPTCHA_PREVIEW' => $demo_captcha->get_demo_template($id),
'CAPTCHA_SELECT' => $captcha_select,
));
diff --git a/phpBB/modules/acp/acp_database.php b/phpBB/modules/acp/acp_database.php
index a51b2d529d..86f050e1df 100644
--- a/phpBB/modules/acp/acp_database.php
+++ b/phpBB/modules/acp/acp_database.php
@@ -33,8 +33,8 @@ class acp_database
$action = request_var('action', '');
$submit = phpbb_request::is_set_post('submit');
- $template->assign_vars(array(
- 'MODE' => $mode
+ phpbb::$template->assign_vars(array(
+ 'MODE' => $mode,
));
switch ($mode)
@@ -175,15 +175,15 @@ class acp_database
{
if (strlen(phpbb::$base_config['table_prefix']) === 0 || stripos($table_name, phpbb::$base_config['table_prefix']) === 0)
{
- $template->assign_block_vars('tables', array(
- 'TABLE' => $table_name
+ phpbb::$template->assign_block_vars('tables', array(
+ 'TABLE' => $table_name,
));
}
}
unset($tables);
- $template->assign_vars(array(
- 'U_ACTION' => $this->u_action . '&amp;action=download'
+ phpbb::$template->assign_vars(array(
+ 'U_ACTION' => $this->u_action . '&amp;action=download',
));
$available_methods = array('gzip' => 'zlib', 'bzip2' => 'bz2');
@@ -195,13 +195,13 @@ class acp_database
continue;
}
- $template->assign_block_vars('methods', array(
- 'TYPE' => $type
+ phpbb::$template->assign_block_vars('methods', array(
+ 'TYPE' => $type,
));
}
- $template->assign_block_vars('methods', array(
- 'TYPE' => 'text'
+ phpbb::$template->assign_block_vars('methods', array(
+ 'TYPE' => 'text',
));
break;
}
@@ -430,10 +430,10 @@ class acp_database
if ($supported == 'true')
{
- $template->assign_block_vars('files', array(
+ phpbb::$template->assign_block_vars('files', array(
'FILE' => $file,
'NAME' => gmdate("d-m-Y H:i:s", $matches[1]),
- 'SUPPORTED' => $supported
+ 'SUPPORTED' => $supported,
));
}
}
@@ -441,8 +441,8 @@ class acp_database
closedir($dh);
}
- $template->assign_vars(array(
- 'U_ACTION' => $this->u_action . '&amp;action=submit'
+ phpbb::$template->assign_vars(array(
+ 'U_ACTION' => $this->u_action . '&amp;action=submit',
));
break;
}
diff --git a/phpBB/modules/acp/acp_disallow.php b/phpBB/modules/acp/acp_disallow.php
index dcf137cfb3..b5307ff536 100644
--- a/phpBB/modules/acp/acp_disallow.php
+++ b/phpBB/modules/acp/acp_disallow.php
@@ -95,10 +95,10 @@ class acp_disallow
}
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_ACTION' => $this->u_action,
- 'S_DISALLOWED_NAMES' => $disallow_select)
- );
+ 'S_DISALLOWED_NAMES' => $disallow_select,
+ ));
}
}
diff --git a/phpBB/modules/acp/acp_email.php b/phpBB/modules/acp/acp_email.php
index b86765b897..3fc3db2055 100644
--- a/phpBB/modules/acp/acp_email.php
+++ b/phpBB/modules/acp/acp_email.php
@@ -241,7 +241,7 @@ class acp_email
$s_priority_options .= '<option value="' . MAIL_NORMAL_PRIORITY . '" selected="selected">' . phpbb::$user->lang['MAIL_NORMAL_PRIORITY'] . '</option>';
$s_priority_options .= '<option value="' . MAIL_HIGH_PRIORITY . '">' . phpbb::$user->lang['MAIL_HIGH_PRIORITY'] . '</option>';
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_WARNING' => (sizeof($error)) ? true : false,
'WARNING_MSG' => (sizeof($error)) ? implode('<br />', $error) : '',
'U_ACTION' => $this->u_action,
diff --git a/phpBB/modules/acp/acp_forums.php b/phpBB/modules/acp/acp_forums.php
index 3b2c7020ff..047636c6a1 100644
--- a/phpBB/modules/acp/acp_forums.php
+++ b/phpBB/modules/acp/acp_forums.php
@@ -360,12 +360,12 @@ class acp_forums
meta_refresh(0, $url);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_PROGRESS_BAR' => $this->u_action . "&amp;action=progress_bar&amp;start=$topics_done&amp;total={$row['forum_topics_real']}",
'UA_PROGRESS_BAR' => addslashes($this->u_action . "&amp;action=progress_bar&amp;start=$topics_done&amp;total={$row['forum_topics_real']}"),
'S_CONTINUE_SYNC' => true,
- 'L_PROGRESS_EXPLAIN' => sprintf(phpbb::$user->lang['SYNC_IN_PROGRESS_EXPLAIN'], $topics_done, $row['forum_topics_real']))
- );
+ 'L_PROGRESS_EXPLAIN' => sprintf(phpbb::$user->lang['SYNC_IN_PROGRESS_EXPLAIN'], $topics_done, $row['forum_topics_real']),
+ ));
return;
}
@@ -374,12 +374,12 @@ class acp_forums
$url = $this->u_action . "&amp;parent_id={$this->parent_id}&amp;f=$forum_id&amp;action=sync_forum";
meta_refresh(0, $url);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_PROGRESS_BAR' => $this->u_action . '&amp;action=progress_bar',
'UA_PROGRESS_BAR' => addslashes($this->u_action . '&amp;action=progress_bar'),
'S_CONTINUE_SYNC' => true,
- 'L_PROGRESS_EXPLAIN' => sprintf(phpbb::$user->lang['SYNC_IN_PROGRESS_EXPLAIN'], 0, $row['forum_topics_real']))
- );
+ 'L_PROGRESS_EXPLAIN' => sprintf(phpbb::$user->lang['SYNC_IN_PROGRESS_EXPLAIN'], 0, $row['forum_topics_real']),
+ ));
return;
@@ -404,7 +404,7 @@ class acp_forums
add_log('admin', 'LOG_FORUM_SYNC', $row['forum_name']);
phpbb::$acm->destroy_sql(FORUMS_TABLE);
- $template->assign_var('L_FORUM_RESYNCED', sprintf(phpbb::$user->lang['FORUM_RESYNCED'], $row['forum_name']));
+ phpbb::$template->assign_var('L_FORUM_RESYNCED', sprintf(phpbb::$user->lang['FORUM_RESYNCED'], $row['forum_name']));
break;
@@ -561,9 +561,9 @@ class acp_forums
if (phpbb::$db->sql_fetchrow($result))
{
- $template->assign_vars(array(
- 'S_MOVE_FORUM_OPTIONS' => make_forum_select($forum_data['parent_id'], $forum_id, false, true, false))
- );
+ phpbb::$template->assign_vars(array(
+ 'S_MOVE_FORUM_OPTIONS' => make_forum_select($forum_data['parent_id'], $forum_id, false, true, false),
+ ));
}
phpbb::$db->sql_freeresult($result);
@@ -588,16 +588,16 @@ class acp_forums
if (phpbb::$db->sql_fetchrow($result))
{
- $template->assign_vars(array(
- 'S_MOVE_FORUM_OPTIONS' => make_forum_select($forum_data['parent_id'], $subforums_id)) // , false, true, false???
- );
+ phpbb::$template->assign_vars(array(
+ 'S_MOVE_FORUM_OPTIONS' => make_forum_select($forum_data['parent_id'], $subforums_id), // , false, true, false???
+ ));
}
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_HAS_SUBFORUMS' => ($forum_data['right_id'] - $forum_data['left_id'] > 1) ? true : false,
- 'S_FORUMS_LIST' => $forums_list)
- );
+ 'S_FORUMS_LIST' => $forums_list,
+ ));
}
$s_show_display_on_index = false;
@@ -619,7 +619,7 @@ class acp_forums
$errors[] = phpbb::$user->lang['FORUM_PASSWORD_OLD'];
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_EDIT_FORUM' => true,
'S_ERROR' => (sizeof($errors)) ? true : false,
'S_PARENT_ID' => $this->parent_id,
@@ -715,15 +715,15 @@ class acp_forums
if (phpbb::$db->sql_fetchrow($result))
{
- $template->assign_vars(array(
- 'S_MOVE_FORUM_OPTIONS' => make_forum_select($forum_data['parent_id'], $subforums_id, false, true)) // , false, true, false???
- );
+ phpbb::$template->assign_vars(array(
+ 'S_MOVE_FORUM_OPTIONS' => make_forum_select($forum_data['parent_id'], $subforums_id, false, true), // , false, true, false???
+ ));
}
phpbb::$db->sql_freeresult($result);
$parent_id = ($this->parent_id == $forum_id) ? 0 : $this->parent_id;
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_DELETE_FORUM' => true,
'U_ACTION' => $this->u_action . "&amp;parent_id={$parent_id}&amp;action=delete&amp;f=$forum_id",
'U_BACK' => $this->u_action . '&amp;parent_id=' . $this->parent_id,
@@ -734,8 +734,8 @@ class acp_forums
'S_HAS_SUBFORUMS' => ($forum_data['right_id'] - $forum_data['left_id'] > 1) ? true : false,
'S_FORUMS_LIST' => $forums_list,
'S_ERROR' => (sizeof($errors)) ? true : false,
- 'ERROR_MSG' => (sizeof($errors)) ? implode('<br />', $errors) : '')
- );
+ 'ERROR_MSG' => (sizeof($errors)) ? implode('<br />', $errors) : '',
+ ));
return;
break;
@@ -769,7 +769,7 @@ class acp_forums
if ($action == 'sync' || $action == 'sync_forum')
{
- $template->assign_var('S_RESYNCED', true);
+ phpbb::$template->assign_var('S_RESYNCED', true);
}
$sql = 'SELECT *
@@ -808,7 +808,7 @@ class acp_forums
$forum_title .= $row['forum_name'];
$forum_title .= ($forum_type != FORUM_LINK) ? '</a>' : '';
- $template->assign_block_vars('forums', array(
+ phpbb::$template->assign_block_vars('forums', array(
'FOLDER_IMAGE' => $folder_image,
'FORUM_IMAGE' => ($row['forum_image']) ? '<img src="' . PHPBB_ROOT_PATH . $row['forum_image'] . '" alt="" />' : '',
'FORUM_IMAGE_SRC' => ($row['forum_image']) ? PHPBB_ROOT_PATH . $row['forum_image'] : '',
@@ -825,8 +825,8 @@ class acp_forums
'U_MOVE_DOWN' => $url . '&amp;action=move_down',
'U_EDIT' => $url . '&amp;action=edit',
'U_DELETE' => $url . '&amp;action=delete',
- 'U_SYNC' => $url . '&amp;action=sync')
- );
+ 'U_SYNC' => $url . '&amp;action=sync',
+ ));
}
while ($row = phpbb::$db->sql_fetchrow($result));
}
@@ -836,17 +836,17 @@ class acp_forums
$url = $this->u_action . '&amp;parent_id=' . $this->parent_id . '&amp;f=' . $row['forum_id'];
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_NO_FORUMS' => true,
'U_EDIT' => $url . '&amp;action=edit',
'U_DELETE' => $url . '&amp;action=delete',
- 'U_SYNC' => $url . '&amp;action=sync')
- );
+ 'U_SYNC' => $url . '&amp;action=sync',
+ ));
}
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'ERROR_MSG' => (sizeof($errors)) ? implode('<br />', $errors) : '',
'NAVIGATION' => $navigation,
'FORUM_BOX' => $forum_box,
@@ -1897,14 +1897,14 @@ class acp_forums
{
page_header(phpbb::$user->lang['SYNC_IN_PROGRESS']);
- $template->set_filenames(array(
- 'body' => 'progress_bar.html')
- );
+ phpbb::$template->set_filenames(array(
+ 'body' => 'progress_bar.html',
+ ));
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_PROGRESS' => phpbb::$user->lang['SYNC_IN_PROGRESS'],
- 'L_PROGRESS_EXPLAIN' => ($start && $total) ? sprintf(phpbb::$user->lang['SYNC_IN_PROGRESS_EXPLAIN'], $start, $total) : phpbb::$user->lang['SYNC_IN_PROGRESS'])
- );
+ 'L_PROGRESS_EXPLAIN' => ($start && $total) ? sprintf(phpbb::$user->lang['SYNC_IN_PROGRESS_EXPLAIN'], $start, $total) : phpbb::$user->lang['SYNC_IN_PROGRESS'],
+ ));
page_footer();
}
diff --git a/phpBB/modules/acp/acp_groups.php b/phpBB/modules/acp/acp_groups.php
index 9ee936339a..67d2f62ef4 100644
--- a/phpBB/modules/acp/acp_groups.php
+++ b/phpBB/modules/acp/acp_groups.php
@@ -540,7 +540,7 @@ class acp_groups
break;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_EDIT' => true,
'S_ADD_GROUP' => ($action == 'add') ? true : false,
'S_GROUP_PERM' => ($action == 'add' && phpbb::$acl->acl_get('a_authgroups') && phpbb::$acl->acl_gets('a_aauth', 'a_fauth', 'a_mauth', 'a_uauth')) ? true : false,
@@ -563,7 +563,6 @@ class acp_groups
'GROUP_MAX_RECIPIENTS' => (isset($group_row['group_max_recipients'])) ? $group_row['group_max_recipients'] : 0,
'GROUP_COLOUR' => (isset($group_row['group_colour'])) ? $group_row['group_colour'] : '',
-
'S_DESC_BBCODE_CHECKED' => $group_desc_data['allow_bbcode'],
'S_DESC_URLS_CHECKED' => $group_desc_data['allow_urls'],
'S_DESC_SMILIES_CHECKED'=> $group_desc_data['allow_smilies'],
@@ -591,8 +590,7 @@ class acp_groups
'U_SWATCH' => append_sid(PHPBB_ADMIN_PATH . 'swatch.' . PHP_EXT, 'form=settings&amp;name=group_colour'),
'U_ACTION' => "{$this->u_action}&amp;action=$action&amp;g=$group_id",
'L_AVATAR_EXPLAIN' => sprintf(phpbb::$user->lang['AVATAR_EXPLAIN'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], round(phpbb::$config['avatar_filesize'] / 1024)),
- )
- );
+ ));
return;
break;
@@ -617,15 +615,15 @@ class acp_groups
while ($row = phpbb::$db->sql_fetchrow($result))
{
- $template->assign_block_vars('leader', array(
+ phpbb::$template->assign_block_vars('leader', array(
'U_USER_EDIT' => append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=users&amp;action=edit&amp;u={$row['user_id']}"),
'USERNAME' => $row['username'],
'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);
@@ -646,7 +644,7 @@ class acp_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_GROUP_SPECIAL' => ($group_row['group_type'] == GROUP_SPECIAL) ? true : false,
'S_ACTION_OPTIONS' => $s_action_options,
@@ -676,22 +674,22 @@ class acp_groups
{
if ($row['user_pending'] && !$pending)
{
- $template->assign_block_vars('member', array(
- 'S_PENDING' => true)
- );
+ phpbb::$template->assign_block_vars('member', array(
+ 'S_PENDING' => true,
+ ));
$pending = true;
}
- $template->assign_block_vars('member', array(
+ phpbb::$template->assign_block_vars('member', array(
'U_USER_EDIT' => append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=users&amp;action=edit&amp;u={$row['user_id']}"),
'USERNAME' => $row['username'],
'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);
@@ -699,10 +697,10 @@ class acp_groups
break;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_ACTION' => $this->u_action,
- 'S_GROUP_ADD' => (phpbb::$acl->acl_get('a_groupadd')) ? true : false)
- );
+ 'S_GROUP_ADD' => (phpbb::$acl->acl_get('a_groupadd')) ? true : false,
+ ));
// Get us all the groups
$sql = 'SELECT g.group_id, g.group_name, g.group_type
@@ -745,16 +743,16 @@ class acp_groups
{
if ($type == 'special')
{
- $template->assign_block_vars('groups', array(
- 'S_SPECIAL' => true)
- );
+ phpbb::$template->assign_block_vars('groups', array(
+ 'S_SPECIAL' => true,
+ ));
}
foreach ($row_ary as $group_id => $row)
{
$group_name = (!empty(phpbb::$user->lang['G_' . $row['group_name']]))? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'];
- $template->assign_block_vars('groups', array(
+ phpbb::$template->assign_block_vars('groups', array(
'U_LIST' => "{$this->u_action}&amp;action=list&amp;g=$group_id",
'U_EDIT' => "{$this->u_action}&amp;action=edit&amp;g=$group_id",
'U_DELETE' => (phpbb::$acl->acl_get('a_groupdel')) ? "{$this->u_action}&amp;action=delete&amp;g=$group_id" : '',
@@ -763,8 +761,7 @@ class acp_groups
'GROUP_NAME' => $group_name,
'TOTAL_MEMBERS' => $row['total_members'],
- )
- );
+ ));
}
}
}
diff --git a/phpBB/modules/acp/acp_icons.php b/phpBB/modules/acp/acp_icons.php
index 87bf369ac7..be435995e1 100644
--- a/phpBB/modules/acp/acp_icons.php
+++ b/phpBB/modules/acp/acp_icons.php
@@ -154,7 +154,7 @@ class acp_icons
}
$smiley_options .= '<option value="' . $row['smiley_url'] . '"' . (($selected) ? ' selected="selected"' : '') . '>' . $row['smiley_url'] . '</option>';
- $template->assign_block_vars('smile', array(
+ phpbb::$template->assign_block_vars('smile', array(
'SMILEY_URL' => addslashes($row['smiley_url']),
'CODE' => addslashes($row['code']),
'EMOTION' => addslashes($row['emotion']),
@@ -232,7 +232,7 @@ class acp_icons
$colspan += ($icon_id) ? 1 : 0;
$colspan += ($action == 'add') ? 2 : 0;
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_EDIT' => true,
'S_SMILIES' => ($mode == 'smilies') ? true : false,
'S_ADD' => ($action == 'add') ? true : false,
@@ -260,7 +260,7 @@ class acp_icons
foreach ($data as $img => $img_row)
{
- $template->assign_block_vars('items', array(
+ phpbb::$template->assign_block_vars('items', array(
'IMG' => $img,
'A_IMG' => addslashes($img),
'IMG_SRC' => PHPBB_ROOT_PATH . $img_path . '/' . $img,
@@ -279,7 +279,7 @@ class acp_icons
// Ok, another row for adding an addition code for a pre-existing image...
if ($action == 'add' && $mode == 'smilies' && sizeof($smilies))
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_ADD_CODE' => true,
'S_IMG_OPTIONS' => $smiley_options,
@@ -619,7 +619,7 @@ class acp_icons
$pak_options .= '<option value="' . $pak . '">' . htmlspecialchars($pak) . '</option>';
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_CHOOSE_PAK' => true,
'S_PAK_OPTIONS' => $pak_options,
@@ -632,8 +632,7 @@ class acp_icons
'U_BACK' => $this->u_action,
'U_ACTION' => $this->u_action . '&amp;action=import',
- )
- );
+ ));
}
break;
@@ -642,13 +641,12 @@ class acp_icons
$this->page_title = 'EXPORT_' . $lang;
$this->tpl_name = 'message_body';
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'MESSAGE_TITLE' => phpbb::$user->lang['EXPORT_' . $lang],
'MESSAGE_TEXT' => sprintf(phpbb::$user->lang['EXPORT_' . $lang . '_EXPLAIN'], '<a href="' . $this->u_action . '&amp;action=send">', '</a>'),
'S_USER_NOTICE' => true,
- )
- );
+ ));
return;
@@ -808,7 +806,7 @@ class acp_icons
}
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_TITLE' => phpbb::$user->lang['ACP_' . $lang],
'L_EXPLAIN' => phpbb::$user->lang['ACP_' . $lang . '_EXPLAIN'],
'L_IMPORT' => phpbb::$user->lang['IMPORT_' . $lang],
@@ -825,8 +823,7 @@ class acp_icons
'U_ACTION' => $this->u_action,
'U_IMPORT' => $this->u_action . '&amp;action=import',
'U_EXPORT' => $this->u_action . '&amp;action=export',
- )
- );
+ ));
$spacer = false;
@@ -839,7 +836,7 @@ class acp_icons
{
$alt_text = ($mode == 'smilies') ? $row['code'] : '';
- $template->assign_block_vars('items', array(
+ phpbb::$template->assign_block_vars('items', array(
'S_SPACER' => (!$spacer && !$row['display_on_posting']) ? true : false,
'ALT_TEXT' => $alt_text,
'IMG_SRC' => PHPBB_ROOT_PATH . $img_path . '/' . $row[$fields . '_url'],
@@ -850,8 +847,8 @@ class acp_icons
'U_EDIT' => $this->u_action . '&amp;action=edit&amp;id=' . $row[$fields . '_id'],
'U_DELETE' => $this->u_action . '&amp;action=delete&amp;id=' . $row[$fields . '_id'],
'U_MOVE_UP' => $this->u_action . '&amp;action=move_up&amp;id=' . $row[$fields . '_id'],
- 'U_MOVE_DOWN' => $this->u_action . '&amp;action=move_down&amp;id=' . $row[$fields . '_id'])
- );
+ 'U_MOVE_DOWN' => $this->u_action . '&amp;action=move_down&amp;id=' . $row[$fields . '_id'],
+ ));
if (!$spacer && !$row['display_on_posting'])
{
diff --git a/phpBB/modules/acp/acp_inactive.php b/phpBB/modules/acp/acp_inactive.php
index 508aefe034..89583575db 100644
--- a/phpBB/modules/acp/acp_inactive.php
+++ b/phpBB/modules/acp/acp_inactive.php
@@ -218,15 +218,15 @@ class acp_inactive
foreach ($inactive as $row)
{
- $template->assign_block_vars('inactive', array(
+ phpbb::$template->assign_block_vars('inactive', array(
'INACTIVE_DATE' => phpbb::$user->format_date($row['user_inactive_time']),
'JOINED' => phpbb::$user->format_date($row['user_regdate']),
'LAST_VISIT' => (!$row['user_lastvisit']) ? ' - ' : phpbb::$user->format_date($row['user_lastvisit']),
'REASON' => $row['inactive_reason'],
'USER_ID' => $row['user_id'],
'USERNAME' => $row['username'],
- 'U_USER_ADMIN' => append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=users&amp;mode=overview&amp;u={$row['user_id']}"))
- );
+ 'U_USER_ADMIN' => append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=users&amp;mode=overview&amp;u={$row['user_id']}"),
+ ));
}
$option_ary = array('activate' => 'ACTIVATE', 'delete' => 'DELETE');
@@ -235,7 +235,7 @@ class acp_inactive
$option_ary += array('remind' => 'REMIND');
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_INACTIVE_USERS' => true,
'S_INACTIVE_OPTIONS' => build_select($option_ary),
diff --git a/phpBB/modules/acp/acp_jabber.php b/phpBB/modules/acp/acp_jabber.php
index e0fe8aba25..d9c192601c 100644
--- a/phpBB/modules/acp/acp_jabber.php
+++ b/phpBB/modules/acp/acp_jabber.php
@@ -108,7 +108,7 @@ class acp_jabber
trigger_error($message . adm_back_link($this->u_action));
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_ACTION' => $this->u_action,
'JAB_ENABLE' => $jab_enable,
'L_JAB_SERVER_EXPLAIN' => sprintf(phpbb::$user->lang['JAB_SERVER_EXPLAIN'], '<a href="http://www.jabber.org/">', '</a>'),
diff --git a/phpBB/modules/acp/acp_language.php b/phpBB/modules/acp/acp_language.php
index 82c18c79aa..9d76e3fd0b 100644
--- a/phpBB/modules/acp/acp_language.php
+++ b/phpBB/modules/acp/acp_language.php
@@ -124,11 +124,11 @@ class acp_language
foreach ($requested_data as $data => $default)
{
$default_value = request_var($data, '');
- $template->assign_block_vars('data', array(
+ phpbb::$template->assign_block_vars('data', array(
'DATA' => $data,
'NAME' => phpbb::$user->lang[strtoupper($method . '_' . $data)],
'EXPLAIN' => phpbb::$user->lang[strtoupper($method . '_' . $data) . '_EXPLAIN'],
- 'DEFAULT' => (empty($default_value)) ? $default : $default_value
+ 'DEFAULT' => (empty($default_value)) ? $default : $default_value,
));
}
@@ -144,7 +144,7 @@ class acp_language
*/
$hidden_data .= build_hidden_fields(array('entry' => $_POST['entry']), true, STRIP);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_UPLOAD' => true,
'NAME' => $method,
'U_ACTION' => $this->u_action . "&amp;id=$lang_id&amp;action=upload_data",
@@ -152,7 +152,7 @@ class acp_language
'HIDDEN' => $hidden_data,
'S_CONNECTION_SUCCESS' => (request_var('test_connection', '') && $test_connection === true) ? true : false,
- 'S_CONNECTION_FAILED' => (request_var('test_connection', '') && $test_connection !== true) ? true : false
+ 'S_CONNECTION_FAILED' => (request_var('test_connection', '') && $test_connection !== true) ? true : false,
));
break;
@@ -517,12 +517,12 @@ class acp_language
foreach ($methods as $method)
{
- $template->assign_block_vars('buttons', array(
- 'VALUE' => $method
+ phpbb::$template->assign_block_vars('buttons', array(
+ 'VALUE' => $method,
));
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_DETAILS' => true,
'U_ACTION' => $this->u_action . "&amp;action=details&amp;id=$lang_id",
'U_BACK' => $this->u_action,
@@ -530,9 +530,8 @@ class acp_language
'LANG_ENGLISH_NAME' => $lang_entries['lang_english_name'],
'LANG_ISO' => $lang_entries['lang_iso'],
'LANG_AUTHOR' => $lang_entries['lang_author'],
- 'ALLOW_UPLOAD' => sizeof($methods)
- )
- );
+ 'ALLOW_UPLOAD' => sizeof($methods),
+ ));
// If current lang is different from the default lang, then first try to grab missing/additional vars
if ($lang_iso != phpbb::$config['default_lang'])
@@ -605,20 +604,20 @@ class acp_language
if (sizeof($missing_files))
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_MISSING_FILES' => true,
'L_MISSING_FILES' => sprintf(phpbb::$user->lang['THOSE_MISSING_LANG_FILES'], $lang_entries['lang_local_name']),
- 'MISSING_FILES' => implode('<br />', $missing_files))
- );
+ 'MISSING_FILES' => implode('<br />', $missing_files),
+ ));
}
if ($is_missing_var)
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_MISSING_VARS' => true,
'L_MISSING_VARS_EXPLAIN' => sprintf(phpbb::$user->lang['THOSE_MISSING_LANG_VARIABLES'], $lang_entries['lang_local_name']),
- 'U_MISSING_ACTION' => $this->u_action . "&amp;action=$action&amp;id=$lang_id")
- );
+ 'U_MISSING_ACTION' => $this->u_action . "&amp;action=$action&amp;id=$lang_id",
+ ));
foreach ($missing_vars as $file => $vars)
{
@@ -627,11 +626,11 @@ class acp_language
continue;
}
- $template->assign_block_vars('missing', array(
+ phpbb::$template->assign_block_vars('missing', array(
'FILE' => $file,
'TPL' => $this->print_language_entries($vars, '', false),
- 'KEY' => (strpos($file, '/') === false) ? '|' . $file : str_replace('/', '|', $file))
- );
+ 'KEY' => (strpos($file, '/') === false) ? '|' . $file : str_replace('/', '|', $file),
+ ));
}
}
}
@@ -722,14 +721,13 @@ class acp_language
}
// Normal language pack entries
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_ENTRY_ACTION' => $this->u_action . "&amp;action=details&amp;id=$lang_id#entries",
'S_EMAIL_FILE' => $is_email_file,
'S_FROM_STORE' => $file_from_store,
'S_LANG_OPTIONS' => $s_lang_options,
'PRINT_MESSAGE' => $print_message,
- )
- );
+ ));
if (!$is_email_file)
{
@@ -743,14 +741,14 @@ class acp_language
$tpl .= $this->print_language_entries($lang);
- $template->assign_var('TPL', $tpl);
+ phpbb::$template->assign_var('TPL', $tpl);
unset($tpl);
}
else
{
- $template->assign_vars(array(
- 'LANG' => $lang)
- );
+ phpbb::$template->assign_vars(array(
+ 'LANG' => $lang,
+ ));
unset($lang);
}
@@ -991,12 +989,12 @@ class acp_language
$radio_buttons .= '<label><input type="radio"' . ((!$radio_buttons) ? ' id="use_method"' : '') . ' class="radio" value="' . $method . '" name="use_method" /> ' . $method . '</label>';
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_SELECT_METHOD' => true,
'U_BACK' => $this->u_action,
'U_ACTION' => $this->u_action . "&amp;action=$action&amp;id=$lang_id",
- 'RADIO_BUTTONS' => $radio_buttons)
- );
+ 'RADIO_BUTTONS' => $radio_buttons,
+ ));
return;
}
@@ -1098,7 +1096,7 @@ class acp_language
$installed[] = $row['lang_iso'];
$tagstyle = ($row['lang_iso'] == phpbb::$config['default_lang']) ? '*' : '';
- $template->assign_block_vars('lang', array(
+ phpbb::$template->assign_block_vars('lang', array(
'U_DETAILS' => $this->u_action . "&amp;action=details&amp;id={$row['lang_id']}",
'U_DOWNLOAD' => $this->u_action . "&amp;action=download&amp;id={$row['lang_id']}",
'U_DELETE' => $this->u_action . "&amp;action=delete&amp;id={$row['lang_id']}",
@@ -1147,12 +1145,12 @@ class acp_language
{
foreach ($new_ary as $iso => $lang_ary)
{
- $template->assign_block_vars('notinst', array(
+ phpbb::$template->assign_block_vars('notinst', array(
'ISO' => htmlspecialchars($lang_ary['iso']),
'LOCAL_NAME' => htmlspecialchars($lang_ary['local_name'], ENT_COMPAT, 'UTF-8'),
'NAME' => htmlspecialchars($lang_ary['name'], ENT_COMPAT, 'UTF-8'),
- 'U_INSTALL' => $this->u_action . '&amp;action=install&amp;iso=' . urlencode($lang_ary['iso']))
- );
+ 'U_INSTALL' => $this->u_action . '&amp;action=install&amp;iso=' . urlencode($lang_ary['iso']),
+ ));
}
}
diff --git a/phpBB/modules/acp/acp_logs.php b/phpBB/modules/acp/acp_logs.php
index 63f57c7d21..ff847d36b5 100644
--- a/phpBB/modules/acp/acp_logs.php
+++ b/phpBB/modules/acp/acp_logs.php
@@ -111,10 +111,10 @@ class acp_logs
{
$forum_box = '<option value="0">' . phpbb::$user->lang['ALL_FORUMS'] . '</option>' . make_forum_select($forum_id);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_SHOW_FORUMS' => true,
- 'S_FORUM_BOX' => $forum_box)
- );
+ 'S_FORUM_BOX' => $forum_box,
+ ));
}
// Grab log data
@@ -122,7 +122,7 @@ class acp_logs
$log_count = 0;
view_log($mode, $log_data, $log_count, phpbb::$config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_TITLE' => $l_title,
'L_EXPLAIN' => $l_title_explain,
'U_ACTION' => $this->u_action,
@@ -134,8 +134,7 @@ class acp_logs
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir,
'S_CLEARLOGS' => phpbb::$acl->acl_get('a_clearlogs'),
- )
- );
+ ));
foreach ($log_data as $row)
{
@@ -150,7 +149,7 @@ class acp_logs
}
}
- $template->assign_block_vars('log', array(
+ phpbb::$template->assign_block_vars('log', array(
'USERNAME' => $row['username_full'],
'REPORTEE_USERNAME' => ($row['reportee_username'] && $row['user_id'] != $row['reportee_id']) ? $row['reportee_username_full'] : '',
@@ -159,8 +158,7 @@ class acp_logs
'ACTION' => $row['action'],
'DATA' => (sizeof($data)) ? implode(' | ', $data) : '',
'ID' => $row['id'],
- )
- );
+ ));
}
}
}
diff --git a/phpBB/modules/acp/acp_modules.php b/phpBB/modules/acp/acp_modules.php
index afc3c75b1e..631f78c830 100644
--- a/phpBB/modules/acp/acp_modules.php
+++ b/phpBB/modules/acp/acp_modules.php
@@ -323,7 +323,7 @@ class acp_modules
// Name options
$s_name_options .= '<option value="' . $option . '"' . (($option == $module_data['module_basename']) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang($values['title']) . ' [' . $this->module_class . '_' . $option . ']</option>';
- $template->assign_block_vars('m_names', array('NAME' => $option, 'A_NAME' => addslashes($option)));
+ phpbb::$template->assign_block_vars('m_names', array('NAME' => $option, 'A_NAME' => addslashes($option)));
// Build module modes
foreach ($values['modes'] as $m_mode => $m_values)
@@ -333,18 +333,18 @@ class acp_modules
$s_mode_options .= '<option value="' . $m_mode . '"' . (($m_mode == $module_data['module_mode']) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang($m_values['title']) . '</option>';
}
- $template->assign_block_vars('m_names.modes', array(
+ phpbb::$template->assign_block_vars('m_names.modes', array(
'OPTION' => $m_mode,
'VALUE' => phpbb::$user->lang($m_values['title']),
'A_OPTION' => addslashes($m_mode),
- 'A_VALUE' => addslashes(phpbb::$user->lang($m_values['title'])))
- );
+ 'A_VALUE' => addslashes(phpbb::$user->lang($m_values['title'])),
+ ));
}
}
$s_cat_option = '<option value="0"' . (($module_data['parent_id'] == 0) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['NO_PARENT'] . '</option>';
- $template->assign_vars(array_merge(array(
+ phpbb::$template->assign_vars(array_merge(array(
'S_EDIT_MODULE' => true,
'S_IS_CAT' => $is_cat,
'S_CAT_OPTIONS' => $s_cat_option . $this->make_module_select($module_data['parent_id'], ($action == 'edit') ? $module_row['module_id'] : false, false, false, false, true),
@@ -365,10 +365,10 @@ class acp_modules
if (sizeof($errors))
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_ERROR' => true,
- 'ERROR_MSG' => implode('<br />', $errors))
- );
+ 'ERROR_MSG' => implode('<br />', $errors),
+ ));
}
return;
@@ -379,10 +379,10 @@ class acp_modules
// Default management page
if (sizeof($errors))
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_ERROR' => true,
- 'ERROR_MSG' => implode('<br />', $errors))
- );
+ 'ERROR_MSG' => implode('<br />', $errors),
+ ));
}
if (!$this->parent_id)
@@ -437,7 +437,7 @@ class acp_modules
$url = $this->u_action . '&amp;parent_id=' . $this->parent_id . '&amp;m=' . $row['module_id'];
- $template->assign_block_vars('modules', array(
+ phpbb::$template->assign_block_vars('modules', array(
'MODULE_IMAGE' => $module_image,
'MODULE_TITLE' => $langname,
'MODULE_ENABLED' => ($row['module_enabled']) ? true : false,
@@ -452,8 +452,8 @@ class acp_modules
'U_EDIT' => $url . '&amp;action=edit',
'U_DELETE' => $url . '&amp;action=delete',
'U_ENABLE' => $url . '&amp;action=enable',
- 'U_DISABLE' => $url . '&amp;action=disable')
- );
+ 'U_DISABLE' => $url . '&amp;action=disable',
+ ));
}
while ($row = phpbb::$db->sql_fetchrow($result));
}
@@ -463,7 +463,7 @@ class acp_modules
$url = $this->u_action . '&amp;parent_id=' . $this->parent_id . '&amp;m=' . $row['module_id'];
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_NO_MODULES' => true,
'MODULE_TITLE' => $langname,
'MODULE_ENABLED' => ($row['module_enabled']) ? true : false,
@@ -472,8 +472,8 @@ class acp_modules
'U_EDIT' => $url . '&amp;action=edit',
'U_DELETE' => $url . '&amp;action=delete',
'U_ENABLE' => $url . '&amp;action=enable',
- 'U_DISABLE' => $url . '&amp;action=disable')
- );
+ 'U_DISABLE' => $url . '&amp;action=disable',
+ ));
}
phpbb::$db->sql_freeresult($result);
@@ -496,15 +496,14 @@ class acp_modules
$s_install_options .= '</optgroup>';
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_SEL_ACTION' => $this->u_action,
'U_ACTION' => $this->u_action . '&amp;parent_id=' . $this->parent_id,
'NAVIGATION' => $navigation,
'MODULE_BOX' => $module_box,
'PARENT_ID' => $this->parent_id,
'S_INSTALL_OPTIONS' => $s_install_options,
- )
- );
+ ));
}
/**
diff --git a/phpBB/modules/acp/acp_permission_roles.php b/phpBB/modules/acp/acp_permission_roles.php
index aba743cc7a..deb697f891 100644
--- a/phpBB/modules/acp/acp_permission_roles.php
+++ b/phpBB/modules/acp/acp_permission_roles.php
@@ -70,10 +70,10 @@ class acp_permission_roles
break;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_TITLE' => phpbb::$user->lang[$this->page_title],
- 'L_EXPLAIN' => phpbb::$user->lang[$this->page_title . '_EXPLAIN'])
- );
+ 'L_EXPLAIN' => phpbb::$user->lang[$this->page_title . '_EXPLAIN'],
+ ));
// Take action... admin submitted something
if ($submit || $action == 'remove')
@@ -303,7 +303,7 @@ class acp_permission_roles
trigger_error(phpbb::$user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_EDIT' => true,
'U_ACTION' => $this->u_action . "&amp;action={$action}&amp;role_id={$role_id}",
@@ -312,8 +312,7 @@ class acp_permission_roles
'ROLE_NAME' => $role_row['role_name'],
'ROLE_DESCRIPTION' => $role_row['role_description'],
'L_ACL_TYPE' => phpbb::$user->lang['ACL_TYPE_' . strtoupper($permission_type)],
- )
- );
+ ));
// We need to fill the auth options array with ACL_NO options ;)
$sql = 'SELECT auth_option_id, auth_option
@@ -347,10 +346,10 @@ class acp_permission_roles
{
$role_name = (!empty(phpbb::$user->lang[$role_row['role_name']])) ? phpbb::$user->lang[$role_row['role_name']] : $role_row['role_name'];
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_DISPLAY_ROLE_MASK' => true,
- 'L_ROLE_ASSIGNED_TO' => sprintf(phpbb::$user->lang['ROLE_ASSIGNED_TO'], $role_name))
- );
+ 'L_ROLE_ASSIGNED_TO' => sprintf(phpbb::$user->lang['ROLE_ASSIGNED_TO'], $role_name),
+ ));
$auth_admin->display_role_mask($hold_ary);
}
@@ -411,7 +410,7 @@ class acp_permission_roles
{
$role_name = (!empty(phpbb::$user->lang[$row['role_name']])) ? phpbb::$user->lang[$row['role_name']] : $row['role_name'];
- $template->assign_block_vars('roles', array(
+ phpbb::$template->assign_block_vars('roles', array(
'ROLE_NAME' => $role_name,
'ROLE_DESCRIPTION' => (!empty(phpbb::$user->lang[$row['role_description']])) ? phpbb::$user->lang[$row['role_description']] : nl2br($row['role_description']),
@@ -419,29 +418,29 @@ class acp_permission_roles
'U_REMOVE' => $this->u_action . '&amp;action=remove&amp;role_id=' . $row['role_id'],
'U_MOVE_UP' => $this->u_action . '&amp;action=move_up&amp;order=' . $row['role_order'],
'U_MOVE_DOWN' => $this->u_action . '&amp;action=move_down&amp;order=' . $row['role_order'],
- 'U_DISPLAY_ITEMS' => ($row['role_id'] == $display_item) ? '' : $this->u_action . '&amp;display_item=' . $row['role_id'] . '#assigned_to')
- );
+ 'U_DISPLAY_ITEMS' => ($row['role_id'] == $display_item) ? '' : $this->u_action . '&amp;display_item=' . $row['role_id'] . '#assigned_to',
+ ));
$s_role_options .= '<option value="' . $row['role_id'] . '">' . $role_name . '</option>';
if ($display_item == $row['role_id'])
{
- $template->assign_vars(array(
- 'L_ROLE_ASSIGNED_TO' => sprintf(phpbb::$user->lang['ROLE_ASSIGNED_TO'], $role_name))
- );
+ phpbb::$template->assign_vars(array(
+ 'L_ROLE_ASSIGNED_TO' => sprintf(phpbb::$user->lang['ROLE_ASSIGNED_TO'], $role_name),
+ ));
}
}
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
- 'S_ROLE_OPTIONS' => $s_role_options)
- );
+ phpbb::$template->assign_vars(array(
+ 'S_ROLE_OPTIONS' => $s_role_options,
+ ));
if ($display_item)
{
- $template->assign_vars(array(
- 'S_DISPLAY_ROLE_MASK' => true)
- );
+ phpbb::$template->assign_vars(array(
+ 'S_DISPLAY_ROLE_MASK' => true,
+ ));
$hold_ary = $auth_admin->get_role_mask($display_item);
$auth_admin->display_role_mask($hold_ary);
@@ -462,29 +461,29 @@ class acp_permission_roles
$content_array = $content_array[0];
- $template->assign_var('S_NUM_PERM_COLS', sizeof($categories));
+ phpbb::$template->assign_var('S_NUM_PERM_COLS', sizeof($categories));
// Assign to template
foreach ($content_array as $cat => $cat_array)
{
- $template->assign_block_vars('auth', array(
+ phpbb::$template->assign_block_vars('auth', array(
'CAT_NAME' => phpbb::$user->lang['permission_cat'][$cat],
'S_YES' => ($cat_array['S_YES'] && !$cat_array['S_NEVER'] && !$cat_array['S_NO']) ? true : false,
'S_NEVER' => ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false,
- 'S_NO' => ($cat_array['S_NO'] && !$cat_array['S_NEVER'] && !$cat_array['S_YES']) ? true : false)
- );
+ 'S_NO' => ($cat_array['S_NO'] && !$cat_array['S_NEVER'] && !$cat_array['S_YES']) ? true : false,
+ ));
foreach ($cat_array['permissions'] as $permission => $allowed)
{
- $template->assign_block_vars('auth.mask', array(
+ phpbb::$template->assign_block_vars('auth.mask', array(
'S_YES' => ($allowed == phpbb::ACL_YES) ? true : false,
'S_NEVER' => ($allowed == phpbb::ACL_NEVER) ? true : false,
'S_NO' => ($allowed == phpbb::ACL_NO) ? true : false,
'FIELD_NAME' => $permission,
- 'PERMISSION' => phpbb::$user->lang['acl_' . $permission]['lang'])
- );
+ 'PERMISSION' => phpbb::$user->lang['acl_' . $permission]['lang'],
+ ));
}
}
}
diff --git a/phpBB/modules/acp/acp_permissions.php b/phpBB/modules/acp/acp_permissions.php
index aaa601229e..d9db7b1bf0 100644
--- a/phpBB/modules/acp/acp_permissions.php
+++ b/phpBB/modules/acp/acp_permissions.php
@@ -144,9 +144,9 @@ class acp_permissions
{
$this->page_title = 'ACP_PERMISSIONS';
- $template->assign_vars(array(
- 'S_INTRO' => true)
- );
+ phpbb::$template->assign_vars(array(
+ 'S_INTRO' => true,
+ ));
return;
}
@@ -201,10 +201,10 @@ class acp_permissions
break;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_TITLE' => phpbb::$user->lang[$this->page_title],
- 'L_EXPLAIN' => phpbb::$user->lang[$this->page_title . '_EXPLAIN'])
- );
+ 'L_EXPLAIN' => phpbb::$user->lang[$this->page_title . '_EXPLAIN'],
+ ));
// Get permission type
$permission_type = request_var('type', $this->permission_dropdown[0]);
@@ -304,10 +304,10 @@ class acp_permissions
continue 2;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_SELECT_FORUM' => true,
- 'S_FORUM_OPTIONS' => make_forum_select(false, false, true, false, false))
- );
+ 'S_FORUM_OPTIONS' => make_forum_select(false, false, true, false, false),
+ ));
break;
@@ -331,13 +331,13 @@ class acp_permissions
// Build subforum options
$s_subforum_options = $this->build_subforum_options($forum_list);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_SELECT_FORUM' => true,
'S_FORUM_OPTIONS' => $s_forum_options,
'S_SUBFORUM_OPTIONS' => $s_subforum_options,
'S_FORUM_ALL' => true,
- 'S_FORUM_MULTIPLE' => true)
- );
+ 'S_FORUM_MULTIPLE' => true,
+ ));
break;
@@ -349,7 +349,7 @@ class acp_permissions
continue 2;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_SELECT_USER' => true,
'U_FIND_USERNAME' => append_sid('memberlist', 'mode=searchuser&amp;form=select_victim&amp;field=username&amp;select_single=true'),
));
@@ -364,10 +364,10 @@ class acp_permissions
continue 2;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_SELECT_GROUP' => true,
- 'S_GROUP_OPTIONS' => group_select_options(false, false, ((phpbb::$user->is_founder) ? false : 0)))
- );
+ 'S_GROUP_OPTIONS' => group_select_options(false, false, ((phpbb::$user->is_founder) ? false : 0)),
+ ));
break;
@@ -407,7 +407,7 @@ class acp_permissions
continue 2;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_SELECT_USERGROUP' => ($victim == 'usergroup') ? true : false,
'S_SELECT_USERGROUP_VIEW' => ($victim == 'usergroup_view') ? true : false,
'S_DEFINED_USER_OPTIONS' => $items['user_ids_options'],
@@ -423,7 +423,7 @@ class acp_permissions
// If there are more than 5 forums selected the admin is not able to select all users/groups too.
// We need to see if the number of forums can be increased or need to be decreased.
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_ACTION' => $this->u_action,
'ANONYMOUS_USER_ID' => ANONYMOUS,
@@ -431,8 +431,8 @@ class acp_permissions
'S_ALLOW_ALL_SELECT' => (sizeof($forum_id) > 5) ? false : true,
'S_CAN_SELECT_USER' => (phpbb::$acl->acl_get('a_authusers')) ? true : false,
'S_CAN_SELECT_GROUP' => (phpbb::$acl->acl_get('a_authgroups')) ? true : false,
- 'S_HIDDEN_FIELDS' => $s_hidden_fields)
- );
+ 'S_HIDDEN_FIELDS' => $s_hidden_fields,
+ ));
// Let the forum names being displayed
if (sizeof($forum_id))
@@ -450,10 +450,10 @@ class acp_permissions
}
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_FORUM_NAMES' => (sizeof($forum_names)) ? true : false,
- 'FORUM_NAMES' => implode(', ', $forum_names))
- );
+ 'FORUM_NAMES' => implode(', ', $forum_names),
+ ));
}
return;
@@ -465,28 +465,28 @@ class acp_permissions
trigger_error(phpbb::$user->lang['ONLY_FORUM_DEFINED'] . adm_back_link($this->u_action), E_USER_WARNING);
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_PERMISSION_DROPDOWN' => (sizeof($this->permission_dropdown) > 1) ? $this->build_permission_dropdown($this->permission_dropdown, $permission_type, $permission_scope) : false,
'L_PERMISSION_TYPE' => phpbb::$user->lang['ACL_TYPE_' . strtoupper($permission_type)],
'U_ACTION' => $this->u_action,
- 'S_HIDDEN_FIELDS' => $s_hidden_fields)
- );
+ 'S_HIDDEN_FIELDS' => $s_hidden_fields,
+ ));
if (strpos($mode, 'setting_') === 0)
{
- $template->assign_vars(array(
- 'S_SETTING_PERMISSIONS' => true)
- );
+ phpbb::$template->assign_vars(array(
+ 'S_SETTING_PERMISSIONS' => true,
+ ));
$hold_ary = $auth_admin->get_mask('set', (sizeof($user_id)) ? $user_id : false, (sizeof($group_id)) ? $group_id : false, (sizeof($forum_id)) ? $forum_id : false, $permission_type, $permission_scope, phpbb::ACL_NO);
$auth_admin->display_mask('set', $permission_type, $hold_ary, ((sizeof($user_id)) ? 'user' : 'group'), (($permission_scope == 'local') ? true : false));
}
else
{
- $template->assign_vars(array(
- 'S_VIEWING_PERMISSIONS' => true)
- );
+ phpbb::$template->assign_vars(array(
+ 'S_VIEWING_PERMISSIONS' => true,
+ ));
$hold_ary = $auth_admin->get_mask('view', (sizeof($user_id)) ? $user_id : false, (sizeof($group_id)) ? $group_id : false, (sizeof($forum_id)) ? $forum_id : false, $permission_type, $permission_scope, phpbb::ACL_NEVER);
$auth_admin->display_mask('view', $permission_type, $hold_ary, ((sizeof($user_id)) ? 'user' : 'group'), (($permission_scope == 'local') ? true : false));
@@ -899,23 +899,23 @@ class acp_permissions
$back = request_var('back', 0);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'PERMISSION' => phpbb::$user->lang['acl_' . $permission]['lang'],
'PERMISSION_USERNAME' => $userdata['username'],
'FORUM_NAME' => $forum_name,
'S_GLOBAL_TRACE' => ($forum_id) ? false : true,
- 'U_BACK' => ($back) ? build_url(array('f', 'back')) . "&amp;f=$back" : '')
- );
+ 'U_BACK' => ($back) ? build_url(array('f', 'back')) . "&amp;f=$back" : '',
+ ));
- $template->assign_block_vars('trace', array(
+ phpbb::$template->assign_block_vars('trace', array(
'WHO' => phpbb::$user->lang['DEFAULT'],
'INFORMATION' => phpbb::$user->lang['TRACE_DEFAULT'],
'S_SETTING_NO' => true,
- 'S_TOTAL_NO' => true)
- );
+ 'S_TOTAL_NO' => true,
+ ));
$sql = 'SELECT DISTINCT g.group_name, g.group_id, g.group_type
FROM ' . GROUPS_TABLE . ' g
@@ -968,7 +968,7 @@ class acp_permissions
break;
}
- $template->assign_block_vars('trace', array(
+ phpbb::$template->assign_block_vars('trace', array(
'WHO' => $row['group_name'],
'INFORMATION' => $information,
@@ -977,8 +977,8 @@ class acp_permissions
'S_SETTING_NEVER' => ($row['auth_setting'] == phpbb::ACL_NEVER) ? true : false,
'S_TOTAL_NO' => ($total == phpbb::ACL_NO) ? true : false,
'S_TOTAL_YES' => ($total == phpbb::ACL_YES) ? true : false,
- 'S_TOTAL_NEVER' => ($total == phpbb::ACL_NEVER) ? true : false)
- );
+ 'S_TOTAL_NEVER' => ($total == phpbb::ACL_NEVER) ? true : false,
+ ));
}
}
@@ -1004,7 +1004,7 @@ class acp_permissions
break;
}
- $template->assign_block_vars('trace', array(
+ phpbb::$template->assign_block_vars('trace', array(
'WHO' => $userdata['username'],
'INFORMATION' => $information,
@@ -1013,8 +1013,8 @@ class acp_permissions
'S_SETTING_NEVER' => ($auth_setting == phpbb::ACL_NEVER) ? true : false,
'S_TOTAL_NO' => false,
'S_TOTAL_YES' => ($total == phpbb::ACL_YES) ? true : false,
- 'S_TOTAL_NEVER' => ($total == phpbb::ACL_NEVER) ? true : false)
- );
+ 'S_TOTAL_NEVER' => ($total == phpbb::ACL_NEVER) ? true : false,
+ ));
if ($forum_id != 0 && isset(phpbb::$acl->acl_options['global'][$permission]))
{
@@ -1042,7 +1042,7 @@ class acp_permissions
// If there is no auth information we do not need to worry the user by showing non-relevant data.
if ($auth_setting)
{
- $template->assign_block_vars('trace', array(
+ phpbb::$template->assign_block_vars('trace', array(
'WHO' => sprintf(phpbb::$user->lang['TRACE_GLOBAL_SETTING'], $userdata['username']),
'INFORMATION' => sprintf($information, '<a href="' . $this->u_action . "&amp;u=$user_id&amp;f=0&amp;auth=$permission&amp;back=$forum_id\">", '</a>'),
@@ -1051,15 +1051,15 @@ class acp_permissions
'S_SETTING_NEVER' => !$auth_setting,
'S_TOTAL_NO' => false,
'S_TOTAL_YES' => ($total == phpbb::ACL_YES) ? true : false,
- 'S_TOTAL_NEVER' => ($total == phpbb::ACL_NEVER) ? true : false)
- );
+ 'S_TOTAL_NEVER' => ($total == phpbb::ACL_NEVER) ? true : false,
+ ));
}
}
// Take founder status into account, overwriting the default values
if ($userdata['user_type'] == phpbb::USER_FOUNDER && strpos($permission, 'a_') === 0)
{
- $template->assign_block_vars('trace', array(
+ phpbb::$template->assign_block_vars('trace', array(
'WHO' => $userdata['username'],
'INFORMATION' => phpbb::$user->lang['TRACE_USER_FOUNDER'],
@@ -1068,14 +1068,14 @@ class acp_permissions
'S_SETTING_NEVER' => ($auth_setting == phpbb::ACL_NEVER) ? true : false,
'S_TOTAL_NO' => false,
'S_TOTAL_YES' => true,
- 'S_TOTAL_NEVER' => false)
- );
+ 'S_TOTAL_NEVER' => false,
+ ));
$total = phpbb::ACL_YES;
}
// Total value...
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_RESULT_NO' => ($total == phpbb::ACL_NO) ? true : false,
'S_RESULT_YES' => ($total == phpbb::ACL_YES) ? true : false,
'S_RESULT_NEVER' => ($total == phpbb::ACL_NEVER) ? true : false,
diff --git a/phpBB/modules/acp/acp_php_info.php b/phpBB/modules/acp/acp_php_info.php
index 5f7b516f66..31a241a36f 100644
--- a/phpBB/modules/acp/acp_php_info.php
+++ b/phpBB/modules/acp/acp_php_info.php
@@ -74,7 +74,7 @@ class acp_php_info
preg_match_all('#<div class="center">(.*)</div>#siU', $output, $output);
$output = (!empty($output[1][0])) ? $output[1][0] : $orig_output;
- $template->assign_var('PHPINFO', $output);
+ phpbb::$template->assign_var('PHPINFO', $output);
}
}
diff --git a/phpBB/modules/acp/acp_profile.php b/phpBB/modules/acp/acp_profile.php
index 98012c77a7..335c0f4835 100644
--- a/phpBB/modules/acp/acp_profile.php
+++ b/phpBB/modules/acp/acp_profile.php
@@ -713,7 +713,7 @@ class acp_profile
}
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_EDIT' => true,
'S_EDIT_MODE' => ($action == 'edit') ? true : false,
'ERROR_MSG' => (sizeof($error)) ? implode('<br />', $error) : '',
@@ -722,8 +722,8 @@ class acp_profile
'L_EXPLAIN' => phpbb::$user->lang['STEP_' . $step . '_EXPLAIN_' . strtoupper($action)],
'U_ACTION' => $this->u_action . "&amp;action=$action&amp;step=$step",
- 'U_BACK' => $this->u_action)
- );
+ 'U_BACK' => $this->u_action,
+ ));
// Now go through the steps
switch ($step)
@@ -732,7 +732,7 @@ class acp_profile
case 1:
// Build common create options
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_STEP_ONE' => true,
'S_FIELD_REQUIRED' => ($cp->vars['field_required']) ? true : false,
'S_SHOW_ON_REG' => ($cp->vars['field_show_on_reg']) ? true : false,
@@ -743,19 +743,19 @@ class acp_profile
'FIELD_TYPE' => phpbb::$user->lang['FIELD_' . strtoupper(custom_profile::$profile_types[$field_type])],
'FIELD_IDENT' => $cp->vars['field_ident'],
'LANG_NAME' => $cp->vars['lang_name'],
- 'LANG_EXPLAIN' => $cp->vars['lang_explain'])
- );
+ 'LANG_EXPLAIN' => $cp->vars['lang_explain'],
+ ));
// String and Text needs to set default values here...
if ($field_type == FIELD_STRING || $field_type == FIELD_TEXT)
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_TEXT' => ($field_type == FIELD_TEXT) ? true : false,
'S_STRING' => ($field_type == FIELD_STRING) ? true : false,
'L_DEFAULT_VALUE_EXPLAIN' => phpbb::$user->lang[strtoupper(custom_profile::$profile_types[$field_type]) . '_DEFAULT_VALUE_EXPLAIN'],
- 'LANG_DEFAULT_VALUE' => $cp->vars['lang_default_value'])
- );
+ 'LANG_DEFAULT_VALUE' => $cp->vars['lang_default_value'],
+ ));
}
if ($field_type == FIELD_BOOL || $field_type == FIELD_DROPDOWN)
@@ -776,25 +776,25 @@ class acp_profile
}
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_BOOL' => ($field_type == FIELD_BOOL) ? true : false,
'S_DROPDOWN' => ($field_type == FIELD_DROPDOWN) ? true : false,
'L_LANG_OPTIONS_EXPLAIN' => phpbb::$user->lang[strtoupper(custom_profile::$profile_types[$field_type]) . '_ENTRIES_EXPLAIN'],
'LANG_OPTIONS' => ($field_type == FIELD_DROPDOWN) ? implode("\n", $cp->vars['lang_options']) : '',
'FIRST_LANG_OPTION' => ($field_type == FIELD_BOOL) ? $cp->vars['lang_options'][0] : '',
- 'SECOND_LANG_OPTION' => ($field_type == FIELD_BOOL) ? $cp->vars['lang_options'][1] : '')
- );
+ 'SECOND_LANG_OPTION' => ($field_type == FIELD_BOOL) ? $cp->vars['lang_options'][1] : '',
+ ));
}
break;
case 2:
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_STEP_TWO' => true,
- 'L_NEXT_STEP' => (sizeof($this->lang_defs['iso']) == 1) ? phpbb::$user->lang['SAVE'] : phpbb::$user->lang['PROFILE_LANG_OPTIONS'])
- );
+ 'L_NEXT_STEP' => (sizeof($this->lang_defs['iso']) == 1) ? phpbb::$user->lang['SAVE'] : phpbb::$user->lang['PROFILE_LANG_OPTIONS'],
+ ));
// Build options based on profile type
$function = 'get_' . custom_profile::$profile_types[$field_type] . '_options';
@@ -802,7 +802,7 @@ class acp_profile
foreach ($options as $num => $option_ary)
{
- $template->assign_block_vars('option', $option_ary);
+ phpbb::$template->assign_block_vars('option', $option_ary);
}
break;
@@ -810,31 +810,31 @@ class acp_profile
// Define remaining language variables
case 3:
- $template->assign_var('S_STEP_THREE', true);
+ phpbb::$template->assign_var('S_STEP_THREE', true);
$options = $this->build_language_options($cp, $field_type, $action);
foreach ($options as $lang_id => $lang_ary)
{
- $template->assign_block_vars('options', array(
- 'LANGUAGE' => sprintf(phpbb::$user->lang[(($lang_id == $this->edit_lang_id) ? 'DEFAULT_' : '') . 'ISO_LANGUAGE'], $lang_ary['lang_iso']))
- );
+ phpbb::$template->assign_block_vars('options', array(
+ 'LANGUAGE' => sprintf(phpbb::$user->lang[(($lang_id == $this->edit_lang_id) ? 'DEFAULT_' : '') . 'ISO_LANGUAGE'], $lang_ary['lang_iso']),
+ ));
foreach ($lang_ary['fields'] as $field_ident => $field_ary)
{
- $template->assign_block_vars('options.field', array(
+ phpbb::$template->assign_block_vars('options.field', array(
'L_TITLE' => $field_ary['TITLE'],
'L_EXPLAIN' => (isset($field_ary['EXPLAIN'])) ? $field_ary['EXPLAIN'] : '',
- 'FIELD' => $field_ary['FIELD'])
- );
+ 'FIELD' => $field_ary['FIELD'],
+ ));
}
}
break;
}
- $template->assign_vars(array(
- 'S_HIDDEN_FIELDS' => $s_hidden_fields)
- );
+ phpbb::$template->assign_vars(array(
+ 'S_HIDDEN_FIELDS' => $s_hidden_fields,
+ ));
return;
@@ -860,7 +860,7 @@ class acp_profile
$s_one_need_edit = true;
}
- $template->assign_block_vars('fields', array(
+ phpbb::$template->assign_block_vars('fields', array(
'FIELD_IDENT' => $row['field_ident'],
'FIELD_TYPE' => phpbb::$user->lang['FIELD_' . strtoupper(custom_profile::$profile_types[$row['field_type']])],
@@ -872,15 +872,15 @@ class acp_profile
'U_MOVE_UP' => $this->u_action . "&amp;action=move_up&amp;order={$row['field_order']}",
'U_MOVE_DOWN' => $this->u_action . "&amp;action=move_down&amp;order={$row['field_order']}",
- 'S_NEED_EDIT' => $s_need_edit)
- );
+ 'S_NEED_EDIT' => $s_need_edit,
+ ));
}
phpbb::$db->sql_freeresult($result);
// At least one option field needs editing?
if ($s_one_need_edit)
{
- $template->assign_var('S_NEED_EDIT', true);
+ phpbb::$template->assign_var('S_NEED_EDIT', true);
}
$s_select_type = '';
@@ -889,10 +889,10 @@ class acp_profile
$s_select_type .= '<option value="' . $key . '">' . phpbb::$user->lang['FIELD_' . strtoupper($value)] . '</option>';
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_ACTION' => $this->u_action,
- 'S_TYPE_OPTIONS' => $s_select_type)
- );
+ 'S_TYPE_OPTIONS' => $s_select_type,
+ ));
}
/**
diff --git a/phpBB/modules/acp/acp_prune.php b/phpBB/modules/acp/acp_prune.php
index 7803c9d869..e50f51dccd 100644
--- a/phpBB/modules/acp/acp_prune.php
+++ b/phpBB/modules/acp/acp_prune.php
@@ -85,9 +85,9 @@ class acp_prune
$prunedate_posted = time() - ($prune_posted * 86400);
$prunedate_viewed = time() - ($prune_viewed * 86400);
- $template->assign_vars(array(
- 'S_PRUNED' => true)
- );
+ phpbb::$template->assign_vars(array(
+ 'S_PRUNED' => true,
+ ));
$sql_forum = (sizeof($forum_id)) ? ' AND ' . phpbb::$db->sql_in_set('forum_id', $forum_id) : '';
@@ -136,11 +136,11 @@ class acp_prune
$prune_ids[] = $row['forum_id'];
- $template->assign_block_vars('pruned', array(
+ phpbb::$template->assign_block_vars('pruned', array(
'FORUM_NAME' => $row['forum_name'],
'NUM_TOPICS' => $p_result['topics'],
- 'NUM_POSTS' => $p_result['posts'])
- );
+ 'NUM_POSTS' => $p_result['posts'],
+ ));
$log_data .= (($log_data != '') ? ', ' : '') . $row['forum_name'];
}
@@ -176,11 +176,11 @@ class acp_prune
// display a select box to use for pruning.
if (!sizeof($forum_id))
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_ACTION' => $this->u_action,
'S_SELECT_FORUM' => true,
- 'S_FORUM_OPTIONS' => make_forum_select(false, false, false))
- );
+ 'S_FORUM_OPTIONS' => make_forum_select(false, false, false),
+ ));
}
else
{
@@ -208,13 +208,13 @@ class acp_prune
$l_selected_forums = (sizeof($forum_id) == 1) ? 'SELECTED_FORUM' : 'SELECTED_FORUMS';
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_SELECTED_FORUMS' => phpbb::$user->lang[$l_selected_forums],
'U_ACTION' => $this->u_action,
'U_BACK' => $this->u_action,
'FORUM_LIST' => $forum_list,
- 'S_HIDDEN_FIELDS' => $s_hidden_fields)
- );
+ 'S_HIDDEN_FIELDS' => $s_hidden_fields,
+ ));
}
}
@@ -290,14 +290,14 @@ class acp_prune
// Assign to template
foreach ($user_ids as $user_id)
{
- $template->assign_block_vars('users', array(
+ phpbb::$template->assign_block_vars('users', array(
'USERNAME' => $usernames[$user_id],
'U_PROFILE' => append_sid('memberlist', 'mode=viewprofile&amp;u=' . $user_id),
'U_USER_ADMIN' => (phpbb::$acl->acl_get('a_user')) ? append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'i=users&amp;mode=overview&amp;u=' . $user_id, true, phpbb::$user->session_id) : '',
));
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_DEACTIVATE' => ($action == 'deactivate') ? true : false,
'S_DELETE' => ($action == 'delete') ? true : false,
));
@@ -345,7 +345,7 @@ class acp_prune
$s_find_active_time .= '<option value="' . $key . '">' . $value . '</option>';
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_ACTION' => $this->u_action,
'S_JOINED_OPTIONS' => $s_find_join_time,
'S_ACTIVE_OPTIONS' => $s_find_active_time,
diff --git a/phpBB/modules/acp/acp_ranks.php b/phpBB/modules/acp/acp_ranks.php
index 9b890aa230..2b45f85c58 100644
--- a/phpBB/modules/acp/acp_ranks.php
+++ b/phpBB/modules/acp/acp_ranks.php
@@ -190,7 +190,7 @@ class acp_ranks
$filename_list = '<option value=""' . (($edit_img == '') ? ' selected="selected"' : '') . '>----------</option>' . $filename_list;
unset($existing_imgs, $imglist);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_EDIT' => true,
'U_BACK' => $this->u_action,
'RANKS_PATH' => PHPBB_ROOT_PATH . phpbb::$config['ranks_path'],
@@ -200,8 +200,8 @@ class acp_ranks
'S_FILENAME_LIST' => $filename_list,
'RANK_IMAGE' => ($edit_img) ? PHPBB_ROOT_PATH . phpbb::$config['ranks_path'] . '/' . $edit_img : PHPBB_ADMIN_PATH . 'images/spacer.gif',
'S_SPECIAL_RANK' => (!isset($ranks['rank_special']) || $ranks['rank_special']) ? true : false,
- 'MIN_POSTS' => (isset($ranks['rank_min']) && !$ranks['rank_special']) ? $ranks['rank_min'] : 0)
- );
+ 'MIN_POSTS' => (isset($ranks['rank_min']) && !$ranks['rank_special']) ? $ranks['rank_min'] : 0,
+ ));
return;
@@ -209,9 +209,9 @@ class acp_ranks
break;
}
- $template->assign_vars(array(
- 'U_ACTION' => $this->u_action)
- );
+ phpbb::$template->assign_vars(array(
+ 'U_ACTION' => $this->u_action,
+ ));
$sql = 'SELECT *
FROM ' . RANKS_TABLE . '
@@ -220,7 +220,7 @@ class acp_ranks
while ($row = phpbb::$db->sql_fetchrow($result))
{
- $template->assign_block_vars('ranks', array(
+ phpbb::$template->assign_block_vars('ranks', array(
'S_RANK_IMAGE' => ($row['rank_image']) ? true : false,
'S_SPECIAL_RANK' => ($row['rank_special']) ? true : false,
@@ -229,8 +229,8 @@ class acp_ranks
'MIN_POSTS' => $row['rank_min'],
'U_EDIT' => $this->u_action . '&amp;action=edit&amp;id=' . $row['rank_id'],
- 'U_DELETE' => $this->u_action . '&amp;action=delete&amp;id=' . $row['rank_id'])
- );
+ 'U_DELETE' => $this->u_action . '&amp;action=delete&amp;id=' . $row['rank_id'],
+ ));
}
phpbb::$db->sql_freeresult($result);
diff --git a/phpBB/modules/acp/acp_reasons.php b/phpBB/modules/acp/acp_reasons.php
index 81484abd95..b8c18220ef 100644
--- a/phpBB/modules/acp/acp_reasons.php
+++ b/phpBB/modules/acp/acp_reasons.php
@@ -164,7 +164,7 @@ class acp_reasons
$translated = true;
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_TITLE' => phpbb::$user->lang['REASON_' . $l_title],
'U_ACTION' => $this->u_action . "&amp;id=$reason_id&amp;action=$action",
'U_BACK' => $this->u_action,
@@ -180,8 +180,7 @@ class acp_reasons
'S_EDIT_REASON' => true,
'S_TRANSLATED' => $translated,
'S_ERROR' => (sizeof($error)) ? true : false,
- )
- );
+ ));
return;
break;
@@ -282,10 +281,9 @@ class acp_reasons
}
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_ACTION' => $this->u_action,
- )
- );
+ ));
// Reason count
$sql = 'SELECT reason_id, COUNT(reason_id) AS reason_count
@@ -319,7 +317,7 @@ class acp_reasons
$translated = true;
}
- $template->assign_block_vars('reasons', array(
+ phpbb::$template->assign_block_vars('reasons', array(
'REASON_TITLE' => $row['reason_title'],
'REASON_DESCRIPTION' => $row['reason_description'],
'REASON_COUNT' => (isset($reason_count[$row['reason_id']])) ? $reason_count[$row['reason_id']] : 0,
@@ -330,8 +328,8 @@ class acp_reasons
'U_EDIT' => $this->u_action . '&amp;action=edit&amp;id=' . $row['reason_id'],
'U_DELETE' => (!$other_reason) ? $this->u_action . '&amp;action=delete&amp;id=' . $row['reason_id'] : '',
'U_MOVE_UP' => $this->u_action . '&amp;action=move_up&amp;order=' . $row['reason_order'],
- 'U_MOVE_DOWN' => $this->u_action . '&amp;action=move_down&amp;order=' . $row['reason_order'])
- );
+ 'U_MOVE_DOWN' => $this->u_action . '&amp;action=move_down&amp;order=' . $row['reason_order'],
+ ));
}
phpbb::$db->sql_freeresult($result);
}
diff --git a/phpBB/modules/acp/acp_search.php b/phpBB/modules/acp/acp_search.php
index e7fab69c0e..43bb667770 100644
--- a/phpBB/modules/acp/acp_search.php
+++ b/phpBB/modules/acp/acp_search.php
@@ -81,10 +81,10 @@ class acp_search
if (!$submit)
{
- $template->assign_block_vars('backend', array(
+ phpbb::$template->assign_block_vars('backend', array(
'NAME' => $name,
- 'SETTINGS' => $vars['tpl'])
- );
+ 'SETTINGS' => $vars['tpl'],
+ ));
}
else if (is_array($vars['config']))
{
@@ -205,7 +205,7 @@ class acp_search
$this->tpl_name = 'acp_search';
$this->page_title = 'ACP_SEARCH_SETTINGS';
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'LIMIT_SEARCH_LOAD' => (float) phpbb::$config['limit_search_load'],
'MIN_SEARCH_AUTHOR_CHARS' => (int) phpbb::$config['min_search_author_chars'],
'SEARCH_INTERVAL' => (float) phpbb::$config['search_interval'],
@@ -216,8 +216,8 @@ class acp_search
'S_YES_SEARCH' => (bool) phpbb::$config['load_search'],
'S_SETTINGS' => true,
- 'U_ACTION' => $this->u_action)
- );
+ 'U_ACTION' => $this->u_action,
+ ));
}
function index($id, $mode)
@@ -461,24 +461,24 @@ class acp_search
}
}
- $template->assign_block_vars('backend', array(
+ phpbb::$template->assign_block_vars('backend', array(
'L_NAME' => $name,
'NAME' => $type,
'S_ACTIVE' => ($type == phpbb::$config['search_type']) ? true : false,
'S_HIDDEN_FIELDS' => build_hidden_fields(array('search_type' => $type)),
'S_INDEXED' => (bool) $search->index_created(),
- 'S_STATS' => (bool) sizeof($statistics))
- );
+ 'S_STATS' => (bool) sizeof($statistics),
+ ));
foreach ($statistics as $statistic)
{
- $template->assign_block_vars('backend.data', array(
+ phpbb::$template->assign_block_vars('backend.data', array(
'STATISTIC_1' => $statistic['statistic_1'],
'VALUE_1' => $statistic['value_1'],
'STATISTIC_2' => (isset($statistic['statistic_2'])) ? $statistic['statistic_2'] : '',
- 'VALUE_2' => (isset($statistic['value_2'])) ? $statistic['value_2'] : '')
- );
+ 'VALUE_2' => (isset($statistic['value_2'])) ? $statistic['value_2'] : '',
+ ));
}
}
unset($search);
@@ -489,7 +489,7 @@ class acp_search
$this->tpl_name = 'acp_search';
$this->page_title = 'ACP_SEARCH_INDEX';
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_INDEX' => true,
'U_ACTION' => $this->u_action,
'U_PROGRESS_BAR' => append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=$id&amp;mode=$mode&amp;action=progress_bar"),
@@ -498,12 +498,12 @@ class acp_search
if (isset($this->state[1]))
{
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_CONTINUE_INDEXING' => $this->state[1],
'U_CONTINUE_INDEXING' => $this->u_action . '&amp;action=' . $this->state[1],
'L_CONTINUE' => ($this->state[1] == 'create') ? phpbb::$user->lang['CONTINUE_INDEXING'] : phpbb::$user->lang['CONTINUE_DELETING_INDEX'],
- 'L_CONTINUE_EXPLAIN' => ($this->state[1] == 'create') ? phpbb::$user->lang['CONTINUE_INDEXING_EXPLAIN'] : phpbb::$user->lang['CONTINUE_DELETING_INDEX_EXPLAIN'])
- );
+ 'L_CONTINUE_EXPLAIN' => ($this->state[1] == 'create') ? phpbb::$user->lang['CONTINUE_INDEXING_EXPLAIN'] : phpbb::$user->lang['CONTINUE_DELETING_INDEX_EXPLAIN'],
+ ));
}
}
@@ -513,14 +513,14 @@ class acp_search
page_header(phpbb::$user->lang[$l_type]);
- $template->set_filenames(array(
- 'body' => 'progress_bar.html')
- );
+ phpbb::$template->set_filenames(array(
+ 'body' => 'progress_bar.html',
+ ));
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_PROGRESS' => phpbb::$user->lang[$l_type],
- 'L_PROGRESS_EXPLAIN' => phpbb::$user->lang[$l_type . '_EXPLAIN'])
- );
+ 'L_PROGRESS_EXPLAIN' => phpbb::$user->lang[$l_type . '_EXPLAIN'],
+ ));
page_footer();
}
diff --git a/phpBB/modules/acp/acp_styles.php b/phpBB/modules/acp/acp_styles.php
index a88778e598..4f21a44e1d 100644
--- a/phpBB/modules/acp/acp_styles.php
+++ b/phpBB/modules/acp/acp_styles.php
@@ -510,7 +510,7 @@ parse_css_file = {PARSE_CSS_FILE}
$this->page_title = 'ACP_' . $l_prefix . 'S';
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_FRONTEND' => true,
'S_STYLE' => ($mode == 'style') ? true : false,
@@ -523,8 +523,7 @@ parse_css_file = {PARSE_CSS_FILE}
'L_CREATE' => phpbb::$user->lang['CREATE_' . $l_prefix],
'U_ACTION' => $this->u_action,
- )
- );
+ ));
$sql = "SELECT *
FROM $sql_from";
@@ -552,7 +551,7 @@ parse_css_file = {PARSE_CSS_FILE}
$s_actions[] = '<a href="' . $this->u_action . "&amp;action=$option&amp;id=" . $row[$mode . '_id'] . '">' . phpbb::$user->lang[strtoupper($option)] . '</a>';
}
- $template->assign_block_vars('installed', array(
+ phpbb::$template->assign_block_vars('installed', array(
'S_DEFAULT_STYLE' => ($mode == 'style' && $row['style_id'] == phpbb::$config['default_style']) ? true : false,
'U_EDIT' => $this->u_action . '&amp;action=' . (($mode == 'style') ? 'details' : 'edit') . '&amp;id=' . $row[$mode . '_id'],
'U_STYLE_ACT_DEACT' => $this->u_action . '&amp;action=' . $stylevis . '&amp;id=' . $row[$mode . '_id'],
@@ -563,8 +562,7 @@ parse_css_file = {PARSE_CSS_FILE}
'NAME' => $row[$mode . '_name'],
'STYLE_COUNT' => ($mode == 'style' && isset($style_count[$row['style_id']])) ? $style_count[$row['style_id']] : 0,
- )
- );
+ ));
}
phpbb::$db->sql_freeresult($result);
@@ -605,18 +603,18 @@ parse_css_file = {PARSE_CSS_FILE}
{
foreach ($new_ary as $cfg)
{
- $template->assign_block_vars('uninstalled', array(
+ phpbb::$template->assign_block_vars('uninstalled', array(
'NAME' => $cfg['name'],
'COPYRIGHT' => $cfg['copyright'],
- 'U_INSTALL' => $this->u_action . '&amp;action=install&amp;path=' . urlencode($cfg['path']))
- );
+ 'U_INSTALL' => $this->u_action . '&amp;action=install&amp;path=' . urlencode($cfg['path']),
+ ));
}
}
unset($new_ary);
- $template->assign_vars(array(
- 'S_BASIS_OPTIONS' => $basis_options)
- );
+ phpbb::$template->assign_vars(array(
+ 'S_BASIS_OPTIONS' => $basis_options,
+ ));
}
@@ -766,7 +764,7 @@ parse_css_file = {PARSE_CSS_FILE}
}
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_EDIT_TEMPLATE' => true,
'S_HIDDEN_FIELDS' => build_hidden_fields(array('template_file' => $template_file)),
'S_TEMPLATES' => $tpl_options,
@@ -786,8 +784,8 @@ parse_css_file = {PARSE_CSS_FILE}
'SELECTED_TEMPLATE' => $template_info['template_name'],
'TEMPLATE_FILE' => $template_file,
'TEMPLATE_DATA' => utf8_htmlspecialchars($template_data),
- 'TEXT_ROWS' => $text_rows)
- );
+ 'TEXT_ROWS' => $text_rows,
+ ));
}
/**
@@ -829,13 +827,13 @@ parse_css_file = {PARSE_CSS_FILE}
{
page_header(phpbb::$user->lang['TEMPLATE_CACHE']);
- $template->set_filenames(array(
- 'body' => 'viewsource.html')
- );
+ phpbb::$template->set_filenames(array(
+ 'body' => 'viewsource.html',
+ ));
- $template->assign_vars(array(
- 'FILENAME' => str_replace('.', '/', $source) . '.html')
- );
+ phpbb::$template->assign_vars(array(
+ 'FILENAME' => str_replace('.', '/', $source) . '.html',
+ ));
$code = str_replace(array("\r\n", "\r"), array("\n", "\n"), file_get_contents(PHPBB_ROOT_PATH . "cache/{$cache_prefix}_$source.html." . PHP_EXT));
@@ -859,10 +857,10 @@ parse_css_file = {PARSE_CSS_FILE}
foreach ($code as $key => $line)
{
- $template->assign_block_vars('source', array(
+ phpbb::$template->assign_block_vars('source', array(
'LINENUM' => $key + 1,
- 'LINE' => preg_replace('#([^ ;])&nbsp;([^ &])#', '$1 $2', $line))
- );
+ 'LINE' => preg_replace('#([^ ;])&nbsp;([^ &])#', '$1 $2', $line),
+ ));
unset($code[$key]);
}
@@ -888,23 +886,23 @@ parse_css_file = {PARSE_CSS_FILE}
continue;
}
- $template->assign_block_vars('file', array(
+ phpbb::$template->assign_block_vars('file', array(
'U_VIEWSOURCE' => $this->u_action . "&amp;action=cache&amp;id=$template_id&amp;source=$file",
'CACHED' => phpbb::$user->format_date(filemtime(PHPBB_ROOT_PATH . "cache/$filename")),
'FILENAME' => $file,
'FILESIZE' => sprintf('%.1f ' . phpbb::$user->lang['KIB'], filesize(PHPBB_ROOT_PATH . "cache/$filename") / 1024),
- 'MODIFIED' => phpbb::$user->format_date(filemtime(PHPBB_ROOT_PATH . "styles/{$template_row['template_path']}/template/$tpl_file.html")))
- );
+ 'MODIFIED' => phpbb::$user->format_date(filemtime(PHPBB_ROOT_PATH . "styles/{$template_row['template_path']}/template/$tpl_file.html")),
+ ));
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_CACHE' => true,
'S_TEMPLATE' => true,
'U_ACTION' => $this->u_action . "&amp;action=cache&amp;id=$template_id",
- 'U_BACK' => $this->u_action)
- );
+ 'U_BACK' => $this->u_action,
+ ));
}
/**
@@ -1068,7 +1066,7 @@ parse_css_file = {PARSE_CSS_FILE}
}
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_EDIT_THEME' => true,
'S_HIDDEN_FIELDS' => build_hidden_fields(array('template_file' => $theme_file)),
'S_THEME_IN_DB' => $theme_info['theme_storedb'],
@@ -1089,8 +1087,8 @@ parse_css_file = {PARSE_CSS_FILE}
'SELECTED_TEMPLATE' => $theme_info['theme_name'],
'TEMPLATE_FILE' => $theme_file,
'TEMPLATE_DATA' => utf8_htmlspecialchars($theme_data),
- 'TEXT_ROWS' => $text_rows)
- );
+ 'TEXT_ROWS' => $text_rows,
+ ));
}
@@ -1228,7 +1226,7 @@ parse_css_file = {PARSE_CSS_FILE}
add_log('admin', 'LOG_IMAGESET_EDIT', $imageset_name);
- $template->assign_var('SUCCESS', true);
+ phpbb::$template->assign_var('SUCCESS', true);
$image_filename = $imgfilename;
$image_width = $imgwidth;
@@ -1282,8 +1280,8 @@ parse_css_file = {PARSE_CSS_FILE}
$img_options = '';
foreach ($this->imageset_keys as $category => $img_ary)
{
- $template->assign_block_vars('category', array(
- 'NAME' => phpbb::$user->lang['IMG_CAT_' . strtoupper($category)]
+ phpbb::$template->assign_block_vars('category', array(
+ 'NAME' => phpbb::$user->lang['IMG_CAT_' . strtoupper($category)],
));
foreach ($img_ary as $img)
@@ -1292,19 +1290,19 @@ parse_css_file = {PARSE_CSS_FILE}
{
foreach ($langs as $language)
{
- $template->assign_block_vars('category.images', array(
+ phpbb::$template->assign_block_vars('category.images', array(
'SELECTED' => ($img == $imgname && $language == $imgnamelang),
'VALUE' => $img . '-' . $language,
- 'TEXT' => phpbb::$user->lang['IMG_' . strtoupper($img)] . ' [ ' . $language . ' ]'
+ 'TEXT' => phpbb::$user->lang['IMG_' . strtoupper($img)] . ' [ ' . $language . ' ]',
));
}
}
else
{
- $template->assign_block_vars('category.images', array(
+ phpbb::$template->assign_block_vars('category.images', array(
'SELECTED' => ($img == $imgname),
'VALUE' => $img,
- 'TEXT' => (($category == 'custom') ? $img : phpbb::$user->lang['IMG_' . strtoupper($img)])
+ 'TEXT' => (($category == 'custom') ? $img : phpbb::$user->lang['IMG_' . strtoupper($img)]),
));
}
}
@@ -1320,8 +1318,8 @@ parse_css_file = {PARSE_CSS_FILE}
{
if ($type !== 'lang' || $sql_extra)
{
- $template->assign_block_vars('imagesetlist', array(
- 'TYPE' => ($type == 'lang')
+ phpbb::$template->assign_block_vars('imagesetlist', array(
+ 'TYPE' => ($type == 'lang'),
));
}
@@ -1334,10 +1332,10 @@ parse_css_file = {PARSE_CSS_FILE}
$image_found = true;
$img_val = htmlspecialchars($img);
}
- $template->assign_block_vars('imagesetlist.images', array(
+ phpbb::$template->assign_block_vars('imagesetlist.images', array(
'SELECTED' => $selected,
'TEXT' => $imgtext,
- 'VALUE' => htmlspecialchars($img)
+ 'VALUE' => htmlspecialchars($img),
));
}
}
@@ -1345,7 +1343,7 @@ parse_css_file = {PARSE_CSS_FILE}
$imgsize_bool = (!empty($imgname) && $image_width && $image_height) ? true : false;
$image_request = '../styles/' . $imageset_path . '/imageset/' . ($image_lang ? $imgnamelang . '/' : '') . $image_filename;
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_EDIT_IMAGESET' => true,
'L_TITLE' => phpbb::$user->lang[$this->page_title],
'L_EXPLAIN' => phpbb::$user->lang[$this->page_title . '_EXPLAIN'],
@@ -1359,7 +1357,7 @@ parse_css_file = {PARSE_CSS_FILE}
'A_NAME' => addslashes($imageset_name),
'ERROR' => !$valid_name,
'IMG_SRC' => ($image_found) ? '../styles/' . $imageset_path . '/imageset/' . $img_val : 'images/no_image.png',
- 'IMAGE_SELECT' => $image_found
+ 'IMAGE_SELECT' => $image_found,
));
}
@@ -1479,7 +1477,7 @@ parse_css_file = {PARSE_CSS_FILE}
$this->page_title = 'DELETE_' . $l_prefix;
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_DELETE' => true,
'S_REPLACE_OPTIONS' => $s_options,
@@ -1493,8 +1491,7 @@ parse_css_file = {PARSE_CSS_FILE}
'U_BACK' => $this->u_action,
'NAME' => $style_row[$mode . '_name'],
- )
- );
+ ));
}
/**
@@ -1874,7 +1871,7 @@ parse_css_file = {PARSE_CSS_FILE}
$format_buttons .= '<label><input type="radio"' . ((!$format_buttons) ? ' id="format"' : '') . ' class="radio" value="' . $method . '" name="format"' . (($method == $format) ? ' checked="checked"' : '') . ' /> ' . $method . '</label>';
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_EXPORT' => true,
'S_ERROR_MSG' => (sizeof($error)) ? true : false,
'S_STYLE' => ($mode == 'style') ? true : false,
@@ -1888,8 +1885,8 @@ parse_css_file = {PARSE_CSS_FILE}
'ERROR_MSG' => (sizeof($error)) ? implode('<br />', $error) : '',
'NAME' => $style_row[$mode . '_name'],
- 'FORMAT_BUTTONS' => $format_buttons)
- );
+ 'FORMAT_BUTTONS' => $format_buttons,
+ ));
}
/**
@@ -2078,7 +2075,7 @@ parse_css_file = {PARSE_CSS_FILE}
$this->page_title = 'EDIT_DETAILS_' . $l_type;
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_DETAILS' => true,
'S_ERROR_MSG' => (sizeof($error)) ? true : false,
'S_STYLE' => ($mode == 'style') ? true : false,
@@ -2104,8 +2101,7 @@ parse_css_file = {PARSE_CSS_FILE}
'ERROR_MSG' => (sizeof($error)) ? implode('<br />', $error) : '',
'NAME' => $style_row[$mode . '_name'],
'COPYRIGHT' => $style_row[$mode . '_copyright'],
- )
- );
+ ));
}
/**
@@ -2363,7 +2359,7 @@ parse_css_file = {PARSE_CSS_FILE}
$this->page_title = 'INSTALL_' . $l_type;
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_DETAILS' => true,
'S_INSTALL' => true,
'S_ERROR_MSG' => (sizeof($error)) ? true : false,
@@ -2388,8 +2384,8 @@ parse_css_file = {PARSE_CSS_FILE}
'COPYRIGHT' => $style_row[$mode . '_copyright'],
'TEMPLATE_NAME' => ($mode == 'style') ? $style_row['template_name'] : '',
'THEME_NAME' => ($mode == 'style') ? $style_row['theme_name'] : '',
- 'IMAGESET_NAME' => ($mode == 'style') ? $style_row['imageset_name'] : '')
- );
+ 'IMAGESET_NAME' => ($mode == 'style') ? $style_row['imageset_name'] : '',
+ ));
}
/**
@@ -2510,7 +2506,7 @@ parse_css_file = {PARSE_CSS_FILE}
$this->page_title = 'ADD_' . $l_type;
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_DETAILS' => true,
'S_ADD' => true,
'S_ERROR_MSG' => (sizeof($error)) ? true : false,
@@ -2536,8 +2532,8 @@ parse_css_file = {PARSE_CSS_FILE}
'ERROR_MSG' => (sizeof($error)) ? implode('<br />', $error) : '',
'NAME' => $style_row[$mode . '_name'],
- 'COPYRIGHT' => $style_row[$mode . '_copyright'])
- );
+ 'COPYRIGHT' => $style_row[$mode . '_copyright'],
+ ));
}
diff --git a/phpBB/modules/acp/acp_update.php b/phpBB/modules/acp/acp_update.php
index 8424992d50..73abac7584 100644
--- a/phpBB/modules/acp/acp_update.php
+++ b/phpBB/modules/acp/acp_update.php
@@ -60,7 +60,7 @@ class acp_update
$up_to_date_automatic = (version_compare(str_replace('rc', 'RC', strtolower($current_version)), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true;
$up_to_date = (version_compare(str_replace('rc', 'RC', strtolower(phpbb::$config['version'])), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true;
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_UP_TO_DATE' => $up_to_date,
'S_UP_TO_DATE_AUTO' => $up_to_date_automatic,
'S_VERSION_CHECK' => true,
diff --git a/phpBB/modules/acp/acp_users.php b/phpBB/modules/acp/acp_users.php
index 9cdd26622a..c012612a24 100644
--- a/phpBB/modules/acp/acp_users.php
+++ b/phpBB/modules/acp/acp_users.php
@@ -59,10 +59,10 @@ class acp_users
$domain = gethostbyaddr($user_ip);
$ipwhois = user_ipwhois($user_ip);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'MESSAGE_TITLE' => sprintf(phpbb::$user->lang['IP_WHOIS_FOR'], $domain),
- 'MESSAGE_TEXT' => nl2br($ipwhois))
- );
+ 'MESSAGE_TEXT' => nl2br($ipwhois),
+ ));
return;
}
@@ -72,7 +72,7 @@ class acp_users
{
$this->page_title = 'SELECT_USER';
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_ACTION' => $this->u_action,
'ANONYMOUS_USER_ID' => ANONYMOUS,
@@ -143,13 +143,13 @@ class acp_users
$s_form_options .= '<option value="' . $module_mode . '"' . $selected . '>' . phpbb::$user->lang['ACP_USER_' . strtoupper($module_mode)] . '</option>';
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_BACK' => $this->u_action,
'U_MODE_SELECT' => append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=$id&amp;u=$user_id"),
'U_ACTION' => $this->u_action . '&amp;u=' . $user_id,
'S_FORM_OPTIONS' => $s_form_options,
- 'MANAGED_USERNAME' => $user_row['username'])
- );
+ 'MANAGED_USERNAME' => $user_row['username'],
+ ));
// Prevent normal users/admins change/view founders if they are not a founder by themselves
if (!phpbb::$user->is_founder && $user_row['user_type'] == phpbb::USER_FOUNDER)
@@ -509,12 +509,12 @@ class acp_users
{
$this->page_title = 'USER_ADMIN_MOVE_POSTS';
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_SELECT_FORUM' => true,
'U_ACTION' => $this->u_action . "&amp;action=$action&amp;u=$user_id",
'U_BACK' => $this->u_action . "&amp;u=$user_id",
- 'S_FORUM_OPTIONS' => make_forum_select(false, false, false, true))
- );
+ 'S_FORUM_OPTIONS' => make_forum_select(false, false, false, true),
+ ));
return;
}
@@ -899,7 +899,7 @@ class acp_users
$user_row['posts_in_queue'] = (int) phpbb::$db->sql_fetchfield('posts_in_queue');
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'L_NAME_CHARS_EXPLAIN' => sprintf(phpbb::$user->lang[phpbb::$config['allow_name_chars'] . '_EXPLAIN'], phpbb::$config['min_name_chars'], phpbb::$config['max_name_chars']),
'L_CHANGE_PASSWORD_EXPLAIN' => sprintf(phpbb::$user->lang[phpbb::$config['pass_complex'] . '_EXPLAIN'], phpbb::$config['min_pass_chars'], phpbb::$config['max_pass_chars']),
'L_POSTS_IN_QUEUE' => phpbb::$user->lang('NUM_POSTS_IN_QUEUE', $user_row['posts_in_queue']),
@@ -1009,7 +1009,7 @@ class acp_users
$log_count = 0;
view_log('user', $log_data, $log_count, phpbb::$config['topics_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_FEEDBACK' => true,
'S_ON_PAGE' => on_page($log_count, phpbb::$config['topics_per_page'], $start),
'PAGINATION' => generate_pagination($this->u_action . "&amp;u=$user_id&amp;$u_sort_param", $log_count, phpbb::$config['topics_per_page'], $start, true),
@@ -1017,18 +1017,18 @@ class acp_users
'S_LIMIT_DAYS' => $s_limit_days,
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir,
- 'S_CLEARLOGS' => phpbb::$acl->acl_get('a_clearlogs'))
- );
+ 'S_CLEARLOGS' => phpbb::$acl->acl_get('a_clearlogs'),
+ ));
foreach ($log_data as $row)
{
- $template->assign_block_vars('log', array(
+ phpbb::$template->assign_block_vars('log', array(
'USERNAME' => $row['username_full'],
'IP' => $row['ip'],
'DATE' => phpbb::$user->format_date($row['time']),
'ACTION' => nl2br($row['action']),
- 'ID' => $row['id'])
- );
+ 'ID' => $row['id'],
+ ));
}
break;
@@ -1211,7 +1211,7 @@ class acp_users
}
unset($now);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'ICQ' => $data['icq'],
'YIM' => $data['yim'],
'AIM' => $data['aim'],
@@ -1226,8 +1226,8 @@ class acp_users
'S_BIRTHDAY_MONTH_OPTIONS' => $s_birthday_month_options,
'S_BIRTHDAY_YEAR_OPTIONS' => $s_birthday_year_options,
- 'S_PROFILE' => true)
- );
+ 'S_PROFILE' => true,
+ ));
// Get additional profile fields and assign them to the template block var 'profile_fields'
phpbb::$user->get_profile_fields($user_id);
@@ -1401,7 +1401,7 @@ class acp_users
${'s_sort_' . $sort_option . '_dir'} .= '</select>';
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_PREFS' => true,
'S_JABBER_DISABLED' => (phpbb::$config['jab_enable'] && $user_row['user_jabber'] && @extension_loaded('xml')) ? false : true,
@@ -1442,8 +1442,7 @@ class acp_users
'S_LANG_OPTIONS' => language_select($data['lang']),
'S_STYLE_OPTIONS' => style_select($data['style']),
'S_TZ_OPTIONS' => tz_select($data['tz'], true),
- )
- );
+ ));
break;
@@ -1483,7 +1482,7 @@ class acp_users
avatar_gallery($category, $avatar_select, 4);
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_AVATAR' => true,
'S_CAN_UPLOAD' => ($can_upload && phpbb::$config['allow_avatar_upload']) ? true : false,
'S_ALLOW_REMOTE' => (phpbb::$config['allow_avatar_remote']) ? true : false,
@@ -1495,8 +1494,8 @@ class acp_users
'USER_AVATAR_WIDTH' => $user_row['user_avatar_width'],
'USER_AVATAR_HEIGHT' => $user_row['user_avatar_height'],
- 'L_AVATAR_EXPLAIN' => sprintf(phpbb::$user->lang['AVATAR_EXPLAIN'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], round(phpbb::$config['avatar_filesize'] / 1024)))
- );
+ 'L_AVATAR_EXPLAIN' => sprintf(phpbb::$user->lang['AVATAR_EXPLAIN'], phpbb::$config['avatar_max_width'], phpbb::$config['avatar_max_height'], round(phpbb::$config['avatar_filesize'] / 1024)),
+ ));
break;
@@ -1534,10 +1533,10 @@ class acp_users
}
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_RANK' => true,
- 'S_RANK_OPTIONS' => $s_rank_options)
- );
+ 'S_RANK_OPTIONS' => $s_rank_options,
+ ));
break;
@@ -1603,7 +1602,7 @@ class acp_users
decode_message($signature, $user_row['user_sig_bbcode_uid']);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_SIGNATURE' => true,
'SIGNATURE' => $signature,
@@ -1625,8 +1624,8 @@ class acp_users
'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,
+ ));
// Assigning custom bbcodes
display_custom_bbcodes();
@@ -1752,7 +1751,7 @@ class acp_users
$view_topic = append_sid('viewtopic', "t={$row['topic_id']}&amp;p={$row['post_msg_id']}") . '#p' . $row['post_msg_id'];
}
- $template->assign_block_vars('attach', array(
+ phpbb::$template->assign_block_vars('attach', array(
'REAL_FILENAME' => $row['real_filename'],
'COMMENT' => nl2br($row['attach_comment']),
'EXTENSION' => $row['extension'],
@@ -1768,19 +1767,19 @@ class acp_users
'S_IN_MESSAGE' => $row['in_message'],
'U_DOWNLOAD' => append_sid('download/file', 'mode=view&amp;id=' . $row['attach_id']),
- 'U_VIEW_TOPIC' => $view_topic)
- );
+ 'U_VIEW_TOPIC' => $view_topic,
+ ));
}
phpbb::$db->sql_freeresult($result);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_ATTACHMENTS' => true,
'S_ON_PAGE' => on_page($num_attachments, phpbb::$config['topics_per_page'], $start),
'S_SORT_KEY' => $s_sort_key,
'S_SORT_DIR' => $s_sort_dir,
- 'PAGINATION' => generate_pagination($this->u_action . "&amp;u=$user_id&amp;sk=$sort_key&amp;sd=$sort_dir", $num_attachments, phpbb::$config['topics_per_page'], $start, true))
- );
+ 'PAGINATION' => generate_pagination($this->u_action . "&amp;u=$user_id&amp;sk=$sort_key&amp;sd=$sort_dir", $num_attachments, phpbb::$config['topics_per_page'], $start, true),
+ ));
break;
@@ -1935,15 +1934,15 @@ class acp_users
{
if ($current_type != $group_type)
{
- $template->assign_block_vars('group', array(
+ phpbb::$template->assign_block_vars('group', array(
'S_NEW_GROUP_TYPE' => true,
- 'GROUP_TYPE' => phpbb::$user->lang['USER_GROUP_' . strtoupper($group_type)])
- );
+ 'GROUP_TYPE' => phpbb::$user->lang['USER_GROUP_' . strtoupper($group_type)],
+ ));
}
foreach ($data_ary as $data)
{
- $template->assign_block_vars('group', array(
+ phpbb::$template->assign_block_vars('group', array(
'U_EDIT_GROUP' => append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=groups&amp;mode=manage&amp;action=edit&amp;u=$user_id&amp;g={$data['group_id']}&amp;back_link=acp_users_groups"),
'U_DEFAULT' => $this->u_action . "&amp;action=default&amp;u=$user_id&amp;g=" . $data['group_id'],
'U_DEMOTE_PROMOTE' => $this->u_action . '&amp;action=' . (($data['group_leader']) ? 'demote' : 'promote') . "&amp;u=$user_id&amp;g=" . $data['group_id'],
@@ -1954,15 +1953,14 @@ class acp_users
'S_NO_DEFAULT' => ($user_row['group_id'] != $data['group_id']) ? true : false,
'S_SPECIAL_GROUP' => ($group_type == 'special') ? true : false,
- )
- );
+ ));
}
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_GROUPS' => true,
- 'S_GROUP_OPTIONS' => $s_group_options)
- );
+ 'S_GROUP_OPTIONS' => $s_group_options,
+ ));
break;
@@ -2019,7 +2017,7 @@ class acp_users
$s_forum_options = '<option value="0"' . ((!$forum_id) ? ' selected="selected"' : '') . '>' . phpbb::$user->lang['VIEW_GLOBAL_PERMS'] . '</option>';
$s_forum_options .= make_forum_select($forum_id, false, true, false, false, false);
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_PERMISSIONS' => true,
'S_GLOBAL' => (!$forum_id) ? true : false,
@@ -2027,18 +2025,18 @@ class acp_users
'U_ACTION' => $this->u_action . '&amp;u=' . $user_id,
'U_USER_PERMISSIONS' => append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'i=permissions&amp;mode=setting_user_global&amp;user_id[]=' . $user_id),
- 'U_USER_FORUM_PERMISSIONS' => append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'i=permissions&amp;mode=setting_user_local&amp;user_id[]=' . $user_id))
- );
+ 'U_USER_FORUM_PERMISSIONS' => append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'i=permissions&amp;mode=setting_user_local&amp;user_id[]=' . $user_id),
+ ));
break;
}
// Assign general variables
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_ERROR' => (sizeof($error)) ? true : false,
- 'ERROR_MSG' => (sizeof($error)) ? implode('<br />', $error) : '')
- );
+ 'ERROR_MSG' => (sizeof($error)) ? implode('<br />', $error) : '',
+ ));
}
/**
diff --git a/phpBB/modules/acp/acp_words.php b/phpBB/modules/acp/acp_words.php
index d9411ce6e3..62c0cfdd1a 100644
--- a/phpBB/modules/acp/acp_words.php
+++ b/phpBB/modules/acp/acp_words.php
@@ -62,14 +62,14 @@ class acp_words
case 'add':
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'S_EDIT_WORD' => true,
'U_ACTION' => $this->u_action,
'U_BACK' => $this->u_action,
'WORD' => (isset($word_info['word'])) ? $word_info['word'] : '',
'REPLACEMENT' => (isset($word_info['replacement'])) ? $word_info['replacement'] : '',
- 'S_HIDDEN_FIELDS' => $s_hidden_fields)
- );
+ 'S_HIDDEN_FIELDS' => $s_hidden_fields,
+ ));
return;
@@ -156,10 +156,10 @@ class acp_words
}
- $template->assign_vars(array(
+ phpbb::$template->assign_vars(array(
'U_ACTION' => $this->u_action,
- 'S_HIDDEN_FIELDS' => $s_hidden_fields)
- );
+ 'S_HIDDEN_FIELDS' => $s_hidden_fields,
+ ));
$sql = 'SELECT *
FROM ' . WORDS_TABLE . '
@@ -168,12 +168,12 @@ class acp_words
while ($row = phpbb::$db->sql_fetchrow($result))
{
- $template->assign_block_vars('words', array(
+ phpbb::$template->assign_block_vars('words', array(
'WORD' => $row['word'],
'REPLACEMENT' => $row['replacement'],
'U_EDIT' => $this->u_action . '&amp;action=edit&amp;id=' . $row['word_id'],
- 'U_DELETE' => $this->u_action . '&amp;action=delete&amp;id=' . $row['word_id'])
- );
+ 'U_DELETE' => $this->u_action . '&amp;action=delete&amp;id=' . $row['word_id'],
+ ));
}
phpbb::$db->sql_freeresult($result);
}
diff --git a/phpBB/modules/acp/auth.php b/phpBB/modules/acp/auth.php
index a959911bc9..396b66c76f 100644
--- a/phpBB/modules/acp/auth.php
+++ b/phpBB/modules/acp/auth.php
@@ -369,7 +369,7 @@ class auth_admin extends auth
$s_role_js_array = implode('', $s_role_js_array);
}
- $template->assign_var('S_ROLE_JS_ARRAY', $s_role_js_array);
+ phpbb::$template->assign_var('S_ROLE_JS_ARRAY', $s_role_js_array);
unset($s_role_js_array);
// Now obtain memberships
@@ -432,7 +432,7 @@ class auth_admin extends auth
$content_array = $categories = array();
self::build_permission_array($hold_ary[$forum_id], $content_array, $categories, array_keys($ug_names_ary));
- $template->assign_block_vars($tpl_pmask, array(
+ phpbb::$template->assign_block_vars($tpl_pmask, array(
'NAME' => ($forum_id == 0) ? $forum_names_ary[0] : $forum_names_ary[$forum_id]['forum_name'],
'PADDING' => ($forum_id == 0) ? '' : $forum_names_ary[$forum_id]['padding'],
@@ -446,8 +446,8 @@ class auth_admin extends auth
'S_VIEW' => ($mode == 'view') ? true : false,
'S_NUM_OBJECTS' => sizeof($content_array),
'S_USER_MODE' => ($user_mode == 'user') ? true : false,
- 'S_GROUP_MODE' => ($user_mode == 'group') ? true : false)
- );
+ 'S_GROUP_MODE' => ($user_mode == 'group') ? true : false,
+ ));
@reset($content_array);
while (list($ug_id, $ug_array) = each($content_array))
@@ -490,13 +490,13 @@ class auth_admin extends auth
$s_custom_permissions = false;
}
- $template->assign_block_vars($tpl_pmask . '.' . $tpl_fmask, array(
+ phpbb::$template->assign_block_vars($tpl_pmask . '.' . $tpl_fmask, array(
'NAME' => $ug_names_ary[$ug_id],
'S_ROLE_OPTIONS' => $s_role_options,
'UG_ID' => $ug_id,
'S_CUSTOM' => $s_custom_permissions,
- 'FORUM_ID' => $forum_id)
- );
+ 'FORUM_ID' => $forum_id,
+ ));
self::assign_cat_array($ug_array, $tpl_pmask . '.' . $tpl_fmask . '.' . $tpl_category, $tpl_mask, $ug_id, $forum_id, $show_trace, ($mode == 'view'));
@@ -518,7 +518,7 @@ class auth_admin extends auth
$content_array = $categories = array();
self::build_permission_array($hold_ary[$ug_id], $content_array, $categories, array_keys($forum_names_ary));
- $template->assign_block_vars($tpl_pmask, array(
+ phpbb::$template->assign_block_vars($tpl_pmask, array(
'NAME' => $ug_name,
'CATEGORIES' => implode('</th><th>', $categories),
@@ -532,8 +532,8 @@ class auth_admin extends auth
'S_VIEW' => ($mode == 'view') ? true : false,
'S_NUM_OBJECTS' => sizeof($content_array),
'S_USER_MODE' => ($user_mode == 'user') ? true : false,
- 'S_GROUP_MODE' => ($user_mode == 'group') ? true : false)
- );
+ 'S_GROUP_MODE' => ($user_mode == 'group') ? true : false,
+ ));
@reset($content_array);
while (list($forum_id, $forum_array) = each($content_array))
@@ -576,14 +576,14 @@ class auth_admin extends auth
$s_custom_permissions = false;
}
- $template->assign_block_vars($tpl_pmask . '.' . $tpl_fmask, array(
+ phpbb::$template->assign_block_vars($tpl_pmask . '.' . $tpl_fmask, array(
'NAME' => ($forum_id == 0) ? $forum_names_ary[0] : $forum_names_ary[$forum_id]['forum_name'],
'PADDING' => ($forum_id == 0) ? '' : $forum_names_ary[$forum_id]['padding'],
'S_ROLE_OPTIONS' => $s_role_options,
'S_CUSTOM' => $s_custom_permissions,
'UG_ID' => $ug_id,
- 'FORUM_ID' => $forum_id)
- );
+ 'FORUM_ID' => $forum_id,
+ ));
self::assign_cat_array($forum_array, $tpl_pmask . '.' . $tpl_fmask . '.' . $tpl_category, $tpl_mask, $ug_id, $forum_id, $show_trace, ($mode == 'view'));
}
@@ -622,10 +622,10 @@ class auth_admin extends auth
{
$auth_ary = $hold_ary[$forum_id];
- $template->assign_block_vars('role_mask', array(
+ phpbb::$template->assign_block_vars('role_mask', array(
'NAME' => ($forum_id == 0) ? phpbb::$user->lang['GLOBAL_MASK'] : $forum_name,
- 'FORUM_ID' => $forum_id)
- );
+ 'FORUM_ID' => $forum_id,
+ ));
if (isset($auth_ary['users']) && sizeof($auth_ary['users']))
{
@@ -637,11 +637,11 @@ class auth_admin extends auth
while ($row = phpbb::$db->sql_fetchrow($result))
{
- $template->assign_block_vars('role_mask.users', array(
+ phpbb::$template->assign_block_vars('role_mask.users', array(
'USER_ID' => $row['user_id'],
'USERNAME' => $row['username'],
- 'U_PROFILE' => append_sid('memberlist', "mode=viewprofile&amp;u={$row['user_id']}"))
- );
+ 'U_PROFILE' => append_sid('memberlist', "mode=viewprofile&amp;u={$row['user_id']}"),
+ ));
}
phpbb::$db->sql_freeresult($result);
}
@@ -656,11 +656,11 @@ class auth_admin extends auth
while ($row = phpbb::$db->sql_fetchrow($result))
{
- $template->assign_block_vars('role_mask.groups', array(
+ phpbb::$template->assign_block_vars('role_mask.groups', array(
'GROUP_ID' => $row['group_id'],
'GROUP_NAME' => ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'],
- 'U_PROFILE' => append_sid('memberlist', "mode=group&amp;g={$row['group_id']}"))
- );
+ 'U_PROFILE' => append_sid('memberlist', "mode=group&amp;g={$row['group_id']}"),
+ ));
}
phpbb::$db->sql_freeresult($result);
}
@@ -1061,13 +1061,13 @@ class auth_admin extends auth
@reset($category_array);
while (list($cat, $cat_array) = each($category_array))
{
- $template->assign_block_vars($tpl_cat, array(
+ phpbb::$template->assign_block_vars($tpl_cat, array(
'S_YES' => ($cat_array['S_YES'] && !$cat_array['S_NEVER'] && !$cat_array['S_NO']) ? true : false,
'S_NEVER' => ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false,
'S_NO' => ($cat_array['S_NO'] && !$cat_array['S_NEVER'] && !$cat_array['S_YES']) ? true : false,
- 'CAT_NAME' => phpbb::$user->lang['permission_cat'][$cat])
- );
+ 'CAT_NAME' => phpbb::$user->lang['permission_cat'][$cat],
+ ));
/* Sort permissions by name (more naturaly and user friendly than sorting by a primary key)
* Commented out due to it's memory consumption and time needed
@@ -1089,7 +1089,7 @@ class auth_admin extends auth
{
if ($s_view)
{
- $template->assign_block_vars($tpl_cat . '.' . $tpl_mask, array(
+ phpbb::$template->assign_block_vars($tpl_cat . '.' . $tpl_mask, array(
'S_YES' => ($allowed == phpbb::ACL_YES) ? true : false,
'S_NEVER' => ($allowed == phpbb::ACL_NEVER) ? true : false,
@@ -1101,12 +1101,12 @@ class auth_admin extends auth
'U_TRACE' => ($show_trace) ? append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=permissions&amp;mode=trace&amp;u=$ug_id&amp;f=$forum_id&amp;auth=$permission") : '',
'UA_TRACE' => ($show_trace) ? append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission", false) : '',
- 'PERMISSION' => phpbb::$user->lang['acl_' . $permission]['lang'])
- );
+ 'PERMISSION' => phpbb::$user->lang['acl_' . $permission]['lang'],
+ ));
}
else
{
- $template->assign_block_vars($tpl_cat . '.' . $tpl_mask, array(
+ phpbb::$template->assign_block_vars($tpl_cat . '.' . $tpl_mask, array(
'S_YES' => ($allowed == phpbb::ACL_YES) ? true : false,
'S_NEVER' => ($allowed == phpbb::ACL_NEVER) ? true : false,
'S_NO' => ($allowed == phpbb::ACL_NO) ? true : false,
@@ -1119,8 +1119,8 @@ class auth_admin extends auth
'U_TRACE' => ($show_trace) ? append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=permissions&amp;mode=trace&amp;u=$ug_id&amp;f=$forum_id&amp;auth=$permission") : '',
'UA_TRACE' => ($show_trace) ? append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission", false) : '',
- 'PERMISSION' => phpbb::$user->lang['acl_' . $permission]['lang'])
- );
+ 'PERMISSION' => phpbb::$user->lang['acl_' . $permission]['lang'],
+ ));
}
}
}