Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

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

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index de6dcd93b84a493006601988e259b8862a883335..2b9a008104a0f62eba50c5211716320e03192b45 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -110,14 +110,14 @@ function adminsCheckAdminAcl ($action, $what) {
        }
 
        // Check ACL and (maybe) allow
-       //* DEBUG: */ print 'default='.$default.',acl_mode='.$acl_mode.',parent='.intval($parent).'<br />';
+       //* DEBUG: */ debugOutput('default='.$default.',acl_mode='.$acl_mode.',parent='.intval($parent));
        if (($default == 'allow') || (($default == 'deny') && ($acl_mode == 'allow')) || ($parent === true) || (($default == '***') && ($acl_mode == 'failed') && ($parent === false))) {
                // Access is granted
                $ret = true;
        } // END - if
 
        // Return value
-       //* DEBUG: */ outputHtml(__FUNCTION__."[".__LINE__."]:act={$action},wht={$whatOR},default={$default},acl_mode={$acl_mode}<br />");
+       //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:act='.$action.',wht='.$what.',default='.$default.',acl_mode='.$acl_mode);
        return $ret;
 }
 
@@ -166,7 +166,7 @@ function adminsChangeAdminAccount ($postData, $element = '') {
                if ((!empty($element)) && (isset($postData[$element]))) {
                        // Save this setting
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `%s`='%s' WHERE `id`=%s LIMIT 1",
-                               array($element, $postData[$element][$id], $id), __FILE__, __LINE__);
+                               array($element, $postData[$element][$id], $id), __FUNCTION__, __LINE__);
 
                        // Admin account saved
                        $message = getMessage('ADMIN_ACCOUNT_SAVED');
@@ -212,7 +212,7 @@ function adminsChangeAdminAccount ($postData, $element = '') {
                                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_admins`
 SET
-       `login`='%s'".$add.",
+       `login`='%s'" . $add . ",
        `email`='%s',
        `default_acl`='%s',
        `la_mode`='%s'
@@ -231,7 +231,7 @@ LIMIT 1",
                                        SQL_QUERY_ESC("UPDATE
        `{?_MYSQL_PREFIX?}_admins`
 SET
-       `login`='%s'".$add.",
+       `login`='%s'" . $add . ",
        `email`='%s',
        `la_mode`='%s'
 WHERE
@@ -365,7 +365,7 @@ function adminsDeleteAdminAccount ($postData) {
                loadTemplate('admin_del_admins', false, $OUT);
        } else {
                // Cannot delete last account!
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ADMINS_CANNOT_DELETE_LAST'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_ADMINS_CANNOT_DELETE_LAST--}');
        }
 }
 
@@ -561,7 +561,7 @@ function getAminsExpertWarning () {
 function getAdminLoginFailures ($adminLogin) {
        // Admin login should not be empty
        if (empty($adminLogin)) {
-               debug_report_bug('adminLogin is empty.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'adminLogin is empty.');
        } // END - if
 
        // By default no admin is found
@@ -597,7 +597,7 @@ function getAdminLoginFailures ($adminLogin) {
 function getAdminLastFailure ($adminLogin) {
        // Admin login should not be empty
        if (empty($adminLogin)) {
-               debug_report_bug('adminLogin is empty.');
+               debug_report_bug(__FUNCTION__, __LINE__, 'adminLogin is empty.');
        } // END - if
 
        // By default no admin is found
@@ -636,10 +636,10 @@ function getAdminLastFailure ($adminLogin) {
 // Filter for adding extra data to the query
 function FILTER_ADD_EXTRA_SQL_DATA ($add = '') {
        // Is the admins extension updated? (should be!)
-       if (getExtensionVersion('admins') >= '0.3.0') $add .= ', `default_acl` AS def_acl';
-       if (getExtensionVersion('admins') >= '0.6.7') $add .= ', `la_mode`';
-       if (getExtensionVersion('admins') >= '0.7.2') $add .= ', `login_failures`, UNIX_TIMESTAMP(`last_failure`) AS last_failure';
-       if (getExtensionVersion('admins') >= '0.7.3') $add .= ', `expert_settings`, `expert_warning`';
+       if (isExtensionInstalledAndNewer('admins', '0.3.0')) $add .= ', `default_acl` AS def_acl';
+       if (isExtensionInstalledAndNewer('admins', '0.6.7')) $add .= ', `la_mode`';
+       if (isExtensionInstalledAndNewer('admins', '0.7.2')) $add .= ', `login_failures`, UNIX_TIMESTAMP(`last_failure`) AS last_failure';
+       if (isExtensionInstalledAndNewer('admins', '0.7.3')) $add .= ', `expert_settings`, `expert_warning`';
 
        // Return it
        return $add;