Complete refacture for previously discovered inconsistency

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

diff --git a/inc/modules/admin/what-list_surfbar_actions.php b/inc/modules/admin/what-list_surfbar_actions.php
index 4a358ca1c0211c3c5e89a36a9ae7618b62a3efe1..4d36b16d4e65d6b8c40d479c5ce75b7e3f4eaf70 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_actions.php
+++ b/inc/modules/admin/what-list_surfbar_actions.php
@@ -47,12 +47,15 @@ addMenuDescription('admin', __FILE__);
 
 // Load all actions
 $result = SQL_QUERY("SELECT
-       `id`, `status`, `action`, `new_status`
+       `actions_id`,
+       `actions_status`,
+       `actions_action`,
+       `actions_new_status`
 FROM
        `{?_MYSQL_PREFIX?}_surfbar_actions`
 ORDER BY
-       `status` ASC,
-       `action` ASC", __FILE__, __LINE__);
+       `actions_status` ASC,
+       `actions_action` ASC", __FILE__, __LINE__);
 
 // Entries found?
 if (SQL_NUMROWS($result) > 0) {
@@ -60,16 +63,16 @@ if (SQL_NUMROWS($result) > 0) {
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
                // "Translate" some data
-               $content['status']     = translateSurfbarUrlStatus($content['status']);
-               $content['action']     = getMessage(sprintf("MEMBER_SURFBAR_ACTION_%s_SUBMIT", $content['action']));
+               $content['actions_status'] = translateSurfbarUrlStatus($content['actions_status']);
+               $content['actions_action'] = getMessage(sprintf("MEMBER_SURFBAR_ACTION_%s_SUBMIT", $content['actions_action']));
 
                // New status set?
-               if (!is_null($content['new_status'])) {
+               if (!is_null($content['actions_new_status'])) {
                        // Translate it
-                       $content['new_status'] = translateSurfbarUrlStatus($content['new_status']);
+                       $content['actions_new_status'] = translateSurfbarUrlStatus($content['actions_new_status']);
                } else {
                        // "Do nothing" status
-                       $content['new_status'] = getMessage('SURFBAR_URL_STATUS_NONE');
+                       $content['actions_new_status'] = getMessage('SURFBAR_URL_STATUS_NONE');
                }
 
                // Add color