Changeset 2256 for branches

Timestamp:

11/26/10 15:59:08 (18 months ago)

Author:

petsagouris

Message:

[Branch 1.5] Various too small edits out of me being a code monkey (code formatting).

Files:

• branches/1.5/libs/AdminAuth.php (modified) (11 diffs)

branches/1.5/libs/AdminAuth.php

@@ -32 +32 @@
         {
                 // Authenticate the admin if the User Signin plugin is INACTIVE:
-                if (!$h->isActive('signin'))
-                {
-                        if (($h->pageName != 'admin_login') && !$this->isAdminCookie($h))
-                        {
-                                header('Location: ' . SITEURL . 'admin_index.php?page=admin_login');
-                                die; exit;
-                        }
-                }
-                
+                if (!$h->isActive('signin')) {
+                        if (($h->pageName != 'admin_login') && !$this->isAdminCookie($h)) {
+                                header('Location: '.SITEURL.'admin_index.php?page=admin_login');
+                                die;
+                                exit;
+                        }
+                }
+
                 // Authenticate the admin if a Signin plugin is ACTIVE and site is OPEN:
-                if (is_object($h->currentUser) && $h->isActive('signin') && (SITE_OPEN == 'true'))
-                {
+                if (is_object($h->currentUser) && $h->isActive('signin') && (SITE_OPEN == 'true')) {
                         // This first condition happens when the Users plugin is activated 
                         // and there's no cookie for the Admin yet.
-                        if (($h->currentUser->name == "") && $h->isActive('signin')) 
-                        {
-                                header('Location: ' . SITEURL . 'index.php?page=login');
-                                die; exit;
-                        } 
-                        elseif ($h->currentUser->getPermission('can_access_admin') != 'yes') 
-                        {
+                        if (($h->currentUser->name == "") && $h->isActive('signin')) {
+                                header('Location: '.SITEURL.'index.php?page=login');
+                                die;
+                                exit;
+                        } elseif ($h->currentUser->getPermission('can_access_admin') != 'yes') {
                                 // maybe the user has permission to access a specific plugin settings page?
                                 $plugin = $h->cage->get->testAlnumLines('plugin');
                                 if ($plugin && ($h->pageName == "plugin_settings")) {
-                                        $permission = "can_" . $plugin . "_settings";
+                                        $permission = "can_".$plugin."_settings";
                                         if ($h->currentUser->getPermission($permission) == 'yes') {
-                                                $h->sidebars = false; // hide sidebars
+                                                $h->sidebars = FALSE; // hide sidebars
                                                 $h->displayTemplate('index');
-                                                die(); exit;
+                                                die();
+                                                exit;
                                         }
                                 }
-                                
+
                                 // User doesn't have permission to access Admin
                                 $h->messages[$h->lang['main_access_denied']] = 'red';
                                 $h->displayTemplate('admin_denied');
-                                die(); exit;
-                        }
-                }
-                
+                                die();
+                                exit;
+                        }
+                }
+
                 // If we get this far, we know that the user has admin access.
-                
+
                 return $h->pageName;
         }
-        
-        
-         /**
+
+        /**
          * Admin login
          * 
@@ -85 +82 @@
         {
                 // Check username
-                if (!$username_check = $h->cage->post->testUsername('username')) { 
-                        $username_check = ''; 
-                } 
-                
+                if (!$username_check = $h->cage->post->testUsername('username')) {
+                        $username_check = '';
+                }
+
                 // Check password
                 if (!$password_check = $h->cage->post->testPassword('password')) {
-                        $password_check = ''; 
-                }
-                
+                        $password_check = '';
+                }
+
                 if ($h->cage->post->keyExists('login_attempted') || $h->cage->post->keyExists('forgotten_password')) {
                         // if either the login or forgot password form is submitted, check the CSRF key
-                        
+
                         if (!$h->csrf()) {
                                 $h->message = $h->lang["error_csrf"];
                                 $h->messageType = "red";
-                                return false;
-                        }
-                }
-                
-                if ($username_check != '' || $password_check != '') 
-                {
+                                return FALSE;
+                        }
+                }
+
+                if ($username_check != '' || $password_check != '') {
                         $login_result = $h->currentUser->loginCheck($h, $username_check, $password_check);
-                        
+
                         if ($login_result) {
                                 //success
@@ -113 +109 @@
                                 $h->currentUser->getUser($h, 0, $username_check);
                                 $this->setAdminCookie($h, $username_check);
-                                $h->currentUser->loggedIn = true;
+                                $h->currentUser->loggedIn = TRUE;
                                 $h->currentUser->updateUserLastLogin($h);
-                                $h->sidebars = true;
+                                $h->sidebars = TRUE;
                                 $h->pageName = 'admin_home'; // a wee hack
-                                return true;
+                                return TRUE;
                         } else {
                                 // login failed
@@ -123 +119 @@
                                 $h->messageType = "red";
                         }
-                } 
-                else 
-                {
+                } else {
                         if ($h->cage->post->keyExists('login_attempted')) {
                                 $h->message = $h->lang["admin_login_failed"];
@@ -132 +126 @@
                         $username_check = '';
                         $password_check = '';
-                        
+
                         // forgotten password request
                         if ($h->cage->post->keyExists('forgotten_password')) {
                                 $this->adminPassword($h);
                         }
-                        
+
                         // confirming forgotten password email
                         $passconf = $h->cage->get->getAlnum('passconf');
                         $userid = $h->cage->get->testInt('userid');
-                        
+
                         if ($passconf && $userid) {
                                 if ($h->currentUser->newRandomPassword($h, $userid, $passconf)) {
@@ -152 +146 @@
                         }
                 }
-                
-                return false;
-        }
-        
-        
-         /**
+
+                return FALSE;
+        }
+
+        /**
          * Admin password forgotten
          * 
@@ -165 +158 @@
         {
                 // Check email
-                if (!$email_check = $h->cage->post->testEmail('email')) { 
-                        $email_check = ''; 
+                if (!$email_check = $h->cage->post->testEmail('email')) {
+                        $email_check = '';
                         // login failed
                         $h->message = $h->lang["admin_login_email_invalid"];
                         $h->messageType = "red";
-                        return false;
-                } 
+                        return FALSE;
+                }
 
                 $valid_email = $h->emailExists($email_check, 'admin');
                 $userid = $h->getUserIdFromEmail($valid_email);
-                
+
                 if ($valid_email && $userid) {
                         //success
@@ -181 +174 @@
                         $h->message = $h->lang['admin_email_password_conf_sent'];
                         $h->messageType = "green";
-                        return true;
+                        return TRUE;
                 } else {
                         // login failed
                         $h->message = $h->lang["admin_login_email_invalid"];
                         $h->messageType = "red";
-                        return false;
-                }
-        }
-        
-        
-         /**
+                        return FALSE;
+                }
+        }
+
+        /**
          * Admin login form
          */
