Fix for 'Problem with number found. ret=0, num='

[mailer.git] / inc / modules / member / what-order.php

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index a950b0993d6cc2efe11e1f082a8f6dab1d99960d..9a6e74c712be87f998a5e4d66b63182a0b7e5dda 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -198,7 +198,13 @@ LIMIT 1",
                                // Remove any HTML code
                                setPostRequestParameter('text', str_replace('<', '{OPEN_HTML}', str_replace('>', '{CLOSE_HTML}', postRequestParameter('text'))));
                        }
-               }
+               } // END - if
+
+               // Is mail type set?
+               if ((!isPostRequestParameterSet('mail_type')) || (postRequestParameter('mail_type') < 1)) {
+                       // Not correctly set
+                       $URL = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('NO_MAIL_TYPE');
+               } // END - if
        } elseif (!isAdmin()) {
                // He has already sent a mail within a specific time
                $URL = 'modules.php?module=login&amp;what=order&amp;code=' . getCode('URL_TLOCK') . '&amp;id=' . $id;
@@ -223,7 +229,11 @@ LEFT JOIN
 ON
        c.userid=d.userid
 WHERE
-       c.cat_id=%s AND c.userid != '%s' AND d.`status`='CONFIRMED' AND d.receive_mails > 0".$add."
+       c.cat_id=%s AND
+       c.userid != '%s' AND
+       d.`status`='CONFIRMED' AND
+       d.receive_mails > 0
+       ".$add."
 ORDER BY
        d.%s %s",
                        array(
@@ -278,7 +288,7 @@ LIMIT 1",
                        if ($content['target_send'] > postRequestParameter('receiver')) $content['target_send'] = bigintval(postRequestParameter('receiver'));
 
                        // Calculate used points
-                       $USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestParameter('type')));
+                       $USED = $content['target_send'] * getPaymentPoints(bigintval(postRequestParameter('mail_type')));
 
                        // Fix empty zip code
                        if (!isPostRequestParameterSet('zip')) setPostRequestParameter('zip', 0);
@@ -292,33 +302,33 @@ LIMIT 1",
                                        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')",
+VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')",
                                                        array(
                                                                getMemberId(),
                                                                postRequestParameter('subject'),
                                                                postRequestParameter('text'),
                                                                $receiver,
-                                                               bigintval(postRequestParameter('type')),
+                                                               bigintval(postRequestParameter('mail_type')),
                                                                postRequestParameter('url'),
                                                                bigintval(postRequestParameter('cat')),
                                                                $content['target_send'],
-                                                               bigintval(postRequestParameter('zip')),
+                                                               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')",
+VALUES (%s,'%s','%s','%s','%s','TEMP',UNIX_TIMESTAMP(),'%s',%s,%s,%s)",
                                                        array(
                                                                getMemberId(),
                                                                postRequestParameter('subject'),
                                                                postRequestParameter('text'),
                                                                $receiver,
-                                                               bigintval(postRequestParameter('type')),
+                                                               bigintval(postRequestParameter('mail_type')),
                                                                postRequestParameter('url'),
                                                                bigintval(postRequestParameter('cat')),
                                                                $content['target_send'],
-                                                               bigintval(postRequestParameter('zip')),
+                                                               bigintval(postRequestParameter('zip'), true false),
                                                        ), __FILE__, __LINE__);
                                        }
                                } else {
@@ -345,7 +355,7 @@ LIMIT 1",
                                                                postRequestParameter('subject'),
                                                                postRequestParameter('text'),
                                                                $receiver,
-                                                               bigintval(postRequestParameter('type')),
+                                                               bigintval(postRequestParameter('mail_type')),
                                                                postRequestParameter('url'),
                                                                bigintval(postRequestParameter('cat')),
                                                                $content['target_send'],
@@ -374,7 +384,7 @@ LIMIT 1",
                                                                postRequestParameter('subject'),
                                                                postRequestParameter('text'),
                                                                $receiver,
-                                                               bigintval(postRequestParameter('type')),
+                                                               bigintval(postRequestParameter('mail_type')),
                                                                postRequestParameter('url'),
                                                                bigintval(postRequestParameter('cat')),
                                                                $content['target_send'],
@@ -391,7 +401,7 @@ LIMIT 1",
                                                array(
                                                        getMemberId(),
                                                        postRequestParameter('subject'),
-                                                       bigintval(postRequestParameter('type'))
+                                                       bigintval(postRequestParameter('mail_type'))
                                                ), __FILE__, __LINE__);
 
                                        // Get pool id
@@ -443,7 +453,7 @@ ORDER BY
                        // @TODO Rewrite this to a filter
                        $HTML = ''; $HOL_STRING = '';
                        if ((isExtensionActive('html_mail')) && (postRequestParameter('html') == 'Y')) $HTML = " AND `html`='Y'";
-                       if (getExtensionVersion('holiday') >= '0.1.3') {
+                       if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                                // Extension's version is fine
                                $HOL_STRING = " AND `holiday_active`='N'";
                        } // END - if