mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-05 15:16:16 +02:00
reportee_id for view_log and add_log
git-svn-id: file:///svn/phpbb/trunk@4824 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
432a3823a0
commit
045028d527
@ -1701,6 +1701,7 @@ function add_log()
|
|||||||
$args = func_get_args();
|
$args = func_get_args();
|
||||||
|
|
||||||
$mode = array_shift($args);
|
$mode = array_shift($args);
|
||||||
|
$reportee_id = ($mode == 'user') ? intval(array_shift($args)) : '';
|
||||||
$forum_id = ($mode == 'mod') ? intval(array_shift($args)) : '';
|
$forum_id = ($mode == 'mod') ? intval(array_shift($args)) : '';
|
||||||
$topic_id = ($mode == 'mod') ? intval(array_shift($args)) : '';
|
$topic_id = ($mode == 'mod') ? intval(array_shift($args)) : '';
|
||||||
$action = array_shift($args);
|
$action = array_shift($args);
|
||||||
@ -1718,6 +1719,11 @@ function add_log()
|
|||||||
VALUES (' . LOG_MOD . ', ' . $user->data['user_id'] . ", $forum_id, $topic_id, '$user->ip', " . time() . ", '$action', '$data')";
|
VALUES (' . LOG_MOD . ', ' . $user->data['user_id'] . ", $forum_id, $topic_id, '$user->ip', " . time() . ", '$action', '$data')";
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'user':
|
||||||
|
$sql = 'INSERT INTO ' . LOG_TABLE . ' (log_type, user_id, reportee_id, log_ip, log_time, log_operation, log_data)
|
||||||
|
VALUES (' . LOG_USERS . ', ' . $user->data['user_id'] . ", $reportee_id, '$user->ip', " . time() . ", '$action', '$data')";
|
||||||
|
break;
|
||||||
|
|
||||||
case 'critical':
|
case 'critical':
|
||||||
$sql = 'INSERT INTO ' . LOG_TABLE . ' (log_type, user_id, log_ip, log_time, log_operation, log_data)
|
$sql = 'INSERT INTO ' . LOG_TABLE . ' (log_type, user_id, log_ip, log_time, log_operation, log_data)
|
||||||
VALUES (' . LOG_CRITICAL . ', ' . $user->data['user_id'] . ", '$user->ip', " . time() . ", '$action', '$data')";
|
VALUES (' . LOG_CRITICAL . ', ' . $user->data['user_id'] . ", '$user->ip', " . time() . ", '$action', '$data')";
|
||||||
@ -1731,7 +1737,7 @@ function add_log()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC')
|
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')
|
||||||
{
|
{
|
||||||
global $db, $user, $auth, $phpEx, $SID;
|
global $db, $user, $auth, $phpEx, $SID;
|
||||||
|
|
||||||
@ -1739,6 +1745,12 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
|
|||||||
|
|
||||||
$profile_url = (defined('IN_ADMIN')) ? "admin_users.$phpEx$SID" : "memberlist.$phpEx$SID&mode=viewprofile";
|
$profile_url = (defined('IN_ADMIN')) ? "admin_users.$phpEx$SID" : "memberlist.$phpEx$SID&mode=viewprofile";
|
||||||
|
|
||||||
|
$censors = array();
|
||||||
|
if ($user->optionget('viewcensors'))
|
||||||
|
{
|
||||||
|
obtain_word_list($censors);
|
||||||
|
}
|
||||||
|
|
||||||
switch ($mode)
|
switch ($mode)
|
||||||
{
|
{
|
||||||
case 'admin':
|
case 'admin':
|
||||||
@ -1763,6 +1775,11 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 'user':
|
||||||
|
$log_type = LOG_USERS;
|
||||||
|
$sql_forum = 'AND l.reportee_id = ' . intval($user_id);
|
||||||
|
break;
|
||||||
|
|
||||||
case 'critical':
|
case 'critical':
|
||||||
$log_type = LOG_CRITICAL;
|
$log_type = LOG_CRITICAL;
|
||||||
$sql_forum = '';
|
$sql_forum = '';
|
||||||
@ -1807,6 +1824,12 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
|
|||||||
{
|
{
|
||||||
foreach ($log_data_ary as $log_data)
|
foreach ($log_data_ary as $log_data)
|
||||||
{
|
{
|
||||||
|
if (sizeof($censors) && $user->optionget('viewcensors'))
|
||||||
|
{
|
||||||
|
$log_data = preg_replace($censors['match'], $censors['replace'], $log_data);
|
||||||
|
}
|
||||||
|
$log_data = str_replace("\n", '<br />', $log_data);
|
||||||
|
|
||||||
$log[$i]['action'] = preg_replace('#%s#', $log_data, $log[$i]['action'], 1);
|
$log[$i]['action'] = preg_replace('#%s#', $log_data, $log[$i]['action'], 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user