]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Fixes #3917. Removed uses of admin interface in manifests. Removed related code.
authorBrett Profitt <brett.profitt@gmail.com>
Fri, 14 Oct 2011 05:08:26 +0000 (22:08 -0700)
committerBrett Profitt <brett.profitt@gmail.com>
Fri, 14 Oct 2011 05:08:26 +0000 (22:08 -0700)
39 files changed:
actions/admin/plugins/simple_update_states.php [deleted file]
documentation/examples/plugins/manifest.xml
engine/classes/ElggPluginManifest.php
engine/classes/ElggPluginManifestParser18.php
engine/lib/admin.php
engine/tests/api/plugins.php
engine/tests/test_files/plugin_18/manifest.xml
languages/en.php
mod/blog/manifest.xml
mod/bookmarks/manifest.xml
mod/categories/manifest.xml
mod/custom_index/manifest.xml
mod/dashboard/manifest.xml
mod/developers/manifest.xml
mod/diagnostics/manifest.xml
mod/embed/manifest.xml
mod/externalpages/manifest.xml
mod/file/manifest.xml
mod/garbagecollector/manifest.xml
mod/groups/manifest.xml
mod/htmlawed/manifest.xml
mod/invitefriends/manifest.xml
mod/likes/manifest.xml
mod/logbrowser/manifest.xml
mod/logrotate/manifest.xml
mod/members/manifest.xml
mod/messageboard/manifest.xml
mod/messages/manifest.xml
mod/notifications/manifest.xml
mod/pages/manifest.xml
mod/profile/manifest.xml
mod/reportedcontent/manifest.xml
mod/search/manifest.xml
mod/tagcloud/manifest.xml
mod/thewire/manifest.xml
mod/tinymce/manifest.xml
mod/twitter/manifest.xml
mod/uservalidationbyemail/manifest.xml
mod/zaudio/manifest.xml

diff --git a/actions/admin/plugins/simple_update_states.php b/actions/admin/plugins/simple_update_states.php
deleted file mode 100644 (file)
index 7601013..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Bulk activate/deactivate for plugins appearing in the "simple" interface.
- *
- * Plugins marked as using the "simple" interface can be activated/deactivated
- * en masse by passing the plugins to activate as an array of their plugin guids
- * in $_REQUEST['enabled_plugins'].  All "simple" plugins not in this array will be
- * deactivated.
- *
- * Simplecache and views cache are reset.
- *
- * @uses array $_REQUEST['activated_plugin_guids'] Array of plugin guids to activate.
- *
- * @since 1.8
- * @package Elgg.Core
- * @subpackage Administration.Plugins
- */
-
-$active_plugin_guids = get_input('active_plugin_guids', array());
-$installed_plugins = elgg_get_plugins('any');
-$success = TRUE;
-
-foreach ($installed_plugins as $plugin) {
-       // this is only for simple plugins.
-       if ($plugin->getManifest()->getAdminInterface() != 'simple') {
-               continue;
-       }
-
-       // only effect changes to plugins not already in that state.
-       if ($plugin->isActive() && !in_array($plugin->guid, $active_plugin_guids)) {
-               $success = $success && $plugin->deactivate();
-       } elseif (!$plugin->isActive()  && in_array($plugin->guid, $active_plugin_guids)) {
-               $success = $success && $plugin->activate();
-       }
-}
-
-if ($success) {
-       //system_message(elgg_echo('admin:plugins:simple_simple_success'));
-} else {
-       register_error(elgg_echo('admin:plugins:simple_simple_fail'));
-}
-
-// don't regenerate the simplecache because the plugin won't be
-// loaded until next run.  Just invalidate and let it regnerate as needed
-elgg_invalidate_simplecache();
-elgg_filepath_cache_reset();
-
-forward(REFERER);
\ No newline at end of file
index 1602a735821adb701343918db51b1cb705743845..2a8a2bd5c1dbc65f75e536628d66ae9fbd66f98e 100644 (file)
        <category>admin</category>
        <category>api</category>
 
-       <on_enable>setup_function</on_enable>
-       <on_disable>teardown_function</on_disable>
-       <admin_interface>simple</admin_interface>
-
        <requires>
                <type>php_extension</type>
                <name>gd</name>
index 0e47f388de850ed9df4fb71be7453e8478f27b06..eacc16455875db7f1aebec4621d8080d7c4b12a5 100644 (file)
@@ -552,24 +552,6 @@ class ElggPluginManifest {
                return $normalized;
        }
 
