Some sponsor API functions added, expression function for user moved:

[mailer.git] / inc / extensions / ext-rallye.php

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index a8c4d3d9c9c222ff9e78a29482a40b6696dd2eac..6b2fb3bdf00f5c8b3a040e23f7aac624cfc7edc7 100644 (file)
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -51,9 +51,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,
@@ -104,9 +104,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'");
@@ -114,7 +114,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
@@ -218,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 <strong>templates/de/emails/member/member_rallye_notify.tpl</strong> folgende zwei Zeilen ein:<br />
@@ -312,7 +312,7 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
                                addExtensionUpdateDependency('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&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");
@@ -329,21 +329,21 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>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 (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
@@ -363,14 +363,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...