Renamed function so it might be more understandable

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

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index f03bf03c016afa31585de9a45b04bd69b859513b..18282c368cf27c09f3cd70a7772c38c4ae630085 100644 (file)
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -309,7 +307,7 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>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, isExtensionDryRun());
@@ -317,7 +315,7 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Filter hinzugef&uuml;gt und ist von <strong>sql_patches</strong> abh&auml;ngig.");
                                break;
-               }
+               } // END - switch
                break;
 
        case 'modify': // When the extension got modified
@@ -329,7 +327,7 @@ 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 (getScriptOutputMode() != 1) {
+               if (!isCssOutputMode()) {
                        // Get total member count
                        $total = getTotalConfirmedUser();
 
@@ -337,13 +335,13 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
                        $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 +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...