Continue link added, contributed by profi-concept. Partly resolves #3

[mailer.git] / inc / modules / admin / what-extensions.php

diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index 2446b3df907cb7b5ea8abc47328b7a5616edb24a..54c37e4dd3205436d3a00a0c2a94fb75bb0f56e1 100644 (file)
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -61,8 +61,8 @@ if (!empty($_GET['reg_ext'])) {
                        // De/activate extension
                        $ACT = "N"; $EXT_LOAD_MODE = "deactivate";
                        if ($active == "N") { $ACT = "Y"; $EXT_LOAD_MODE = "activate"; }
-                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='".$ACT."' WHERE id=%s AND ext_active='%s' LIMIT 1",
-                        array(bigintval($ext_id), $active), __FILE__, __LINE__);
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='".$ACT."' WHERE id=%s AND ext_active='%s' LIMIT 1",
+                               array(bigintval($ext_id), $active), __FILE__, __LINE__);
 
                        // Run embeded SQL commands
                        EXTENSION_RUN_SQLS($ext_id, $EXT_LOAD_MODE);
@@ -83,12 +83,12 @@ if (!empty($_GET['reg_ext'])) {
                                $active = $_POST['active'][$ext_id];
                                if (GET_EXT_VERSION("sql_patches") >= "0.0.6")  {
                                        // Update also CSS column when extensions sql_patches is newer or exact v0.0.6
-                                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_has_css='%s', ext_active='%s' WHERE id=%s LIMIT 1",
-                                        array($_POST['css'][$ext_id], $active, $ext_id), __FILE__, __LINE__);
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_has_css='%s', ext_active='%s' WHERE id=%s LIMIT 1",
+                                               array($_POST['css'][$ext_id], $active, $ext_id), __FILE__, __LINE__);
                                } else {
                                        // When extension is older than v0.0.6 there is no column for the CSS information
-                                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='%s' WHERE id=%s LIMIT 1",
-                                        array($active, $ext_id), __FILE__, __LINE__);
+                                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='%s' WHERE id=%s LIMIT 1",
+                                               array($active, $ext_id), __FILE__, __LINE__);
                                }
 
                                // Run SQLs on activation / deactivation
@@ -103,9 +103,7 @@ if (!empty($_GET['reg_ext'])) {
                }
 
                // Extensions changed
-               OUTPUT_HTML("<P align=\"center\">");
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_EXT_CHANGED);
-               OUTPUT_HTML("</P>");
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_EXT_CHANGED'));
        } else {
                // Edit selected entries
                $SW = "2"; $OUT = "";
@@ -114,12 +112,12 @@ if (!empty($_GET['reg_ext'])) {
                        if (($sel == "Y") || ($sel == "N")) {
                                // Load required data
                                if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
-                                       $result = SQL_QUERY_ESC("SELECT ext_name, ext_has_css, ext_active FROM "._MYSQL_PREFIX."_extensions WHERE id=%s LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT ext_name, ext_has_css, ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE id=%s LIMIT 1",
                                         array(bigintval($ext_id)), __FILE__, __LINE__);
                                        list($name, $css, $active) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
                                } else {
-                                       $result = SQL_QUERY_ESC("SELECT ext_name, ext_active FROM "._MYSQL_PREFIX."_extensions WHERE id=%s LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT ext_name, ext_active FROM `{!_MYSQL_PREFIX!}_extensions` WHERE id=%s LIMIT 1",
                                         array(bigintval($ext_id)), __FILE__, __LINE__);
                                        list($name, $active) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
@@ -225,13 +223,13 @@ case "overview": // List all registered extensions
        if (GET_EXT_VERSION("sql_patches") >= "0.0.6") {
                // Load extension data with CSS informations
                $result = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_active, ext_has_css AS ext_css, ext_version
-FROM "._MYSQL_PREFIX."_extensions
+FROM `{!_MYSQL_PREFIX!}_extensions`
 ".$where."
 ORDER BY ext_name", __FILE__, __LINE__);
        } else {
                // Load extension data without CSS informations
                $result = SQL_QUERY("SELECT id AS ext_id, ext_name, ext_active, id, ext_version
-FROM "._MYSQL_PREFIX."_extensions
+FROM `{!_MYSQL_PREFIX!}_extensions`
 ".$where."
 ORDER BY ext_name", __FILE__, __LINE__);
        }
@@ -270,12 +268,12 @@ ORDER BY ext_name", __FILE__, __LINE__);
                LOAD_TEMPLATE("admin_extensions");
        } else {
                // No extensions are registered
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_EXTENSION_REGISTERED."</FONT>");
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_EXTENSION_REGISTERED'));
        }
        break;
 
 case "register": // Register new extension
-       $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_task_system WHERE assigned_admin=%s AND task_type='EXTENSION' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_task_system` WHERE assigned_admin=%s AND task_type='EXTENSION' LIMIT 1",
                array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
        $task_found = SQL_NUMROWS($result);
 
@@ -285,7 +283,7 @@ case "register": // Register new extension
        // Is the ID number valid and the task was found?
        if (($ext_id > 0) && ($task_found == 1)) {
                // ID is valid so begin with registration, we first want to it's real name from task management (subject column)
-               $result = SQL_QUERY_ESC("SELECT subject FROM "._MYSQL_PREFIX."_task_system WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT subject FROM `{!_MYSQL_PREFIX!}_task_system` WHERE id=%s LIMIT 1",
                        array(bigintval($ext_id)), __FILE__, __LINE__);
                list($subj) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
@@ -306,7 +304,20 @@ case "register": // Register new extension
                                $status = EXTENSION_REGISTER($ext_name, $ext_id);
                                if ($status == true) {
                                        // Extension was found and successfully registered
-                                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_EXTENSION_REGISTERED);
+                                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_EXTENSION_REGISTERED'));
+
+                                       // Show next link
+                                       if (EXT_IS_ACTIVE("task")) {
+                                               LOAD_TEMPLATE("admin_next_link", false, array(
+                                                       'url'   => "modules.php?module=admin&amp;what=list_task",
+                                                       'title' => getMessage('ADMIN_EXT_REGISTER_NEXT_LINK')
+                                               ));
+                                       } else {
+                                               LOAD_TEMPLATE("admin_next_link", false, array(
+                                                       'url'   => "modules.php?module=admin",
+                                                       'title' => getMessage('ADMIN_EXT_REGISTER_NEXT_LINK')
+                                               ));
+                                       }
 
                                        // Do we need to update cache file?
                                        if ((EXT_IS_ACTIVE("cache")) && ($cacheMode != "no")) {
@@ -317,30 +328,30 @@ case "register": // Register new extension
                                        } // END - if
                                } elseif (GET_EXT_VERSION($ext_name) != "") {
                                        // Notify the admin that we have a problem here...
-                                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_ALREADY);
+                                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_ALREADY'));
                                } else {
                                        // Notify the admin that we have a problem here...
-                                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_404);
+                                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_404'));
                                }
                        } else {
                                // Motify the admin that we have a problem here...
-                               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_DEPRECATED);
+                               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_DEPRECATED'));
                        }
                } else {
                        // Extension was not found in task management
-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_ID_404);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_ID_404'));
                }
        } elseif ($task_found == "0") {
                // No longer assigned or old task
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_ASSIGED);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_ASSIGED'));
        } else {
                // ID is invalid
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_REG_FAILED_INVALID);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REG_FAILED_INVALID'));
        }
        break;
 
 case "demo":
-       LOAD_TEMPLATE("admin_settings_saved", false, SETTINGS_NOT_SAVED);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_NOT_SAVED'));
        break;
 }
 //