[Mapbender-commits] r2596 - in branches/testbaudson_dev/http: . classes frames

Mon Jul 7 10:38:47 EDT 2008

Author: christoph
Date: 2008-07-07 10:38:47 -0400 (Mon, 07 Jul 2008)
New Revision: 2596

Modified:
   branches/testbaudson_dev/http/classes/class_element.php
   branches/testbaudson_dev/http/frames/login.php
   branches/testbaudson_dev/http/index.php
Log:
using globalSettings.php

Modified: branches/testbaudson_dev/http/classes/class_element.php
===================================================================

--- branches/testbaudson_dev/http/classes/class_element.php	2008-07-07 14:32:51 UTC (rev 2595)
+++ branches/testbaudson_dev/http/classes/class_element.php	2008-07-07 14:38:47 UTC (rev 2596)
@@ -17,16 +17,10 @@
 # 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");
 
 define("ELEMENT_PATTERN", "/sessionID/");
 
-require_once(dirname(__FILE__)."/../../conf/mapbender.conf");
-require_once(dirname(__FILE__)."/../classes/class_mb_exception.php");
-
-$con = db_connect(DBSERVER,OWNER,PW);
-db_select_db(DB,$con);
-
 class Element {
 	
 	var $guiId;

Modified: branches/testbaudson_dev/http/frames/login.php
===================================================================
--- branches/testbaudson_dev/http/frames/login.php	2008-07-07 14:32:51 UTC (rev 2595)
+++ branches/testbaudson_dev/http/frames/login.php	2008-07-07 14:38:47 UTC (rev 2596)
@@ -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: branches/testbaudson_dev/http/index.php
===================================================================
--- branches/testbaudson_dev/http/index.php	2008-07-07 14:32:51 UTC (rev 2595)
+++ branches/testbaudson_dev/http/index.php	2008-07-07 14:38:47 UTC (rev 2596)
@@ -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>

