- Major change in LOAD_EMAIL_TEMPLATE(). The deprecated switch() block has
[mailer.git] / inc / modules / admin / overview-inc.php
index aa2f8e7103a4af865071b84c869b4130680c60aa..443f8ad13c5b2a95e9d06a5de75eca4b51cbdc78 100644 (file)
@@ -59,13 +59,12 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks)
                        // Possible newly installed extension found so we extract extension's name
                        $ext = strtolower(substr($file, 4, -4)); // Keep always extension names on lower case!!!
 
-                       // Check if extension is installed or not
+                       // Init variables
                        $ext_ver = "";
-                       if ((!is_array($cacheArray['extensions']['ext_version'])) || (empty($cacheArray['extensions']['ext_version'][$ext]))) {
-                               // 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__);
-                       } else {
+                       $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
@@ -77,6 +76,10 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks)
 
                                // Disable load from database
                                $result = false;
+                       } 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__);
                        }
 
                        // Is the extension not yet installed?
@@ -84,40 +87,8 @@ function OUTPUT_STANDARD_OVERVIEW(&$result_tasks)
                                // Generate subject line
                                $ext_subj = sprintf("[%s:]", $ext);
 
-                               // Not installed and do we have created a task for the admin?
-                               //* DEBUG: */ echo $ext.":".$ext_ver."=";
-                               $result = SQL_QUERY_ESC("SELECT `id` FROM `"._MYSQL_PREFIX."_task_system` WHERE `subject` LIKE '%s%%' LIMIT 1",
-                                array($ext_subj), __FILE__, __LINE__);
-                               //* DEBUG: */ echo SQL_NUMROWS($result)."<br />\n";
-                               if ((SQL_NUMROWS($result) == 0) && (GET_EXT_VERSION($ext) == "")) {
-                                       // Template file
-                                       $tpl = sprintf("%stemplates/%s/html/ext/ext_%s.tpl",
-                                               PATH,
-                                               GET_LANGUAGE(),
-                                               $ext
-                                       );
-
-                                       // Load text for task
-                                       if ((file_exists($tpl)) && (is_readable($tpl))) {
-                                               // Load extension's own text template (HTML!)
-                                               $MSG = LOAD_TEMPLATE("ext_".$ext, true);
-                                       } else {
-                                               // Load default message
-                                               $MSG = LOAD_EMAIL_TEMPLATE("admin_new_ext","", 0);
-                                       }
-
-                                       // Task not created so it's a brand-new extension which we need to register and create a task for!
-                                       $result_insert = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, userid, status, task_type, subject, text, task_created)
-VALUES ('%s', '0', 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())",
-                                        array(
-                                               GET_ADMIN_ID(get_session('admin_login')),
-                                               $ext_subj,
-                                               addslashes($MSG),
-                                       ),  __FILE__, __LINE__, true, false);
-                               }
-
-                               // Free memory
-                               SQL_FREERESULT($result);
+                               // 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);
@@ -133,12 +104,17 @@ VALUES ('%s', '0', 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())",
 
                                if (!empty($cacheArray['active_extensions'][$ext])) {
                                        // Maybe we want to keept the current extension active?
-                                       if (($cacheArray['active_extensions'][$ext] == "Y") && (!EXT_IS_ACTIVE($ext, true, true))) {
+                                       if (($cacheArray['active_extensions'][$ext] == "Y") && (!EXT_IS_ACTIVE($ext))) {
                                                // Reactivate this extension!
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='Y' WHERE ext_name='%s' LIMIT 1",
                                                 array($ext), __FILE__, __LINE__);
-                                               EXTENSION_RUN_SQLS(GET_EXT_ID($ext), "activate");
-                                       }
+
+                                               // Extension has been activated?
+                                               if (SQL_AFFECTEDROWS() == 1) {
+                                                       // Then run all queries
+                                                       EXTENSION_RUN_SQLS(GET_EXT_ID($ext), "activate");
+                                               } // END - if
+                                       } // END - if
                                }
                        }
                }
@@ -172,7 +148,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
        if ((isset($_POST['assign'])) && (count($_POST['task']) > 0)) {
                // Assign / do tasks
                $OUT = ""; $SW = 2;
-               foreach ($_POST['task'] as $id=>$sel) {
+               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__);
                        if (SQL_NUMROWS($result_task) == 1) {
@@ -194,13 +170,13 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                }
 
                                if ($uid > 0) {
-                                       $result_user = SQL_QUERY_ESC("SELECT sex, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+                                       $result_user = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                         array(bigintval($uid)), __FILE__, __LINE__);
                                        if (SQL_NUMROWS($result_user) == 1)
                                        {
-                                               list($sex, $sname, $fname, $email) = SQL_FETCHROW($result_user);
+                                               list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user);
                                                SQL_FREERESULT($result_user);
-                                               $ADD = "<LI>".ADMIN_MEMBER_UID.": <STRONG>".ADMIN_USER_PROFILE_LINK($uid)." (<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_SEX($sex)." ".$sname." ".$fname."</A>)</STRONG></LI>";
+                                               $ADD = "<LI>".ADMIN_MEMBER_UID.": <STRONG>".ADMIN_USER_PROFILE_LINK($uid)." (<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</A>)</STRONG></LI>";
                                        }
                                }
 
@@ -427,7 +403,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                        if (!empty($_POST['unassign']))
                        {
                                // Unassign from tasks
-                               foreach ($_POST['task'] as $id=>$sel)
+                               foreach ($_POST['task'] as $id => $sel)
                                {
                                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin=0 WHERE id=%s AND assigned_admin=%s LIMIT 1",
                                         array(bigintval($id), GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
@@ -436,7 +412,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                         elseif (isset($_POST['del']))
                        {
                                // Delete tasks
-                               foreach ($_POST['task'] as $id=>$sel)
+                               foreach ($_POST['task'] as $id => $sel)
                                {
                                        $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE id=%s AND assigned_admin IN (%s,0) LIMIT 1",
                                         array(bigintval($id), GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);