]> git.mxchange.org Git - mailer.git/blobdiff - inc/modules/member/what-order.php
Ref link fixed, nickname fixed, several rewrites, TODOs.txt updated:
[mailer.git] / inc / modules / member / what-order.php
index f6e64164522cb5c99a49704eafd919bfddff1e66..bf76b4b286ed585da088d71a8f104f953e03c5e1 100644 (file)
@@ -41,9 +41,9 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL('modules.php?module=index');
+       redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('order')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'order');
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('order'));
        return;
 }
 
@@ -64,7 +64,7 @@ if (IS_ADMIN()) $whereStatement = '';
 define('__MIN_VALUE', getConfig('order_min'));
 
 // Count unconfirmed mails
-$links = GET_TOTAL_DATA(getUserId(), "user_links", "id", 'userid', true);
+$links = GET_TOTAL_DATA(getUserId(), "user_links", 'id', 'userid', true);
 
 // Does the user has more than 0 mails per day set?
 $HOLIDAY = 'userid';
@@ -76,7 +76,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=%s AND max_mails > 0 LIMIT 1",
-       array(getUserId()), __FILE__, __LINE__);
+array(getUserId()), __FILE__, __LINE__);
 
 $mmails = SQL_NUMROWS($result_mmails);
 list($DMY, $MAXI, $ORDERS, $HOLIDAY) = SQL_FETCHROW($result_mmails);
@@ -87,7 +87,7 @@ $ALLOWED = $MAXI - $ORDERS;
 if (getConfig('order_max_full') == 'MAX') $ALLOWED = $MAXI;
 
 // Now check his points amount
