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

Tue Jul 8 08:18:22 EDT 2008

Author: christoph
Date: 2008-07-08 08:18:22 -0400 (Tue, 08 Jul 2008)
New Revision: 2601

Modified:
   trunk/mapbender/conf/mapbender.conf-dist
   trunk/mapbender/http/frames/index.php
   trunk/mapbender/http/frames/login.php
   trunk/mapbender/http/index.php
   trunk/mapbender/http/php/mb_validateSession.php
Log:
i18n update

Modified: trunk/mapbender/conf/mapbender.conf-dist
===================================================================

--- trunk/mapbender/conf/mapbender.conf-dist	2008-07-08 12:16:51 UTC (rev 2600)
+++ trunk/mapbender/conf/mapbender.conf-dist	2008-07-08 12:18:22 UTC (rev 2601)
@@ -23,8 +23,6 @@
 	define("OWNER", "<owner>");
 	define("PW", "<password>");
 	
-	include_once(dirname(__FILE__) . "/../http/php/database-mysql.php"); 
-	
 	# --------------------------------------------
 	# database with geos functions
 	# --------------------------------------------
@@ -42,8 +40,6 @@
 	define("DB", "<database>");
 	define("OWNER", "<owner>");
 	define("PW", "<password>");
-	
-	include_once(dirname(__FILE__) . "/../http/php/database-pgsql.php"); 
 }
 
 # --------------------------------------------
@@ -150,7 +146,6 @@
 							// If "false", LANGUAGE is set to english
 define("LANGUAGE", "en");   // only available if USE_I18N is "true". 
 							// "en", "de", "bg", "gr", "nl", "it", es"
-require_once(dirname(__FILE__) . "/../lib/i18n.php");
 
 ###HACK for GLOBALS
 $DBSERVER=DBSERVER;

Modified: trunk/mapbender/http/frames/index.php
===================================================================
--- trunk/mapbender/http/frames/index.php	2008-07-08 12:16:51 UTC (rev 2600)
+++ trunk/mapbender/http/frames/index.php	2008-07-08 12:18:22 UTC (rev 2601)
@@ -18,13 +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.
 
-mb_internal_encoding("UTF-8");
 require("../php/mb_validateSession.php");
 require_once(dirname(__FILE__)."/../classes/class_locale.php");
 require_once(dirname(__FILE__)."/../classes/class_gui.php");
 
 $_SESSION["mb_user_gui"] = $gui_id;
-$localeObj = new Mb_locale($_SESSION["mb_lang"]);
 
 //
 // check if user is allowed to access current GUI; 

Modified: trunk/mapbender/http/frames/login.php
===================================================================
--- trunk/mapbender/http/frames/login.php	2008-07-08 12:16:51 UTC (rev 2600)
+++ trunk/mapbender/http/frames/login.php	2008-07-08 12:18:22 UTC (rev 2601)
@@ -17,9 +17,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 ob_start(); 
-include_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
 
 function auth_user($name,$pw){
 	$setEncPw = false;

Modified: trunk/mapbender/http/index.php
===================================================================
--- trunk/mapbender/http/index.php	2008-07-08 12:16:51 UTC (rev 2600)
+++ trunk/mapbender/http/index.php	2008-07-08 12:18:22 UTC (rev 2601)
@@ -18,7 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-include_once(dirname(__FILE__)."/php/system.php");
+include_once(dirname(__FILE__)."/../core/system.php");
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//Dtd HTML 4.01 Transitional//EN">
 <html>

Modified: trunk/mapbender/http/php/mb_validateSession.php
===================================================================
--- trunk/mapbender/http/php/mb_validateSession.php	2008-07-08 12:16:51 UTC (rev 2600)
+++ trunk/mapbender/http/php/mb_validateSession.php	2008-07-08 12:18:22 UTC (rev 2601)
@@ -17,18 +17,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-session_start();
+require_once(dirname(__FILE__)."/../../core/globalSettings.php");
 
-require_once(dirname(__FILE__)."/../php/system.php");
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
 
-//
-// establish database connection
-//
-$con = db_connect($DBSERVER, $OWNER, $PW);
-db_select_db(DB, $con);
-
 $e = new mb_notice("mb_validateSession.php: checking file " . $_SERVER["PHP_SELF"]);
 
 //

