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

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

diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 9b1b5be02c7aebc701859df0594ed6bdce5d5c44..8736faeafc43a1e71b9833f280b6c4a409d69d5d 100644 (file)
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -230,7 +230,7 @@ function SURFBAR_MEMBER_DO_FORM ($formData, $URLs) {
        } elseif (!isset($URLs[$formData['id']])) {
                // id not found in cache
                return false;
        } elseif (!isset($URLs[$formData['id']])) {
                // id not found in cache
                return false;

-       } elseif (!SURFBAR_VALIDATE_MEMBER_ACTION_STATUS($formData['action'], $URLs[$formData['id']]['status'])) {
+       } elseif (!SURFBAR_VALIDATE_MEMBER_ACTION_STATUS($formData['action'], $URLs[$formData['id']]['url_status'])) {

                // Action not allowed for current URL status
                return false;
        }
                // Action not allowed for current URL status
                return false;
        }


@@ -302,7 +302,7 @@ function SURFBAR_MEMBER_RETREAT_ACTION ($urlData) {
        );
 
        // Simply change the status here
        );
 
        // Simply change the status here

-       return SURFBAR_CHANGE_STATUS ($urlData['id'], $urlData['status'], $urlData['new_status'], $data);
+       return SURFBAR_CHANGE_STATUS ($urlData['id'], $urlData['url_status'], $urlData['new_status'], $data);

 }
 
 // Book an URL now (from migration)
 }
 
 // Book an URL now (from migration)


@@ -313,7 +313,7 @@ function SURFBAR_MEMBER_BOOKNOW_ACTION ($urlData) {
        );
 
        // Simply change the status here
        );
 
        // Simply change the status here

-       return SURFBAR_CHANGE_STATUS ($urlData['id'], $urlData['status'], $urlData['new_status'], $data);
+       return SURFBAR_CHANGE_STATUS ($urlData['id'], $urlData['url_status'], $urlData['new_status'], $data);

 }
 
 // Show edit form or do the changes
 }
 
 // Show edit form or do the changes


@@ -342,7 +342,7 @@ function SURFBAR_MEMBER_DELETE_ACTION ($urlData) {
 
 // Pause active banner
 function SURFBAR_MEMBER_PAUSE_ACTION ($urlData) {
 
 // Pause active banner
 function SURFBAR_MEMBER_PAUSE_ACTION ($urlData) {

-       return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData));
+       return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['url_status'], $urlData['new_status'], array($urlData['id'] => $urlData));

 }
 
 // Unpause stopped banner
 }
 
 // Unpause stopped banner


@@ -353,12 +353,12 @@ function SURFBAR_MEMBER_UNPAUSE_ACTION ($urlData) {
        $urlData['edit']['limit'] = $urlData['views_max'];
 
        // Return status change
        $urlData['edit']['limit'] = $urlData['views_max'];
 
        // Return status change

-       return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData));
+       return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['url_status'], $urlData['new_status'], array($urlData['id'] => $urlData));

 }
 
 // Resubmit locked URL
 function SURFBAR_MEMBER_RESUBMIT_ACTION ($urlData) {
 }
 
 // Resubmit locked URL
 function SURFBAR_MEMBER_RESUBMIT_ACTION ($urlData) {

-       return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData));
+       return SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['url_status'], $urlData['new_status'], array($urlData['id'] => $urlData));

 }
 
 // Display selected "action form"
 }
 
 // Display selected "action form"


