Moved SQL queries to 'register' hook, fixed language problem in ext-holiday

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

diff --git a/inc/extensions/ext-rewrite.php b/inc/extensions/ext-rewrite.php
index 07a4714624f3b42b3395444e6db56abf6a1b1c60..262dcc4bb9c9da2095cfa61e308eb75b6abb3e81 100644 (file)
--- a/inc/extensions/ext-rewrite.php
+++ b/inc/extensions/ext-rewrite.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -40,7 +38,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 // Version number
 setThisExtensionVersion('0.1.3');
@@ -56,7 +54,7 @@ switch (getExtensionMode()) {
                // Check if mod_rewrite is loadeded
                if (!isApacheModuleLoaded('mod_rewrite')) {
                        setExtensionReportsFailure(true);
-                       addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
+                       addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
                } // END - if
 
                // SQL commands to run
@@ -73,7 +71,7 @@ switch (getExtensionMode()) {
                if (!isApacheModuleLoaded('mod_rewrite')) {
                        SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='N' WHERE `ext_name`='rewrite' LIMIT 1", __FILE__, __LINE__);
                        setExtensionReportsFailure(true);
-                       addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
+                       addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
         } // END - if
 
         // SQL commands to run
@@ -151,7 +149,7 @@ switch (getExtensionMode()) {
                                // Check if mod_rewrite is loadeded
                                if (!isApacheModuleLoaded('mod_rewrite')) {
                                        setExtensionReportsFailure(true);
-                                       //addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
+                                       //addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
                                } // END - if
                                setExtensionUpdateNotes("Es wird beim Registrieren und aktivieren geprüft, ob im Apache das Modul mod_rewrite geladen wurde. Wenn mod_rewrite nicht gefunden werden konnte, wird abgebrochen.");
                                break;
@@ -169,12 +167,12 @@ switch (getExtensionMode()) {
                if (!isApacheModuleLoaded('mod_rewrite')) {
                        setExtensionReportsFailure(true);
                        SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='N' WHERE `ext_name`='rewrite' LIMIT 1", __FILE__, __LINE__);
-                       if (!isAdmin()) addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
+                       if (!isAdmin()) addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
                } // END - if
                break;
 
        default: // Unknown extension mode
-               logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s detected.", getExtensionMode()));
+               logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
                break;
 }