A lot fixes to templates and missing functions added, more rewrites

[mailer.git] / inc / libs / surfbar_functions.php

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index cab4fb587d36df2bdb09be7877a42b8916cf5df0..a2c33f9a6fc0fcc626319fa7d3e0ab232573a4f5 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -243,7 +243,7 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
        } else {
                // Log invalid request
                DEBUG_LOG(__FUNCTION__, __LINE__, " action={$formData['action']},id={$formData['id']},function={$functionName}");
        } else {
                // Log invalid request
                DEBUG_LOG(__FUNCTION__, __LINE__, " action={$formData['action']},id={$formData['id']},function={$functionName}");

-               addFatalMessage("Invalid member action! action=%s,id=%s,function=%s", array($formData['action'], $formData['id'], $functionName));
+               addFatalMessage(__FUNCTION__, __LINE__, "Invalid member action! action=%s,id=%s,function=%s", array($formData['action'], $formData['id'], $functionName));

        }
 
        // Return status
        }
 
        // Return status


@@ -253,7 +253,7 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
 function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) {
        // Search for the requested action/status combination in database
        $result = SQL_QUERY_ESC("SELECT new_status FROM `{!_MYSQL_PREFIX!}_surfbar_actions` WHERE `action`='%s' AND `status`='%s' LIMIT 1",
 function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) {
        // Search for the requested action/status combination in database
        $result = SQL_QUERY_ESC("SELECT new_status FROM `{!_MYSQL_PREFIX!}_surfbar_actions` WHERE `action`='%s' AND `status`='%s' LIMIT 1",

-               array($action, $status), __FILE__, __LINE__);
+               array($action, $status), __FUNCTION__, __LINE__);

 
        // Is the entry there?
        $isValid = (SQL_NUMROWS($result) == 1);
 
        // Is the entry there?
        $isValid = (SQL_NUMROWS($result) == 1);


@@ -401,7 +401,7 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) {
                } // END - if
        } else {
                // Not found!
                } // END - if
        } else {
                // Not found!

-               addFatalMessage(MEMBER_SURFBAR_EXECUTE_ACTION_404, $functionName);
+               addFatalMessage(__FUNCTION__, __LINE__, getMessage('MEMBER_SURFBAR_EXECUTE_ACTION_404'), $functionName);

        }
 
        // Return status
        }
 
        // Return status


@@ -421,7 +421,7 @@ function SURFBAR_MEMBER_EXECUTE_EDIT_ACTION ($urlData) {
        //if (($urlData['views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) {
                // Run the query
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET url='%s', views_allowed=%s, views_max=%s WHERE id=%s AND `status`='%s' LIMIT 1",
        //if (($urlData['views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) {
                // Run the query
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET url='%s', views_allowed=%s, views_max=%s WHERE id=%s AND `status`='%s' LIMIT 1",

-                       array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['status']), __FILE__, __LINE__);
+                       array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['status']), __FUNCTION__, __LINE__);

 
                // All fine
                $status = true;
 
                // All fine
                $status = true;


@@ -492,7 +492,7 @@ function SURFBAR_HANDLE_LOW_POINTS () {
 
                        // Update last notified
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET surfbar_low_notified=NOW() WHERE userid=%s LIMIT 1",
 
                        // Update last notified
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET surfbar_low_notified=NOW() WHERE userid=%s LIMIT 1",

-                               array($uid), __FILE__, __LINE__);
+                               array($uid), __FUNCTION__, __LINE__);

                } // END - if
        } // END - foreach
 }
                } // END - if
        } // END - foreach
 }


@@ -537,7 +537,7 @@ FROM `{!_MYSQL_PREFIX!}_surfbar_urls`
 WHERE %s='%s'".$add."
 ORDER BY %s %s
 %s",
 WHERE %s='%s'".$add."
 ORDER BY %s %s
 %s",

