A lot fixes to templates and missing functions added, more rewrites

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

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 71e179e00e7c052c8896e2309ac183ae252b80fc..0a5c58363e269f7c1517c009999239f44fbcac50 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -106,11 +106,11 @@ function ADMINS_CHECK_ACL($act, $wht) {
                {
                        // Main menu
                        $result = SQL_QUERY_ESC("SELECT access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND action_menu='%s' LIMIT 1",
-                        array(bigintval($aid), $act), __FILE__, __LINE__);
+                        array(bigintval($aid), $act), __FUNCTION__, __LINE__);
                } elseif (!empty($wht)) {
                        // Sub menu
                        $result = SQL_QUERY_ESC("SELECT access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND what_menu='%s' LIMIT 1",
-                        array(bigintval($aid), $wht), __FILE__, __LINE__);
+                        array(bigintval($aid), $wht), __FUNCTION__, __LINE__);
                }
 
                // Get number of lines
@@ -137,7 +137,7 @@ function ADMINS_CREATE_EMAIL_LINK ($email, $mod="admin") {
                $result = SQL_QUERY_ESC("SELECT id
 FROM `{!_MYSQL_PREFIX!}_admins`
 WHERE email='%s'".$locked." LIMIT 1",
- array($email), __FILE__, __LINE__);
+ array($email), __FUNCTION__, __LINE__);
 
                // Is there an entry?
                if (SQL_NUMROWS($result) == 1) {
@@ -217,7 +217,7 @@ WHERE id=%s LIMIT 1",
                                                $POST['mode'][$id],
                                                $POST['la_mode'][$id],
                                                $id
-                                       ), __FILE__, __LINE__);
+                                       ), __FUNCTION__, __LINE__);
                        } else {
                                // Do not allow it here
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET
@@ -230,7 +230,7 @@ WHERE id=%s LIMIT 1",
                                                $POST['email'][$id],
                                                $POST['la_mode'][$id],
                                                $id
-                                       ), __FILE__, __LINE__);
+                                       ), __FUNCTION__, __LINE__);
                        }
 
                        // Purge cache
@@ -266,7 +266,7 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
 
                // Get the admin's data
                $result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-                       array($id), __FILE__, __LINE__);
+                       array($id), __FUNCTION__, __LINE__);
                if ((SQL_NUMROWS($result) == 1) && ($sel == 1)) {
                        // Entry found
                        $content = SQL_FETCHARRAY($result);
@@ -300,7 +300,7 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
 // Delete given admin accounts
 function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
        // Check if this account is the last one which cannot be deleted...
-       $result_main = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_admins`", __FILE__, __LINE__);
+       $result_main = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_admins`", __FUNCTION__, __LINE__);
        $accounts = SQL_NUMROWS($result_main);
        SQL_FREERESULT($result_main);
        if ($accounts > 1) {
@@ -312,7 +312,7 @@ function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
 
                        // Get the admin's data
                        $result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-                        array($id), __FILE__, __LINE__);
+                        array($id), __FUNCTION__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found
                                $content = SQL_FETCHARRAY($result);
@@ -351,11 +351,11 @@ function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
                if (($del == 1) && (GET_CURRENT_ADMIN_ID() != $id)) {
                        // Rewrite his tasks to all admins
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET assigned_admin=0 WHERE assigned_admin=%s",
-                        array($id), __FILE__, __LINE__);
+                        array($id), __FUNCTION__, __LINE__);
 
                        // Remove account
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
-                               array($id), __FILE__, __LINE__);
+                               array($id), __FUNCTION__, __LINE__);
 
                        // Purge cache
                        CACHE_PURGE_ADMIN_MENU($id);
@@ -370,7 +370,7 @@ function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
 // List all admin accounts
 function ADMINS_LIST_ADMIN_ACCOUNTS() {
        // 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", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY login ASC", __FUNCTION__, __LINE__);
        $SW = 2; $OUT = "";
        while ($content = SQL_FETCHARRAY($result)) {
                // Compile some variables