]> git.mxchange.org Git - mailer.git/blobdiff - inc/modules/member/what-order.php
More usage of EL code, no longer required checks removed:
[mailer.git] / inc / modules / member / what-order.php
index 59b1cb1ba080a6ba2fa96345f2cdf267ab34ccfc..bcaece4fecc09f2df6636ab1a4072ff16e067014 100644 (file)
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('order')) && (!isAdmin())) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('order'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}');
        return;
 } // END - if
 
@@ -59,9 +59,9 @@ if (getConfig('order_max_full') == 'MAX') $ALLOWED = getUserData('receive_mails'
 // Now check his points amount
 $total = getTotalPoints(getMemberId());
 
-if ((isExtensionInstalledAndNewer('holiday', '0.1.3')) && (getUserData('holiday_active') == 'Y')) {
+if ((isExtensionInstalledAndNewer('holiday', '0.1.3')) && (isUserDataEnabled('holiday_active'))) {
        // Holiday is active!
-       loadTemplate('admin_settings_saved', false, '{--MEMBER_HOLIDAY_ORDER_NOT_POSSIBLE--}');
+       displayMessage('{--MEMBER_HOLIDAY_ORDER_NOT_POSSIBLE--}');
 } elseif ((isPostRequestParameterSet('frametester')) && ($ALLOWED > 0) && (postRequestParameter('receiver') > 0)) {
        // Continue with the frametester, we first need to store the data temporary in the pool
        //
@@ -72,7 +72,7 @@ FROM
 WHERE
        `sender`=%s AND
        `url`='%s' AND
-       `timestamp` > (UNIX_TIMESTAMP() - {?url_tlock?})
+       (UNIX_TIMESTAMP() - `timestamp`) >= {?url_tlock?}
 LIMIT 1",
                array(
                        getMemberId(),
@@ -82,6 +82,7 @@ LIMIT 1",
        $type = 'TEMP'; $id = '0';
        if (SQL_NUMROWS($result) == 1) {
                // Load id and mail type
+               // @TODO Rewrite this to SQL_FETCHARRAY()
                list($id, $type) = SQL_FETCHROW($result);
        } // END - if
 
@@ -178,7 +179,7 @@ LIMIT 1",
        if (empty($url)) {
                // Check if category and number of receivers is okay
                $add = '';
-               if ((getConfig('order_multi_page') == 'Y') && (isPostRequestParameterSet('zip')) && (postRequestParameter('zip') != '')) {
+               if ((isOrderMultiPageEnabled()) && (isPostRequestParameterSet('zip')) && (postRequestParameter('zip') != '')) {
                        // Choose recipients by ZIP code
                        $add = sprintf(" AND d.zip LIKE '%s%%'",
                                bigintval(postRequestParameter('zip'))
@@ -219,10 +220,15 @@ ORDER BY
 FROM
        `{?_MYSQL_PREFIX?}_user_holidays`
 WHERE
-       `userid`=%s AND `holiday_start` < UNIX_TIMESTAMP() AND `holiday_end` > UNIX_TIMESTAMP()
+       `userid`=%s AND
+       `holiday_start` < UNIX_TIMESTAMP() AND
+       `holiday_end` > UNIX_TIMESTAMP()
 LIMIT 1",
                                                array($holidayContent['userid']), __FILE__, __LINE__);
-                                       if (SQL_NUMROWS($result_holiday) == 1) $holidayContent['userid'] = '0'; // Exclude user who are in holiday
+                                       if (SQL_NUMROWS($result_holiday) == 1) {
+                                               // Exclude user who are in holiday
+                                               $holidayContent['userid'] = '0';
+                                       } // END - if
 
                                        // Free memory
                                        SQL_FREERESULT($result_holiday);
@@ -248,17 +254,21 @@ LIMIT 1",
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `receive_mails`=`receive_mails`-1 WHERE `userid` IN (%s) LIMIT %s",
                                array(
                                        convertReceivers($receiver),
-                                       $content['target_send']
+                                       bigintval($content['target_send'])
                                ), __FILE__, __LINE__);
 
                        // Is calculated max receivers larger than wanted receivers then reset it
-                       if ($content['target_send'] > postRequestParameter('receiver')) $content['target_send'] = bigintval(postRequestParameter('receiver'));
+                       if ($content['target_send'] > postRequestParameter('receiver')) {
+                               $content['target_send'] = bigintval(postRequestParameter('receiver'));
+                       } // END - if
 
                        // Calculate used points
                        $USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestParameter('mail_type')));
 
                        // Fix empty zip code
-                       if (!isPostRequestParameterSet('zip')) setPostRequestParameter('zip', 0);
+                       if (!isPostRequestParameterSet('zip')) {
+                               setPostRequestParameter('zip', 0);
+                       } // END - if
 
                        // Check if he has enougth points for this order and selected more than 0 receivers
                        if (($USED > 0) && ($USED <= $total) && ($content['target_send'] > 0)) {
@@ -268,8 +278,35 @@ LIMIT 1",
                                        $id = '0';
                                        if (isExtensionActive('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`)
-VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')",
+                                               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',
+       UNIX_TIMESTAMP(),
+       '%s',
+       %s,
+       %s,
+       %s,
+       '%s'
+)",
                                                        array(
                                                                getMemberId(),
                                                                postRequestParameter('subject'),
@@ -278,14 +315,39 @@ VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')",
                                                                bigintval(postRequestParameter('mail_type')),
                                                                postRequestParameter('url'),
                                                                bigintval(postRequestParameter('cat')),
-                                                               $content['target_send'],
+                                                               bigintval($content['target_send']),
                                                                bigintval(postRequestParameter('zip'), true, false),
                                                                postRequestParameter('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`)
-VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s)",
+                                               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',
+       UNIX_TIMESTAMP(),
+       '%s',
+       %s,
+       %s,
+       %s
+)",
                                                        array(
                                                                getMemberId(),
                                                                postRequestParameter('subject'),
@@ -294,7 +356,7 @@ VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s)",
                                                                bigintval(postRequestParameter('mail_type')),
                                                                postRequestParameter('url'),
                                                                bigintval(postRequestParameter('cat')),
-                                                               $content['target_send'],
+                                                               bigintval($content['target_send']),
                                                                bigintval(postRequestParameter('zip'), true, false),
                                                        ), __FILE__, __LINE__);
                                        }
@@ -397,7 +459,7 @@ LIMIT 1",
        $url = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('MORE_RECEIVERS1');
 } elseif (($ALLOWED == '0') && (getConfig('order_max_full') == 'ORDER')) {
        // No more mail orders allowed
-       loadTemplate('admin_settings_saved', false, '{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}');
+       displayMessage('{--MEMBER_ORDER_ALLOWED_EXHAUSTED--}');
 } elseif ($links < getConfig('unconfirmed')) {
        // Show only enabled categories to the user ...
        $whereStatement = " WHERE `visible`='Y'";
@@ -425,7 +487,9 @@ ORDER BY
                        // Enable HTML checking
                        // @TODO Rewrite this to a filter
                        $HTML = ''; $HOL_STRING = '';
-                       if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) $HTML = " AND `html`='Y'";
+                       if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) {
+                               $HTML = " AND `html`='Y'";
+                       } // END - if
                        if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                                // Extension's version is fine
                                $HOL_STRING = " AND `holiday_active`='N'";
@@ -479,7 +543,7 @@ 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($userid)), __FILE__, __LINE__);
 
