moving administrator check to option block registration. reduces amount of

code loaded during plugin's init. removing trailing linefeed from auth.php

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9915 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/administrator/auth.php b/plugins/administrator/auth.php
index 0ba719479d51764b6c9b3a40f45142fbb7229656..606058ad3fedcbc08978ec45f7db046eb84bc3e1 100644 (file)
--- a/plugins/administrator/auth.php
+++ b/plugins/administrator/auth.php
@@ -63,4 +63,4 @@ function adm_check_user() {
 function adm_array_trim(&$value,$key) {
     $value=trim($value);
 }
-?>
+?>
\ No newline at end of file

diff --git a/plugins/administrator/setup.php b/plugins/administrator/setup.php
index 94af22ac6706459ff1238199ffbc2561e0fee0ea..dd2ae82d8dc2506ea9966aabe0fea5785a022bbc 100644 (file)
--- a/plugins/administrator/setup.php
+++ b/plugins/administrator/setup.php
@@ -12,9 +12,6 @@
  * @subpackage administrator
  */
 
-/** @ignore */
-require_once(SM_PATH . 'plugins/administrator/auth.php');
-
 /**
  * Init the plugin
  * @access private
@@ -22,10 +19,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 +28,18 @@ 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');
 
-    $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
-    );
+    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
+            );
+    }
 }
 ?>
\ No newline at end of file