purge feeds after updating

[tt-rss.git] / modules / pref-prefs.php

diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index 2564f30e4bab78e569eeed4020f842e446338ef6..80a63cb9e6a10d65d26f22d5aece5f4bd9abbf47 100644 (file)
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -8,8 +8,18 @@
        }
 
        function module_pref_prefs($link) {
+
+               global $access_level_names;
+
                $subop = $_REQUEST["subop"];
 
+               $prefs_blacklist = array("HIDE_FEEDLIST", "SYNC_COUNTERS", "ENABLE_LABELS");
+
+               if (FORCE_ARTICLE_PURGE != 0) {
+                       array_push($prefs_blacklist, "PURGE_OLD_DAYS");
+                       array_push($prefs_blacklist, "PURGE_UNREAD_ARTICLES");
+               }
+
                if ($subop == "change-password") {
 
                        $old_pw = $_POST["OLD_PASSWORD"];
@@ -31,8 +41,12 @@
                                return;
                        }
 
-                       $old_pw_hash = 'SHA1:' . sha1($_POST["OLD_PASSWORD"]);
-                       $new_pw_hash = 'SHA1:' . sha1($_POST["NEW_PASSWORD"]);
+                       $old_pw_hash1 = encrypt_password($_POST["OLD_PASSWORD"]);
+                       $old_pw_hash2 = encrypt_password($_POST["OLD_PASSWORD"],
+                               $_SESSION["name"]);
+
+                       $new_pw_hash = encrypt_password($_POST["NEW_PASSWORD"],
+                               $_SESSION["name"]);
 
                        $active_uid = $_SESSION["uid"];
                        
@@ -41,8 +55,8 @@
                                $login = db_escape_string($_SERVER['PHP_AUTH_USER']);
 
                                $result = db_query($link, "SELECT id FROM ttrss_users WHERE 
-                                       id = '$active_uid' AND (pwd_hash = '$old_pw' OR 
-                                               pwd_hash = '$old_pw_hash')");
+                                       id = '$active_uid' AND (pwd_hash = '$old_pw_hash1' OR 
+                                               pwd_hash = '$old_pw_hash2')");
 
                                if (db_num_rows($result) == 1) {
                                        db_query($link, "UPDATE ttrss_users SET pwd_hash = '$new_pw_hash' 
@@ -142,7 +156,7 @@
 
                        return;
 
-               } else if ($subop == __("Change theme")) {
+               } else if ($subop == "change-theme") {
 
                        $theme = db_escape_string($_POST["theme"]);
 
@@ -212,15 +226,26 @@
                                print "<table width=\"100%\" class=\"prefPrefsList\">";
                                print "<tr><td colspan='3'><h3>".__("Personal data")."</h3></tr></td>";
 
-                               $result = db_query($link, "SELECT email FROM ttrss_users
+                               $result = db_query($link, "SELECT email,access_level FROM ttrss_users
                                        WHERE id = ".$_SESSION["uid"]);
                                        
                                $email = db_fetch_result($result, 0, "email");
        
-                               print "<tr><td width=\"40%\">E-mail</td>";
-                               print "<td><input class=\"editbox\" name=\"email\" 
+                               print "<tr><td width=\"40%\">".__('E-mail')."</td>";
+                               print "<td class=\"prefValue\"><input class=\"editbox\" name=\"email\" 
+                                       onfocus=\"javascript:disableHotkeys();\" 
+                                       onblur=\"javascript:enableHotkeys();\"
                                        onkeypress=\"return filterCR(event, changeUserEmail)\"
                                        value=\"$email\"></td></tr>";
+
+                               if (!SINGLE_USER_MODE) {
+
+                                       $access_level = db_fetch_result($result, 0, "access_level");
+
+                                       print "<tr><td width=\"40%\">".__('Access level')."</td>";
+                                       print "<td>" . $access_level_names[$access_level] . "</td></tr>";
+
+                               }
        
                                print "</table>";
        
@@ -239,19 +264,25 @@
                                print "<tr><td colspan='3'><h3>".__("Authentication")."</h3></tr></td>";
        
                                print "<tr><td width=\"40%\">".__("Old password")."</td>";
-                               print "<td><input class=\"editbox\" type=\"password\"
+                               print "<td class=\"prefValue\"><input class=\"editbox\" type=\"password\"
+                                       onfocus=\"javascript:disableHotkeys();\" 
+                                       onblur=\"javascript:enableHotkeys();\"
                                        onkeypress=\"return filterCR(event, changeUserPassword)\"
                                        name=\"OLD_PASSWORD\"></td></tr>";
        
                                print "<tr><td width=\"40%\">".__("New password")."</td>";
                                
-                               print "<td><input class=\"editbox\" type=\"password\"
+                               print "<td class=\"prefValue\"><input class=\"editbox\" type=\"password\"
+                                       onfocus=\"javascript:disableHotkeys();\" 
+                                       onblur=\"javascript:enableHotkeys();\"
                                        onkeypress=\"return filterCR(event, changeUserPassword)\"
                                        name=\"NEW_PASSWORD\"></td></tr>";
 
                                print "<tr><td width=\"40%\">".__("Confirm password")."</td>";
 
-                               print "<td><input class=\"editbox\" type=\"password\"
+                               print "<td class=\"prefValue\"><input class=\"editbox\" type=\"password\"
+                                       onfocus=\"javascript:disableHotkeys();\" 
+                                       onblur=\"javascript:enableHotkeys();\"
                                        onkeypress=\"return filterCR(event, changeUserPassword)\"
                                        name=\"CONFIRM_PASSWORD\"></td></tr>";
 
@@ -297,7 +328,7 @@
                                print "</select></td></tr>";
                                print "</table>";
                                print "<input type=\"hidden\" name=\"op\" value=\"pref-prefs\">";
-                               print "<input type=\"hidden\" name=\"subop\" value=\"Change theme\">";
+                               print "<input type=\"hidden\" name=\"subop\" value=\"change-theme\">";
                                print "<p><input class=\"button\" type=\"submit\" 
                                        value=\"".__('Change theme')."\">";
                                print "</form>";
@@ -316,7 +347,8 @@
                                        owner_uid = ".$_SESSION["uid"]."
                                ORDER BY section_id,short_desc");
 
-                       print "<form action=\"backend.php\" method=\"POST\" id=\"pref_prefs_form\">";
+                       print "<form onsubmit='return false' action=\"backend.php\" 
+                               method=\"POST\" id=\"pref_prefs_form\">";
 
                        $lnum = 0;
 
@@ -324,6 +356,10 @@
        
                        while ($line = db_fetch_assoc($result)) {
 
+                               if (in_array($line["pref_name"], $prefs_blacklist)) {
+                                       continue;
+                               }
+
                                if ($active_section != $line["section_name"]) {
 
                                        if ($active_section != "") {
@@ -351,13 +387,13 @@
                                $def_value = $line["def_value"];
                                $help_text = $line["help_text"];
 
-                               print "<td width=\"40%\" id=\"$pref_name\">" . __($line["short_desc"]);
+                               print "<td width=\"40%\" class=\"prefName\" id=\"$pref_name\">" . __($line["short_desc"]);
 
                                if ($help_text) print "<div class=\"prefHelp\">".__($help_text)."</div>";
                                
                                print "</td>";
 
-                               print "<td>";
+                               print "<td class=\"prefValue\">";
 
                                if ($type_name == "bool") {
 //                                     print_select($pref_name, $value, array("true", "false"));
@@ -371,7 +407,10 @@
                                        print_radio($pref_name, $value, __("Yes"), array(__("Yes"), __("No")));
                        
                                } else {
-                                       print "<input class=\"editbox\" name=\"$pref_name\" value=\"$value\">";
+                                       print "<input class=\"editbox\"
+                                               onfocus=\"javascript:disableHotkeys();\" 
+                                               onblur=\"javascript:enableHotkeys();\"  
+                                               name=\"$pref_name\" value=\"$value\">";
                                }
 
                                print "</td>";