X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fextensions%2Fext-rallye.php;h=18282c368cf27c09f3cd70a7772c38c4ae630085;hb=c42ead27f4a63de80b53f029d570bfeac7188c3a;hp=58e28483788d28437301ed74cbd473b02c306672;hpb=c6838f887ab007b0d82ab9d727ba2d30b4bc5a97;p=mailer.git
diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index 58e2848378..18282c368c 100644
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -14,10 +14,9 @@
* $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 *
+ * 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 +38,7 @@
// Some security stuff...
if (!defined('__SECURITY')) {
die();
-}
+} // END - if
// Version number
setThisExtensionVersion('0.3.5');
@@ -50,9 +49,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 +102,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 +112,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 +216,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:
@@ -308,15 +307,15 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu
case '0.3.5': // SQL queries for 0.3.5
// This update depends on sql_patches
- addExtensionUpdateDependency('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;
- }
+ } // END - switch
break;
case 'modify': // When the extension got modified
@@ -328,21 +327,21 @@ Zudem sollten Sie mindestens folgende Templates (in 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 (!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') {
+ 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)";
+ $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
@@ -362,14 +361,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...
@@ -382,7 +381,7 @@ LIMIT 1", __FILE__, __LINE__);
break;
default: // Unknown extension mode
- logDebugMessage(__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