Some major rewrites + ext-network continued:

[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 3e800b811d4b375edf35a88f509aa2bede930030..7edad6ab8de5f8347c99913707fd3d290d134672 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -203,75 +203,70 @@ LIMIT 1",
                                $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'] = displayMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=' . $ext_name . '%}', TRUE) . $taskData['text'];
-                                               } // END - if
-
-                                               // Set current extension name
-                                               setCurrentExtensionName($ext_name);
+                               $ext_ver  = '';
+                               $ext_name = '';
+                               $title    = '{--ADMIN_TASK_NO_SQL_TITLE--}';
 
-                                               // Add notes to text
-                                               $taskData['text'] .= getExtensionNotes();
+                               // Extract extension name from subject (for testing)
+                               $ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1);
 
-                                               // 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, ':'));
+                               // 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);
 
-                                               // Load SQLs from file
-                                               updateExtension($ext_name, $ext_ver, TRUE);
+                                       // Get current extension's version
+                                       $ext_ver = getCurrentExtensionVersion();
 
-                                               // Set current extension name
-                                               setCurrentExtensionName($ext_name);
+                                       // Is this non-productive?
+                                       if (isExtensionProductive() === FALSE) {
+                                               // Issue warning
+                                               $taskData['text'] = displayMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=' . $ext_name . '%}', TRUE) . $taskData['text'];
+                                       } // END - if
 
-                                               // Add notes to text
-                                               $taskData['text'] .= getExtensionNotes();
+                                       // Set current extension name
+                                       setCurrentExtensionName($ext_name);
 
-                                               // Set title
-                                               $title = '{--ADMIN_SQLS_EXECUTED_ON_UPDATE--}';
-                                       } else {
-                                               // Remove extension's name
-                                               $ext_name = '';
-                                       }
+                                       // Add notes to text
+                                       $taskData['text'] .= getExtensionNotes();
 
-                                       // Add SQLs to a table
-                                       if ((!empty($ext_name)) && (isVerboseSqlEnabled())) {
-                                               // Add verbose SQL table
-                                               $taskData['text'] .= addExtensionVerboseSqlTable($title);
-                                       } // END - if
-                               } elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
-                                       // Run SQL commands in dry mode but only return the notes
+                                       // 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, ':'));
+
+                                       // 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 {
+                                       // 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(
@@ -279,7 +274,8 @@ LIMIT 1",
                                        'add'          => $add,
                                        'text'         => $taskData['text'],
                                        'task_created' => generateDateTime($taskData['task_created'], '1'),
-                                       'ext_name'     => $ext_name
+                                       'ext_name'     => $ext_name,
+                                       'ext_version'  => $ext_ver
                                );
 
                                // Load template