New naming convention applied to many functions, see #118 for details

[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 ce6655905febda1e54f75359dc41cef0acd83b01..b2494b9b00f412ca3d7a48638a4dce62d814cb57 100644 (file)
--- a/inc/modules/member/what-surfbar_list.php
+++ b/inc/modules/member/what-surfbar_list.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL('modules.php?module=index');
+       redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('surfbar')) && (!IS_ADMIN())) {
        addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'surfbar'));
        return;
@@ -54,11 +54,11 @@ ADD_DESCR('member', __FILE__);
 $URLs = SURFBAR_GET_USER_URLS();
 
 // Are there entries or form is submitted?
-if ((IS_FORM_SENT()) && (REQUEST_ISSET_POST(('action'))) && (REQUEST_ISSET_POST(('id')))) {
+if ((IS_FORM_SENT()) && (REQUEST_ISSET_POST(('action'))) && (REQUEST_ISSET_POST('id'))) {
        // Process the form
        if (SURFBAR_MEMBER_DO_FORM(REQUEST_POST_ARRAY(), $URLs)) {
                // Action performed but shall we display it?
-               if (((REQUEST_POST('action') != "edit") && (REQUEST_POST('action') != "delete")) || (REQUEST_ISSET_POST(('execute')))) {
+               if (((REQUEST_POST('action') != 'edit') && (REQUEST_POST('action') != "delete")) || (REQUEST_ISSET_POST(('execute')))) {
                        // Display "action done" message if action is wether 'edit' nor 'delete' or has been executed
                        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_ACTION_DONE'));
                } // END - if
@@ -75,12 +75,12 @@ if ((IS_FORM_SENT()) && (REQUEST_ISSET_POST(('action'))) && (REQUEST_ISSET_POST(
                $content['url'] = DEREFERER($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\">".TRANSLATE_COMMA($content['views_total'])."</a>]";
+                       $content['views_total'] = "[<a href=\"{!URL!}/modules.php?module=login&amp;what=surfbar_list\">".translateComma($content['views_total'])."</a>]";
                } // END - if
-               $content['registered']  = MAKE_DATETIME($content['registered'], "2");
-               $content['last_locked'] = MAKE_DATETIME($content['last_locked'], "2");
+               $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']      = SURFBAR_TRANSLATE_STATUS($content['status']);
+               $content['status']      = surfbarTranslateUserStatus($content['status']);
                if (empty($content['lock_reason'])) {
                        // Fixes some HTML problems with empty cells
                        $content['lock_reason'] = '---';