Huge rewrite of default parameters, ext-network continued:

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

diff --git a/inc/modules/member/what-surfbar_book.php b/inc/modules/member/what-surfbar_book.php
index 7db373f5434cc5404b619db6c889b6ad94a38c9f..a2f13980d581798ddd016ada28460cb504ffee74 100644 (file)
--- a/inc/modules/member/what-surfbar_book.php
+++ b/inc/modules/member/what-surfbar_book.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,44 +38,45 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-} elseif (!IS_MEMBER()) {
+       die();
+} elseif (!isMember()) {
        // Redirect
-       redirectToUrl('modules.php?module=index');
-} elseif ((!EXT_IS_ACTIVE('surfbar')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveMessage('surfbar'));
-       return;
+       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
 
 // Still allowed to book more URLs?
 if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
        // No more URLs allowed to book!
-       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_NO_MORE_ALLOWED'));
-} elseif ((isFormSent()) && (REQUEST_ISSET_POST(('limited')))) {
+       loadTemplate('admin_settings_saved', false, getMessage('MEMBER_SURFBAR_NO_MORE_ALLOWED'));
+} elseif ((isFormSent()) && (isPostRequestElementSet(('limited')))) {
        // Is limitation "no" and "limit" is > 0?
-       if ((REQUEST_POST('limited') == 'N') && ((REQUEST_ISSET_POST(('limit'))) && (REQUEST_POST('limit') > 0)) || (!REQUEST_ISSET_POST(('limit')))) {
+       if ((postRequestElement('limited') != 'Y') && ((isPostRequestElementSet(('limit'))) && (postRequestElement('limit') > 0)) || (!isPostRequestElementSet(('limit')))) {
                // Set it to unlimited
-               REQUEST_SET_POST('limit', 0);
+               setRequestPostElement('limit', 0);
        } // END - if
 
        // Register the new URL
-       $insertId = SURFBAR_MEMBER_ADD_URL(REQUEST_POST('url'), REQUEST_POST('limit'));
+       $insertId = SURFBAR_MEMBER_ADD_URL(postRequestElement('url'), postRequestElement('limit'));
 
        // By default something went wrong
-       $msg = getMessage('MEMBER_SURFBAR_URL_NOT_ADDED');
+       $message = getMessage('MEMBER_SURFBAR_URL_NOT_ADDED');
 
        // Was this fine?
        if ($insertId > 0) {
                // URL added and waiting for unlock
-               $msg = getMessage('MEMBER_SURFBAR_URL_ADDED');
+               $message = getMessage('MEMBER_SURFBAR_URL_ADDED');
        } // END - if
 
        // Load message template
-       LOAD_TEMPLATE('admin_settings_saved', false, $msg);
+       loadTemplate('admin_settings_saved', false, $message);
 } else {
        // Prepare some content
        $content = array(
@@ -86,7 +87,7 @@ if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
        );
 
        // Load surfbar order form
-       LOAD_TEMPLATE(sprintf("member_surfbar_book_%s", strtolower(getConfig('surfbar_pay_model'))), false, $content);
+       loadTemplate(sprintf("member_surfbar_book_%s", strtolower(getConfig('surfbar_pay_model'))), false, $content);
 }
 
 //