Fix for inserted codes while registering of extensions, many rewrites/cleanups:

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

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index f03bf03c016afa31585de9a45b04bd69b859513b..8b05ceb6095d60be860e42551fd3661aa44b0e87 100644 (file)
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -337,13 +337,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 +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...