X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions%2Fext-country.php;h=5e62d49da6326ac38ad2d756fa3bbd8145ee4227;hp=c19e879b59257fafe4cac6f4774d3ceb9e857998;hb=596c8ab32594401ca84abfbfe35513ddfff31bec;hpb=5d89789720c77e954b2eba28c00ec710dd28900d

diff --git a/inc/extensions/ext-country.php b/inc/extensions/ext-country.php
index c19e879b59..5e62d49da6 100644
--- a/inc/extensions/ext-country.php
+++ b/inc/extensions/ext-country.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -41,40 +41,48 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
-setThisExtensionVersion('0.0.4');
+setThisExtensionVersion('0.0.5');
 
-// Version history array (add more with , '0.1.0' and so on)
-setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4'));
+// Version history array (add more with , '0.0.1' and so on)
+setExtensionVersionHistory(array('0.0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0.5'));
 
 // Keep this extension always active!
 setExtensionAlwaysActive('Y');
 
 switch (getExtensionMode()) {
-	case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
+	case 'register': // Do stuff when installation is running
 		// SQL commands to run
-		addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_countries`');
-		addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_countries` (
+		addDropTableSql('countries');
+		addCreateTableSql('countries', "
 `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`)
-) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci");
+PRIMARY KEY (`id`),
+UNIQUE INDEX (`code`)",
+			'Country codes and their full-length descriptions');
+
+		// Insert first (Germany) country
 		addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_countries` (code, descr, is_active) VALUES ('DE','Deutschland','Y')");
 
 		// Admin menu
 		addAdminMenuSql('country', NULL, 'Ländercodes verwalten','Stellen Sie hier Ländercodes ein, damit auch internationale Mitglieder sich zu Ihrem {OPEN_CONFIG}mt_word{CLOSE_CONFIG} anmelden können.', 8);
 		addAdminMenuSql('country','list_country','Verwalten','Hinzufügen, Ändern und Löschen von Ländercodes.', 1);
 
+		// This extension depends on ext-user
+		addExtensionDependency('user');
+
 		// Add entry to user table
-		addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD country_code BIGINT(20) UNSIGNED NOT NULL DEFAULT 1");
+		addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_user_data` ADD `country_code` BIGINT(20) UNSIGNED NOT NULL DEFAULT 1");
 		break;
 
 	case 'remove': // Do stuff when removing extension
 		// SQL commands to run
-		addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_countries`');
+		addDropTableSql('countries');
 		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='country'");
+
+		// Unregister filter
+		unregisterFilter(__FILE__, __LINE__, 'pre_user_registration', 'COUNTRY_USER_REGISTRATION_ADD_SQL_COLUMNS', TRUE, isExtensionDryRun());
 		break;
 
 	case 'activate': // Do stuff when admin activates this extension
@@ -88,8 +96,7 @@ PRIMARY KEY (`id`)
 		break;
 
 	case 'update': // Update an extension
-		switch (getCurrentExtensionVersion())
-		{
+		switch (getCurrentExtensionVersion()) {
 			case '0.0.1': // SQL queries for v0.0.1
 				// Update notes (these will be set as task text!)
 				setExtensionUpdateNotes("SQL-Dateien hinzugefügt, die Sie mit z.B. phpMyAdmin einspielen können. (DOCS/country/README.de lesen!)");
@@ -109,13 +116,24 @@ PRIMARY KEY (`id`)
 				// Update notes (these will be set as task text!)
 				setExtensionUpdateNotes("Sicherheitsupdate für die Include-Befehle.");
 				break;
-		}
+
+			case '0.0.5': // SQL queries for v0.0.5
+				// Register a filter
+				registerFilter(__FILE__, __LINE__, 'pre_user_registration', 'COUNTRY_USER_REGISTRATION_ADD_SQL_COLUMNS', FALSE, TRUE, isExtensionDryRun());
+
+				// This depends on ext-register
+				addExtensionDependency('register');
+
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("Filter zum Mitgliederanmeldeformular hinzugefügt.");
+				break;
+		} // END - switch
 		break;
 
 	case 'modify': // When the extension got modified
 		break;
 
-	case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305.
+	case 'test': // For testing purposes
 		break;
 
 	case 'init': // Do stuff when extension is initialized
@@ -124,7 +142,7 @@ PRIMARY KEY (`id`)
 	default: // Unknown extension mode
 		logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
 		break;
-}
+} // END - switch
 
-//
+// [EOF]
 ?>