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

customJS.js

@@ -36,7 +36,7 @@ $(document).ready(function() {
 		obj.done(function(data){
 			alert(data);
 		});
-		$( "#chatbar" ).reset();
+		$('#chatbar')[0].reset();
 	});
 
 	$('#changeToNormal').click(function(event){
@@ -51,7 +51,8 @@ $(document).ready(function() {
 			obj.removeClass('btn-warning');
 		}
 		obj.addClass('btn-default');
-		obj.attr('name', 'chatok');
+		
+		$('#messageType').attr('name', 'chatok');
 	});
 	
 	$('#changeToMod').click(function(event){
@@ -66,7 +67,7 @@ $(document).ready(function() {
 			obj.removeClass('btn-danger');
 		}
 		obj.addClass('btn-warning');
-		$('#sendMessage').attr('name', 'modok');
+		$('#messageType').attr('name', 'modok');
 	});
 	
 	$('#changeToAdmin').click(function(event){
@@ -81,7 +82,7 @@ $(document).ready(function() {
 			obj.removeClass('btn-warning');
 		}
 		obj.addClass('btn-danger');
-		$('#sendMessage').attr('name', 'adminok');
+		$('#messageType').attr('name', 'adminok');
 	});
 	
 	$('#showRegBtn').click(function(){

newChat.php

@@ -97,9 +97,10 @@ else{
 					<form class="" role="form" id="chatbar">
 						<div class="input-group">
 							<span class="input-group-addon hidden-xs"><?php echo $users['name']; ?>:</span>
-							<input type="text" class="form-control" placeholder="Deine Nachricht..." autofocus>
+							<input type="text" name="text" class="form-control" placeholder="Deine Nachricht..." autofocus>
 							<span class="input-group-btn dropup">
-								<button class="btn btn-default" id="sendMessage" name="chatok" type="submit"><span class="glyphicon glyphicon-send" /> <span class="hidden-xs">Senden</span></button>
+								<input type="hidden" id="messageType" name=chatok value="btn" />
+								<button class="btn btn-default" id="sendMessage" type="submit"><span class="glyphicon glyphicon-send" /> <span class="hidden-xs">Senden</span></button>
 								<?php 
 									if($users['admin'] >= 1)
 									{