More fixes, thanks to Piter01
[mailer.git] / inc / modules / member / what-order.php
index 51c11ef..5a45378 100644 (file)
@@ -66,11 +66,10 @@ SQL_FREERESULT($result_links);
 
 // Does the user has more than 0 mails per day set?
 $HOLIDAY="userid";
-if (GET_EXT_VERSION("holiday") >= "0.1.3")
-{
+if (GET_EXT_VERSION("holiday") >= "0.1.3") {
        // Fetch also holiday activation data
        $HOLIDAY = "holiday_active";
-}
+} // END - if
 
 $result_mmails = SQL_QUERY_ESC("SELECT userid, receive_mails, mail_orders, ".$HOLIDAY."
 FROM "._MYSQL_PREFIX."_user_data
@@ -97,7 +96,7 @@ if ($TOTAL > 0) {
 
        // Add (maybe) missing three zeros
        if (!ereg(".", $TOTAL)) $TOTAL .= ".00000";
-}
+} // END - if
 
 if (($HOLIDAY == "Y") && (GET_EXT_VERSION("holiday") >= "0.1.3")) {
        // Holiday is active!
@@ -113,95 +112,91 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
         array($GLOBALS['userid'], $_POST['url'], $_CONFIG['url_tlock']), __FILE__, __LINE__);
 
        $type = "TEMP"; $id = 0;
