Way more usage of EL code:

[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 f2c6938e8784ff7a0e76f501174082d67fb3c797..deb31075c91ff622f5e3152e9f0ded0ce674a6b3 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -15,11 +15,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,13 +39,13 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('guest', __FILE__);
+addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('user')) && (!isAdmin())) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('user'));
+       displayMessage(generateExtensionInactiveNotInstalledMessage('user'));
        return;
 } // END - if
 
@@ -64,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')) {
+       if ((isExtensionActive('nickname')) && (isNicknameUsed(postRequestParameter('id')))) {
                // Nickname entered
                $userid = SQL_ESCAPE(postRequestParameter('id'));
        } else {
@@ -123,7 +121,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