Prevent endless recursive sent subfolder names - see: http://thread.gmane.org/gmane...

[squirrelmail.git] / plugins / administrator / setup.php

diff --git a/plugins/administrator/setup.php b/plugins/administrator/setup.php
index 94af22ac6706459ff1238199ffbc2561e0fee0ea..2b6dbc597802906bdfb2af73d4bcdb024c3be4c5 100644 (file)
--- a/plugins/administrator/setup.php
+++ b/plugins/administrator/setup.php
@@ -1,20 +1,18 @@
 <?php
+
 /**
  * Administrator plugin - Setup script
  *
  * Plugin allows remote administration.
  *
- * @version $Id$
  * @author Philippe Mingo
- * @copyright (c) 1999-2005 The SquirrelMail Project Team
+ * @copyright 1999-2012 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
  * @package plugins
  * @subpackage administrator
  */
 
-/** @ignore */
-require_once(SM_PATH . 'plugins/administrator/auth.php');
-
 /**
  * Init the plugin
  * @access private
@@ -22,10 +20,8 @@ require_once(SM_PATH . 'plugins/administrator/auth.php');
 function squirrelmail_plugin_init_administrator() {
     global $squirrelmail_plugin_hooks;
 
-    if ( adm_check_user() ) {
-        $squirrelmail_plugin_hooks['optpage_register_block']['administrator'] =
-                                  'squirrelmail_administrator_optpage_register_block';
-    }
+    $squirrelmail_plugin_hooks['optpage_register_block']['administrator'] =
+        'squirrelmail_administrator_optpage_register_block';
 }
 
 /**
@@ -33,13 +29,17 @@ function squirrelmail_plugin_init_administrator() {
  * @access private
  */
 function squirrelmail_administrator_optpage_register_block() {
-    global $optpage_blocks;
+    /** add authentication functions */
+    include_once(SM_PATH . 'plugins/administrator/auth.php');
+
+    if ( adm_check_user() ) {
+        global $optpage_blocks;
 
-    $optpage_blocks[] = array(
-        'name' => _("Administration"),
-        'url'  => SM_PATH . 'plugins/administrator/options.php',
-        'desc' => _("This module allows administrators to manage SquirrelMail main configuration remotely."),
-        'js'   => false
-    );
+        $optpage_blocks[] = array(
+            'name' => _("Administration"),
+            'url'  => SM_PATH . 'plugins/administrator/options.php',
+            'desc' => _("This module allows administrators to manage SquirrelMail main configuration remotely."),
+            'js'   => false
+            );
+    }
 }
-?>
\ No newline at end of file