misc updater tweaks

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

diff --git a/db-prefs.php b/db-prefs.php
index 16278c54045db3e5297053b1c623479663be0b67..0858c2ce46a773236a774f184e4524fd8eea8423 100644 (file)
--- a/db-prefs.php
+++ b/db-prefs.php
@@ -1,13 +1,30 @@
-<?
-       // TODO cache last query results
-
+<?php
        require_once "config.php";
        require_once "db.php";
 
-       function get_pref($link, $pref_name) {
+       if (!defined('DISABLE_SESSIONS') && !SINGLE_USER_MODE) {
+               if (!$_SESSION["prefs_cache"])
+                       $_SESSION["prefs_cache"] = array();
+       }
+
+       function get_pref($link, $pref_name, $user_id = false, $die_on_error = false) {
 
                $pref_name = db_escape_string($pref_name);
 
+               if (!$user_id) {
+                       $user_id = $_SESSION["uid"];
+               } else {
+                       $user_id = sprintf("%d", $user_id);
+                       $prefs_cache = false;
+               }
+
+               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 
                        value,ttrss_prefs_types.type_name as type_name 
                        FROM 
@@ -15,24 +32,52 @@
                        WHERE 
                                ttrss_user_prefs.pref_name = '$pref_name' AND 
                                ttrss_prefs_types.id = type_id AND
-                               owner_uid = ".$_SESSION["uid"]." AND
+                               owner_uid = '$user_id' AND
                                ttrss_user_prefs.pref_name = ttrss_prefs.pref_name");
 
                if (db_num_rows($result) > 0) {
                        $value = db_fetch_result($result, 0, "value");
                        $type_name = db_fetch_result($result, 0, "type_name");
 
-                       if ($type_name == "bool") {                     
-                               return $value == "true";                                
-                       } else if ($type_name == "integer") {                   
-                               return sprintf("%d", $value);                           
-                       } else {
-                               return $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;
+                       }
                }
        }
 
+       function convert_pref_type($value, $type_name) {
+               if ($type_name == "bool") {                     
+                       return $value == "true";                                
+               } else if ($type_name == "integer") {                   
+                       return sprintf("%d", $value);                           
+               } else {
+                       return $value;
+               }
+       }
+
+       // doesn't peform any type checking, be vigilant
+       
+       function set_pref($link, $key, $value) {
+               $key = db_escape_string($key);
+               $value = db_escape_string($value);
+       
+               db_query($link, "UPDATE ttrss_user_prefs SET 
+                       value = '$value' WHERE pref_name = '$key' 
+                               AND owner_uid = " . $_SESSION["uid"]);
+
+               $_SESSION["prefs_cache"] = array();
+
+       }
 ?>