X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fextensions%2Fext-rallye.php;h=b9ce9a746cded807552858c8f84798e1115b2336;hp=58e28483788d28437301ed74cbd473b02c306672;hb=865d8f7670c976d59d5699d72958c8c00f6af70e;hpb=adb34cea9c14bcac14030f8eb1e6ae2c3231c962 diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php index 58e2848378..b9ce9a746c 100644 --- a/inc/extensions/ext-rallye.php +++ b/inc/extensions/ext-rallye.php @@ -6,19 +6,18 @@ * -------------------------------------------------------------------- * * File : ext-rallye.php * * -------------------------------------------------------------------- * - * Short description : Referal rallye * + * Short description : Referral rallye * * -------------------------------------------------------------------- * - * Kurzbeschreibung : Ref-Rallyes starten * + * Kurzbeschreibung : Referral Rallyes starten * * -------------------------------------------------------------------- * * $Revision:: $ * * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * * $Author:: $ * - * Needs to be in all Files and every File needs "svn propset * - * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * 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 * @@ -39,106 +38,112 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Version number -setThisExtensionVersion('0.3.5'); +setThisExtensionVersion('0.3.8'); -// 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', '0.3.7', '0.3.8')); switch (getExtensionMode()) { - case 'register': // Do stuff when installation is running (modules.php?module=admin is called) + case 'setup': // 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); 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 - 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('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', true, getExtensionDryRun()); + 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 // 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'"); + 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."); @@ -146,7 +151,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 @@ -165,7 +170,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"); + 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."); @@ -208,17 +213,17 @@ 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 - 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 templates/de/emails/member/member_rallye_notify.tpl folgende zwei Zeilen ein:
@@ -260,7 +265,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 @@ -290,7 +295,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."); @@ -307,82 +312,50 @@ 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'); - // Register filter - registerFilter('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', false, true, getExtensionDryRun()); + 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'); + + // Update notes + setExtensionUpdateNotes("Gewinn aus der Referral-Rallye wird nun über die Tabelle {OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data 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ü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ü umbenannt, da "config" nur für die Konfigurationstabelle {?_MYSQL_PREFIX?}_config ist."); + 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 - 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 - 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) && (isExtensionActive('autopurge'))) { - // End rallye here... - markReferalRallyesAsExpired($result); - } // END - if - - // Free memory - SQL_FREERESULT($result); - } // END - if break; default: // Unknown extension mode - logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s detected.", getExtensionMode())); + reportBug(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName())); break; } // END - switch