X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fguest%2Fwhat-login.php;h=edec3039458ff90de570d56d82bbaaab1053412a;hb=e98608bf2a6208376d30996cf9152e1f091ac369;hp=0c942a81ee5558fcea3461e88ba57e6caa934fb2;hpb=414570c5081d337bb6c28dcf521bd8bca02f69e7;p=mailer.git

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 0c942a81ee..edec303945 100644
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -11,10 +11,10 @@
  * Kurzbeschreibung  : Loginbereich (leitet an das richtige Lgin-Modul  *
  *                     weiter)                                          *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $Author::                                                          $ *
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
@@ -60,9 +60,9 @@ $URL = "";
 $ADD = "";
 
 // Already logged in?
-if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash'))) {
+if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
 	// Maybe, then continue with it
-	$uid = $GLOBALS['userid'];
+	$uid = getUserId();
 } elseif ((REQUEST_ISSET_POST(('id'))) && (REQUEST_ISSET_POST(('password'))) && (IS_FORM_SENT())) {
 	// Set userid and crypt password when login data was submitted
 	if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID(REQUEST_POST('id')))) {
@@ -90,7 +90,7 @@ if (IS_MEMBER()) {
 	$URL = "modules.php?module=login";
 } elseif ((IS_FORM_SENT()) && ("".$uid."" != "".REQUEST_POST('id')."")) {
 	// Invalid input (no nickname extension installed but nickname entered)
-	$ERROR = constant('CODE_EXTENSION_PROBLEM');
+	$ERROR = getCode('EXTENSION_PROBLEM');
 } elseif (IS_FORM_SENT()) {
 	// Try the login (see inc/libs/user_functions.php)
 	$URL = USER_DO_LOGIN(REQUEST_POST('id'), REQUEST_POST('password'));
@@ -108,50 +108,50 @@ if (REQUEST_ISSET_GET(('login'))) {
 // Login problems?
 if (!empty($ERROR)) {
 	// Ok, which one now?
-	$MSG = "<tr>
+	$message = "<tr>
   <td width=\"10\" class=\"seperator\">&nbsp;</td>
   <td colspan=\"7\" align=\"center\">
     <span class=\"guest_failed\">";
 
 	switch ($ERROR) {
-		case constant('CODE_WRONG_PASS'):
-			$MSG .= getMessage('LOGIN_WRONG_PASS');
+		case getCode('WRONG_PASS'):
+			$message .= getMessage('LOGIN_WRONG_PASS');
 			break;
 
-		case constant('CODE_WRONG_ID'):
-			$MSG .= getMessage('LOGIN_WRONG_ID');
+		case getCode('WRONG_ID'):
+			$message .= getMessage('LOGIN_WRONG_ID');
 			break;
 
-		case constant('CODE_ID_LOCKED'):
-			$MSG .= getMessage('LOGIN_ID_LOCKED');
+		case getCode('ID_LOCKED'):
+			$message .= getMessage('LOGIN_ID_LOCKED');
 			break;
 
-		case constant('CODE_ID_UNCONFIRMED'):
-			$MSG .= getMessage('LOGIN_ID_UNCONFIRMED');
+		case getCode('ID_UNCONFIRMED'):
+			$message .= getMessage('LOGIN_ID_UNCONFIRMED');
 			break;
 
-		case constant('CODE_NO_COOKIES'):
-			$MSG .= getMessage('LOGIN_NO_COOKIES');
+		case getCode('NO_COOKIES'):
+			$message .= getMessage('LOGIN_NO_COOKIES');
 			break;
 
-		case constant('CODE_EXTENSION_PROBLEM'):
+		case getCode('EXTENSION_PROBLEM'):
 			if (IS_ADMIN()) {
-				$MSG .= sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "nickname");
+				$message .= sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "nickname");
 			} else {
-				$MSG .= getMessage('LOGIN_WRONG_ID');
+				$message .= getMessage('LOGIN_WRONG_ID');
 			}
 			break;
 
 		default:
 			DEBUG_LOG(__FILE__, __LINE__, sprintf("Unhandled error code %s detected.", $ERROR));
-			$MSG .= getMessage('LOGIN_WRONG_ID');
+			$message .= getMessage('LOGIN_WRONG_ID');
 			break;
 		}
-		$MSG .= "</span>
+		$message .= "</span>
   </td>
   <td width=\"10\" class=\"seperator\">&nbsp;</td>
 </tr>\n";
-		define('LOGIN_FAILURE_MSG', $MSG);
+		define('LOGIN_FAILURE_MSG', $message);
 } else {
 	// No problems, no output
 	define('LOGIN_FAILURE_MSG', "");