Security line in all includes changed
[mailer.git] / inc / modules / member / what-order.php
index 205ef6a5894be61323610fc75ecd8e9ba427f793..0577688f285f31497906f59009f8ad233552a853 100644 (file)
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-}
- elseif (!IS_LOGGED_IN())
-{
-       LOAD_URL(URL."/modules.php?module=index");
-}
- elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN()))
-{
+} elseif (!IS_MEMBER()) {
+       LOAD_URL("modules.php?module=index");
+} elseif (!EXT_IS_ACTIVE("order")) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
        return;
 }
@@ -51,27 +46,27 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 ADD_DESCR("member", basename(__FILE__));
 
 $URL = ""; $id = 0;
-$WHERE = " WHERE visible='Y'";
+$whereStatement = " WHERE visible='Y'";
 
 // Set undefined array elements
 if (empty($_GET['msg']))       $_GET['msg']       = "";
 if (empty($_POST['zip']))      $_POST['zip']      = "";
 if (empty($_POST['html']))     $_POST['html']     = "";
 if (empty($_POST['receiver'])) $_POST['receiver'] = "";
-if (is_admin()) $WHERE = "";
+if (is_admin()) $whereStatement = "";
 
 // Add slashes to every value
-foreach($_POST as $key=>$value)
+foreach($_POST as $key => $value)
 {
        // Skip submit buttons
        if (($key != "data") && ($key != "frametester")) $_POST[$key] = addslashes($value);
 }
 
 // Minimum mails / order
-define('__MIN_VALUE', $CONFIG['order_min']);
+define('__MIN_VALUE', $_CONFIG['order_min']);
 
 // Count unconfirmed mails
-$result_links = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_links WHERE userid=%d",
+$result_links = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_links WHERE userid=%s",
  array($GLOBALS['userid']), __FILE__, __LINE__);
 $links = SQL_NUMROWS($result_links);
 SQL_FREERESULT($result_links);
@@ -86,7 +81,7 @@ if (GET_EXT_VERSION("holiday") >= "0.1.3")
 
 $result_mmails = SQL_QUERY_ESC("SELECT userid, receive_mails, mail_orders, ".$HOLIDAY."
 FROM "._MYSQL_PREFIX."_user_data
-WHERE userid=%d AND max_mails > 0 LIMIT 1",
+WHERE userid=%s AND max_mails > 0 LIMIT 1",
  array($GLOBALS['userid']), __FILE__, __LINE__);
 
 $mmails = SQL_NUMROWS($result_mmails);
@@ -95,16 +90,16 @@ SQL_FREERESULT($result_mmails);
 if ($HOLIDAY == $DMY) $HOLIDAY='N';
 
 $ALLOWED = $MAXI - $ORDERS;
-if ($CONFIG['order_max'] == "MAX") $ALLOWED = $MAXI;
+if ($_CONFIG['order_max_full'] == "MAX") $ALLOWED = $MAXI;
 
 // Check HTML extension
 $HTML_EXT = EXT_IS_ACTIVE("html_mail");
 
 // Now check his points amount
