Large code cleanups:

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

diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index fe00417623539260fa9ea913acd4c4f617db42a4..1d7601c6bf18d596eddd28717be8d40fbcdfe88b 100644 (file)
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -6,9 +6,9 @@
  * -------------------------------------------------------------------- *
  * File              : ext-rallye.php                                   *
  * -------------------------------------------------------------------- *
- * Short description : Referal rallye                                   *
+ * Short description : Referral rallye                                  *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Ref-Rallyes starten                              *
+ * Kurzbeschreibung  : Referral Rallyes starten                         *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
@@ -119,14 +119,14 @@ INDEX (`userid`)",
 
        case 'activate': // Do stuff when admin activates this extension
                // SQL commands to run
-               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y', `locked`='N' WHERE `what`='rallyes' LIMIT 1");
-               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='rallyes' LIMIT 1");
+               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='Y',`locked`='N' WHERE `what`='rallyes' LIMIT 1");
+               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y',`locked`='N' WHERE `what`='rallyes' LIMIT 1");
                break;
 
        case 'deactivate': // Do stuff when admin deactivates this extension
                // SQL commands to run
-               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N', `locked`='Y' WHERE `what`='rallyes' LIMIT 1");
-               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N', `locked`='Y' WHERE `what`='rallyes' LIMIT 1");
+               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='N',`locked`='Y' WHERE `what`='rallyes' LIMIT 1");
+               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='N',`locked`='Y' WHERE `what`='rallyes' LIMIT 1");
                break;
 
        case 'update': // Update an extension
@@ -209,12 +209,12 @@ INDEX (`userid`)",
 
                        case '0.1.8': // SQL queries for v0.1.8
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Weitere Templates vom Admin-Bereich ausgelagert und Referal-Anazahl in der Mail zur Rallye-Ankündigung repariert.");
+                               setExtensionUpdateNotes("Weitere Templates vom Admin-Bereich ausgelagert und Referral-Anazahl in der Mail zur Rallye-Ankündigung repariert.");
                                break;
 
                        case '0.1.9': // SQL queries for v0.1.9
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Funktion <u>generateUserProfileLink()</u> mit Verlinkung auf Referal-Liste implementiert.");
+                               setExtensionUpdateNotes("Funktion <u>generateUserProfileLink()</u> mit Verlinkung auf Referral-Liste implementiert.");
                                break;
 
                        case '0.2.0': // SQL queries for v0.2.0
@@ -261,7 +261,7 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
 
                        case '0.2.6': // SQL queries for v0.2.6
                                // Update notes (these will be set as task text!)
-                               setExtensionUpdateNotes("Automatisches Starten von Referal-Rallyes repariert.");
+                               setExtensionUpdateNotes("Automatisches Starten von Referral-Rallyes repariert.");
                                break;
 
                        case '0.2.7': // SQL queries for v0.2.7
@@ -291,7 +291,7 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
                                break;
 
                        case '0.3.2': // SQL queries for v0.3.2
-                               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='rals', `sort`=1, `title`='Referal-Rallye' WHERE `what`='rallyes' LIMIT 1");
+                               addExtensionSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `action`='rals',`title`='Referral-Rallye',`sort`=1 WHERE `what`='rallyes' LIMIT 1");
 
                                // Update notes (these will be set as task text!)
                                setExtensionUpdateNotes("Mitgliedsmen&uuml; komplett umgebaut.");
@@ -325,7 +325,7 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
                                addExtensionDependency('sql_patches');
 
                                // Update notes
-                               setExtensionUpdateNotes("Gewinn aus der Referal-Rallye wird nun &uuml;ber die Tabelle <strong>{OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data</strong> verwaltet.");
+                               setExtensionUpdateNotes("Gewinn aus der Referral-Rallye wird nun &uuml;ber die Tabelle <strong>{OPEN_CONFIG}_MYSQL_PREFIX{CLOSE_CONFIG}_points_data</strong> verwaltet.");
                                break;
                } // END - switch
                break;
@@ -346,8 +346,8 @@ Zudem sollten Sie mindestens folgende Templates (in <strong>templates/".getLangu
                        // 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`";
+                               $ADD1 = ",`min_users`,`min_prices`";
+                               $ADD2 = ",d.`min_users`,d.`min_prices`";
                                $OR   = " OR (d.`min_users` <= " . $total . " AND d.`min_users` > 0)";
                        } // END  - if
 
@@ -365,7 +365,7 @@ WHERE
 LIMIT 1", __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Start rallye
-                               autostartReferalRallyes($result);
+                               autostartReferralRallyes($result);
                        } // END - if
 
                        // Free memory
@@ -373,7 +373,12 @@ 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
@@ -384,7 +389,7 @@ WHERE
 LIMIT 1", __FILE__, __LINE__);
                        if ((SQL_NUMROWS($result) == 1) && (isExtensionActive('autopurge'))) {
                                // End rallye here...
-                               markReferalRallyesAsExpired($result);
+                               markReferralRallyesAsExpired($result);
                        } // END - if
 
                        // Free memory