From d76573653a96119e2bcf429c9b7c859cebb56555 Mon Sep 17 00:00:00 2001 From: bergware Date: Mon, 24 Oct 2016 09:44:19 +0200 Subject: [PATCH] Replace fixed path with docroot variable --- plugins/dynamix.plugin.manager/PluginsError.page | 2 +- plugins/dynamix.plugin.manager/PluginsStale.page | 2 +- plugins/dynamix.plugin.manager/include/PluginHelpers.php | 5 ++++- plugins/dynamix.plugin.manager/include/ShowChanges.php | 6 ++++-- plugins/dynamix.plugin.manager/include/ShowPlugins.php | 7 ++++--- plugins/dynamix.plugin.manager/scripts/plugincheck | 7 ++++--- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/plugins/dynamix.plugin.manager/PluginsError.page b/plugins/dynamix.plugin.manager/PluginsError.page index 14d08bbe4..5e0bfffc7 100644 --- a/plugins/dynamix.plugin.manager/PluginsError.page +++ b/plugins/dynamix.plugin.manager/PluginsError.page @@ -16,7 +16,7 @@ Cond="glob('/boot/config/plugins-error/*.plg')" ?> "; echo "Plugin FileStatus"; diff --git a/plugins/dynamix.plugin.manager/PluginsStale.page b/plugins/dynamix.plugin.manager/PluginsStale.page index 3f5bf1f82..8b5140829 100644 --- a/plugins/dynamix.plugin.manager/PluginsStale.page +++ b/plugins/dynamix.plugin.manager/PluginsStale.page @@ -16,7 +16,7 @@ Cond="glob('/boot/config/plugins-stale/*.plg')" ?> "; echo "PluginAuthorVersionStatus"; diff --git a/plugins/dynamix.plugin.manager/include/PluginHelpers.php b/plugins/dynamix.plugin.manager/include/PluginHelpers.php index 1d9d5bda0..e18ee20e1 100644 --- a/plugins/dynamix.plugin.manager/include/PluginHelpers.php +++ b/plugins/dynamix.plugin.manager/include/PluginHelpers.php @@ -11,9 +11,12 @@ */ ?> -
+
diff --git a/plugins/dynamix.plugin.manager/include/ShowPlugins.php b/plugins/dynamix.plugin.manager/include/ShowPlugins.php index a6ec480b1..f1fb95b30 100644 --- a/plugins/dynamix.plugin.manager/include/ShowPlugins.php +++ b/plugins/dynamix.plugin.manager/include/ShowPlugins.php @@ -11,8 +11,9 @@ */ ?> "; } // action - $action = strpos($plugin_file, "/usr/local/emhttp/plugins") !== 0 ? make_link("remove", basename($plugin_file)) : "built-in"; + $action = strpos($plugin_file, "$docroot/plugins") !== 0 ? make_link("remove", basename($plugin_file)) : "built-in"; // write plugin information echo ""; echo "

{$link}

"; diff --git a/plugins/dynamix.plugin.manager/scripts/plugincheck b/plugins/dynamix.plugin.manager/scripts/plugincheck index a74c521bb..ec55aafdd 100755 --- a/plugins/dynamix.plugin.manager/scripts/plugincheck +++ b/plugins/dynamix.plugin.manager/scripts/plugincheck @@ -12,15 +12,16 @@ */ ?>