Menu entries moved to ext-user:

[mailer.git] / beg.php

diff --git a/beg.php b/beg.php
index e46a44d872ca2fdc0d0e2ddd35e3a28d8a32e2e6..14d19efe31ff64b344359158f4dc44816c0eb4ca 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -64,15 +64,12 @@ if (isGetRequestParameterSet('userid')) {
        $pay = false;
 
        // Validate if it is not a number
-       if (isNicknameUsed(getRequestParameter('userid'))) {
-               // Is the nickname extension there?
-               if (isExtensionActive('nickname')) {
-                       // Maybe we have found a nickname?
-                       fetchUserData(getRequestParameter('userid'), 'nickname');
-               } else {
-                       // Nickname entered but nickname is not active
-                       $errorCode = getCode('EXTENSION_PROBLEM');
-               }
+       if ((isExtensionActive('nickname')) && (isNicknameUsed(getRequestParameter('userid')))) {
+               // Maybe we have found a nickname?
+               fetchUserData(getRequestParameter('userid'), 'nickname');
+       } elseif (isNicknameUsed(getRequestParameter('userid'))) {
+               // Nickname entered but nickname is not active
+               $errorCode = getCode('EXTENSION_PROBLEM');
        } else {
                // Direct userid
                fetchUserData(getRequestParameter('userid'));
@@ -149,7 +146,7 @@ if (isGetRequestParameterSet('userid')) {
                        $content['message'] = loadTemplate('beg_login', true, $content);
                } elseif (getBegPayMode() != 'NONE') { // Other pay-mode active!
                        // Load message template depending on pay-mode
-                       $content['message'] = loadTemplate('beg_pay_mode_'.strtolower(getBegPayMode()), true, $content);
+                       $content['message'] = loadTemplate('beg_pay_mode_' . strtolower(getBegPayMode()), true, $content);
                        $pay = true;
                } else {
                        // Clicked received while reload lock is active
@@ -173,7 +170,7 @@ if (isGetRequestParameterSet('userid')) {
                        );
 
                        // Include config-depending template
-                       loadTemplate('beg_pay_code_'.strtolower(getBegPayMode()), false, $content);
+                       loadTemplate('beg_pay_code_' . strtolower(getBegPayMode()), false, $content);
                } elseif (($pay === false) && (!isset($content['message']))) {
                        // Cannot pay! :-(
                        $content['message'] = loadTemplate('beg_failed', true);