Fixes for stripped HTML tags, and false warnings in debug log

[mailer.git] / inc / extensions / ext-rewrite.php

diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php
index c440439df78dc31bfd2a13b18d5fceb1bfae89fb..89f17b04ec14bfa0e6b09407e4fe19a6f0109e17 100644 (file)
--- a/inc/extensions/ext-rewrite.php
+++ b/inc/extensions/ext-rewrite.php
@@ -52,7 +52,7 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
        // Check if mod_rewrite is loadeded
        if (!IF_APACHE_MODULE_LOADED('mod_rewrite')){
                $EXT_REPORTS_FAILURE = true;
-               ADD_FATAL(MOD_REWRITE_ERROR);
+               addFatalMessage(MOD_REWRITE_ERROR);
        } // END - if
 
        // SQL commands to run
@@ -61,15 +61,15 @@ case "register": // Do stuff when installation is running (modules.php?module=ad
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE what='config_rewrite' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `what`='config_rewrite' LIMIT 1";
        break;
 
 case "activate": // Do stuff when admin activates this extension
        // Check if mod_rewrite is loadeded
        if (!IF_APACHE_MODULE_LOADED('mod_rewrite')) {
-               $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='N' WHERE ext_name='rewrite' LIMIT 1", array(), __FILE__, __LINE__);
+               SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='N' WHERE ext_name='rewrite' LIMIT 1", __FILE__, __LINE__);
                $EXT_REPORTS_FAILURE = true;
-               ADD_FATAL(MOD_REWRITE_ERROR);
+               addFatalMessage(MOD_REWRITE_ERROR);
         } // END - if
 
        // SQL commands to run
@@ -123,8 +123,8 @@ case "update": // Update an extension
                break;
 
        case "0.0.9": // SQL queries for v0.0.9
-               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD rewrite_skip VARCHAR(255) NOT NULL DEFAULT 'login:admin:frametester:mailid'";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_rewrite','Rewrite-Engine','Stellen Sie hier ein, welche Module übersprungen werden sollen, in denen also kein Umschreiben des HTML-Codes stattfinden soll.', 8)";
+               $SQLs[] = "ALTER TABLE `{!_MYSQL_PREFIX!}_config` ADD rewrite_skip VARCHAR(255) NOT NULL DEFAULT 'login:admin:frametester:mailid'";
+               $SQLs[] = "INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_rewrite','Rewrite-Engine','Stellen Sie hier ein, welche Module übersprungen werden sollen, in denen also kein Umschreiben des HTML-Codes stattfinden soll.', 8)";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Zu überspringende Module können per Admin-Bereich eingestellt werden.";
@@ -132,7 +132,7 @@ case "update": // Update an extension
 
        case "0.1.0": // SQL queries for v0.2.1
                // Update notes (these will be set as task text!)
-               $UPDATE_NOTES = "W&ouml;rter <STRONG>Mailtausch</STRONG>, <STRONG>Mailtausches</STRONG> und <STRONG>Mailtauscher</STRONG> sind austauschbar.";
+               $UPDATE_NOTES = "W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.";
                break;
 
        case "0.1.1": // SQL queries for v0.1.1
@@ -148,25 +148,25 @@ case "update": // Update an extension
                // Check if mod_rewrite is loadeded
                if (!IF_APACHE_MODULE_LOADED('mod_rewrite')){
                        $EXT_REPORTS_FAILURE = true;
-                       //ADD_FATAL(MOD_REWRITE_ERROR);
+                       //addFatalMessage(MOD_REWRITE_ERROR);
                } // END - if
                $UPDATE_NOTES = "Es wird beim Registrieren und aktivieren gepr&uuml;ft, ob im Apache das Modul mod_rewrite geladen wurde. Wenn mod_rewrite nicht gefunden werden konnte, wird abgebrochen.";
                break;
        }
        break;
 
+case "test": // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305.
+       break;
+
 default: // Do stuff when extension is loaded
        // Check if mod_rewrite is loadeded
        if (!IF_APACHE_MODULE_LOADED('mod_rewrite')){
                $EXT_REPORTS_FAILURE = true;
-               $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_extensions SET ext_active='N' WHERE ext_name='rewrite' LIMIT 1", array(), __FILE__, __LINE__);
-               if (!IS_ADMIN())ADD_FATAL(MOD_REWRITE_ERROR);
+               SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_extensions` SET ext_active='N' WHERE ext_name='rewrite' LIMIT 1", __FILE__, __LINE__);
+               if (!IS_ADMIN())addFatalMessage(MOD_REWRITE_ERROR);
         } // END - if
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "rewrite";
-
 //
 ?>