Next wave of lesser getMessage() usage and more EL

[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 8ba7890dd83a744a21e5bd3304d1ad39b7ddacf0..c2908405e1a1ca5cd872eb707250fc01ffd26b56 100644 (file)
--- a/inc/modules/admin/what-list_surfbar_actions.php
+++ b/inc/modules/admin/what-list_surfbar_actions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/12/2008 *
- * ================                             Last change: 10/12/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 10/12/2008 *
+ * ===================                          Last change: 10/12/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_surfbar_actions.php                    *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -46,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) {
@@ -59,16 +63,15 @@ if (SQL_NUMROWS($result) > 0) {
        $OUT = ''; $SW = 2;
        while ($content = SQL_FETCHARRAY($result)) {
                // "Translate" some data
-               $content['status']     = constant(sprintf("SURFBAR_URL_STATUS_%s", $content['status']));
-               $content['action']     = constant(sprintf("MEMBER_SURFBAR_ACTION_%s_SUBMIT", $content['action']));
+               $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'] = constant(sprintf("SURFBAR_URL_STATUS_%s", $content['new_status']));
+                       $content['actions_new_status'] = translateSurfbarUrlStatus($content['actions_new_status']);
                } else {
                        // "Do nothing" status
-                       $content['new_status'] = SURFBAR_URL_STATUS_NONE;
+                       $content['actions_new_status'] = '{--SURFBAR_URL_STATUS_NONE--}';
                }
 
                // Add color
@@ -85,7 +88,7 @@ if (SQL_NUMROWS($result) > 0) {
        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