More EL used, this has fixed double calls of translateComma() in various places

[mailer.git] / inc / modules / member / what-surfbar_list.php

diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php
index ca2b65af24307a8bba0ca53d94ff8f748ba1cae1..0f1c81eaa67a8f9e46d58c9474e147c17a343a5a 100644 (file)
--- a/inc/modules/member/what-surfbar_list.php
+++ b/inc/modules/member/what-surfbar_list.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 09/17/2008 *
- * ================                             Last change: 09/17/2008 *
+ * ===================                          Last change: 09/17/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-surfbar_list.php                            *
@@ -14,10 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * 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 *
@@ -52,54 +51,44 @@ if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
 } // END - if
 
 // Load user URLs
-$URLs = SURFBAR_GET_USER_URLS();
+$urlArray = SURFBAR_GET_USER_URLS();
 
 // Are there entries or form is submitted?
-if ((isFormSent()) && (isPostRequestElementSet(('action'))) && (isPostRequestElementSet('id'))) {
+if ((isFormSent()) && (isPostRequestParameterSet('action')) && (isPostRequestParameterSet('id'))) {
        // Process the form
-       if (SURFBAR_MEMBER_DO_FORM(postRequestArray(), $URLs)) {
+       if (SURFBAR_MEMBER_DO_FORM(postRequestArray(), $urlArray)) {
                // Action performed but shall we display it?
-               if (((postRequestElement('action') != 'edit') && (postRequestElement('action') != "delete")) || (isPostRequestElementSet(('execute')))) {
+               if (((postRequestParameter('action') != 'edit') && (postRequestParameter('action') != 'delete')) || (isPostRequestParameterSet('execute'))) {
                        // Display "action done" message if action is wether 'edit' nor 'delete' or has been executed
-                       loadTemplate('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_ACTION_DONE'));
+                       loadTemplate('admin_settings_saved', false, '{--MEMBER_SURFBAR_ACTION_DONE--}');
                } // END - if
        } else {
                // Something went wrong
-               loadTemplate('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_ACTION_FAILED'));
+               loadTemplate('admin_settings_saved', false, '{--MEMBER_SURFBAR_ACTION_FAILED--}');
        }
-} elseif (count($URLs) > 0) {
+} elseif (count($urlArray) > 0) {
        // List all URLs
-       $OUT = ''; $SW = 2;
-       foreach ($URLs as $id => $content) {
+       $OUT = '';
+       foreach ($urlArray as $id => $content) {
                // "Translate"/insert data
-               $content['sw'] = $SW;
-               $content['url'] = generateDerefererUrl($content['url']);
                if ($content['views_total'] > 0) {
                        // Include link to stats
-                       $content['views_total'] = "[<a href=\"{?URL?}/modules.php?module=login&amp;what=surfbar_list\">".translateComma($content['views_total'])."</a>]";
-               } // END - if
-               $content['registered']  = generateDateTime($content['registered'], 2);
-               $content['last_locked'] = generateDateTime($content['last_locked'], 2);
-               $content['actions']     = SURFBAR_MEMBER_ACTIONS($content['id'], $content['status']);
-               $content['status']      = translateSurfbarUrlStatus($content['status']);
-               if (empty($content['lock_reason'])) {
-                       // Fixes some HTML problems with empty cells
-                       $content['lock_reason'] = '---';
+                       $content['views_total'] = '[<a href="{%url=modules.php?module=login&amp;what=surfbar_list%}">{%pipe,translateComma=' . $content['views_total'] . '%}</a>]';
                } // END - if
+               $content['url_registered']  = generateDateTime($content['url_registered'], 2);
+               $content['url_last_locked'] = generateDateTime($content['url_last_locked'], 2);
+               $content['actions']         = SURFBAR_MEMBER_ACTIONS($content['id'], $content['url_status']);
 
                // Load row template
                $OUT .= loadTemplate('member_surfbar_list_row', true, $content);
-
-               // Switch color
-               $SW = 3 - $SW;
        } // END - if
 
        // Load main template
        loadTemplate('member_surfbar_list', false, $OUT);
 } else {
        // No URLs booked so far
-       loadTemplate('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_NO_URLS_FOUND'));
+       loadTemplate('admin_settings_saved', false, '{--MEMBER_SURFBAR_NO_URLS_FOUND--}');
 }
 
-//
+// [EOF]
 ?>