A lot has been rewritten, ext-teams added, ext-forced continued:

[mailer.git] / inc / modules / guest / what-login.php

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index deb31075c91ff622f5e3152e9f0ded0ce674a6b3..1129585e3b7220fd07f6c9d8422795ab535f4784 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('user')) && (!isAdmin())) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('user'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}');
        return;
 } // END - if
 
@@ -62,7 +62,7 @@ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
        $userid = getMemberId();
 } elseif ((isPostRequestParameterSet('id')) && (isPostRequestParameterSet('password')) && (isFormSent())) {
        // Set userid and crypt password when login data was submitted
-       if ((isExtensionActive('nickname')) && (isNicknameUsed(postRequestParameter('id')))) {
+       if (isNicknameUsed(postRequestParameter('id'))) {
                // Nickname entered
                $userid = SQL_ESCAPE(postRequestParameter('id'));
        } else {
@@ -71,10 +71,13 @@ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
        }
 } elseif (isPostRequestParameterSet('new_pass')) {
        // New password requested
-       $userid = '0';
-       if (isPostRequestParameterSet('id')) {
+       $userid = NULL;
+       if (isPostRequestParameterSet('email')) {
+               // Email is set
+               $userid = SQL_ESCAPE(postRequestParameter('email'));
+       } elseif (isPostRequestParameterSet('id')) {
                // Do we have nickname or userid?
-               if ((isExtensionActive('nickname')) && (isNicknameUsed(postRequestParameter('id')))) {
+               if (isNicknameUsed(postRequestParameter('id'))) {
                        // Nickname entered
                        $userid = SQL_ESCAPE(postRequestParameter('id'));
                } else {
@@ -84,7 +87,8 @@ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
        } // END - if
 } else {
        // Not logged in
-       $userid = '0'; $hash = '';
+       $userid = NULL;
+       $hash = '';
 }
 
 if (isMember()) {