diff options
| -rw-r--r-- | engine/classes/ElggPluginPackage.php | 4 | ||||
| -rw-r--r-- | engine/lib/admin.php | 2 | ||||
| -rw-r--r-- | mod/diagnostics/start.php | 2 | ||||
| -rw-r--r-- | pages/settings/tools.php | 2 | ||||
| -rw-r--r-- | views/default/core/settings/tools.php | 10 | ||||
| -rw-r--r-- | views/default/core/settings/tools/plugin.php | 25 | ||||
| -rw-r--r-- | views/default/object/plugin.php | 6 |
7 files changed, 24 insertions, 27 deletions
diff --git a/engine/classes/ElggPluginPackage.php b/engine/classes/ElggPluginPackage.php index 7b033a9d8..e1b3427cc 100644 --- a/engine/classes/ElggPluginPackage.php +++ b/engine/classes/ElggPluginPackage.php @@ -415,7 +415,7 @@ class ElggPluginPackage { * Checks if $plugins meets the requirement by $dep. * * @param array $dep An Elgg manifest.xml deps array - * @param array $plugins A list of plugins as returned by get_installed_plugins(); + * @param array $plugins A list of plugins as returned by elgg_get_plugins(); * @param bool $inverse Inverse the results to use as a conflicts. * @return bool */ @@ -433,7 +433,7 @@ class ElggPluginPackage { * Checks if $plugins meets the requirement by $dep. * * @param array $dep An Elgg manifest.xml deps array - * @param array $plugins A list of plugins as returned by get_installed_plugins(); + * @param array $plugins A list of plugins as returned by elgg_get_plugins(); * @param bool $inverse Inverse the results to use as a conflicts. * @return bool */ diff --git a/engine/lib/admin.php b/engine/lib/admin.php index cab6fe4e5..d076bbd3d 100644 --- a/engine/lib/admin.php +++ b/engine/lib/admin.php @@ -18,7 +18,7 @@ function elgg_admin_add_plugin_settings_menu() { global $CONFIG; - if (!$installed_plugins = get_installed_plugins()) { + if (!$installed_plugins = elgg_get_plugins()) { // nothing added because no items return FALSE; } diff --git a/mod/diagnostics/start.php b/mod/diagnostics/start.php index a756c8168..78e01d0ad 100644 --- a/mod/diagnostics/start.php +++ b/mod/diagnostics/start.php @@ -45,7 +45,7 @@ function diagnostics_basic_hook($hook, $entity_type, $returnvalue, $params) { * @return tring */ function diagnostics_plugins_hook($hook, $entity_type, $returnvalue, $params) { - $returnvalue .= elgg_echo('diagnostics:report:plugins', array(print_r(get_installed_plugins(), true))); + $returnvalue .= elgg_echo('diagnostics:report:plugins', array(print_r(elgg_get_plugins(), true))); return $returnvalue; } diff --git a/pages/settings/tools.php b/pages/settings/tools.php index dcb026677..ea7c904e5 100644 --- a/pages/settings/tools.php +++ b/pages/settings/tools.php @@ -17,7 +17,7 @@ if ((!elgg_get_page_owner_entity()) || (!elgg_get_page_owner_entity()->canEdit() $title = elgg_echo("usersettings:plugins"); $content = elgg_view("core/settings/tools", - array('installed_plugins' => get_installed_plugins())); + array('installed_plugins' => elgg_get_plugins())); $params = array( 'content' => $content, diff --git a/views/default/core/settings/tools.php b/views/default/core/settings/tools.php index 42b2227ff..e280e0d8e 100644 --- a/views/default/core/settings/tools.php +++ b/views/default/core/settings/tools.php @@ -7,7 +7,9 @@ */ // Description of what's going on -echo "<div class='user-settings margin-top'>".elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description")))."</div>"; +echo "<div class='user-settings margin-top'>" + . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description"))) + . "</div>"; $limit = get_input('limit', 10); $offset = get_input('offset', 0); @@ -18,8 +20,8 @@ $count = count($installed_plugins); // Display list of plugins $n = 0; -foreach ($installed_plugins as $plugin => $data) { - if (elgg_is_active_plugin($plugin)) { - echo elgg_view("core/settings/tools/plugin", array('plugin' => $plugin, 'details' => $data)); +foreach ($installed_plugins as $plugin) { + if ($plugin->isActive()) { + echo elgg_view("core/settings/tools/plugin", array('plugin' => $plugin)); } }
\ No newline at end of file diff --git a/views/default/core/settings/tools/plugin.php b/views/default/core/settings/tools/plugin.php index d89e93c2f..ab25e7fb8 100644 --- a/views/default/core/settings/tools/plugin.php +++ b/views/default/core/settings/tools/plugin.php @@ -1,42 +1,35 @@ <?php /** - * Elgg plugin manifest class + * This displays a plugin's user settings. * - * This file renders a plugin for the admin screen, including active/deactive, manifest details & display plugin - * settings. - * - * @package Elgg - * @subpackage Core + * @package Elgg.Plugin + * @subpackage Settings */ $plugin = $vars['plugin']; -$details = $vars['details']; - -$active = $details['active']; -$manifest = $details['manifest']; - +$plugin_id = $plugin->getID(); $user_guid = $details['user_guid']; -if ($user_guid) { +if (!$user_guid) { $user_guid = elgg_get_logged_in_user_guid(); } -if (elgg_view("usersettings/{$plugin}/edit")) { +if (elgg_view("usersettings/$plugin_id/edit")) { ?> <div class="elgg-module elgg-module-info"> <div class="elgg-head"> - <h3><?php echo elgg_echo($plugin); ?></h3> + <h3><?php echo $plugin->manifest->getName(); ?></h3> </div> <div class="elgg-body"> <div id="<?php echo $plugin; ?>_settings"> <?php echo elgg_view("object/plugin", array( 'plugin' => $plugin, - 'entity' => find_plugin_usersettings($plugin, $user_guid), + 'entity' => find_plugin_usersettings($plugin_id, $user_guid), 'prefix' => 'user' )); ?> </div> </div> -</div> +</div> <?php }
\ No newline at end of file diff --git a/views/default/object/plugin.php b/views/default/object/plugin.php index aef9a9bbd..054931a38 100644 --- a/views/default/object/plugin.php +++ b/views/default/object/plugin.php @@ -8,10 +8,12 @@ $entity = $vars['entity']; $plugin = $vars['plugin']; +$plugin_id = $plugin->getID(); $prefix = $vars['prefix']; // Do we want to show admin settings (default) or user settings -$form_body = elgg_view("{$prefix}settings/{$plugin}/edit", $vars); -$form_body .= "<p>" . elgg_view('input/hidden', array('internalname' => 'plugin', 'value' => $plugin)) . elgg_view('input/submit', array('value' => elgg_echo('save'))) . "</p>"; +$form_body = elgg_view("{$prefix}settings/{$plugin_id}/edit", $vars) + . "<p>" . elgg_view('input/hidden', array('internalname' => 'plugin', 'value' => $plugin_id)) + . elgg_view('input/submit', array('value' => elgg_echo('save'))) . "</p>"; ?> <div> |