Deprecated (user)settings/$plugin_id/edit in favor of plugins/$plugin_id/(user)settings

git-svn-id: http://code.elgg.org/elgg/trunk@8421 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/admin/plugin_settings.php b/views/default/admin/plugin_settings.php
index c2801cec32e809e6afe7eec5f27e0039315b35a0..7473768c0d9fd7fc104f2c1d6cbf47621d0c50aa 100644 (file)
--- a/views/default/admin/plugin_settings.php
+++ b/views/default/admin/plugin_settings.php
@@ -14,8 +14,9 @@ $plugin_id = $plugin->getID();
 // required for plugin settings backward compatibility
 $vars['entity'] = $plugin;
 
-if (elgg_view_exists("settings/$plugin_id/edit")) {
+$settings = false;
 
+if (elgg_view_exists("settings/$plugin_id/edit") || elgg_view_exists("plugins/$plugin_id/settings")) {
        $title = $plugin->manifest->getName();
 
        $params = array('id' => "$plugin_id-settings");

diff --git a/views/default/core/settings/tools.php b/views/default/core/settings/tools.php
index 3836b7ef1dbbc45406dbfca1f265792b77b0a72c..ff02c91834d6e9ceee91a483b06bf48b707540de 100644 (file)
--- a/views/default/core/settings/tools.php
+++ b/views/default/core/settings/tools.php
@@ -25,9 +25,13 @@ $count = count($installed_plugins);
 // Display all plugins' usersettings forms
 foreach ($installed_plugins as $plugin) {
        $plugin_id = $plugin->getID();
-       if ($plugin->isActive() && elgg_view_exists("usersettings/$plugin_id/edit")) {
-               $title = $plugin->manifest->getName();
-               $body = elgg_view_form('plugins/usersettings/save', array(), array('entity' => $plugin));
-               echo elgg_view_module('info', $title, $body);
+       if ($plugin->isActive()) {
+               if (elgg_view_exists("usersettings/$plugin_id/edit") 
+                       || elgg_view_exists("plugins/$plugin_id/usersettings")) {
+       
+                       $title = $plugin->manifest->getName();
+                       $body = elgg_view_form('plugins/usersettings/save', array(), array('entity' => $plugin));
+                       echo elgg_view_module('info', $title, $body);
+               }
        }
 }
\ No newline at end of file

diff --git a/views/default/forms/plugins/settings/save.php b/views/default/forms/plugins/settings/save.php
index 5125f31423a02c36c6bbe36e5a6b6f110c7491d9..efe6d7792bed73e3ac19543a361a12b24f5a22c5 100644 (file)
--- a/views/default/forms/plugins/settings/save.php
+++ b/views/default/forms/plugins/settings/save.php
@@ -17,7 +17,12 @@ if ($type != 'user') {
        $type = '';
 }
 
-echo elgg_view("{$type}settings/$plugin_id/edit", $vars);
+if (elgg_view_exists("{$type}settings/$plugin_id/edit")) {
+       elgg_deprecated_notice("{$type}settings/$plugin_id/edit was deprecated in favor of plugins/$plugin_id/{$type}settings", 1.8);
+       echo elgg_view("{$type}settings/$plugin_id/edit", $vars);
+} else {
+       echo elgg_view("plugins/$plugin_id/{$type}settings", $vars);
+}
 
 echo "<div>";
 echo elgg_view('input/hidden', array('name' => 'plugin_id', 'value' => $plugin_id));