From ba80ee68fbaf95fd7022222598eaaea2f1fd751e Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Wed, 9 Jul 2025 09:17:41 +0800 Subject: [PATCH] MDL-83424 core: Move admin/cli scripts to root directory Note: Plugin-specific CLI directories cannot be moved. --- {public/admin => admin}/cli/adhoc_task.php | 0 .../admin => admin}/cli/alternative_component_cache.php | 0 {public/admin => admin}/cli/automated_backups.php | 0 {public/admin => admin}/cli/backup.php | 0 {public/admin => admin}/cli/build_theme_css.php | 0 {public/admin => admin}/cli/cfg.php | 0 {public/admin => admin}/cli/check_database_schema.php | 0 {public/admin => admin}/cli/checks.php | 0 {public/admin => admin}/cli/cron.php | 0 {public/admin => admin}/cli/dashboard_reset.php | 0 {public/admin => admin}/cli/delete_course.php | 0 {public/admin => admin}/cli/emailstop.php | 0 {public/admin => admin}/cli/fix_course_sequence.php | 0 {public/admin => admin}/cli/fix_deleted_users.php | 0 .../admin => admin}/cli/fix_orphaned_calendar_events.php | 0 .../cli/fix_orphaned_question_categories.php | 0 {public/admin => admin}/cli/generate_key.php | 0 {public/admin => admin}/cli/import.php | 0 {public/admin => admin}/cli/install.php | 8 ++++---- {public/admin => admin}/cli/install_database.php | 2 +- {public/admin => admin}/cli/kill_all_sessions.php | 0 {public/admin => admin}/cli/maintenance.php | 0 {public/admin => admin}/cli/mysql_collation.php | 0 {public/admin => admin}/cli/mysql_compressed_rows.php | 0 {public/admin => admin}/cli/purge_caches.php | 0 {public/admin => admin}/cli/reset_password.php | 0 {public/admin => admin}/cli/restore_backup.php | 0 {public/admin => admin}/cli/scheduled_task.php | 0 {public/admin => admin}/cli/svgtool.php | 0 {public/admin => admin}/cli/uninstall_plugins.php | 0 {public/admin => admin}/cli/upgrade.php | 0 31 files changed, 5 insertions(+), 5 deletions(-) rename {public/admin => admin}/cli/adhoc_task.php (100%) rename {public/admin => admin}/cli/alternative_component_cache.php (100%) rename {public/admin => admin}/cli/automated_backups.php (100%) rename {public/admin => admin}/cli/backup.php (100%) rename {public/admin => admin}/cli/build_theme_css.php (100%) rename {public/admin => admin}/cli/cfg.php (100%) rename {public/admin => admin}/cli/check_database_schema.php (100%) rename {public/admin => admin}/cli/checks.php (100%) rename {public/admin => admin}/cli/cron.php (100%) rename {public/admin => admin}/cli/dashboard_reset.php (100%) rename {public/admin => admin}/cli/delete_course.php (100%) rename {public/admin => admin}/cli/emailstop.php (100%) rename {public/admin => admin}/cli/fix_course_sequence.php (100%) rename {public/admin => admin}/cli/fix_deleted_users.php (100%) rename {public/admin => admin}/cli/fix_orphaned_calendar_events.php (100%) rename {public/admin => admin}/cli/fix_orphaned_question_categories.php (100%) rename {public/admin => admin}/cli/generate_key.php (100%) rename {public/admin => admin}/cli/import.php (100%) rename {public/admin => admin}/cli/install.php (99%) rename {public/admin => admin}/cli/install_database.php (98%) rename {public/admin => admin}/cli/kill_all_sessions.php (100%) rename {public/admin => admin}/cli/maintenance.php (100%) rename {public/admin => admin}/cli/mysql_collation.php (100%) rename {public/admin => admin}/cli/mysql_compressed_rows.php (100%) rename {public/admin => admin}/cli/purge_caches.php (100%) rename {public/admin => admin}/cli/reset_password.php (100%) rename {public/admin => admin}/cli/restore_backup.php (100%) rename {public/admin => admin}/cli/scheduled_task.php (100%) rename {public/admin => admin}/cli/svgtool.php (100%) rename {public/admin => admin}/cli/uninstall_plugins.php (100%) rename {public/admin => admin}/cli/upgrade.php (100%) diff --git a/public/admin/cli/adhoc_task.php b/admin/cli/adhoc_task.php similarity index 100% rename from public/admin/cli/adhoc_task.php rename to admin/cli/adhoc_task.php diff --git a/public/admin/cli/alternative_component_cache.php b/admin/cli/alternative_component_cache.php similarity index 100% rename from public/admin/cli/alternative_component_cache.php rename to admin/cli/alternative_component_cache.php diff --git a/public/admin/cli/automated_backups.php b/admin/cli/automated_backups.php similarity index 100% rename from public/admin/cli/automated_backups.php rename to admin/cli/automated_backups.php diff --git a/public/admin/cli/backup.php b/admin/cli/backup.php similarity index 100% rename from public/admin/cli/backup.php rename to admin/cli/backup.php diff --git a/public/admin/cli/build_theme_css.php b/admin/cli/build_theme_css.php similarity index 100% rename from public/admin/cli/build_theme_css.php rename to admin/cli/build_theme_css.php diff --git a/public/admin/cli/cfg.php b/admin/cli/cfg.php similarity index 100% rename from public/admin/cli/cfg.php rename to admin/cli/cfg.php diff --git a/public/admin/cli/check_database_schema.php b/admin/cli/check_database_schema.php similarity index 100% rename from public/admin/cli/check_database_schema.php rename to admin/cli/check_database_schema.php diff --git a/public/admin/cli/checks.php b/admin/cli/checks.php similarity index 100% rename from public/admin/cli/checks.php rename to admin/cli/checks.php diff --git a/public/admin/cli/cron.php b/admin/cli/cron.php similarity index 100% rename from public/admin/cli/cron.php rename to admin/cli/cron.php diff --git a/public/admin/cli/dashboard_reset.php b/admin/cli/dashboard_reset.php similarity index 100% rename from public/admin/cli/dashboard_reset.php rename to admin/cli/dashboard_reset.php diff --git a/public/admin/cli/delete_course.php b/admin/cli/delete_course.php similarity index 100% rename from public/admin/cli/delete_course.php rename to admin/cli/delete_course.php diff --git a/public/admin/cli/emailstop.php b/admin/cli/emailstop.php similarity index 100% rename from public/admin/cli/emailstop.php rename to admin/cli/emailstop.php diff --git a/public/admin/cli/fix_course_sequence.php b/admin/cli/fix_course_sequence.php similarity index 100% rename from public/admin/cli/fix_course_sequence.php rename to admin/cli/fix_course_sequence.php diff --git a/public/admin/cli/fix_deleted_users.php b/admin/cli/fix_deleted_users.php similarity index 100% rename from public/admin/cli/fix_deleted_users.php rename to admin/cli/fix_deleted_users.php diff --git a/public/admin/cli/fix_orphaned_calendar_events.php b/admin/cli/fix_orphaned_calendar_events.php similarity index 100% rename from public/admin/cli/fix_orphaned_calendar_events.php rename to admin/cli/fix_orphaned_calendar_events.php diff --git a/public/admin/cli/fix_orphaned_question_categories.php b/admin/cli/fix_orphaned_question_categories.php similarity index 100% rename from public/admin/cli/fix_orphaned_question_categories.php rename to admin/cli/fix_orphaned_question_categories.php diff --git a/public/admin/cli/generate_key.php b/admin/cli/generate_key.php similarity index 100% rename from public/admin/cli/generate_key.php rename to admin/cli/generate_key.php diff --git a/public/admin/cli/import.php b/admin/cli/import.php similarity index 100% rename from public/admin/cli/import.php rename to admin/cli/import.php diff --git a/public/admin/cli/install.php b/admin/cli/install.php similarity index 99% rename from public/admin/cli/install.php rename to admin/cli/install.php index 4e80d7608c7..9d23de73759 100644 --- a/public/admin/cli/install.php +++ b/admin/cli/install.php @@ -103,7 +103,7 @@ if (file_exists($distrolibfile)) { } // Nothing to do if config.php exists -$configfile = dirname(__DIR__, 3).'/config.php'; +$configfile = dirname(__DIR__, 2).'/config.php'; if (file_exists($configfile)) { require($configfile); require_once($CFG->libdir.'/clilib.php'); @@ -150,15 +150,15 @@ define('PHPUNIT_TEST', false); define('IGNORE_COMPONENT_CACHE', true); // Check that PHP is of a sufficient version as soon as possible. -require_once(__DIR__.'/../../lib/phpminimumversionlib.php'); +require_once(dirname(__DIR__, 2) . '/public/lib/phpminimumversionlib.php'); moodle_require_minimum_php_version(); // set up configuration global $CFG; $CFG = new stdClass(); $CFG->lang = 'en'; -$CFG->dirroot = dirname(dirname(__DIR__)); -$CFG->root = dirname(__DIR__, 3); +$CFG->root = dirname(__DIR__, 2); +$CFG->dirroot = $CFG->root . '/public'; $CFG->libdir = "$CFG->dirroot/lib"; $CFG->wwwroot = "http://localhost"; $CFG->httpswwwroot = $CFG->wwwroot; diff --git a/public/admin/cli/install_database.php b/admin/cli/install_database.php similarity index 98% rename from public/admin/cli/install_database.php rename to admin/cli/install_database.php index e4ed7ba124b..08d59f4093a 100644 --- a/public/admin/cli/install_database.php +++ b/admin/cli/install_database.php @@ -65,7 +65,7 @@ Example: "; // Check that PHP is of a sufficient version as soon as possible. -require_once(__DIR__.'/../../lib/phpminimumversionlib.php'); +require_once(dirname(__DIR__, 2) . '/public/lib/phpminimumversionlib.php'); moodle_require_minimum_php_version(); // Nothing to do if config.php does not exist diff --git a/public/admin/cli/kill_all_sessions.php b/admin/cli/kill_all_sessions.php similarity index 100% rename from public/admin/cli/kill_all_sessions.php rename to admin/cli/kill_all_sessions.php diff --git a/public/admin/cli/maintenance.php b/admin/cli/maintenance.php similarity index 100% rename from public/admin/cli/maintenance.php rename to admin/cli/maintenance.php diff --git a/public/admin/cli/mysql_collation.php b/admin/cli/mysql_collation.php similarity index 100% rename from public/admin/cli/mysql_collation.php rename to admin/cli/mysql_collation.php diff --git a/public/admin/cli/mysql_compressed_rows.php b/admin/cli/mysql_compressed_rows.php similarity index 100% rename from public/admin/cli/mysql_compressed_rows.php rename to admin/cli/mysql_compressed_rows.php diff --git a/public/admin/cli/purge_caches.php b/admin/cli/purge_caches.php similarity index 100% rename from public/admin/cli/purge_caches.php rename to admin/cli/purge_caches.php diff --git a/public/admin/cli/reset_password.php b/admin/cli/reset_password.php similarity index 100% rename from public/admin/cli/reset_password.php rename to admin/cli/reset_password.php diff --git a/public/admin/cli/restore_backup.php b/admin/cli/restore_backup.php similarity index 100% rename from public/admin/cli/restore_backup.php rename to admin/cli/restore_backup.php diff --git a/public/admin/cli/scheduled_task.php b/admin/cli/scheduled_task.php similarity index 100% rename from public/admin/cli/scheduled_task.php rename to admin/cli/scheduled_task.php diff --git a/public/admin/cli/svgtool.php b/admin/cli/svgtool.php similarity index 100% rename from public/admin/cli/svgtool.php rename to admin/cli/svgtool.php diff --git a/public/admin/cli/uninstall_plugins.php b/admin/cli/uninstall_plugins.php similarity index 100% rename from public/admin/cli/uninstall_plugins.php rename to admin/cli/uninstall_plugins.php diff --git a/public/admin/cli/upgrade.php b/admin/cli/upgrade.php similarity index 100% rename from public/admin/cli/upgrade.php rename to admin/cli/upgrade.php