Fixes for wrong tewmplate names, new network added:

[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 e888b2cbbb076e89571c46c7ea2043a801b36b43..159735d801632a40264af8bc42186ef3c4272a29 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -64,7 +64,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 (isExtensionActive('nickname')) {
                // Nickname entered
                $userid = SQL_ESCAPE(postRequestParameter('id'));
        } else {
@@ -74,7 +74,16 @@ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
 } elseif (isPostRequestParameterSet('new_pass')) {
        // New password requested
        $userid = '0';
-       if ((isPostRequestParameterSet('id')) && (postRequestParameter('id') > 0)) $userid = bigintval(postRequestParameter('id'));
+       if (isPostRequestParameterSet('id')) {
+               // Do we have nickname or userid?
+               if ((isExtensionActive('nickname')) && (isNicknameUsed(postRequestParameter('id')))) {
+                       // Nickname entered
+                       $userid = SQL_ESCAPE(postRequestParameter('id'));
+               } else {
+                       // Direct userid entered
+                       $userid  = bigintval(postRequestParameter('id'));
+               }
+       } // END - if
 } else {
        // Not logged in
        $userid = '0'; $hash = '';
@@ -114,7 +123,7 @@ if (!empty($errorCode)) {
        // @TODO Move this HTML code into a template
        $content['message'] = '<tr>
   <td colspan="4" align="center">
-    <span class="guest_failed">' . getMessageFromErrorCode($errorCode) . '</span>
+    <span class="notice">' . getMessageFromErrorCode($errorCode) . '</span>
   </td>
 </tr>';
 } // END - if