Heavy rewrite:

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

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 2d143e482410a1ec0a442506d1fcffb05244e4bb..77835dbec4f1cef40590e33665df4259046d9e73 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -120,13 +120,16 @@ function adminsCheckAdminAcl ($act, $wht) {
 }
 
 // Create email link to admins's account
-function adminsCreateEmailLink ($email, $mod='admin') {
+function generateAdminEmailLink ($email, $mod = 'admin') {
        // Is it an email?
-       if (strpos($email, "@") !== false) {
+       if (strpos($email, '@') !== false) {
                // Create email link
                $result = SQL_QUERY_ESC("SELECT `id`
-FROM `{!_MYSQL_PREFIX!}_admins`
-WHERE `email`='%s' LIMIT 1",
+FROM
+       `{!_MYSQL_PREFIX!}_admins`
+WHERE
+       `email`='%s'
+LIMIT 1",
                array($email), __FUNCTION__, __LINE__);
 
                // Is there an entry?
@@ -360,7 +363,7 @@ function adminsRemoveAdminAccount ($POST) {
 // List all admin accounts
 function adminsListAdminAccounts() {
        // Select all admin accounts
-       $result = SQL_QUERY("SELECT id, login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY login ASC", __FUNCTION__, __LINE__);
+       $result = SQL_QUERY("SELECT `id`, `login`, `email`, `default_acl` AS mode, `la_mode` FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `login` ASC", __FUNCTION__, __LINE__);
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
                // Compile some variables
@@ -369,7 +372,7 @@ function adminsListAdminAccounts() {
 
                // Prepare some more data
                $content['sw']         = $SW;
-               $content['email_link'] = generateMemberEmailLink($content['id']);
+               $content['email_link'] = generateEmailLink($content['id'], 'admins');
 
                // Load row template and switch color
                $OUT .= LOAD_TEMPLATE('admin_list_admins_row', true, $content);
@@ -387,9 +390,9 @@ function adminsListAdminAccounts() {
 // Filter for adding extra data to the query
 function FILTER_ADD_EXTRA_SQL_DATA ($add = '') {
        // Is the admins extension updated? (should be!)
-       if (GET_EXT_VERSION('admins') >= '0.3.0')   $add .= ", default_acl AS def_acl";
-       if (GET_EXT_VERSION('admins') >= '0.6.7') $add .= ", la_mode";
-       if (GET_EXT_VERSION('admins') >= '0.7.2') $add .= ", login_failures, UNIX_TIMESTAMP(last_failure) AS last_failure";
+       if (GET_EXT_VERSION('admins') >= '0.3.0') $add .= ', `default_acl` AS def_acl';
+       if (GET_EXT_VERSION('admins') >= '0.6.7') $add .= ', `la_mode`';
+       if (GET_EXT_VERSION('admins') >= '0.7.2') $add .= ', `login_failures`, UNIX_TIMESTAMP(`last_failure`) AS last_failure';
 
        // Return it
        return $add;