More rewrites, and output-mode fixed (we should documentate this)

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

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index a46474ab9827c806401f298b20853445081086a6..120cb25103d7fe9b9596cfedf4de117ce0547deb 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -56,7 +56,7 @@ function SURFBAR_ADMIN_ADD_URL ($url, $limit, $reload) {
                // URL invalid
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s : Invalid URL.", $url, $limit, $reload));
                return false;
-       } elseif (SURFBAR_LOOKUP_BY_URL($url, '0')) {
+       } elseif (SURFBAR_LOOKUP_BY_URL($url, 0)) {
                // URL already found in surfbar!
                logDebugMessage(__FUNCTION__, __LINE__, sprintf("Cannot add URL=%s,limit=%s,reload=%s : Already added.", $url, $limit, $reload));
                return false;
@@ -75,7 +75,7 @@ function SURFBAR_ADMIN_ADD_URL ($url, $limit, $reload) {
        }
 
        // Register the new URL
-       return SURFBAR_REGISTER_URL($url, '0', 'ACTIVE', 'unlock', array('limit' => $limit, 'reload' => $reload));
+       return SURFBAR_REGISTER_URL($url, 0, 'ACTIVE', 'unlock', array('limit' => $limit, 'reload' => $reload));
 }
 
 // Admin unlocked an email so we can migrate the URL
@@ -363,11 +363,11 @@ function SURFBAR_MEMBER_RESUBMIT_ACTION ($urlData) {
 // Display selected "action form"
 function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) {
        // Translate some data
-       $urlData['registered']    = generateDateTime($urlData['registered'], '2');
+       $urlData['registered']    = generateDateTime($urlData['registered'], 2);
        $urlData['views_total']   = translateComma($urlData['views_total']);
        $urlData['views_max']     = translateComma($urlData['views_max']);
        $urlData['views_allowed'] = translateComma($urlData['views_allowed']);
-       $urlData['last_locked']   = generateDateTime($urlData['last_locked'], '2');
+       $urlData['last_locked']   = generateDateTime($urlData['last_locked'], 2);
 
        // Is the lock reason empty?
        if (empty($urlData['lock_reason'])) {
@@ -477,7 +477,7 @@ function SURFBAR_HANDLE_SELF_MAINTENANCE () {
 // Handle URLs which limit has depleted
 function SURFBAR_HANDLE_DEPLETED_VIEWS () {
        // Get all URLs
-       $urlArray = SURFBAR_GET_URL_DATA('0', 'views_max', 'id', 'ASC', 'id', " AND views_allowed>0 AND `status`='ACTIVE'");
+       $urlArray = SURFBAR_GET_URL_DATA(0, 'views_max', 'id', 'ASC', 'id', " AND views_allowed>0 AND `status`='ACTIVE'");
 
        // Do we have some entries?
        if (count($urlArray) > 0) {
@@ -675,8 +675,8 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) {
 
        // Translate some data if present
        if (isset($content['status']))        $content['status']        = translateSurfbarUrlStatus($content['status']);
-       if (isset($content['registered']))    $content['registered']    = generateDateTime($content['registered'], '2');
-       if (isset($content['last_locked']))   $content['last_locked']   = generateDateTime($content['last_locked'], '2');
+       if (isset($content['registered']))    $content['registered']    = generateDateTime($content['registered'], 2);
+       if (isset($content['last_locked']))   $content['last_locked']   = generateDateTime($content['last_locked'], 2);
        if (isset($content['views_total']))   $content['views_total']   = translateComma($content['views_total']);
        if (isset($content['views_allowed'])) $content['views_allowed'] = translateComma($content['views_allowed']);
        if (isset($content['views_max']))     $content['views_max']     = translateComma($content['views_max']);
@@ -708,8 +708,8 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
 
        // Translate some data if present
        if (isset($content['status']))        $content['status']        = translateSurfbarUrlStatus($content['status']);
-       if (isset($content['registered']))    $content['registered']    = generateDateTime($content['registered'], '2');
-       if (isset($content['last_locked']))   $content['last_locked']   = generateDateTime($content['last_locked'], '2');
+       if (isset($content['registered']))    $content['registered']    = generateDateTime($content['registered'], 2);
+       if (isset($content['last_locked']))   $content['last_locked']   = generateDateTime($content['last_locked'], 2);
        if (isset($content['views_total']))   $content['views_total']   = translateComma($content['views_total']);
        if (isset($content['views_allowed'])) $content['views_allowed'] = translateComma($content['views_allowed']);
        if (isset($content['views_max']))     $content['views_max']     = translateComma($content['views_max']);
@@ -1321,7 +1321,7 @@ function SURFBAR_CALCULATE_DYNAMIC_MIN_VALUE () {
        $addon += abs(log($onlineUsers / $totalUsers + 1) * $percent * $totalUsers);
 
        // Get total URLs
-       $totalUrls = SURFBAR_GET_TOTAL_URLS('ACTIVE', '0');
+       $totalUrls = SURFBAR_GET_TOTAL_URLS('ACTIVE', 0);
 
        // Get user's total URLs
        $userUrls = SURFBAR_GET_TOTAL_USER_URLS(0, 'ACTIVE');
@@ -1355,7 +1355,7 @@ function SURFBAR_CALCULATE_DYNAMIC_MAX_VALUE () {
        $addon += abs($max * $percent * $totalUsers);
 
        // Get total URLs
-       $totalUrls = SURFBAR_GET_TOTAL_URLS('ACTIVE', '0');
+       $totalUrls = SURFBAR_GET_TOTAL_URLS('ACTIVE', 0);
 
        // Calculate addon
        $addon += abs($max * $percent * $totalUrls);