X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions%2Fext-rallye.php;h=b9ce9a746cded807552858c8f84798e1115b2336;hp=f4047fd9a4934a0b47de3005e8b583c579e8a747;hb=865d8f7670c976d59d5699d72958c8c00f6af70e;hpb=63f159414369b5ea19a8ca75d8cd8033c45d8341

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index f4047fd9a4..b9ce9a746c 100644
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -41,13 +41,13 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Version number
-setThisExtensionVersion('0.3.6');
+setThisExtensionVersion('0.3.8');
 
 // 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', '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'));
+setExtensionVersionHistory(array('0.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'));
 
 switch (getExtensionMode()) {
-	case 'register': // Do stuff when installation is running
+	case 'setup': // Do stuff when installation is running
 		// SQL commands to run
 		addDropTableSql('rallye_data');
 		addCreateTableSql('rallye_data', "
@@ -91,8 +91,7 @@ INDEX (`userid`)",
 		// Admin menu
 		addAdminMenuSql('rallye', NULL, 'Rallye-Management','Richten Sie neue Ref-Rallyes ein, die zeitgesteuert anfangen und aufhöhren. Dabei wird alles weitere automatisch geregelt.',9);
 		addAdminMenuSql('rallye','add_rallye','Neue Rallye hinzufügen','Neue Ref-Rallye hinzufügen.',1);
-		// @TODO Fix config_rallye_prices to list_rallye_prices
-		addAdminMenuSql('rallye','config_rallye_prices','Preise einrichten','Richten Sie Preise zu den Rallyes ein.',2);
+		addAdminMenuSql('rallye','list_rallye_prices','Preise einrichten','Richten Sie Preise zu den Rallyes ein.',2);
 		addAdminMenuSql('rallye','list_rallyes','Rallyes verwalten','Alle bestehenden Ref-Rallyes auflisten, bearbeiten, stoppen, löschen usw.',3);
 
 		// Guest menu
@@ -117,7 +116,9 @@ INDEX (`userid`)",
 		unregisterExtensionPointsData('rallye_winner');
 
 		// Unregister filter
-		unregisterFilter(__FILE__, __LINE__, 'extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, isExtensionDryRun());
+		unregisterFilter(__FILE__, __LINE__, 'extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', TRUE, isExtensionDryRun());
+		unregisterFilter(__FILE__, __LINE__, 'init', 'RALLYE_NOTIFY_USERS', TRUE, isExtensionDryRun());
+		unregisterFilter(__FILE__, __LINE__, 'add_rallye_notify_sqls', 'ADD_RALLYE_SQL_COLUMNS', TRUE, isExtensionDryRun());
 		break;
 
 	case 'activate': // Do stuff when admin activates this extension
@@ -135,14 +136,14 @@ INDEX (`userid`)",
 	case 'update': // Update an extension
 		switch (getCurrentExtensionVersion()) {
 			case '0.0.1': // SQL queries for v0.0.1
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_rallye_data` ADD `expired` ENUM('Y','N') NOT NULL DEFAULT 'N'");
+				addExtensionAddTableColumnSql('rallye_data', 'expired', "ENUM('Y','N') NOT NULL DEFAULT 'N'");
 
 				// Update notes (these will be set as task text!)
 				setExtensionUpdateNotes("Ablaufen der Rallyes intergriert.");
 				break;
 
 			case '0.0.2': // SQL queries for v0.0.2
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_rallye_users` ADD `curr_points` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000");
+				addExtensionAddTableColumnSql('rallye_users', 'curr_points', 'FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000');
 
 				// Update notes (these will be set as task text!)
 				setExtensionUpdateNotes("Aktueller {?POINTS?}-Stand wird beachtet.");
@@ -169,7 +170,7 @@ INDEX (`userid`)",
 				break;
 
 			case '0.1.0': // SQL queries for v0.2.1
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_rallye_users` CHANGE `curr_points` `curr_points` FLOAT(23,5) UNSIGNED NOT NULL DEFAULT 0.00000");
+				addExtensionChangeTableColumnSql('rallye_users', 'curr_points', 'curr_points', 'FLOAT(23,5) UNSIGNED NOT NULL DEFAULT 0.00000');
 
 				// Update notes (these will be set as task text!)
 				setExtensionUpdateNotes("5 Nachkommastellen implementiert.");
@@ -221,8 +222,8 @@ INDEX (`userid`)",
 				break;
 
 			case '0.2.0': // SQL queries for v0.2.0
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_rallye_data` ADD `min_users` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0");
-				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_rallye_data` ADD `min_prices` BIGINT(20) UNSIGNED NOT NULL DEFAULT 3");
+				addExtensionAddTableColumnSql('rallye_data', 'min_users', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 0');
+				addExtensionAddTableColumnSql('rallye_data', 'min_prices', 'BIGINT(20) UNSIGNED NOT NULL DEFAULT 3');
 
 				// Update notes (these will be set as task text!)
 				setExtensionUpdateNotes("Ablaufen der Rallyes intergriert. Bauen Sie in Ihr Template <strong>templates/de/emails/member/member_rallye_notify.tpl</strong> folgende zwei Zeilen ein:<br />
@@ -311,11 +312,8 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
 				break;
 
 			case '0.3.5': // SQL queries for 0.3.5
-				// This update depends on ext-sql_patches
-				addExtensionDependency('sql_patches');
-
 				// Register filter
-				registerFilter(__FILE__, __LINE__, 'extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', false, true, isExtensionDryRun());
+				registerFilter(__FILE__, __LINE__, 'extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', FALSE, TRUE, isExtensionDryRun());
 
 				// Update notes (these will be set as task text!)
 				setExtensionUpdateNotes("Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");
@@ -325,12 +323,25 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
 				// Register points data
 				registerExtensionPointsData('rallye_winner', 'points', 'LOCKED', 'DIRECT');
 
-				// This depends on ext-sql_patches
-				addExtensionDependency('sql_patches');
-
 				// Update notes
 				setExtensionUpdateNotes("Gewinn aus der Referral-Rallye wird nun &uuml;ber die Tabelle <strong>{OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data</strong> verwaltet.");
 				break;
+
+			case '0.3.7': // SQL queries for v0.3.7
+				// Register filter
+				registerFilter(__FILE__, __LINE__, 'init', 'RALLYE_NOTIFY_USERS', FALSE, TRUE, isExtensionDryRun());
+				registerFilter(__FILE__, __LINE__, 'add_rallye_notify_sqls', 'ADD_RALLYE_SQL_COLUMNS', FALSE, TRUE, isExtensionDryRun());
+
+				// Update notes
+				setExtensionUpdateNotes("Weitere Filter hinzugef&uuml;gt.");
+				break;
+
+			case '0.3.8': // SQL queries for v0.3.8
+				addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `what`='list_rallye_prices' WHERE `action`='rallye' AND `what`='config_rallye_prices' LIMIT 1");
+
+				// Update notes
+				setExtensionUpdateNotes("Men&uuml; umbenannt, da &quot;config&quot; nur f&uuml;r die Konfigurationstabelle <strong>{?_MYSQL_PREFIX?}_config</strong> ist.");
+				break;
 		} // END - switch
 		break;
 
@@ -341,73 +352,10 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
 		break;
 
 	case 'init': // Do stuff when extension is initialized
-		// Do stuff only when not in CSS mode
-		// @TODO Move this code into a hook
-		if (!isCssOutputMode()) {
-			// Get total member count
-			$total = getTotalConfirmedUser();
-
-			// Add more data on higher versions
-			$ADD1 = ''; $ADD2 = ''; $OR = '';
-			if (isExtensionInstalledAndNewer('rallye', '0.2.0')) {
-				$ADD1 = ",`min_users`,`min_prices`";
-				$ADD2 = ",d.`min_users`,d.`min_prices`";
-				$OR   = " OR (d.`min_users` <= " . $total . " AND d.`min_users` > 0)";
-			} // END  - if
-
-			// Check for new started but not notified rallyes
-			$result = SQL_QUERY("SELECT SQL_SMALL_RESULT
-	`id`,
-	`title`,
-	`start_time`,
-	`end_time`,
-	`send_notify`
-	" . $ADD1 . "
-FROM
-	`{?_MYSQL_PREFIX?}_rallye_data`
-WHERE
-	`is_active`='Y' AND
-	`notified`='N' AND
-	`expired`='N' AND
-	`start_time` <= UNIX_TIMESTAMP() AND
-	`end_time` > UNIX_TIMESTAMP()
-LIMIT 1", __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) == 1) {
-				// Start rallye
-				autostartReferralRallyes($result);
-			} // END - if
-
-			// Free memory
-			SQL_FREERESULT($result);
-
-			// Check for expired rallyes
-			$result = SQL_QUERY("SELECT SQL_SMALL_RESULT
-	d.`id`,
-	d.`title`,
-	d.`start_time`,
-	d.`end_time`,
-	d.`send_notify`
-	" . $ADD2 . "
-FROM
-	`{?_MYSQL_PREFIX?}_rallye_data` AS d
-WHERE
-	d.`is_active`='Y' AND
-	d.`notified`='Y' AND
-	d.`expired`='N' AND
-	(d.`end_time` <= UNIX_TIMESTAMP()".$OR.")
-LIMIT 1", __FILE__, __LINE__);
-			if ((SQL_NUMROWS($result) == 1) && (isExtensionActive('autopurge'))) {
-				// End rallye here...
-				stopRallyeByResult($result);
-			} // END - if
-
-			// Free memory
-			SQL_FREERESULT($result);
-		} // END - if
 		break;
 
 	default: // Unknown extension mode
-		logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
+		reportBug(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
 		break;
 } // END - switch