From fb0742394a2097a506a777f0bc7c285c07eb6a72 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 10 Nov 2010 13:14:44 +0300
Subject: [PATCH] remove error_reporting() hacks; set default error reporting
 level in functions.php

---
 backend.php        | 14 +-------------
 db-updater.php     |  7 ++-----
 digest.php         |  2 --
 functions.php      | 45 +++++++++------------------------------------
 localized_js.php   |  1 -
 opml.php           |  4 +---
 prefs.php          |  2 --
 register.php       |  7 ++-----
 tt-rss.php         |  2 --
 update.php         |  5 +----
 update_daemon2.php |  5 -----
 11 files changed, 16 insertions(+), 78 deletions(-)

diff --git a/backend.php b/backend.php
index 34f9c3b25..8b1454ad7 100644
--- a/backend.php
+++ b/backend.php
@@ -1,6 +1,4 @@
 <?php
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
 	/* remove ill effects of magic quotes */
 
 	if (get_magic_quotes_gpc()) {
@@ -16,23 +14,13 @@
 		$_REQUEST = array_map('stripslashes_deep', $_REQUEST);
 	}
 
+	require_once "functions.php";
 	require_once "sessions.php";
 	require_once "modules/backend-rpc.php";
-
-/*	if ($_REQUEST["debug"]) {
-		define('DEFAULT_ERROR_LEVEL', E_ALL);
-	} else {
-		define('DEFAULT_ERROR_LEVEL', E_ERROR | E_WARNING | E_PARSE);
-	}
-	
-	error_reporting(DEFAULT_ERROR_LEVEL); */
-
 	require_once "sanity_check.php";
 	require_once "config.php";
-	
 	require_once "db.php";
 	require_once "db-prefs.php";
-	require_once "functions.php";
 
 	no_cache_incantation();
 
diff --git a/db-updater.php b/db-updater.php
index 76e308856..09c16955b 100644
--- a/db-updater.php
+++ b/db-updater.php
@@ -1,10 +1,7 @@
 <?php
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-	require_once "sessions.php";
-	
-	require_once "sanity_check.php";
 	require_once "functions.php";
+	require_once "sessions.php";
+	require_once "sanity_check.php";
 	require_once "config.php";
 	require_once "db.php";
 	
diff --git a/digest.php b/digest.php
index d2bbfedb7..0d4934217 100644
--- a/digest.php
+++ b/digest.php
@@ -1,6 +1,4 @@
 <?php
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
 	require_once "functions.php"; 
 	require_once "sessions.php";
 	require_once "sanity_check.php";
diff --git a/functions.php b/functions.php
index 0448b6876..73fd93682 100644
--- a/functions.php
+++ b/functions.php
@@ -1,10 +1,7 @@
 <?php
 
 	date_default_timezone_set('UTC');
-
-	if ($_REQUEST["debug"]) {
-		define('DEFAULT_ERROR_LEVEL', E_ALL);
-	}
+	error_reporting(E_ALL & ~E_NOTICE);
 
 	require_once 'config.php';
 
@@ -365,7 +362,7 @@
 			curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
-			$contents = curl_exec($ch);
+			$contents = @curl_exec($ch);
 			if ($contents === false) {
 				curl_close($ch);
 				return false;
@@ -380,7 +377,7 @@
 
 			return $contents;
 		} else {
-			return file_get_contents($url);
+			return @file_get_contents($url);
 		}
 
 	}
@@ -485,8 +482,6 @@
 
 #		print "FAVICON [$site_url]: $favicon_url\n";
 
-		error_reporting(0);
-
 		$icon_file = ICONS_DIR . "/$feed.ico";
 
 		if ($favicon_url && !file_exists($icon_file)) {
@@ -502,9 +497,6 @@
 				}
 			}
 		}
-
-		error_reporting(DEFAULT_ERROR_LEVEL);
-
 	}
 
 	function update_rss_feed($link, $feed, $ignore_daemon = false) {
@@ -611,10 +603,6 @@
 			_debug("update_rss_feed: fetching [$fetch_url]...");
 		}
 
