X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions%2Fext-sql_patches.php;h=9fa654dfe35afe6f4fe97507826928bbbaf81d88;hb=506be1a75d826f083ae6133aa8236eb5eeecab0a;hp=fc66df9d3fc2fc17b07ed75e85f4b0a2ea8e89aa;hpb=fbf4ed76d84e2a562e0438656963675244802ad6;p=mailer.git

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index fc66df9d3f..9fa654dfe3 100644
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,10 +41,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
-setThisExtensionVersion('0.7.2');
+setThisExtensionVersion('0.7.4');
 
 // 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', '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', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2'));
+setExtensionVersionHistory(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', '0.2.1', '0.2.2', '0.2.3', '0.2.4', '0.2.5', '0.2.6', '0.2.7', '0.2.8', '0.2.9', '0.3.0', '0.3.1', '0.3.2', '0.3.3', '0.3.4', '0.3.5', '0.3.6', '0.3.7', '0.3.8', '0.3.9', '0.4.0', '0.4.1', '0.4.2', '0.4.3', '0.4.4', '0.4.5', '0.4.6', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4', '0.6.4', '0.6.5', '0.6.6', '0.6.7', '0.6.8', '0.6.9', '0.7.0', '0.7.1', '0.7.2', '0.7.3', '0.7.4'));
 
 // Keep this extension always active!
 setExtensionAlwaysActive('Y');
@@ -274,11 +274,14 @@ switch (getExtensionMode()) {
 				break;
 
 			case '0.2.4': // SQL queries for v0.2.4
-				$auto_type = 'png'; // PNG image is the default
-				if ((isIncludeReadable('theme/'.getCurrentTheme().'/images/code_bg.jpg')) && function_exists('imagecreatefromjpeg')) {
+				// PNG image is the default
+				$auto_type = 'png';
+
+				// Is the JPEG file found and required PHP function there?
+				if ((isFileReadable(getPath() . 'theme/' . getCurrentTheme() . '/images/code_bg.jpg')) && function_exists('imagecreatefromjpeg')) {
 					// Switch to JPEG format
 					$auto_type = 'jpg';
-				}
+				} // END - if
 				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `img_type` ENUM('jpg','png') NOT NULL DEFAULT '" . $auto_type . "'");
 
 				// Update notes (these will be set as task text!)
@@ -374,7 +377,7 @@ INDEX (`la_id`),
 INDEX (`la_action`),
 INDEX (`la_what`),
 PRIMARY KEY (`id`)
-) TYPE={?_TABLE_TYPE?}");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci");
 				// All "logical areas" together
 				addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_admin_menu_las_data`');
 				addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_admin_menu_las_data` (
@@ -387,7 +390,7 @@ UNIQUE KEY (`la_id`),
 INDEX (`la_posx`),
 INDEX (`la_posy`),
 PRIMARY KEY (`id`)
-) TYPE={?_TABLE_TYPE?}");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci");
 				// Which menu do you like?
 				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `admin_menu` ENUM('NEW','OLD') NOT NULL DEFAULT 'OLD'");
 
