More SQL rewrites, TODO: Put all table and column names in backticks (`)

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

diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php
index caa401e3d06b4d2237db2292088cb945c3bebe57..474f0a442ac335fcbb1d2a0b5546cc32b1df8b27 100644 (file)
--- a/inc/extensions/ext-register.php
+++ b/inc/extensions/ext-register.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // 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);
 }
@@ -49,7 +48,7 @@ $EXT_VER_HISTORY = array("0.0", "0.1", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1.
 
 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[] = "";
 
@@ -59,7 +58,7 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
 
 case "remove": // Do stuff when removing extension
        // SQL commands to run
-       $SQLs[] = "DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE action='setup' AND what='config_register' LIMIT 1";
+       $SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_admin_menu` WHERE what='config_register' LIMIT 1";
        break;
 
 case "activate": // Do stuff when admin activates this extension
@@ -78,22 +77,22 @@ case "update": // Update an extension
        case "0.1": // SQL queries for v0.1
                $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_must_register";
                $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_must_register (
-id bigint(20) NOT NULL auto_increment,
-field_name varchar(255) not null default '',
-field_required enum('Y', 'N') not null default 'Y',
+id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+field_name VARCHAR(255) NOT NULL DEFAULT '',
+field_required ENUM('Y','N') NOT NULL DEFAULT 'Y',
 PRIMARY KEY(id)
 ) TYPE=MyISAM";
 
                // Add all entries as required (DO NOT DELETE THEM FROM DATABASE!)
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('surname', 'Y')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('family_name', 'Y')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('street_nr', 'Y')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('cntry', 'Y')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('zip', 'Y')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('city', 'Y')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('surname','Y')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('family_name','Y')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('street_nr','Y')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('cntry','Y')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('zip','Y')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_must_register (field_name, field_required) VALUES ('city','Y')";
 
                // Add admin menu
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('setup', 'config_register', 'Pflichtfelder', 'Stellen Sie hier die Pflichtfelder sowohl im Anmeldeformular, als auch im Mitgliedsbereich unter <STRONG>Profildaten &auml;ndern</STRONG> ein.', 12)";
+               $SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('setup','config_register','Pflichtfelder','Stellen Sie hier die Pflichtfelder sowohl im Anmeldeformular, als auch im Mitgliedsbereich unter <STRONG>Profildaten &auml;ndern</STRONG> ein.', 12)";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Einstellbare Pflichtfelder hinzugef&uuml;gt.";
@@ -114,7 +113,7 @@ PRIMARY KEY(id)
                $EXT_UPDATE_DEPENDS = "sql_patches";
 
                // Update notes (these will be set as task text!)
-               $UPDATE_NOTES = "Standart Referral-ID kann per Admin-Bereich eingestellt werden (war vorher nur in modules.php und index.php direkt eingebbar.)";
+               $UPDATE_NOTES = "Standart Referal-ID kann per Admin-Bereich eingestellt werden (war vorher nur in modules.php und index.php direkt eingebbar.)";
                break;
 
        case "0.1.4": // SQL queries for v0.1.4
@@ -174,7 +173,7 @@ PRIMARY KEY(id)
 
        case "0.2.5": // SQL queries for v0.2.5
                // Update notes (these will be set as task text!)
-               $UPDATE_NOTES = "Seit <A href=\"".SERVER_URL."/patches/340-Gast_Mitgliedsmenue_Deaktivieren.zip\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
+               $UPDATE_NOTES = "Seit <A href=\"#\">Patch 340</A> &uuml;berfl&uuml;ssige HTML-Tags entfernt.";
                break;
 
        case "0.2.6": // SQL queries for v0.2.6
@@ -184,7 +183,7 @@ PRIMARY KEY(id)
 
        case "0.2.7": // SQL queries for v0.2.7
                // Update notes (these will be set as task text!)
-               $UPDATE_NOTES = "Referral-ID wird endlich korrekt gesetzt.";
+               $UPDATE_NOTES = "Referal-ID wird endlich korrekt gesetzt.";
                break;
 
        case "0.2.8": // SQL queries for v0.2.8
@@ -263,8 +262,8 @@ PRIMARY KEY(id)
                break;
 
        case "0.4.2": // SQL queries for v0.4.2
-               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_config ADD register_default ENUM('Y', 'N') NOT NULL DEFAULT 'N'";
-               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_admin_menu SET what='config_register2' WHERE what='config_reg' LIMIT 1";
+               $SQLs[] = "ALTER TABLE `"._MYSQL_PREFIX."_config` ADD register_default ENUM('Y','N') NOT NULL DEFAULT 'N'";
+               $SQLs[] = "UPDATE `"._MYSQL_PREFIX."_admin_menu` SET what='config_register2' WHERE what='config_reg' LIMIT 1";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Bei der Anmeldung kann die Standart-Auswahl zwischen Ja/Nein umgeschaltet werden. Das &Auml;ndern des Templates <STRONG>templates/".GET_LANGUAGE()."/html/guest/guest_register.tpl</STRONG> ist nicht mehr n&ouml;tig.";
@@ -287,7 +286,7 @@ PRIMARY KEY(id)
 
        case "0.4.6": // SQL queries for v0.4.6
                // Update notes (these will be set as task text!)
-               $UPDATE_NOTES = "Einstellung nach ".POINTS."-Einstellungen verlagert.";
+               $UPDATE_NOTES = "Einstellung nach {!POINTS!}-Einstellungen verlagert.";
                break;
 
        case "0.4.7": // SQL queries for v0.4.7
@@ -323,17 +322,8 @@ PRIMARY KEY(id)
        break;
 
 default: // Do stuff when extension is loaded
-       $dummy = LOAD_CONFIG();
-       $_CONFIG = array_merge($_CONFIG, $dummy);
-       unset($dummy);
        break;
 }
 
-// Language file prefix
-$EXT_LANG_PREFIX = "register";
-
-// Extension is always active?
-$EXT_ALWAYS_ACTIVE = "N";
-
 //
 ?>