[Mapbender-commits] r7131 - in trunk/mapbender/http: frames php

Tue Nov 16 03:54:58 EST 2010

Author: christoph
Date: 2010-11-16 00:54:58 -0800 (Tue, 16 Nov 2010)
New Revision: 7131

Modified:
   trunk/mapbender/http/frames/login.php
   trunk/mapbender/http/php/mod_createUser.php
Log:
http://trac.osgeo.org/mapbender/ticket/720

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

--- trunk/mapbender/http/frames/login.php	2010-11-16 08:40:20 UTC (rev 7130)
+++ trunk/mapbender/http/frames/login.php	2010-11-16 08:54:58 UTC (rev 7131)
@@ -16,8 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-require_once(dirname(__FILE__)."/../../core/globalSettings.php");
-require_once(dirname(__FILE__)."/../../lib/class_Mapbender_session.php");
+require_once dirname(__FILE__) . "/../../conf/mapbender.conf";
 
 function auth_user($name,$pw){
 	$setEncPw = false;
@@ -43,13 +42,6 @@
 		}
 	}
 }
-function setSession(){
-	session_start();
-	session_write_close();
-}
-function killSession(){
-	Mapbender::session()->kill();
-}
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
@@ -126,7 +118,6 @@
 echo "<body onload='setFocus()'>";
 
 if(!isset($name) || $name == '' || !isset($password) || $password == ''){
-	killSession();
 	echo "<form name='loginForm' action ='" . $_SERVER["SCRIPT_NAME"] . "' method='POST'>";
 	echo "<table>";
 	echo "<tr><td>Name: </td><td><input type='text' name='name' class='login_text' value=''></td></tr>";
@@ -137,6 +128,10 @@
 	echo "</form>";
 }
 if(isset($name) && $name != '' && isset($password) && $password != ''){
+	require_once(dirname(__FILE__)."/../../core/globalSettings.php");
+	require_once(dirname(__FILE__)."/../../lib/class_Mapbender_session.php");
+
+
 	$sql_count = "SELECT mb_user_login_count FROM mb_user WHERE mb_user_name = $1";
 	$params = array($name);
 	$types = array('s');
@@ -152,7 +147,6 @@
 	
 	// if given user data is found in database, set session data (db_fetch_array returns false if no row is found)
 	if($row){
-		setSession();
 		include(dirname(__FILE__)."/../../conf/session.conf");
 	}	
 	if(Mapbender::session()->get("mb_user_id")){
@@ -186,7 +180,6 @@
 				
 				$myURL .= "&".$cleanUrl;
 				
-				session_write_close();
 				header ($myURL);
 				die;
 			}
@@ -203,11 +196,9 @@
 		$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['SCRIPT_NAME'])."/login.php?name=".$name);
 		}
 		else {
-			session_write_close();
 			header ("Location: http://".$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])."/login.php?name=".$name);
 		}
 		die;

Modified: trunk/mapbender/http/php/mod_createUser.php
===================================================================
--- trunk/mapbender/http/php/mod_createUser.php	2010-11-16 08:40:20 UTC (rev 7130)
+++ trunk/mapbender/http/php/mod_createUser.php	2010-11-16 08:54:58 UTC (rev 7131)
@@ -18,6 +18,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+require_once dirname(__FILE__) . "/../../conf/mapbender.conf";
+if (PORTAL !== true) {
+	echo "This module is disabled. Please check your mapbender.conf.";
+	die;
+}
 
 /*  
  * @security_patch irv open 
@@ -27,10 +32,6 @@
 require_once(dirname(__FILE__)."/../classes/class_gui.php");
 require_once(dirname(__FILE__)."/../classes/class_administration.php");
 
-if(PORTAL != true){
-	echo "This module is disabled. Please check your mapbender.conf.";
-	die;	
-}
 
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

