blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

prefs caching improvements

Browse source
This commit is contained in:
Andrew Dolgov 2011-11-11 10:01:56 +04:00
parent c648997b1c
commit afba49c39a
1 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
db-prefs.php
View file

@ -21,7 +21,7 @@
//$prefs_cache = false; //$prefs_cache = false;
} }
if ($prefs_cache && !defined('DISABLE_SESSIONS') && !SINGLE_USER_MODE) { if ($prefs_cache && !defined('DISABLE_SESSIONS')) {
if ($_SESSION["prefs_cache"] && @$_SESSION["prefs_cache"][$pref_name]) { if ($_SESSION["prefs_cache"] && @$_SESSION["prefs_cache"][$pref_name]) {
$tuple = $_SESSION["prefs_cache"][$pref_name]; $tuple = $_SESSION["prefs_cache"][$pref_name];
return convert_pref_type($tuple["value"], $tuple["type"]); return convert_pref_type($tuple["value"], $tuple["type"]);
@ -51,8 +51,8 @@
$value = db_fetch_result($result, 0, "value"); $value = db_fetch_result($result, 0, "value");
$type_name = db_fetch_result($result, 0, "type_name"); $type_name = db_fetch_result($result, 0, "type_name");
if (!defined('DISABLE_SESSIONS') && !SINGLE_USER_MODE) { if (!defined('DISABLE_SESSIONS')) {
if ($user_id = $_SESSION["uid"]) { if ($user_id == $_SESSION["uid"]) {
$_SESSION["prefs_cache"][$pref_name]["type"] = $type_name; $_SESSION["prefs_cache"][$pref_name]["type"] = $type_name;
$_SESSION["prefs_cache"][$pref_name]["value"] = $value; $_SESSION["prefs_cache"][$pref_name]["value"] = $value;
} }
@ -79,8 +79,8 @@
} }
} }
function set_pref($link, $key, $value, $user_id = false) { function set_pref($link, $pref_name, $value, $user_id = false) {
$key = db_escape_string($key); $pref_name = db_escape_string($pref_name);
$value = db_escape_string($value); $value = db_escape_string($value);
if (!$user_id) { if (!$user_id) {
@ -99,14 +99,28 @@
if (get_schema_version($link) < 63) $profile_qpart = ""; if (get_schema_version($link) < 63) $profile_qpart = "";
$result = db_query($link, "SELECT type_name $type_name = "";
FROM ttrss_prefs,ttrss_prefs_types $current_value = "";
WHERE pref_name = '$key' AND type_id = ttrss_prefs_types.id");
if (db_num_rows($result) > 0) { if (!defined('DISABLE_SESSIONS')) {
if ($_SESSION["prefs_cache"] && @$_SESSION["prefs_cache"][$pref_name]) {
$type_name = $_SESSION["prefs_cache"][$pref_name]["type"];
$current_value = $_SESSION["prefs_cache"][$pref_name]["value"];
}
}
$type_name = db_fetch_result($result, 0, "type_name"); if (!$type_name) {
$result = db_query($link, "SELECT type_name
FROM ttrss_prefs,ttrss_prefs_types
WHERE pref_name = '$pref_name' AND type_id = ttrss_prefs_types.id");
if (db_num_rows($result) > 0)
$type_name = db_fetch_result($result, 0, "type_name");
} else if ($current_value == $value) {
return;
}
if ($type_name) {
if ($type_name == "bool") { if ($type_name == "bool") {
if ($value == "1" || $value == "true") { if ($value == "1" || $value == "true") {
$value = "true"; $value = "true";
@ -117,26 +131,25 @@
$value = sprintf("%d", $value); $value = sprintf("%d", $value);
} }
if ($key == 'DEFAULT_ARTICLE_LIMIT' && $value == 0) { if ($pref_name == 'DEFAULT_ARTICLE_LIMIT' && $value == 0) {
$value = 30; $value = 30;
} }
if ($key == 'USER_TIMEZONE' && $value == '') { if ($pref_name == 'USER_TIMEZONE' && $value == '') {
$value = 'UTC'; $value = 'UTC';
} }
db_query($link, "UPDATE ttrss_user_prefs SET db_query($link, "UPDATE ttrss_user_prefs SET
value = '$value' WHERE pref_name = '$key' value = '$value' WHERE pref_name = '$pref_name'
$profile_qpart $profile_qpart
AND owner_uid = " . $_SESSION["uid"]); AND owner_uid = " . $_SESSION["uid"]);
if (!defined('DISABLE_SESSIONS') && !SINGLE_USER_MODE) { if (!defined('DISABLE_SESSIONS')) {
if ($user_id = $_SESSION["uid"]) { if ($user_id == $_SESSION["uid"]) {
$_SESSION["prefs_cache"][$pref_name]["type"] = $type_name; $_SESSION["prefs_cache"][$pref_name]["type"] = $type_name;
$_SESSION["prefs_cache"][$pref_name]["value"] = $value; $_SESSION["prefs_cache"][$pref_name]["value"] = $value;
} }
} }
} }
} }
?> ?>