Fix for endless loop

diff --git a/inc/modules/login.php b/inc/modules/login.php
index bc46bfb49ed382b61664941351060b63f1b73c08..4252eaf76cb982100b2b258ad6321315c4e685d3 100644 (file)
--- 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("<tr>
   <td class=\"member_menu\">");

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index f7f6049d476c639335c05301b4b41911a7b90475..c2139f52eab7b237f2fd240fc0c6817f225514c1 100644 (file)
--- 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 a0fdb6784c3711e622935a085bc07bd31c14dd57..7d4e39673bf7fc0f430a082bd4a6c0bf2f67bea5 100644 (file)
--- a/templates/de/html/member/member_order_page2.tpl
+++ b/templates/de/html/member/member_order_page2.tpl
@@ -33,7 +33,7 @@
        <tr>
                <td width="10" class="seperator">&nbsp;</td>
                <td align="right">
-                       {--ENTER_RECEIVER--}: Minimum: <strong>$content[min]</strong>
+                       {--ENTER_RECEIVER--}: Minimum: <strong>{?order_min?}</strong>
                </td>
                <td width="10" class="seperator">&nbsp;</td>
                <td><input type="text" name="receiver" class="member_normal" size="4" maxlength="5" value="$content[target_send]" /></td>