From 3e2e8ea82079f4e76b8add38efccf6c24afda507 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 29 Oct 2009 19:12:44 +0000 Subject: [PATCH 1/1] Fix for endless loop --- inc/modules/login.php | 3 +++ inc/modules/member/what-order.php | 7 ++----- templates/de/html/member/member_order_page2.tpl | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/inc/modules/login.php b/inc/modules/login.php index bc46bfb49e..4252eaf76c 100644 --- a/inc/modules/login.php +++ b/inc/modules/login.php @@ -59,6 +59,9 @@ enableBlockMode(false); // Generate a tableset for the menu title and content loadTemplate('member_header'); +// Add code-message here +handleCodeMessage(); + // Begin menu block here outputHtml(" "); diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index f7f6049d47..c2139f52ea 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -57,9 +57,6 @@ $whereStatement = " WHERE `visible`='Y'"; // Set undefined array elements if (isAdmin()) $whereStatement = ''; -// Minimum mails / order -$content['min'] = getConfig('order_min'); - // Count unconfirmed mails $links = countSumTotalData(getUserId(), 'user_links', 'id', 'userid', true); @@ -418,7 +415,7 @@ LIMIT 1", $URL = 'modules.php?module=login&what=order&code=' . getCode('NO_RECS_LEFT'); } } -} elseif (postRequestElement('receiver') == 0) { +} elseif (postRequestElement('receiver') == '0') { // Not enougth receivers selected $URL = 'modules.php?module=login&what=order&code=' . getCode('MORE_RECEIVERS1'); } elseif (($ALLOWED == 0) && (getConfig('order_max_full') == 'ORDER')) { @@ -590,7 +587,7 @@ LIMIT 1", } else { // Default output for that your members don't forget it... $content['url'] = 'http://'; - $content['target_send'] = $content['min']; + $content['target_send'] = getConfig('order_min'); $content['subject'] = '{--ORDER_DEFAULT_SUBJECT--}'; $content['text'] = '{--ORDER_DEFAULT_TEXT--}'; } diff --git a/templates/de/html/member/member_order_page2.tpl b/templates/de/html/member/member_order_page2.tpl index a0fdb6784c..7d4e39673b 100644 --- a/templates/de/html/member/member_order_page2.tpl +++ b/templates/de/html/member/member_order_page2.tpl @@ -33,7 +33,7 @@   - {--ENTER_RECEIVER--}: Minimum: $content[min] + {--ENTER_RECEIVER--}: Minimum: {?order_min?}   -- 2.30.2