Renamed function, used more "pool functions":

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

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index b4c4982b90bb043ccaddc2e0118595bf18879052..4eee54dc4f965cebd97578528c943fdb6395e285 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -728,8 +728,8 @@ function insertSurfbarUrlByArray ($urlData) {
                ), __FUNCTION__, __LINE__
        );
 
-       // Return insert id
-       return SQL_INSERTID();
+       // Return secured insert id
+       return SQL_INSERT_ID();
 }
 
 // Notify admin(s) with a selected message and content
@@ -953,18 +953,18 @@ function isSurfbarReloadFull () {
 
        // Ask the database
        $result = SQL_QUERY_ESC("SELECT
-       COUNT(l.`locks_id`) AS `cnt`
+       COUNT(`l`.`locks_id`) AS `cnt`
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_locks` AS `l`
 INNER JOIN
        `{?_MYSQL_PREFIX?}_surfbar_urls` AS `u`
 ON
-       `u`.`url_id`=l.`locks_url_id`
+       `u`.`url_id`=`l`.`locks_url_id`
 WHERE
-       l.`locks_userid`=%s AND
-       (UNIX_TIMESTAMP() - {%%pipe,getSurfbarSurfLock%%}) < UNIX_TIMESTAMP(l.`locks_last_surfed`) AND
+       `l`.`locks_userid`=%s AND
+       (UNIX_TIMESTAMP() - {%%pipe,getSurfbarSurfLock%%}) < UNIX_TIMESTAMP(`l`.`locks_last_surfed`) AND
        (
-               ((UNIX_TIMESTAMP(l.`locks_last_surfed`) - `u`.`url_fixed_reload`) < 0 AND `u`.`url_fixed_reload` > 0) OR
+               ((UNIX_TIMESTAMP(`l`.`locks_last_surfed`) - `u`.`url_fixed_reload`) < 0 AND `u`.`url_fixed_reload` > 0) OR
                `u`.`url_fixed_reload` = 0
        )
 LIMIT 1",
@@ -1616,7 +1616,7 @@ ON
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_surfbar_locks` AS `l`
 ON
-       `sbu`.`url_id`=l.`locks_url_id`
+       `sbu`.`url_id`=`l`.`locks_url_id`
 WHERE
        `sbu`.`url_userid` NOT IN (" . implode(',', $userids) . ") AND
        (`sbu`.`url_views_allowed`=0 OR (`sbu`.`url_views_allowed` > 0 AND `sbu`.`url_views_max` > 0)) AND
@@ -1771,7 +1771,7 @@ function determineSurfbarNextId ($urlId = NULL) {
        `sbu`.`url_views_total`,
        `sbu`.`url_views_max`,
        `sbu`.`url_views_allowed`,
-       UNIX_TIMESTAMP(l.`locks_last_surfed`) AS `last_surfed`,
+       UNIX_TIMESTAMP(`l`.`locks_last_surfed`) AS `last_surfed`,
        `sbu`.`url_fixed_reload`
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_urls` AS `sbu`
@@ -1782,7 +1782,7 @@ ON
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_surfbar_locks` AS `l`
 ON
-       `sbu`.`url_id`=l.`locks_url_id`
+       `sbu`.`url_id`=`l`.`locks_url_id`
 WHERE
        (`sbu`.`url_userid` NOT IN (" . implode(',', $userids['url_userid']) . ") OR `sbu`.`url_userid` IS NULL) AND
        `sbu`.`url_status`='ACTIVE' AND
@@ -1791,7 +1791,7 @@ WHERE
 GROUP BY
        `sbu`.`url_id`
 ORDER BY
-       l.`locks_last_surfed` ASC,
+       `l`.`locks_last_surfed` ASC,
        `sbu`.`url_id` ASC
 LIMIT %s,1",
                        array($randNum), __FUNCTION__, __LINE__
@@ -1807,7 +1807,7 @@ LIMIT %s,1",
        `sbu`.`url_views_total`,
        `sbu`.`url_views_max`,
        `sbu`.`url_views_allowed`,
-       UNIX_TIMESTAMP(l.`locks_last_surfed`) AS `last_surfed`,
+       UNIX_TIMESTAMP(`l`.`locks_last_surfed`) AS `last_surfed`,
        `sbu`.`url_fixed_reload`
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_urls` AS `sbu`
@@ -1818,7 +1818,7 @@ ON
 LEFT JOIN
        `{?_MYSQL_PREFIX?}_surfbar_locks` AS `l`
 ON
-       `sbu`.`url_id`=l.`locks_url_id`
+       `sbu`.`url_id`=`l`.`locks_url_id`
 WHERE
        (`sbu`.`url_userid` != %s OR `sbu`.`url_userid` IS NULL) AND
        `sbu`.`url_status`='ACTIVE' AND