mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 19:54:12 +02:00
Code Issues Releases Wiki Activity

[ticket/13494] Update calls to set_config()

Browse Source 
PHPBB3-13494
This commit is contained in:
Gaëtan Muller
2015-01-11 17:32:31 +01:00
parent 6e2838a4ca
commit 79d4ff5538
45 changed files with 175 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_attachments.php
View File

@@ -190,7 +190,7 @@ class acp_attachments
if ($submit)
{
set_config($config_name, $config_value);
$config->set($config_name, $config_value);
}
}

10
phpBB/includes/acp/acp_board.php
View File

@@ -532,7 +532,7 @@ class acp_board
if ($submit)
{
set_config($config_name, $config_value);
$config->set($config_name, $config_value);
if ($config_name == 'allow_quick_reply' && isset($_POST['allow_quick_reply_enable']))
{
@@ -568,7 +568,7 @@ class acp_board
{
if (!isset($config[$field]))
{
set_config($field, '');
$config->set($field, '');
}
if (!isset($cfg_array[$field]) || strpos($field, 'legend') !== false)
@@ -583,7 +583,7 @@ class acp_board
if ($submit)
{
$updated_auth_settings = true;
set_config($field, $config_value);
$config->set($field, $config_value);
}
}
}
@@ -600,11 +600,11 @@ class acp_board
{
foreach ($old_auth_config as $config_name => $config_value)
{
set_config($config_name, $config_value);
$config->set($config_name, $config_value);
}
trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING);
}
set_config('auth_method', basename($cfg_array['auth_method']));
$config->set('auth_method', basename($cfg_array['auth_method']));
}
else
{

4
phpBB/includes/acp/acp_captcha.php
View File

@@ -71,7 +71,7 @@ class acp_captcha
{
foreach ($config_vars as $config_var => $options)
{
set_config($config_var, request_var($config_var, $options['default']));
$config->set($config_var, request_var($config_var, $options['default']));
}
if ($selected !== $config['captcha_plugin'])
@@ -82,7 +82,7 @@ class acp_captcha
$old_captcha = $factory->get_instance($config['captcha_plugin']);
$old_captcha->uninstall();
set_config('captcha_plugin', $selected);
$config->set('captcha_plugin', $selected);
$new_captcha = $factory->get_instance($config['captcha_plugin']);
$new_captcha->install();

8
phpBB/includes/acp/acp_forums.php
View File

@@ -1962,7 +1962,7 @@ class acp_forums
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
set_config('num_posts', (int) $row['stat'], true);
$config->set('num_posts', (int) $row['stat'], false);
$sql = 'SELECT COUNT(topic_id) AS stat
FROM ' . TOPICS_TABLE . '
@@ -1971,7 +1971,7 @@ class acp_forums
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
set_config('num_topics', (int) $row['stat'], true);
$config->set('num_topics', (int) $row['stat'], false);
$sql = 'SELECT COUNT(attach_id) as stat
FROM ' . ATTACHMENTS_TABLE;
@@ -1979,7 +1979,7 @@ class acp_forums
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
set_config('num_files', (int) $row['stat'], true);
$config->set('num_files', (int) $row['stat'], false);
$sql = 'SELECT SUM(filesize) as stat
FROM ' . ATTACHMENTS_TABLE;
@@ -1987,7 +1987,7 @@ class acp_forums
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
set_config('upload_dir_size', (float) $row['stat'], true);
$config->set('upload_dir_size', (float) $row['stat'], false);
return array();
}

14
phpBB/includes/acp/acp_jabber.php
View File

@@ -103,13 +103,13 @@ class acp_jabber
$db->sql_query($sql);
}
set_config('jab_enable', $jab_enable);
set_config('jab_host', $jab_host);
set_config('jab_port', $jab_port);
set_config('jab_username', $jab_username);
set_config('jab_password', $jab_password);
set_config('jab_package_size', $jab_package_size);
set_config('jab_use_ssl', $jab_use_ssl);
$config->set('jab_enable', $jab_enable);
$config->set('jab_host', $jab_host);
$config->set('jab_port', $jab_port);
$config->set('jab_username', $jab_username);
$config->set('jab_password', $jab_password);
$config->set('jab_package_size', $jab_package_size);
$config->set('jab_use_ssl', $jab_use_ssl);
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_' . $log);
trigger_error($message . adm_back_link($this->u_action));

18
phpBB/includes/acp/acp_main.php
View File

