misc updater tweaks

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

diff --git a/db-prefs.php b/db-prefs.php
index 80d890fbc249973e03e068c1da85d7cf5bcb20c2..0858c2ce46a773236a774f184e4524fd8eea8423 100644 (file)
--- a/db-prefs.php
+++ b/db-prefs.php
@@ -1,15 +1,13 @@
-<?
+<?php
        require_once "config.php";
        require_once "db.php";
 
-       if (! DISABLE_SESSIONS) {       
-               session_start();
-               
+       if (!defined('DISABLE_SESSIONS') && !SINGLE_USER_MODE) {
                if (!$_SESSION["prefs_cache"])
                        $_SESSION["prefs_cache"] = array();
        }
 
-       function get_pref($link, $pref_name, $user_id = false) {
+       function get_pref($link, $pref_name, $user_id = false, $die_on_error = false) {
 
                $pref_name = db_escape_string($pref_name);
 
@@ -19,10 +17,12 @@
                        $user_id = sprintf("%d", $user_id);
                        $prefs_cache = false;
                }
-       
-               if ($_SESSION["prefs_cache"] && $_SESSION["prefs_cache"][$pref_name]) {
-                       $tuple = $_SESSION["prefs_cache"][$pref_name];
-                       return convert_pref_type($tuple["value"], $tuple["type"]);
+
+               if (!defined('DISABLE_SESSIONS') && !SINGLE_USER_MODE) {        
+                       if ($_SESSION["prefs_cache"] && $_SESSION["prefs_cache"][$pref_name]) {
+                               $tuple = $_SESSION["prefs_cache"][$pref_name];
+                               return convert_pref_type($tuple["value"], $tuple["type"]);
+                       }
                }
 
                $result = db_query($link, "SELECT 
@@ -39,14 +39,21 @@
                        $value = db_fetch_result($result, 0, "value");
                        $type_name = db_fetch_result($result, 0, "type_name");
 
-                       if ($user_id = $_SESSION["uid"]) {
-                               $_SESSION["prefs_cache"][$pref_name]["type"] = $type_name;
-                               $_SESSION["prefs_cache"][$pref_name]["value"] = $value;
+                       if (!defined('DISABLE_SESSIONS') && !SINGLE_USER_MODE) {        
+                               if ($user_id = $_SESSION["uid"]) {
+                                       $_SESSION["prefs_cache"][$pref_name]["type"] = $type_name;
+                                       $_SESSION["prefs_cache"][$pref_name]["value"] = $value;
+                               }
                        }
+
                        return convert_pref_type($value, $type_name);
                        
                } else {                
-                       die("Fatal error, unknown preferences key: $pref_name");                        
+                       if ($die_on_error) {
+                               die("Fatal error, unknown preferences key: $pref_name");
+                       } else {
+                               return null;
+                       }
                }
        }