-<?
+<?php
require_once "config.php";
function db_connect($host, $user, $pass, $db) {
- if (DB_TYPE == "pgsql") {
-
- $string = "dbname=$db user=$user password=$pass";
-
+ if (DB_TYPE == "pgsql") {
+
+ $string = "dbname=$db user=$user";
+
+ if ($pass) {
+ $string .= " password=$pass";
+ }
+
if ($host) {
$string .= " host=$host";
}
} else if (DB_TYPE == "mysql") {
$link = mysql_connect($host, $user, $pass);
if ($link) {
- $result = 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));
}
}
-function db_escape_string($s) {
- if (DB_TYPE == "pgsql") {
- return pg_escape_string($s);
- } else {
- return mysql_real_escape_string($s);
- }
-}
-
-/* I hate MySQL :( */
+function db_escape_string($s, $strip_tags = true) {
+ if ($strip_tags) $s = strip_tags($s);
-function db_escape_string_2($s, $link) {
- if (DB_TYPE == "pgsql") {
+ if (DB_TYPE == "pgsql") {
return pg_escape_string($s);
} else {
- return mysql_real_escape_string($s, $link);
+ return mysql_real_escape_string($s);
}
}
function db_query($link, $query, $die_on_error = true) {
+ //if ($_REQUEST["qlog"])
+ // error_log($_SESSION["uid"] . ":" . $_REQUEST["op"] . "/" . $_REQUEST["subop"] .
+ // " $query\n", 3, "/tmp/ttrss-query.log");
+
if (DB_TYPE == "pgsql") {
$result = pg_query($link, $query);
if (!$result) {
$query = htmlspecialchars($query); // just in case
if ($die_on_error) {
- die("Query <i>$query</i> failed: " . pg_last_error($link));
+ die("Query <i>$query</i> failed [$result]: " . pg_last_error($link));
}
}
return $result;
}
}
-function db_query_2($query) {
- if (DB_TYPE == "pgsql") {
- return pg_query($query);
- } else if (DB_TYPE == "mysql") {
- return mysql_query($link);
- }
-}
-
function db_fetch_assoc($result) {
if (DB_TYPE == "pgsql") {
return pg_fetch_assoc($result);
}
}
+function db_quote($str){
+ return("'$str'");
+}
+
?>