Debug info cleanup

e107_handlers/e107_class.php

@@ -339,7 +339,6 @@ class e107
 	 */
 	protected function _init($e107_paths, $e107_root_path, $e107_config_mysql_info, $e107_config_override = array())
 	{
-
 		if(empty($this->e107_dirs))
 		{
 			// Do some security checks/cleanup, prepare the environment
@@ -2861,6 +2860,10 @@ class e107
 			if(preg_match($regex,$input))
 			{
 				header('HTTP/1.0 400 Bad Request', true, 400);
+				if(deftrue('e_DEBUG'))
+				{
+					echo "Bad Request: ".__METHOD__." : ". __LINE__;
+				}
 				exit();
 			}
 
@@ -2869,12 +2872,20 @@ class e107
 			if(preg_match($regex,$input))
 			{
 				header('HTTP/1.0 400 Bad Request', true, 400);
+				if(deftrue('e_DEBUG'))
+				{
+					echo "Bad Request: ".__METHOD__." : ". __LINE__;
+				}
 				exit();
 			}
 
-			if(preg_match("/system *?\((.*);.*\)/i",$input))
+			if(preg_match("/system\((.*);.*\)/i",$input))
 			{
 				header('HTTP/1.0 400 Bad Request', true, 400);
+				if(deftrue('e_DEBUG'))
+				{
+					echo "Bad Request: ".__METHOD__." : ". __LINE__;
+				}
 				exit();	
 			}
 			
@@ -2882,6 +2893,10 @@ class e107
 			if(preg_match($regex,$input))
 			{
 				header('HTTP/1.0 400 Bad Request', true, 400);
+				if(deftrue('e_DEBUG'))
+				{
+					echo "Bad Request: ".__METHOD__." : ". __LINE__;
+				}
 				exit();
 			}
 		
@@ -2900,12 +2915,20 @@ class e107
 			{
 	
 				header('HTTP/1.0 400 Bad Request', true, 400);
+				if(deftrue('e_DEBUG'))
+				{
+					echo "Bad Request: ".__METHOD__." : ". __LINE__;
+				}
 				exit();
 			}
 						
 			if(($key == "HTTP_USER_AGENT") && strpos($input,"libwww-perl")!==FALSE)
 			{
 				header('HTTP/1.0 400 Bad Request', true, 400);
+				if(deftrue('e_DEBUG'))
+				{
+					echo "Bad Request: ".__METHOD__." : ". __LINE__;
+				}
 				exit();	
 			}
 			
@@ -2915,6 +2938,10 @@ class e107
 		if(strpos(str_replace('.', '', $input), '22250738585072011') !== FALSE) // php-bug 53632
 		{
 			header('HTTP/1.0 400 Bad Request', true, 400);
+			if(deftrue('e_DEBUG'))
+			{
+				echo "Bad Request: ".__METHOD__." : ". __LINE__;
+			}
 			exit();
 		} 
 		

e107_handlers/e_parse_class.php

@@ -1593,10 +1593,11 @@ class e_parse extends e_parser
 					elseif(substr($sub_blk, 0, 6) == '<style')
 					{
 						// Its a style block - just pass it through unaltered - except, do we need the line break stuff? - QUERY XXX-01
-						if(DB_INF_SHOW)
+						if(defined('DB_INF_SHOW'))
 						{
 							echo "Processing stylesheet: {$sub_blk}<br />";
 						}
+
 						$ret_parser .= $sub_blk;
 					}
 					else

e107_handlers/notify_class.php

@@ -40,7 +40,7 @@ class notify
 	{
 		$active = e107::getConfig()->get('notify');
 
-		if(empty($active))
+		if(empty($active) && e_PAGE == 'notify.php')
 		{
 			e107::getMessage()->addDebug('Notify is disabled!');
 			return false;