Naming convention applied, ext-network menu resorted:

[mailer.git] / inc / modules / admin / what-extensions.php

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 0e130785efd3b65dea30979f9401d048c5420b39..5f5ce559352180e148337f5a335e4061c64ea6f2 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -326,15 +326,11 @@ ORDER BY
                break;
 
        case 'register': // Register new extension
-               $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `assigned_admin`=%s AND `task_type`='EXTENSION' LIMIT 1",
-                       array(getCurrentAdminId()), __FILE__, __LINE__);
-               $task_found = SQL_NUMROWS($result);
-
-               // Free result
-               SQL_FREERESULT($result);
+               // Do we have some tasks?
+               $numTasks = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, "AND `task_type`='EXTENSION'");
 
                // Is the id number valid and the task was found?
-               if (($taskId > 0) && ($task_found == 1)) {
+               if (($taskId > 0) && ($numTasks > 0)) {
                        // id is valid so begin with registration, we first want to it's real name from task management (subject column)
                        $result = SQL_QUERY_ESC("SELECT `subject` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s LIMIT 1",
                                array(bigintval($taskId)), __FILE__, __LINE__);
@@ -389,7 +385,7 @@ ORDER BY
                                // Extension was not found in task management
                                loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ID_404--}');
                        }
-               } elseif ($task_found == '0') {
+               } elseif ($numTasks == '0') {
                        // No longer assigned or old task
                        loadTemplate('admin_settings_saved', false, '{--ADMIN_EXTENSION_REGISTRATION_FAILED_ASSIGED--}');
                } else {