]> git.mxchange.org Git - mailer.git/blobdiff - inc/modules/admin/overview-inc.php
Previous fix fixed, a lot constants rewritten (unfinished)
[mailer.git] / inc / modules / admin / overview-inc.php
index cfbd6efc5fcfe36926f622234d007dc4e6920133..188f07abe2d1b4e8f7736cad9a20dee8546c2362 100644 (file)
@@ -41,8 +41,8 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
        global $cacheArray, $_CONFIG;
 
        // First check for solved and not assigned tasks and assign them to current admin
-       $result_task = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin='%s' WHERE assigned_admin < 1 AND status != 'NEW'",
-        array(GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET assigned_admin='%s' WHERE assigned_admin < 1 AND status != 'NEW'",
+               array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 
        // We currently don't want to install an extension so let's find out if we need...
        $EXT_LOAD_MODE = "register";
@@ -55,54 +55,40 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
                if ((substr($file, 0, 4) == "ext-") && (substr($file, -4) == ".php")) {
                        //* DEBUG: */ echo $file."<br />\n";
                        // Possible newly installed extension found so we extract extension's name
-                       $ext = strtolower(substr($file, 4, -4)); // Keep always extension names on lower case!!!
+                       $ext_name = strtolower(substr($file, 4, -4)); // Keep always extension names on lower case!!!
 
                        // Init variables
-                       $ext_ver = "";
                        $result = false;
 
                        // Check if extension is installed or not
-                       if ((is_array($cacheArray['extensions']['ext_version'])) && (isset($cacheArray['extensions']['ext_version'][$ext]))) {
-                               // Load version from cache
-                               if (!empty($cacheArray['extensions']['ext_version'][$ext])) {
-                                       // Extension is installed so we can get it's version number
-                                       $ext_ver = $cacheArray['extensions']['ext_version'][$ext];
-                               } else {
-                                       // Extension is not installed so no version number was found
-                                       $ext_ver = "";
-                               }
-                       } elseif (!EXT_IS_ACTIVE("cache")) {
-                               // Load data from database
-                               $result = SQL_QUERY_ESC("SELECT id, ext_version FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",
-                                array($ext), __FILE__, __LINE__);
-                       }
+                       $ext_ver = GET_EXT_VERSION($ext_name);
 
                        // Is the extension not yet installed?
-                       if ((SQL_NUMROWS($result) == 0) && (empty($ext_ver))) {
+                       if (empty($ext_ver)) {
                                // Generate subject line
-                               $ext_subj = sprintf("[%s:]", $ext);
-
-                               // Create a task for newly installed extension
-                               CREATE_NEW_EXTENSION_TASK(GET_ADMIN_ID(get_session('admin_login')), $ext_subj, $ext);
+                               $ext_subj = sprintf("[%s:]", $ext_name);
 
                                // We maybe want to install an extension so let's test-drive it...
-                               include(PATH."inc/extensions/".$file);
-                       } else {
-                               // Maybe we want to update?
-                               if ((empty($cacheArray['extensions']['ext_version'][$ext])) && (SQL_NUMROWS($result) == 1)) {
-                                       list($dummy, $ext_ver) = SQL_FETCHROW($result);
-                                       SQL_FREERESULT($result);
+                               if (LOAD_EXTENSION($ext_name, $EXT_LOAD_MODE)) {
+                                       // Create a task for newly installed extension
+                                       CREATE_NEW_EXTENSION_TASK(GET_CURRENT_ADMIN_ID(), $ext_subj, $ext_name);
                                } // END - if
+                       } else {
+                               // Test-drive extension in update mode
+                               require(sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name));
 
                                // Update extension if extension is installed and outdated
-                               //* DEBUG: */ print "ext={$ext},ver={$ext_ver}/".GET_EXT_VERSION($ext)."<br />\n";
-                               if ((!empty($ext_ver)) && (EXT_IS_ACTIVE($ext)) && (GET_EXT_VERSION($ext) > $ext_ver)) EXTENSION_UPDATE($file, $ext, $ext_ver);
+                               //* DEBUG: */ print "ext={$ext_name},ver={$EXT_VERSION}/".GET_EXT_VERSION($ext_name)."<br />\n";
+                               if ($EXT_VERSION > $ext_ver) {
+                                       // Update the extension
+                                       EXTENSION_UPDATE($ext_name, $ext_ver);
+                               } // END - if
 
-                               if (!empty($cacheArray['active_extensions'][$ext])) {
+                               if (isset($cacheArray['active_extensions'][$ext_name])) {
                                        // Maybe we want to keept the current extension active?
-                                       if (($cacheArray['active_extensions'][$ext] == "Y") && (!EXT_IS_ACTIVE($ext))) {
+                                       if (($cacheArray['active_extensions'][$ext_name] == "Y") && (!EXT_IS_ACTIVE($ext_name))) {
                                                // Reactivate this extension!
-                                               ACTIVATE_EXTENSION($ext);
+                                               ACTIVATE_EXTENSION($ext_name);
                                        } // END - if
                                } // END - if
                        }
@@ -114,10 +100,10 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
 
        // 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
-FROM "._MYSQL_PREFIX."_task_system
+FROM `{!_MYSQL_PREFIX!}_task_system`
 WHERE assigned_admin='%s' OR (assigned_admin='0' AND status='NEW')
 ORDER BY userid DESC, task_type DESC, subject, task_created DESC",
-        array(GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
+               array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result_tasks) > 0) {
                // New jobs found!
@@ -131,15 +117,15 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC",
        return $JOBS_DONE;
 }
 
-//
-function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
+// Outputs selected tasks
+function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
        global $_CONFIG, $NOTES;
-       if ((isset($_POST['assign'])) && (count($_POST['task']) > 0)) {
+       if ((isset($POST['assign'])) && (count($POST['task']) > 0)) {
                // Assign / do tasks
                $OUT = ""; $SW = 2;
-               foreach ($_POST['task'] as $id => $sel) {
-                       $result_task = SQL_QUERY_ESC("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')) LIMIT 1",
-                        array(bigintval($id), GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
+               foreach ($POST['task'] as $id => $sel) {
+                       $result_task = SQL_QUERY_ESC("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')) LIMIT 1",
+                               array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result_task) == 1) {
                                // Task is valid...
                                list($tid, $uid, $type, $subj, $text, $created, $status, $aid) = SQL_FETCHROW($result_task);
@@ -147,24 +133,24 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
 
                                if ($aid == "0") {
                                        // Assgin current admin to unassgigned task
-                                       $result_assign = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin='%s' WHERE id=%s LIMIT 1",
-                                        array(GET_ADMIN_ID(get_session('admin_login')), bigintval($tid)), __FILE__, __LINE__);
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET assigned_admin='%s' WHERE id=%s LIMIT 1",
+                                               array(GET_CURRENT_ADMIN_ID(), bigintval($tid)), __FILE__, __LINE__);
                                } // END - if
 
                                $ADD = "";
                                if ($type == "SUPPORT_MEMBER") {
                                        $mode = substr($text, 0, strpos($text, ":"));
                                        $text = substr($text, strpos($text, ":") + 1);
-                                       $ADD = "<LI>".ADMIN_TASK_SUPPORT_MODE.": <STRONG>".$mode."</STRONG></LI>";
+                                       $ADD = "<li>".ADMIN_TASK_SUPPORT_MODE.": <strong>".$mode."</strong></li>";
                                } // END - if
 
                                if ($uid > 0) {
-                                       $result_user = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+                                       $result_user = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                                         array(bigintval($uid)), __FILE__, __LINE__);
                                        if (SQL_NUMROWS($result_user) == 1) {
                                                list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user);
                                                SQL_FREERESULT($result_user);
-                                               $ADD = "<LI>".ADMIN_MEMBER_UID.": <STRONG>".ADMIN_USER_PROFILE_LINK($uid)." (<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</A>)</STRONG></LI>";
+                                               $ADD = "<li>".ADMIN_MEMBER_UID.": <strong>".ADMIN_USER_PROFILE_LINK($uid)." (<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</a>)</strong></li>";
                                        } // END - if
                                } // END - if
 
@@ -179,7 +165,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                $title = TASK_NO_TITLE;
 
                                // Shall I list SQL commands assigned to an extension installation or update task?
-                               if (((GET_EXT_VERSION("sql_patches") != '') && ($_CONFIG['verbose_sql'] == "Y")) || (!EXT_IS_ACTIVE("sql_patches"))) {
+                               if (((GET_EXT_VERSION("sql_patches") != '') && (getConfig('verbose_sql') == "Y")) || (!EXT_IS_ACTIVE("sql_patches"))) {
                                        $ext_name = substr($subj, 1, strpos($subj, ":") - 1);
                                        if ($type == "EXTENSION") {
                                                // Load SQL commands for registering
@@ -191,7 +177,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                                // Set title
                                                $title = ADMIN_SQLS_EXECUTED_ON_REGISTER;
                                        } elseif ($type == "EXTENSION_UPDATE") {
-                                               // Load SQL commands for update (already done!)
+                                               // Prepare extension name and version
                                                $ext_name = substr($ext_name, 7);
                                                $ext_name = substr($ext_name, 0, strpos($ext_name, "-"));
                                                $test = "[UPDATE-".$ext_name."-";
@@ -199,7 +185,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                                $ext_ver = substr($ext_ver, 0, strpos($ext_ver, ":"));
 
                                                // Load SQLs from file
-                                               $SQLs = EXTENSION_UPDATE("ext-".$ext_name.".php", $ext_name, $ext_ver, true);
+                                               $SQLs = EXTENSION_UPDATE($ext_name, $ext_ver, true);
 
                                                // Add notes to text
                                                $text .= $NOTES;
@@ -214,13 +200,13 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                        // Add SQLs to a table
                                        if (empty($SQLs)) $SQLs = array();
                                        if (empty($title)) $title = "";
-                                       if ((!empty($ext_name)) && (GET_EXT_VERSION("sql_patches")) && ($_CONFIG['verbose_sql'] == "Y")) {
+                                       if ((!empty($ext_name)) && (GET_EXT_VERSION("sql_patches")) && (getConfig('verbose_sql') == "Y")) {
                                                // Add verbose SQL table
                                                $text .= EXTENSION_VERBOSE_TABLE($SQLs, $title, " class=\"admin_table top2 left2 right2\"", true, "100%")."<br />\n";
                                        } // END - if
                                } else {
                                        // Run SQL commands in dry mode but only return the notes
-                                       $SQLs = EXTENSION_UPDATE("ext-".$ext_name.".php", $ext_name, $ext_ver, true);
+                                       $SQLs = EXTENSION_UPDATE($ext_name, $ext_ver, true);
                                        $text .= $NOTES;
                                }
 
@@ -238,11 +224,12 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                $OUT .= LOAD_TEMPLATE("admin_overview_row", true, $content);
 
                                // Which task do we actually have here?
+                               // @TODO Rewrite this to something with include files
                                switch ($type)
                                {
                                case "EXTENSION": // Install new extensions
                                        $ext_name = substr($subj, 1, strpos($subj, ":") - 1);
-                                       $result_lines = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_extensions WHERE ext_name='%s' LIMIT 1",
+                                       $result_lines = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_name='%s' LIMIT 1",
                                         array($ext_name), __FILE__, __LINE__);
                                        $lines = SQL_NUMROWS($result_lines);
                                        SQL_FREERESULT($result_lines);
@@ -254,32 +241,33 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                                ));
                                        } else {
                                                // Task is closed so nothing is todo
-                                               $OUT .= "<FONT class=\"admin_failed\">".ADMIN_EXT_ALREADY_REGISTERED."</FONT>\n";
+                                               $OUT .= "<div class=\"admin_failed\">".ADMIN_EXT_ALREADY_REGISTERED."</div>\n";
 
                                                // Close task but not already closes or deleted or update tasks
                                                if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) {
-                                                       ADMIN_SOLVE_TASK($tid);
+                                                       // Solve the task
+                                                       RUN_FILTER('solve_task', $tid);
                                                } // END - if
                                        }
                                        break;
 
-                               case "EXTENSION_UPDATE":
+                               case "EXTENSION_UPDATE": // Extension update
                                        // Extension updates are installed automatically
-                                       $OUT .= "<FONT class=\"admin_failed medium\">".ADMIN_EXTENSION_UPDATED."</FONT>\n";
+                                       $OUT .= "<div class=\"admin_failed medium\">".ADMIN_EXTENSION_UPDATED."</div>\n";
 
                                        // Close task
                                        if (($status != "CLOSED") && ($status != "DELETED")) {
                                                // Solve the task
-                                               ADMIN_SOLVE_TASK($tid);
+                                               RUN_FILTER('solve_task', $tid);
                                        } // END - if
                                        break;
 
                                case "SUPPORT_MEMBER": // Assign on member's support request
                                        switch ($mode)
                                        {
-                                       default: // Unknown support mode
+                                       default: // @TODO Unknown support mode
                                                DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
-                                               $OUT .= "<FONT class=\"admin_failed medium\">".ADMIN_UNKNOWN_SUPPORT_MODE_1.$mode.ADMIN_UNKNOWN_SUPPORT_MODE_2."</FONT>\n";
+                                               $OUT .= "<div class=\"admin_failed medium\">".ADMIN_UNKNOWN_SUPPORT_MODE_1.$mode.ADMIN_UNKNOWN_SUPPORT_MODE_2."</div>\n";
                                                break;
                                        }
                                        break;
@@ -287,8 +275,8 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                case "PAYOUT_REQUEST": // Payout requests
                                        if (EXT_IS_ACTIVE("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",
-                                                array(bigintval($uid), bigintval($created)), __FILE__, __LINE__);
+                                               $result_pay = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE userid=%s AND payout_timestamp=%s LIMIT 1",
+                                                       array(bigintval($uid), bigintval($created)), __FILE__, __LINE__);
                                                list($pid) = SQL_FETCHROW($result_pay);
                                                SQL_FREERESULT($result_pay);
 
@@ -301,19 +289,19 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                                        $OUT .= LOAD_TEMPLATE("admin_payout_overview_form", true, $content);
                                                } else {
                                                        // Problem obtaining payout ID
-                                                       $OUT .= "<FONT class=\"admin_failed medium\">".PAYOUT_OBTAIN_ID_FAILED."</FONT>\n";
+                                                       $OUT .= "<div class=\"admin_failed medium\">".PAYOUT_OBTAIN_ID_FAILED."</div>\n";
                                                }
                                        } else {
                                                // Extension is not installed
-                                               $OUT .= "<FONT class=\"admin_failed medium\">".ADMIN_PAYOUT_NOT_INSTALLED."</FONT>\n";
+                                               $OUT .= "<div class=\"admin_failed medium\">".ADMIN_PAYOUT_NOT_INSTALLED."</div>\n";
                                        }
                                        break;
 
                                case "WERNIS_REQUEST": // Wernis requests
                                        if (EXT_IS_ACTIVE("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",
-                                                array(bigintval($uid), bigintval($created)), __FILE__, __LINE__);
+                                               $result_pay = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_wernis` WHERE userid=%s AND wernis_timestamp=%s LIMIT 1",
+                                                       array(bigintval($uid), bigintval($created)), __FILE__, __LINE__);
                                                list($pid) = SQL_FETCHROW($result_pay);
                                                SQL_FREERESULT($result_pay);
 
@@ -326,11 +314,11 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                                        $OUT .= LOAD_TEMPLATE("admin_wernis_overview_form", true, $content);
                                                } else {
                                                        // Problem obtaining wernis ID
-                                                       $OUT .= "<FONT class=\"admin_failed medium\">".WERNIS_OBTAIN_ID_FAILED."</FONT>\n";
+                                                       $OUT .= "<div class=\"admin_failed medium\">".WERNIS_OBTAIN_ID_FAILED."</div>\n";
                                                }
                                        } else {
                                                // Extension is not installed
-                                               $OUT .= "<FONT class=\"admin_failed medium\">".ADMIN_WERNIS_NOT_INSTALLED."</FONT>\n";
+                                               $OUT .= "<div class=\"admin_failed medium\">".ADMIN_WERNIS_NOT_INSTALLED."</div>\n";
                                        }
                                        break;
 
@@ -339,8 +327,8 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                        break;
 
                                case "NL_UNSUBSCRIBE": // Newsletter unsubscriptions
-                                       $result = SQL_QUERY_ESC("SELECT nl_timespan FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
-                                        array(bigintval($uid)), __FILE__, __LINE__);
+                                       $result = SQL_QUERY_ESC("SELECT nl_timespan FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+                                               array(bigintval($uid)), __FILE__, __LINE__);
                                        list($span) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
 
@@ -353,18 +341,18 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                                $OUT .= LOAD_TEMPLATE("admin_newsletter_tsk", true, $content);
                                        } else {
                                                // Already unsubscribed
-                                               $OUT .= "<FONT class=\"admin_failed medium\">".ADMIN_NL_UNSUBSCRIBE_ALREADY."</FONT>\n";
+                                               $OUT .= "<div class=\"admin_failed medium\">".ADMIN_NL_UNSUBSCRIBE_ALREADY."</div>\n";
                                        }
                                        break;
 
                                default: // Unknown task type
                                        DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type));
-                                       $OUT .= "<FONT class=\"admin_failed medium\">".ADMIN_UNKNOWN_TASK_TYPE_1.$type.ADMIN_UNKNOWN_TASK_TYPE_2.$id.ADMIN_UNKNOWN_TASK_TYPE_3."</FONT>\n";
+                                       $OUT .= "<div class=\"admin_failed medium\">".ADMIN_UNKNOWN_TASK_TYPE_1.$type.ADMIN_UNKNOWN_TASK_TYPE_2.$id.ADMIN_UNKNOWN_TASK_TYPE_3."</div>\n";
                                        break;
                                }
-                               $OUT .= "  </TD>
-  <TD width=\"1%\" class=\"switch_sw".$SW." bottom2 right2\">&nbsp;</TD>
-</TR>\n";
+                               $OUT .= "  </td>
+  <td width=\"1%\" class=\"switch_sw".$SW." bottom2 right2\">&nbsp;</td>
+</tr>\n";
                        } // END - if
                        $SW = 3 - $SW;
                } // END - foreach
@@ -373,25 +361,25 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                // Load final template
                LOAD_TEMPLATE("admin_overview_list");
        } else {
-               if ((isset($_POST['task'])) && ((sizeof($_POST['task']) > 0) || ($_POST['task'][0] == "1"))) {
+               if ((isset($POST['task'])) && ((sizeof($POST['task']) > 0) || ($POST['task'][0] == "1"))) {
                        // Only unassign / delete tasks when there are selected tasks posted
-                       if (!empty($_POST['unassign'])) {
+                       if (!empty($POST['unassign'])) {
                                // Unassign from tasks
-                               foreach ($_POST['task'] as $id => $sel) {
-                                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin=0 WHERE id=%s AND assigned_admin=%s LIMIT 1",
-                                        array(bigintval($id), GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
+                               foreach ($POST['task'] as $id => $sel) {
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET assigned_admin=0 WHERE id=%s AND assigned_admin=%s LIMIT 1",
+                                               array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
                                }
-                       } elseif (isset($_POST['del'])) {
+                       } elseif (isset($POST['del'])) {
                                // Delete tasks
-                               foreach ($_POST['task'] as $id => $sel) {
-                                       $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE id=%s AND assigned_admin IN (%s,0) LIMIT 1",
-                                        array(bigintval($id), GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
+                               foreach ($POST['task'] as $id => $sel) {
+                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s AND assigned_admin IN (%s,0) LIMIT 1",
+                                               array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
                                }
                        }
 
                        // 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",
-                        array(GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
+                       $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",
+                        array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
                } // END - if
 
                // There are uncompleted jobs!
@@ -401,16 +389,16 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                        $infos = "---";
                        if ($admin == "0") {
                                // No admin currently is assigned
-                               $admin = "<FONT class=\"admin_note\">".ADMIN_NO_ADMIN_ASSIGNED."</FONT>";
+                               $admin = "<div class=\"admin_note\">".ADMIN_NO_ADMIN_ASSIGNED."</div>";
                        } else {
                                // Load admin's data
                                $login = GET_ADMIN_LOGIN($admin);
                                if ($login != "***") {
                                        // Admin found
-                                       $admin = "<A href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</A>";
+                                       $admin = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
                                } else {
                                        // Maybe deleted?
-                                       $admin = "<FONT class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</FONT>";
+                                       $admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
                                }
                        }
 
@@ -431,7 +419,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                // Member found otherwise it's a system task
                                $uid = ADMIN_USER_PROFILE_LINK($uid);
                        } else {
-                               $uid = "<I>".ADMIN_IS_SYSTEM_TASK."</I>";
+                               $uid = "<em>".ADMIN_IS_SYSTEM_TASK."</em>";
                        }
 
                        // Prepare content