Security line in all includes changed

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

diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php
index 4d0d23e4ecda48b90a05b76b8ea78fb2e60a2fc5..33b40947d572e602d472731426019f91537d86dd 100644 (file)
--- a/inc/extensions/ext-country.php
+++ b/inc/extensions/ext-country.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);
 }
@@ -53,21 +52,21 @@ case "register": // Do stuff when installtion is running (modules.php?module=adm
        // SQL commands to run
        $SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_countries";
        $SQLs[] = "CREATE TABLE "._MYSQL_PREFIX."_countries (
-id bigint(20) not null auto_increment,
-code char(2) not null default 'DE',
-descr varchar(255) not null default 'Deutschland',
-is_active enum('Y', 'N') not null default 'N',
+id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
+code CHAR(2) NOT NULL DEFAULT 'DE',
+descr VARCHAR(255) NOT NULL DEFAULT 'Deutschland',
+is_active ENUM('Y', 'N') NOT NULL DEFAULT 'N',
 KEY(code),
 PRIMARY KEY(id)
 ) TYPE=MyISAM";
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_countries (code, descr, is_active) VALUES ('DE', 'Deutschland', 'Y')";
 
        // Admin menu
-       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('country', '', 'Ländercodes verwalten', 'Stellen Sie hier Ländercodes ein, damit auch internationale Mitglieder sich zu Ihrem ".MT_WORD." anmelden können.', 8)";
+       $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('country', NULL, 'Ländercodes verwalten', 'Stellen Sie hier Ländercodes ein, damit auch internationale Mitglieder sich zu Ihrem ".MT_WORD." anmelden können.', 8)";
        $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_admin_menu (action, what, title, descr, sort) VALUES('country', 'list_country', 'Verwalten', 'Hinzufügen, Ändern und Löschen von Ländercodes.', 1)";
 
        // Add entry to user table
-       $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD country_code bigint(20) not null default '1'";
+       $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD country_code BIGINT(20) UNSIGNED NOT NULL DEFAULT '1'";
        break;
 
 case "remove": // Do stuff when removing extension
@@ -119,7 +118,7 @@ default: // Do stuff when extension is loaded
 $EXT_LANG_PREFIX = "country";
 
 // Extension is always active?
-$EXT_ALWAYS_ACTIVE = 'Y';
+$EXT_ALWAYS_ACTIVE = "Y";
 
 //
 ?>