Unsupported extensions removed, several rewrites to extension handling, 'yoomedia...

[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 23501fea9938f4b76b100f23e5a985fa9f8b8c4e..cfbd6efc5fcfe36926f622234d007dc4e6920133 100644 (file)
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -94,8 +94,9 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks) {
                                        SQL_FREERESULT($result);
                                } // END - if
 
-                               // Update extension
-                               if (!empty($ext_ver)) EXTENSION_UPDATE($file, $ext, $ext_ver);
+                               // 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);
 
                                if (!empty($cacheArray['active_extensions'][$ext])) {
                                        // Maybe we want to keept the current extension active?
@@ -277,6 +278,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                        switch ($mode)
                                        {
                                        default: // Unknown support mode
+                                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
                                                $OUT .= "<FONT class=\"admin_failed medium\">".ADMIN_UNKNOWN_SUPPORT_MODE_1.$mode.ADMIN_UNKNOWN_SUPPORT_MODE_2."</FONT>\n";
                                                break;
                                        }
@@ -356,6 +358,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                        break;
 
                                default: // Unknown task type
+                                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type));
                                        $OUT .= "<FONT class=\"admin_failed medium\">".ADMIN_UNKNOWN_TASK_TYPE_1.$type.ADMIN_UNKNOWN_TASK_TYPE_2.$id.ADMIN_UNKNOWN_TASK_TYPE_3."</FONT>\n";
                                        break;
                                }
@@ -410,8 +413,10 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                        $admin = "<FONT class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</FONT>";
                                }
                        }
-                       $evl = "\$type_out = ADMIN_TASK_IS_".strtoupper($type).";";
-                       eval($evl);
+
+                       // Get task type
+                       $type_out = constant('ADMIN_TASK_IS_'.strtoupper($type).'');
+
                        $type2 = substr($text, 0, strpos($text, ":"));
                        // Generate infos
                        switch ($type)
@@ -421,16 +426,15 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                $infos = substr($subj, 1, strpos($subj, ":") - 1);
                                break;
                        }
-                       if ($uid > 0)
-                       {
+
+                       if ($uid > 0) {
                                // Member found otherwise it's a system task
                                $uid = ADMIN_USER_PROFILE_LINK($uid);
-                       }
-                        else
-                       {
+                       } else {
                                $uid = "<I>".ADMIN_IS_SYSTEM_TASK."</I>";
                        }
 
+                       // Prepare content
                        $content = array(
                                'sw'      => $SW,
                                'id'      => $id,
@@ -441,7 +445,16 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                'created' => MAKE_DATETIME($created, "2")
                        );
 
-                       LOAD_TEMPLATE("admin_overview_list_rows", false, $content);
+                       // Do we have extension task?
+                       if (($type == "EXTENSION") && (GET_EXT_VERSION($infos) == "")) {
+                               // Load extension row template
+                               LOAD_TEMPLATE("admin_overview_list_ext_rows", false, $content);
+                       } else {
+                               // Load default row template
+                               LOAD_TEMPLATE("admin_overview_list_rows", false, $content);
+                       }
+
+                       // Switch color
                        $SW = 3 - $SW;
                }
                // Free memory