config.php partly solved, see #117

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

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 7c9f58af84b22c6dfbfbe5a8c8829127232a3856..82ae305ab19236c64445d92560b69567ddd75947 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -374,13 +374,13 @@ function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) {
        if ($action == 'edit') {
                // Default is not limited
                $urlData['limited_yes'] = '';
-               $urlData['limited_no']  = ' chkecked="checked"';
+               $urlData['limited_no']  = ' checked="checked"';
                $urlData['limited']     = 'false';
 
                // Is this URL limited?
                if ($urlData['views_max'] > 0) {
                        // Then rewrite form data
-                       $urlData['limited_yes'] = ' chkecked="checked"';
+                       $urlData['limited_yes'] = ' checked="checked"';
                        $urlData['limited_no']  = '';
                        $urlData['limited']     = 'true';
                } // END - if
@@ -664,8 +664,8 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) {
 
        // Translate some data if present
        if (isset($content['status']))        $content['status']        = surfbarTranslateUserStatus($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']);
@@ -697,8 +697,8 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
 
        // Translate some data if present
        if (isset($content['status']))        $content['status']        = surfbarTranslateUserStatus($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']);
@@ -870,7 +870,7 @@ function SURFBAR_GET_TOTAL_URLS ($status = 'ACTIVE', $excludeUserId = 0) {
        // Get amount from database
        $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt
 FROM `{!_MYSQL_PREFIX!}_surfbar_urls`
-WHERE userid NOT IN (".implode(",", $UIDs['uid']).") AND `status`='%s'",
+WHERE userid NOT IN (".implode(',', $UIDs['uid']).") AND `status`='%s'",
                array($status), __FUNCTION__, __LINE__
        );
 
@@ -1162,7 +1162,7 @@ ORDER BY u.userid ASC", __FUNCTION__, __LINE__);
        SQL_FREERESULT($result);
 
        // Debug message
-       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "UIDs::count=".count($UIDs)." (with own userid=".getUserId().")", false);
+       //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "UIDs::count=".count($UIDs)." (with own userid=".getUserId().')', false);
 
        // Return result
        return $UIDs;
@@ -1410,7 +1410,7 @@ LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_salts` AS sbs
 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."
+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", __FUNCTION__, __LINE__);
 
        // Log last query
@@ -1484,10 +1484,10 @@ function SURFBAR_RELOAD_TO_STOP_PAGE ($page="stop") {
        // Internal or external?
        if ((getConfig('surfbar_pause_mode') == 'INTERNAL') || (getConfig('surfbar_pause_url') == '')) {
                // Reload to internal page
-               redirectToUrl("surfbar.php?frame=".$page);
+               redirectToUrl('surfbar.php?frame=' . $page);
        } else {
                // Reload to external page
-               LOAD_CONFIGURED_URL('surfbar_pause_url');
+               redirectToConfiguredUrl('surfbar_pause_url');
        }
 }
 
@@ -1510,11 +1510,11 @@ function SURFBAR_DETERMINE_NEXT_ID ($urlId = 0) {
                        $add = " AND sbu.id NOT IN (";
                        foreach ($USE as $url_id => $lid) {
                                // Add URL id
-                               $add .= $url_id.",";
+                               $add .= $url_id.',';
                        } // END - foreach
 
                        // Add closing bracket
-                       $add = substr($add, 0, -1) . ")";
+                       $add = substr($add, 0, -1) . ')';
                } // END - if
 
                // Determine depleted user account
@@ -1537,7 +1537,7 @@ LEFT JOIN `{!_MYSQL_PREFIX!}_surfbar_salts` AS sbs
 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['uid']).") AND sbu.`status`='ACTIVE' AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))".$add."
+WHERE sbu.userid NOT IN (".implode(',', $UIDs['uid']).") AND sbu.`status`='ACTIVE' AND (sbu.views_allowed=0 OR (sbu.views_allowed > 0 AND sbu.views_max > 0))".$add."
 GROUP BY sbu.id
 ORDER BY l.last_surfed ASC, sbu.id ASC
 LIMIT %s,1",