X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions%2Fext-rallye.php;h=fe00417623539260fa9ea913acd4c4f617db42a4;hb=7957bf99511c45f993cdad1304ade6700385fef8;hp=d63be45392a49ab428caac21a681df59fc3925e1;hpb=392c181338f84b2e0e0fdfbd304b1ca9d8da077e;p=mailer.git
diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index d63be45392..fe00417623 100644
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -1,7 +1,7 @@
user connection table');
// Admin menu
- addExtensionSql("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öhren. Dabei wird alles weitere automatisch geregelt.','9')");
- addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_admin_menu` (`action`,`what`,`title`,`descr`,`sort`) VALUES ('rallye','add_rallye','Neue Rallye hinzufügen','Neue Ref-Rallye hinzufügen.','1')");
- addExtensionSql("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')");
- addExtensionSql("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öschen usw.','3')");
+ 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_rallyes','Rallyes verwalten','Alle bestehenden Ref-Rallyes auflisten, bearbeiten, stoppen, löschen usw.',3);
// Guest menu
- addExtensionSql("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', 9);
// Member menu
- addExtensionSql("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', 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");
// 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
@@ -216,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 templates/de/emails/member/member_rallye_notify.tpl folgende zwei Zeilen ein:
@@ -234,7 +236,7 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu
case '0.2.1': // SQL queries for v0.2.1
// Update notes (these will be set as task text!)
- setExtensionUpdateNotes("Wörter Mailtausch, Mailtausches und Mailtauscher sind austauschbar.");
+ setExtensionUpdateNotes("Wörter {?mt_word?}, {?mt_word2?} und {?mt_word3?} sind austauschbar.");
break;
case '0.2.2': // SQL queries for v0.2.2
@@ -289,7 +291,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', `sort`=1, `title`='Referal-Rallye' WHERE `what`='rallyes' LIMIT 1");
// Update notes (these will be set as task text!)
setExtensionUpdateNotes("Mitgliedsmenü komplett umgebaut.");
@@ -306,42 +308,52 @@ 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, getExtensionDryRun());
+ registerFilter('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
+ addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_points_data` (`subject`,`column_name`,`locked_mode`,`payment_method`) VALUES ('rallye_winner','points','LOCKED','DIRECT')");
+
+ // This depends on ext-sql_patches
+ addExtensionDependency('sql_patches');
+
+ // Update notes
+ setExtensionUpdateNotes("Gewinn aus der Referal-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
- if (getOutputMode() != '1') {
+ // @TODO Move this code into a hook
+ if (!isCssOutputMode()) {
// 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') {
- $ADD1 = ", `min_users`, `min_prices`";
- $ADD2 = ", d.min_users, d.min_prices";
- $OR = " OR (d.min_users <= ".$total." AND d.min_users > 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)";
} // 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
@@ -361,14 +373,14 @@ 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
- d.is_active='Y' AND
- d.notified='Y' AND
- d.expired='N' AND
- (d.end_time <= UNIX_TIMESTAMP()".$OR.")
+ 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...
@@ -381,7 +393,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