-$total = GET_TOTAL_DATA(getUserId(), "user_points", "points") - GET_TOTAL_DATA(getUserId(), "user_data", "used_points");;
+$total = GET_TOTAL_DATA(getUserId(), 'user_points', 'points') - GET_TOTAL_DATA(getUserId(), 'user_data', 'used_points');;
 
 if (($HOLIDAY == 'Y') && (GET_EXT_VERSION('holiday') >= '0.1.3')) {
        // Holiday is active!
@@ -96,12 +96,19 @@ 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=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
-               array(getUserId(), REQUEST_POST('url'), getConfig('url_tlock')), __FILE__, __LINE__);
-
-       $type = "TEMP"; $id = 0;
+       $result = SQL_QUERY_ESC("SELECT `id`, `data_type`
+FROM
+       `{!_MYSQL_PREFIX!}_pool`
+WHERE
+       `sender`=%s AND `url`='%s' AND `timestamp` > (UNIX_TIMESTAMP() - %s)
+LIMIT 1",
+               array(
+                       getUserId(),
+                       REQUEST_POST('url'),
+                       getConfig('url_tlock')
+               ), __FILE__, __LINE__);
+
+       $type = 'TEMP'; $id = 0;
        if (SQL_NUMROWS($result) == 1) {
                // Load id and mail type
                list($id, $type) = SQL_FETCHROW($result);
@@ -110,13 +117,13 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
        // Free result
        SQL_FREERESULT($result);
 
-       if ($type == "TEMP") {
+       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 (getConfig('test_text') == 'Y') {
                        // Test submitted text against some filters (length, URLs in text etc.)
-                       if ((strpos(strtolower(REQUEST_POST('text')), "https://") > -1) || (strpos(strtolower(REQUEST_POST('text')), "http://") > -1) || (strpos(strtolower(REQUEST_POST('text')), "www") > -1)) {
+                       if ((strpos(strtolower(REQUEST_POST('text')), "https://") > -1) || (strpos(strtolower(REQUEST_POST('text')), 'http://') > -1) || (strpos(strtolower(REQUEST_POST('text')), "www") > -1)) {
                                // URL found!
                                $URL = 'modules.php?module=login&what=order&msg=' . getCode('URL_FOUND');
                        } // END - if
@@ -134,8 +141,8 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
                // Shall I test the subject line against URLs?
                if (getConfig('test_subj') == 'Y') {
                        // Check the subject line for issues
-                       REQUEST_SET_POST('subject', str_replace("\\", "[nl]", substr(REQUEST_POST('subject'), 0, 200)));
-                       if ((strpos(strtolower(REQUEST_POST('subject')), "http://") > -1) || (strpos(strtolower(REQUEST_POST('subject')), "www") > -1)) {
+                       REQUEST_SET_POST('subject', str_replace("\\", '[nl]', substr(REQUEST_POST('subject'), 0, 200)));
+                       if ((strpos(strtolower(REQUEST_POST('subject')), 'http://') > -1) || (strpos(strtolower(REQUEST_POST('subject')), "www") > -1)) {
                                // URL in subject found
                                $URL = 'modules.php?module=login&what=order&msg=' . getCode('SUBJ_URL');
                        } // END - if
@@ -152,7 +159,7 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
                                list($blist) = SQL_FETCHROW($result);
 
                                // Create redirect-URL
-                               $URL = 'modules.php?module=login&what=order&msg=' . getCode('BLIST_URL')."&blist=".$blist;
+                               $URL = 'modules.php?module=login&what=order&msg=' . getCode('BLIST_URL') . '&blist=' . $blist;
                        } // END - if
 
                        // Free result
@@ -166,7 +173,7 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
                } // END - if
 
                // Validate URL
-               if (!VALIDATE_URL(REQUEST_POST('url'))) {
+               if (!isUrlValid(REQUEST_POST('url'))) {
                        // URL is invalid!
                        $URL = 'modules.php?module=login&what=order&msg=' . getCode('INVALID_URL');
                } // END - if
@@ -179,15 +186,15 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
                                REQUEST_SET_POST('text', HTML_CHECK_TAGS(REQUEST_POST('text')));
 
                                // Maybe invalid tags found?
-                               if (!REQUEST_ISSET_POST(('text'))) $URL = 'modules.php?module=login&what=order&msg=' . getCode('INVALID_TAGS')."&id=".$id;
+                               if (!REQUEST_ISSET_POST('text')) $URL = 'modules.php?module=login&what=order&msg=' . getCode('INVALID_TAGS')."&id=".$id;
                        } else {
                                // Remove any HTML code
-                               REQUEST_SET_POST('text', str_replace("<", "{OPEN_HTML}", str_replace(">", "{CLOSE_HTML}", REQUEST_POST('text'))));
+                               REQUEST_SET_POST('text', str_replace('<', '{OPEN_HTML}', str_replace('>', '{CLOSE_HTML}', REQUEST_POST('text'))));
                        }
                }
        } elseif (!IS_ADMIN()) {
                // He has already sent a mail within a specific time
-               $URL = 'modules.php?module=login&amp;what=order&amp;msg=' . getCode('URL_TLOCK')."&amp;id=".$id;
+               $URL = 'modules.php?module=login&amp;what=order&amp;msg=' . getCode('URL_TLOCK') . '&amp;id=' . $id;
        }
 
        // Still no error?
@@ -200,17 +207,24 @@ WHERE sender=%s AND url='%s' AND timestamp > (UNIX_TIMESTAMP() - %s) LIMIT 1",
                } // END - if
 
                // 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=%s AND c.userid != '%s' AND d.`status`='CONFIRMED' AND d.receive_mails > 0".$add."
-ORDER BY d.%s %s",
- array(
-       bigintval(REQUEST_POST('cat')),
-       getUserId(),
-       getConfig('order_select'),
-       getConfig('order_mode'),
- ), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT
+       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=%s AND c.userid != '%s' AND d.`status`='CONFIRMED' AND d.receive_mails > 0".$add."
+ORDER BY
+       d.%s %s",
+                       array(
+                               bigintval(REQUEST_POST('cat')),
+                               getUserId(),
+                               getConfig('order_select'),
+                               getConfig('order_mode'),
+                       ), __FILE__, __LINE__);
 
                // Do we enougth receivers left?
                if (SQL_NUMROWS($result) >= REQUEST_POST('receiver')) {
@@ -226,10 +240,15 @@ ORDER BY d.%s %s",
                        while ($content = SQL_FETCHARRAY($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",
- array(bigintval($content['userid'])), __FILE__, __LINE__);
-                                       if (SQL_NUMROWS($result_holiday) == 1) $content['userid'] = 0; // Exclude user who are in holiday
+                                       $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",
+                                               array(bigintval($content['userid'])), __FILE__, __LINE__);
+                                       if (SQL_NUMROWS($result_holiday) == 1) $content['userid'] = 0; // Exclude user who are in holiday
 
                                        // Free memory
                                        SQL_FREERESULT($result_holiday);
@@ -252,124 +271,132 @@ WHERE userid=%s AND holiday_start < UNIX_TIMESTAMP() AND holiday_end > UNIX_TIME
                        $MAX_SEND = count($TEST);
 
                        // Update receiver list
-                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET receive_mails=receive_mails-1 WHERE userid IN (%s) LIMIT %s",
+                       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__);
 
                        // Is calculated max receivers larger than wanted receivers then reset it
                        if ($MAX_SEND > REQUEST_POST('receiver')) $MAX_SEND = REQUEST_POST('receiver');
 
                        // Calculate used points
