X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions%2Fext-rallye.php;h=572f1d18fb73032a8dec8be625ae18e976c2596c;hp=e4e2963dd80ea04cbd21a49073a847cef8a76985;hb=af5059252c53c8802929611bf322ca4597b70146;hpb=b16d1f640a44da05b1f018be13e8d0b803a74aeb

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index e4e2963dd8..572f1d18fb 100644
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 06/19/2004 *
- * ================                             Last change: 12/26/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 06/19/2004 *
+ * ===================                          Last change: 12/26/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : ext-rallye.php                                   *
@@ -17,7 +17,8 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * 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 *
@@ -38,24 +39,22 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+	die();
 }
 
 // Version number
-EXT_SET_VERSION('0.3.5');
+setThisExtensionVersion('0.3.5');
 
 // Version history array (add more with , '0.1.0' and so on)
-EXT_SET_VER_HISTORY(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'));
+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'));
 
-switch ($EXT_LOAD_MODE)
-{
-	case 'register': // Do stuff when installation is running (modules.php?module=admin&action=login is called)
+switch (getExtensionMode()) {
+	case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
 		// SQL commands to run
-		ADD_EXT_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_rallye_data`");
-		ADD_EXT_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_rallye_prices`");
-		ADD_EXT_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_rallye_users`");
-		ADD_EXT_SQL("CREATE TABLE `{!_MYSQL_PREFIX!}_rallye_data` (
+		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,
 title VARCHAR(255) NOT NULL DEFAULT '',
@@ -69,161 +68,161 @@ send_notify ENUM('Y','N') NOT NULL DEFAULT 'Y',
 notified ENUM('Y','N') NOT NULL DEFAULT 'N',
 KEY (admin_id),
 PRIMARY KEY (id)
-) TYPE={!_TABLE_TYPE!}");
-		ADD_EXT_SQL("CREATE TABLE `{!_MYSQL_PREFIX!}_rallye_prices` (
+) TYPE={?_TABLE_TYPE?}");
+		addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_rallye_prices` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 rallye_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 price_level BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 points BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 info LONGTEXT NOT NULL,
 KEY (rallye_id),
-PRIMARY KEY(id)
-) TYPE={!_TABLE_TYPE!}");
-		ADD_EXT_SQL("CREATE TABLE `{!_MYSQL_PREFIX!}_rallye_users` (
+PRIMARY KEY (id)
+) TYPE={?_TABLE_TYPE?}");
+		addExtensionSql("CREATE TABLE `{?_MYSQL_PREFIX?}_rallye_users` (
 id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
 rallye_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 userid BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 refs BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 KEY (rallye_id),
 KEY (userid),
-PRIMARY KEY(id)
-) TYPE={!_TABLE_TYPE!}");
+PRIMARY KEY (id)
+) TYPE={?_TABLE_TYPE?}");
 
 		// Admin menu
-		ADD_EXT_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye', NULL, 'Rallye-Management','Richten Sie neue Ref-Rallyes ein, die zeitgesteuert anfangen und aufh&ouml;hren. Dabei wird alles weitere automatisch geregelt.','9')");
-		ADD_EXT_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye','add_rallye','Neue Rallye hinzuf&uuml;gen','Neue Ref-Rallye hinzuf&uuml;gen.','1')");
-		ADD_EXT_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye','config_rallye_prices','Preise einrichten','Richten Sie Preise zu den Rallyes ein.','2')");
-		ADD_EXT_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye','list_rallyes','Rallyes verwalten','Alle bestehenden Ref-Rallyes auflisten, bearbeiten, stoppen, l&ouml;schen usw.','3')");
+		addAdminMenuSql('rallye', NULL, 'Rallye-Management','Richten Sie neue Ref-Rallyes ein, die zeitgesteuert anfangen und aufh&ouml;hren. Dabei wird alles weitere automatisch geregelt.',9);
+		addAdminMenuSql('rallye','add_rallye','Neue Rallye hinzuf&uuml;gen','Neue Ref-Rallye hinzuf&uuml;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_rallyes','Rallyes verwalten','Alle bestehenden Ref-Rallyes auflisten, bearbeiten, stoppen, l&ouml;schen usw.',3);
 
 		// Guest menu
-		ADD_EXT_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','rallyes','Ref-Rallyes','Y','Y','9')");
+		addGuestMenuSql('main','rallyes','Ref-Rallyes','N','Y',9);
 
 		// Member menu
-		ADD_EXT_SQL("INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('main','rallyes','Ref-Rallyes','Y','Y','9')");
+		addMemberMenuSql('main','rallyes','Ref-Rallyes','N','Y',9);
 		break;
 
 	case 'remove': // Do stuff when removing extension
 		// Drop tables
-		ADD_EXT_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_rallye_data`");
-		ADD_EXT_SQL("DROP TABLE IF EXISTS `{!_MYSQL_PREFIX!}_rallye_prices`");
-		ADD_EXT_SQL("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
-		ADD_EXT_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='rallye'");
-		ADD_EXT_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `what`='rallyes'");
-		ADD_EXT_SQL("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `what`='rallyes'");
+		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='rallye'");
+		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `what`='rallyes'");
+		addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='rallyes'");
 
 		// Unregister filter
-		unregisterFilter('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, $dry_run);
+		unregisterFilter('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, getExtensionDryRun());
 		break;
 
 	case 'activate': // Do stuff when admin activates this extension
 		// SQL commands to run
-		ADD_EXT_SQL("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `what`='rallyes' LIMIT 1");
-		ADD_EXT_SQL("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='rallyes' LIMIT 1");
+		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `what`='rallyes' LIMIT 1");
+		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='rallyes' LIMIT 1");
 		break;
 
 	case 'deactivate': // Do stuff when admin deactivates this extension
 		// SQL commands to run
-		ADD_EXT_SQL("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `what`='rallyes' LIMIT 1");
-		ADD_EXT_SQL("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='rallyes' LIMIT 1");
+		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `what`='rallyes' LIMIT 1");
+		addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='rallyes' LIMIT 1");
 		break;
 
 	case 'update': // Update an extension
-		switch ($EXT_VER)
-		{
+		switch (getCurrentExtensionVersion()) {
 			case '0.0.1': // SQL queries for v0.0.1
-				ADD_EXT_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_rallye_data` ADD expired ENUM('Y','N') NOT NULL DEFAULT 'N'");
+				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_rallye_data` ADD expired ENUM('Y','N') NOT NULL DEFAULT 'N'");
 
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Ablaufen der Rallyes intergriert.");
+				setExtensionUpdateNotes("Ablaufen der Rallyes intergriert.");
 				break;
 
 			case '0.0.2': // SQL queries for v0.0.2
-				ADD_EXT_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_rallye_users` ADD curr_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000");
+				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_rallye_users` ADD curr_points FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000");
 
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Aktueller {!POINTS!}-Stand wird beachtet.");
+				setExtensionUpdateNotes("Aktueller {?POINTS?}-Stand wird beachtet.");
 				break;
 
 			case '0.0.6': // SQL queries for v0.0.6
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Fehler <em>Unknown column 'd.useid' in 'on clause'</em> behoben.");
+				setExtensionUpdateNotes("Fehler <em>Unknown column 'd.useid' in 'on clause'</em> behoben.");
 				break;
 
 			case '0.0.7': // SQL queries for v0.0.7
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Fehlende Abfrage im Mitlieder-Modul, on Erweiterung auch aktiviert ist.");
+				setExtensionUpdateNotes("Fehlende Abfrage im Mitlieder-Modul, on Erweiterung auch aktiviert ist.");
 				break;
 
 			case '0.0.8': // SQL queries for v0.0.8
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Fehler <u>Template nicht gefunden</u> behoben und Admin-Formulare ausgelagert");
+				setExtensionUpdateNotes("Fehler <u>Template nicht gefunden</u> behoben und Admin-Formulare ausgelagert");
 				break;
 
 			case '0.0.9': // SQL queries for v0.0.9
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Fehler beseitigt, wenn error_reporting=E_ALL gesetzt ist. Und der vorherige Fehler <u>Template nicht gefunden</u> ist endlich beseitigt.");
+				setExtensionUpdateNotes("Fehler beseitigt, wenn error_reporting=E_ALL gesetzt ist. Und der vorherige Fehler <u>Template nicht gefunden</u> ist endlich beseitigt.");
 				break;
 
 			case '0.1.0': // SQL queries for v0.2.1
-				ADD_EXT_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_rallye_users` CHANGE curr_points curr_points FLOAT(23,5) UNSIGNED NOT NULL DEFAULT 0.00000");
+				addExtensionSql("ALTER TABLE `{?_MYSQL_PREFIX?}_rallye_users` CHANGE curr_points curr_points FLOAT(23,5) UNSIGNED NOT NULL DEFAULT 0.00000");
 
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("5 Nachkommastellen implementiert.");
+				setExtensionUpdateNotes("5 Nachkommastellen implementiert.");
 				break;
 
 			case '0.1.1': // SQL queries for v0.1.1
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Fehler beseitigt, wenn error_reporting=E_ALL gesetzt ist.");
+				setExtensionUpdateNotes("Fehler beseitigt, wenn error_reporting=E_ALL gesetzt ist.");
 				break;
 
 			case '0.1.2': // SQL queries for v0.1.2
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Problem mit Speicherung der Einstellungen beseitigt.");
+				setExtensionUpdateNotes("Problem mit Speicherung der Einstellungen beseitigt.");
 				break;
 
 			case '0.1.3': // SQL queries for v0.1.3
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Anzeigefehler im Gast-/Mitgliedsbereich behoben.");
+				setExtensionUpdateNotes("Anzeigefehler im Gast-/Mitgliedsbereich behoben.");
 				break;
 
 			case '0.1.4': // SQL queries for v0.1.4
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Admin-Mails korregiert.");
+				setExtensionUpdateNotes("Admin-Mails korregiert.");
 				break;
 
 			case '0.1.5': // SQL queries for v0.1.5
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Men&uuml;punkte im Gast-/Mitgliedsbereich k&ouml;nnen nicht mehr aufgerufen werden, wenn die Erweiterung deaktiviert ist.");
+				setExtensionUpdateNotes("Men&uuml;punkte im Gast-/Mitgliedsbereich k&ouml;nnen nicht mehr aufgerufen werden, wenn die Erweiterung deaktiviert ist.");
 				break;
 
 			case '0.1.6': // SQL queries for v0.1.6
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Seit <a href=\"#\">Patch 340</a> &uuml;berfl&uuml;ssige HTML-Tags entfernt.");
+				setExtensionUpdateNotes("Seit <strong>Patch 340</strong> &uuml;berfl&uuml;ssige HTML-Tags entfernt.");
 				break;
 
 			case '0.1.7': // SQL queries for v0.1.7
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Aktivierte bzw. abgelaufene Rallyes werden nur ausserhalb des CSS-Modus geladen (wenn also nicht css.php aufgerufen wurde)");
+				setExtensionUpdateNotes("Aktivierte bzw. abgelaufene Rallyes werden nur ausserhalb des CSS-Modus geladen (wenn also nicht css.php aufgerufen wurde)");
 				break;
 
 			case '0.1.8': // SQL queries for v0.1.8
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Weitere Templates vom Admin-Bereich ausgelagert und Referal-Anazahl in der Mail zur Rallye-Ank&uuml;ndigung repariert.");
+				setExtensionUpdateNotes("Weitere Templates vom Admin-Bereich ausgelagert und Referal-Anazahl in der Mail zur Rallye-Ank&uuml;ndigung repariert.");
 				break;
 
 			case '0.1.9': // SQL queries for v0.1.9
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Funktion <u>generateUserProfileLink()</u> mit Verlinkung auf Referal-Liste implementiert.");
+				setExtensionUpdateNotes("Funktion <u>generateUserProfileLink()</u> mit Verlinkung auf Referal-Liste implementiert.");
 				break;
 
 			case '0.2.0': // SQL queries for v0.2.0
