Renamed all SQL-related functions to camel-case notation

[mailer.git] / inc / filter / user_filter.php

diff --git a/inc/filter/user_filter.php b/inc/filter/user_filter.php
index 75e699f4ad1972401e1458367f463bbc72da0c8c..7c731dab5801f1e7cc4fd1b82b1d159db0988ecf 100644 (file)
--- a/inc/filter/user_filter.php
+++ b/inc/filter/user_filter.php
@@ -179,7 +179,7 @@ function FILTER_GENERIC_UPDATE_USER_REFERRAL ($filterData) {
        assert(isReferralIdValid());
 
        // Update ref counter, determineReferralId() must already be called before this filter is executed
-       SQL_QUERY('UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ref_clicks`=`ref_clicks`+1 WHERE `userid`={%pipe,getReferralId%} LIMIT 1', __FUNCTION__, __LINE__);
+       sqlQuery('UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ref_clicks`=`ref_clicks`+1 WHERE `userid`={%pipe,getReferralId%} LIMIT 1', __FUNCTION__, __LINE__);
 
        // Return filter data
        return $filterData;
@@ -191,12 +191,12 @@ function FILTER_UPDATE_USER_SUBID ($filterData) {
        assert(isReferralIdValid());
 
        // Get sub id and secure it
-       $subId = SQL_ESCAPE(getRequestElement('subid'));
+       $subId = sqlEscapeString(getRequestElement('subid'));
 
        // Is the sub id available and registered with referral id?
        if (countSumTotalData(getReferralId(), 'user_subids', 'id', 'userid', TRUE, sprintf(" AND `subid`='%s'", $subId)) == 1) {
                // Sub id is assigned to referral id, so add a record
-               SQL_QUERY_ESC("INSERT INTO
+               sqlQueryEscaped("INSERT INTO
        `{?_MYSQL_PREFIX?}_subid_log`
 (
        `refid`,
@@ -212,12 +212,12 @@ function FILTER_UPDATE_USER_SUBID ($filterData) {
        '{%%pipe,detectUserAgent%%}'
 )",
                        array(
-                               // @NOTE: SQL_QUERY_ESC() already escape it, don't use $subId here
+                               // @NOTE: sqlQueryEscaped() already escape it, don't use $subId here
                                getRequestElement('subid')
                        ), __FUNCTION__, __LINE__);
 
                // Add insert id for other filters
-               $filterData['insert_id'] = SQL_INSERT_ID();
+               $filterData['insert_id'] = getSqlInsertId();
 
                // Register sub id in filter
                setSession('subid', $subId);
@@ -247,15 +247,15 @@ function FILTER_MEMBER_REFLINK_USER_SUBIDS_CONTENT ($content = '') {
        // Does the current user have sub ids?
        if (getTotalMemberSubIds() > 0) {
                // Then Load all
-               $result = SQL_QUERY_ESC('SELECT `id`, `subid` FROM `{?_MYSQL_PREFIX?}_user_subids` WHERE `userid`=%s ORDER BY `subid` ASC',
+               $result = sqlQueryEscaped('SELECT `id`, `subid` FROM `{?_MYSQL_PREFIX?}_user_subids` WHERE `userid`=%s ORDER BY `subid` ASC',
                        array(getMemberId()), __FUNCTION__, __LINE__);
 
                // There should be entries left
-               assert(!SQL_HASZERONUMS($result));
+               assert(!ifSqlHasZeroNums($result));
 
                // Load all
                $out = '';
-               while ($row = SQL_FETCHARRAY($result)) {
+               while ($row = sqlFetchArray($result)) {
                        // Load row template
                        $out .= loadTemplate('member_list_reflink_user_subids_row', TRUE, $row);
                } // END - while
@@ -264,7 +264,7 @@ function FILTER_MEMBER_REFLINK_USER_SUBIDS_CONTENT ($content = '') {
                $content .= loadTemplate('member_list_reflink_user_subids', TRUE, $out);
 
                // Free result
-               SQL_FREERESULT($result);
+               sqlFreeResult($result);
        } // END - if
 
        // Return data