change backup UI dir to naming convention

emoncms · Apr 3, 2019 · 9063922 · 9063922
1 parent 86c22cf
commit 9063922
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/backup/backup_controller.php → backup-module/backup_controller.php b/backup/backup_controller.php → backup-module/backup_controller.php
@@ -22,10 +22,14 @@ function backup_controller()
         $route->format = "text";
         return "<br><div class='alert alert-error'><b>Error:</b> backup module requires admin access</div>";
     }
-    if (!file_exists("$homedir/backup/config.cfg")) return "<br><div class='alert alert-error'><b>Error:</b> missing backup config.cfg</div>";
+    if (file_exists("$homedir/backup/config.cfg")) {
+        $parsed_ini = parse_ini_file("$homedir/backup/config.cfg", true);
+    } else if (file_exists("$homedir/modules/backup/config.cfg")) {
+        $parsed_ini = parse_ini_file("$homedir/modules/backup/config.cfg", true);
+    } else {
+        return "<br><div class='alert alert-error'><b>Error:</b> missing backup config.cfg</div>";
+    }
 
-    $parsed_ini = parse_ini_file("$homedir/backup/config.cfg", true);
-
     $export_flag = "/tmp/emoncms-flag-export";
     $export_script = $parsed_ini['backup_script_location']."/emoncms-export.sh";
     $export_logfile = $parsed_ini['backup_location']."/emoncms-export.log";

diff --git a/backup/backup_menu.php → backup-module/backup_menu.php b/backup/backup_menu.php → backup-module/backup_menu.php
diff --git a/backup/backup_view.php → backup-module/backup_view.php b/backup/backup_view.php → backup-module/backup_view.php
diff --git a/backup/module.json → backup-module/module.json b/backup/module.json → backup-module/module.json