X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-surfbar_list.php;h=b096222d07aeb3dcbe6f4affcebb78b5008e12da;hb=8deeddb48c055d0c2483509b7cd6a95ed6d3a87a;hp=46583ddd84ee995d7c0538119735fa0b20c94737;hpb=1e2a4228e071a67a2d79e970a843e3e30476cfb8;p=mailer.git

diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php
index 46583ddd84..b096222d07 100644
--- 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,7 @@
  * 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                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,33 +38,34 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-} elseif (!IS_MEMBER()) {
-	redirectToUrl('modules.php?module=index');
-} elseif ((!EXT_IS_ACTIVE('surfbar')) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('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();
 
 // Are there entries or form is submitted?
-if ((isFormSent()) && (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(), $URLs)) {
 		// 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) {
 	// List all URLs
@@ -72,32 +73,32 @@ if ((isFormSent()) && (REQUEST_ISSET_POST(('action'))) && (REQUEST_ISSET_POST('i
 	foreach ($URLs 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\">".translateComma($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']  = generateDateTime($content['registered'], '2');
-		$content['last_locked'] = generateDateTime($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']      = surfbarTranslateUserStatus($content['status']);
+		$content['status']      = translateSurfbarUrlStatus($content['status']);
 		if (empty($content['lock_reason'])) {
 			// Fixes some HTML problems with empty cells
 			$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'));
 }
 
 //