[Mapbender-commits] r6975 - in branches/mapbender/http: frames php

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-09-29 18:40:14 +0000 (Wed, 29 Sep 2010)
New Revision: 6975

Modified:
   branches/mapbender/http/frames/index.php
   branches/mapbender/http/frames/login.php
   branches/mapbender/http/php/mb_getGUIs.php
   branches/mapbender/http/php/mb_listGUIs.php
Log:
pdo

Modified: branches/mapbender/http/frames/index.php
===================================================================
--- branches/mapbender/http/frames/index.php	2010-09-29 15:26:36 UTC (rev 6974)
+++ branches/mapbender/http/frames/index.php	2010-09-29 18:40:14 UTC (rev 6975)
@@ -24,7 +24,6 @@
 
 Mapbender::session()->set("mb_user_gui",$gui_id);
 
-print_r($_SESSION);
 //
 // check if user is allowed to access current GUI; 
 // if not, return to login screen

Modified: branches/mapbender/http/frames/login.php
===================================================================
--- branches/mapbender/http/frames/login.php	2010-09-29 15:26:36 UTC (rev 6974)
+++ branches/mapbender/http/frames/login.php	2010-09-29 18:40:14 UTC (rev 6975)
@@ -166,7 +166,7 @@
 	if($row){
 		setSession();
 		include(dirname(__FILE__)."/../../conf/session.conf");
-	}	
+	}
 	if(Mapbender::session()->get("mb_user_id")){
 		if($row["mb_user_login_count"] <= MAXLOGIN){
 			$sql_del_cnt =  "UPDATE mb_user SET mb_user_login_count = 0 WHERE mb_user_id = $1";
@@ -199,7 +199,7 @@
 				$myURL .= "&".$cleanUrl;
 				
 				session_write_close();
-				header ($myURL);
+#				header ($myURL);
 				die;
 			}
 			# list all guis of this user and his groups

Modified: branches/mapbender/http/php/mb_getGUIs.php
===================================================================
--- branches/mapbender/http/php/mb_getGUIs.php	2010-09-29 15:26:36 UTC (rev 6974)
+++ branches/mapbender/http/php/mb_getGUIs.php	2010-09-29 18:40:14 UTC (rev 6975)
@@ -26,8 +26,8 @@
 		$t = array('i');
 		$res_groups = db_prep_query($sql_groups,$v,$t);
 		$cnt_groups = 0;
-		while(db_fetch_row($res_groups)){
-			$mb_user_groups[$cnt_groups] = db_result($res_groups,$cnt_groups,"fkey_mb_group_id");
+		while($row = db_fetch_row($res_groups)){
+			$mb_user_groups[$cnt_groups] = $row["fkey_mb_group_id"];
 			$cnt_groups++;
 		}
 		$count_g = 0;
@@ -44,8 +44,8 @@
 			}
 			$sql_g .= "))";
 			$res_g = db_prep_query($sql_g,$v,$t);
-			while(db_fetch_row($res_g)){
-				$arrayGuis[$count_g] = db_result($res_g, $count_g, "gui_id");
+			while($row = db_fetch_row($res_g)){
+				$arrayGuis[$count_g] = $row["gui_id"];
 				$count_g++;
 			}
 		}
@@ -56,9 +56,9 @@
 		$t = array('i');
 		$res_guis = db_prep_query($sql_guis,$v,$t);
 		$count_guis = 0;
-		while(db_fetch_row($res_guis)){
-			if( !in_array(db_result($res_guis,$count_guis,"gui_id"),$arrayGuis)){
-				$arrayGuis[$count_g] = db_result($res_guis,$count_guis,"gui_id");
+		while($row = db_fetch_row($res_guis)){
+			if( !in_array($row["gui_id"],$arrayGuis)){
+				$arrayGuis[$count_g] = $row["gui_id"];
 				$count_g++;
 			}
 			$count_guis++;

Modified: branches/mapbender/http/php/mb_listGUIs.php
===================================================================
--- branches/mapbender/http/php/mb_listGUIs.php	2010-09-29 15:26:36 UTC (rev 6974)
+++ branches/mapbender/http/php/mb_listGUIs.php	2010-09-29 18:40:14 UTC (rev 6975)
@@ -125,4 +125,4 @@
 	
 	echo "</div>";	
 }
-?>
\ No newline at end of file
+?>