]> git.mxchange.org Git - mailer.git/blobdiff - inc/modules/order.php
Fixes for parser errors
[mailer.git] / inc / modules / order.php
index a5222540c6cb9101d0aa6e19480e02544699e0ee..289e50cd2f505d9226888df3dde829ee9635d7c0 100644 (file)
@@ -65,29 +65,11 @@ if (empty($url)) {
                $type = 'NEW';
        } // END - if
 
-       // Update sending pool
-       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='%s' WHERE `id`=%s AND `sender`=%s AND `data_type`='TEMP' LIMIT 1",
-               array(
-                       $type,
-                       bigintval(getRequestElement('order')),
-                       getMemberId()
-               ), __FILE__, __LINE__);
-
-       // Finally is the entry valid?
-       if (!SQL_HASZEROAFFECTED()) {
-               // @TODO Unused: 2,4
-               // Load mail again...              0         1          2             3            4         5       6            7
-               $result = SQL_QUERY_ESC("SELECT `subject`, `text`, `receivers`, `payment_id`, `timestamp`, `url`, `cat_id`, `target_send` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s AND `sender`=%s LIMIT 1",
-                       array(
-                               bigintval(getRequestElement('order')),
-                               getMemberId()
-                       ), __FILE__, __LINE__);
-
-               // Merge arrays
-               $content = merge_array($content, SQL_FETCHARRAY($result));
-
-               // Free result
-               SQL_FREERESULT($result);
+       // Update pool data and check if the entry is valid
+       if (!updatePoolDataById(getRequestElement('order'), 'data_type', $type, NULL, sprintf(" AND `sender`=%s AND `data_type`='TEMP'", getMemberId()))) {
+               // Merge array with pool data
+               // @TODO Unused: timestamp
+               $content = merge_array($content, getPoolDataFromId(getRequestElement('order')));
 
                // Fix empty subject line
                if (empty($content['subject'])) {