From e21437d5a29b0861c38c480b9cef0a4996752d46 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Tue, 30 Apr 2024 08:52:47 +0200 Subject: [PATCH] Internal: Update tests/scripts/ to ensure right path for global.inc.php and exit is always present. Scripts are not yet supported in C2. --- .../scripts/build_translation_request_file.php | 4 ++-- tests/scripts/check_extra_fields.php | 2 +- tests/scripts/check_users_in_csv_file.php | 2 +- tests/scripts/course2session.php | 2 +- ...delete_deleted_exercises_with_questions.php | 2 +- tests/scripts/delete_items_from_csv.php | 4 ++-- tests/scripts/delete_old_courses.php | 4 ++-- .../delete_old_courses_even_not_empty.php | 4 ++-- tests/scripts/delete_old_tasks.php | 8 ++++---- tests/scripts/delete_orphan_questions.php | 10 +++++----- tests/scripts/delete_users_from_csv.php | 2 +- .../detect_deleted_visible_documents.php | 2 +- tests/scripts/disable_user_conditions.php | 1 + tests/scripts/edit_course_html_files.php | 3 ++- tests/scripts/fix_course_index.php | 1 + tests/scripts/fix_course_spent_time.php | 18 +++++++++--------- tests/scripts/fix_documents_path.php | 2 +- tests/scripts/fix_duplicate_settings.php | 4 ++-- tests/scripts/fix_exercise_score_in_lp.php | 2 +- tests/scripts/fix_group_items_with_old_db.php | 7 ++++--- tests/scripts/fix_lp_calendar.php | 4 ++-- tests/scripts/fix_lp_id_to_iid.php | 2 +- tests/scripts/fix_lp_id_to_iid_v2.php | 2 +- tests/scripts/fix_lp_items_not_found.php | 2 +- tests/scripts/fix_migrations_1.9.x_1.10.0.php | 2 +- tests/scripts/fix_mimetex.php | 2 +- tests/scripts/fix_restored_learnpaths.php | 2 +- tests/scripts/fix_student_publication_id.php | 2 +- tests/scripts/fix_user_id.php | 3 ++- tests/scripts/insert_session_fields.php | 4 ++-- tests/scripts/insert_sessions_categories.php | 3 ++- tests/scripts/kill_all_queries.php | 2 +- tests/scripts/login_as_admin.php | 2 +- tests/scripts/migrate_item_property.php | 4 ++-- tests/scripts/move_users.php | 2 +- tests/scripts/multi_url_conversion.php | 4 ++-- tests/scripts/restore_deleted_documents.php | 2 +- tests/scripts/settings2csv.php | 2 +- tests/scripts/switch_files_to_gettext.php | 6 +++--- .../synchronize_user_base_from_ldap.php | 16 ++++++++-------- tests/scripts/update_user_extra_field.php | 2 +- tests/scripts/userfields_to_groups.php | 3 ++- tests/scripts/users_no_course.php | 2 +- tests/scripts/video.php | 2 +- tests/scripts/wipe-out.php | 4 ++-- 45 files changed, 86 insertions(+), 79 deletions(-) diff --git a/tests/scripts/build_translation_request_file.php b/tests/scripts/build_translation_request_file.php index 9d823c2e6d..f9defe95b9 100755 --- a/tests/scripts/build_translation_request_file.php +++ b/tests/scripts/build_translation_request_file.php @@ -7,8 +7,8 @@ /** * Includes and declarations */ -die(); -require_once '../../main/inc/global.inc.php'; +exit; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; $path = api_get_path(SYS_LANG_PATH); $referenceLanguage = 'english'; $language = 'german'; diff --git a/tests/scripts/check_extra_fields.php b/tests/scripts/check_extra_fields.php index d0957bde15..d9660f501e 100644 --- a/tests/scripts/check_extra_fields.php +++ b/tests/scripts/check_extra_fields.php @@ -9,7 +9,7 @@ exit; -require_once __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; $em = Database::getManager(); $repo = $em->getRepository('ChamiloCoreBundle:ExtraField'); diff --git a/tests/scripts/check_users_in_csv_file.php b/tests/scripts/check_users_in_csv_file.php index 9611cf3adc..12740a2cba 100644 --- a/tests/scripts/check_users_in_csv_file.php +++ b/tests/scripts/check_users_in_csv_file.php @@ -3,7 +3,7 @@ exit; -require_once __DIR__.'/../inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; api_protect_admin_script(); $file = ''; diff --git a/tests/scripts/course2session.php b/tests/scripts/course2session.php index 9c4b96b813..1976cdb583 100644 --- a/tests/scripts/course2session.php +++ b/tests/scripts/course2session.php @@ -9,7 +9,7 @@ */ // comment exit statement before executing exit; -require __DIR__ . '/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; $debug = 1; // Who will be the general coach assigned to all sessions created? diff --git a/tests/scripts/delete_deleted_exercises_with_questions.php b/tests/scripts/delete_deleted_exercises_with_questions.php index cc68e4eece..9bb391bc73 100644 --- a/tests/scripts/delete_deleted_exercises_with_questions.php +++ b/tests/scripts/delete_deleted_exercises_with_questions.php @@ -3,7 +3,7 @@ exit; -require_once __DIR__ . '/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; $sql = 'SELECT iid, c_id, title FROM c_quiz diff --git a/tests/scripts/delete_items_from_csv.php b/tests/scripts/delete_items_from_csv.php index ed7379f48d..d862043110 100644 --- a/tests/scripts/delete_items_from_csv.php +++ b/tests/scripts/delete_items_from_csv.php @@ -3,7 +3,7 @@ exit; -require_once __DIR__ . '/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; $file = 'delete.csv'; if (!file_exists($file)) { @@ -58,4 +58,4 @@ foreach ($data as $row) { } $counter++; -} \ No newline at end of file +} diff --git a/tests/scripts/delete_old_courses.php b/tests/scripts/delete_old_courses.php index 93f79664cb..4cc4878ac3 100644 --- a/tests/scripts/delete_old_courses.php +++ b/tests/scripts/delete_old_courses.php @@ -17,7 +17,7 @@ exit; $creation = '2014-01-01'; $access = '2014-07-01'; -require_once '../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; if (PHP_SAPI !== 'cli') { die('This script can only be executed from the command line'); @@ -51,7 +51,7 @@ if (!empty($items)) { echo('rm -rf '.__DIR__.'/../../archive/'.$item['directory'].'_*').PHP_EOL; exec('rm -rf '.__DIR__.'/../../archive/'.$item['directory'].'_*'); // The normal procedure also created a database dump, but it is - // stored in the course folder, so no issue there... + // stored in the course folder, so no issue there... if (substr($size, 0, 4) == '160K') { $total += 160; } diff --git a/tests/scripts/delete_old_courses_even_not_empty.php b/tests/scripts/delete_old_courses_even_not_empty.php index 571c74cebd..84b1e19fa5 100644 --- a/tests/scripts/delete_old_courses_even_not_empty.php +++ b/tests/scripts/delete_old_courses_even_not_empty.php @@ -7,7 +7,7 @@ exit; -require_once '../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; if (PHP_SAPI !== 'cli') { die('This script can only be executed from the command line'); @@ -45,7 +45,7 @@ if (!empty($items)) { echo('rm -rf '.__DIR__.'/../../archive/'.$item['directory'].'_*').PHP_EOL; exec('rm -rf '.__DIR__.'/../../archive/'.$item['directory'].'_*'); // The normal procedure also created a database dump, but it is - // stored in the course folder, so no issue there... + // stored in the course folder, so no issue there... if (substr($size, 3, 1) == 'K') { $total += substr($size, 0, 3); } diff --git a/tests/scripts/delete_old_tasks.php b/tests/scripts/delete_old_tasks.php index e41cd962b8..e3a7f62ff8 100644 --- a/tests/scripts/delete_old_tasks.php +++ b/tests/scripts/delete_old_tasks.php @@ -11,12 +11,12 @@ * @author Percy Santiago * @author Yannick Warnier */ -exit(); //remove this line to execute from the command line +exit; //remove this line to execute from the command line if (PHP_SAPI !== 'cli') { die('This script can only be executed from the command line'); } -require __DIR__.'/../../main/inc/conf/configuration.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; // Dates $expiryDate = '2015-06-01'; //session start date must be < to be considered @@ -51,8 +51,8 @@ echo "[".time()."] Found $countSessions sessions between $fromDate and $expiryDa while ($session = mysql_fetch_assoc($res)) { $sql2 = "SELECT c.id AS cid, c.code as ccode, c.directory as cdir - FROM course c, session_rel_course s - WHERE s.id_session = ".$session['id']." + FROM course c, session_rel_course s + WHERE s.id_session = ".$session['id']." AND s.course_code = c.code"; $res2 = mysql_query($sql2, $conexion); //Database::query($sql2); diff --git a/tests/scripts/delete_orphan_questions.php b/tests/scripts/delete_orphan_questions.php index 27291bbe52..d3fb336e16 100644 --- a/tests/scripts/delete_orphan_questions.php +++ b/tests/scripts/delete_orphan_questions.php @@ -3,11 +3,11 @@ exit; -require_once __DIR__ . '/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; -$sql = 'SELECT iid, c_id, question - FROM c_quiz_question - WHERE iid not in (SELECT question_id from c_quiz_rel_question) +$sql = 'SELECT iid, c_id, question + FROM c_quiz_question + WHERE iid not in (SELECT question_id from c_quiz_rel_question) ORDER BY iid'; $result = Database::query($sql); @@ -23,4 +23,4 @@ foreach ($data as $row) { } echo 'Deleting question '.$counter.'/'.$totalQuestions.' - #'.$row['iid'].PHP_EOL; $counter++; -} \ No newline at end of file +} diff --git a/tests/scripts/delete_users_from_csv.php b/tests/scripts/delete_users_from_csv.php index 00afbdb2f3..526dac4f98 100644 --- a/tests/scripts/delete_users_from_csv.php +++ b/tests/scripts/delete_users_from_csv.php @@ -2,7 +2,7 @@ /* For licensing terms, see /license.txt */ exit; -require __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; api_protect_admin_script(); // Define origin and destination courses' code diff --git a/tests/scripts/detect_deleted_visible_documents.php b/tests/scripts/detect_deleted_visible_documents.php index 18f6e764bc..cf86712fd6 100644 --- a/tests/scripts/detect_deleted_visible_documents.php +++ b/tests/scripts/detect_deleted_visible_documents.php @@ -5,7 +5,7 @@ */ exit; -require __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; api_protect_admin_script(); // Define origin and destination courses' code diff --git a/tests/scripts/disable_user_conditions.php b/tests/scripts/disable_user_conditions.php index 91642f807b..78c5c7c56a 100644 --- a/tests/scripts/disable_user_conditions.php +++ b/tests/scripts/disable_user_conditions.php @@ -16,6 +16,7 @@ * than 6 months then deactivate his account and send an email to the learner. * */ +exit; require_once __DIR__.'/../../public/main/inc/global.inc.php'; $senderId = api_get_setting('platform.disable_user_conditions_sender_id'); diff --git a/tests/scripts/edit_course_html_files.php b/tests/scripts/edit_course_html_files.php index 6aa3c15642..ffc8951767 100644 --- a/tests/scripts/edit_course_html_files.php +++ b/tests/scripts/edit_course_html_files.php @@ -11,7 +11,8 @@ * need to move it to an executable folder and change the first require. * @author Yannick Warnier */ -require __DIR__.'/../../main/inc/global.inc.php'; +exit; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; api_protect_admin_script(); // Search string diff --git a/tests/scripts/fix_course_index.php b/tests/scripts/fix_course_index.php index 1cd21c48ab..27283e35da 100644 --- a/tests/scripts/fix_course_index.php +++ b/tests/scripts/fix_course_index.php @@ -11,6 +11,7 @@ * - Check the results in one index.php file * - Delete this file */ +exit; if (PHP_SAPI != 'cli') { die('This script can only be launched from the command line'); } diff --git a/tests/scripts/fix_course_spent_time.php b/tests/scripts/fix_course_spent_time.php index d195601f75..4a570abe8c 100644 --- a/tests/scripts/fix_course_spent_time.php +++ b/tests/scripts/fix_course_spent_time.php @@ -8,7 +8,7 @@ */ exit; -require_once __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; $maxSeconds = 10 * 60 * 60; // Check records higher than X hours $addSecondsToLogin = 2 * 60 * 60; // Update this abusive records with X hours @@ -17,14 +17,14 @@ $sendMessage = true; $userId = 1; // User id that will receive a report $update = false; // Update and fix the record -$sql = "SELECT - course_access_id, - counter, - UNIX_TIMESTAMP(logout_course_date) - UNIX_TIMESTAMP(login_course_date) diff, - login_course_date, - logout_course_date - FROM track_e_course_access - WHERE UNIX_TIMESTAMP(logout_course_date) > UNIX_TIMESTAMP(login_course_date) +$sql = "SELECT + course_access_id, + counter, + UNIX_TIMESTAMP(logout_course_date) - UNIX_TIMESTAMP(login_course_date) diff, + login_course_date, + logout_course_date + FROM track_e_course_access + WHERE UNIX_TIMESTAMP(logout_course_date) > UNIX_TIMESTAMP(login_course_date) ORDER by diff DESC LIMIT $limit "; diff --git a/tests/scripts/fix_documents_path.php b/tests/scripts/fix_documents_path.php index 916fac6994..a138d2bde0 100644 --- a/tests/scripts/fix_documents_path.php +++ b/tests/scripts/fix_documents_path.php @@ -19,7 +19,7 @@ exit; -require_once __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; /*$test = ' https://example.fr/../../../../../../../LOLOS/CHAMILO/document/Chamilo/Fonctionalite_de_groupe.html diff --git a/tests/scripts/fix_duplicate_settings.php b/tests/scripts/fix_duplicate_settings.php index edeeedb13f..c3345fa654 100644 --- a/tests/scripts/fix_duplicate_settings.php +++ b/tests/scripts/fix_duplicate_settings.php @@ -4,9 +4,9 @@ * Remove the current_settings duplicates from migration 1.9.x to 1.10.x */ -//exit; +exit; -require_once __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; //api_protect_admin_script(); diff --git a/tests/scripts/fix_exercise_score_in_lp.php b/tests/scripts/fix_exercise_score_in_lp.php index 14c61d7c26..cd66b59998 100644 --- a/tests/scripts/fix_exercise_score_in_lp.php +++ b/tests/scripts/fix_exercise_score_in_lp.php @@ -9,7 +9,7 @@ exit; -require_once '../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; api_protect_admin_script(); diff --git a/tests/scripts/fix_group_items_with_old_db.php b/tests/scripts/fix_group_items_with_old_db.php index a4e63be259..2ff5198875 100644 --- a/tests/scripts/fix_group_items_with_old_db.php +++ b/tests/scripts/fix_group_items_with_old_db.php @@ -21,10 +21,11 @@ /** * Context initialization */ +exit; if (PHP_SAPI != 'cli') { die('This script can only be executed from the command line'); } -require __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; /** * Old database configuration @@ -83,7 +84,7 @@ foreach ($oldDBH->query($sqlOld) as $oldRow) { $sqlNew = "SELECT iid, to_group_id FROM c_item_property WHERE c_id = ".$oldRow['c_id']. $sessionSubSelect. - " AND tool = '".$oldRow['tool']."' + " AND tool = '".$oldRow['tool']."' AND ref = ".$oldRow['ref']; //echo trim(str_replace("\n", '', $sqlNew)).PHP_EOL; @@ -173,4 +174,4 @@ function getOldGroupsByCourse() { } } return $courses; -} \ No newline at end of file +} diff --git a/tests/scripts/fix_lp_calendar.php b/tests/scripts/fix_lp_calendar.php index d954f1a056..e2721d3a24 100644 --- a/tests/scripts/fix_lp_calendar.php +++ b/tests/scripts/fix_lp_calendar.php @@ -1,7 +1,7 @@ get_handler_field_info_by_field_variable('calendar'); diff --git a/tests/scripts/fix_lp_id_to_iid.php b/tests/scripts/fix_lp_id_to_iid.php index f365743ff0..b5934d3494 100644 --- a/tests/scripts/fix_lp_id_to_iid.php +++ b/tests/scripts/fix_lp_id_to_iid.php @@ -7,7 +7,7 @@ exit; -require_once '../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; /** @var int $courseId */ $onlyCourseId = 0; diff --git a/tests/scripts/fix_lp_id_to_iid_v2.php b/tests/scripts/fix_lp_id_to_iid_v2.php index 88f5b753c8..2caf6368fd 100644 --- a/tests/scripts/fix_lp_id_to_iid_v2.php +++ b/tests/scripts/fix_lp_id_to_iid_v2.php @@ -7,7 +7,7 @@ exit; -require_once '../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; /** @var int $courseId */ $onlyCourseId = 0; diff --git a/tests/scripts/fix_lp_items_not_found.php b/tests/scripts/fix_lp_items_not_found.php index 38270abba0..e505c1937d 100644 --- a/tests/scripts/fix_lp_items_not_found.php +++ b/tests/scripts/fix_lp_items_not_found.php @@ -9,7 +9,7 @@ exit; -require_once '../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; /** @var The course id $courseId */ $courseId = 0; diff --git a/tests/scripts/fix_migrations_1.9.x_1.10.0.php b/tests/scripts/fix_migrations_1.9.x_1.10.0.php index 9b70d72fee..f38356e761 100755 --- a/tests/scripts/fix_migrations_1.9.x_1.10.0.php +++ b/tests/scripts/fix_migrations_1.9.x_1.10.0.php @@ -6,7 +6,7 @@ */ exit; -require_once __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; api_protect_admin_script(); diff --git a/tests/scripts/fix_mimetex.php b/tests/scripts/fix_mimetex.php index 5d742d77db..66264a9ce5 100644 --- a/tests/scripts/fix_mimetex.php +++ b/tests/scripts/fix_mimetex.php @@ -3,7 +3,7 @@ exit; -require_once __DIR__ . '/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; $sql = 'SELECT iid, id, question, c_id FROM c_quiz_question diff --git a/tests/scripts/fix_restored_learnpaths.php b/tests/scripts/fix_restored_learnpaths.php index b4293a7de0..bd727c886c 100644 --- a/tests/scripts/fix_restored_learnpaths.php +++ b/tests/scripts/fix_restored_learnpaths.php @@ -7,7 +7,7 @@ use Chamilo\CourseBundle\Entity\CLp; use Doctrine\ORM\Query\Expr\Join; use Chamilo\CourseBundle\Entity\CTool; -require_once __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; $em = Database::getManager(); diff --git a/tests/scripts/fix_student_publication_id.php b/tests/scripts/fix_student_publication_id.php index fd31b433f1..5d62da6b6d 100644 --- a/tests/scripts/fix_student_publication_id.php +++ b/tests/scripts/fix_student_publication_id.php @@ -6,7 +6,7 @@ if (PHP_SAPI != 'cli') { die('This script can only be launched from the command line'); } -require_once __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; require_once api_get_path(SYS_CODE_PATH).'install/install.lib.php'; diff --git a/tests/scripts/fix_user_id.php b/tests/scripts/fix_user_id.php index a5919e7688..2f3dac5527 100644 --- a/tests/scripts/fix_user_id.php +++ b/tests/scripts/fix_user_id.php @@ -3,10 +3,11 @@ /** * Temporary fix to set user.user_id to the same as user.id */ +exit; if (PHP_SAPI != 'cli') { die('This script can only be executed from the command line'); } -require __DIR__.'/../../main/inc/conf/configuration.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; $dbh = mysql_connect( $_configuration['db_host'], diff --git a/tests/scripts/insert_session_fields.php b/tests/scripts/insert_session_fields.php index 8436021a29..71fc0a8849 100644 --- a/tests/scripts/insert_session_fields.php +++ b/tests/scripts/insert_session_fields.php @@ -3,9 +3,9 @@ * This script insert session extra fields */ -//exit; +exit; -require_once '../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; api_protect_admin_script(); diff --git a/tests/scripts/insert_sessions_categories.php b/tests/scripts/insert_sessions_categories.php index ce52008222..91e24a8e99 100644 --- a/tests/scripts/insert_sessions_categories.php +++ b/tests/scripts/insert_sessions_categories.php @@ -3,7 +3,8 @@ /** * This script generates four session categories. */ -require_once '../../main/inc/global.inc.php'; +exit; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; api_protect_admin_script(); $accessUrlId = api_get_current_access_url_id(); diff --git a/tests/scripts/kill_all_queries.php b/tests/scripts/kill_all_queries.php index 2bc0076f9e..c97c50643d 100644 --- a/tests/scripts/kill_all_queries.php +++ b/tests/scripts/kill_all_queries.php @@ -10,7 +10,7 @@ * should be able to quickly restart your database. */ exit; -require_once '../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; $result = Database::query("SHOW FULL PROCESSLIST"); while ($row=Database::fetch_array($result)) { $process_id=$row["Id"]; diff --git a/tests/scripts/login_as_admin.php b/tests/scripts/login_as_admin.php index a43d6b8be8..1dcba2f913 100644 --- a/tests/scripts/login_as_admin.php +++ b/tests/scripts/login_as_admin.php @@ -7,7 +7,7 @@ if (PHP_SAPI != 'cli') { die('This script can only be executed from the command line'); } -require_once __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; $userInfo = UserManager::logInAsFirstAdmin(); diff --git a/tests/scripts/migrate_item_property.php b/tests/scripts/migrate_item_property.php index 3a9f761787..092578617a 100644 --- a/tests/scripts/migrate_item_property.php +++ b/tests/scripts/migrate_item_property.php @@ -19,11 +19,11 @@ use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter; echo 'First check if table "classification__category" has a default category; if not then run:
'; echo 'bin/console sonata:media:fix-media-context'; echo 'change course id in the query'; -//exit; +exit; // For tests to clean all resource stuff: // -require_once __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; $sql = "SELECT d.id, diff --git a/tests/scripts/move_users.php b/tests/scripts/move_users.php index cbafbdd296..b4ef21ad75 100644 --- a/tests/scripts/move_users.php +++ b/tests/scripts/move_users.php @@ -11,7 +11,7 @@ * Init */ die('Remove the "die()" line to execute this script'.PHP_EOL); -require __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; // Define origin and destination courses' code $originCourse = 'XYZ2014'; $destinationCourse = 'XYZ2014C2'; diff --git a/tests/scripts/multi_url_conversion.php b/tests/scripts/multi_url_conversion.php index 1d231b5263..8c8963b83f 100644 --- a/tests/scripts/multi_url_conversion.php +++ b/tests/scripts/multi_url_conversion.php @@ -7,7 +7,7 @@ * referencing ID 1 to ID 2. */ die(); -require __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; $tableAccessUrl = Database::get_main_table(TABLE_MAIN_ACCESS_URL); $tableUserRelCourseVote = Database::get_main_table(TABLE_MAIN_USER_REL_COURSE_VOTE); @@ -120,4 +120,4 @@ $resU = Database::query($sqlU); echo "Table $tableAccessUrlRelUserGroup updated".PHP_EOL; echo "Database updated.".PHP_EOL; -echo "Please set \$_configuration['multiple_access_urls'] to true in the app/config/configuration.php file".PHP_EOL; \ No newline at end of file +echo "Please set \$_configuration['multiple_access_urls'] to true in the app/config/configuration.php file".PHP_EOL; diff --git a/tests/scripts/restore_deleted_documents.php b/tests/scripts/restore_deleted_documents.php index 89ed92bf97..3e23d67745 100644 --- a/tests/scripts/restore_deleted_documents.php +++ b/tests/scripts/restore_deleted_documents.php @@ -10,7 +10,7 @@ use Chamilo\CourseBundle\Entity\CItemProperty; exit; -require __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; api_protect_admin_script(); diff --git a/tests/scripts/settings2csv.php b/tests/scripts/settings2csv.php index 3591c17963..6048bcd1fd 100644 --- a/tests/scripts/settings2csv.php +++ b/tests/scripts/settings2csv.php @@ -28,7 +28,7 @@ if (!empty($argv[1])) { $language = $argv[1]; } $_GET['language'] = $language; -@require __DIR__ . '/../../main/inc/global.inc.php'; +@require_once __DIR__.'/../../public/main/inc/global.inc.php'; // Categories, in order of appearance in the Chamilo settings page // Check the end of main/admin/settings.php for the initial list diff --git a/tests/scripts/switch_files_to_gettext.php b/tests/scripts/switch_files_to_gettext.php index 20a7ec8dc0..164d12a616 100644 --- a/tests/scripts/switch_files_to_gettext.php +++ b/tests/scripts/switch_files_to_gettext.php @@ -6,8 +6,8 @@ /** * Includes and declarations. */ -exit(); -require_once __DIR__.'/../../inc/global.inc.php'; +exit; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; $path = api_get_path(SYS_LANG_PATH).'english'; ini_set('memory_limit', '128M'); /** @@ -87,4 +87,4 @@ foreach ($files as $file) { flush(); } -echo "Done analyzing $countFiles files, with $countReplaces replacements!\n"; \ No newline at end of file +echo "Done analyzing $countFiles files, with $countReplaces replacements!\n"; diff --git a/tests/scripts/synchronize_user_base_from_ldap.php b/tests/scripts/synchronize_user_base_from_ldap.php index 516700ed1f..b4e4b08bdd 100644 --- a/tests/scripts/synchronize_user_base_from_ldap.php +++ b/tests/scripts/synchronize_user_base_from_ldap.php @@ -7,7 +7,7 @@ User account synchronisation from LDAP This script creates new user accounts found in the LDAP directory (if multiURL is enable, it creates the user on the URL for which the LDAP has been configured) -disables user accounts not found in the LDAP directory (it disbales the user for all URLs) +disables user accounts not found in the LDAP directory (it disbales the user for all URLs) or delete the user depending on the variable deleteUsersNotFoundInLDAP (only if the user has auth_source === extldap) updates existing user accounts found in the LDAP directory, re-enabling them if disabled (it applies for all URLs) only if option reenableUsersFoundInLDAP is set to true. anonymizes user accounts disabled for more than 3 years (applies for all URLs) only if the variable is set to true (by default). @@ -25,7 +25,7 @@ username field is used to identify and match LDAP and Chamilo accounts together. */ exit; // Change this to the absolute path to chamilo root folder if you move the script out of tests/scripts -$chamiloRoot = __DIR__.'/../..'; +$chamiloRoot = __DIR__.'/../../public'; // Set to true in order to get a trace of changes made by this script $debug = false; @@ -43,7 +43,7 @@ $reenableUsersFoundInLDAP = false; // Anonymize user accounts disabled for more than 3 years $anonymizeUserAccountsDisbaledFor3Years = false; -// List of username of accounts that should not be disabled or deleted if not present in LDAP +// List of username of accounts that should not be disabled or deleted if not present in LDAP // For exemple the first admin and the anonymous user that has no username ('') //$usernameListNotToTouchEvenIfNotInLDAP = ['admin','','test']; @@ -101,7 +101,7 @@ if (api_is_multiple_url_enabled()) { $multipleUrlLDAPConfig = true; if (!empty($extldap_config) && array_key_exists('host', $extldap_config) && !empty($extldap_config['host'])) { $multipleUrlLDAPConfig = false; - } + } } if (!$multipleUrlLDAPConfig) { @@ -201,7 +201,7 @@ foreach ($accessUrls as $accessUrl) { LDAP_OPT_PROTOCOL_VERSION, array_key_exists('protocol_version', $extldap_config[$accessUrlId]) ? $extldap_config[$accessUrlId]['protocol_version'] : 2 ); - + ldap_set_option( $ldap, LDAP_OPT_REFERRALS, @@ -284,7 +284,7 @@ foreach ($accessUrls as $accessUrl) { } $entry = ldap_next_entry($ldap, $entry); } - + ldap_close($ldap); if ($debug) { echo "ldapUsers = " . print_r($ldapUsers,1) . "\n"; @@ -413,7 +413,7 @@ foreach (array_diff(array_keys($dbUsers), array_keys($allLdapUsers)) as $usernam } if ($debug) { echo 'Deleted user ' . $usernameToDisable . "\n"; - } + } } else { if (!$test) { if ($user->isActive()) { @@ -435,7 +435,7 @@ foreach (array_diff(array_keys($dbUsers), array_keys($allLdapUsers)) as $usernam if ($debug) { echo 'Disabled ' . $user->getUsername() . "\n"; } - } + } } } if (!$test) { diff --git a/tests/scripts/update_user_extra_field.php b/tests/scripts/update_user_extra_field.php index 9c26504ae6..4ffcfc7dd7 100644 --- a/tests/scripts/update_user_extra_field.php +++ b/tests/scripts/update_user_extra_field.php @@ -17,7 +17,7 @@ exit; -require __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; // Define origin and destination courses' code $extraFieldName = 'dni'; diff --git a/tests/scripts/userfields_to_groups.php b/tests/scripts/userfields_to_groups.php index ad39d34b1e..e94a802c99 100644 --- a/tests/scripts/userfields_to_groups.php +++ b/tests/scripts/userfields_to_groups.php @@ -3,10 +3,11 @@ * Move user fields "ruc" and "razon_social" to (social) groups (create groups) * and assign the related users to those groups. */ +exit; if (PHP_SAPI != 'cli') { die('This script can only be launched from the command line'); } -require __DIR__ . '/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; // We assume all these fields represent the same value, so they are on a 1-1 // relationship. diff --git a/tests/scripts/users_no_course.php b/tests/scripts/users_no_course.php index 74682b1941..b22e6357a9 100644 --- a/tests/scripts/users_no_course.php +++ b/tests/scripts/users_no_course.php @@ -7,7 +7,7 @@ */ exit; -require __DIR__.'/../../main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; api_protect_admin_script(); diff --git a/tests/scripts/video.php b/tests/scripts/video.php index faeccd4dc1..13395f316f 100644 --- a/tests/scripts/video.php +++ b/tests/scripts/video.php @@ -7,7 +7,7 @@ * @todo Add security filtering for filenames * @author Yannick Warnier */ -exit(); +exit; ini_set('memory_limit',0); ini_set('max_execution_time',0); ini_set('upload_max_filesize',0); diff --git a/tests/scripts/wipe-out.php b/tests/scripts/wipe-out.php index 1b72add5a1..d678a3a890 100644 --- a/tests/scripts/wipe-out.php +++ b/tests/scripts/wipe-out.php @@ -14,7 +14,7 @@ /** * Security checks */ - +exit; if (PHP_SAPI != 'cli') { echo "For security reasons, this script can only be launched from the command line, sorry."; exit; @@ -43,7 +43,7 @@ ini_set('track_errors',1); $_SERVER['SERVER_NAME'] = ''; $_SERVER['HTTP_HOST'] = 'localhost'; $root = __DIR__.'/../'; -require $root.'main/inc/global.inc.php'; +require_once __DIR__.'/../../public/main/inc/global.inc.php'; $global_db = Database::get_main_database(); $webpath = api_get_path(WEB_PATH);