X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions%2Fext-rallye.php;h=f03bf03c016afa31585de9a45b04bd69b859513b;hb=b353f8583ae3c0a9224d97a2ed01fd8cd7965081;hp=c9dfc977038a45dac41c5ba7fd19d2c554e3802e;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index c9dfc97703..f03bf03c01 100644
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 06/19/2004 *
- * ================                             Last change: 12/26/2004 *
+ * ===================                          Last change: 12/26/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : ext-rallye.php                                   *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,7 +40,7 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-}
+} // END - if
 
 // Version number
 setThisExtensionVersion('0.3.5');
@@ -50,9 +51,9 @@ setExtensionVersionHistory(array('0.0', '0.0.1', '0.0.2', '0.0.3', '0.0.4', '0.0
 switch (getExtensionMode()) {
 	case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
 		// SQL commands to run
-		addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_data`");
-		addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_prices`");
-		addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_users`");
+		addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_data`');
+		addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_prices`');
+		addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_users`');
 		addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_rallye_data` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 admin_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
@@ -103,9 +104,9 @@ PRIMARY KEY (id)
 
 	case 'remove': // Do stuff when removing extension
 		// Drop tables
-		addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_data`");
-		addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_prices`");
-		addExtensionSql("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_users`");
+		addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_data`');
+		addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_prices`');
+		addExtensionSql('DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_rallye_users`');
 
 		// Remove menus
 		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='rallye'");
@@ -113,7 +114,7 @@ PRIMARY KEY (id)
 		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='rallyes'");
 
 		// Unregister filter
-		unregisterFilter('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, getExtensionDryRun());
+		unregisterFilter(__FUNCTION__, __LINE__, 'extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, isExtensionDryRun());
 		break;
 
 	case 'activate': // Do stuff when admin activates this extension
@@ -217,8 +218,8 @@ PRIMARY KEY (id)
 				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");
+				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");
 
 				// 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,7 +312,7 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
 				addExtensionUpdateDependency('sql_patches');
 
 				// Register filter
-				registerFilter('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', false, true, getExtensionDryRun());
+				registerFilter('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.");
@@ -328,13 +329,13 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
 	case 'init': // Do stuff when extension is initialized
 		// Do stuff only when not in CSS mode
 		// @TODO Move this code into rallye_functions.php
-		if (getOutputMode() != 1) {
+		if (getScriptOutputMode() != 1) {
 			// Get total member count
-			$total = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true);
+			$total = getTotalConfirmedUser();
 
 			// Add more data on higher versions
 			$ADD1 = ''; $ADD2 = ''; $OR = '';
-			if (getExtensionVersion('rallye') >= '0.2.0') {
+			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)";
@@ -382,7 +383,7 @@ LIMIT 1", __FILE__, __LINE__);
 		break;
 
 	default: // Unknown extension mode
-		DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown extension mode %s detected.", getExtensionMode()));
+		logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
 		break;
 } // END - switch