reduce the number of always included libraries

[tt-rss.git] / db.php

diff --git a/db.php b/db.php
index 844bd0e418355ecbb8553869d28e96722e22ee1b..0682b58f829fa09dbd43ed14720cc1606f1bba0d 100644 (file)
--- a/db.php
+++ b/db.php
@@ -3,14 +3,14 @@
 require_once "config.php";
 
 function db_connect($host, $user, $pass, $db) {
-       if (DB_TYPE == "pgsql") {       
-                         
+       if (DB_TYPE == "pgsql") {
+
                $string = "dbname=$db user=$user";
-         
+
                if ($pass) {
-                       $string .= " password=$pass";   
+                       $string .= " password=$pass";
                }
-               
+
                if ($host) {
                        $string .= " host=$host";
                }
@@ -30,10 +30,10 @@ function db_connect($host, $user, $pass, $db) {
        } 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));
@@ -41,8 +41,10 @@ function db_connect($host, $user, $pass, $db) {
        }
 }
 
-function db_escape_string($s) {
-       if (DB_TYPE == "pgsql") {       
+function db_escape_string($s, $strip_tags = true) {
+       if ($strip_tags) $s = strip_tags($s);
+
+       if (DB_TYPE == "pgsql") {
                return pg_escape_string($s);
        } else {
                return mysql_real_escape_string($s);
@@ -50,12 +52,16 @@ function db_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 [$result]: " . pg_last_error($link));                   
+                               die("Query <i>$query</i> failed [$result]: " . pg_last_error($link));
                        }
                }
                return $result;
@@ -129,4 +135,8 @@ function db_last_error($link) {
        }
 }
 
+function db_quote($str){
+       return("'$str'");
+}
+
 ?>