All database names are now 'back-ticked' and constant _MYSQL_PREFIX is wrapped. Partl...

[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 204d1974b21dfad0f6507414b7e09b83eb11088d..a3216622976010ec316cf6413902c8542841fea8 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,18 +83,18 @@ 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
                                switch ($active) {
-                                       case 'Y': $EXT_LOAD_MODE = "activate";   break;
-                                       case 'N': $EXT_LOAD_MODE = "deactivate"; break;
+                                       case "Y": $EXT_LOAD_MODE = "activate";   break;
+                                       case "N": $EXT_LOAD_MODE = "deactivate"; break;
                                }
 
                                // Run embeded SQL commands
@@ -114,12 +114,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);
@@ -163,11 +163,11 @@ if (!empty($_GET['reg_ext'])) {
                // Get extension name
                $ext_name = GET_EXT_NAME($ext_id);
 
-               if ($_CONFIG['verbose_sql'] == "Y") {
+               if (getConfig('verbose_sql') == "Y") {
                        // Load SQL commands in remove mode
-                       if (LOAD_EXTENSION($ext_name, "remove", "", true)) {
+                       if (LOAD_EXTENSION($ext_name, "remove", "", true, $SQLs)) {
                                // Generate extra table with loaded SQL commands
-                               $VERBOSE_OUT = EXTENSION_VERBOSE_TABLE();
+                               $VERBOSE_OUT = EXTENSION_VERBOSE_TABLE($SQLs);
                        } // END - if
                } // END - if
 
@@ -225,13 +225,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 +270,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, ADMIN_NO_EXTENSION_REGISTERED."</div>");
        }
        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 +285,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);