[Mapbender-commits] r4846 - trunk/mapbender/http/frames

Wed Oct 21 04:02:24 EDT 2009

Author: christoph
Date: 2009-10-21 04:02:22 -0400 (Wed, 21 Oct 2009)
New Revision: 4846

Modified:
   trunk/mapbender/http/frames/login.php
Log:


Modified: trunk/mapbender/http/frames/login.php
===================================================================

--- trunk/mapbender/http/frames/login.php	2009-10-21 07:58:08 UTC (rev 4845)
+++ trunk/mapbender/http/frames/login.php	2009-10-21 08:02:22 UTC (rev 4846)
@@ -16,7 +16,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-ob_start(); 
 require_once(dirname(__FILE__)."/../../core/globalSettings.php");
 require_once(dirname(__FILE__)."/../../lib/class_Mapbender_session.php");
 
@@ -65,7 +64,6 @@
 }
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
 <html>
 <head>
 <!-- 
@@ -135,7 +133,7 @@
 	if($row = db_fetch_array($res_count)){
 		if($row["mb_user_login_count"] > MAXLOGIN){
 			echo "Permission denied. Login failed ".MAXLOGIN." times. Your account has been deactivated. Please contact your administrator!";
-			die();
+			die;
 		}
 	}
 	
@@ -177,7 +175,7 @@
 				}
 				session_write_close();
 				header ($myURL);
-				exit;
+				die;
 			}
 			# list all guis of this user and his groups
 			else{	   
@@ -192,15 +190,16 @@
 		$t = array('s');
 		db_prep_query($sql_set_cnt,$v,$t);				
 		if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
+			session_write_close();
 			header ("Location: https://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/login.php?name=".$name);
 		}
 		else {
+			session_write_close();
 			header ("Location: http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF'])."/login.php?name=".$name);
 		}
-		exit();
+		die;
 	}
 }
-ob_end_flush();
 ?>
 </body>
-</html>
+</html>
\ No newline at end of file

