allow connections to pgsql without password

[tt-rss.git] / db-prefs.php

diff --git a/db-prefs.php b/db-prefs.php
index 1c9bbd11659e94d057c98208ff2a3d173329ed39..bc047851259d3fb0f5b463b766c1875b64105cae 100644 (file)
--- a/db-prefs.php
+++ b/db-prefs.php
@@ -21,11 +21,12 @@
                }
 
                if ($profile) {
-                       $profile_qpart = "profile = '$profile'";
+                       $profile_qpart = "profile = '$profile' AND";
                } else {
-                       $profile_qpart = "profile IS NULL";
+                       $profile_qpart = "profile IS NULL AND";
                }
 
+               if (get_schema_version($link) < 63) $profile_qpart = "";
 
                if ($prefs_cache && !defined('DISABLE_SESSIONS') && !SINGLE_USER_MODE) {        
                        if ($_SESSION["prefs_cache"] && $_SESSION["prefs_cache"][$pref_name]) {
@@ -39,7 +40,7 @@
                        FROM 
                                ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types
                        WHERE 
-                               $profile_qpart AND
+                               $profile_qpart
                                ttrss_user_prefs.pref_name = '$pref_name' AND 
                                ttrss_prefs_types.id = type_id AND
                                owner_uid = '$user_id' AND
@@ -77,7 +78,7 @@
                }
        }
 
-       function set_pref($link, $key, $value, $user_id) {
+       function set_pref($link, $key, $value, $user_id = false) {
                $key = db_escape_string($key);
                $value = db_escape_string($value);
 
@@ -90,11 +91,13 @@
                }
 
                if ($profile) {
-                       $profile_qpart = "profile = '$profile'";
+                       $profile_qpart = "AND profile = '$profile'";
                } else {
-                       $profile_qpart = "profile IS NULL";
+                       $profile_qpart = "AND profile IS NULL";
                }
 
+               if (get_schema_version($link) < 63) $profile_qpart = "";
+
                $result = db_query($link, "SELECT type_name 
                        FROM ttrss_prefs,ttrss_prefs_types 
                        WHERE pref_name = '$key' AND type_id = ttrss_prefs_types.id");
@@ -119,7 +122,7 @@
 
                        db_query($link, "UPDATE ttrss_user_prefs SET 
                                value = '$value' WHERE pref_name = '$key' 
-                                       AND $profile_qpart
+                                       $profile_qpart
                                        AND owner_uid = " . $_SESSION["uid"]);
 
                        $_SESSION["prefs_cache"] = array();