@@ -199 +191 @@
                 if (!$username_check = $h->cage->post->testUsername('username')) {
                         $username_check = '';
-                } 
-                
+                }
+
                 // Check password
                 if (!$password_check = $h->cage->post->testPassword('password')) {
-                        $password_check = ''; 
-                }
-                
+                        $password_check = '';
+                }
+
                 // Check email (for forgotten password form)
                 if (!$email_check = $h->cage->post->testEmail('email')) {
-                        $email_check = ''; 
-                }
-                
-                require_once(ADMIN_THEMES . ADMIN_THEME . 'admin_login.php');
-        }
-        
-        
+                        $email_check = '';
+                }
+
+                require_once(ADMIN_THEMES.ADMIN_THEME.'admin_login.php');
+        }
+
         /**
          * Set a 30-day cookie for the administrator
@@ -222 +213 @@
         public function setAdminCookie($h)
         {
-                if (!$h->currentUser->name) 
-                { 
+                if (!$h->currentUser->name) {
                         echo $this->lang["admin_login_error_cookie"];
-                        return false;
-                } 
-                else 
-                {
-                        $strCookie=base64_encode(
-                                join(':', array($h->currentUser->name, 
-                                $h->currentUser->generateHash($h->currentUser->name, md5(SITEURL)),
-                                md5($h->currentUser->password)))
+                        return FALSE;
+                } else {
+                        $strCookie = base64_encode(
+                                                        join(':', array($h->currentUser->name,
+                                                                $h->currentUser->generateHash($h->currentUser->name, md5(SITEURL)),
+                                                                md5($h->currentUser->password)))
                         );
-                        
+
                         // (2592000 = 60 seconds * 60 mins * 24 hours * 30 days.)
                         $month = 2592000 + time();
-                        
+
                         if (strpos(SITEURL, "localhost") !== false) {
-                             setcookie("hotaru_user", $h->currentUser->name, $month, "/");
-                             setcookie("hotaru_key", $strCookie, $month, "/");
+                                setcookie("hotaru_user", $h->currentUser->name, $month, "/");
+                                setcookie("hotaru_key", $strCookie, $month, "/");
                         } else {
-                             $parsed = parse_url(SITEURL); 
-                                        
-                             // now we need a dot in front of that so cookies work across subdomains:
-                             setcookie("hotaru_user", $h->currentUser->name, $month, "/", "." . $parsed['host']);
-                             setcookie("hotaru_key", $strCookie, $month, "/", "." . $parsed['host']);
-                        }  
-                        
-                        return true;
-                }
-        }
-
-         /**
-         *  Checks if a cookie exists and if it belongs to an Admin user
+                                $parsed = parse_url(SITEURL);
+
+                                // now we need a dot in front of that so cookies work across subdomains:
+                                setcookie("hotaru_user", $h->currentUser->name, $month, "/", ".".$parsed['host']);
+                                setcookie("hotaru_key", $strCookie, $month, "/", ".".$parsed['host']);
+                        }
+
+                        return TRUE;
+                }
+        }
+
+        /**
+         * Checks if a cookie exists and if it belongs to an Admin user
+         * NOTE: This is ONLY used if the User Signin plugin is inactive.
          *
          * @return bool
-         *
-         * NOTE!!! This is ONLY used if the User Signin plugin is inactive.
          */
         public function isAdminCookie($h)
         {
-                if (!$h->currentUser->checkCookie($h)) { return false; }
-                
-                if (!$h->isAdmin($h->currentUser->name)) { return false; }
+                if (!$h->currentUser->checkCookie($h)) {
+                        return FALSE;
+                }
+
+                if (!$h->isAdmin($h->currentUser->name)) {
+                        return FALSE;
+                }
 
                 //success...
-                return true;
-        }
-        
-         /**
+                return TRUE;
+        }
+
+        /**
          * Admin logout
          *
@@ -278 +269 @@
         {
                 $h->currentUser->destroyCookieAndSession();
-                header("Location: " . SITEURL);
-                return true;
-        }
+                header("Location: ".SITEURL);
+                return TRUE;
+        }
+
 }
-?>