X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions%2Fext-rallye.php;h=f4047fd9a4934a0b47de3005e8b583c579e8a747;hp=f8abbf08dadc10a691def8c88d3d85d26a8b50f6;hb=63f159414369b5ea19a8ca75d8cd8033c45d8341;hpb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8
diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index f8abbf08da..f4047fd9a4 100644
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -6,9 +6,9 @@
* -------------------------------------------------------------------- *
* File : ext-rallye.php *
* -------------------------------------------------------------------- *
- * Short description : Referal rallye *
+ * Short description : Referral rallye *
* -------------------------------------------------------------------- *
- * Kurzbeschreibung : Ref-Rallyes starten *
+ * Kurzbeschreibung : Referral Rallyes starten *
* -------------------------------------------------------------------- *
* $Revision:: $ *
* $Date:: $ *
@@ -16,8 +16,8 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -41,50 +41,52 @@ if (!defined('__SECURITY')) {
} // END - if
// Version number
-setThisExtensionVersion('0.3.5');
+setThisExtensionVersion('0.3.6');
-// 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'));
+// 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'));
switch (getExtensionMode()) {
- case 'register': // Do stuff when installation is running (modules.php?module=admin is called)
+ case 'register': // Do stuff when installation is running
// 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("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 '',
-descr LONGTEXT NOT NULL,
-template VARCHAR(255) NOT NULL DEFAULT '',
-start_time VARCHAR(10) NOT NULL DEFAULT 0,
-end_time VARCHAR(10) NOT NULL DEFAULT 0,
-auto_add_new_user ENUM('Y','N') NOT NULL DEFAULT 'Y',
-is_active ENUM('Y','N') NOT NULL DEFAULT 'N',
-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?}");
- 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?}");
- 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?}");
+ addDropTableSql('rallye_data');
+ addCreateTableSql('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 '',
+`descr` LONGTEXT NOT NULL,
+`template` VARCHAR(255) NOT NULL DEFAULT '',
+`start_time` VARCHAR(10) NOT NULL DEFAULT 0,
+`end_time` VARCHAR(10) NOT NULL DEFAULT 0,
+`auto_add_new_user` ENUM('Y','N') NOT NULL DEFAULT 'Y',
+`is_active` ENUM('Y','N') NOT NULL DEFAULT 'N',
+`send_notify` ENUM('Y','N') NOT NULL DEFAULT 'Y',
+`notified` ENUM('Y','N') NOT NULL DEFAULT 'N',
+PRIMARY KEY (`id`),
+INDEX (`admin_id`)",
+ 'Main rallye data');
+
+ addDropTableSql('rallye_prices');
+ addCreateTableSql('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,
+PRIMARY KEY (`id`),
+INDEX (`rallye_id`)",
+ 'Prices data for a rallye');
+
+ addDropTableSql('rallye_users');
+ addCreateTableSql('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,
+PRIMARY KEY (`id`),
+INDEX (`rallye_id`),
+INDEX (`userid`)",
+ 'Rallye->user connection table');
// 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);
@@ -94,50 +96,53 @@ PRIMARY KEY (id)
addAdminMenuSql('rallye','list_rallyes','Rallyes verwalten','Alle bestehenden Ref-Rallyes auflisten, bearbeiten, stoppen, löschen usw.',3);
// Guest menu
- addGuestMenuSql('main','rallyes','Ref-Rallyes','N','Y',9);
+ addGuestMenuSql('main', 'rallyes', 'Ref-Rallyes', 9);
// Member menu
- addMemberMenuSql('main','rallyes','Ref-Rallyes','N','Y',9);
+ addMemberMenuSql('main', 'rallyes', 'Ref-Rallyes', 9);
break;
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`');
+ addDropTableSql('rallye_data');
+ addDropTableSql('rallye_prices');
+ addDropTableSql('rallye_users');
// Remove menus
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'");
+ addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `what`='rallyes' LIMIT 1");
+ addExtensionSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE `what`='rallyes' LIMIT 1");
+
+ // Remove points_data entry
+ unregisterExtensionPointsData('rallye_winner');
// Unregister filter
- unregisterFilter(__FUNCTION__, __LINE__, 'extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, isExtensionDryRun());
+ unregisterFilter(__FILE__, __LINE__, 'extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, isExtensionDryRun());
break;
case 'activate': // Do stuff when admin activates this extension
// SQL commands to run
- 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");
+ 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
- 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");
+ 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 (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'");
+ 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!)
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");
+ 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!)
setExtensionUpdateNotes("Aktueller {?POINTS?}-Stand wird beachtet.");
@@ -145,7 +150,7 @@ PRIMARY KEY (id)
case '0.0.6': // SQL queries for v0.0.6
// Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Fehler Unknown column 'd.useid' in 'on clause' behoben.");
+ setExtensionUpdateNotes("Fehler Unknown column 'd.useid' in 'on clause' behoben.");
break;
case '0.0.7': // SQL queries for v0.0.7
@@ -164,7 +169,7 @@ PRIMARY KEY (id)
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");
+ 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!)
setExtensionUpdateNotes("5 Nachkommastellen implementiert.");
@@ -207,12 +212,12 @@ PRIMARY KEY (id)
case '0.1.8': // SQL queries for v0.1.8
// Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Weitere Templates vom Admin-Bereich ausgelagert und Referal-Anazahl in der Mail zur Rallye-Ankündigung repariert.");
+ setExtensionUpdateNotes("Weitere Templates vom Admin-Bereich ausgelagert und Referral-Anazahl in der Mail zur Rallye-Ankündigung repariert.");
break;
case '0.1.9': // SQL queries for v0.1.9
// Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Funktion generateUserProfileLink() mit Verlinkung auf Referal-Liste implementiert.");
+ setExtensionUpdateNotes("Funktion generateUserProfileLink() mit Verlinkung auf Referral-Liste implementiert.");
break;
case '0.2.0': // SQL queries for v0.2.0
@@ -259,7 +264,7 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu
case '0.2.6': // SQL queries for v0.2.6
// Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Automatisches Starten von Referal-Rallyes repariert.");
+ setExtensionUpdateNotes("Automatisches Starten von Referral-Rallyes repariert.");
break;
case '0.2.7': // SQL queries for v0.2.7
@@ -289,7 +294,7 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu
break;
case '0.3.2': // SQL queries for v0.3.2
- addExtensionSql("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',`title`='Referral-Rallye',`sort`=1 WHERE `what`='rallyes' LIMIT 1");
// Update notes (these will be set as task text!)
setExtensionUpdateNotes("Mitgliedsmenü komplett umgebaut.");
@@ -306,27 +311,38 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu
break;
case '0.3.5': // SQL queries for 0.3.5
- // This update depends on sql_patches
- addExtensionUpdateDependency('sql_patches');
+ // This update depends on ext-sql_patches
+ addExtensionDependency('sql_patches');
// Register filter
- registerFilter('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ügt und ist von sql_patches abhängig.");
break;
- }
+
+ case '0.3.6': // SQL queries for v0.3.6
+ // 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 über die Tabelle {OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data verwaltet.");
+ 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
// Do stuff only when not in CSS mode
- // @TODO Move this code into rallye_functions.php
+ // @TODO Move this code into a hook
if (!isCssOutputMode()) {
// Get total member count
$total = getTotalConfirmedUser();
@@ -334,14 +350,19 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu
// 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`";
+ $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 . "
+ `id`,
+ `title`,
+ `start_time`,
+ `end_time`,
+ `send_notify`
+ " . $ADD1 . "
FROM
`{?_MYSQL_PREFIX?}_rallye_data`
WHERE
@@ -353,7 +374,7 @@ WHERE
LIMIT 1", __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Start rallye
- autostartReferalRallyes($result);
+ autostartReferralRallyes($result);
} // END - if
// Free memory
@@ -361,7 +382,12 @@ LIMIT 1", __FILE__, __LINE__);
// 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 . "
+ d.`id`,
+ d.`title`,
+ d.`start_time`,
+ d.`end_time`,
+ d.`send_notify`
+ " . $ADD2 . "
FROM
`{?_MYSQL_PREFIX?}_rallye_data` AS d
WHERE
@@ -372,7 +398,7 @@ WHERE
LIMIT 1", __FILE__, __LINE__);
if ((SQL_NUMROWS($result) == 1) && (isExtensionActive('autopurge'))) {
// End rallye here...
- markReferalRallyesAsExpired($result);
+ stopRallyeByResult($result);
} // END - if
// Free memory