-$result_p = SQL_QUERY_ESC("SELECT SUM(points) FROM "._MYSQL_PREFIX."_user_points WHERE userid=%d",
+$result_p = SQL_QUERY_ESC("SELECT SUM(points) FROM "._MYSQL_PREFIX."_user_points WHERE userid=%s",
  array($GLOBALS['userid']), __FILE__, __LINE__);
 
-$TOTAL = "0";
+$TOTAL = 0;
 if (SQL_NUMROWS($result_p) > 0)
 {
        // Load points
@@ -112,18 +107,13 @@ if (SQL_NUMROWS($result_p) > 0)
        SQL_FREERESULT($result_p);
 
        // And subtract his used points...
-       $result_p = SQL_QUERY_ESC("SELECT used_points FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
-        array($GLOBALS['userid']), __FILE__, __LINE__);
-
-       list($p) = SQL_FETCHROW($result_p);
-       SQL_FREERESULT($result_p);
-       $TOTAL -= $p;
+       $TOTAL -= GET_TOTAL_DATA($GLOBALS['userid'], "user_data", "used_points");
 
        // Add (maybe) missing three zeros
        if (!ereg(".", $TOTAL)) $TOTAL .= ".00000";
 }
 
-if (($HOLIDAY == 'Y') && (GET_EXT_VERSION("holiday") >= "0.1.3"))
+if (($HOLIDAY == "Y") && (GET_EXT_VERSION("holiday") >= "0.1.3"))
 {
        // Holiday is active!
        SQL_FREERESULT($result_p);
@@ -134,10 +124,10 @@ if (($HOLIDAY == 'Y') && (GET_EXT_VERSION("holiday") >= "0.1.3"))
        // Continue with the frametester, we first need to store the data temporary in the pool
        //
        // First we would like to store the data and get it's pool position back...
-       $result = SQL_QUERY_ESC("SELECT id, data_type FROM "._MYSQL_PREFIX."_pool WHERE sender=%d AND url='%s' AND timestamp > %d LIMIT 1",
-        array($GLOBALS['userid'], $_POST['url'], bigintval(time() - $CONFIG['url_tlock'])), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT id, data_type FROM "._MYSQL_PREFIX."_pool WHERE sender=%s AND url='%s' AND timestamp > %s LIMIT 1",
+        array($GLOBALS['userid'], $_POST['url'], bigintval(time() - $_CONFIG['url_tlock'])), __FILE__, __LINE__);
 
-       $type = "TEMP"; $id = "0";
+       $type = "TEMP"; $id = 0;
        if (SQL_NUMROWS($result) == 1)
        {
                list($id, $type) = SQL_FETCHROW($result);
@@ -148,7 +138,7 @@ if (($HOLIDAY == 'Y') && (GET_EXT_VERSION("holiday") >= "0.1.3"))
                // 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))
@@ -157,14 +147,14 @@ if (($HOLIDAY == 'Y') && (GET_EXT_VERSION("holiday") >= "0.1.3"))
                                $URL = URL."/modules.php?module=login&what=order&msg=".CODE_URL_FOUND;
                        }
                        $TEST = str_replace("\n", "", str_replace("\r", "", addslashes($_POST['text'])));
-                       if (strlen($TEST) > $CONFIG['max_tlength'])
+                       if (strlen($TEST) > $_CONFIG['max_tlength'])
                        {
                                // Text is too long!
                                $URL = URL."/modules.php?module=login&what=order&msg=".CODE_OVERLENGTH;
                        }
                }
                // 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));
@@ -175,7 +165,7 @@ if (($HOLIDAY == 'Y') && (GET_EXT_VERSION("holiday") >= "0.1.3"))
                        }
                }
                // 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",
@@ -189,7 +179,7 @@ if (($HOLIDAY == 'Y') && (GET_EXT_VERSION("holiday") >= "0.1.3"))
                                $URL = URL."/modules.php?module=login&what=order&msg=".CODE_BLIST_URL."&blist=".$blist;
                        }
                }
