Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.
[mailer.git] / inc / modules / admin / overview-inc.php
index 39aa0dc..d356c2b 100644 (file)
@@ -8,18 +8,16 @@
  * -------------------------------------------------------------------- *
  * Short description : Output standard task management                  *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Standart-Aufgaben-Management ausgeben            *
+ * Kurzbeschreibung  : Standard-Aufgaben-Management ausgeben            *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // @TODO This function does also check for uncompleted tasks
 function outputStandardOverview (&$result_tasks) {
        // First check for solved and not assigned tasks and assign them to current admin
-       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE assigned_admin < 1 AND status != 'NEW'",
+       sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `assigned_admin` IS NULL AND status != 'NEW'",
                array(getCurrentAdminId()), __FILE__, __LINE__);
 
        // We currently don't want to install an extension so let's find out if we need...
        setExtensionMode('test');
-       $jobsDone = true;
+       $jobsDone = TRUE;
 
        // Open the extension directory
-       $extensionList = getArrayFromDirectory('inc/extensions/', 'ext-', false, false);
+       $extensionList = getArrayFromDirectory('inc/extensions/', 'ext-', FALSE, FALSE);
        foreach ($extensionList as $file) {
                // Only file name is required... :(
                $file = basename($file);
@@ -64,20 +62,21 @@ function outputStandardOverview (&$result_tasks) {
                        $ext_name = strtolower(substr($file, 4, -4)); // Keep always extension names on lower case!!!
 
                        // Init variables
-                       $result = false;
+                       $result = FALSE;
 
                        // Check if extension is installed or not
                        $extInstalled = (isExtensionInstalled($ext_name) && (isExtensionActive($ext_name)));
 
                        // Is the extension not yet installed?
-                       if ($extInstalled === false) {
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ',extInstalled=' . intval($extInstalled));
+                       if ($extInstalled === FALSE) {
                                // We maybe want to install an extension so let's test-drive it...
-                               if (loadExtension($ext_name, getExtensionMode(), '', true)) {
+                               if (loadExtension($ext_name, 'test', '0.0.0', TRUE)) {
                                        // Create a task for newly installed extension (we ignore the task id here)
                                        createNewExtensionTask($ext_name);
                                } // END - if
                        } else {
-                               // Test-drive extension in update mode
+                               // Test-drive extension
                                loadExtension($ext_name, 'test');
 
                                // Get extension version
@@ -92,7 +91,7 @@ function outputStandardOverview (&$result_tasks) {
                                } // END - if
 
                                if (isset($GLOBALS['cache_array']['always_active'][$ext_name])) {
-                                       // Maybe we want to keept the current extension active?
+                                       // Shall the current extension kept activated?
                                        if (($GLOBALS['cache_array']['always_active'][$ext_name] == 'Y') && (!isExtensionActive($ext_name))) {
                                                // Reactivate this extension!
                                                doActivateExtension($ext_name);
@@ -103,12 +102,18 @@ function outputStandardOverview (&$result_tasks) {
        } // END - foreach
 
        // At last - but not least - check for own and new unassigned tasks...
-       $result_tasks = SQL_QUERY_ESC("SELECT
-       `id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created`
+       $result_tasks = sqlQueryEscaped("SELECT
+       `id`,
+       `assigned_admin`,
+       `userid`,
+       `task_type`,
+       `subject`,
+       `text`,
+       `task_created`
 FROM
        `{?_MYSQL_PREFIX?}_task_system`
 WHERE
-       `assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW')
+       `assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW')
 ORDER BY
        `userid` DESC,
        `task_type` DESC,
@@ -116,13 +121,13 @@ ORDER BY
        `task_created` DESC",
                array(getCurrentAdminId()), __FILE__, __LINE__);
 
-       if (!SQL_HASZERONUMS($result_tasks)) {
-               // New jobs found!
-               $jobsDone = false;
+       if (!ifSqlHasZeroNumRows($result_tasks)) {
+               // New jobs found
+               $jobsDone = FALSE;
        } // END - if
 
        // Free the result
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 
        // Return status
        return $jobsDone;
@@ -134,12 +139,19 @@ function outputSeletectedTasks ($postData, $result_tasks) {
                // Assign / do tasks
                $OUT = '';
                foreach ($postData['sel'] as $taskId => $sel) {
-                       $result_task = SQL_QUERY_ESC("SELECT
-       `id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin`
+                       $result_task = sqlQueryEscaped("SELECT
+       `id`,
+       `userid`,
+       `task_type`,
+       `subject`,
+       `text`,
+       `task_created`,
+       `status`,
+       `assigned_admin`
 FROM
        `{?_MYSQL_PREFIX?}_task_system`
 WHERE
-       `id`=%s AND (`assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW'))
+       `id`=%s AND (`assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW'))
 LIMIT 1",
                                array(
                                        bigintval($taskId),
@@ -147,13 +159,13 @@ LIMIT 1",
                                ), __FILE__, __LINE__);
 
                        // Task is found?
-                       if (SQL_NUMROWS($result_task) == 1) {
+                       if (sqlNumRows($result_task) == 1) {
                                // Task is valid so load it's data
-                               $taskData = SQL_FETCHARRAY($result_task);
+                               $taskData = sqlFetchArray($result_task);
 
                                if ($taskData['assigned_admin'] == '0') {
                                        // Assgin current admin to unassgigned task
-                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s AND `assigned_admin`=0 LIMIT 1",
+                                       sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s AND `assigned_admin` IS NULL LIMIT 1",
                                                array(
                                                        getCurrentAdminId(),
                                                        bigintval($taskData['id'])
@@ -169,17 +181,17 @@ LIMIT 1",
                                } // END - if
 
                                // Is a userid assign?
-                               if ($taskData['userid'] > 0) {
+                               if (isValidId($taskData['userid'])) {
                                        // Then load his data!
                                        if (fetchUserData($taskData['userid'])) {
                                                // Fetch row
                                                $content = getUserDataArray();
 
                                                // Generate HTML list entry
-                                               $add = '<li>{--ADMIN_MEMBER_UID--}: <strong>' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>)</strong></li>';
+                                               $add = '<li>{--ADMIN_ASSIGNED_USERID--}: <strong>' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (<a href="' . generateEmailLink($content['email'], 'user_data') . '">{%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . '</a>)</strong></li>';
                                        } else {
                                                // Invalid userid, so log and zero it
-                                               logDebugMessage(__FUNCTION__, __LINE__, 'Invalid userid=' . $taskData['userid'] . ' -> not found!');
+                                               logDebugMessage(__FUNCTION__, __LINE__, 'fetchUserData() failed: userid=' . $taskData['userid'] . ' not found.');
                                                $taskData['userid'] = '0';
                                        }
                                } // END - if
@@ -188,90 +200,86 @@ LIMIT 1",
                                $taskData['text'] = decodeEntities($taskData['text']);
 
                                // Compile and insert text from task into table template
-                               $taskData['text'] = loadTemplate('admin_extensions_text', true, $taskData['text']);
+                               $taskData['text'] = loadTemplate('admin_extensions_text', TRUE, $taskData['text']);
 
                                // Initialize variables (no title for SQL commands by default)
-                               $ext_name = ''; $ext_ver = '';
-                               $title = '{--ADMIN_TASK_NO_SQL_TITLE--}';
-
-                               // Shall I list SQL commands assigned to an extension installation or update task?
-                               if ((isVerboseSqlEnabled()) || (!isExtensionInstalled('sql_patches'))) {
-                                       // Extract extension name from subject
-                                       $ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1);
-
-                                       // Update task or extension task?
-                                       if (($taskData['task_type'] == 'EXTENSION') && (!isExtensionInstalled($ext_name))) {
-                                               // Load SQL commands for registering in dry-run
-                                               registerExtension($ext_name, $taskId, true);
-
-                                               // Is this non-productive?
-                                               if (isExtensionProductive() === false) {
-                                                       // Issue warning
-                                                       $taskData['text'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name)) . $taskData['text'];
-                                               } // END - if
+                               $ext_ver  = '';
+                               $ext_name = '';
+                               $title    = '{--ADMIN_TASK_NO_SQL_TITLE--}';
 
-                                               // Set current extension name
-                                               setCurrentExtensionName($ext_name);
+                               // Extract extension name from subject (for testing)
+                               $ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1);
 
-                                               // Add notes to text
-                                               $taskData['text'] .= getExtensionNotes();
+                               // Update task or extension task?
+                               if (($taskData['task_type'] == 'EXTENSION') && (!isExtensionInstalled($ext_name))) {
+                                       // Load SQL commands for registering in dry-run
+                                       registerExtension($ext_name, $taskId, TRUE);
 
-                                               // Set title
-                                               $title = '{--ADMIN_SQLS_EXECUTED_ON_REGISTER--}';
-                                       } elseif ($taskData['task_type'] == 'EXTENSION_UPDATE') {
-                                               // Prepare extension name and version
-                                               $ext_name = substr($ext_name, 7);
-                                               $ext_name = substr($ext_name, 0, strpos($ext_name, '-'));
-                                               $test = '[UPDATE-' . $ext_name . '-';
-                                               $ext_ver = substr($taskData['subject'], strlen($test));
-                                               $ext_ver = substr($ext_ver, 0, strpos($ext_ver, ':'));
+                                       // Get current extension's version
+                                       $ext_ver = getCurrentExtensionVersion();
 
-                                               // Load SQLs from file
-                                               updateExtension($ext_name, $ext_ver, true);
+                                       // Is this non-productive?
+                                       if (isExtensionProductive() === FALSE) {
+                                               // Issue warning
+                                               $taskData['text'] = returnMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=' . $ext_name . '%}') . $taskData['text'];
+                                       } // END - if
 
-                                               // Set current extension name
-                                               setCurrentExtensionName($ext_name);
+                                       // Set current extension name
+                                       setCurrentExtensionName($ext_name);
 
-                                               // Add notes to text
-                                               $taskData['text'] .= getExtensionNotes();
+                                       // Add notes to text
+                                       $taskData['text'] .= getExtensionNotes();
 
-                                               // Set title
-                                               $title = '{--ADMIN_SQLS_EXECUTED_ON_UPDATE--}';
-                                       } else {
-                                               // Remove extension's name
-                                               $ext_name = '';
-                                       }
+                                       // Set title
+                                       $title = '{--ADMIN_SQLS_EXECUTED_ON_REGISTER--}';
+                               } elseif ($taskData['task_type'] == 'EXTENSION_UPDATE') {
+                                       // Prepare extension name and version
+                                       $ext_name = substr($ext_name, 7);
+                                       $ext_name = substr($ext_name, 0, strpos($ext_name, '-'));
+                                       $test = '[UPDATE-' . $ext_name . '-';
+                                       $ext_ver = substr($taskData['subject'], strlen($test));
+                                       $ext_ver = substr($ext_ver, 0, strpos($ext_ver, ':'));
 
-                                       // Add SQLs to a table
-                                       if ((!empty($ext_name)) && (isVerboseSqlEnabled())) {
-                                               // Add verbose SQL table
-                                               $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="admin_table top left right"', true, '100%') . '<br />';
-                                       } // END - if
-                               } elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
-                                       // Run SQL commands in dry mode but only return the notes
-                                       updateExtension($ext_name, $ext_ver, true);
+                                       // Load SQLs from file
+                                       updateExtension($ext_name, $ext_ver, TRUE);
 
                                        // Set current extension name
                                        setCurrentExtensionName($ext_name);
 
-                                       // Get notes
+                                       // Add notes to text
                                        $taskData['text'] .= getExtensionNotes();
+
+                                       // Set title
+                                       $title = '{--ADMIN_SQLS_EXECUTED_ON_UPDATE--}';
                                } else {
-                                       // This should not normally happen!
-                                       debug_report_bug(__FILE__, __LINE__, 'ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! isVerboseSqlEnabled=' . intval(isVerboseSqlEnabled()));
+                                       // Remove extension's name
+                                       $ext_name = '';
                                }
 
+                               // Add SQLs to a table
+                               if ((!empty($ext_name)) && (isVerboseSqlEnabled())) {
+                                       // Add verbose SQL table
+                                       $taskData['text'] .= addExtensionVerboseSqlTable($title);
+                               } // END - if
+
+                               // Version+extension name must be set
+                               if (((!empty($ext_name)) && (empty($ext_ver))) || ((empty($ext_name)) && (!empty($ext_ver)))) {
+                                       // This should not normally happen!
+                                       reportBug(__FILE__, __LINE__, 'ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! isVerboseSqlEnabled=' . intval(isVerboseSqlEnabled()));
+                               } // END - if
+
                                // Prepare array for the template
                                $content = array(
                                        'subject'      => $taskData['subject'],
                                        'add'          => $add,
                                        'text'         => $taskData['text'],
-                                       'task_created' => generateDateTime($taskData['task_created'], 1),
-                                       'extension'    => $ext_name
+                                       'task_created' => generateDateTime($taskData['task_created'], '1'),
+                                       'ext_name'     => $ext_name,
+                                       'ext_version'  => $ext_ver
                                );
 
                                // Load template
-                               $OUT .= loadTemplate('admin_overview_row', true, $content);
+                               $OUT .= loadTemplate('admin_overview_row', TRUE, $content);
 
                                // Which task do we actually have here?
                                // @TODO Rewrite this to something with include files and/or filter
@@ -280,16 +288,16 @@ LIMIT 1",
                                                $ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1);
                                                if (!isExtensionInstalled($ext_name)) {
                                                        // New (not yet installed) extension found
-                                                       $OUT .= loadTemplate('admin_extension_reg_form', true, array(
+                                                       $OUT .= loadTemplate('admin_extension_reg_form', TRUE, array(
                                                                'id'       => bigintval($taskId),
                                                                'ext_name' => $ext_name
                                                        ));
                                                } else {
                                                        // Extension is already installed
-                                                       $OUT .= '<div class="admin_failed">{--ADMIN_EXTENSION_ALREADY_REGISTERED--}</div>';
+                                                       $OUT .= '<div class="notice">{--ADMIN_EXTENSION_ALREADY_REGISTERED--}</div>';
 
                                                        // Close task but not already closed, solved, deleted or update tasks
-                                                       if ((!in_array($taskData['status'], array('CLOSED','DELETED','SOLVED'))) && ($taskData['task_type'] != 'EXTENSION_UPDATE')) {
+                                                       if ((!in_array($taskData['status'], array('CLOSED', 'DELETED', 'SOLVED'))) && ($taskData['task_type'] != 'EXTENSION_UPDATE')) {
                                                                // Solve the task
                                                                runFilterChain('solve_task', $taskData['id']);
                                                        } // END - if
@@ -298,9 +306,9 @@ LIMIT 1",
 
                                        case 'EXTENSION_UPDATE': // Extension update
                                                // Extension updates are installed automatically
-                                               $OUT .= '<div class="admin_failed medium">{--ADMIN_EXTENSION_UPDATED--}</div>';
+                                               $OUT .= '<div class="notice medium">{--ADMIN_EXTENSION_UPDATED--}</div>';
 
-                                               // Close task
+                                               // Close task if not closed or deleted
                                                if (!in_array($taskData['status'], array('CLOSED', 'DELETED'))) {
                                                        // Solve the task
                                                        runFilterChain('solve_task', $taskData['id']);
@@ -311,21 +319,21 @@ LIMIT 1",
                                                // @TODO This may also be rewritten to include files
                                                switch ($mode) {
                                                        default: // @TODO Unknown support mode
-                                                       logDebugMessage(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
-                                                       $OUT .= '<div class="admin_failed medium">' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '</div>';
+                                                       logDebugMessage(__FILE__, __LINE__, sprintf('Unknown support mode %s detected. This part is under construction.', $mode));
+                                                       $OUT .= '<div class="notice medium">{%message,ADMIN_UNKNOWN_SUPPORT_MODE=' . $mode . '%}</div>';
                                                        break;
-                                               }
+                                               } // END - switch
                                                break;
 
                                        case 'PAYOUT_REQUEST': // Payout requests
                                                if (isExtensionActive('payout')) {
                                                        // Extension is installed so let him send a notification to the user
-                                                       $result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `userid`=%s AND `payout_timestamp`=%s LIMIT 1",
+                                                       $result_pay = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `userid`=%s AND `payout_timestamp`=%s LIMIT 1",
                                                                array(bigintval($taskData['userid']), bigintval($taskData['task_created'])), __FILE__, __LINE__);
-                                                       list($pid) = SQL_FETCHROW($result_pay);
-                                                       SQL_FREERESULT($result_pay);
+                                                       list($pid) = sqlFetchRow($result_pay);
+                                                       sqlFreeResult($result_pay);
 
-                                                       if ((!empty($pid)) && ($pid > 0)) {
+                                                       if (isValidId($pid)) {
                                                                // Payout id can be obtained
                                                                $content = array(
                                                                        'pid' => $pid,
@@ -333,53 +341,53 @@ LIMIT 1",
                                                                );
 
                                                                // Load template
-                                                               $OUT .= loadTemplate('admin_payout_overview_form', true, $content);
+                                                               $OUT .= loadTemplate('admin_payout_overview_form', TRUE, $content);
                                                        } else {
                                                                // Problem obtaining payout id
-                                                               $OUT .= '<div class="admin_failed medium">{--ADMIN_PAYOUT_OBTAIN_ID_FAILED--}</div>';
+                                                               $OUT .= '<div class="notice medium">{--ADMIN_PAYOUT_OBTAIN_ID_FAILED--}</div>';
                                                        }
                                                } else {
                                                        // Extension is not installed
-                                                       $OUT .= '<div class="admin_failed medium">{--ADMIN_PAYOUT_NOT_INSTALLED--}</div>';
+                                                       $OUT .= '<div class="notice medium">{--ADMIN_PAYOUT_NOT_INSTALLED--}</div>';
                                                }
                                                break;
 
                                        case 'WERNIS_REQUEST': // Wernis requests
                                                if (isExtensionActive('wernis')) {
                                                        // Extension is installed so let him send a notification to the user
-                                                       $result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_wernis` WHERE `userid`=%s AND wernis_timestamp=%s LIMIT 1",
+                                                       $result_pay = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_wernis` WHERE `userid`=%s AND wernis_timestamp=%s LIMIT 1",
                                                                array(bigintval($taskData['userid']), bigintval($taskData['task_created'])), __FILE__, __LINE__);
-                                                       list($pid) = SQL_FETCHROW($result_pay);
-                                                       SQL_FREERESULT($result_pay);
+                                                       list($pid) = sqlFetchRow($result_pay);
+                                                       sqlFreeResult($result_pay);
 
-                                                       if ((!empty($pid)) && ($pid > 0)) {
+                                                       if (isValidId($pid)) {
                                                                // Payout id can be obtained
                                                                $content = array(
                                                                        'pid' => $pid,
                                                                        'tid' => $taskData['id'],
                                                                );
-                                                               $OUT .= loadTemplate('admin_wernis_overview_form', true, $content);
+                                                               $OUT .= loadTemplate('admin_wernis_overview_form', TRUE, $content);
                                                        } else {
                                                                // Problem obtaining wernis id
-                                                               $OUT .= '<div class="admin_failed medium">{--WERNIS_OBTAIN_ID_FAILED--}</div>';
+                                                               $OUT .= '<div class="notice medium">{--WERNIS_OBTAIN_ID_FAILED--}</div>';
                                                        }
                                                } else {
                                                        // Extension is not installed
-                                                       $OUT .= '<div class="admin_failed medium">{--ADMIN_WERNIS_NOT_INSTALLED--}</div>';
+                                                       $OUT .= '<div class="notice medium">{--ADMIN_WERNIS_NOT_INSTALLED--}</div>';
                                                }
                                                break;
 
                                        case 'HOLIDAY_REQUEST': // Holiday requests
-                                               $OUT .= loadTemplate('admin_task_holiday', true, $taskData['userid']);
+                                               $OUT .= loadTemplate('admin_task_holiday', TRUE, $taskData['userid']);
                                                break;
 
                                        case 'MEMBER_ORDER': // Member mail orders
-                                               $OUT .= loadTemplate('admin_task_order', true, $taskId);
+                                               $OUT .= loadTemplate('admin_task_order', TRUE, $taskId);
                                                break;
 
                                        default: // Unknown task type
-                                               logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $taskData['task_type']));
-                                               $OUT .= '<div class="admin_failed medium">' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $taskData['task_type'], $taskId) . '</div>';
+                                               logDebugMessage(__FILE__, __LINE__, sprintf('Unknown task type %s detected.', $taskData['task_type']));
+                                               $OUT .= '<div class="notice medium">' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $taskData['task_type'], $taskId) . '</div>';
                                                break;
                                }
                                $OUT .= '
@@ -388,39 +396,39 @@ LIMIT 1",
                        } // END - if
 
                        // Free result
-                       SQL_FREERESULT($result_task);
+                       sqlFreeResult($result_task);
                } // END - foreach
 
                // Load final template
-               loadTemplate('admin_overview_list', false, $OUT);
+               loadTemplate('admin_overview_list', FALSE, $OUT);
        } else {
                if ((isset($postData['sel'])) && ((count($postData['sel']) > 0) || ($postData['sel'][0] == 1))) {
                        // Only unassign / delete tasks when there are selected tasks posted
                        if (!empty($postData['unassign'])) {
                                // Unassign from tasks
                                foreach ($postData['sel'] as $taskId => $sel) {
-                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
+                                       sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=NULL WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
                                                array(bigintval($taskId), getCurrentAdminId()), __FILE__, __LINE__);
-                               }
-                       } elseif (isset($postData['del'])) {
+                               } // END - foreach
+                       } elseif (!empty($postData['delete'])) {
                                // Delete tasks
                                foreach ($postData['sel'] as $taskId => $sel) {
-                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s AND `assigned_admin` IN (%s,0) LIMIT 1",
+                                       sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s AND `assigned_admin` IN (%s,0,NULL) LIMIT 1",
                                                array(bigintval($taskId), getCurrentAdminId()), __FILE__, __LINE__);
-                               }
+                               } // END - foreach
                        } else {
                                // Unknown action
-                               debug_report_bug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r($postData, true)));
+                               reportBug(__FILE__, __LINE__, sprintf('Unknown task action performed. data=<pre>%s</pre>', print_r($postData, TRUE)));
                        }
 
                        // Update query
-                       $result_tasks = SQL_QUERY_ESC("SELECT `id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW') ORDER BY `task_created` DESC",
+                       $result_tasks = sqlQueryEscaped("SELECT `id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW') ORDER BY `task_created` DESC",
                                array(getCurrentAdminId()), __FILE__, __LINE__);
                } // END - if
 
                // There are uncompleted jobs!
                $OUT = '';
-               while ($content = SQL_FETCHARRAY($result_tasks)) {
+               while ($content = sqlFetchArray($result_tasks)) {
                        // Init infos
                        $content['infos'] = '';
 
@@ -431,36 +439,33 @@ LIMIT 1",
                                case 'EXTENSION_UPDATE':
                                        $content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ':') - 1);
                                        break;
-                       }
-
-                       // Get task type
-                       $content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}';
+                       } // END - switch
 
-                       if (isValidUserId($content['userid'])) {
+                       if (isValidId($content['userid'])) {
                                // Member found otherwise it's a system task
-                               $content['userid'] = generateUserProfileLink($content['userid']);
+                               $content['userid'] = '{%pipe,generateUserProfileLink=' . $content['userid'] . '%}';
                        } else {
-                               $content['userid'] = '<em>{--ADMIN_IS_SYSTEM_TASK--}</em>';
+                               $content['userid'] = '{--ADMIN_IS_SYSTEM_TASK--}';
                        }
 
                        // Add/translate some content
                        $content['task_created'] = generateDateTime($content['task_created'], 2);
 
-                       // Do we have extension task?
+                       // Is there extension task?
                        if (isExtensionTask($content)) {
                                // Load extension row template
-                               $OUT .= loadTemplate('admin_overview_list_ext_rows', true, $content);
+                               $OUT .= loadTemplate('admin_overview_list_ext_rows', TRUE, $content);
                        } else {
                                // Load default row template
-                               $OUT .= loadTemplate('admin_overview_list_rows', true, $content);
+                               $OUT .= loadTemplate('admin_overview_list_rows', TRUE, $content);
                        }
                } // END - while
 
                // Free memory
-               SQL_FREERESULT($result_tasks);
+               sqlFreeResult($result_tasks);
 
                // Load footer template
-               loadTemplate('admin_overview_table', false, $OUT);
+               loadTemplate('admin_overview_table', FALSE, $OUT);
        }
 }