More usage of EL

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index c457b8489ee19f5f0fae92027b81cfca77074f7e..5c20771c895554e61dc23c185797c2dc215105ea 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -99,7 +99,7 @@ function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
                                $ret = 'done';
                        } else {
                                // Set status
-                               $ret = 'pass';
+                               $ret = 'password';
                        }
                } // END - if
        } // END - if
@@ -139,7 +139,7 @@ function ifAdminCookiesAreValid ($adminLogin, $passHash) {
                        $ret = 'done';
                } else {
                        // Set status
-                       $ret = 'pass';
+                       $ret = 'password';
                }
        } // END - if
 
@@ -623,7 +623,7 @@ function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
 
 // Creates a user-profile link for the admin. This function can also be used for many other purposes
 function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
-       if (($title == '') && ($userid > 0)) {
+       if (($title == '') && (isValidUserId($userid))) {
                // Set userid as title
                $title = $userid;
        } elseif ($userid == 0) {
@@ -1247,7 +1247,7 @@ function setAdminMenuHasEntries ($action, $hasEntries) {
 // Creates a link to the user's admin-profile
 function adminCreateUserLink ($userid) {
        // Is the userid set correctly?
-       if ($userid > 0) {
+       if (isValidUserId($userid)) {
                // Create a link to that profile
                return '{%url=modules.php?module=admin&what=list_user&userid=' . bigintval($userid) . '%}';
        } // END - if