Conflict solved, more templates added, TODOs.txt updated:

[mailer.git] / inc / modules / admin / what-list_surfbar_urls.php

diff --git a/inc/modules/admin/what-list_surfbar_urls.php b/inc/modules/admin/what-list_surfbar_urls.php
index 076a5c306588907ded20e1b9f8db32f466b81d0c..be0ad38097180370ba0ffd5be833e8f09e476d3b 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_urls.php
+++ b/inc/modules/admin/what-list_surfbar_urls.php
@@ -140,9 +140,9 @@ if ($show === false) return false;
 
 // List all URLs
 $result = SQL_QUERY("SELECT
 
 // List all URLs
 $result = SQL_QUERY("SELECT

-       `id`, `userid`, `url`, `views_total`, `status`,
-       UNIX_TIMESTAMP(`registered`) AS registered,
-       UNIX_TIMESTAMP(`last_locked`) AS last_locked,
+       `id`, `userid`, `url`, `views_total`, `status` AS `url_status`,
+       UNIX_TIMESTAMP(`registered`) AS url_registered,
+       UNIX_TIMESTAMP(`last_locked`) AS url_last_locked,

        `lock_reason`
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_urls`
        `lock_reason`
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_urls`


@@ -155,13 +155,13 @@ if (SQL_NUMROWS($result) > 0) {
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
                // "Translate"/add content
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
                // "Translate"/add content

-               $content['sw']          = $SW;
-               $content['userid']      = generateUserProfileLink($content['userid']);
-               $content['url']         = generateFrametesterUrl($content['url']);
-               $content['views_total'] = translateComma($content['views_total']);
-               $content['status']      = translateSurfbarUrlStatus($content['status']);
-               $content['registered']  = generateDateTime($content['registered'], 2);
-               $content['last_locked'] = generateDateTime($content['last_locked'], 2);
+               $content['sw']              = $SW;
+               $content['userid']          = generateUserProfileLink($content['userid']);
+               $content['url']             = generateFrametesterUrl($content['url']);
+               $content['views_total']     = translateComma($content['views_total']);
+               $content['url_status']      = translateSurfbarUrlStatus($content['url_status']);
+               $content['url_registered']  = generateDateTime($content['url_registered'], 2);
+               $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2);

                if (empty($content['lock_reason'])) $content['lock_reason'] = '---';
 
                // Load row template
                if (empty($content['lock_reason'])) $content['lock_reason'] = '---';
 
                // Load row template