More fixes, thanks to Piter01

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

diff --git a/inc/extensions/ext-other.php b/inc/extensions/ext-other.php
index 01ad655b2cd8c6174f4256ed6911e5190db47b7f..5a1a2919e816156d4411f946076c21ac5f49fe21 100644 (file)
--- a/inc/extensions/ext-other.php
+++ b/inc/extensions/ext-other.php
@@ -32,24 +32,23 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
 
 // Version number
-$EXT_VERSION = "0.1.9";
+$EXT_VERSION = "0.2.0";
 
 // Auto-set extension version
 if (empty($EXT_VER)) $EXT_VER = $EXT_VERSION;
 
 // Version history array (add more with , "0.1" and so on)
-$EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0.0.6", "0.0.7", "0.0.8", "0.0.9", "0.1.0", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1.5", "0.1.6", "0.1.7", "0.1.8", "0.1.9");
+$EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0.0.6", "0.0.7", "0.0.8", "0.0.9", "0.1.0", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1.5", "0.1.6", "0.1.7", "0.1.8", "0.1.9", "0.2.0");
 
 switch ($EXT_LOAD_MODE)
 {
-case "register": // Do stuff when installtion is running (modules.php?module=admin&action=login is called)
+case "register": // Do stuff when installation is running (modules.php?module=admin&action=login is called)
        // SQL commands to run
        $SQLs[] = "";
        break;
@@ -74,7 +73,7 @@ case "update": // Update an extension
        {
        case "0.0.1": // SQL queries for v0.0.1
                // Update notes (these will be set as task text!)
-               $UPDATE_NOTES = "Fehler <FONT class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in ".PATH."inc/libs/pro_functions.php on line 227</FONT> behoben.";
+               $UPDATE_NOTES = "Fehler <FONT class=\"admin_failed\">Warning: Missing argument 2 for create_timestamp_from_selections() in {!PATH!}inc/libs/pro_functions.php on line 227</FONT> behoben.";
                break;
 
        case "0.0.2": // SQL queries for v0.0.2
@@ -88,7 +87,7 @@ case "update": // Update an extension
                break;
 
        case "0.0.4": // SQL queries for v0.0.4
-               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD max_comma tinyint(4) not null default '3'";
+               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD max_comma TINYINT(3) UNSIGNED NOT NULL DEFAULT '3'";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Angezeigte Kommastellen k&ouml;nnen zwischen 0 und 5 eingestellt werden.";
@@ -157,14 +156,14 @@ case "update": // Update an extension
                break;
 
        case "0.1.6": // SQL queries for v0.1.6
-               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD reject_url varchar(255) not null default '".URL."'";
+               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD reject_url VARCHAR(255) NOT NULL DEFAULT '".URL."'";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bei Ablehnung der URL wird jetzt endlich eine Standart-URL eingesetzt, die konfigurierbar ist. Fehler beim Laden der Konfiguration gefunden.";
                break;
 
        case "0.1.7": // SQL queries for v0.1.7
-               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD currency varchar(255) not null default '&euro;'";
+               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD currency VARCHAR(255) NOT NULL DEFAULT '&euro;'";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Standart-W&auml;hrung der Geb&uuml;hren f&uuml;r alle Erweiterungen geltend hinzugef&uuml;gt.";
@@ -176,7 +175,14 @@ case "update": // Update an extension
                break;
 
        case "0.1.9": // SQL queries for v0.1.9
-               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD mailid_error_redirect ENUM('index', 'reject') NOT NULL DEFAULT 'index'";
+               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD mailid_error_redirect ENUM('index','reject') NOT NULL DEFAULT 'index'";
+
+               // Update notes (these will be set as task text!)
+               $UPDATE_NOTES = "Bei fehlerhafter Mail w&auml;hrend der Best&auml;tigung kann wahlweise zur Hauptseite weitergeleitet oder auf die eingestellte Ablehnungsseite umgeleitet werden.";
+               break;
+
+       case "0.2.0": // SQL queries for v0.2.0
+               $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` CHANGE `mailid_error_redirect` `mailid_error_redirect` ENUM('INDEX','REJECT') NOT NULL DEFAULT 'INDEX'";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bei fehlerhafter Mail w&auml;hrend der Best&auml;tigung kann wahlweise zur Hauptseite weitergeleitet oder auf die eingestellte Ablehnungsseite umgeleitet werden.";
@@ -185,19 +191,11 @@ case "update": // Update an extension
        break;
 
 default: // Do stuff when extension is loaded
-       $dummy = LOAD_CONFIG();
-       $_CONFIG['max_comma']                           = $dummy['max_comma'];  // Maximum numbers behind commata
-       $_CONFIG['reject_url']                          = $dummy['reject_url']; // Default rejection URL
-       $_CONFIG['mailid_error_redirect']       = $dummy['mailid_error_redirect']; // Default rejection URL
-       define('__CURRENCY', $dummy['currency']);     // This is the currency for fees! They shall normally remain in real money currencies...
-       unset($dummy);
        break;
 }
-// Language file prefix
-$EXT_LANG_PREFIX = "other";
 
-// Extension is always active?
-$EXT_ALWAYS_ACTIVE = 'Y';
+// Keep this extension always active!
+$EXT_ALWAYS_ACTIVE = "Y";
 
 //
 ?>