From 90242f14becf6081b7cf5b7800134e84c6c1919c Mon Sep 17 00:00:00 2001
From: cookie <cookie@29ba0400-6e00-0410-a75a-ca02368028f8>
Date: Wed, 9 Nov 2005 17:10:39 +0000
Subject: [PATCH] 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          | 11 ++-----
 www-ssl/menu.php            |  5 ++-
 www-ssl/nonpublic/index.php | 64 ++++++++++++-------------------------
 3 files changed, 26 insertions(+), 54 deletions(-)

diff --git a/www-ssl/logout.php b/www-ssl/logout.php
index 23ec9aed..d8fe10a8 100755
--- a/www-ssl/logout.php
+++ b/www-ssl/logout.php
@@ -1,6 +1,5 @@
 <?php
-$title = "Himmel";
-$header = "News";
+include ("./inc/config.php");
 
 // 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");
 ?>
diff --git a/www-ssl/menu.php b/www-ssl/menu.php
index 9d9c7efa..af08a8cb 100755
--- a/www-ssl/menu.php
+++ b/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
-			
 
 ?>
diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php
index 54cbabf4..45f28f8f 100755
--- a/www-ssl/nonpublic/index.php
+++ b/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
@@ -43,58 +53,26 @@ if ( IsSet($_POST["user"])) {
 			$SQL = "SELECT * FROM `UserCVS` WHERE UID=".$_SESSION['UID'];
 			$Erg_CVS =  mysql_query($SQL, $con);
 			$_SESSION['CVS'] = mysql_fetch_array($Erg_CVS);
-	  
-			include ("./inc/header.php");
-
-			echo Get_Text(1).$_SESSION['Nick'];
-			echo nl2br(Get_Text(2));
-	
-			include ("./news_output.php");
-	      
+			
+			LoginOK();
 		} 
 		else 
 		{ // Passwort nicht ok...
-
-			include ("./inc/header.php");
-	  
-			echo Get_Text("pub_index_pass_no_ok");
-			include ("./inc/login_eingabefeld.php");
-
+			$ErrorText = "pub_index_pass_no_ok";
 		} // Ende Passwort-Check
-	
 	} 
 	else 
 	{ // Anzahl der User in User-Tabelle <> 1 --> keine Anmeldung
-		include ("./inc/header.php");
 		if ($user_anz == 0) 
-		{
-	  		echo Get_Text("pub_index_User_unset");
-		} 
+	  		$ErrorText = "pub_index_User_unset";
 		else 
-		{
-			echo Get_Text("pub_index_User_more_as_one");
-		}
-
-		include ("./inc/login_eingabefeld.php");
+			$ErrorText = "pub_index_User_more_as_one";
 	} // 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");
-
-} // Ende Ueberpruefung, ob User bereits angemeldet...
-	
 
-
-?>
-<!-- <br>
-<a href="nonpublic/list.php"> list.php </a> -->
-<?
+include ("./inc/header.php");
+echo "<h2>". Get_Text($ErrorText). "</h2><br>\n";
+include ("./inc/login_eingabefeld.php");
 include ("./inc/footer.php");
 
 ?>