Performance hacks, encapsulation and more EL code usage:

[mailer.git] / inc / libs / admins_functions.php

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 2f084b8d3740c0dffd139ace88972c39a478b324..3e650a1f5a69a589a055bd225ba075b69972b3bb 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -187,17 +187,19 @@ function adminsChangeAdminAccount ($postData, $element = '') {
                                // Rewrite cookie when it's own account
                                if ($adminId == $id) {
                                        // Set timeout cookie
-                                       setSession('admin_last', time());
+                                       setAdminLast(time());
 
-                                       if ($adminId != getSession('admin_id')) {
+                                       if ($adminId != getCurrentAdminId()) {
                                                // Update login cookie
-                                               setSession('admin_id', $adminId);
+                                               setAdminId($adminId);
 
                                                // Update password cookie as well?
-                                               if (!empty($add)) setSession('admin_md5', $hash);
-                                       } elseif (generateHash($postData['pass1'][$id], $salt) != getSession('admin_md5')) {
+                                               if (!empty($add)) {
+                                                       setAdminMd5($hash);
+                                               } // END - if
+                                       } elseif (generateHash($postData['pass1'][$id], $salt) != getAdminMd5()) {
                                                // Update password cookie
-                                               setSession('admin_md5', $hash);
+                                               setAdminMd5($hash);
                                        }
                                } // END - if
 
@@ -689,7 +691,7 @@ function FILTER_REHASH_ADMINS_PASSWORD ($data) {
        adminsChangeAdminAccount($postData);
 
        // Update cookie/session and data array
-       setSession('admin_md5', encodeHashForCookie($newHash));
+       setAdminMd5(encodeHashForCookie($newHash));
        $data['pass_hash'] = $newHash;
 
        // Always make sure the cache is destroyed