-				ADD_EXT_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_rallye_data` ADD min_users BIGINT(20) UNSIGNED NOT NULL DEFAULT 0");
-				ADD_EXT_SQL("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!)
-				EXT_SET_UPDATE_NOTES("Ablaufen der Rallyes intergriert. Bauen Sie in Ihr Template <strong>templates/de/emails/member/member_rallye_notify.tpl</strong> folgende zwei Zeilen ein:<br />
+				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 />
 <ul>
   <li>&#36;DATA&#91;min_users&#93;</li>
   <li>&#36;DATA&#91;min_prices&#93;</li>
@@ -237,138 +236,156 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
 
 			case '0.2.1': // SQL queries for v0.2.1
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("W&ouml;rter <strong>Mailtausch</strong>, <strong>Mailtausches</strong> und <strong>Mailtauscher</strong> sind austauschbar.");
+				setExtensionUpdateNotes("W&ouml;rter <strong>{?mt_word?}</strong>, <strong>{?mt_word2?}</strong> und <strong>{?mt_word3?}</strong> sind austauschbar.");
 				break;
 
 			case '0.2.2': // SQL queries for v0.2.2
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Links wegen <strong>what=admins_contct</strong> ge&auml;ndert.");
+				setExtensionUpdateNotes("Links wegen <strong>what=admins_contct</strong> ge&auml;ndert.");
 				break;
 
 			case '0.2.3': // SQL queries for v0.2.3
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("HTML-Code ausgelagert in Templates und SQL-Anweisungen abgesichert.");
+				setExtensionUpdateNotes("HTML-Code ausgelagert in Templates und SQL-Anweisungen abgesichert.");
 				break;
 
 			case '0.2.4': // SQL queries for v0.2.4
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Abspeichern von Einstellungen repariert.");
+				setExtensionUpdateNotes("Abspeichern von Einstellungen repariert.");
 				break;
 
 			case '0.2.5': // SQL queries for v0.2.5
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Men&uuml;punkt &quot;Rallyes verwalten&quot; repariert.");
+				setExtensionUpdateNotes("Men&uuml;punkt &quot;Rallyes verwalten&quot; repariert.");
 				break;
 
 			case '0.2.6': // SQL queries for v0.2.6
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Automatisches Starten von Referal-Rallyes repariert.");
+				setExtensionUpdateNotes("Automatisches Starten von Referal-Rallyes repariert.");
 				break;
 
 			case '0.2.7': // SQL queries for v0.2.7
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Fatalen Fehler beseitigt.");
+				setExtensionUpdateNotes("Fatalen Fehler beseitigt.");
 				break;
 
 			case '0.2.8': // SQL queries for v0.2.8
 				// Update notes (these will be set as task text!)
 
-				EXT_SET_UPDATE_NOTES("Vorbereitung auf die neue Mediendaten v0.0.4.");
+				setExtensionUpdateNotes("Vorbereitung auf die neue Mediendaten v0.0.4.");
 				break;
 
 			case '0.2.9': // SQL queries for v0.2.9
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Sicherheitsupdate f&uuml;r die Include-Befehle.");
+				setExtensionUpdateNotes("Sicherheitsupdate f&uuml;r die Include-Befehle.");
 				break;
 
 			case '0.3.0': // SQL queries for v0.3.0
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("if-Anweisungen auf Funktion <strong>empty()</strong> umgestellt.");
+				setExtensionUpdateNotes("if-Anweisungen auf Funktion <strong>empty()</strong> umgestellt.");
 				break;
 
 			case '0.3.1': // SQL queries for v0.3.1
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Erweiterung f&uuml;r automatisch generierte Admin-Kontaktlinks ge&auml;ndert.");
+				setExtensionUpdateNotes("Erweiterung f&uuml;r automatisch generierte Admin-Kontaktlinks ge&auml;ndert.");
 				break;
 
 			case '0.3.2': // SQL queries for v0.3.2
-				ADD_EXT_SQL("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `action`='rals', `sort`='1', `title`='Referal-Rallye' WHERE `what`='rallyes' LIMIT 1");
+				addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='rals', `sort`=1, `title`='Referal-Rallye' WHERE `what`='rallyes' LIMIT 1");
 
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Mitgliedsmen&uuml; komplett umgebaut.");
+				setExtensionUpdateNotes("Mitgliedsmen&uuml; komplett umgebaut.");
 				break;
 
 			case '0.3.3': // SQL queries for v0.3.3
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Rallyes werden nun nur dann automatisch beseitigt, wenn die Erweiterung <strong>autopurge</strong> installiert und aktiviert ist.");
+				setExtensionUpdateNotes("Rallyes werden nun nur dann automatisch beseitigt, wenn die Erweiterung <strong>autopurge</strong> installiert und aktiviert ist.");
 				break;
 
 			case '0.3.4': // SQL queries for v0.3.4
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Fehlerhinweis bei deaktivierter Erweiterung verbessert.");
+				setExtensionUpdateNotes("Fehlerhinweis bei deaktivierter Erweiterung verbessert.");
 				break;
 
 			case '0.3.5': // SQL queries for 0.3.5
 				// This update depends on sql_patches
-				EXT_ADD_UPDATE_DEPENDS('sql_patches');
+				addExtensionUpdateDependency('sql_patches');
 
 				// Register filter
-				registerFilter('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', false, true, $dry_run);
+				registerFilter('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', false, true, getExtensionDryRun());
 
 				// Update notes (these will be set as task text!)
-				EXT_SET_UPDATE_NOTES("Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");
+				setExtensionUpdateNotes("Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");
 				break;
 		}
 		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.
-				break;
-
-			default: // Do stuff when extension is loaded
-				// Do stuff only when not in CSS mode
-				if (($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1') && ($GLOBALS['cache_mode'] != 'init')) {
-					// Get total member count
-					$total = GET_TOTAL_DATA('CONFIRMED', 'user_data', 'userid', 'status', true);
+	case 'modify': // When the extension got modified
+		break;
 
-					// Add more data on higher versions
-					$ADD1 = ''; $ADD2 = ''; $OR = '';
-					if (GET_EXT_VERSION('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
+	case 'test': // For testing purposes. For details see file inc/modules/admin/what-extensions.php, arround line 305.
+		break;
 
-					// 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()
+	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) {
+			// Get total member count
+			$total = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true);
+
+			// Add more data on higher versions
+			$ADD1 = ''; $ADD2 = ''; $OR = '';
+			if (getExtensionVersion('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
-						RALLYE_AUTOSTART_RALLYES($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.")
+			if (SQL_NUMROWS($result) == 1) {
+				// Start rallye
+				autostartReferalRallyes($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) && (EXT_IS_ACTIVE('autopurge'))) {
-						// End rallye here...
-						RALLYE_EXPIRE_RALLYES($result);
-					} // END - if
+			if ((SQL_NUMROWS($result) == 1) && (isExtensionActive('autopurge'))) {
+				// End rallye here...
+				markReferalRallyesAsExpired($result);
+			} // END - if
+
+			// Free memory
+			SQL_FREERESULT($result);
+		} // END - if
+		break;
 
-					// 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()));
+		break;
+} // END - switch
 
-//
+// [EOF]
 ?>