-               if (($_POST['receiver'] < $CONFIG['order_min']) && (!IS_ADMIN()))
+               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;
@@ -205,7 +195,7 @@ if (($HOLIDAY == 'Y') && (GET_EXT_VERSION("holiday") >= "0.1.3"))
                // Probe for HTML extension
                if ($HTML_EXT)
                {
-                       if ($_POST['html'] == 'Y')
+                       if ($_POST['html'] == "Y")
                        {
                                // Chek for valid HTML tags
                                $_POST['text'] = HTML_CHECK_TAGS($_POST['text']);
@@ -229,20 +219,20 @@ if (($HOLIDAY == 'Y') && (GET_EXT_VERSION("holiday") >= "0.1.3"))
        {
                // Check if category and number of receivers is okay
                $ADD = "";
-               if (($CONFIG['order_multi_page'] == 'Y') && (!empty($_POST['zip']))) $ADD = "AND d.zip LIKE '".bigintval($_POST['zip'])."{PER}'";
+               if (($_CONFIG['order_multi_page'] == "Y") && (!empty($_POST['zip']))) $ADD = "AND d.zip LIKE '".bigintval($_POST['zip'])."{PER}'";
 
                // Check for userids
                $result = SQL_QUERY_ESC("SELECT DISTINCT c.userid FROM "._MYSQL_PREFIX."_user_cats AS c
 LEFT JOIN "._MYSQL_PREFIX."_user_data AS d
 ON c.userid=d.userid
-WHERE c.cat_id=%d AND c.userid != '%s' AND d.status='CONFIRMED' AND d.receive_mails > 0
+WHERE c.cat_id=%s AND c.userid != '%s' AND d.status='CONFIRMED' AND d.receive_mails > 0
 ".$ADD."
 ORDER BY d.%s %s",
  array(
        bigintval($_POST['cat']),
        $GLOBALS['userid'],
-       $CONFIG['order_select'],
-       $CONFIG['order_mode'],
+       $_CONFIG['order_select'],
+       $_CONFIG['order_mode'],
  ), __FILE__, __LINE__);
 
                // Do we enougth receivers left?
@@ -264,7 +254,7 @@ ORDER BY d.%s %s",
                                {
                                        // Check for his holiday status
                                        $result_holiday = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_holidays
-WHERE userid=%d AND holiday_start < ".time()." AND holiday_end > ".time()." LIMIT 1",
+WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIMESTAMP() LIMIT 1",
  array(bigintval($REC)), __FILE__, __LINE__);
                                        if (SQL_NUMROWS($result_holiday) == 1) $REC = 0; // Exclude user who are in holiday
 
@@ -356,14 +346,14 @@ array(
 subject='%s',
 text='%s',
 receivers='%s',
-payment_id=%d,
+payment_id=%s,
 timestamp=UNIX_TIMESTAMP(),
 url='%s',
-cat_id=%d,
-target_send=%d,
-zip=%d,
+cat_id=%s,
+target_send=%s,
+zip=%s,
 html_msg='%s'
-WHERE id=%d LIMIT 1",
+WHERE id=%s LIMIT 1",
 array(
        $_POST['subject'],
        $_POST['text'],
@@ -384,13 +374,13 @@ array(
 subject='%s',
 text='%s',
 receivers='%s',
-payment_id=%d,
+payment_id=%s,
 timestamp=UNIX_TIMESTAMP(),
 url='%s',
-cat_id=%d,
-target_send=%d,
-zip=%d
-WHERE id=%d LIMIT 1",
+cat_id=%s,
+target_send=%s,
+zip=%s
+WHERE id=%s LIMIT 1",
 array(
        $_POST['subject'],
        $_POST['text'],
@@ -408,7 +398,7 @@ array(
                                // Do we need to get the ID number?
                                if ($id == 0) {
                                        // Order is placed as temporary. We need to get it's id for the frametester
-                                       $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_pool WHERE sender=%d AND subject='%s' AND payment_id=%d AND data_type='TEMP' AND timestamp=%d LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_pool WHERE sender=%s AND subject='%s' AND payment_id=%s AND data_type='TEMP' AND timestamp=%s LIMIT 1",
                                        array(
                                                $GLOBALS['userid'],
                                                $_POST['subject'],
@@ -446,15 +436,15 @@ array(
        // Not enougth receivers selected
        $URL = URL."/modules.php?module=login&amp;what=order&amp;msg=".CODE_MORE_RECEIVERS1;
 }
- elseif (($ALLOWED == 0) && ($CONFIG['order_max'] == "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".$WHERE." ORDER BY sort", __FILE__, __LINE__);
+       $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)
@@ -468,7 +458,7 @@ array(
 
                        // Enable HTML checking
                        $HTML = ""; $HOLIDAY = false; $HOL_STRING = "";
-                       if (($HTML_EXT) && ($_POST['html'] == 'Y')) $HTML = " AND html='Y'";
+                       if (($HTML_EXT) && ($_POST['html'] == "Y")) $HTML = " AND html='Y'";
                        if (GET_EXT_VERSION("holiday") >= "0.1.3")
                        {
                                // Extension's version is fine
@@ -482,10 +472,10 @@ array(
                                $CATS['name'][] = $cat;
 
                                // Select users in current category
-                               $result_uids = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_cats WHERE cat_id=%d AND userid != '%s' ORDER BY userid",
+                               $result_uids = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_cats WHERE cat_id=%s AND userid != '%s' ORDER BY userid",
                                 array(bigintval($id), $GLOBALS['userid']), __FILE__, __LINE__);
 
-                               $uid_cnt = "0";
+                               $uid_cnt = 0;
                                while (list($ucat) = SQL_FETCHROW($result_uids))
                                {
                                        // Check for holiday system
@@ -496,8 +486,8 @@ array(
                                                $result_holiday = SQL_QUERY_ESC("SELECT DISTINCT d.userid FROM "._MYSQL_PREFIX."_user_data AS d
 LEFT JOIN "._MYSQL_PREFIX."_user_holidays AS h
 ON d.userid=h.userid
-WHERE d.userid=%d AND d.receive_mails > 0 AND d.status='CONFIRMED' AND d.holiday_active='Y'
-AND h.holiday_start < ".time()." AND h.holiday_end > ".time()."
+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)
                                                {
@@ -512,10 +502,10 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                        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=%d".$HTML." AND receive_mails > 0 AND status='CONFIRMED' LIMIT 1",
+                                               $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);
@@ -544,7 +534,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                        // Now we need to load the mail types...
                        $result = SQL_QUERY("SELECT id, price, payment, mail_title FROM "._MYSQL_PREFIX."_payments ORDER BY payment", __FILE__, __LINE__);
 
-                       $TYPES = array();
+                       $typeS = array();
                        if (SQL_NUMROWS($result) > 0)
                        {
                                // Check for message ID in URL
@@ -552,7 +542,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                switch ($_GET['msg'])
                                {
                                case CODE_URL_TLOCK:
-                                       $result = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_pool WHERE id=%d LIMIT 1",
+                                       $result = SQL_QUERY_ESC("SELECT timestamp FROM "._MYSQL_PREFIX."_pool WHERE id=%s LIMIT 1",
                                         array(bigintval($_GET['id'])), __FILE__, __LINE__);
 
                                        // Load timestamp from last order
@@ -563,17 +553,17 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                        SQL_FREERESULT($result);
 
                                        // Calculate hours...
-                                       $STD = round($CONFIG['url_tlock'] / 60 / 60);
+                                       $STD = round($_CONFIG['url_tlock'] / 60 / 60);
 
                                        // Minutes...
-                                       $MIN = round(($CONFIG['url_tlock'] - $STD * 60 * 60) / 60);
+                                       $MIN = round(($_CONFIG['url_tlock'] - $STD * 60 * 60) / 60);
 
                                        // And seconds
-                                       $SEC = $CONFIG['url_tlock'] - $STD * 60 * 60 - $MIN * 60;
+                                       $SEC = $_CONFIG['url_tlock'] - $STD * 60 * 60 - $MIN * 60;
 
                                        // Finally contruct the message
-                                       $MSG = MEMBER_URL_TIME_LOCK."<BR>".CONFIG_URL_TLOCK." ".$STD." ".
-                                               HOURS.", ".$MIN." ".MINS." "._AND." ".$SEC." ".SECS."<BR>".
+                                       $MSG = MEMBER_URL_TIME_LOCK."<br />".CONFIG_URL_TLOCK." ".$STD." ".
+                                               _HOURS.", ".$MIN." "._MINUTES." "._AND." ".$SEC." "._SECONDS."<br />".
                                                MEMBER_LAST_TLOCK.": ".$LORDER;
                                        break;
 
@@ -590,7 +580,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                        break;
 
                                case CODE_BLIST_URL:
-                                       $MSG = MEMBER_URL_BLACK_LISTED."<BR>
+                                       $MSG = MEMBER_URL_BLACK_LISTED."<br />
 ".MEMBER_BLIST_TIME.": ".MAKE_DATETIME($_GET['blist'], "0");
                                        break;
 
@@ -615,7 +605,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                        break;
 
                                case CODE_MORE_RECEIVERS3:
-                                       $MSG = MEMBER_ENTER_MORE_MIN_RECEIVERS_1.$CONFIG['order_min'].MEMBER_ENTER_MORE_MIN_RECEIVERS_2;
+                                       $MSG = MEMBER_ENTER_MORE_MIN_RECEIVERS_1.$_CONFIG['order_min'].MEMBER_ENTER_MORE_MIN_RECEIVERS_2;
                                        break;
 
                                case CODE_INVALID_URL:
@@ -636,7 +626,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                }
 
                                // Load all email types...
-                               while ($TYPES[] = SQL_FETCHROW($result))
+                               while ($typeS[] = SQL_FETCHROW($result))
                                {
                                        // Nothing to do here... ;-)
                                }
@@ -648,7 +638,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                $TOTAL = TRANSLATE_COMMA($TOTAL);
 
                                // Check how many mail orders he has placed today and how many he's allowed to send
-                               switch ($CONFIG['order_max'])
+                               switch ($_CONFIG['order_max_full'])
                                {
                                case "MAX": // He is allowed to send as much as possible
                                        define('ORDER_MAX_VALUE', ORDER_ALLOED_MAX);
@@ -666,7 +656,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                $OLD_ORDER = false; $subject = ""; $text = ""; $target = "";
 
                                // Check if we already have an order placed and make it editable
-                               $result = SQL_QUERY_ESC("SELECT subject, text, payment_id, timestamp, url, target_send, cat_id, zip FROM "._MYSQL_PREFIX."_pool WHERE sender=%d AND data_type='TEMP' LIMIT 1",
+                               $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)
@@ -688,33 +678,33 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                }
 
                                // 01      2                       21    12                             2    23         443    3          3210
-                               if ((!empty($_POST['data'])) || (($CONFIG['order_multi_page'] == 'N') && ((!IS_ADMIN()) && (!$HTML_EXT))))
+                               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";
                                        }
                                        // Mail type
-                                       $TYPE = "";
-                                       foreach ($TYPES as $key=>$value)
+                                       $type = "";
+                                       foreach ($typeS as $key => $value)
                                        {
-                                               $P = TRANSLATE_COMMA($TYPES[$key][1]);
+                                               $P = TRANSLATE_COMMA($typeS[$key][1]);
                                                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";
+                                                       $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";
                                                }
                                        }
 
                                        // Put all in constants for the template
                                        define('CATEGORY_SELECTION', $CAT);
-                                       define('TYPE_SELECTION', $TYPE);
+                                       define('TYPE_SELECTION', $type);
                                        define('TARGET', $target);
                                        define('SUBJECT', $subject);
                                        define('TEXT', COMPILE_CODE($text));
@@ -730,7 +720,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                                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()));
@@ -751,7 +741,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                        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";
+                                               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
@@ -760,7 +750,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                                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(
@@ -782,19 +772,19 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                         else
                        {
                                // No mail types defined
-                               OUTPUT_HTML ("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_PAYMENTS."</SPAN></STRONG>");
+                               OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_PAYMENTS."</SPAN></STRONG>");
                        }
                }
                 else
                {
                        // No points left!
-                       OUTPUT_HTML ("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_POINTS."</SPAN></STRONG>");
+                       OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_POINTS."</SPAN></STRONG>");
                }
        }
         else
        {
                // No cateogries are defined yet
-               OUTPUT_HTML ("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_CATS."</SPAN></STRONG>");
+               OUTPUT_HTML("<STRONG><SPAN class=\"member_failed\">".MEMBER_NO_CATS."</SPAN></STRONG>");
        }
 }
  elseif ($mmails == "0")
@@ -805,7 +795,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
  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);
+       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_LINKS_LEFT_1.$links.MEMBER_LINKS_LEFT_2.$_CONFIG['unconfirmed'].MEMBER_LINKS_LEFT_3);
 }
 
 if (!empty($URL))