diff options
Diffstat (limited to 'views/default/forms/plugins')
| -rw-r--r-- | views/default/forms/plugins/settings/save.php | 26 | ||||
| -rw-r--r-- | views/default/forms/plugins/usersettings/save.php | 10 |
2 files changed, 25 insertions, 11 deletions
diff --git a/views/default/forms/plugins/settings/save.php b/views/default/forms/plugins/settings/save.php index b2d818e87..116529905 100644 --- a/views/default/forms/plugins/settings/save.php +++ b/views/default/forms/plugins/settings/save.php @@ -1,27 +1,31 @@ <?php /** - * Used to show plugin user settings. + * Used to show plugin settings for both users and admins. * * @package Elgg.Core * @subpackage Plugins */ -$plugin = $vars['plugin']; +$plugin = $vars['entity']; $plugin_id = $plugin->getID(); -$user_guid = elgg_get_array_value('user_guid', $vars, elgg_get_logged_in_user_guid()); +$user_guid = elgg_extract('user_guid', $vars, elgg_get_logged_in_user_guid()); // Do we want to show admin settings or user settings -$type = elgg_get_array_value('type', $vars, ''); +$type = elgg_extract('type', $vars, ''); if ($type != 'user') { $type = ''; } -echo elgg_view("{$type}settings/{$plugin_id}/edit", $vars); - -echo "<p>"; -echo elgg_view('input/hidden', array('internalname' => 'plugin_id', 'value' => $plugin_id)); -echo elgg_view('input/hidden', array('internalname' => 'user_guid', 'value' => $user_guid)); -echo elgg_view('input/submit', array('value' => elgg_echo('save'))); -echo "</p>"; +if (elgg_view_exists("plugins/$plugin_id/{$type}settings")) { + echo elgg_view("plugins/$plugin_id/{$type}settings", $vars); +} elseif (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); +} +echo '<div class="elgg-foot">'; +echo elgg_view('input/hidden', array('name' => 'plugin_id', 'value' => $plugin_id)); +echo elgg_view('input/hidden', array('name' => 'user_guid', 'value' => $user_guid)); +echo elgg_view('input/submit', array('value' => elgg_echo('save'))); +echo '</div>'; diff --git a/views/default/forms/plugins/usersettings/save.php b/views/default/forms/plugins/usersettings/save.php index 8532cdfd1..ced88f818 100644 --- a/views/default/forms/plugins/usersettings/save.php +++ b/views/default/forms/plugins/usersettings/save.php @@ -1,4 +1,14 @@ <?php +/** + * Plugin user settings + * + * Calls the plugin admin settings form body with type set to 'user' + * + * @package Elgg.Core + * @subpackage Plugins + */ + $vars['type'] = 'user'; +// Can't use elgg_view_form() because it overrides the $vars['action'] parameter echo elgg_view('forms/plugins/settings/save', $vars);
\ No newline at end of file |