X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fpref%2Fprefs.php;h=faab69235504c66097fc3baf1717f91f4ea19ef5;hb=6322ac79a020ab584d412d782d62b2ee77d7c6cf;hp=938782b51df06d35efa1216c350badaffe0ee95e;hpb=58a2577d48790c79adfd44bcfd662c980ce6cfe4;p=tt-rss.git diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 938782b5..faab6923 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -30,7 +30,7 @@ class Pref_Prefs extends Handler_Protected { "COMBINED_DISPLAY_MODE" => array(__("Combined feed display"), __("Display expanded list of feed articles, instead of separate displays for headlines and article content")), "CONFIRM_FEED_CATCHUP" => array(__("Confirm marking feed as read"), ""), "DEFAULT_ARTICLE_LIMIT" => array(__("Amount of articles to display at once"), ""), - "DEFAULT_UPDATE_INTERVAL" => array(__("Default interval between feed updates"), ""), + "DEFAULT_UPDATE_INTERVAL" => array(__("Default feed update interval"), __("Shortest interval at which a feed will be checked for updates regardless of update method")), "DIGEST_CATCHUP" => array(__("Mark articles in e-mail digest as read"), ""), "DIGEST_ENABLE" => array(__("Enable e-mail digest"), __("This option enables sending daily digest of new (and unread) headlines on your configured e-mail address")), "DIGEST_PREFERRED_TIME" => array(__("Try to send digests around specified time"), __("Uses UTC timezone")), @@ -53,7 +53,8 @@ class Pref_Prefs extends Handler_Protected { "STRIP_UNSAFE_TAGS" => array(__("Strip unsafe tags from articles"), __("Strip all but most common HTML tags when reading articles.")), "USER_STYLESHEET" => array(__("Customize stylesheet"), __("Customize CSS stylesheet to your liking")), "USER_TIMEZONE" => array(__("User timezone"), ""), - "VFEED_GROUP_BY_FEED" => array(__("Group headlines in virtual feeds"), __("Special feeds, labels, and categories are grouped by originating feeds")) + "VFEED_GROUP_BY_FEED" => array(__("Group headlines in virtual feeds"), __("Special feeds, labels, and categories are grouped by originating feeds")), + "USER_CSS_THEME" => array(__("Select theme"), __("Select one of the available CSS themes")) ); } @@ -98,32 +99,48 @@ class Pref_Prefs extends Handler_Protected { if (!isset($_POST[$pref])) $_POST[$pref] = 'false'; } + $need_reload = false; + foreach (array_keys($_POST) as $pref_name) { - $pref_name = db_escape_string($this->link, $pref_name); - $value = db_escape_string($this->link, $_POST[$pref_name]); + $pref_name = db_escape_string( $pref_name); + $value = db_escape_string( $_POST[$pref_name]); if ($pref_name == 'DIGEST_PREFERRED_TIME') { - if (get_pref($this->link, 'DIGEST_PREFERRED_TIME') != $value) { + if (get_pref( 'DIGEST_PREFERRED_TIME') != $value) { - db_query($this->link, "UPDATE ttrss_users SET + db_query( "UPDATE ttrss_users SET last_digest_sent = NULL WHERE id = " . $_SESSION['uid']); } } - set_pref($this->link, $pref_name, $value); + if ($pref_name == "language") { + if ($_SESSION["language"] != $value) { + setcookie("ttrss_lang", $value, + time() + SESSION_COOKIE_LIFETIME); + $_SESSION["language"] = $value; + + $need_reload = true; + } + } else { + set_pref( $pref_name, $value); + } } - print __("The configuration was saved."); + if ($need_reload) { + print "PREFS_NEED_RELOAD"; + } else { + print __("The configuration was saved."); + } } function getHelp() { - $pref_name = db_escape_string($this->link, $_REQUEST["pn"]); + $pref_name = db_escape_string( $_REQUEST["pn"]); - $result = db_query($this->link, "SELECT help_text FROM ttrss_prefs + $result = db_query( "SELECT help_text FROM ttrss_prefs WHERE pref_name = '$pref_name'"); if (db_num_rows($result) > 0) { @@ -136,12 +153,12 @@ class Pref_Prefs extends Handler_Protected { function changeemail() { - $email = db_escape_string($this->link, $_POST["email"]); - $full_name = db_escape_string($this->link, $_POST["full_name"]); + $email = db_escape_string( $_POST["email"]); + $full_name = db_escape_string( $_POST["full_name"]); $active_uid = $_SESSION["uid"]; - db_query($this->link, "UPDATE ttrss_users SET email = '$email', + db_query( "UPDATE ttrss_users SET email = '$email', full_name = '$full_name' WHERE id = '$active_uid'"); print __("Your personal data has been saved."); @@ -159,10 +176,12 @@ class Pref_Prefs extends Handler_Protected { $profile_qpart = "profile IS NULL"; } - db_query($this->link, "DELETE FROM ttrss_user_prefs + db_query( "DELETE FROM ttrss_user_prefs WHERE $profile_qpart AND owner_uid = ".$_SESSION["uid"]); - initialize_user_prefs($this->link, $_SESSION["uid"], $_SESSION["profile"]); + initialize_user_prefs( $_SESSION["uid"], $_SESSION["profile"]); + + echo __("Your preferences are now set to default values."); } function index() { @@ -206,7 +225,7 @@ class Pref_Prefs extends Handler_Protected { print "