[Mapbender-commits] r6767 - in trunk/mapbender: core http/classes

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-08-19 15:59:06 +0000 (Thu, 19 Aug 2010)
New Revision: 6767

Modified:
   trunk/mapbender/core/globalSettings.php
   trunk/mapbender/http/classes/class_mb_log.php
Log:
moved LOG_DIR to globalSettings

proper FirePHP initialization

Modified: trunk/mapbender/core/globalSettings.php
===================================================================
--- trunk/mapbender/core/globalSettings.php	2010-08-18 12:06:02 UTC (rev 6766)
+++ trunk/mapbender/core/globalSettings.php	2010-08-19 15:59:06 UTC (rev 6767)
@@ -99,6 +99,7 @@
 //
 // class for error handling
 //
+DEFINE("LOG_DIR", dirname(__FILE__) . "/../log/");		
 require_once(dirname(__FILE__)."/../http/classes/class_mb_exception.php");
 
 //
@@ -124,7 +125,6 @@
 //
 require_once(dirname(__FILE__)."/../lib/ajax.php");
 
-
 //
 // get real ip address, can be improved, see
 // http://roshanbh.com.np/2007/12/getting-real-ip-address-in-php.html

Modified: trunk/mapbender/http/classes/class_mb_log.php
===================================================================
--- trunk/mapbender/http/classes/class_mb_log.php	2010-08-18 12:06:02 UTC (rev 6766)
+++ trunk/mapbender/http/classes/class_mb_log.php	2010-08-19 15:59:06 UTC (rev 6767)
@@ -27,7 +27,7 @@
  * @package exceptionHandling
  */
 abstract class mb_log {
-	
+
 	/**
 	 * Appends a message to a given log file.
 	 * 
@@ -41,7 +41,7 @@
 		}
 		if ($this->isValidLevel($level)) {
 			if (defined("LOG_PHP_WITH_FIREPHP") && LOG_PHP_WITH_FIREPHP === "on") {
-				global $firephp;
+				$firephp = FirePHP::getInstance(true);
 				switch ($level) {
 					case "error":
 						$firephp->error($n);
@@ -137,7 +137,7 @@
 	/**
 	 * @var	string	the path to the log directory
 	 */
-	protected $dir = "../../log/";
+	protected $dir = LOG_DIR;
 
 	/**
 	 * @var	string	the prefix of the logs' file name