Even more rewrites/fixes from EL branch (please report any broken part after you...

[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 a595660af2df42efce85d037f82fcb45bf6eae35..e3446626e33be9c2f759d72b41b3d92bd23740ac 100644 (file)
--- a/inc/modules/member/what-surfbar_list.php
+++ b/inc/modules/member/what-surfbar_list.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/17/2008 *
- * ================                             Last change: 09/17/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 09/17/2008 *
+ * ===================                          Last change: 09/17/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-surfbar_list.php                            *
@@ -17,7 +17,8 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * 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 *
@@ -38,66 +39,67 @@
 
 // Some security stuff...
 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');
-} elseif ((!EXT_IS_ACTIVE('surfbar')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'surfbar');
-       return;
+       die();
+} elseif (!isMember()) {
+       redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-ADD_DESCR('member', __FILE__);
+addMenuDescription('member', __FILE__);
+
+if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
+       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('surfbar'));
+       return;
+} // END - if
 
 // Load user URLs
-$URLs = SURFBAR_GET_USER_URLS();
+$urlArray = SURFBAR_GET_USER_URLS();
 
 // Are there entries or form is submitted?
-if ((IS_FORM_SENT()) && (REQUEST_ISSET_POST(('action'))) && (REQUEST_ISSET_POST(('id')))) {
+if ((isFormSent()) && (isPostRequestParameterSet(('action'))) && (isPostRequestParameterSet('id'))) {
        // Process the form
-       if (SURFBAR_MEMBER_DO_FORM(REQUEST_POST_ARRAY(), $URLs)) {
+       if (SURFBAR_MEMBER_DO_FORM(postRequestArray(), $urlArray)) {
                // Action performed but shall we display it?
-               if (((REQUEST_POST('action') != "edit") && (REQUEST_POST('action') != "delete")) || (REQUEST_ISSET_POST(('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
-                       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_ACTION_DONE'));
+                       loadTemplate('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_ACTION_DONE'));
                } // END - if
        } else {
                // Something went wrong
-               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_ACTION_FAILED'));
+               loadTemplate('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_ACTION_FAILED'));
        }
-} elseif (count($URLs) > 0) {
+} elseif (count($urlArray) > 0) {
        // List all URLs
        $OUT = ''; $SW = 2;
-       foreach ($URLs as $id => $content) {
+       foreach ($urlArray as $id => $content) {
                // "Translate"/insert data
                $content['sw'] = $SW;
-               $content['url'] = DEREFERER($content['url']);
+               $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\">".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['actions']     = SURFBAR_MEMBER_ACTIONS($content['id'], $content['status']);
-               $content['status']      = SURFBAR_TRANSLATE_STATUS($content['status']);
+               $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']);
+               $content['url_status']      = translateSurfbarUrlStatus($content['url_status']);
                if (empty($content['lock_reason'])) {
                        // Fixes some HTML problems with empty cells
-                       $content['lock_reason'] = "---";
+                       $content['lock_reason'] = '---';
                } // END - if
 
                // Load row template
-               $OUT .= LOAD_TEMPLATE("member_surfbar_list_row", true, $content);
+               $OUT .= loadTemplate('member_surfbar_list_row', true, $content);
 
                // Switch color
                $SW = 3 - $SW;
        } // END - if
 
        // Load main template
-       LOAD_TEMPLATE("member_surfbar_list", false, $OUT);
+       loadTemplate('member_surfbar_list', false, $OUT);
 } else {
        // No URLs booked so far
-       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_NO_URLS_FOUND'));
+       loadTemplate('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_NO_URLS_FOUND'));
 }
 
 //