add master .pot; update translations

[tt-rss.git] / db.php

diff --git a/db.php b/db.php
index d8187fc3bcf65808bfe674d383fda7b19aec27d4..9b1ce5d84cc2319230d6d467a37b9d1208523fc4 100644 (file)
--- a/db.php
+++ b/db.php
@@ -5,7 +5,11 @@ require_once "config.php";
 function db_connect($host, $user, $pass, $db) {
        if (DB_TYPE == "pgsql") {       
                          
-               $string = "dbname=$db user=$user password=$pass";       
+               $string = "dbname=$db user=$user";
+         
+               if ($pass) {
+                       $string .= " password=$pass";   
+               }
                
                if ($host) {
                        $string .= " host=$host";
@@ -37,21 +41,13 @@ function db_connect($host, $user, $pass, $db) {
        }
 }
 
-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") {       
                return pg_escape_string($s);
        } else {
-               return mysql_real_escape_string($s, $link);
+               return mysql_real_escape_string($s);
        }
 }
 
@@ -77,14 +73,6 @@ function db_query($link, $query, $die_on_error = true) {
        }
 }
 
-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);