-               array($column, $searchTerm, $order, $sort, $limit), __FILE__, __LINE__);
+               array($column, $searchTerm, $order, $sort, $limit), __FUNCTION__, __LINE__);

 
        // Is there at least one record?
        if (SQL_NUMROWS($result) > 0) {
 
        // Is there at least one record?
        if (SQL_NUMROWS($result) > 0) {


@@ -620,7 +620,7 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
                        $urlData['limit'],
                        $urlData['limit'],
                        $urlData['reload']
                        $urlData['limit'],
                        $urlData['limit'],
                        $urlData['reload']

-               ), __FILE__, __LINE__
+               ), __FUNCTION__, __LINE__

        );
 
        // Return insert id
        );
 
        // Return insert id


@@ -804,7 +804,7 @@ INNER JOIN `{!_MYSQL_PREFIX!}_surfbar_urls` AS u
 ON u.id=l.url_id
 WHERE l.userid=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(l.last_surfed) AND (((UNIX_TIMESTAMP(l.last_surfed) - u.fixed_reload) < 0 AND u.fixed_reload > 0) OR u.fixed_reload = 0)
 LIMIT 1",
 ON u.id=l.url_id
 WHERE l.userid=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(l.last_surfed) AND (((UNIX_TIMESTAMP(l.last_surfed) - u.fixed_reload) < 0 AND u.fixed_reload > 0) OR u.fixed_reload = 0)
 LIMIT 1",

-               array($GLOBALS['userid']), __FILE__, __LINE__
+               array($GLOBALS['userid']), __FUNCTION__, __LINE__

        );
 
        // Fetch row
        );
 
        // Fetch row


@@ -844,7 +844,7 @@ function SURFBAR_GET_TOTAL_URLS ($status="ACTIVE", $excludeUserId=0) {
        $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt
 FROM `{!_MYSQL_PREFIX!}_surfbar_urls`
 WHERE userid NOT IN (".implode(",", $UIDs['uid']).") AND `status`='%s'",
        $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt
 FROM `{!_MYSQL_PREFIX!}_surfbar_urls`
 WHERE userid NOT IN (".implode(",", $UIDs['uid']).") AND `status`='%s'",

-               array($status), __FILE__, __LINE__
+               array($status), __FUNCTION__, __LINE__

        );
 
        // Fetch row
        );
 
        // Fetch row


@@ -895,7 +895,7 @@ function SURFBAR_GET_TOTAL_USER_URLS ($uid=0, $status="",$exclude="") {
 FROM `{!_MYSQL_PREFIX!}_surfbar_urls`
 WHERE userid=%s".$ADD."
 LIMIT %s",
 FROM `{!_MYSQL_PREFIX!}_surfbar_urls`
 WHERE userid=%s".$ADD."
 LIMIT %s",

-               array($uid, getConfig('surfbar_max_order')), __FILE__, __LINE__
+               array($uid, getConfig('surfbar_max_order')), __FUNCTION__, __LINE__

        );
 
        // Fetch row
        );
 
        // Fetch row


@@ -966,11 +966,11 @@ function SURFBAR_LOCKDOWN_ID ($urlId) {
        ///* DEBUG: */ return;
        // Just add it to the database
        SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_locks` (userid, url_id) VALUES (%s, %s)",
        ///* DEBUG: */ return;
        // Just add it to the database
        SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_locks` (userid, url_id) VALUES (%s, %s)",

-               array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__);
+               array($GLOBALS['userid'], bigintval($urlId)), __FUNCTION__, __LINE__);

 
        // Remove the salt from database
        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_surfbar_salts` WHERE url_id=%s AND userid=%s LIMIT 1",
 
        // Remove the salt from database
        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_surfbar_salts` WHERE url_id=%s AND userid=%s LIMIT 1",

