Began to rewrite whole script for newly added filters, new extension stub 'network...

[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 e8a2b36674321af689b7c92c3c35c9ba2c9f2c08..5574b354e4b79b9282f954d4bbefac594eeb2f4a 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -55,60 +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);
+                               $ext_subj = sprintf("[%s:]", $ext_name);
 
                                // We maybe want to install an extension so let's test-drive it...
-                               if (LOAD_EXTENSION($ext, $EXT_LOAD_MODE)) {
+                               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);
+                                       CREATE_NEW_EXTENSION_TASK(GET_CURRENT_ADMIN_ID(), $ext_subj, $ext_name);
                                } // END - if
                        } 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);
-                               } // END - if
-
                                // Test-drive extension in update mode
-                               include(sprintf("%sinc/extensions/ext-%s.php", PATH, $ext));
-                               
+                               include(sprintf("%sinc/extensions/ext-%s.php", PATH, $ext_name));
+
                                // Update extension if extension is installed and outdated
-                               //* DEBUG: */ print "ext={$ext},ver={$EXT_VERSION}/".GET_EXT_VERSION($ext)."<br />\n";
-                               if ($EXT_VERSION > GET_EXT_VERSION($ext)) {
+                               //* 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($file, $ext, $ext_ver);
+                                       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
                        }
@@ -205,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;
@@ -226,7 +206,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                        } // 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;
                                }
 
@@ -264,7 +244,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
 
                                                // Close task but not already closes or deleted or update tasks
                                                if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) {
-                                                       ADMIN_SOLVE_TASK($tid);
+                                                       RUN_FILTER('solve_task', $tid);
                                                } // END - if
                                        }
                                        break;
@@ -276,7 +256,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                        // Close task
                                        if (($status != "CLOSED") && ($status != "DELETED")) {
                                                // Solve the task
-                                               ADMIN_SOLVE_TASK($tid);
+                                               RUN_FILTER('solve_task', $tid);
                                        } // END - if
                                        break;