fehlermeldungen werden wieder angezeigt, und das rechtemengement ist dadurch genauer

git-svn-id: svn://svn.cccv.de/engel-system@29 29ba0400-6e00-0410-a75a-ca02368028f8

www-ssl/logout.php

@@ -1,6 +1,5 @@
 <?php
-$title = "Himmel";
+include ("./inc/config.php");
-$header = "News";
 
 // Die Session zerstoeren...
 session_start();
@@ -8,11 +7,7 @@ session_destroy ();
 // und eine neue erstellen, damit kein Erzengelmenü angezeigt wird (falls sich ein Erzengel abmeldet...)
 session_start();
 
-include ("./inc/header.php");
+header("HTTP/1.1 302 Moved Temporarily");
+header("Location: ". substr($url, 0, strlen($url)-1). $ENGEL_ROOT);
 
-echo Get_Text("index_logout")."<br><br>";
-
-include ("./inc/login_eingabefeld.php");
-
-include ("./inc/footer.php");
 ?>

www-ssl/menu.php

@@ -34,13 +34,12 @@ $Menu["Entry"][3]["Line"] = "<br>";
 $Menu["Entry"][4]["File"] = "nonpublic/schichtplan_beamer.php";
 $Menu["Entry"][4]["Name"] = Get_Text("pub_menu_SchichtplanBeamer");
 
-if ($_SESSION['CVS']["nonpublic/index.php"] == "Y") 
+if ($_SESSION['CVS']["nonpublic/news.php"] == "Y") 
 {
 	$MenuAdmin["Path"] = "";
 	$MenuAdmin["Name"] = Get_Text("pub_menu_menuname");
-	$MenuAdmin["Entry"][0]["File"] = "nonpublic/index.php";
+	$MenuAdmin["Entry"][0]["File"] = "nonpublic/news.php";
 	$MenuAdmin["Entry"][0]["Name"] = "Engel-Men&uuml;";
 } // MenueShowAdminSection
 
-
 ?>

www-ssl/nonpublic/index.php

@@ -7,10 +7,20 @@ include ("./inc/crypt.php");
 
 session_start(); // alte Session - falls vorhanden - wiederherstellen...
 
-if ( IsSet($_POST["user"])) {
+function LoginOK()
+{
+	include ("./inc/config.php");
+	header("HTTP/1.1 302 Moved Temporarily");
+	header("Location: ". substr($url, 0, strlen($url)-1). $ENGEL_ROOT. "nonpublic/news.php");
+}
 
+if ( !IsSet($_POST["user"]))
+{ // User ist bereits angemeldet... normaler Inhalt...
+	LoginOK();
+} 
+else
+{ // User ist noch nicht angemeldet 
 	$sql = "select * from User where Nick = '". $_POST["user"]. "'";
-
 	$userstring = mysql_query($sql, $con);
 
 	// anzahl zeilen
@@ -44,57 +54,25 @@ if ( IsSet($_POST["user"])) {
 			$Erg_CVS =  mysql_query($SQL, $con);
 			$_SESSION['CVS'] = mysql_fetch_array($Erg_CVS);
 			
-			include ("./inc/header.php");
+			LoginOK();
-
-			echo Get_Text(1).$_SESSION['Nick'];
-			echo nl2br(Get_Text(2));
-	
-			include ("./news_output.php");
-	      
 		} 
 		else 
 		{ // Passwort nicht ok...
-
+			$ErrorText = "pub_index_pass_no_ok";
-			include ("./inc/header.php");
-	  
-			echo Get_Text("pub_index_pass_no_ok");
-			include ("./inc/login_eingabefeld.php");
-
 		} // Ende Passwort-Check
-	
 	} 
 	else 
 	{ // Anzahl der User in User-Tabelle <> 1 --> keine Anmeldung
-		include ("./inc/header.php");
 		if ($user_anz == 0) 
-		{
+	  		$ErrorText = "pub_index_User_unset";
-	  		echo Get_Text("pub_index_User_unset");
-		} 
 		else 
-		{
+			$ErrorText = "pub_index_User_more_as_one";
-			echo Get_Text("pub_index_User_more_as_one");
-		}
-
-		include ("./inc/login_eingabefeld.php");
 	} // Ende Check, ob User angemeldet wurde
 } 
-else 
-{ // User ist bereits angemeldet... normaler Inhalt...
-
-	include ("./inc/header.php");
-        echo Get_Text(1).$_SESSION['Nick'];
-        echo nl2br(Get_Text(2));
 
-	include ("./news_output.php");
+include ("./inc/header.php");
-
+echo "<h2>". Get_Text($ErrorText). "</h2><br>\n";
-} // Ende Ueberpruefung, ob User bereits angemeldet...
+include ("./inc/login_eingabefeld.php");
-	
-
-
-?>
-<!-- <br>
-<a href="nonpublic/list.php"> list.php </a> -->
-<?
 include ("./inc/footer.php");
 
 ?>