Introduced new wrapper functions to make the code more readable, new extension ext...

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

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 354b33b3a44fb0aeac07ed0f7c66ab82198f9c86..e62d6835f0f7660b37a47a36306a4836e2eb3dbf 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -109,7 +109,7 @@ function SURFBAR_ADMIN_UNLOCK_URL_IDS ($IDs) {
        } elseif (!is_array($IDs)) {
                // No array
                return false;
-       } elseif (count($IDs) == '0') {
+       } elseif (count($IDs) == 0) {
                // Empty array
                return false;
        }
@@ -136,7 +136,7 @@ function SURFBAR_ADMIN_REJECT_URL_IDS ($IDs) {
        } elseif (!is_array($IDs)) {
                // No array
                return false;
-       } elseif (count($IDs) == '0') {
+       } elseif (count($IDs) == 0) {
                // Empty array
                return false;
        }
@@ -553,12 +553,25 @@ function SURFBAR_GET_URL_DATA ($searchTerm, $column = 'id', $order = 'id', $sort
        } // END - if
 
        // Look up the record
-       $result = SQL_QUERY_ESC("SELECT id, userid, url, views_total, views_max, views_allowed, status, registered, last_locked, lock_reason, views_max, views_allowed, fixed_reload
-FROM `{?_MYSQL_PREFIX?}_surfbar_urls`
-WHERE %s='%s'".$add."
-ORDER BY %s %s
+       $result = SQL_QUERY_ESC("SELECT
+       `id`, `userid`, `url`,
+       `views_total`, `views_max`, `views_allowed`, `status`,
+       UNIX_TIMESTAMP(`registered`) AS `registered`, UNIX_TIMESTAMP(`last_locked`) AS `last_locked`, `lock_reason`,
+       `views_max`, `views_allowed`, `fixed_reload`
+FROM
+       `{?_MYSQL_PREFIX?}_surfbar_urls`
+WHERE
+       `%s`='%s'".$add."
+ORDER BY
+       `%s` %s
 %s",
-       array($column, $searchTerm, $order, $sort, $limit), __FUNCTION__, __LINE__);
+               array(
+                       $column,
+                       $searchTerm,
+                       $order,
+                       $sort,
+                       $limit
+               ), __FUNCTION__, __LINE__);
 
        // Is there at least one record?
        if (SQL_NUMROWS($result) > 0) {
@@ -640,14 +653,14 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
 
        // Just run the insert query for now
        SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_surfbar_urls` (userid,url,status,views_max,views_allowed,fixed_reload) VALUES (%s,'%s','%s',%s,%s,%s)",
-       array(
-       $userid,
-       $urlData['url'],
-       $urlData['status'],
-       $urlData['limit'],
-       $urlData['limit'],
-       $urlData['reload']
-       ), __FUNCTION__, __LINE__
+               array(
+                       $userid,
+                       $urlData['url'],
+                       $urlData['status'],
+                       $urlData['limit'],
+                       $urlData['limit'],
+                       $urlData['reload']
+               ), __FUNCTION__, __LINE__
        );
 
        // Return insert id
@@ -875,7 +888,7 @@ function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = '0') {
        $userids = SURFBAR_DETERMINE_DEPLETED_USERIDS();
 
        // If we dont get any user ids back, there are no URLs
-       if (count($userids['userid']) == '0') {
+       if (count($userids['userid']) == 0) {
                // No user ids found, no URLs!
                return 0;
        } // END - if
@@ -1245,7 +1258,7 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array())
        $newStatus = strtolower($newStatus);
 
        // Get URL data for status comparison if missing
-       if ((!is_array($data)) || (count($data) == '0')) {
+       if ((!is_array($data)) || (count($data) == 0)) {
                // Fetch missing URL data
                $data = SURFBAR_GET_URL_DATA($urlId);
        } // END - if