-       /**
-        * Returns the admin interface to use.
-        *
-        *  @return string simple or advanced
-        */
-       public function getAdminInterface() {
-               $interface = $this->parser->getAttribute('admin_interface');
-
-               switch ($interface) {
-                       case 'simple':
-                       case 'advanced':
-                               return $interface;
-
-                       default:
-                               return 'advanced';
-               }
-       }
-
        /**
         * Returns the admin interface to use.
         *
index db8b3dc6a51e22758394ef01c2ea556a561c5ac3..554e28c0284dcf5d45ad1f6447c5a45a547acbe8 100644 (file)
@@ -16,7 +16,7 @@ class ElggPluginManifestParser18 extends ElggPluginManifestParser {
                'name', 'author', 'version', 'blurb', 'description',
                'website', 'copyright', 'license', 'requires', 'suggests',
                'screenshot', 'category', 'conflicts', 'provides',
-               'admin_interface', 'activate_on_install'
+               'activate_on_install'
        );
 
        /**
@@ -46,7 +46,6 @@ class ElggPluginManifestParser18 extends ElggPluginManifestParser {
                                case 'website':
                                case 'copyright':
                                case 'license':
-                               case 'admin_interface':
                                case 'activate_on_install':
                                        $parsed[$element->name] = $element->content;
                                        break;
index d12baed504e0680054ac8b0a4473e08c4cf406b8..ae6429baf4d3d443bb5c711f7927e20a7aa1d7fc 100644 (file)
@@ -230,8 +230,6 @@ function admin_init() {
 
        elgg_register_action('admin/delete_admin_notice', '', 'admin');
 
-       elgg_register_action('admin/plugins/simple_update_states', '', 'admin');
-
        elgg_register_action('profile/fields/reset', '', 'admin');
        elgg_register_action('profile/fields/add', '', 'admin');
        elgg_register_action('profile/fields/edit', '', 'admin');
index 72092b688e13cba1e33f8e2522379abcf492ad5d..8f5f5dd1e5adff1a4f5711da3ea7e257d05857cd 100644 (file)
@@ -105,7 +105,6 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
                                array('type' => 'plugin', 'name' => 'facebook_connect', 'version' => 1.0),
                        ),
 
-                       'admin_interface' => 'simple',
                        'activate_on_install' => true
                );
 
@@ -265,10 +264,6 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
                $this->assertEqual($this->manifest17->getConflicts(), array());
        }
 
-       public function testElggPluginManifestGetAdminInterface() {
-               $this->assertEqual($this->manifest18->getAdminInterface(), 'simple');
-       }
-
        public function testElggPluginManifestGetActivateOnInstall() {
                $this->assertEqual($this->manifest18->getActivateOnInstall(), true);
        }
index 23f0fa0bfe7d6999a2c4eb446ed63c0a2d2bf35e..445a41c2e25660bf82010d9179be21473e1ad200 100644 (file)
@@ -34,7 +34,6 @@
 
        <category>ServiceAPI</category>
 
-       <admin_interface>simple</admin_interface>
        <activate_on_install>true</activate_on_install>
 
        <requires>
index 9967bc34d6125e0db9c4bcbbc86e8d4a347e8238..67e447901658ef94ccf539a03242955ee82cb309 100644 (file)
@@ -686,12 +686,7 @@ $english = array(
        'admin:plugins:plugin_website' => 'Plugin website',
        'admin:plugins:author' => '%s',
        'admin:plugins:version' => 'Version %s',
-       'admin:plugins:simple' => 'Simple',
-       'admin:plugins:advanced' => 'Advanced',
        'admin:plugin_settings' => 'Plugin Settings',
-       'admin:plugins:simple_simple_fail' => 'Could not save settings.',
-       'admin:plugins:simple_simple_success' => 'Settings saved.',
-       'admin:plugins:simple:cannot_activate' => 'Cannot activate this plugin. Check the advanced plugin admin area for more information.',
        'admin:plugins:warning:unmet_dependencies_active' => 'This plugin is active but has unmet dependencies. You may encounter problems. See "more info" below for details.',
 
        'admin:plugins:dependencies:type' => 'Type',
index 9914620608c20207e74062b70dd94a43609f0f57..dfbd7a1a649153702c17438261dfdefeeef0cade 100644 (file)
@@ -15,6 +15,5 @@
                <type>elgg_version</type>
                <version>2010030101</version>
        </requires>
-       <admin_interface>simple</admin_interface>
        <activate_on_install>true</activate_on_install>
 </plugin_manifest>
index 72e9af9b07f26eea9a9bc77415a5d4926bc719d5..24969b837e06924b993df9a40755d44d574a32dc 100644 (file)
@@ -16,5 +16,4 @@
                <version>2010030101</version>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>simple</admin_interface>
 </plugin_manifest>
index 15d7192c1baf1c9a56c44f0efaaa4433ee8870c6..db6f0324fab29ceb5148a94d950ffdeb581b4ae2 100644 (file)
@@ -14,5 +14,4 @@
                <type>elgg_version</type>
                <version>2010030101</version>
        </requires>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>
index 7bb2a2543c110e2ed7893872d832ffee92443a68..dd00f2c491a1ae2f5b96da7fb294bac1a2b6f356 100644 (file)
@@ -12,5 +12,4 @@
                <type>elgg_version</type>
                <version>2009030702</version>
        </requires>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>
index b5e9cff2ef842b771b4b4080f6becec7a7961411..7096fc86aad3e3d228ab6e1311cc346a3882177a 100644 (file)
@@ -12,5 +12,4 @@
                <type>elgg_version</type>
                <version>2010030101</version>
        </requires>
-       <admin_interface>advanced</admin_interface>
-</plugin_manifest>
\ No newline at end of file
+</plugin_manifest>
index 4a7ed82bd1406ef5eaa24e62a501af106ee68867..25840e1649a9ff13d6cc7d4d2b9e4860cbd782b7 100644 (file)
@@ -15,7 +15,4 @@
                <type>elgg_version</type>
                <version>2009030802</version>
        </requires>
-
-       <admin_interface>advanced</admin_interface>
-
 </plugin_manifest>
index e85b19aefd420a10a4d73f54dbe8a58cb0d3be51..5ebd7cf55b23ff66817afc04076addfa631cf6da 100644 (file)
@@ -14,5 +14,4 @@
                <type>elgg_version</type>
                <version>2010030101</version>
        </requires>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>
index 02c0123301e1891061620abe4b00081a062a9548..27e9b9adac8340db143d628c077ccb1b576fab83 100644 (file)
@@ -18,5 +18,4 @@
                <name>file</name>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>
index 32528585d080d76276f8c904299840f723dc944b..4064ea602a27d8ace1c25339ae3bba1e5b6ed253 100644 (file)
@@ -12,5 +12,4 @@
                <type>elgg_version</type>
                <version>2010030101</version>
        </requires>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>
index aac9c3f6b7951ffcc05779535d99608f5c6d278e..8a80e38dc80a2f6f0f1efc385799b24a51850a9c 100644 (file)
@@ -14,6 +14,5 @@
                <type>elgg_version</type>
                <version>2010030101</version>
        </requires>
-       <admin_interface>simple</admin_interface>
        <activate_on_install>true</activate_on_install>
 </plugin_manifest>
index 466e49d61d450fe5343c11bba5907493785a1f15..0da71cd6b4d875c193b1d83a4b435179e2d568f0 100644 (file)
@@ -14,5 +14,4 @@
                <version>2009030702</version>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>
index 4188aa8614b17c0d4e034e75e030f85057e75f12..542e9de0155abb1d0072a2351f1f73fb8b2215c8 100644 (file)
@@ -15,5 +15,4 @@
                <version>2010030101</version>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>simple</admin_interface>
 </plugin_manifest>
index 0c48bbd28fd52ae557a946cdf3c8d9e80d7e6926..b176834e5376feeebae52a64b05dd96537014b6e 100644 (file)
@@ -14,5 +14,4 @@
                <version>2009041701</version>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>
index e02c19c36614e3ec88236f34971cb8d28c176966..75a2d17f2c0970d8793df24a77c769d31408fe6c 100644 (file)
@@ -13,6 +13,5 @@
                <type>elgg_version</type>
                <version>2010030101</version>
        </requires>
-       <admin_interface>advanced</admin_interface>
        <activate_on_install>true</activate_on_install>
 </plugin_manifest>
index f63c643a64610da3feae541ae052946dea6a3cdb..946cfd86bd95e9918553b11a7652ee8e798c7ead 100644 (file)
@@ -14,5 +14,4 @@
                <version>2010030101</version>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>advanced</admin_interface>
-</plugin_manifest>
\ No newline at end of file
+</plugin_manifest>
index 585288912327592f18b343ba0e43cb518ff7b492..846ad155aa1e8ffc1a900276e0776c82d2fca0a8 100644 (file)
@@ -14,5 +14,4 @@
                <version>2009030702</version>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>
index ab6250ac02951ef32eb72c5c47baff09fbe8110c..503bf6cd1a471e07f55aec07cbd7e2713fe5a943 100644 (file)
@@ -14,5 +14,4 @@
                <version>2009030702</version>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>
index b96684198bff0c77d06ccd4743b1042489d06158..f5e95eb41f1714c455eab2c8163105fa998d4150 100644 (file)
@@ -13,5 +13,4 @@
                <version>2010030101</version>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>advanced</admin_interface>
-</plugin_manifest>
\ No newline at end of file
+</plugin_manifest>
index 25c42ee936cb1a8aa93228adfcd4bd325b5042e4..5881c4e46b93fafae1437c7ef1371894a5649d7a 100644 (file)
@@ -14,5 +14,4 @@
                <version>2010030101</version>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>simple</admin_interface>
 </plugin_manifest>
index 66ca4b44423e691136c72a3026a6c8fa893ddf3a..30acc240de00010f57d01abb27374c8453127c8d 100644 (file)
@@ -14,5 +14,4 @@
                <version>2010030101</version>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>simple</admin_interface>
 </plugin_manifest>
index 16a67cb005d7833b0b8cdd96ddf07d177bcdd4f6..97b88fb756f0c8157121ea8a885827e4e9b735dd 100644 (file)
@@ -12,6 +12,5 @@
                <type>elgg_version</type>
                <version>2010030101</version>
        </requires>
-       <admin_interface>advanced</admin_interface>
        <activate_on_install>true</activate_on_install>
 </plugin_manifest>
index 4b5e5c7472165cd7dc5836996acf06cf5d3b22c1..a91881cab0698fa6dd7cb6f7ef0c3e0eb4d74131 100644 (file)
@@ -14,6 +14,5 @@
                <type>elgg_version</type>
                <version>2010030101</version>
        </requires>
-       <admin_interface>simple</admin_interface>
        <activate_on_install>true</activate_on_install>
 </plugin_manifest>
index d811e373bd1ef6960183d0b89ab4920dbcfe4aed..a1cff4dc205408d45e00aad13a794f791faf86b9 100644 (file)
@@ -10,7 +10,6 @@
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU Public License Version 2</license>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>advanced</admin_interface>
        <requires>
                <type>elgg_version</type>
                <version>2011010401</version>
index c51134608d31748a75f7c92e251ffcad0a82101e..d65b55ca3476cdf495ee3a2171ef5445f25b4760 100644 (file)
@@ -13,5 +13,4 @@
                <version>2010030101</version>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>
index 053e22178e5d8c5f07632b3172d1ab0ed9a7d4c1..b13e127d018a5334766dacc242e6f41be54149d0 100644 (file)
@@ -13,5 +13,4 @@
                <version>2009030702</version>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>
index 6fcad14e2b96dea11911be74c4cb2668ef34d13f..7c64829fc4706d31ccf9eb857ecf2f079186e890 100644 (file)
@@ -13,5 +13,4 @@
                <type>elgg_version</type>
                <version>2010030101</version>
        </requires>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>
index 27dd5732d69b5af930b7e511f742b3790a5e1704..74e811bed1230a2463a0a64deb0197c87eda06ec 100644 (file)
@@ -13,6 +13,5 @@
                <type>elgg_version</type>
                <version>2010030101</version>
        </requires>
-       <admin_interface>simple</admin_interface>
        <activate_on_install>true</activate_on_install>
 </plugin_manifest>
index 5e69055d871ebb1449a3fea5d0ae2e96a1dbd643..2d062d3993dfe15503fabfae413fd21e873138e9 100644 (file)
@@ -14,5 +14,4 @@
                <version>2010030101</version>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>
index bd71766206f5fa01bc9cfd04361a245573ae3c02..ffb6ccc05758101952e9d5a91644beca2249ab43 100644 (file)
@@ -13,5 +13,4 @@
                <type>elgg_version</type>
                <version>2010030101</version>
        </requires>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>
index df0a7cb58f99ebcfb49502a62d19b0a087a27505..3358e11199a7467b2bef2aa30da7bb5227038918 100644 (file)
@@ -14,5 +14,4 @@
                <version>2009033101</version>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>
index ecbff85feb5b92826de52392c41f793bf617b0ad..423a7e86369cb4ebbd51d81f3aa8988d6953bc68 100644 (file)
@@ -15,5 +15,4 @@
                <version>2010111501</version>
        </requires>
        <activate_on_install>true</activate_on_install>
-       <admin_interface>advanced</admin_interface>
 </plugin_manifest>