Surfbar continued and some rewrites/fixes:

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

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 7bef4431ce29075100aa8b753775dce5469ed24e..fa03501c1d10ae45d0c5a356946bde011d793e94 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -320,8 +320,30 @@ function SURFBAR_MEMBER_DELETE_ACTION ($urlData) {
 // Display selected "action form"
 function SURFBAR_MEMBER_DISPLAY_ACTION_FORM ($action, $urlData) {
        // Translate some data
-       $urlData['registered']  = MAKE_DATETIME($urlData['registered'], "2");
-       $urlData['views_total'] = TRANSLATE_COMMA($urlData['views_total']);
+       $urlData['registered']    = MAKE_DATETIME($urlData['registered'], "2");
+       $urlData['views_total']   = TRANSLATE_COMMA($urlData['views_total']);
+       $urlData['views_max']     = TRANSLATE_COMMA($urlData['views_max']);
+       $urlData['views_allowed'] = TRANSLATE_COMMA($urlData['views_allowed']);
+       $urlData['last_locked']   = MAKE_DATETIME($urlData['last_locked'], "2");
+
+       // Is the lock reason empty?
+       if (empty($urlData['lock_reason'])) {
+               // Fix it to three dashes
+               $urlData['lock_reason'] = "---";
+       } // END - if
+
+       // Default is not limited
+       $urlData['limited_yes'] = "";
+       $urlData['limited_no']  = " checked=\"checked\"";
+       $urlData['limited']     = "false";
+
+       // Is this URL limited?
+       if ($urlData['views_max'] > 0) {
+               // Then rewrite form data
+               $urlData['limited_yes'] = " checked=\"checked\"";
+               $urlData['limited_no']  = "";
+               $urlData['limited']     = "true";
+       } // END - if
 
        // Load the form and display it
        LOAD_TEMPLATE(sprintf("member_surfbar_%s_action_form", $action), false, $urlData);
@@ -424,7 +446,7 @@ function SURFBAR_GET_URL_DATA ($searchTerm, $column="id", $order="id", $sort="AS
        } // END - if
 
        // Look up the record
-       $result = SQL_QUERY_ESC("SELECT id, userid, url, views_total, status, registered, last_locked, lock_reason, views_max, views_allowed
+       $result = SQL_QUERY_ESC("SELECT id, userid, url, views_total, views_max, views_allowed, status, registered, last_locked, lock_reason, views_max, views_allowed
 FROM "._MYSQL_PREFIX."_surfbar_urls
 WHERE %s='%s'".$add."
 ORDER BY %s %s
@@ -502,7 +524,7 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
        if (empty($uid)) $uid = 0;
 
        // Just run the insert query for now
-       SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_urls (userid,url,status,views_max,views_allowed) VALUES (%s,'%s','%s','%s','%s')",
+       SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_surfbar_urls (userid,url,status,views_max,views_allowed) VALUES (%s,'%s','%s',%s,%s)",
                array(
                        $uid,
                        $urlData['url'],
@@ -1255,7 +1277,7 @@ function SURFBAR_GET_USER_URLS () {
        $URLs = array();
 
        // Begin the query
-       $result = SQL_QUERY_ESC("SELECT u.id, u.userid, u.url, u.views_total, u.status, UNIX_TIMESTAMP(u.registered) AS registered, UNIX_TIMESTAMP(u.last_locked) AS last_locked, u.lock_reason AS lock_reason
+       $result = SQL_QUERY_ESC("SELECT u.id, u.userid, u.url, u.views_total, u.views_max, u.views_allowed, u.status, UNIX_TIMESTAMP(u.registered) AS registered, UNIX_TIMESTAMP(u.last_locked) AS last_locked, u.lock_reason AS lock_reason
 FROM "._MYSQL_PREFIX."_surfbar_urls AS u
 WHERE u.userid=%s AND u.status != 'DELETED'
 ORDER BY u.id ASC",