Renamed function, used more "pool functions":

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 2a36d6db07ef1d7d42b773638daffeba2e530199..28ba603cfe196063e7e2302e87b53ce23212ba87 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -907,8 +907,20 @@ function getPaymentPrice ($paymentsId) {
        return getPaymentData($paymentsId, 'price');
 }
 
+// Get payment time
+function getPaymentTime ($paymentsId) {
+       // Return result
+       return getPaymentData($paymentsId, 'time');
+}
+
+// Get payment 'payment'
+function getPaymentPayment ($paymentsId) {
+       // Return result
+       return getPaymentData($paymentsId, 'payment');
+}
+
 // "Getter" for payment data (cached)
-function getPaymentData ($paymentsId, $lookFor = 'price') {
+function getPaymentData ($paymentsId, $lookFor) {
        // Default value...
        $data[$lookFor] = NULL;
 
@@ -986,8 +998,7 @@ function removeReceiver (&$receivers, $key, $userid, $poolId, $statsId = 0, $isB
                                // Update 'mails_sent' if ext-sql_patches is updated
                                if (isExtensionInstalledAndNewer('sql_patches', '0.7.4')) {
                                        // Update the pool
-                                       SQL_QUERY_ESC('UPDATE `{?_MYSQL_PREFIX?}_pool` SET `mails_sent`=`mails_sent`+1 WHERE `id`=%s LIMIT 1',
-                                               array(bigintval($poolId)), __FUNCTION__, __LINE__);
+                                       updatePoolDataById($poolId, 'mails_sent', 1, '+');
                                } // END - if
                                $ret = 'done';
                        } else {
@@ -1880,7 +1891,7 @@ function createNewTask ($subject, $notes, $taskType, $userid = NULL, $adminId =
                ), __FUNCTION__, __LINE__, TRUE, $strip);
 
        // Return insert id which is the task id
-       return SQL_INSERTID();
+       return SQL_INSERT_ID();
 }
 
 // Updates last module / online time
@@ -2117,14 +2128,14 @@ function doGenericAddEntries ($tableName, $columns = array(), $filterFunctions =
                SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
                // Add id number
-               setPostRequestElement('id', SQL_INSERTID());
+               setPostRequestElement('id', SQL_INSERT_ID());
 
                // Prepare filter data array
                $filterData = array(
                        'mode'          => 'add',
                        'table_name'    => $tableName,
                        'content'       => postRequestArray(),
-                       'id'            => SQL_INSERTID(),
+                       'id'            => SQL_INSERT_ID(),
                        'subject'       => '',
                        // @TODO Used generic 'userid' here
                        'userid_column' => array('userid'),