-                                               if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestParameterSet('zip')) && (getConfig('order_multi_page') == 'Y')) {
+                                               if ((SQL_NUMROWS($result_ver) == 1) && (isPostRequestParameterSet('zip')) && (isOrderMultiPageEnabled())) {
                                                        // Get zip code
                                                        list($zip) = SQL_FETCHROW($result_ver);
                                                        if (substr($zip, 0, strlen(postRequestParameter('zip'))) == postRequestParameter('zip')) {
@@ -514,7 +578,7 @@ LIMIT 1",
 
                                if (!empty($message)) {
                                        // We got system message so we drop it out to the user
-                                       loadTemplate('admin_settings_saved', false, $message);
+                                       displayMessage($message);
                                } // END - if
 
                                // Load all email types...
@@ -526,7 +590,7 @@ LIMIT 1",
                                SQL_FREERESULT($result);
 
                                // Output user's points
-                               $content['total'] = $total;
+                               $content['total_points'] = $total;
 
                                // Check how many mail orders he has placed today and how many he's allowed to send
                                switch (getConfig('order_max_full')) {
@@ -587,7 +651,7 @@ LIMIT 1",
                                // Free result
                                SQL_FREERESULT($result);
 
-                               if ((isPostRequestParameterSet('data')) || ((getConfig('order_multi_page') != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) {
+                               if ((isPostRequestParameterSet('data')) || ((getOrderMultiPage() != 'Y') && ((!isAdmin()) && (!isExtensionActive('html_mail'))))) {
                                        // Pre-output categories
                                        $content['category_selection'] = '';
                                        foreach ($categories['id'] as $key => $value) {
@@ -640,7 +704,7 @@ LIMIT 1",
                                        $content['zip_content'] = '';
 
                                        // Do we want ZIP code or not?
-                                       if ((getConfig('order_multi_page') == 'Y') || (isAdmin())) {
+                                       if ((isOrderMultiPageEnabled()) || (isAdmin())) {
                                                // Yes
                                                if (postRequestParameter('zip') > 0) {
                                                        $data = array(
@@ -659,19 +723,19 @@ LIMIT 1",
                                }
                        } else {
                                // No mail types defined
-                               loadTemplate('admin_settings_saved', false, '<span class="notice">{--MEMBER_NO_PAYMENTS--}</span>');
+                               displayMessage('<span class="notice">{--MEMBER_NO_PAYMENTS--}</span>');
                        }
                } else {
                        // No points left
-                       loadTemplate('admin_settings_saved', false, '<span class="notice">{--MEMBER_NO_POINTS--}</span>');
+                       displayMessage('<span class="notice">{--MEMBER_NO_POINTS--}</span>');
                }
        } else {
                // No cateogries are defined yet
-               loadTemplate('admin_settings_saved', false, '<span class="notice">{--MEMBER_NO_CATEGORIES--}</span>');
+               displayMessage('<span class="notice">{--MEMBER_NO_CATEGORIES--}</span>');
        }
 } else {
        // Please confirm some mails first
-       loadTemplate('admin_settings_saved', false, '<span class="notice">{%message,MEMBER_LINKS_LEFT=' . $links . '%}</span>', $links);
+       displayMessage('<span class="notice">{%message,MEMBER_LINKS_LEFT=' . $links . '%}</span>', $links);
 }
 
 if (!empty($url)) {