From kde-commits  Wed Aug 10 20:42:59 2011
From: Ingo Malchow <imalchow () kde ! org>
Date: Wed, 10 Aug 2011 20:42:59 +0000
To: kde-commits
Subject: www/media/includes/classes
Message-Id: <20110810204259.6CE03AC7CB () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=131300902000393

SVN commit 1246248 by imalchow:

some more verboseness with OOP

 M  +9 -7      class_handler404.inc  


--- trunk/www/media/includes/classes/class_handler404.inc #1246247:1246248
@@ -10,6 +10,8 @@
 	var $mapper = array();
 	var $dirmapper = array ();
 	var $address;
+	var $server;
+	var $uri;
 
 	function Handler404()
 	{
@@ -41,18 +43,18 @@
                         exit();
                 }
 
-		$uri = $_SERVER['REQUEST_URI'];
-		$server = $_SERVER['SERVER_NAME'];
+		$this->uri = $_SERVER['REQUEST_URI'];
+		$this->server = $_SERVER['SERVER_NAME'];
 
 		# remove trailing slash for mapping
-      		if (strlen($uri) > 1 && $uri[strlen($uri)-1] == "/")
+      		if (strlen($this->uri) > 1 && $this->uri[strlen($this->uri)-1] == "/")
 		{
-			$uri = substr($uri, 0, strlen($uri)-1);
+			$this->uri = substr($this->uri, 0, strlen($uri)-1);
 		}
 
-		if ($this->mapper[$uri])
+		if ($this->mapper[$this->uri])
 		{
-			header("Location: " . $this->mapper[$uri], true, 301);
+			header("Location: " . $this->mapper[$this->uri], true, 301);
 			exit();
 		}
 		
@@ -101,7 +103,7 @@
 			&& !strstr($_SERVER['REQUEST_URI'], "/es/") && !strstr($_SERVER['REQUEST_URI'], "/fr/")
 			&& !strstr($_SERVER['REQUEST_URI'], "/people/images/") && !strstr($_SERVER['REQUEST_URI'], "/international/"))
 			{
-				 mail($this->address, "404", "404 while requesting " . $_SERVER['REQUEST_URI'] . " from " . $_SERVER['HTTP_REFERER'] . " on host $server\n");
+				 mail($this->address, "404", "404 while requesting " . $_SERVER['REQUEST_URI'] . " from " . $_SERVER['HTTP_REFERER'] . " on host ".$this->server."\n");
 			}
 		}
 	}