From f2123cdc42c8da21a297158fbb655f72bc92edce Mon Sep 17 00:00:00 2001 From: brettp Date: Wed, 5 Jan 2011 04:36:07 +0000 Subject: Fixes #2760. Refs #2759. Updated plugin admin actions to use the new system. Added plugin dependency views in admin. ElggPluginPackage->checkDependencies() now returns the detected value. git-svn-id: http://code.elgg.org/elgg/trunk@7838 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/admin/components/plugin.php | 246 +++++++++++++-------- .../admin/components/plugin_dependencies.php | 45 ++++ views/default/admin/plugins/advanced.php | 43 ++-- views/default/admin/plugins/simple.php | 78 ++++--- 4 files changed, 266 insertions(+), 146 deletions(-) create mode 100644 views/default/admin/components/plugin_dependencies.php (limited to 'views/default') diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php index ae611af07..d190e94a5 100644 --- a/views/default/admin/components/plugin.php +++ b/views/default/admin/components/plugin.php @@ -2,152 +2,218 @@ /** * Elgg plugin manifest class * - * This file renders a plugin for the admin screen, including active/deactive, manifest details & display plugin - * settings. + * This file renders a plugin for the admin screen, including active/deactive, + * manifest details & display plugin settings. * - * @package Elgg - * @subpackage Core + * @package Elgg.Core + * @subpackage Plugins */ $plugin = $vars['plugin']; -$details = $vars['details']; - -$active = $details['active']; -$manifest = $details['manifest']; - -$plugin_pretty_name = (isset($manifest['name'])) ? $manifest['name'] : $plugin; - -// Check elgg version if available -$version_check_valid = false; -if ($manifest['elgg_version']) { - $version_check_valid = check_plugin_compatibility($manifest['elgg_version']); -} +$priority = $plugin->getPriority(); +$active = $plugin->isActive(); +$name = $plugin->manifest->getName(); +$can_activate = $plugin->canActivate(); +$max_priority = elgg_get_max_plugin_priority(); +$actions_base = '/action/admin/plugins/'; $ts = time(); $token = generate_action_token($ts); -$active_class = ($active) ? 'active' : 'not_active'; - -$top_url = $up_url = $down_url = $bottom_url = ''; -if ($vars['order'] > 10) { - $top_url = elgg_get_site_url()."action/admin/plugins/reorder?plugin={$plugin}&order=1&__elgg_token=$token&__elgg_ts=$ts"; - $top_link = '' . elgg_echo('top') . ''; - - $order = $vars['order'] - 11; - - $up_url = elgg_get_site_url()."action/admin/plugins/reorder?plugin={$plugin}&order=$order&__elgg_token=$token&__elgg_ts=$ts"; - $up_link = '' . elgg_echo('up') . ''; +$active_class = ($active && $can_activate) ? 'active' : 'not_active'; + +// build reordering links +$links = ''; + +// top and up link only if not at top +if ($priority > 1) { + $top_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array( + 'plugin_guid' => $plugin->guid, + 'priority' => 'first', + 'is_action' => true + )); + + $links .= elgg_view('output/url', array( + 'href' => $top_url, + 'text' => elgg_echo('top'), + 'is_action' => true + )); + + $up_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array( + 'plugin_guid' => $plugin->guid, + 'priority' => '-1', + 'is_action' => true + )); + + $links .= elgg_view('output/url', array( + 'href' => $up_url, + 'text' => elgg_echo('up'), + 'is_action' => true + )); } -if ($vars['order'] < $vars['maxorder']) { - $order = $vars['order'] + 11; - $down_url = elgg_get_site_url()."action/admin/plugins/reorder?plugin={$plugin}&order=$order&__elgg_token=$token&__elgg_ts=$ts"; - $down_link = '' . elgg_echo('down') . ''; - - $order = $vars['maxorder'] + 11; - $bottom_url = elgg_get_site_url()."action/admin/plugins/reorder?plugin={$plugin}&order=$order&__elgg_token=$token&__elgg_ts=$ts"; - $bottom_link = '' . elgg_echo('bottom') . ''; +// down and bottom links only if not at bottom +if ($priority < $max_priority) { + $down_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array( + 'plugin_guid' => $plugin->guid, + 'priority' => '+1', + 'is_action' => true + )); + + $links .= elgg_view('output/url', array( + 'href' => $down_url, + 'text' => elgg_echo('down'), + 'is_action' => true + )); + + $bottom_url = elgg_http_add_url_query_elements($actions_base . 'set_priority', array( + 'plugin_guid' => $plugin->guid, + 'priority' => 'last', + 'is_action' => true + )); + + $links .= elgg_view('output/url', array( + 'href' => $bottom_url, + 'text' => elgg_echo('bottom'), + 'is_action' => true + )); } -if ($active) { - $url = elgg_get_site_url()."action/admin/plugins/disable?plugin=$plugin&__elgg_token=$token&__elgg_ts=$ts"; - $enable_disable = '' . elgg_echo('disable') . ''; +// activate / deactivate links +if ($can_activate) { + if ($active) { + $action = 'deactivate'; + $class = 'elgg-cancel-button'; + } else { + $action = 'activate'; + $class = 'elgg-submit-button'; + } + + $url = elgg_http_add_url_query_elements($actions_base . $action, array( + 'plugin_guids[]' => $plugin->guid, + 'is_action' => true + )); + + $action_button = elgg_view('output/url', array( + 'href' => $url, + 'text' => elgg_echo($action), + 'is_action' => true, + 'class' => "elgg-button $class" + )); } else { - $url = elgg_get_site_url()."action/admin/plugins/enable?plugin=$plugin&__elgg_token=$token&__elgg_ts=$ts"; - $enable_disable = '' . elgg_echo('enable') . ''; + $action_button = elgg_view('output/url', array( + 'text' => elgg_echo('admin:plugins:cannot_activate'), + 'disabled' => 'disabled', + 'class' => "elgg-action-button disabled" + )); } - -$categories_list = ''; -if ($manifest['category']) { +// Display categories +$categories = $plugin->manifest->getCategories(); +$categories_html = ''; +if ($categories) { $categories_arr = array(); - $base_url = elgg_get_site_url()."pg/admin/plugins?category="; + $base_url = elgg_get_site_url() . "pg/admin/plugins?category="; - foreach($manifest['category'] as $category) { + foreach ($categories as $category) { $url = $base_url . urlencode($category); $categories_arr[] = "" . htmlspecialchars($category) . ''; } - $categories_list = implode(', ', $categories_arr); + $categories_html = implode(', ', $categories_arr); } -$screenshots = ''; -if ($manifest['screenshot']) { - $base_url = elgg_get_site_url()."mod/"; - +// @todo We need to make a page handler to read these files in. +// this is broken. +$screenshot_html = ''; +$screenshots = $plugin->manifest->getScreenshots(); +if ($screenshots) { + $base_url = elgg_get_plugin_path() . $plugin->getID() . '/'; $limit = 4; - foreach ($manifest['screenshot'] as $screenshot) { + foreach ($screenshots as $screenshot) { if ($limit <= 0) { break; } - $screenshot_src = $base_url . $plugin . "/$screenshot"; - $screenshots .= "
    • "; + $screenshot_src = $plugin->getPath() . $screenshot['path']; + $screenshots .= "
    • "; $limit--; } } +// metadata +$description = elgg_view('output/longtext', array('value' => $plugin->manifest->getDescription())); +$author = '' . elgg_echo('admin:plugins:label:author') . ': ' + . elgg_view('output/text', array('value' => $plugin->manifest->getAuthor())); +$version = htmlspecialchars($plugin->manifest->getVersion()); +$website = elgg_view('output/url', array( + 'href' => $plugin->manifest->getWebsite(), + 'text' => $plugin->manifest->getWebsite() +)); + +$copyright = elgg_view('output/text', array('value' => $plugin->manifest->getCopyright())); +$license = elgg_view('output/text', array('value' => $plugin->manifest->getLicense())); + ?>
    - +
    -
    +
    - [". elgg_echo('settings') ."]"; - } - ?> -

    - getID() . '/edit'; +if (elgg_view_exists($settings_view)) { + $link = elgg_get_site_url() . "pg/admin/plugin_settings/" . $plugin->getID(); + $settings_link = "[" . elgg_echo('settings') . "]"; +} +?> +

    manifest->getName() . " $version $settings_link"; ?>

    +
    +

    + + manifest->getApiVersion() < 1.8) { + $reqs = $plugin->manifest->getRequires(); + if (!$reqs) { + $message = elgg_echo('admin:plugins:warning:elgg_version_unknown'); + echo "

    $message

    "; + } + } - if ($manifest) { + if (!$can_activate) { + $message = elgg_echo('admin:plugins:warning:unmet_dependencies'); + echo "

    $message

    "; + } ?> -
    $manifest['description'])); ?>
    -

    : ". htmlspecialchars($manifest['author']) ?>

    -

    : ". htmlspecialchars($manifest['version']) ?>

    \ No newline at end of file diff --git a/views/default/admin/components/plugin_dependencies.php b/views/default/admin/components/plugin_dependencies.php new file mode 100644 index 000000000..9e0e284f1 --- /dev/null +++ b/views/default/admin/components/plugin_dependencies.php @@ -0,0 +1,45 @@ +package->checkDependencies(true); + +$columns = array('type', 'name', 'value', 'local_value', 'comment'); + +echo ' + +'; + +foreach ($columns as $column) { + $column = elgg_echo("admin:plugins:dependencies:$column"); + echo ""; +} + +echo ''; + +foreach ($deps as $dep) { + $fields = elgg_get_plugin_dependency_strings($dep); + + if ($dep['status']) { + $class = 'elgg-satisfied-dependency'; + } else { + $class = 'elgg-unsatisfied-dependency'; + } + + echo ""; + + foreach ($columns as $column) { + echo ""; + } + + echo ''; +} + +echo '
    $column
    {$fields[$column]}
    '; \ No newline at end of file diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php index ead930090..1138ace4f 100644 --- a/views/default/admin/plugins/advanced.php +++ b/views/default/admin/plugins/advanced.php @@ -4,25 +4,25 @@ * * Shows a list of all plugins sorted by load order. * - * @package Elgg - * @subpackage Core + * @package Elgg.Core + * @subpackage Admin.Plugins */ -regenerate_plugin_list(); -$installed_plugins = get_installed_plugins(); -$plugin_list = array(); -$show_category = get_input('category', NULL); +elgg_generate_plugin_entities(); +$installed_plugins = elgg_get_plugins('any'); +$show_category = get_input('category', null); // Get a list of the all categories // and trim down the plugin list if we're not viewing all categories. // @todo this could be cached somewhere after have the manifest loaded $categories = array(); -foreach ($installed_plugins as $id => $plugin) { - $plugin_categories = $plugin['manifest']['category']; +foreach ($installed_plugins as $plugin) { + $plugin_categories = $plugin->manifest->getCategories(); // handle plugins that don't declare categories - if ((!$plugin_categories && $show_category) || ($show_category && !in_array($show_category, $plugin_categories))) { + // unset them here because this is the list we foreach + if ($show_category && !in_array($show_category, $plugin_categories)) { unset($installed_plugins[$id]); } @@ -57,9 +57,13 @@ $category_form = elgg_view('input/form', array( // Page Header elements $title = elgg_view_title(elgg_echo('admin:plugins')); -// @todo Until "en/disable all" means "All plugins on this page" hide when not looking at all. +// @todo Until "en/deactivate all" means "All plugins on this page" hide when not looking at all. if (!isset($show_category) || empty($show_category)) { - $buttons = "url}action/admin/plugins/enableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('enableall')." url}action/admin/plugins/disableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('disableall')." "; + $activate_url = "{$CONFIG->url}action/admin/plugins/activate_all?__elgg_token=$token&__elgg_ts=$ts"; + $deactivate_url = "{$CONFIG->url}action/admin/plugins/deactivate_all?__elgg_token=$token&__elgg_ts=$ts"; + + $buttons = "" . elgg_echo('admin:plugins:activate_all') . ' '; + $buttons .= "" . elgg_echo('admin:plugins:deactivate_all') . ' '; $buttons .= "

    "; } else { $buttons = ''; @@ -76,25 +80,12 @@ $buttons .= $category_form;
    $foo) { - if ($key > $max) $max = $key; -} - // Display list of plugins -$n = 0; -foreach ($installed_plugins as $plugin => $data) { +foreach ($installed_plugins as $plugin) { echo elgg_view('admin/components/plugin', array( 'plugin' => $plugin, - 'details' => $data, - 'maxorder' => $max, - 'order' => array_search($plugin, $plugin_list) + 'max_priority' => $max_priority )); - $n++; } ?>