-               array(bigintval($urlId), $GLOBALS['userid']), __FILE__, __LINE__);
+               array(bigintval($urlId), $GLOBALS['userid']), __FUNCTION__, __LINE__);

 }
 // Pay points to the user and remove it from the sender if userid is given else it is a "sponsored surf"
 function SURFBAR_PAY_POINTS () {
 }
 // Pay points to the user and remove it from the sender if userid is given else it is a "sponsored surf"
 function SURFBAR_PAY_POINTS () {


@@ -1000,17 +1000,17 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
 
        // Update URL stats
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET views_total=views_total+1".$ADD." WHERE id=%s LIMIT 1",
 
        // Update URL stats
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET views_total=views_total+1".$ADD." WHERE id=%s LIMIT 1",

-               array(SURFBAR_GET_ID()), __FILE__, __LINE__);
+               array(SURFBAR_GET_ID()), __FUNCTION__, __LINE__);

 
        // Update the stats entry
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_stats` SET count=count+1 WHERE userid=%s AND url_id=%s LIMIT 1",
 
        // Update the stats entry
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_stats` SET count=count+1 WHERE userid=%s AND url_id=%s LIMIT 1",

-               array($GLOBALS['userid'], SURFBAR_GET_ID()), __FILE__, __LINE__);
+               array($GLOBALS['userid'], SURFBAR_GET_ID()), __FUNCTION__, __LINE__);

 
        // Was that update okay?
        if (SQL_AFFECTEDROWS() < 1) {
                // No, then insert entry
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_stats` (userid,url_id,count) VALUES (%s,%s,1)",
 
        // Was that update okay?
        if (SQL_AFFECTEDROWS() < 1) {
                // No, then insert entry
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_stats` (userid,url_id,count) VALUES (%s,%s,1)",

-                       array($GLOBALS['userid'], SURFBAR_GET_ID()), __FILE__, __LINE__);
+                       array($GLOBALS['userid'], SURFBAR_GET_ID()), __FUNCTION__, __LINE__);

        } // END - if
 
        // Update total/daily/weekly/monthly counter
        } // END - if
 
        // Update total/daily/weekly/monthly counter


@@ -1029,7 +1029,7 @@ function SURFBAR_UPDATE_SALT_STATS () {
 
        // Simply store the salt from cache away in database...
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_salts` SET last_salt='%s' WHERE url_id=%s AND userid=%s LIMIT 1",
 
        // Simply store the salt from cache away in database...
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_salts` SET last_salt='%s' WHERE url_id=%s AND userid=%s LIMIT 1",

-               array(SURFBAR_GET_SALT(), SURFBAR_GET_ID(), $GLOBALS['userid']), __FILE__, __LINE__);
+               array(SURFBAR_GET_SALT(), SURFBAR_GET_ID(), $GLOBALS['userid']), __FUNCTION__, __LINE__);

 
        // Debug message
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "salt=".SURFBAR_GET_SALT().",id=".SURFBAR_GET_ID().",uid=".$GLOBALS['userid']."", false);
 
        // Debug message
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "salt=".SURFBAR_GET_SALT().",id=".SURFBAR_GET_ID().",uid=".$GLOBALS['userid']."", false);


@@ -1038,7 +1038,7 @@ function SURFBAR_UPDATE_SALT_STATS () {
        if (SQL_AFFECTEDROWS() < 1) {
                // Insert missing entry!
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_salts` (url_id,userid,last_salt) VALUES (%s, %s, '%s')",
        if (SQL_AFFECTEDROWS() < 1) {
                // Insert missing entry!
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_surfbar_salts` (url_id,userid,last_salt) VALUES (%s, %s, '%s')",

-                       array(SURFBAR_GET_ID(), $GLOBALS['userid'], SURFBAR_GET_SALT()), __FILE__, __LINE__);
+                       array(SURFBAR_GET_ID(), $GLOBALS['userid'], SURFBAR_GET_SALT()), __FUNCTION__, __LINE__);

        } // END - if
 
        // Debug message
        } // END - if
 
        // Debug message