-       if (SQL_NUMROWS($result) == 1)
-       {
+       if (SQL_NUMROWS($result) == 1) {
                list($id, $type) = SQL_FETCHROW($result);
-               SQL_FREERESULT($result);
        }
-       if ($type == "TEMP")
-       {
+
+       // Free result
+       SQL_FREERESULT($result);
+
+       if ($type == "TEMP") {
                // No entry found, so we need to check out the stats table as well... :)
                // We have to add that suff here, now we continue WITHOUT checking and check the text and subject against some filters
                $URL = "";
-               if ($_CONFIG['test_text'] == "Y")
-               {
+               if ($_CONFIG['test_text'] == "Y") {
                        // Test submitted text against some filters (length, URLs in text etc.)
-                       if ((strpos(strtolower($_POST['text']), "https://") > -1) || (strpos(strtolower($_POST['text']), "http://") > -1) || (strpos(strtolower($_POST['text']), "www") > -1))
-                       {
+                       if ((strpos(strtolower($_POST['text']), "https://") > -1) || (strpos(strtolower($_POST['text']), "http://") > -1) || (strpos(strtolower($_POST['text']), "www") > -1)) {
                                // URL found!
                                $URL = URL."/modules.php?module=login&what=order&msg=".CODE_URL_FOUND;
-                       }
+                       } // END - if
+
+                       // Remove new-line and carriage-return characters
                        $TEST = str_replace("\n", "", str_replace("\r", "", $_POST['text']));
-                       if (strlen($TEST) > $_CONFIG['max_tlength'])
-                       {
+
+                       // Text length within allowed length?
+                       if (strlen($TEST) > $_CONFIG['max_tlength']) {
                                // Text is too long!
                                $URL = URL."/modules.php?module=login&what=order&msg=".CODE_OVERLENGTH;
-                       }
-               }
+                       } // END - if
+               } // END - if
+
                // Shall I test the subject line against URLs?
-               if ($_CONFIG['test_subj'] == "Y")
-               {
+               if ($_CONFIG['test_subj'] == "Y") {
                        // Check the subject line for issues
                        $_POST['subject'] = str_replace("\\", "[nl]", substr($_POST['subject'], 0, 200));
-                       if ((strpos(strtolower($_POST['subject']), "http://") > -1) || (strpos(strtolower($_POST['subject']), "www") > -1))
-                       {
+                       if ((strpos(strtolower($_POST['subject']), "http://") > -1) || (strpos(strtolower($_POST['subject']), "www") > -1)) {
                                // URL in subject found
                                $URL = URL."/modules.php?module=login&what=order&msg=".CODE_SUBJ_URL;
-                       }
-               }
+                       } // END - if
+               } // END - if
+
                // And shall I check that his URL is not in the black list?
-               if ($_CONFIG['url_blacklist'] == "Y")
-               {
+               if ($_CONFIG['url_blacklist'] == "Y") {
                        // Ok, I do that for you know...
                        $result = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_url_blist WHERE url='%s' LIMIT 1",
-                        array($_POST['url']), __FILE__, __LINE__);
+                               array($_POST['url']), __FILE__, __LINE__);
 
-                       if (SQL_NUMROWS($result) == 1)
-                       {
+                       if (SQL_NUMROWS($result) == 1) {
                                // Jupp, we got one listed
                                list($blist) = SQL_FETCHROW($result);
                                SQL_FREERESULT($result);
                                $URL = URL."/modules.php?module=login&what=order&msg=".CODE_BLIST_URL."&blist=".$blist;
-                       }
-               }
-               if (($_POST['receiver'] < $_CONFIG['order_min']) && (!IS_ADMIN()))
-               {
+                       } // END - if
+               } // END - if
+
+               // Enougth receivers entered?
+               if (($_POST['receiver'] < $_CONFIG['order_min']) && (!IS_ADMIN())) {
                        // Less than allowed receivers entered!
                        $URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_MORE_RECEIVERS3;
-               }
+               } // END - if
 
                // Validate URL
-               if (!VALIDATE_URL($_POST['url']))
-               {
+               if (!VALIDATE_URL($_POST['url'])) {
                        // URL is invalid!
                        $URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_INVALID_URL;
-               }
+               } // END - if
 
                // Probe for HTML extension
-               if ($HTML_EXT)
-               {
-                       if ($_POST['html'] == "Y")
-                       {
+               if ($HTML_EXT) {
+                       // HTML or regular text mail?
+                       if ($_POST['html'] == "Y") {
                                // Chek for valid HTML tags
                                $_POST['text'] = HTML_CHECK_TAGS($_POST['text']);
 
                                // Maybe invalid tags found?
                                if (empty($_POST['text'])) $URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_INVALID_TAGS."&id=".$id;
-                       }
-                        else
-                       {
+                       } else {
                                // Remove any HTML code
                                $_POST['text'] = str_replace("<", "{OPEN_HTML}", str_replace(">", "{CLOSE_HTML}", $_POST['text']));
                        }
                }
-       }
-        elseif (!IS_ADMIN())
-       {
+       } elseif (!IS_ADMIN()) {
                // He has already sent a mail within a specific time
                $URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_URL_TLOCK."&id=".$id;
        }
-       if (empty($URL))
-       {
+
+       // Still no error?
+       if (empty($URL)) {
                // Check if category and number of receivers is okay
                $ADD = "";
                if (($_CONFIG['order_multi_page'] == "Y") && (!empty($_POST['zip']))) {
@@ -223,22 +218,18 @@ ORDER BY d.%s %s",
  ), __FILE__, __LINE__);
 
                // Do we enougth receivers left?
-               if (SQL_NUMROWS($result) >= $_POST['receiver'])
-               {
+               if (SQL_NUMROWS($result) >= $_POST['receiver']) {
                        // Check for holiday extensions
                        $HOLIDAY = false;
-                       if (GET_EXT_VERSION("holiday") >= "0.1.3")
-                       {
+                       if (GET_EXT_VERSION("holiday") >= "0.1.3") {
                                // Include checking for users in holiday
                                $HOLIDAY = true;
-                       }
+                       } // END - if
 
                        // Load receivers from database
                        $TEST = array(); $cnt = 0;
-                       while (list($REC) = SQL_FETCHROW($result))
-                       {
-                               if ($HOLIDAY)
-                               {
+                       while (list($REC) = SQL_FETCHROW($result)) {
+                               if ($HOLIDAY) {
                                        // Check for his holiday status
                                        $result_holiday = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_holidays
 WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIMESTAMP() LIMIT 1",
@@ -247,15 +238,14 @@ WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIME
 
                                        // Free memory
                                        SQL_FREERESULT($result_holiday);
-                               }
+                               } // END - if
 
-                               if ($REC > 0)
-                               {
+                               if ($REC > 0) {
                                        // Add receiver
                                        $TEST[] = $REC;
                                        $cnt++;
-                               }
-                       }
+                               } // END - if
+                       } // END - while
 
                        // Free memory
                        SQL_FREERESULT($result);
@@ -268,7 +258,7 @@ WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIME
 
                        // Update receiver list
                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET receive_mails=receive_mails-1 WHERE userid IN (%s) LIMIT %s",
-                        array(str_replace(";", ", ", $RECEIVER), $MAX_SEND), __FILE__, __LINE__);
+                               array(str_replace(";", ", ", $RECEIVER), $MAX_SEND), __FILE__, __LINE__);
 
                        // Is calculated max receivers larger than wanted receivers then reset it
                        if ($MAX_SEND > $_POST['receiver']) $MAX_SEND = $_POST['receiver'];
@@ -276,17 +266,17 @@ WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIME
                        // Calculate used points
                        $USED = $MAX_SEND * GET_PAY_POINTS(bigintval($_POST['type']));
 
+                       // Fix empty zip code
+                       if (empty($_POST['zip'])) $_POST['zip'] = "0";
+
                        // Check if he has enougth points for this order and selected more than 0 receivers
-                       if (($USED > 0) && ($USED <= $TOTAL) && ($MAX_SEND > 0))
-                       {
+                       if (($USED > 0) && ($USED <= $TOTAL) && ($MAX_SEND > 0)) {
                                // Gettings points is okay, so we can add $USED later from
                                $TIME = time();
-                               if (($id == "0") || ($type != "TEMP"))
-                               {
+                               if (($id == "0") || ($type != "TEMP")) {
                                        // New order
                                        $id = 0;
-                                       if ($HTML_EXT)
-                                       {
+                                       if ($HTML_EXT) {
                                                // HTML extension is active
                                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_pool (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip, html_msg)
  VALUES ('%s','%s','%s','%s','%s','TEMP','%s','%s','%s','%s','%s','%s')",
@@ -303,9 +293,7 @@ array(
        bigintval($_POST['zip']),
        $_POST['html']
 ), __FILE__, __LINE__);
-                                       }
-                                        else
-                                       {
+                                       } else {
                                                // No HTML extension is active
                                                $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_pool (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip)
  VALUES ('%s','%s','%s','%s','%s','TEMP','%s','%s','%s','%s','%s')",
@@ -322,12 +310,9 @@ array(
        bigintval($_POST['zip']),
 ), __FILE__, __LINE__);
                                        }
-                               }
-                                else
-                               {
+                               } else {
                                        // Change current order
-                                       if ($HTML_EXT)
-                                       {
+                                       if ($HTML_EXT) {
                                                // HTML extension is active
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET
 subject='%s',
@@ -353,9 +338,7 @@ array(
        $_POST['html'],
        bigintval($id)
 ), __FILE__, __LINE__);
-                                       }
-                                        else
-                                       {
+                                       } else {
                                                // No HTML extension is active
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET
 subject='%s',
@@ -399,43 +382,29 @@ array(
 
                                // ID is received so we can redirect the user, used points will be added when he send's out the mail
                                $URL = URL."/modules.php?module=frametester&amp;order=".$id."";
-                       }
-                        elseif ($MAX_SEND == 0)
-                       {
+                       } elseif ($MAX_SEND == 0) {
                                // Not enougth receivers found which can receive mails
                                $URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_MORE_RECEIVERS2;
-                       }
-                        else
-                       {
+                       } else {
                                // No enougth points left!
                                $URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_MORE_POINTS;
                        }
-               }
-                else
-               {
+               } else  {
                        // Ordered more mails than he can send in this category
                        $URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_NO_RECS_LEFT;
                }
        }
-}
- elseif ($_POST['receiver'] == "0")
-{
+} elseif ($_POST['receiver'] == "0") {
        // Not enougth receivers selected
        $URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_MORE_RECEIVERS1;
-}
- elseif (($ALLOWED == 0) && ($_CONFIG['order_max_full'] == "ORDER"))
-{
+} elseif (($ALLOWED == 0) && ($_CONFIG['order_max_full'] == "ORDER")) {
        // No more mail orders allowed
        LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_ORDER_ALLOWED_EXHAUSTED);
-}
- elseif (($links < $_CONFIG['unconfirmed']) && ($mmails == "1"))
-{
+} elseif (($links < $_CONFIG['unconfirmed']) && ($mmails == "1")) {
        // Display order form
        $result_cats = SQL_QUERY("SELECT id, cat FROM "._MYSQL_PREFIX."_cats".$whereStatement." ORDER BY sort", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result_cats) > 0)
-       {
-               if ($TOTAL > 0)
-               {
+       if (SQL_NUMROWS($result_cats) > 0) {
+               if ($TOTAL > 0) {
                        // Initialize array...
                        $CATS = array(
                                'id'   => array(),
@@ -446,15 +415,13 @@ array(
                        // Enable HTML checking
                        $HTML = ""; $HOLIDAY = false; $HOL_STRING = "";
                        if (($HTML_EXT) && ($_POST['html'] == "Y")) $HTML = " AND html='Y'";
-                       if (GET_EXT_VERSION("holiday") >= "0.1.3")
-                       {
+                       if (GET_EXT_VERSION("holiday") >= "0.1.3") {
                                // Extension's version is fine
                                $HOLIDAY = true; $HOL_STRING = " AND holiday_active='N'";
-                       }
+                       } // END - if
 
                        // ... and begin loading stuff
-                       while (list($id, $cat) = SQL_FETCHROW($result_cats))
-                       {
+                       while (list($id, $cat) = SQL_FETCHROW($result_cats)) {
                                $CATS['id'][]   = bigintval($id);
                                $CATS['name'][] = $cat;
 
@@ -463,12 +430,10 @@ array(
                                 array(bigintval($id), $GLOBALS['userid']), __FILE__, __LINE__);
 
                                $uid_cnt = 0;
-                               while (list($ucat) = SQL_FETCHROW($result_uids))
-                               {
+                               while (list($ucat) = SQL_FETCHROW($result_uids)) {
                                        // Check for holiday system
                                        $HOL_ACTIVE = false;
-                                       if ($HOLIDAY)
-                                       {
+                                       if ($HOLIDAY) {
                                                // Check user's holiday status
                                                $result_holiday = SQL_QUERY_ESC("SELECT DISTINCT d.userid FROM "._MYSQL_PREFIX."_user_data AS d
 LEFT JOIN "._MYSQL_PREFIX."_user_holidays AS h
@@ -476,44 +441,38 @@ ON d.userid=h.userid
 WHERE d.userid=%s AND d.receive_mails > 0 AND d.status='CONFIRMED' AND d.holiday_active='Y'
 AND h.holiday_start < UNIX_TIMESTAMP() AND h.holiday_end > UNIX_TIMESTAMP()
 LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
-                                               if (SQL_NUMROWS($result_holiday) == 1)
-                                               {
+                                               if (SQL_NUMROWS($result_holiday) == 1) {
                                                        // Holiday is active!
                                                        $HOL_ACTIVE = true;
-                                               }
+                                               } // END - if
 
                                                // Free memory
                                                SQL_FREERESULT($result_holiday);
-                                       }
+                                       } // END - if
 
-                                       if (!$HOL_ACTIVE)
-                                       {
+                                       if (!$HOL_ACTIVE) {
                                                // Check if the user want's to receive mails?
                                                $result_ver = SQL_QUERY_ESC("SELECT zip FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s".$HTML." AND receive_mails > 0 AND status='CONFIRMED' LIMIT 1",
                                                 array(bigintval($ucat)), __FILE__, __LINE__);
 
-                                               if ((SQL_NUMROWS($result_ver) == 1) && (!empty($_POST['zip'])) && ($_CONFIG['order_multi_page'] == "Y"))
-                                               {
+                                               if ((SQL_NUMROWS($result_ver) == 1) && (!empty($_POST['zip'])) && ($_CONFIG['order_multi_page'] == "Y")) {
                                                        list($zip) = SQL_FETCHROW($result_ver);
                                                        SQL_FREERESULT($result_ver);
-                                                       if (substr($zip, 0, strlen($_POST['zip'])) == $_POST['zip'])
-                                                       {
+                                                       if (substr($zip, 0, strlen($_POST['zip'])) == $_POST['zip']) {
                                                                // Ok, ZIP part is found
                                                                $uid_cnt++;
-                                                       }
-                                               }
-                                                else
-                                               {
+                                                       } // END - if
+                                               } else {
                                                        // Count numbers up!
                                                        $uid_cnt += SQL_NUMROWS($result_ver);
                                                }
-                                       }
-                               }
+                                       } // END - if
+                               } // END - while
 
                                // Free memory
                                SQL_FREERESULT($result_uids);
                                $CATS['uids'][] = $uid_cnt;
-                       }
+                       } // END - while
 
                        // Free memory
                        SQL_FREERESULT($result_cats);
@@ -522,8 +481,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                        $result = SQL_QUERY("SELECT id, price, payment, mail_title FROM "._MYSQL_PREFIX."_payments ORDER BY payment", __FILE__, __LINE__);
 
                        $typeS = array();
-                       if (SQL_NUMROWS($result) > 0)
-                       {
+                       if (SQL_NUMROWS($result) > 0) {
                                // Check for message ID in URL
                                $MSG = "";
                                switch ($_GET['msg'])
@@ -567,8 +525,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                        break;
 
                                case CODE_BLIST_URL:
-                                       $MSG = MEMBER_URL_BLACK_LISTED."<br />
-".MEMBER_BLIST_TIME.": ".MAKE_DATETIME($_GET['blist'], "0");
+                                       $MSG = MEMBER_URL_BLACK_LISTED."<br />\n".MEMBER_BLIST_TIME.": ".MAKE_DATETIME($_GET['blist'], "0");
                                        break;
 
                                case CODE_NO_RECS_LEFT:
@@ -651,8 +608,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                $result = SQL_QUERY_ESC("SELECT subject, text, payment_id, timestamp, url, target_send, cat_id, zip FROM "._MYSQL_PREFIX."_pool WHERE sender=%s AND data_type='TEMP' LIMIT 1",
                                 array($GLOBALS['userid']), __FILE__, __LINE__);
 
-                               if (SQL_NUMROWS($result) == 1)
-                               {
+                               if (SQL_NUMROWS($result) == 1) {
                                        // Old order found
                                        list($subject, $text, $payment, $tstamp, $url, $target, $cat, $zip) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
@@ -662,37 +618,32 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 
                                        // Old order is grabbed
                                        $OLD_ORDER = true;
-                               }
-                                else
-                               {
+                               } else {
                                        // Default output for that your members don't forget it...
                                        $url = "http://";
                                }
 
-                               // 01      2                       21    12                             2    23         443    3          3210
-                               if ((!empty($_POST['data'])) || (($_CONFIG['order_multi_page'] == "N") && ((!IS_ADMIN()) && (!$HTML_EXT))))
-                               {
+                               // 01      2              21    12                                   2    23         443    3          3210
+                               if ((!empty($_POST['data'])) || (($_CONFIG['order_multi_page'] == "N") && ((!IS_ADMIN()) && (!$HTML_EXT)))) {
                                        // Pre-output categories
                                        $CAT = "";
-                                       foreach ($CATS['id'] as $key => $value)
-                                       {
+                                       foreach ($CATS['id'] as $key => $value) {
                                                $CAT .= "      <OPTION value=\"".$value."\"";
                                                if (($OLD_ORDER) && ($cat == $value)) $CAT .= " selected=\"selected\"";
                                                $CAT .= ">".$CATS['name'][$key]." (".$CATS['uids'][$key]." ".USER_IN_CAT.")</OPTION>\n";
-                                       }
+                                       } // END - foreach
+
                                        // Mail type
                                        $type = "";
-                                       foreach ($typeS as $key => $value)
-                                       {
+                                       foreach ($typeS as $key => $value) {
                                                $P = TRANSLATE_COMMA($typeS[$key][1]);
-                                               if (is_array($value))
-                                               {
+                                               if (is_array($value)) {
                                                        // Output option line
                                                        $type .= "      <OPTION value=\"".$typeS[$key][0]."\"";
                                                        if (($OLD_ORDER) && ($payment == $typeS[$key][0])) $type .= " selected=\"selected\"";
                                                        $type .= ">".$P." ".PER_MAIL." - ".$typeS[$key][3]." - ".round($typeS[$key][2])." ".PAYMENT."</OPTION>\n";
-                                               }
-                                       }
+                                               } // END - if
+                                       } // END - foreach
 
                                        // Put all in constants for the template
                                        define('CATEGORY_SELECTION', $CAT);
@@ -702,57 +653,45 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                        define('TEXT', COMPILE_CODE($text));
                                        define('T_URL', $url);
 
-                                       if (!empty($_POST['zip']))
-                                       {
+                                       if (!empty($_POST['zip'])) {
                                                // Output entered ZIP code
                                                define('ZIP_OUTPUT', LOAD_TEMPLATE("member_order-zip2", true, $_POST['zip']));
-                                       }
-                                        else
-                                       {
+                                       } else {
                                                define('ZIP_OUTPUT', "<TR><TD colspan=\"5\" height=\"5\" class=\"seperator\">&nbsp;</TD></TR>");
                                        }
+
                                        // HTML extension
-                                       if (($HTML_EXT) && ($_POST['html'] == "Y"))
-                                       {
+                                       if (($HTML_EXT) && ($_POST['html'] == "Y")) {
                                                // Extension is active so output valid HTML tags
                                                define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE("member_order-html_ext", true, HTML_ADD_VALID_TAGS()));
-                                       }
-                                        else
-                                       {
+                                       } else {
                                                // Extension not active and/or class not uploaded
                                                define('MEMBER_HTML_EXTENSION', "<TR><TD colspan=\"5\"><INPUT type=\"hidden\" name=\"html\" value=\"N\"></TD></TR>");
                                        }
 
                                        // Output form for page 2
                                        LOAD_TEMPLATE("member_order_page2");
-                               }
-                                else
-                               {
+                               } else {
                                        // Remember maybe entered ZIP code in constant
                                        $ADD = "";
-                                       if ($HTML_EXT)
-                                       {
+                                       if ($HTML_EXT) {
                                                // Add some content when html extension is active
                                                if (($_CONFIG['order_multi_page'] == "Y") || (IS_ADMIN())) $ADD = "<TR><TD colspan=\"2\" class=\"seperator bottom2\" height=\"5\">&nbsp;</TD></TR>\n";
                                                define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE("member_order-html_intro", true));
-                                       }
-                                        else
-                                       {
+                                       } else {
                                                // No HTML extension installed
                                                define('MEMBER_HTML_EXTENSION', "<TR><TD colspan=\"2\"><INPUT type=\"hidden\" name=\"html\" value=\"N\"></TD></TR>");
                                        }
+
                                        // Do we want ZIP code or not?
-                                       if (($_CONFIG['order_multi_page'] == "Y") || (IS_ADMIN()))
-                                       {
+                                       if (($_CONFIG['order_multi_page'] == "Y") || (IS_ADMIN())) {
                                                // Yes
                                                $content = array(
                                                        'zip' => $_POST['zip'],
                                                        'add' => $ADD
                                                );
                                                define('MEMBER_ZIP_CONTENT', LOAD_TEMPLATE("member_order-zip1", true, $content));
-                                       }
-                                        else
-                                       {
+                                       } else {
                                                // No
                                                define('MEMBER_ZIP_CONTENT', "");
                                        }
@@ -760,41 +699,30 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                        // Output form for page 1 (ZIP code or HTML)
                                        LOAD_TEMPLATE("member_order_page1");
                                }
-                       }
-                        else
-                       {
+                       } else {
                                // No mail types defined
                                OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_PAYMENTS."</SPAN></STRONG>");
                        }
-               }
-                else
-               {
+               } else {
                        // No points left!
                        OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_POINTS."</SPAN></STRONG>");
                }
-       }
-        else
-       {
+       } else {
                // No cateogries are defined yet
                OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_CATS."</SPAN></STRONG>");
        }
-}
- elseif ($mmails == "0")
-{
+} elseif ($mmails == "0") {
        // Please set more than 0 mails per day!
        LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_HAS_ZERO_MMAILS);
-}
- else
-{
+} else {
        // Please confirm some mails first!
        LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_LINKS_LEFT_1.$links.MEMBER_LINKS_LEFT_2.$_CONFIG['unconfirmed'].MEMBER_LINKS_LEFT_3);
 }
 
-if (!empty($URL))
-{
+if (!empty($URL)) {
        // Redirect to requested URL
        LOAD_URL($URL);
-}
+} // END - if
 
 //
 ?>