Naming convention applied to language strings, new API function added:

[mailer.git] / inc / modules / admin / overview-inc.php

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 1b85cbead7f86951fc864885b97bacdd709d16ad..34a4783cbbebbb92c978328dafe15da03daef2e9 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -40,7 +40,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // @TODO This function does also check for uncompleted tasks
 function outputStandardOverview (&$result_tasks) {
@@ -192,7 +192,7 @@ LIMIT 1",
 
                                // Initialize variables (no title for SQL commands by default)
                                $ext_name = ''; $ext_ver = '';
-                               $title = '{--TASK_NO_TITLE--}';
+                               $title = '{--ADMIN_TASK_NO_SQL_TITLE--}';
 
                                // Shall I list SQL commands assigned to an extension installation or update task?
                                if ((isVerboseSqlEnabled()) || (!isExtensionInstalled('sql_patches'))) {
@@ -207,7 +207,7 @@ LIMIT 1",
                                                // 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'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name)) . $taskData['text'];
                                                } // END - if
 
                                                // Set current extension name
@@ -245,7 +245,7 @@ LIMIT 1",
                                        // 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 />\n";
+                                               $taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="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
@@ -278,19 +278,15 @@ LIMIT 1",
                                switch ($taskData['task_type']) {
                                        case 'EXTENSION': // Install new extensions
                                                $ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 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);
-                                               if ($lines == '0') {
-                                                       // New extension found
+                                               if (!isExtensionInstalled($ext_name)) {
+                                                       // New (not yet installed) extension found
                                                        $OUT .= loadTemplate('admin_extension_reg_form', true, array(
                                                                'id'       => bigintval($taskId),
                                                                'ext_name' => $ext_name
                                                        ));
                                                } else {
-                                                       // Task is closed so nothing is todo
-                                                       $OUT .= '<div class="admin_failed">{--ADMIN_EXTENSION_ALREADY_REGISTERED--}</div>';
+                                                       // Extension is already installed
+                                                       $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')) {
@@ -302,7 +298,7 @@ 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
                                                if (!in_array($taskData['status'], array('CLOSED', 'DELETED'))) {
@@ -316,7 +312,7 @@ LIMIT 1",
                                                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>';
+                                                       $OUT .= '<div class="notice medium">' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '</div>';
                                                        break;
                                                }
                                                break;
@@ -340,11 +336,11 @@ LIMIT 1",
                                                                $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;
 
@@ -365,11 +361,11 @@ LIMIT 1",
                                                                $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;
 
@@ -383,7 +379,7 @@ LIMIT 1",
 
                                        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>';
+                                               $OUT .= '<div class="notice medium">' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $taskData['task_type'], $taskId) . '</div>';
                                                break;
                                }
                                $OUT .= '
@@ -451,7 +447,7 @@ LIMIT 1",
                        $content['task_created'] = generateDateTime($content['task_created'], 2);
 
                        // Do we have extension task?
-                       if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) {
+                       if (isExtensionTask($content)) {
                                // Load extension row template
                                $OUT .= loadTemplate('admin_overview_list_ext_rows', true, $content);
                        } else {