diff --git a/main/admin/index.php b/main/admin/index.php index 3a5ac68b7a..10edcf5006 100644 --- a/main/admin/index.php +++ b/main/admin/index.php @@ -502,12 +502,12 @@ if (api_is_platform_admin()) { $items = array(); foreach ($menuAdministratorItems as $pluginName) { - $pluginInfo = $plugin_obj->getPluginInfo($pluginName); + $pluginInfo = $plugin_obj->getPluginInfo($pluginName, true); /** @var \Plugin $plugin */ $plugin = $pluginInfo['obj']; $pluginUrl = $plugin->getAdminUrl(); - if (!$pluginUrl) { + if (empty($pluginUrl)) { continue; } @@ -518,7 +518,7 @@ if (api_is_platform_admin()) { } $blocks['plugins']['items'] = $items; - $blocks['plugins']['extra'] = null; + $blocks['plugins']['extra'] = ''; } } diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php index daf76b55be..02c903a3ec 100644 --- a/main/inc/lib/api.lib.php +++ b/main/inc/lib/api.lib.php @@ -3371,7 +3371,7 @@ function api_not_allowed( $show_headers = 1; } - $tpl = new Template(null, $show_headers, $show_headers); + $tpl = new Template(null, $show_headers, $show_headers, false, true, false); $tpl->assign('hide_login_link', 1); $tpl->assign('content', $msg); diff --git a/main/inc/lib/plugin.class.php b/main/inc/lib/plugin.class.php index 139469a45d..ba3a79bd12 100755 --- a/main/inc/lib/plugin.class.php +++ b/main/inc/lib/plugin.class.php @@ -897,12 +897,12 @@ class Plugin /** * Get the admin URL for the plugin if Plugin::isAdminPlugin is true - * @return null|string + * @return string */ public function getAdminUrl() { if (!$this->isAdminPlugin) { - return null; + return ''; } $name = $this->get_name(); @@ -917,6 +917,6 @@ class Plugin return "$webPath/start.php"; } - return null; + return ''; } } diff --git a/main/inc/lib/plugin.lib.php b/main/inc/lib/plugin.lib.php index 722a766fef..770eb8a66e 100755 --- a/main/inc/lib/plugin.lib.php +++ b/main/inc/lib/plugin.lib.php @@ -411,7 +411,6 @@ class AppPlugin public function getPluginInfo($plugin_name, $forced = false) { $pluginData = Session::read('plugin_data'); - if (isset($pluginData[$plugin_name]) && $forced == false) { return $pluginData[$plugin_name]; } else { diff --git a/plugin/redirection/RedirectionPlugin.php b/plugin/redirection/RedirectionPlugin.php index 107175b7d7..791153db69 100644 --- a/plugin/redirection/RedirectionPlugin.php +++ b/plugin/redirection/RedirectionPlugin.php @@ -8,6 +8,8 @@ */ class RedirectionPlugin extends Plugin { + public $isAdminPlugin = true; + /** * Class constructor */ @@ -15,11 +17,13 @@ class RedirectionPlugin extends Plugin { $version = '1.0'; $author = 'Enrique Alcaraz, Julio Montoya'; - parent::__construct($version, $author, ['enabled' => 'boolean']); + $this->isAdminPlugin = true; } - + /** + * @return RedirectionPlugin + */ public static function create() { static $result = null; diff --git a/plugin/redirection/admin.php b/plugin/redirection/admin.php new file mode 100644 index 0000000000..28d22c9e24 --- /dev/null +++ b/plugin/redirection/admin.php @@ -0,0 +1,5 @@ + +$content = '
- +
- -
- - '; - echo ''; - echo ''; - echo ''; - echo ''; - } - ?> -
User URL
'.$userName.''.$item['url'].'Delete
-
- +'; + +foreach ($list as $item) { + $userInfo = api_get_user_info($item['user_id']); + $userName = get_lang('Unknown'); + if (!empty($userInfo)) { + $userName = $userInfo['complete_name_with_username'].' - '.$item['user_id']; + } + $content.= ''; + $content.= ''.$userName.''; + $content.= ''.$item['url'].''; + $content.= 'Delete'; + $content.= ''; +} + +$content.= ' + +'; -Display::display_footer(); \ No newline at end of file +$tpl = new Template( + '', + true, + true, + false, + false, + false +); +$tpl->assign('content', $content); +$tpl->display_one_col_template();