diff --git a/tests/log/fixtures/delete_log.xml b/tests/log/fixtures/delete_log.xml index 4b2402102e..393c686f0c 100644 --- a/tests/log/fixtures/delete_log.xml +++ b/tests/log/fixtures/delete_log.xml @@ -6,6 +6,7 @@ user_id forum_id topic_id + post_id reportee_id log_ip log_time @@ -18,6 +19,7 @@ 0 0 0 + 0 127.0.0.1 1 LOG_INSTALL_INSTALLED @@ -30,6 +32,7 @@ 0 0 0 + 0 127.0.0.1 1 LOG_KEY_NOT_EXISTS @@ -42,6 +45,7 @@ 0 0 0 + 0 127.0.0.1 1 LOG_CRITICAL @@ -54,6 +58,7 @@ 12 34 0 + 0 127.0.0.1 1 LOG_MOD @@ -66,6 +71,7 @@ 12 45 0 + 0 127.0.0.1 1 LOG_MOD @@ -78,6 +84,7 @@ 23 56 0 + 0 127.0.0.1 1 LOG_MOD @@ -90,6 +97,7 @@ 12 45 0 + 0 127.0.0.1 1 LOG_MOD2 @@ -101,6 +109,7 @@ 1 0 0 + 0 2 127.0.0.1 1 @@ -113,6 +122,7 @@ 1 0 0 + 0 1 127.0.0.1 1 @@ -126,6 +136,7 @@ 0 0 0 + 0 127.0.0.1 1 LOG_SINGULAR_PLURAL @@ -138,6 +149,7 @@ 15 3 0 + 0 127.0.0.1 1 LOG_MOD3 @@ -150,6 +162,7 @@ 13 0 0 + 0 127.0.0.1 1 @@ -162,6 +175,7 @@ 14 0 0 + 0 127.0.0.1 1 @@ -174,6 +188,7 @@ 0 0 0 + 0 127.0.0.1 1 @@ -186,6 +201,7 @@ 0 0 0 + 0 127.0.0.1 1 diff --git a/tests/log/fixtures/empty_log.xml b/tests/log/fixtures/empty_log.xml index 261b6a622a..47fd639b17 100644 --- a/tests/log/fixtures/empty_log.xml +++ b/tests/log/fixtures/empty_log.xml @@ -6,6 +6,7 @@ user_id forum_id topic_id + post_id reportee_id log_ip log_time diff --git a/tests/log/fixtures/full_log.xml b/tests/log/fixtures/full_log.xml index ef35884444..5b9ded9ffb 100644 --- a/tests/log/fixtures/full_log.xml +++ b/tests/log/fixtures/full_log.xml @@ -6,6 +6,7 @@ user_id forum_id topic_id + post_id reportee_id log_ip log_time @@ -18,6 +19,7 @@ 0 0 0 + 0 127.0.0.1 1 LOG_INSTALL_INSTALLED @@ -30,6 +32,7 @@ 0 0 0 + 0 127.0.0.1 1 LOG_KEY_NOT_EXISTS @@ -42,6 +45,7 @@ 0 0 0 + 0 127.0.0.1 1 LOG_CRITICAL @@ -54,6 +58,7 @@ 12 34 0 + 0 127.0.0.1 1 LOG_MOD @@ -66,6 +71,7 @@ 12 45 0 + 0 127.0.0.1 1 LOG_MOD @@ -78,6 +84,7 @@ 23 56 0 + 0 127.0.0.1 1 LOG_MOD @@ -90,6 +97,7 @@ 12 45 0 + 0 127.0.0.1 1 LOG_MOD2 @@ -101,6 +109,7 @@ 1 0 0 + 0 2 127.0.0.1 1 @@ -113,6 +122,7 @@ 1 0 0 + 0 1 127.0.0.1 1 @@ -126,6 +136,7 @@ 0 0 0 + 0 127.0.0.1 1 LOG_SINGULAR_PLURAL @@ -138,6 +149,7 @@ 15 3 0 + 0 127.0.0.1 1 LOG_MOD3 diff --git a/tests/log/function_view_log_test.php b/tests/log/function_view_log_test.php index 02e0b3912f..81b1f4a78c 100644 --- a/tests/log/function_view_log_test.php +++ b/tests/log/function_view_log_test.php @@ -46,6 +46,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'time' => 1, 'forum_id' => 0, 'topic_id' => 0, + 'post_id' => 0, 'viewforum' => '', 'action' => 'LOG_INSTALL_INSTALLED 3.1.0-dev', @@ -65,6 +66,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'time' => 1, 'forum_id' => 0, 'topic_id' => 0, + 'post_id' => 0, 'viewforum' => '', 'action' => '{LOG KEY NOT EXISTS}
additional_data', @@ -84,6 +86,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'time' => 1, 'forum_id' => 0, 'topic_id' => 0, + 'post_id' => 0, 'viewforum' => '', 'action' => '{LOG CRITICAL}
critical data', @@ -103,10 +106,12 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'time' => 1, 'forum_id' => 12, 'topic_id' => 34, + 'post_id' => 0, 'viewforum' => '', 'action' => '{LOG MOD}', 'viewtopic' => '', + 'viewpost' => '', 'viewlogs' => '', ), 5 => array( @@ -124,10 +129,12 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'time' => 1, 'forum_id' => 12, 'topic_id' => 45, + 'post_id' => 0, 'viewforum' => '', 'action' => '{LOG MOD}', 'viewtopic' => '', + 'viewpost' => '', 'viewlogs' => '', ), 6 => array( @@ -145,10 +152,12 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'time' => 1, 'forum_id' => 23, 'topic_id' => 56, + 'post_id' => 0, 'viewforum' => append_sid("phpBB/viewforum.$phpEx", 'f=23'), 'action' => '{LOG MOD}', 'viewtopic' => append_sid("phpBB/viewtopic.$phpEx", 'f=23&t=56'), + 'viewpost' => '', 'viewlogs' => append_sid("phpBB/mcp.$phpEx", 'i=logs&mode=topic_logs&t=56'), ), 7 => array( @@ -166,10 +175,12 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'time' => 1, 'forum_id' => 12, 'topic_id' => 45, + 'post_id' => 0, 'viewforum' => '', 'action' => 'LOG_MOD2', 'viewtopic' => '', + 'viewpost' => '', 'viewlogs' => '', ), 8 => array( @@ -187,6 +198,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'time' => 1, 'forum_id' => 0, 'topic_id' => 0, + 'post_id' => 0, 'viewforum' => '', 'action' => 'LOG_USER admin', @@ -206,6 +218,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'time' => 1, 'forum_id' => 0, 'topic_id' => 0, + 'post_id' => 0, 'viewforum' => '', 'action' => 'LOG_USER guest', @@ -225,6 +238,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'time' => 1, 'forum_id' => 0, 'topic_id' => 0, + 'post_id' => 0, 'viewforum' => '', 'action' => 'LOG_SINGULAR_PLURAL 2', @@ -244,10 +258,12 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'time' => 1, 'forum_id' => 15, 'topic_id' => 3, + 'post_id' => 0, 'viewforum' => '', 'action' => 'LOG_MOD3 guest ', 'viewtopic' => '', + 'viewpost' => '', 'viewlogs' => '', ), );