-		if (!defined('DAEMON_EXTENDED_DEBUG') && !$_REQUEST['xdebug']) {
-			error_reporting(0);
-		}
-
 		$obj_id = md5("FDATA:$use_simplepie:$fetch_url");
 
 		if ($memcache && $obj = $memcache->get($obj_id)) {
@@ -628,7 +616,7 @@
 		} else {
 
 			if (!$use_simplepie) {
-				$rss = fetch_rss($fetch_url);
+				$rss = @fetch_rss($fetch_url);
 			} else {
 				if (!is_dir(SIMPLEPIE_CACHE_DIR)) {
 					mkdir(SIMPLEPIE_CACHE_DIR);
@@ -668,8 +656,6 @@
 
 		if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
 			_debug("update_rss_feed: fetch done, parsing...");
-		} else {
-			error_reporting (DEFAULT_ERROR_LEVEL);
 		}
 
 		$feed = db_escape_string($feed);
@@ -1134,8 +1120,6 @@
 						$dupcheck_qpart = "";
 					}
 
-//					error_reporting(0);
-
 					/* Collect article tags here so we could filter by them: */
 
 					$article_filters = get_article_filters($filters, $entry_title, 
@@ -1153,8 +1137,6 @@
 						continue;
 					}
 
-//					error_reporting (DEFAULT_ERROR_LEVEL);
-
 					$score = calculate_article_score($article_filters);
 
 					if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
@@ -2261,8 +2243,6 @@
 
 	function sanity_check($link) {
 
-		error_reporting(0);
-
 		$error_code = 0;
 		$schema_version = get_schema_version($link);
 
@@ -2281,8 +2261,6 @@
 			$error_code = 12;
 		}
 
-		error_reporting (DEFAULT_ERROR_LEVEL);
-
 		if ($error_code != 0) {
 			print_error_xml($error_code);
 			return false;
@@ -2293,9 +2271,7 @@
 
 	function file_is_locked($filename) {
 		if (function_exists('flock')) {
-			error_reporting(0);
-			$fp = fopen(LOCK_DIRECTORY . "/$filename", "r");
-			error_reporting(DEFAULT_ERROR_LEVEL);
+			$fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
 			if ($fp) {
 				if (flock($fp, LOCK_EX | LOCK_NB)) {
 					flock($fp, LOCK_UN);
@@ -3232,7 +3208,7 @@
 
 			if (time() - $_SESSION["daemon_stamp_check"] > 30) {
 
-				$stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+				$stamp = (int) @file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
 
 				if ($stamp) {
 					$stamp_delta = time() - $stamp;
@@ -3256,7 +3232,7 @@
 		if (CHECK_FOR_NEW_VERSION && $_SESSION["access_level"] >= 10) {
 			
 			if ($_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
-				$new_version_details = check_for_update($link);
+				$new_version_details = @check_for_update($link);
 
 				print "<param key=\"new_version_available\" value=\"".
 					sprintf("%d", $new_version_details != ""). "\"/>";
@@ -3950,18 +3926,15 @@
 			return;
 		}
 
-		error_reporting(0);
 		if (DEFAULT_UPDATE_METHOD == "1") {
 			$rss = new SimplePie();
 			$rss->set_useragent(SIMPLEPIE_USERAGENT . MAGPIE_USER_AGENT_EXT);
-//			$rss->set_timeout(MAGPIE_FETCH_TIME_OUT);
 			$rss->set_feed_url($fetch_url);
 			$rss->set_output_encoding('UTF-8');
 			$rss->init();
 		} else {
 			$rss = fetch_rss($releases_feed);
 		}
-		error_reporting (DEFAULT_ERROR_LEVEL);
 
 		if ($rss) {
 
@@ -5100,8 +5073,6 @@
 
 			$lnum = $limit*$offset;
 
-			error_reporting (DEFAULT_ERROR_LEVEL);
-	
 			$num_unread = 0;
 			$cur_feed_title = '';
 
@@ -6859,6 +6830,8 @@
 		$url     = fix_url($url);
 		$baseUrl = substr($url, 0, strrpos($url, '/') + 1);
 
+		libxml_use_internal_errors(true);
+
 		$doc = new DOMDocument();
 		$doc->loadHTMLFile($url);
 		$xpath = new DOMXPath($doc);
diff --git a/localized_js.php b/localized_js.php
index 0d66da575..08eec1aff 100644
--- a/localized_js.php
+++ b/localized_js.php
@@ -1,5 +1,4 @@
 <?php
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
 	define('DISABLE_SESSIONS', true);
 
 	require "functions.php";
diff --git a/opml.php b/opml.php
index 98f4a95aa..296f43bed 100644
--- a/opml.php
+++ b/opml.php
@@ -1,9 +1,7 @@
 <?php
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
+	require_once "functions.php";
 	require_once "sessions.php";
 	require_once "sanity_check.php";
-	require_once "functions.php";
 	require_once "config.php";
 	require_once "db.php";
 	require_once "db-prefs.php";
diff --git a/prefs.php b/prefs.php
index c6d2605b9..5cedb4f6f 100644
--- a/prefs.php
+++ b/prefs.php
@@ -1,6 +1,4 @@
 <?php
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
 	require_once "functions.php"; 
 	require_once "sessions.php";
 	require_once "sanity_check.php";
diff --git a/register.php b/register.php
index 9969d83ba..bd80a4df3 100644
--- a/register.php
+++ b/register.php
@@ -4,14 +4,11 @@
 	// 1) templates/register_notice.txt - displayed above the registration form
 	// 2) register_expire_do.php - contains user expiration queries when necessary
 
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
 	$action = $_REQUEST["action"];
 
-	require_once "sessions.php";
-	
-	require_once "sanity_check.php";
 	require_once "functions.php";
+	require_once "sessions.php";
+	require_once "sanity_check.php";
 	require_once "config.php";
 	require_once "db.php";
 	
diff --git a/tt-rss.php b/tt-rss.php
index 5375309ce..1452bd297 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -1,6 +1,4 @@
 <?php
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
 	require_once "functions.php"; 
 	require_once "sessions.php";
 	require_once "sanity_check.php";
diff --git a/update.php b/update.php
index 50b9fc412..64b5795fa 100755
--- a/update.php
+++ b/update.php
@@ -1,18 +1,15 @@
 #!/usr/bin/php
 <?php
-	define('DEFAULT_ERROR_LEVEL', E_ERROR | E_WARNING | E_PARSE);
 	define('DISABLE_SESSIONS', true);
 
 	if (!defined('PHP_EXECUTABLE'))
 		define('PHP_EXECUTABLE', '/usr/bin/php');
 
-	error_reporting(DEFAULT_ERROR_LEVEL);
-
+	require_once "functions.php";
 	require_once "sanity_check.php";
 	require_once "config.php";
 	require_once "db.php";
 	require_once "db-prefs.php";
-	require_once "functions.php";
 
 	$op = $argv[1];
 
diff --git a/update_daemon2.php b/update_daemon2.php
index d7141c878..5ffc4f549 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -3,9 +3,6 @@
 	// This is an experimental multiprocess update daemon.
 	// Some configurable variable may be found below.
 
-	// define('DEFAULT_ERROR_LEVEL', E_ALL);
-	define('DEFAULT_ERROR_LEVEL', E_ERROR | E_WARNING | E_PARSE);
-
 	declare(ticks = 1);
 
 	define('DISABLE_SESSIONS', true);
@@ -38,8 +35,6 @@
 	require_once "functions.php";
 	require_once "lib/magpierss/rss_fetch.inc";
 
-	error_reporting(DEFAULT_ERROR_LEVEL);
-
 	$children = array();
 	$ctimes = array();