Next stage of HTML rewriting, lesser br-tags

[mailer.git] / inc / modules / guest / what-rallyes.php

diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index 8bb5527f892e9fe47087452fb7ef7f85e9f6d9d0..799414e0b6320cf47be608e0d1378c48e58d13d7 100644 (file)
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -53,8 +53,8 @@ if ((!isExtensionActive('rallye')) && (!isAdmin())) {
 outputHtml('<div align="center">');
 
 // Check for possible running rallyes
-$ADMIN = " AND d.is_active='Y'";
-if (isAdmin()) $ADMIN = '';
+$ADD = " AND d.is_active='Y'";
+if (isAdmin()) $ADD = '';
 
 $result = SQL_QUERY("SELECT
        d.id, d.admin_id, a.login, d.title, d.descr, d.template, d.start_time, d.end_time, d.min_users, d.min_prices
@@ -65,7 +65,7 @@ INNER JOIN
 ON
        d.admin_id=a.id
 WHERE
-       d.notified='Y'".$ADMIN."
+       d.notified='Y'" . $ADD . "
 ORDER BY
        d.end_time
 LIMIT 1", __FILE__, __LINE__);
@@ -83,11 +83,11 @@ if (SQL_NUMROWS($result) == 1) {
                // Rallye will expire in less one day!
                $content['extras'] = getMessage('RALLYE_EXPIRE_ONE_DAY');
        } else {
-               $content['extras'] = "<a href=\"{?URL?}/modules.php?module=index&amp;what=register\">{--RALLYE_REGISTER_NOW--}</a>";
+               $content['extras'] = "<a href=\"{%url=modules.php?module=index&amp;what=register%}\">{--RALLYE_REGISTER_NOW--}</a>";
        }
 
        // Set admin line (currently set to impressum, later to contact form)
-       // @TODO Reactivate this: $content['admin'] = "<a href=\"{?URL?}/modules.php?module=index&amp;what=impressum&amp;admin=".$adminId."\">".$login."</a>";
+       // @TODO Reactivate this: $content['admin'] = "<a href=\"{%url=modules.php?module=index&amp;what=impressum&amp;admin=" . $adminId . "%}\">" . $login . "</a>";
 
        // Set title
        $content['title'] = $title;