Extension updates should now work (cache refresh is broken)

[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 cfbd6efc5fcfe36926f622234d007dc4e6920133..b39e9a0c0c7ca2fa7727faa67316832a384391ff 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -42,7 +42,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
 
        // 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__);
+               array(GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
 
        // We currently don't want to install an extension so let's find out if we need...
        $EXT_LOAD_MODE = "register";
@@ -74,7 +74,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
                        } 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__);
+                                       array($ext), __FILE__, __LINE__);
                        }
 
                        // Is the extension not yet installed?
@@ -82,11 +82,11 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
                                // 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);
-
                                // We maybe want to install an extension so let's test-drive it...
-                               include(PATH."inc/extensions/".$file);
+                               if (LOAD_EXTENSION($ext, $EXT_LOAD_MODE)) {
+                                       // Create a task for newly installed extension
+                                       CREATE_NEW_EXTENSION_TASK(GET_ADMIN_ID(get_session('admin_login')), $ext_subj, $ext);
+                               } // END - if
                        } else {
                                // Maybe we want to update?
                                if ((empty($cacheArray['extensions']['ext_version'][$ext])) && (SQL_NUMROWS($result) == 1)) {
@@ -94,9 +94,15 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
                                        SQL_FREERESULT($result);
                                } // END - if
 
+                               // Test-drive extension in update mode
+                               include(sprintf("%sinc/extensions/ext-%s.php", PATH, $ext));
+                               
                                // 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},ver={$EXT_VERSION}/".GET_EXT_VERSION($ext)."<br />\n";
+                               if ($EXT_VERSION > GET_EXT_VERSION($ext)) {
+                                       // Update the extension
+                                       EXTENSION_UPDATE($file, $ext, $ext_ver);
+                               } // END - if
 
                                if (!empty($cacheArray['active_extensions'][$ext])) {
                                        // Maybe we want to keept the current extension active?
@@ -117,7 +123,7 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
 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_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result_tasks) > 0) {
                // New jobs found!
@@ -139,7 +145,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_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__);
+                               array(bigintval($id), GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result_task) == 1) {
                                // Task is valid...
                                list($tid, $uid, $type, $subj, $text, $created, $status, $aid) = SQL_FETCHROW($result_task);
@@ -148,7 +154,7 @@ 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__);
+                                               array(GET_ADMIN_ID(get_session('admin_login')), bigintval($tid)), __FILE__, __LINE__);
                                } // END - if
 
                                $ADD = "";
@@ -191,7 +197,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."-";