makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10714] Use keys for the log data instead of requiring a special order

Browse source 
PHPBB3-10714
This commit is contained in:
Joas Schilling 2012-03-18 13:47:24 +01:00
parent 1539ad7ebe
commit cff15ec307
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/includes/functions.php
View file

@ -3392,14 +3392,11 @@ function add_log()
case 'critical': case 'critical':
break; break;
case 'mod': case 'mod':
// forum_id $additional_data['forum_id'] = array_shift($args);
$additional_data[] = array_shift($args); $additional_data['topic_id'] = array_shift($args);
// topic_id
$additional_data[] = array_shift($args);
break; break;
case 'user': case 'user':
// reportee_id $additional_data['reportee_id'] = array_shift($args);
$additional_data[] = array_shift($args);
break; break;
default: default:
/** /**

13
phpBB/includes/log/log.php
View file

@ -115,18 +115,25 @@ class phpbb_log implements phpbb_log_interface
break; break;
case 'mod': case 'mod':
$forum_id = (int) $additional_data['forum_id'];
unset($additional_data['forum_id']);
$topic_id = (int) $additional_data['topic_id'];
unset($additional_data['topic_id']);
$sql_ary += array( $sql_ary += array(
'log_type' => LOG_MOD, 'log_type' => LOG_MOD,
'forum_id' => intval(array_shift($additional_data)), 'forum_id' => $forum_id,
'topic_id' => intval(array_shift($additional_data)), 'topic_id' => $topic_id,
'log_data' => (!sizeof($additional_data)) ? '' : serialize($additional_data), 'log_data' => (!sizeof($additional_data)) ? '' : serialize($additional_data),
); );
break; break;
case 'user': case 'user':
$reportee_id = (int) $additional_data['reportee_id'];
unset($additional_data['reportee_id']);
$sql_ary += array( $sql_ary += array(
'log_type' => LOG_USERS, 'log_type' => LOG_USERS,
'reportee_id' => intval(array_shift($additional_data)), 'reportee_id' => $reportee_id,
'log_data' => (!sizeof($additional_data)) ? '' : serialize($additional_data), 'log_data' => (!sizeof($additional_data)) ? '' : serialize($additional_data),
); );
break; break;