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

[ticket/10714] Remove dependency injection and use global instead

Browse Source 
This avoids loading functions_admin.php globally and was suggested by naderman

PHPBB3-10714
This commit is contained in:
Joas Schilling
2012-08-21 16:49:08 +02:00
parent d828ef93f2
commit d289bc13ac
3 changed files with 13 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
phpBB/includes/functions.php
View File

@@ -3357,29 +3357,20 @@ function parse_cfg_file($filename, $lines = false)
*/
function add_log()
{
// This is all just an ugly hack to add "Dependency Injection" to a function
// the only real code is the function call which maps this function to a method.
static $static_log = null;
global $phpbb_log;
$args = func_get_args();
$log = (isset($args[0])) ? $args[0] : false;
if ($log instanceof phpbb_log_interface)
{
$static_log = $log;
return true;
}
else if ($log === false)
if ($log === false)
{
return false;
}
$tmp_log = $static_log;
// no log class set, create a temporary one ourselves to keep backwards compatability
if ($tmp_log === null)
if ($phpbb_log === null)
{
$tmp_log = new phpbb_log(LOG_TABLE);
$phpbb_log = new phpbb_log(LOG_TABLE);
}
$mode = array_shift($args);
@@ -3407,7 +3398,7 @@ function add_log()
$user_id = (empty($user->data)) ? ANONYMOUS : $user->data['user_id'];
$user_ip = (empty($user->ip)) ? '' : $user->ip;
return $tmp_log->add($mode, $user_id, $user_ip, $log_operation, time(), $additional_data);
return $phpbb_log->add($mode, $user_id, $user_ip, $log_operation, time(), $additional_data);
}
/**

26
phpBB/includes/functions_admin.php
View File

@@ -2488,34 +2488,20 @@ function cache_moderators()
*/
function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC', $keywords = '')
{
// This is all just an ugly hack to add "Dependency Injection" to a function
// the only real code is the function call which maps this function to a method.
static $static_log = null;
if ($mode instanceof phpbb_log_interface)
{
$static_log = $mode;
return true;
}
else if ($mode === false)
{
return false;
}
$tmp_log = $static_log;
global $phpbb_log;
// no log class set, create a temporary one ourselves to keep backwards compatability
if ($tmp_log === null)
if ($phpbb_log === null)
{
$tmp_log = new phpbb_log(LOG_TABLE);
$phpbb_log = new phpbb_log(LOG_TABLE);
}
$count_logs = ($log_count !== false);
$log = $tmp_log->get_logs($mode, $count_logs, $limit, $offset, $forum_id, $topic_id, $user_id, $limit_days, $sort_by, $keywords);
$log_count = $tmp_log->get_log_count();
$log = $phpbb_log->get_logs($mode, $count_logs, $limit, $offset, $forum_id, $topic_id, $user_id, $limit_days, $sort_by, $keywords);
$log_count = $phpbb_log->get_log_count();
return $tmp_log->get_valid_offset();
return $phpbb_log->get_valid_offset();
}
/**