non Windows server path fix

Syxton · Aug 30, 2023 · e9f4467 · e9f4467
1 parent 281302c
commit e9f4467
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/classes/processor.php b/classes/processor.php
@@ -621,7 +621,7 @@ protected function archivecourse($obj, $delete = true) {
 
             $archivefile = date("Y-m-d") . "{$suffix}-{$safeshort}.mbz";
 
-            $rootpath = trim(get_config('tool_coursearchiver', 'coursearchiverrootpath'), "/\\");
+            $rootpath = rtrim(get_config('tool_coursearchiver', 'coursearchiverrootpath'), "/\\");
             $archivepath = trim(str_replace(str_split(':*?"<>|'),
                                             '',
                                             get_config('tool_coursearchiver', 'coursearchiverpath')),
@@ -1542,7 +1542,7 @@ public static function get_archivelist($search, $recover = false) {
         $isadmin = is_siteadmin();
         $config = get_config('tool_coursearchiver');
 
-        $rootpath = trim($config->coursearchiverrootpath, "/\\");
+        $rootpath = rtrim($config->coursearchiverrootpath, "/\\");
         $archivepath = trim(str_replace(str_split(':*?"<>|'),
                                         '',
                                         $config->coursearchiverpath),
@@ -1631,7 +1631,7 @@ public static function delete_archives($selected) {
         global $CFG, $DB;
 
         $config = get_config('tool_coursearchiver');
-        $rootpath = trim($config->coursearchiverrootpath, "/\\");
+        $rootpath = rtrim($config->coursearchiverrootpath, "/\\");
         $archivepath = trim(str_replace(str_split(':*?"<>|'),
                                         '',
                                         $config->coursearchiverpath),
@@ -1667,7 +1667,7 @@ public static function delete_archives($selected) {
     public static function recover_archives($selected) {
         global $CFG, $DB;
 
-        $rootpath = trim(get_config('tool_coursearchiver', 'coursearchiverrootpath'), "/\\");
+        $rootpath = rtrim(get_config('tool_coursearchiver', 'coursearchiverrootpath'), "/\\");
         $archivepath = trim(str_replace(str_split(':*?"<>|'),
                                         '',
                                         get_config('tool_coursearchiver', 'coursearchiverpath')),

diff --git a/classes/task/cron_task.php b/classes/task/cron_task.php
@@ -49,7 +49,7 @@ public function get_name() {
     public function execute() {
         global $CFG, $DB;
 
-        $rootpath = trim(get_config('tool_coursearchiver', 'coursearchiverrootpath'), "/\\");
+        $rootpath = rtrim(get_config('tool_coursearchiver', 'coursearchiverrootpath'), "/\\");
         $archivepath = trim(str_replace(str_split(':*?"<>|'),
                                         '',
                                         get_config('tool_coursearchiver', 'coursearchiverpath')),

diff --git a/db/upgrade.php b/db/upgrade.php
@@ -139,7 +139,7 @@ function xmldb_tool_coursearchiver_upgrade($oldversion) {
         }
 
         // Fill up the database with previously archived files.
-        $rootpath = trim(get_config('tool_coursearchiver', 'coursearchiverrootpath'), "/\\");
+        $rootpath = rtrim(get_config('tool_coursearchiver', 'coursearchiverrootpath'), "/\\");
         $archivepath = trim(str_replace(str_split(':*?"<>|'),
                                         '',
                                         get_config('tool_coursearchiver', 'coursearchiverpath')),

diff --git a/restorefile.php b/restorefile.php
@@ -39,7 +39,7 @@
 
 global $CFG, $DB;
 
-$rootpath = trim(get_config('tool_coursearchiver', 'coursearchiverrootpath'), "/\\");
+$rootpath = rtrim(get_config('tool_coursearchiver', 'coursearchiverrootpath'), "/\\");
 $archivepath = trim(str_replace(str_split(':*?"<>|'),
                                 '',
                                 get_config('tool_coursearchiver', 'coursearchiverpath')),