-                       $USED = $MAX_SEND * GET_PAY_POINTS(bigintval(REQUEST_POST('type')));
+                       $USED = $MAX_SEND * getPaymentPoints(bigintval(REQUEST_POST('type')));
 
                        // Fix empty zip code
-                       if (!REQUEST_ISSET_POST('zip')) REQUEST_SET_POST('zip', "0");
+                       if (!REQUEST_ISSET_POST('zip')) REQUEST_SET_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)) {
                                // 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 (EXT_IS_ACTIVE('html_mail')) {
                                                // HTML extension is active
-                                               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)
+                                               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')",
-array(
-       getUserId(),
-       REQUEST_POST('subject'),
-       REQUEST_POST('text'),
-       $RECEIVER,
-       bigintval(REQUEST_POST('type')),
-       $TIME,
-       REQUEST_POST('url'),
-       bigintval(REQUEST_POST('cat')),
-       $MAX_SEND,
-       bigintval(REQUEST_POST('zip')),
-       REQUEST_POST('html')
-), __FILE__, __LINE__);
+                                                       array(
+                                                               getUserId(),
+                                                               REQUEST_POST('subject'),
+                                                               REQUEST_POST('text'),
+                                                               $RECEIVER,
+                                                               bigintval(REQUEST_POST('type')),
+                                                               $TIME,
+                                                               REQUEST_POST('url'),
+                                                               bigintval(REQUEST_POST('cat')),
+                                                               $MAX_SEND,
+                                                               bigintval(REQUEST_POST('zip')),
+                                                               REQUEST_POST('html')
+                                                       ), __FILE__, __LINE__);
                                        } else {
                                                // No HTML extension is active
-                                               SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_pool` (sender, subject, text, receivers, payment_id, data_type, timestamp, url, cat_id, target_send, zip)
+                                               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')",
-array(
-       getUserId(),
-       REQUEST_POST('subject'),
-       REQUEST_POST('text'),
-       $RECEIVER,
-       bigintval(REQUEST_POST('type')),
-       $TIME,
-       REQUEST_POST('url'),
-       bigintval(REQUEST_POST('cat')),
-       $MAX_SEND,
-       bigintval(REQUEST_POST('zip')),
-), __FILE__, __LINE__);
+                                                       array(
+                                                               getUserId(),
+                                                               REQUEST_POST('subject'),
+                                                               REQUEST_POST('text'),
+                                                               $RECEIVER,
+                                                               bigintval(REQUEST_POST('type')),
+                                                               $TIME,
+                                                               REQUEST_POST('url'),
+                                                               bigintval(REQUEST_POST('cat')),
+                                                               $MAX_SEND,
+                                                               bigintval(REQUEST_POST('zip')),
+                                                       ), __FILE__, __LINE__);
                                        }
                                } else {
                                        // Change current order
                                        if (EXT_IS_ACTIVE('html_mail')) {
                                                // HTML extension is active
-                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET
-subject='%s',
-text='%s',
-receivers='%s',
-payment_id=%s,
-timestamp=UNIX_TIMESTAMP(),
-url='%s',
-cat_id=%s,
-target_send=%s,
-zip=%s,
-html_msg='%s'
-WHERE id=%s LIMIT 1",
-array(
-       REQUEST_POST('subject'),
-       REQUEST_POST('text'),
-       $RECEIVER,
-       bigintval(REQUEST_POST('type')),
-       REQUEST_POST('url'),
-       bigintval(REQUEST_POST('cat')),
-       $MAX_SEND,
-       bigintval(REQUEST_POST('zip')),
-       REQUEST_POST('html'),
-       bigintval($id)
-), __FILE__, __LINE__);
+                                               SQL_QUERY_ESC("UPDATE
+       `{!_MYSQL_PREFIX!}_pool`
+SET
+       `subject`='%s',
+       `text`='%s',
+       `receivers`='%s',
+       `payment_id`=%s,
+       `timestamp`=UNIX_TIMESTAMP(),
+       `url`='%s',
+       `cat_id`=%s,
+       `target_send`=%s,
+       `zip`=%s,
+       `html_msg`='%s'
+WHERE
+       `id`=%s
+LIMIT 1",
+                                                       array(
+                                                               REQUEST_POST('subject'),
+                                                               REQUEST_POST('text'),
+                                                               $RECEIVER,
+                                                               bigintval(REQUEST_POST('type')),
+                                                               REQUEST_POST('url'),
+                                                               bigintval(REQUEST_POST('cat')),
+                                                               $MAX_SEND,
+                                                               bigintval(REQUEST_POST('zip')),
+                                                               REQUEST_POST('html'),
+                                                               bigintval($id)
+                                                       ), __FILE__, __LINE__);
                                        } else {
                                                // No HTML extension is active
-                                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_pool` SET
-subject='%s',
-text='%s',
-receivers='%s',
-payment_id=%s,
-timestamp=UNIX_TIMESTAMP(),
-url='%s',
-cat_id=%s,
-target_send=%s,
-zip=%s
-WHERE id=%s LIMIT 1",
-array(
-       REQUEST_POST('subject'),
-       REQUEST_POST('text'),
-       $RECEIVER,
-       bigintval(REQUEST_POST('type')),
-       REQUEST_POST('url'),
-       bigintval(REQUEST_POST('cat')),
-       $MAX_SEND,
-       bigintval(REQUEST_POST('zip')),
-       bigintval($id)
-), __FILE__, __LINE__);
+                                               SQL_QUERY_ESC("UPDATE
+       `{!_MYSQL_PREFIX!}_pool`
+SET
+       `subject`='%s',
+       `text`='%s',
+       `receivers`='%s',
+       `payment_id`=%s,
+       `timestamp`=UNIX_TIMESTAMP(),
+       `url`='%s',
+       `cat_id`=%s,
+       `target_send`=%s,
+       `zip`=%s
+WHERE
+       `id`=%s
+LIMIT 1",
+                                                       array(
+                                                               REQUEST_POST('subject'),
+                                                               REQUEST_POST('text'),
+                                                               $RECEIVER,
+                                                               bigintval(REQUEST_POST('type')),
+                                                               REQUEST_POST('url'),
+                                                               bigintval(REQUEST_POST('cat')),
+                                                               $MAX_SEND,
+                                                               bigintval(REQUEST_POST('zip')),
+                                                               bigintval($id)
+                                                       ), __FILE__, __LINE__);
                                        }
                                }
 
                                // 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=%s AND subject='%s' AND payment_id=%s AND data_type='TEMP' AND timestamp=%s LIMIT 1",
