Merge branch 'master' of ssh://git@git.ivaya.de/BA_SST/PHP-Chat.git

index.php

@@ -12,8 +12,13 @@ include("config.php");
 // $result = mysql_query("SELECT * FROM user WHERE name = '{$_SESSION['chatuserid']}'");
 // $users = mysql_fetch_array($result);
 
+if(isset($_GET['logoff'])){
+	mysql_query("UPDATE user SET online = '0' WHERE id = '{$_SESSION['chatuserid']}'");
+	mysql_query("INSERT INTO chat (nachricht, user_id, userchange, hideuser, chat_time) VALUES ('<b>{$users['name']}</b> verl&auml;sst den Chat', '{$_SESSION['chatuserid']}', '1', '1', '".time()."')");
+	unset($_SESSION);	
+}
 
-// Falls ein Formular bermittelt wurde:
+// Falls ein Formular �bermittelt wurde:
 if(isset($_POST['ok']))
 {
 	if($_POST['ok'] == "Anmelden"){
@@ -34,7 +39,7 @@ if(isset($_POST['ok']))
 				mysql_query("UPDATE user SET online = '1', refresh_time = ".time()." WHERE id = '{$_SESSION['chatuserid']}'");
 				mysql_query("INSERT INTO chat (nachricht, user_id, userchange, hideuser, chat_time) VALUES ('<b>{$user['name']}</b> betritt den Chat', '{$_SESSION['chatuserid']}', '1', '1', '".time()."')");
 				$meldung .= "<font color=\"green\">Du hast dich erfolgreich angemeldet!</font>";
-				$JqueryDo = "$('#showLogin').click();".PHP_EOL."setTimeout(function(){ window.location = \"/fr.php\"; }, 700);";
+				$JqueryDo = "$('#showLogin').click();".PHP_EOL."setTimeout(function(){ window.location = \"/newChat.php\"; }, 700);";
 			}
 			else{
 				$meldung .= "<font color=\"red\">Name ($username) oder Passwort falsch!</font>";

newChat.php

@@ -42,7 +42,7 @@ if(!isset($_SESSION['chatuserid']) OR $users['online'] == 0)
 							<li><a href="#">Admin-Menü</a></li>
 						</ul>
 						<ul class="nav navbar-nav navbar-right">
-							<li id="LoginBtn"><a href="index.php?logoff" id="doLogoff"><span class="glyphicon glyphicon-log-out"></span> Abmelden</a></li>
+							<li id="LoginBtn"><a href="index.php?logoff=true"><span class="glyphicon glyphicon-log-out"></span> Abmelden</a></li>
 						</ul>
 					</div>