Preparing administrator for alternate autentication methods.

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

diff --git a/plugins/administrator/auth.php b/plugins/administrator/auth.php
new file mode 100644 (file)
index 0000000..eb6bd74
--- /dev/null
+++ b/plugins/administrator/auth.php
@@ -0,0 +1,19 @@
+<?php
+
+function adm_check_user() {
+
+    GLOBAL $username;
+
+    $auth = FALSE;
+    if ( $adm_id = fileowner('../config/config.php') ) {
+        $adm = posix_getpwuid( $adm_id );
+        if ( $username == $adm['name'] ) {
+            $auth = TRUE;
+        } 
+    }
+
+    return( $auth );
+
+}
+
+?>
\ No newline at end of file

diff --git a/plugins/administrator/options.php b/plugins/administrator/options.php
index 55e5da07a3d1918082033b09487fc75a1a10ea87..3d045bec5d76969e2e19742d0c459cc1346ee68a 100644 (file)
--- a/plugins/administrator/options.php
+++ b/plugins/administrator/options.php
@@ -136,18 +136,11 @@ require_once('../functions/page_header.php');
 require_once('../functions/imap.php');
 require_once('../src/load_prefs.php');
 require_once('../plugins/administrator/defines.php');
+require_once('../plugins/administrator/auth.php');
 
 GLOBAL $data_dir, $username;
 
-$auth = FALSE;
-if ( $adm_id = fileowner('../config/config.php') ) {
-    $adm = posix_getpwuid( $adm_id );
-    if ( $username == $adm['name'] ) {
-        $auth = TRUE;
-    }
-}
-
-if ( !auth ) {
+if ( !adm_check_user() ) {
     header("Location: ../../src/options.php") ;
     exit;
 }

diff --git a/plugins/administrator/setup.php b/plugins/administrator/setup.php
index a90859ae1279b097dafd9d48aabc3afbfd7abb77..45b0c875eea8e22f619c9ebc33ebe49befa02287 100644 (file)
--- a/plugins/administrator/setup.php
+++ b/plugins/administrator/setup.php
@@ -11,15 +11,14 @@
  * $Id$
  */
 
+require_once('../plugins/administrator/auth.php');
+
 function squirrelmail_plugin_init_administrator() {
     global $squirrelmail_plugin_hooks, $username;
 
-    if ( $adm_id = fileowner('../config/config.php') ) {
-        $adm = posix_getpwuid( $adm_id );
-        if ( $username == $adm['name'] ) {
-            $squirrelmail_plugin_hooks['optpage_register_block']['administrator'] =
-                                      'squirrelmail_administrator_optpage_register_block';
-        }
+    if ( adm_check_user() ) {        
+        $squirrelmail_plugin_hooks['optpage_register_block']['administrator'] =
+                                  'squirrelmail_administrator_optpage_register_block';
     }
 }