From b568eb4e67509a44bcafff68c580b65675cbd1d6 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Wed, 25 Mar 2015 14:56:15 -0500 Subject: [PATCH] Replace NOW() by api_get_utc_datetime() --- main/inc/lib/add_course.lib.inc.php | 41 ++++++++++++----------- main/inc/lib/stats.lib.inc.php | 4 +-- main/inc/lib/system_announcements.lib.php | 3 +- main/inc/lib/tracking.lib.php | 7 ++-- 4 files changed, 29 insertions(+), 26 deletions(-) diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php index a5de69e08b..e87db94b56 100755 --- a/main/inc/lib/add_course.lib.inc.php +++ b/main/inc/lib/add_course.lib.inc.php @@ -743,6 +743,7 @@ class AddCourse // Example material should be in the same language as the course is. $language_interface_original = $language_interface; $language_interface = $language; + $now = api_get_utc_datetime(); //Share folder Database::query( @@ -752,7 +753,7 @@ class AddCourse ); $example_doc_id = Database:: insert_id(); Database::query( - "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)" + "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,'$now','$now',$example_doc_id,'DocumentAdded',1,0,NULL,0)" ); //Chat folder @@ -763,7 +764,7 @@ class AddCourse ); $example_doc_id = Database:: insert_id(); Database::query( - "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)" + "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,'$now','$now',$example_doc_id,'DocumentAdded',1,0,NULL,0)" ); $sys_course_path = api_get_path(SYS_COURSE_PATH); @@ -786,7 +787,7 @@ class AddCourse ); $example_doc_id = Database:: insert_id(); Database::query( - "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)" + "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,'$now','$now',$example_doc_id,'DocumentAdded',1,0,NULL,0)" ); Database::query( @@ -796,7 +797,7 @@ class AddCourse ); $example_doc_id = Database:: insert_id(); Database::query( - "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)" + "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,'$now','$now',$example_doc_id,'DocumentAdded',1,0,NULL,0)" ); Database::query( @@ -806,7 +807,7 @@ class AddCourse ); $example_doc_id = Database:: insert_id(); Database::query( - "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)" + "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,'$now','$now',$example_doc_id,'DocumentAdded',1,0,NULL,0)" ); Database::query( @@ -816,7 +817,7 @@ class AddCourse ); $example_doc_id = Database:: insert_id(); Database::query( - "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)" + "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,'$now','$now',$example_doc_id,'DocumentAdded',1,0,NULL,0)" ); Database::query( @@ -826,7 +827,7 @@ class AddCourse ); $example_doc_id = Database:: insert_id(); Database::query( - "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)" + "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,'$now','$now',$example_doc_id,'DocumentAdded',1,0,NULL,0)" ); Database::query( @@ -836,7 +837,7 @@ class AddCourse ); $example_doc_id = Database:: insert_id(); Database::query( - "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)" + "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,'$now','$now',$example_doc_id,'DocumentAdded',1,0,NULL,0)" ); // FILL THE COURSE DOCUMENT WITH DEFAULT COURSE PICTURES @@ -962,7 +963,7 @@ class AddCourse ); $image_id = Database:: insert_id(); Database::query( - "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,NOW(),NOW(),$image_id,'DocumentAdded',1,0,NULL,0)" + "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,'$now','$now',$image_id,'DocumentAdded',1,0,NULL,0)" ); } } @@ -1003,7 +1004,7 @@ class AddCourse $example_cert_id = $image_id; } Database::query( - "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,NOW(),NOW(),$image_id,'DocumentAdded',1,0,NULL,1)" + "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id,'document',1,'$now','$now',$image_id,'DocumentAdded',1,0,NULL,1)" ); } } @@ -1023,7 +1024,7 @@ class AddCourse ); // We need to add the item properties too! $insert_id = Database:: insert_id(); - $sql = "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id, '" . TOOL_CALENDAR_EVENT . "',1,NOW(),NOW(),$insert_id,'AgendaAdded',1,0,NULL,1)"; + $sql = "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ($course_id, '" . TOOL_CALENDAR_EVENT . "',1,'$now','$now',$insert_id,'AgendaAdded',1,0,NULL,1)"; Database::query($sql); /* Links tool */ @@ -1037,7 +1038,7 @@ class AddCourse // We need to add the item properties too! $insert_id = Database:: insert_id(); $sql = "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) - VALUES ($course_id, '" . TOOL_LINK . "',1,NOW(),NOW(),$insert_id,'LinkAdded',1,0,NULL,1)"; + VALUES ($course_id, '" . TOOL_LINK . "',1,'$now','$now',$insert_id,'LinkAdded',1,0,NULL,1)"; Database::query($sql); $add_wikipedia_link_sql = "INSERT INTO $TABLETOOLLINK (c_id, url, title, description, category_id, display_order, on_homepage, target) @@ -1048,7 +1049,7 @@ class AddCourse // We need to add the item properties too! $insert_id = Database:: insert_id(); - $sql = "INSERT INTO $TABLEITEMPROPERTY (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('" . TOOL_LINK . "',1,NOW(),NOW(),$insert_id,'LinkAdded',1,0,NULL,1)"; + $sql = "INSERT INTO $TABLEITEMPROPERTY (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('" . TOOL_LINK . "',1,'$now','$now',$insert_id,'LinkAdded',1,0,NULL,1)"; Database::query($sql); /* Annoucement tool */ @@ -1058,13 +1059,13 @@ class AddCourse get_lang('AnnouncementExampleTitle') ) . "', '" . self::lang2db( get_lang('AnnouncementEx') - ) . "', NOW(), '1','0')"; + ) . "', '$now', '1','0')"; Database::query($sql); // We need to add the item properties too! $insert_id = Database:: insert_id(); $sql = "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) - VALUES ($course_id, '" . TOOL_ANNOUNCEMENT . "',1,NOW(),NOW(),$insert_id,'AnnouncementAdded',1,0,NULL,1)"; + VALUES ($course_id, '" . TOOL_ANNOUNCEMENT . "',1,'$now','$now',$insert_id,'AnnouncementAdded',1,0,NULL,1)"; Database::query($sql); /* Introduction text */ @@ -1156,7 +1157,7 @@ class AddCourse $insert_id = Database:: insert_id(); Database::query( "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) - VALUES ($course_id, 'forum_category',1,NOW(),NOW(),$insert_id,'ForumCategoryAdded',1,0,NULL,1)" + VALUES ($course_id, 'forum_category',1,'$now','$now',$insert_id,'ForumCategoryAdded',1,0,NULL,1)" ); Database::query( @@ -1168,19 +1169,19 @@ class AddCourse $insert_id = Database:: insert_id(); Database::query( "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) - VALUES ($course_id, '" . TOOL_FORUM . "', 1,NOW(),NOW(),$insert_id,'ForumAdded',1,0,NULL,1)" + VALUES ($course_id, '" . TOOL_FORUM . "', 1,'$now','$now',$insert_id,'ForumAdded',1,0,NULL,1)" ); Database::query( "INSERT INTO $TABLEFORUMTHREADS (c_id, thread_id, thread_title, forum_id, thread_replies, thread_poster_id, thread_poster_name, thread_views, thread_last_post, thread_date, locked, thread_qualify_max, session_id) VALUES ($course_id, 1, '" . self::lang2db( get_lang('ExampleThread') - ) . "', 1, 0, 1, '', 0, 1, NOW(), 0, 10, 0)" + ) . "', 1, 0, 1, '', 0, 1, '$now', 0, 10, 0)" ); $insert_id = Database:: insert_id(); Database::query( "INSERT INTO $TABLEITEMPROPERTY (c_id, tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) - VALUES ($course_id, 'forum_thread',1,NOW(),NOW(),$insert_id,'ForumThreadAdded',1,0,NULL,1)" + VALUES ($course_id, 'forum_thread',1,'$now','$now',$insert_id,'ForumThreadAdded',1,0,NULL,1)" ); Database::query( @@ -1188,7 +1189,7 @@ class AddCourse get_lang('ExampleThread') ) . "', '" . self::lang2db( get_lang('ExampleThreadContent') - ) . "', 1, 1, 1, '', NOW(), 0, 0, 1)" + ) . "', 1, 1, 1, '', '$now', 0, 0, 1)" ); /* Gradebook tool */ diff --git a/main/inc/lib/stats.lib.inc.php b/main/inc/lib/stats.lib.inc.php index 27c91234b5..560bb305ed 100755 --- a/main/inc/lib/stats.lib.inc.php +++ b/main/inc/lib/stats.lib.inc.php @@ -72,10 +72,10 @@ function decodeOpenInfos() { ignore_user_abort(1) ; // we take the last event id to prevent miss of some recorded event // only processed record have to be cleaned - + $now = api_get_utc_datetime(); $sql = "SELECT open_id FROM $TABLETRACK_OPEN - WHERE open_date <= NOW() + WHERE open_date <= '$now' ORDER BY open_id DESC LIMIT 1"; //$processBegin = StatsUtils::getOneResult($sql); diff --git a/main/inc/lib/system_announcements.lib.php b/main/inc/lib/system_announcements.lib.php index e2d7b9a1f1..5af4b465dc 100755 --- a/main/inc/lib/system_announcements.lib.php +++ b/main/inc/lib/system_announcements.lib.php @@ -32,11 +32,12 @@ class SystemAnnouncementManager $ann_group_db_ok =true; $groups_string = '('.implode($groups,',').')'; + $now = api_get_utc_datetime(); $sql = "SELECT *, DATE_FORMAT(date_start,'%d-%m-%Y %h:%i:%s') AS display_date" ." FROM $db_table" ." WHERE (lang='$user_selected_language'" ." OR lang IS NULL)" - ." AND ((NOW() BETWEEN date_start AND date_end) OR date_end='0000-00-00') "; + ." AND (('$now' BETWEEN date_start AND date_end) OR date_end='0000-00-00') "; switch ($visible) { case self::VISIBLE_GUEST : diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php index e200538828..3d92d9cfee 100755 --- a/main/inc/lib/tracking.lib.php +++ b/main/inc/lib/tracking.lib.php @@ -3297,10 +3297,10 @@ class Tracking $course_code = Database::escape_string($course_code); $session_id = intval($session_id); $tbl_stats_access = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_ACCESS); - + $now = api_get_utc_datetime(); $sql = "SELECT count(*) FROM $tbl_stats_access WHERE - DATE_SUB(NOW(),INTERVAL $last_days DAY) <= access_date AND + DATE_SUB('$now',INTERVAL $last_days DAY) <= access_date AND c_id = '$course_id' AND access_tool='".TOOL_CHAT."' AND access_session_id='$session_id' "; @@ -3436,6 +3436,7 @@ class Tracking $table_course_rel_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER); $tableCourse = Database :: get_main_table(TABLE_MAIN_COURSE); $inner = ''; + $now = api_get_utc_datetime(); if ($session_id!=0) { $inner = ' INNER JOIN '.$tbl_session_course_user.' session_course_user ON c.code = session_course_user.course_code @@ -3447,7 +3448,7 @@ class Tracking INNER JOIN '.$tableCourse.' c ON (c.id = stats_login.c_id) GROUP BY user_id - HAVING DATE_SUB( NOW(), INTERVAL '.$since.' DAY) > max_date '; + HAVING DATE_SUB( "' . $now . '", INTERVAL '.$since.' DAY) > max_date '; if ($since == 'never') { $sql = 'SELECT course_user.user_id