-                                       array(
-                                               getUserId(),
-                                               REQUEST_POST('subject'),
-                                               bigintval(REQUEST_POST('type')),
-                                               $TIME
-                                       ), __FILE__, __LINE__);
+                                       $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(
+                                                       getUserId(),
+                                                       REQUEST_POST('subject'),
+                                                       bigintval(REQUEST_POST('type')),
+                                                       $TIME
+                                               ), __FILE__, __LINE__);
 
                                        list($id) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
@@ -397,7 +424,13 @@ array(
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_ORDER_ALLOWED_EXHAUSTED'));
 } elseif (($links < getConfig('unconfirmed')) && ($mmails == '1')) {
        // Display order form
-       $result_cats = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY `sort`", __FILE__, __LINE__);
+       $result_cats = SQL_QUERY("SELECT
+       `id`, `cat`
+FROM
+       `{!_MYSQL_PREFIX!}_cats`
+".$whereStatement."
+ORDER BY
+       `sort` ASC", __FILE__, __LINE__);
        if (SQL_NUMROWS($result_cats) > 0) {
                if ($total > 0) {
                        // Initialize array...
@@ -422,7 +455,7 @@ array(
                                $CATS['name'][] = $content['cat'];
 
                                // Select users in current category
-                               $result_uids = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s 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` ASC",
                                        array(bigintval($content['id']), getUserId()), __FILE__, __LINE__);
 
                                $uid_cnt = 0;
@@ -431,12 +464,17 @@ array(
                                        $HOL_ACTIVE = false;
                                        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
-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__);
+                                               $result_holiday = SQL_QUERY_ESC("SELECT
+       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=%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) {
                                                        // Holiday is active!
                                                        $HOL_ACTIVE = true;
@@ -448,7 +486,7 @@ 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=%s".$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) && (REQUEST_ISSET_POST('zip')) && (getConfig('order_multi_page') == 'Y')) {
@@ -474,93 +512,92 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                        SQL_FREERESULT($result_cats);
 
                        // 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__);
+                       $result = SQL_QUERY("SELECT `id`, `price`, `payment`, `mail_title` FROM `{!_MYSQL_PREFIX!}_payments` ORDER BY `payment` ASC", __FILE__, __LINE__);
 
                        $typeS = array();
                        if (SQL_NUMROWS($result) > 0) {
                                // Check for message ID in URL
                                $message = '';
-                               switch (REQUEST_GET('msg'))
-                               {
-                               case getCode('URL_TLOCK'):
-                                       $result = SQL_QUERY_ESC("SELECT timestamp FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
-                                        array(bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
+                               switch (REQUEST_GET('msg')) {
+                                       case getCode('URL_TLOCK'):
+                                               $result = SQL_QUERY_ESC("SELECT `timestamp` FROM `{!_MYSQL_PREFIX!}_pool` WHERE `id`=%s LIMIT 1",
+                                                       array(bigintval(REQUEST_GET('id'))), __FILE__, __LINE__);
 
-                                       // Load timestamp from last order
-                                       list($LORDER) = SQL_FETCHROW($result);
-                                       $LORDER = MAKE_DATETIME($LORDER, "1");
+                                               // Load timestamp from last order
+                                               list($LORDER) = SQL_FETCHROW($result);
+                                               $LORDER = generateDateTime($LORDER, '1');
 
-                                       // Free memory
-                                       SQL_FREERESULT($result);
+                                               // Free memory
+                                               SQL_FREERESULT($result);
 
-                                       // Calculate hours...
-                                       $STD = round(getConfig('url_tlock') / 60 / 60);
+                                               // Calculate hours...
+                                               $STD = round(getConfig('url_tlock') / 60 / 60);
 
-                                       // Minutes...
-                                       $MIN = round((getConfig('url_tlock') - $STD * 60 * 60) / 60);
+                                               // Minutes...
+                                               $MIN = round((getConfig('url_tlock') - $STD * 60 * 60) / 60);
 
-                                       // And seconds
-                                       $SEC = getConfig('url_tlock') - $STD * 60 * 60 - $MIN * 60;
+                                               // And seconds
+                                               $SEC = getConfig('url_tlock') - $STD * 60 * 60 - $MIN * 60;
 
-                                       // Finally contruct the message
-                                       // @TODO Rewrite this old lost code to a template
-                                       $message = "{--MEMBER_URL_TIME_LOCK--}<br />{--CONFIG_URL_TLOCK--} ".$STD."
+                                               // Finally contruct the message
+                                               // @TODO Rewrite this old lost code to a template
+                                               $message = "{--MEMBER_URL_TIME_LOCK--}<br />{--CONFIG_URL_TLOCK--} ".$STD."
                                                {--_HOURS--}, ".$MIN." {--_MINUTES--} {--_AND--} ".$SEC." {--_SECONDS--}<br />
                                                {--MEMBER_LAST_TLOCK--}: ".$LORDER;
-                                       break;
+                                               break;
 
-                               case getCode('OVERLENGTH'):
-                                       $message = getMessage('MEMBER_TEXT_OVERLENGTH');
-                                       break;
+                                       case getCode('OVERLENGTH'):
+                                               $message = getMessage('MEMBER_TEXT_OVERLENGTH');
+                                               break;
 
-                               case getCode('URL_FOUND'):
-                                       $message = getMessage('MEMBER_TEXT_CONTAINS_URL');
-                                       break;
+                                       case getCode('URL_FOUND'):
+                                               $message = getMessage('MEMBER_TEXT_CONTAINS_URL');
+                                               break;
 
-                               case getCode('SUBJ_URL'):
-                                       $message = getMessage('MEMBER_SUBJ_CONTAINS_URL');
-                                       break;
+                                       case getCode('SUBJ_URL'):
+                                               $message = getMessage('MEMBER_SUBJ_CONTAINS_URL');
+                                               break;
 
-                               case getCode('BLIST_URL'):
-                                       $message = "{--MEMBER_URL_BLACK_LISTED--}<br />\n{--MEMBER_BLIST_TIME--}: ".MAKE_DATETIME(REQUEST_GET('blist'), "0");
-                                       break;
+                                       case getCode('BLIST_URL'):
+                                               $message = "{--MEMBER_URL_BLACK_LISTED--}<br />\n{--MEMBER_BLIST_TIME--}: ".generateDateTime(REQUEST_GET('blist'), '0');
+                                               break;
 
-                               case getCode('NO_RECS_LEFT'):
-                                       $message = getMessage('MEMBER_SELECTED_MORE_RECS');
-                                       break;
+                                       case getCode('NO_RECS_LEFT'):
+                                               $message = getMessage('MEMBER_SELECTED_MORE_RECS');
+                                               break;
 
-                               case getCode('INVALID_TAGS'):
-                                       $message = getMessage('MEMBER_HTML_INVALID_TAGS');
-                                       break;
+                                       case getCode('INVALID_TAGS'):
+                                               $message = getMessage('MEMBER_HTML_INVALID_TAGS');
+                                               break;
 
-                               case getCode('MORE_POINTS'):
-                                       $message = getMessage('MEMBER_MORE_POINTS_NEEDED');
-                                       break;
+                                       case getCode('MORE_POINTS'):
+                                               $message = getMessage('MEMBER_MORE_POINTS_NEEDED');
+                                               break;
 
-                               case getCode('MORE_RECEIVERS1'):
-                                       $message = getMessage('MEMBER_ENTER_MORE_RECEIVERS');
-                                       break;
+                                       case getCode('MORE_RECEIVERS1'):
+                                               $message = getMessage('MEMBER_ENTER_MORE_RECEIVERS');
+                                               break;
 
-                               case getCode('MORE_RECEIVERS2'):
-                                       $message = getMessage('MEMBER_NO_MORE_RECEIVERS_FOUND');
-                                       break;
+                                       case getCode('MORE_RECEIVERS2'):
+                                               $message = getMessage('MEMBER_NO_MORE_RECEIVERS_FOUND');
+                                               break;
 
-                               case getCode('MORE_RECEIVERS3'):
-                                       $message = sprintf(getMessage('MEMBER_ENTER_MORE_MIN_RECEIVERS'), getConfig('order_min'));
-                                       break;
+                                       case getCode('MORE_RECEIVERS3'):
+                                               $message = sprintf(getMessage('MEMBER_ENTER_MORE_MIN_RECEIVERS'), getConfig('order_min'));
+                                               break;
 
-                               case getCode('INVALID_URL'):
-                                       $message = getMessage('MEMBER_ENTER_INVALID_URL');
-                                       break;
+                                       case getCode('INVALID_URL'):
+                                               $message = getMessage('MEMBER_ENTER_INVALID_URL');
+                                               break;
 
-                               case "": // When no error code is included in the URL we do not need to output an error message as well...
-                                       break;
+                                       case '': // When no error code is included in the URL we do not need to output an error message as well...
+                                               break;
 
-                               default:
-                                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown error code %s detected.", REQUEST_GET('msg')));
-                                       $message = sprintf(getMessage('UNKNOWN_CODE'), REQUEST_GET('msg'));
-                                       break;
-                               }
+                                       default:
+                                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown error code %s detected.", REQUEST_GET('msg')));
+                                               $message = sprintf(getMessage('UNKNOWN_CODE'), REQUEST_GET('msg'));
+                                               break;
+                               } // END - switch
 
                                if (!empty($message)) {
                                        // We got system message so we drop it out to the user
@@ -576,70 +613,74 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                SQL_FREERESULT($result);
 
                                // Output user's points
-                               $total = TRANSLATE_COMMA($total);
+                               $total = translateComma($total);
 
                                // Check how many mail orders he has placed today and how many he's allowed to send
-                               switch (getConfig('order_max_full'))
-                               {
-                               case 'MAX': // He is allowed to send as much as possible
-                                       define('ORDER_MAX_VALUE', getMessage('MEMBER_ORDER_ALLOWED_MAX'));
-                                       break;
-
-                               case 'ORDER': // He is allowed to send as much as he setup the receiving value
-                                       define('ORDER_MAX_VALUE', sprintf(getMessage('MEMBER_ORDER_ALLOWED_RECEIVE'), $ALLOWED, $MAXI));
-                                       break;
-
-                               default: // Unknown/invalid
-                                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown order_mas_full config detected.", getConfig('order_max_full')));
-                                       define('ORDER_MAX_VALUE', getMessage('MEMBER_ORDER_ALLOWED_UNKNOWN'));
-                                       break;
-                               }
+                               switch (getConfig('order_max_full')) {
+                                       case 'MAX': // He is allowed to send as much as possible
+                                               define('ORDER_MAX_VALUE', getMessage('MEMBER_ORDER_ALLOWED_MAX'));
+                                               break;
+
+                                       case 'ORDER': // He is allowed to send as much as he setup the receiving value
+                                               define('ORDER_MAX_VALUE', sprintf(getMessage('MEMBER_ORDER_ALLOWED_RECEIVE'), $ALLOWED, $MAXI));
+                                               break;
+
+                                       default: // Unknown/invalid
+                                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown order_mas_full config detected.", getConfig('order_max_full')));
+                                               define('ORDER_MAX_VALUE', getMessage('MEMBER_ORDER_ALLOWED_UNKNOWN'));
+                                               break;
+                               } // END - switch
 
                                // Load final template
-                               LOAD_TEMPLATE("member_order_points", false, $total);
+                               LOAD_TEMPLATE('member_order_points', false, $total);
 
                                // Reset variables
                                $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=%s AND data_type='TEMP' LIMIT 1",
-                                array(getUserId()), __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(getUserId()), __FILE__, __LINE__);
 
                                if (SQL_NUMROWS($result) == 1) {
                                        // Old order found
-                                       list($subject, $text, $payment, $tstamp, $url, $target, $content['cat'], $zip) = SQL_FETCHROW($result);
+                                       $content = SQL_FETCHARRAY($result);
 
                                        // Fix max receivers when it is too much
-                                       if ((isset($CATS['uids'][$content['cat']])) && ($target > $CATS['uids'][$content['cat']])) $target = $CATS['uids'][$content['cat']];
+                                       if ((isset($CATS['uids'][$content['cat_id']])) && ($content['target_send'] > $CATS['uids'][$content['cat_id']])) $content['target_send'] = $CATS['uids'][$content['cat_id']];
 
                                        // Old order is grabbed
                                        $OLD_ORDER = true;
                                } else {
                                        // Default output for that your members don't forget it...
-                                       $url = "http://";
+                                       $content['url'] = 'http://';
                                }
 
                                // Free result
                                SQL_FREERESULT($result);
 
-                               // 01      2              21    12                                    2    23         443    3          3210
-                               if ((REQUEST_ISSET_POST(('data'))) || ((getConfig('order_multi_page') != 'Y') && ((!IS_ADMIN()) && (!EXT_IS_ACTIVE('html_mail'))))) {
+                               if ((REQUEST_ISSET_POST('data')) || ((getConfig('order_multi_page') != 'Y') && ((!IS_ADMIN()) && (!EXT_IS_ACTIVE('html_mail'))))) {
                                        // Pre-output categories
                                        $CAT = '';
                                        foreach ($CATS['id'] as $key => $value) {
                                                $CAT .= "      <option value=\"".$value."\"";
-                                               if (($OLD_ORDER) && ($content['cat'] == $value)) $CAT .= ' selected="selected"';
+                                               if (($OLD_ORDER) && ($content['cat_id'] == $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) {
-                                               $P = TRANSLATE_COMMA($typeS[$key][1]);
+                                               $P = translateComma($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"';
+                                                       if (($OLD_ORDER) && ($content['payment_id'] == $typeS[$key][0])) $type .= ' selected="selected"';
                                                        $type .= ">".$P." {--PER_MAIL--} - ".$typeS[$key][3]." - ".round($typeS[$key][2])." {--PAYMENT--}</option>\n";
                                                } // END - if
                                        } // END - foreach
@@ -647,14 +688,14 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                        // Put all in constants for the template
                                        define('CATEGORY_SELECTION', $CAT);
                                        define('TYPE_SELECTION', $type);
-                                       define('TARGET', $target);
-                                       define('SUBJECT', $subject);
-                                       define('TEXT', COMPILE_CODE($text));
-                                       define('T_URL', $url);
+                                       define('TARGET', $content['target_send']);
+                                       define('SUBJECT', $content['subject']);
+                                       define('TEXT', COMPILE_CODE($content['text']));
+                                       define('T_URL', $content['url']);
 
                                        if (REQUEST_ISSET_POST('zip')) {
                                                // Output entered ZIP code
-                                               define('ZIP_OUTPUT', LOAD_TEMPLATE("member_order-zip2", true, REQUEST_POST('zip')));
+                                               define('ZIP_OUTPUT', LOAD_TEMPLATE('member_order-zip', true, REQUEST_POST('zip')));
                                        } else {
                                                define('ZIP_OUTPUT', "<tr><td colspan=\"5\" height=\"5\" class=\"seperator\">&nbsp;</td></tr>");
                                        }
@@ -662,21 +703,21 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                        // HTML extension
                                        if ((EXT_IS_ACTIVE('html_mail')) && (REQUEST_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()));
+                                               define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE('member_order-html_ext', true, HTML_ADD_VALID_TAGS()));
                                        } 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");
+                                       LOAD_TEMPLATE('member_order_page2');
                                } else {
                                        // Remember maybe entered ZIP code in constant
                                        $add = '';
                                        if (EXT_IS_ACTIVE('html_mail')) {
                                                // Add some content when html extension is active
                                                if ((getConfig('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));
+                                               define('MEMBER_HTML_EXTENSION', LOAD_TEMPLATE('member_order-html_intro', true));
                                        } else {
                                                // No HTML extension installed
                                                define('MEMBER_HTML_EXTENSION', "<tr><td colspan=\"2\"><input type=\"hidden\" name=\"html\" value=\"N\" /></td></tr>");
@@ -696,14 +737,14 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                                                                'add' => $add
                                                        );
                                                }
-                                               define('MEMBER_ZIP_CONTENT', LOAD_TEMPLATE("member_order-zip1", true, $content));
+                                               define('MEMBER_ZIP_CONTENT', LOAD_TEMPLATE('member_order-zip1', true, $content));
                                        } else {
                                                // No
                                                define('MEMBER_ZIP_CONTENT', '');
                                        }
 
                                        // Output form for page 1 (ZIP code or HTML)
-                                       LOAD_TEMPLATE("member_order_page1");
+                                       LOAD_TEMPLATE('member_order_page1');
                                }
                        } else {
                                // No mail types defined
@@ -717,7 +758,7 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
                // No cateogries are defined yet
                LOAD_TEMPLATE('admin_settings_saved', false, "<span class=\"member_failed\">{--MEMBER_NO_CATS--}</span>");
        }
-} elseif ($mmails == "0") {
+} elseif ($mmails == '0') {
        // Please set more than 0 mails per day
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_HAS_ZERO_MMAILS'));
 } else {
@@ -727,8 +768,8 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__);
 
 if (!empty($URL)) {
        // Redirect to requested URL
-       LOAD_URL($URL);
+       redirectToUrl($URL);
 } // END - if
 
-//
+// [EOF]
 ?>