@@ -121,8 +121,8 @@ class acp_main
trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
}
set_config('record_online_users', 1, true);
set_config('record_online_date', time(), true);
$config->set('record_online_users', 1, false);
$config->set('record_online_date', time(), false);
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_RESET_ONLINE');
if ($request->is_ajax())
@@ -141,35 +141,35 @@ class acp_main
FROM ' . POSTS_TABLE . '
WHERE post_visibility = ' . ITEM_APPROVED;
$result = $db->sql_query($sql);
set_config('num_posts', (int) $db->sql_fetchfield('stat'), true);
$config->set('num_posts', (int) $db->sql_fetchfield('stat'), false);
$db->sql_freeresult($result);
$sql = 'SELECT COUNT(topic_id) AS stat
FROM ' . TOPICS_TABLE . '
WHERE topic_visibility = ' . ITEM_APPROVED;
$result = $db->sql_query($sql);
set_config('num_topics', (int) $db->sql_fetchfield('stat'), true);
$config->set('num_topics', (int) $db->sql_fetchfield('stat'), false);
$db->sql_freeresult($result);
$sql = 'SELECT COUNT(user_id) AS stat
FROM ' . USERS_TABLE . '
WHERE user_type IN (' . USER_NORMAL . ',' . USER_FOUNDER . ')';
$result = $db->sql_query($sql);
set_config('num_users', (int) $db->sql_fetchfield('stat'), true);
$config->set('num_users', (int) $db->sql_fetchfield('stat'), false);
$db->sql_freeresult($result);
$sql = 'SELECT COUNT(attach_id) as stat
FROM ' . ATTACHMENTS_TABLE . '
WHERE is_orphan = 0';
$result = $db->sql_query($sql);
set_config('num_files', (int) $db->sql_fetchfield('stat'), true);
$config->set('num_files', (int) $db->sql_fetchfield('stat'), false);
$db->sql_freeresult($result);
$sql = 'SELECT SUM(filesize) as stat
FROM ' . ATTACHMENTS_TABLE . '
WHERE is_orphan = 0';
$result = $db->sql_query($sql);
set_config('upload_dir_size', (float) $db->sql_fetchfield('stat'), true);
$config->set('upload_dir_size', (float) $db->sql_fetchfield('stat'), false);
$db->sql_freeresult($result);
if (!function_exists('update_last_username'))
@@ -259,7 +259,7 @@ class acp_main
trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
}
set_config('board_startdate', time() - 1);
$config->set('board_startdate', time() - 1);
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_RESET_DATE');
if ($request->is_ajax())
@@ -664,7 +664,7 @@ class acp_main
// Fill dbms version if not yet filled
if (empty($config['dbms_version']))
{
set_config('dbms_version', $db->sql_server_info(true));
$config->set('dbms_version', $db->sql_server_info(true));
}
$this->tpl_name = 'acp_main';

8
phpBB/includes/acp/acp_search.php
View File

@@ -133,7 +133,7 @@ class acp_search
// only change config if anything was actually changed
if ($submit && ($config[$config_name] != $config_value))
{
set_config($config_name, $config_value);
$config->set($config_name, $config_value);
$updated = true;
}
}
@@ -157,7 +157,7 @@ class acp_search
{
if (!method_exists($search, 'init') || !($error = $search->init()))
{
set_config('search_type', $cfg_array['search_type']);
$config->set('search_type', $cfg_array['search_type']);
if (!$updated)
{
@@ -578,6 +578,8 @@ class acp_search
function save_state($state = false)
{
global $config;
if ($state)
{
$this->state = $state;
@@ -585,7 +587,7 @@ class acp_search
ksort($this->state);
set_config('search_indexing_state', implode(',', $this->state), true);
$config->set('search_indexing_state', implode(',', $this->state), true);
}
/**

2
phpBB/includes/acp/acp_send_statistics.php
View File

@@ -38,7 +38,7 @@ class acp_send_statistics
if (!isset($config['questionnaire_unique_id']))
{
$install_id = unique_id();
set_config('questionnaire_unique_id', $install_id);
$config->set('questionnaire_unique_id', $install_id);
}
else
{

5
phpBB/includes/acp/acp_styles.php
View File

@@ -32,6 +32,9 @@ class acp_styles
protected $styles_list_cols = 0;
protected $reserved_style_names = array('adm', 'admin', 'all');
/** @var \phpbb\config\config */
protected $config;
/** @var \phpbb\db\driver\driver_interface */
protected $db;
@@ -538,7 +541,7 @@ class acp_styles
{
trigger_error($this->user->lang['STYLE_DEFAULT_CHANGE_INACTIVE'] . adm_back_link($update_action), E_USER_WARNING);
}
set_config('default_style', $id);
$this->config->set('default_style', $id);
$this->cache->purge();
}