@@ -1056,7 +1056,7 @@ FROM `{!_MYSQL_PREFIX!}_surfbar_locks`
 WHERE userid=%s AND url_id=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(last_surfed)
 ORDER BY last_surfed ASC
 LIMIT 1",
 WHERE userid=%s AND url_id=%s AND (UNIX_TIMESTAMP() - ".SURFBAR_GET_SURF_LOCK().") < UNIX_TIMESTAMP(last_surfed)
 ORDER BY last_surfed ASC
 LIMIT 1",

-               array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__
+               array($GLOBALS['userid'], bigintval($urlId)), __FUNCTION__, __LINE__

        );
 
        // Fetch counter
        );
 
        // Fetch counter


@@ -1093,7 +1093,7 @@ ON u.userid=d.userid
 WHERE u.userid NOT IN (%s,0) AND u.`status`='ACTIVE'
 GROUP BY u.userid
 ORDER BY u.userid ASC",
 WHERE u.userid NOT IN (%s,0) AND u.`status`='ACTIVE'
 GROUP BY u.userid
 ORDER BY u.userid ASC",

-                       array($GLOBALS['userid']), __FILE__, __LINE__);
+                       array($GLOBALS['userid']), __FUNCTION__, __LINE__);

        } else {
                // Get all userid
                $result = SQL_QUERY("SELECT u.userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified
        } else {
                // Get all userid
                $result = SQL_QUERY("SELECT u.userid, UNIX_TIMESTAMP(d.surfbar_low_notified) AS notified


@@ -1102,7 +1102,7 @@ INNER JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
 ON u.userid=d.userid
 WHERE u.`status`='ACTIVE'
 GROUP BY u.userid
 ON u.userid=d.userid
 WHERE u.`status`='ACTIVE'
 GROUP BY u.userid

-ORDER BY u.userid ASC", __FILE__, __LINE__);
+ORDER BY u.userid ASC", __FUNCTION__, __LINE__);

        }
 
        // Load all userid
        }
 
        // Load all userid


@@ -1137,7 +1137,7 @@ function SURFBAR_DETERMINE_TOTAL_ONLINE () {
 FROM `{!_MYSQL_PREFIX!}_surfbar_stats`
 WHERE (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(last_online)) <= %s
 GROUP BY userid",
 FROM `{!_MYSQL_PREFIX!}_surfbar_stats`
 WHERE (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(last_online)) <= %s
 GROUP BY userid",

-               array(getConfig('online_timeout')), __FILE__, __LINE__);
+               array(getConfig('online_timeout')), __FUNCTION__, __LINE__);

 
        // Fetch count
        $cnt = SQL_NUMROWS($result);
 
        // Fetch count
        $cnt = SQL_NUMROWS($result);


@@ -1198,7 +1198,7 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array())
        // Update the status now
        // ---------- Comment out for debugging/developing member actions! ---------
        //SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET `status`='%s' WHERE id=%s LIMIT 1",
        // Update the status now
        // ---------- Comment out for debugging/developing member actions! ---------
        //SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_surfbar_urls` SET `status`='%s' WHERE id=%s LIMIT 1",

-       //      array($newStatus, bigintval($urlId)), __FILE__, __LINE__);
+       //      array($newStatus, bigintval($urlId)), __FUNCTION__, __LINE__);

        // ---------- Comment out for debugging/developing member actions! ---------
 
        // Was that fine?
        // ---------- Comment out for debugging/developing member actions! ---------
 
        // Was that fine?


@@ -1316,7 +1316,7 @@ WHERE
        userid=%s
 ORDER BY
        id ASC", array($GLOBALS['userid']),
        userid=%s
 ORDER BY
        id ASC", array($GLOBALS['userid']),