@@ -411,7 +414,7 @@ PRIMARY KEY (`id`)
 `clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 INDEX (`admin_id`),
 PRIMARY KEY (`id`)
-) TYPE={?_TABLE_TYPE?}");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci");
 
 				// Update notes (these will be set as task text!)
 				setExtensionUpdateNotes("Admin-abhängig werden nun Klicks im Admin-Menü gezählt, die zur automatischen Anpassung des Menüs in den logischen Bereichen diennen. Dieses "intelligente Unbauen" können Sie auch ganz abschalten.");
@@ -614,13 +617,13 @@ PRIMARY KEY (`id`)
 				addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_filters`');
 				addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_filters` (
 `filter_id` BIGINT(20) UNSIGNED AUTO_INCREMENT,
-`filter_name` VARCHAR(255) NOT NULL DEFAULT '',
-`filter_function` VARCHAR(255) NOT NULL DEFAULT '',
+`filter_name` VARCHAR(50) NOT NULL DEFAULT '',
+`filter_function` VARCHAR(100) NOT NULL DEFAULT '',
 `filter_active` ENUM('N','Y') NOT NULL DEFAULT 'Y',
 `filter_counter` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 UNIQUE `name_function` (`filter_name` , `filter_function`),
 PRIMARY KEY (`filter_id`)
-) TYPE={?_TABLE_TYPE?} COMMENT='Filter system'");
+) ENGINE = {?_TABLE_TYPE?} CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT = 'Filter system'");
 				addAdminMenuSql('setup','list_filter','Filter-Management', 'Zeigt alle im System registrierten Filter an und lässt diese de- bzw. wieder aktivieren.', 17);
 
 				// Update notes (these will be set as task text!)
@@ -689,15 +692,12 @@ PRIMARY KEY (`filter_id`)
 				break;
 
 			case '0.6.8': // SQL queries for v0.6.8
-				addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_admin_menu`
-CHANGE `action` `action` VARCHAR(50) NOT NULL,
-CHANGE `what` `what` VARCHAR(50) NULL DEFAULT NULL');
-				addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_guest_menu`
-CHANGE `action` `action` VARCHAR(50) NOT NULL,
-CHANGE `what` `what` VARCHAR(50) NULL DEFAULT NULL');
-				addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_member_menu`
-CHANGE `action` `action` VARCHAR(50) NOT NULL,
-CHANGE `what` `what` VARCHAR(50) NULL DEFAULT NULL');
+				addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_admin_menu` CHANGE `action` `action` VARCHAR(50) NOT NULL');
+				addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_admin_menu` CHANGE `what` `what` VARCHAR(50) NULL DEFAULT NULL');
+				addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_guest_menu` CHANGE `action` `action` VARCHAR(50) NOT NULL');
+				addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_admin_menu` CHANGE `what` `what` VARCHAR(50) NULL DEFAULT NULL');
+				addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_member_menu` CHANGE `action` `action` VARCHAR(50) NOT NULL');
+				addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_admin_menu` CHANGE `what` `what` VARCHAR(50) NULL DEFAULT NULL');
 
 				// Update notes (these will be set as task text!)
 				setExtensionUpdateNotes("Spalten verkürzt, damit die Schlüssel passen.");
@@ -720,7 +720,7 @@ CHANGE `what` `what` VARCHAR(50) NULL DEFAULT NULL');
 `added` DATETIME NOT NULL,
 PRIMARY KEY (`hostname`),
 INDEX (`ip`)
-) ENGINE={?_TABLE_TYPE?}");
+) ENGINE = {?_TABLE_TYPE?}");
 
 				// Configuration
 				addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_config` ADD `dns_cache_timeout` BIGINT(20) NOT NULL DEFAULT ' . (60*60*24));
@@ -746,13 +746,28 @@ INDEX (`ip`)
 				// Update notes (these will be set as task text!)
 				setExtensionUpdateNotes("Daten an Namenskonvention angepasst.");
 				break;
+
+			case '0.7.3': // SQL queries for v0.7.3
+				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_filters` CHANGE `filter_name` `filter_name` VARCHAR(50) NOT NULL DEFAULT ''");
+				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_filters` CHANGE `filter_function` `filter_function` VARCHAR(100) NOT NULL DEFAULT ''");
+
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("Spalten in Filtertabelle gekürzt (SQL-Fehler wegen zu grossem Schlüssel).");
+				break;
+
+			case '0.7.4': // SQL queries for v0.7.4
+				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_pool` ADD `mails_sent` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0");
+
+				// Update notes (these will be set as task text!)
+				setExtensionUpdateNotes("Spalten in Filtertabelle gekürzt (SQL-Fehler wegen zu grossem Schlüssel).");
+				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
@@ -768,7 +783,7 @@ INDEX (`ip`)
 		// Test again
 		if ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && (getFileHash() != '') && (getMasterSalt() != '') && (getPassScramble() != '')) {
 			// File hash fas generated so we can also file the secret file... hopefully.
-			$hashFile = sprintf("%sinc/cache/.%s.cache", getPath(), getFileHash());
+			$hashFile = sprintf("%s%s.%s.cache", getPath(), getCachePath(), getFileHash());
 			if (isFileReadable($hashFile)) {
 				// Read file
 				setConfigEntry('secret_key', readFromFile($hashFile));