ajaxify prefs save/reset; update translations

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

diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index 7ade0391bc313982080e8aa725311d769fd4fb3d..2564f30e4bab78e569eeed4020f842e446338ef6 100644 (file)
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -56,12 +56,14 @@
 
                        return;
 
-               } else if ($subop == __("Save configuration")) {
+               } else if ($subop == "save-config") {
 
-                       $_SESSION["prefs_op_result"] = "save-config";
+#                      $_SESSION["prefs_op_result"] = "save-config";
 
                        $_SESSION["prefs_cache"] = false;
 
+//                     print_r($_POST);
+
                        foreach (array_keys($_POST) as $pref_name) {
                        
                                $pref_name = db_escape_string($pref_name);
@@ -96,7 +98,11 @@
 
                        }
 
-                       return prefs_js_redirect();
+                       #return prefs_js_redirect();
+
+                       print __("The configuration was saved.");
+
+                       return;
 
                } else if ($subop == "getHelp") {
 
@@ -120,28 +126,23 @@
                        db_query($link, "UPDATE ttrss_users SET email = '$email' 
                                WHERE id = '$active_uid'");                             
                
-                       print "E-mail has been changed.";
+                       print __("E-mail has been changed.");
                
                        return;
 
-               } else if ($subop == __("Reset to defaults")) {
+               } else if ($subop == "reset-config") {
 
                        $_SESSION["prefs_op_result"] = "reset-to-defaults";
 
-                       if (DB_TYPE == "pgsql") {
-                               db_query($link,"UPDATE ttrss_user_prefs 
-                                       SET value = ttrss_prefs.def_value 
-                                       WHERE owner_uid = '".$_SESSION["uid"]."' AND
-                                       ttrss_prefs.pref_name = ttrss_user_prefs.pref_name");
-                       } else {
-                               db_query($link, "DELETE FROM ttrss_user_prefs 
-                                       WHERE owner_uid = ".$_SESSION["uid"]);
-                               initialize_user_prefs($link, $_SESSION["uid"]);
-                       }
+                       db_query($link, "DELETE FROM ttrss_user_prefs 
+                               WHERE owner_uid = ".$_SESSION["uid"]);
+                       initialize_user_prefs($link, $_SESSION["uid"]);
 
-                       return prefs_js_redirect();
+                       print __("The configuration was reset to defaults.");
 
-               } else if ($subop == "Change theme") {
+                       return;
+
+               } else if ($subop == __("Change theme")) {
 
                        $theme = db_escape_string($_POST["theme"]);
 
@@ -200,9 +201,9 @@
                                        print format_notice(__("The configuration was reset to defaults."));
                                }
 
-                               if ($_SESSION["prefs_op_result"] == "save-config") {
-                                       print format_notice(__("The configuration was saved."));
-                               }
+#                              if ($_SESSION["prefs_op_result"] == "save-config") {
+#                                      print format_notice(__("The configuration was saved."));
+#                              }
 
                                $_SESSION["prefs_op_result"] = "";
 
@@ -315,7 +316,7 @@
                                        owner_uid = ".$_SESSION["uid"]."
                                ORDER BY section_id,short_desc");
 
-                       print "<form action=\"backend.php\" method=\"POST\">";
+                       print "<form action=\"backend.php\" method=\"POST\" id=\"pref_prefs_form\">";
 
                        $lnum = 0;
 
@@ -362,12 +363,12 @@
 //                                     print_select($pref_name, $value, array("true", "false"));
 
                                        if ($value == "true") {
-                                               $value = "Yes";
+                                               $value = __("Yes");
                                        } else {
-                                               $value = "No";
+                                               $value = __("No");
                                        }
 
-                                       print_radio($pref_name, $value, array("Yes", "No"));
+                                       print_radio($pref_name, $value, __("Yes"), array(__("Yes"), __("No")));
                        
                                } else {
                                        print "<input class=\"editbox\" name=\"$pref_name\" value=\"$value\">";
@@ -385,10 +386,11 @@
                        print "<input type=\"hidden\" name=\"op\" value=\"pref-prefs\">";
 
                        print "<p><input class=\"button\" type=\"submit\" 
-                               name=\"subop\" value=\"".__('Save configuration')."\">";
+                               onclick=\"return validatePrefsSave()\"
+                               value=\"".__('Save configuration')."\">";
                                
                        print "&nbsp;<input class=\"button\" type=\"submit\" 
-                               name=\"subop\" onclick=\"return validatePrefsReset()\" 
+                               onclick=\"return validatePrefsReset()\" 
                                value=\"".__('Reset to defaults')."\"></p>";
 
                        print "</form>";