-               __FILE__, __LINE__);
+               __FUNCTION__, __LINE__);

 
        // Load all entries
        while (list($lid, $url, $last) = SQL_FETCHROW($result)) {
 
        // Load all entries
        while (list($lid, $url, $last) = SQL_FETCHROW($result)) {


@@ -1364,7 +1364,7 @@ ON sbu.id=sbs.url_id
 LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_locks` AS l
 ON sbu.id=l.url_id
 WHERE sbu.userid NOT IN (".implode(",", $UIDs).") AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND sbu.`status`='ACTIVE'".$ADD."
 LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_locks` AS l
 ON sbu.id=l.url_id
 WHERE sbu.userid NOT IN (".implode(",", $UIDs).") AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0)) AND sbu.`status`='ACTIVE'".$ADD."

-GROUP BY sbu.id", __FILE__, __LINE__);
+GROUP BY sbu.id", __FUNCTION__, __LINE__);

 
        // Log last query
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "lastQuery=".getConfig('db_last_query')."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS()."", false);
 
        // Log last query
        //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "lastQuery=".getConfig('db_last_query')."|numRows=".SQL_NUMROWS($result)."|Affected=".SQL_AFFECTEDROWS()."", false);


@@ -1388,7 +1388,7 @@ function SURFBAR_GET_USER_URLS () {
 FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS u
 WHERE u.userid=%s AND u.status != 'DELETED'
 ORDER BY u.id ASC",
 FROM `{!_MYSQL_PREFIX!}_surfbar_urls` AS u
 WHERE u.userid=%s AND u.status != 'DELETED'
 ORDER BY u.id ASC",

-               array($GLOBALS['userid']), __FILE__, __LINE__);
+               array($GLOBALS['userid']), __FUNCTION__, __LINE__);

 
        // Are there entries?
        if (SQL_NUMROWS($result) > 0) {
 
        // Are there entries?
        if (SQL_NUMROWS($result) > 0) {


@@ -1412,7 +1412,7 @@ function SURFBAR_GET_ACTION_ARRAY ($status) {
 
        // Get all assigned actions
        $result = SQL_QUERY_ESC("SELECT action FROM `{!_MYSQL_PREFIX!}_surfbar_actions` WHERE `status`='%s' ORDER BY `id` ASC",
 
        // Get all assigned actions
        $result = SQL_QUERY_ESC("SELECT action FROM `{!_MYSQL_PREFIX!}_surfbar_actions` WHERE `status`='%s' ORDER BY `id` ASC",

-               array($status), __FILE__, __LINE__);
+               array($status), __FUNCTION__, __LINE__);

 
        // Some entries there?
        if (SQL_NUMROWS($result) > 0) {
 
        // Some entries there?
        if (SQL_NUMROWS($result) > 0) {


@@ -1490,7 +1490,7 @@ WHERE sbu.userid NOT IN (".implode(",", $UIDs['uid']).") AND sbu.`status`='ACTIV
 GROUP BY sbu.id
 ORDER BY l.last_surfed ASC, sbu.id ASC
 LIMIT %s,1",
 GROUP BY sbu.id
 ORDER BY l.last_surfed ASC, sbu.id ASC
 LIMIT %s,1",

-                       array($randNum), __FILE__, __LINE__
+                       array($randNum), __FUNCTION__, __LINE__

                );
        } else {
                // Get data from specified id number
                );
        } else {
                // Get data from specified id number


@@ -1502,7 +1502,7 @@ LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_locks` AS l
 ON sbu.id=l.url_id
 WHERE sbu.userid != %s AND sbu.`status`='ACTIVE' AND sbu.id=%s AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))
 LIMIT 1",
 ON sbu.id=l.url_id
 WHERE sbu.userid != %s AND sbu.`status`='ACTIVE' AND sbu.id=%s AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))
 LIMIT 1",

-                       array($GLOBALS['userid'], bigintval($urlId)), __FILE__, __LINE__
+                       array($GLOBALS['userid'], bigintval($urlId)), __FUNCTION__, __LINE__

                );
        }
 
                );
        }