@@ -424,7 +424,7 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) {
                // Execute the function
                if (call_user_func_array($functionName, array($urlData)) == true) {
                        // Update status as well
                // Execute the function
                if (call_user_func_array($functionName, array($urlData)) == true) {
                        // Update status as well

-                       $executed = SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['status'], $urlData['new_status'], array($urlData['id'] => $urlData));
+                       $executed = SURFBAR_CHANGE_STATUS($urlData['id'], $urlData['url_status'], $urlData['new_status'], array($urlData['id'] => $urlData));

                } // END - if
        } else {
                // Not found!
                } // END - if
        } else {
                // Not found!


@@ -444,7 +444,7 @@ function SURFBAR_MEMBER_EXECUTE_EDIT_ACTION ($urlData) {
                //if (($urlData['views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) {
                // Run the query
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET url='%s', views_allowed=%s, views_max=%s WHERE `id`=%s AND `status`='%s' LIMIT 1",
                //if (($urlData['views_allowed'] != $urlData['edit']['limit']) || ($url1 != $url2)) {
                // Run the query
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_surfbar_urls` SET url='%s', views_allowed=%s, views_max=%s WHERE `id`=%s AND `status`='%s' LIMIT 1",

-                       array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['status']), __FUNCTION__, __LINE__);
+                       array($urlData['url'], $urlData['edit']['limit'], $urlData['edit']['limit'], $urlData['id'], $urlData['url_status']), __FUNCTION__, __LINE__);

 
                // All fine
                $status = true;
 
                // All fine
                $status = true;


@@ -555,7 +555,7 @@ function SURFBAR_GET_URL_DATA ($searchTerm, $column = 'id', $order = 'id', $sort
        // Look up the record
        $result = SQL_QUERY_ESC("SELECT
        `id`, `userid`, `url`,
        // Look up the record
        $result = SQL_QUERY_ESC("SELECT
        `id`, `userid`, `url`,

-       `views_total`, `views_max`, `views_allowed`, `status`,
+       `views_total`, `views_max`, `views_allowed`, `status` AS `url_status`,

        UNIX_TIMESTAMP(`registered`) AS `url_registered`, UNIX_TIMESTAMP(`last_locked`) AS `url_last_locked`, `lock_reason`,
        `views_max`, `views_allowed`, `fixed_reload`
 FROM
        UNIX_TIMESTAMP(`registered`) AS `url_registered`, UNIX_TIMESTAMP(`last_locked`) AS `url_last_locked`, `lock_reason`,
        `views_max`, `views_allowed`, `fixed_reload`
 FROM


@@ -606,8 +606,8 @@ function SURFBAR_REGISTER_URL ($url, $userid, $status = 'PENDING', $addMode = 'r
        $content = merge_array($extraFields, array(
                'url'         => $url,
                'frametester' => generateFrametesterUrl($url),
        $content = merge_array($extraFields, array(
                'url'         => $url,
                'frametester' => generateFrametesterUrl($url),

-               'userid'         => $userid,
-               'status'      => $status,
+               'userid'      => $userid,
+               'url_status'  => $status,

        ));
 
        // Is limit/reload set?
        ));
 
        // Is limit/reload set?


@@ -656,7 +656,7 @@ function SURFBAR_INSERT_URL_BY_ARRAY ($urlData) {
                array(
                        $userid,
                        $urlData['url'],
                array(
                        $userid,
                        $urlData['url'],

-                       $urlData['status'],
+                       $urlData['url_status'],

                        $urlData['limit'],
                        $urlData['limit'],
                        $urlData['reload']
                        $urlData['limit'],
                        $urlData['limit'],
                        $urlData['reload']


@@ -680,11 +680,11 @@ function SURFBAR_NOTIFY_ADMIN ($messageType, $content) {
        // Is the subject line there?
        if ((substr($subject, 0, 1) == '!') && (substr($subject, -1, 1) == '!')) {
                // Set default subject if following eval() wents wrong
        // Is the subject line there?
        if ((substr($subject, 0, 1) == '!') && (substr($subject, -1, 1) == '!')) {
                // Set default subject if following eval() wents wrong

-               $subject = getMessage('ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT');
+               $subject = getMaskedMessage('ADMIN_SURFBAR_NOTIFY_DEFAULT_SUBJECT', strtoupper($messageType));

        } // END - if
 
        // Translate some data if present
        } // END - if
 
        // Translate some data if present

-       if (isset($content['status']))          $content['status']          = translateSurfbarUrlStatus($content['status']);
+       if (isset($content['url_status']))      $content['url_status']      = translateSurfbarUrlStatus($content['url_status']);

        if (isset($content['url_registered']))  $content['url_registered']  = generateDateTime($content['url_registered'], 2);
        if (isset($content['url_last_locked'])) $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2);
        if (isset($content['views_total']))     $content['views_total']     = translateComma($content['views_total']);
        if (isset($content['url_registered']))  $content['url_registered']  = generateDateTime($content['url_registered'], 2);
        if (isset($content['url_last_locked'])) $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2);
        if (isset($content['views_total']))     $content['views_total']     = translateComma($content['views_total']);


@@ -717,7 +717,7 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
        } // END - if
 
        // Translate some data if present
        } // END - if
 
        // Translate some data if present

-       if (isset($content['status']))          $content['status']          = translateSurfbarUrlStatus($content['status']);
+       if (isset($content['url_status']))      $content['url_status']      = translateSurfbarUrlStatus($content['url_status']);

        if (isset($content['url_registered']))  $content['url_registered']  = generateDateTime($content['url_registered'], 2);
        if (isset($content['url_last_locked'])) $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2);
        if (isset($content['views_total']))     $content['views_total']     = translateComma($content['views_total']);
        if (isset($content['url_registered']))  $content['url_registered']  = generateDateTime($content['url_registered'], 2);
        if (isset($content['url_last_locked'])) $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2);
        if (isset($content['views_total']))     $content['views_total']     = translateComma($content['views_total']);


@@ -1270,7 +1270,7 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array())
        } // END - if
 
        // Is the status like prevStatus is saying?
        } // END - if
 
        // Is the status like prevStatus is saying?

-       if ($data[$urlId]['status'] != $prevStatus) {
+       if ($data[$urlId]['url_status'] != $prevStatus) {

                // No, then abort here
                return false;
        } // END - if
                // No, then abort here
                return false;
        } // END - if


@@ -1297,16 +1297,16 @@ function SURFBAR_CHANGE_STATUS ($urlId, $prevStatus, $newStatus, $data=array())
        $data[$urlId]['costs']       = translateComma(getConfig('surfbar_static_costs'));
 
        // Do some dirty fixing here:
        $data[$urlId]['costs']       = translateComma(getConfig('surfbar_static_costs'));
 
        // Do some dirty fixing here:

-       if (($data[$urlId]['status'] == 'STOPPED') && ($newStatus == 'pending')) {
+       if (($data[$urlId]['url_status'] == 'STOPPED') && ($newStatus == 'pending')) {

                // Fix for template change
                $newStatus = 'continued';
        } // END - if
 
        // Send admin notification
                // Fix for template change
                $newStatus = 'continued';
        } // END - if
 
        // Send admin notification

-       SURFBAR_NOTIFY_ADMIN("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]);
+       SURFBAR_NOTIFY_ADMIN('url_' . $data[$urlId]['url_status'] . '_' . $newStatus, $data[$urlId]);

 
        // Send user notification
 
        // Send user notification

-       SURFBAR_NOTIFY_USER("url_{$data[$urlId]['status']}_{$newStatus}", $data[$urlId]);
+       SURFBAR_NOTIFY_USER('url_' . $data[$urlId]['url_status'] . '_' . $newStatus, $data[$urlId]);

 
        // All done!
        return true;
 
        // All done!
        return true;


@@ -1521,8 +1521,8 @@ function SURFBAR_GET_ARRAY_FROM_STATUS ($status) {
        $returnArray = array();
 
        // Get all assigned actions
        $returnArray = array();
 
        // Get all assigned actions

-       $result = SQL_QUERY_ESC("SELECT action FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `status`='%s' ORDER BY `id` ASC",
-       array($status), __FUNCTION__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `action` FROM `{?_MYSQL_PREFIX?}_surfbar_actions` WHERE `status`='%s' ORDER BY `id` ASC",
+               array($status), __FUNCTION__, __LINE__);

 
        // Some entries there?
        if (SQL_NUMROWS($result) > 0) {
 
        // Some entries there?
        if (SQL_NUMROWS($result) > 0) {