Fixes/rewrites for ext-surfbar:

[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 a06466e85801611840803225ab75ba3d50f1fbc1..9846af2bd1989559de4c7318dbcde2fc1139aa5f 100644 (file)
--- a/inc/modules/member/what-surfbar_book.php
+++ b/inc/modules/member/what-surfbar_book.php
@@ -14,11 +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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -46,20 +44,20 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('surfbar')) && (!isAdmin())) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('surfbar'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}');
        return;
 } // END - if
 
 // Still allowed to book more URLs?
 if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
        // No more URLs allowed to book!
-       loadTemplate('admin_settings_saved', false, '{--MEMBER_SURFBAR_NO_MORE_ALLOWED--}');
-} elseif ((isFormSent()) && (isPostRequestParameterSet(('limited')))) {
+       displayMessage('{--MEMBER_SURFBAR_NO_MORE_ALLOWED--}');
+} elseif ((isFormSent()) && (isPostRequestParameterSet('limited'))) {
        // Is limitation "no" and "limit" is > 0?
-       if ((postRequestParameter('limited') != 'Y') && ((isPostRequestParameterSet(('limit'))) && (postRequestParameter('limit') > 0)) || (!isPostRequestParameterSet(('limit')))) {
+       if (postRequestParameter('limited') == 'N') {
                // Set it to unlimited
                setPostRequestParameter('limit', 0);
        } // END - if
@@ -77,16 +75,10 @@ if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
        } // END - if
 
        // Load message template
-       loadTemplate('admin_settings_saved', false, $message);
+       displayMessage($message);
 } else {
-       // Prepare some content
-       $content = array(
-               'reward'     => SURFBAR_DETERMINE_REWARD(true),
-               'costs'      => SURFBAR_DETERMINE_COSTS(true),
-       );
-
        // Load surfbar order form
-       loadTemplate(sprintf("member_surfbar_book_%s", strtolower(getConfig('surfbar_pay_model'))), false, $content);
+       loadTemplate(sprintf("member_surfbar_book_%s", strtolower(getSurfbarPaymentModel())));
 }
 
 // [EOF]