diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2004-02-11 18:27:00 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2004-02-11 18:27:00 +0000 |
| commit | 045028d5271825d1acf24aef051d6c30170568ec (patch) | |
| tree | 6ab9bb221e1b14c4cf12edddbf637c9bc0c9605f /phpBB/includes/functions_admin.php | |
| parent | 432a3823a047644b05967c7e6121d5090b1f0868 (diff) | |
| download | forums-045028d5271825d1acf24aef051d6c30170568ec.tar forums-045028d5271825d1acf24aef051d6c30170568ec.tar.gz forums-045028d5271825d1acf24aef051d6c30170568ec.tar.bz2 forums-045028d5271825d1acf24aef051d6c30170568ec.tar.xz forums-045028d5271825d1acf24aef051d6c30170568ec.zip | |
reportee_id for view_log and add_log
git-svn-id: file:///svn/phpbb/trunk@4824 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 609ea7938a..6309dda87d 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -1700,11 +1700,12 @@ function add_log() $args = func_get_args(); - $mode = array_shift($args); - $forum_id = ($mode == 'mod') ? intval(array_shift($args)) : ''; - $topic_id = ($mode == 'mod') ? intval(array_shift($args)) : ''; - $action = array_shift($args); - $data = (!sizeof($args)) ? '' : $db->sql_escape(serialize($args)); + $mode = array_shift($args); + $reportee_id = ($mode == 'user') ? intval(array_shift($args)) : ''; + $forum_id = ($mode == 'mod') ? intval(array_shift($args)) : ''; + $topic_id = ($mode == 'mod') ? intval(array_shift($args)) : ''; + $action = array_shift($args); + $data = (!sizeof($args)) ? '' : $db->sql_escape(serialize($args)); switch ($mode) { @@ -1718,6 +1719,11 @@ function add_log() VALUES (' . LOG_MOD . ', ' . $user->data['user_id'] . ", $forum_id, $topic_id, '$user->ip', " . time() . ", '$action', '$data')"; 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': $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')"; @@ -1731,7 +1737,7 @@ function add_log() 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; @@ -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"; + $censors = array(); + if ($user->optionget('viewcensors')) + { + obtain_word_list($censors); + } + switch ($mode) { case 'admin': @@ -1762,6 +1774,11 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id $sql_forum = ($forum_id) ? 'AND l.forum_id = ' . intval($forum_id) : ''; } break; + + case 'user': + $log_type = LOG_USERS; + $sql_forum = 'AND l.reportee_id = ' . intval($user_id); + break; case 'critical': $log_type = LOG_CRITICAL; @@ -1807,6 +1824,12 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id { 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); } } |