More HTML swapped and admin contact link rewritten. Resolves #91

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

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index d928ad7df4cda025a3a27a0d0aa90ba4df3a826f..5d7c8f9a1718018e83307b7e27b2342803f39f1a 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -184,13 +184,7 @@ function SURFBAR_MEMBER_ACTIONS ($urlId, $status) {
        // "Walk" through all actions and create forms
        foreach ($actionArray as $actionId=>$action) {
                // Add form for this action
-               $OUT .= sprintf("       <td align=\"center\" width=\"%d%%\">
-               <form action=\"{!URL!}/modules.php?module=login&amp;what=surfbar_list\" method=\"post\" style=\"padding-bottom:0px\">
-                       <input type=\"hidden\" name=\"id\" value=\"%s\" />
-                       <input type=\"hidden\" name=\"action\" value=\"%s\" />
-                       <input type=\"submit\" class=\"member_submit\" name=\"ok\" title=\"{--MEMBER_SURFBAR_ACTION_%s_TITLE--}\" value=\"{--MEMBER_SURFBAR_ACTION_%s_SUBMIT--}\" />
-               </form>
-       </td>\n",
+               $OUT .= sprintf(LOAD_TEMPLATE("member_surfbar_list_form", true),
                        $width,
                        bigintval($urlId),
                        strtolower($action),
@@ -264,7 +258,7 @@ function SURFBAR_VALIDATE_MEMBER_ACTION_STATUS ($action, $status) {
        global $SURFBAR_CACHE;
 
        // 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",
+       $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__);
 
        // Is the entry there?
@@ -653,7 +647,7 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) {
        if (defined($constantName)) {
                $subject = constant($constantName);
        } else {
-               addFatalMessage(ADMIN_SURFBAR_NOTIFY_SUBJECT_404, $constantName);
+               addFatalMessage(getMessage('ADMIN_SURFBAR_NOTIFY_SUBJECT_404'), $constantName);
        }
 
        // Translate some data if present
@@ -689,7 +683,7 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
        if (defined($constantName)) {
                $subject = constant($constantName);
        } else {
-               addFatalMessage(MEMBER_SURFBAR_NOTIFY_SUBJECT_404, $constantName);
+               addFatalMessage(getMessage('MEMBER_SURFBAR_NOTIFY_SUBJECT_404'), $constantName);
        }
 
        // Translate some data if present
@@ -1048,10 +1042,10 @@ function SURFBAR_UPDATE_INSERT_STATS_RECORD () {
        } // END - if
 
        // Update total/daily/weekly/monthly counter
-       $_CONFIG['surfbar_total_counter']++;
-       $_CONFIG['surfbar_daily_counter']++;
-       $_CONFIG['surfbar_weekly_counter']++;
-       $_CONFIG['surfbar_monthly_counter']++;
+       incrementConfigEntry('surfbar_total_counter');
+       incrementConfigEntry('surfbar_daily_counter');
+       incrementConfigEntry('surfbar_weekly_counter');
+       incrementConfigEntry('surfbar_monthly_counter');
 
        // Update config as well
        UPDATE_CONFIG(array("surfbar_total_counter", "surfbar_daily_counter", "surfbar_weekly_counter", "surfbar_monthly_counter"), array(1,1,1,1), "+");
@@ -1355,7 +1349,7 @@ function SURFBAR_GET_LOCK_IDS () {
        // Get all id from locks within the timestamp
        $result = SQL_QUERY_ESC("SELECT id, url_id, UNIX_TIMESTAMP(last_surfed) AS last
 FROM
-       {!MYSQL_PREFIX!}_surfbar_locks
+       {!_MYSQL_PREFIX!}_surfbar_locks
 WHERE
        userid=%s
 ORDER BY
@@ -1621,8 +1615,8 @@ function SURFBAR_GET_DATA ($element) {
        } else { // END - if
                print("<pre>");
                print_r($SURFBAR_CACHE);
-               debug_print_backtrace();
-               die("</pre>");
+               print("</pre>");
+               debug_report_bug();
        }
 
        // Return result