X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=db.php;h=55768f3f66364909b06eb06d346a20138c863e59;hb=e8614131e893af473e0a585addb19d9f4e8b8973;hp=d739aa9b2ac5271efa5c8293cbc99ed7fdaa4849;hpb=8158c57a8e3a40338045e0b809bca42f1e703ca5;p=tt-rss.git

diff --git a/db.php b/db.php
index d739aa9b..55768f3f 100644
--- a/db.php
+++ b/db.php
@@ -5,14 +5,35 @@ require_once "config.php";
 function db_connect($host, $user, $pass, $db) {
 	if (DB_TYPE == "pgsql") {	
 			  
-		return pg_connect("host=$host dbname=$db user=$user password=$pass");
+		$string = "dbname=$db user=$user password=$pass";	
+		
+		if ($host) {
+			$string .= " host=$host";
+		}
+
+		if (defined('DB_PORT')) {
+			$string = "$string port=" . DB_PORT;
+		}
+
+		$link = pg_connect($string);
+
+		if (!$link) {
+			die("Connection failed: " . pg_last_error($link));
+		}
+
+		return $link;
 
 	} else if (DB_TYPE == "mysql") {
 		$link = mysql_connect($host, $user, $pass);
 		if ($link) {
-			mysql_select_db($db, $link);
+			$result = mysql_select_db($db, $link);			
+			if (!$result) {
+				die("Can't select DB: " . mysql_error($link));
+			}			
+			return $link;
+		} else {
+			die("Connection failed: " . mysql_error($link));
 		}
-		return $link;
 	}
 }
 
@@ -24,11 +45,31 @@ function db_escape_string($s) {
 	}
 }
 
+/* I hate MySQL :( */
+
+function db_escape_string_2($s, $link) {
+	if (DB_TYPE == "pgsql") {	
+		return pg_escape_string($s);
+	} else {
+		return mysql_real_escape_string($s, $link);
+	}
+}
+
 function db_query($link, $query) {
 	if (DB_TYPE == "pgsql") {
-		return pg_query($link, $query);
+		$result = pg_query($link, $query);
+		if (!$result) {
+			$query = htmlspecialchars($query); // just in case
+		  	die("Query <i>$query</i> failed: " . pg_last_error($link));			
+		}
+		return $result;
 	} else if (DB_TYPE == "mysql") {
-		return mysql_query($query, $link);
+		$result = mysql_query($query, $link);
+		if (!$result) {
+			$query = htmlspecialchars($query);
+		  	die("Query <i>$query</i> failed: " . mysql_error($link));
+		}
+		return $result;
 	}
 }
 
@@ -61,12 +102,17 @@ function db_fetch_result($result, $row, $param) {
 	if (DB_TYPE == "pgsql") {
 		return pg_fetch_result($result, $row, $param);
 	} else if (DB_TYPE == "mysql") {
-		// FIXME
-		$line = mysql_fetch_assoc($result);
-		return $line[$param];
+		// I hate incoherent naming of PHP functions
+		return mysql_result($result, $row, $param);
 	}
 }
 
+function db_unescape_string($str) {
+	$tmp = str_replace("\\\"", "\"", $str);
+	$tmp = str_replace("\\'", "'", $tmp);
+	return $tmp;
+}
+
 function db_close($link) {
 	if (DB_TYPE == "pgsql") {
 
@@ -76,3 +122,12 @@ function db_close($link) {
 		return mysql_close($link);
 	}
 }
+
+function db_affected_rows($link, $result) {
+	if (DB_TYPE == "pgsql") {
+		return pg_affected_rows($result);
+	} else if (DB_TYPE == "mysql") {
+		return mysql_affected_rows($link);
+	}
+}
+?>