Naming convention applied to language strings, new API function added:

[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..29dcdb6519d546700a73eee01bca75b953b183e3 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_actions.php
+++ b/inc/modules/admin/what-list_surfbar_actions.php
@@ -47,46 +47,42 @@ 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) {
+if (!SQL_HASZERONUMS($result)) {
        // List all entries
-       $OUT = ''; $SW = 2;
+       $OUT = '';
        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_action'] = sprintf("{--MEMBER_SURFBAR_ACTION_%s_SUBMIT--}", strtoupper($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'] = '{--SURFBAR_URL_STATUS_NONE--}';
                }
 
-               // Add color
-               $content['sw'] = $SW;
-
                // Load row template
                $OUT .= loadTemplate('admin_list_surfbar_actions_row', true, $content);
-
-               // Switch color
-               $SW = 3 - $SW;
        } // END - while
 
        // Load main template
        loadTemplate('admin_list_surfbar_actions', false, $OUT);
 } else {
        // No entries found, very bad!
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_NO_ACTIONS'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_SURFBAR_NO_ACTIONS--}');
 }
 
 // Free result