X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions%2Fext-order.php;h=dbc2f8d5565000f068c9e72753b712ce2dae2c0e;hp=b3ec12f3f0bee730222ba7368db71c59d3397280;hb=5d89789720c77e954b2eba28c00ec710dd28900d;hpb=2acfc49984a0f9bb3adaf6366351d6ce604dcacd

diff --git a/inc/extensions/ext-order.php b/inc/extensions/ext-order.php
index b3ec12f3f0..dbc2f8d556 100644
--- a/inc/extensions/ext-order.php
+++ b/inc/extensions/ext-order.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                    *
@@ -51,7 +49,7 @@ setExtensionVersionHistory(array('0.0', '0.1.0', '0.1.1', '0.1.2', '0.1.3', '0.1
 switch (getExtensionMode()) {
 	case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
 		// SQL commands to run
-		addExtensionSql('');
+		addMemberMenuSql('order','order','Mailbuchung','N','Y',1);
 		break;
 
 	case 'remove': // Do stuff when removing extension
@@ -75,7 +73,7 @@ switch (getExtensionMode()) {
 	case 'update': // Update an extension
 		switch (getCurrentExtensionVersion()) {
 			case '0.1.0': // SQL queries for v0.1
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD order_max_full ENUM('ORDER','MAX') NOT NULL DEFAULT 'MAX'");
+				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `order_max_full` ENUM('ORDER','MAX') NOT NULL DEFAULT 'MAX'");
 				addAdminMenuSql('setup','config_order','Mailbuchungsseite','Einstellungen am Mailbuchungsformular.',7);
 
 				// Update notes (these will be set as task text!)
@@ -300,7 +298,7 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us
 				break;
 
 			case '0.5.0': // SQL queries for v0.5.0
-				addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_url_blacklist`");
+				addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_url_blacklist`');
 				addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_url_blacklist` (
 `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 `url` VARCHAR(255) NOT NULL DEFAULT '',
@@ -308,19 +306,12 @@ nicht die vom Mitglied eingegebene. Resultat: Das Script beschwerte sich, der Us
 `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 PRIMARY KEY (`id`),
 INDEX (`pool_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='URL blacklist'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'URL blacklist'");
 
 				// Update notes (these will be set as task text!)
 				setExtensionUpdateNotes("Tabelle für URL-Sperrliste angelegt.");
 				break;
 
-			case '0.5.1': // SQL queries for v0.5.1
-				addMemberMenuSql('main','order','Mailbuchung','N','Y',8);
-
-				// Update notes (these will be set as task text!)
-				setExtensionUpdateNotes("Weiteren Menü-Query in Erweiterung verlagert.");
-				break;
-
 			case '0.5.2': // SQL queries for v0.5.2
 				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` DROP `test_text`");
 				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` DROP `test_subj`");
@@ -330,7 +321,7 @@ INDEX (`pool_id`)
 				// Update notes (these will be set as task text!)
 				setExtensionUpdateNotes("Inkonsistenz in Konfigurationsnamen korregiert.");
 				break;
-		}
+		} // END - switch
 		break;
 
 	case 'modify': // When the extension got modified
@@ -341,9 +332,10 @@ INDEX (`pool_id`)
 
 	case 'init': // Do stuff when extension is initialized
 		// Do daily reset only when installed and extension version is at least 0.1.1
-		if ((isResetModeEnabled()) && (isInstalled()) && (isAdminRegistered()) && (getExtensionVersion('order') >= '0.1.1')) {
+		// @TODO This should be moved out to inc/reset/
+		if ((isResetModeEnabled()) && (isInstalled()) && (isAdminRegistered()) && (isExtensionInstalledAndNewer('order', '0.1.1'))) {
 			// Reset mail order values
-			$result_ext = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET mail_orders=0 WHERE mail_orders > 0", __FILE__, __LINE__);
+			$result_ext = SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `mail_orders`=0 WHERE `mail_orders` > 0', __FILE__, __LINE__);
 		} // END - if
 		break;
 
@@ -353,7 +345,7 @@ INDEX (`pool_id`)
 	default: // Unknown extension mode
 		logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
 		break;
-}
+} // END - switch
 
 // [EOF]
 ?>