diff --git a/backend.php b/backend.php index 1c7b3ffb..8220337a 100644 --- a/backend.php +++ b/backend.php @@ -50,14 +50,7 @@ init_connection($link); - $method = strtolower($_REQUEST["method"]); - $mode = $_REQUEST["mode"]; - - /* if ((!$op || $op == "rss" || $op == "dlg") && !$_REQUEST["noxml"]) { - header("Content-Type: application/xml; charset=utf-8"); - } else { - header("Content-Type: text/plain; charset=utf-8"); - } */ + $method = $_REQUEST['subop'] ? $_REQUEST['subop'] : $_REQUEST["method"]; header("Content-Type: text/plain; charset=utf-8"); @@ -78,7 +71,7 @@ return; } else if (!($_SESSION["uid"] && validate_session($link))) { - if ($op == 'pref-feeds' && $_REQUEST['method'] == 'add') { + if ($op == 'pref-feeds' && $method == 'add') { header("Content-Type: text/html"); login_sequence($link); render_login_form($link); @@ -173,11 +166,6 @@ module_pref_labels($link); break; // pref-labels - case "pref-prefs": - require_once "modules/pref-prefs.php"; - module_pref_prefs($link); - break; // pref-prefs - case "pref-users": require_once "modules/pref-users.php"; module_pref_users($link); diff --git a/classes/pref_prefs.php b/classes/pref_prefs.php new file mode 100644 index 00000000..89626827 --- /dev/null +++ b/classes/pref_prefs.php @@ -0,0 +1,493 @@ +link, "SELECT id FROM ttrss_users WHERE + id = '$active_uid' AND (pwd_hash = '$old_pw_hash1' OR + pwd_hash = '$old_pw_hash2')"); + + if (db_num_rows($result) == 1) { + db_query($this->link, "UPDATE ttrss_users SET pwd_hash = '$new_pw_hash' + WHERE id = '$active_uid'"); + + $_SESSION["pwd_hash"] = $new_pw_hash; + + print __("Password has been changed."); + } else { + print "ERROR: ".__('Old password is incorrect.'); + } + } + + return; + + } + + function saveconfig() { + + $_SESSION["prefs_cache"] = false; + + $orig_theme = get_pref($this->link, "_THEME_ID"); + + foreach (array_keys($_POST) as $pref_name) { + + $pref_name = db_escape_string($pref_name); + $value = db_escape_string($_POST[$pref_name]); + + set_pref($this->link, $pref_name, $value); + + } + + if ($orig_theme != get_pref($this->link, "_THEME_ID")) { + print "PREFS_THEME_CHANGED"; + } else { + print __("The configuration was saved."); + } + } + + function getHelp() { + + $pref_name = db_escape_string($_REQUEST["pn"]); + + $result = db_query($this->link, "SELECT help_text FROM ttrss_prefs + WHERE pref_name = '$pref_name'"); + + if (db_num_rows($result) > 0) { + $help_text = db_fetch_result($result, 0, "help_text"); + print $help_text; + } else { + printf(__("Unknown option: %s"), $pref_name); + } + } + + function changeemail() { + + $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', + full_name = '$full_name' WHERE id = '$active_uid'"); + + print __("Your personal data has been saved."); + + return; + } + + function resetconfig() { + + $_SESSION["prefs_op_result"] = "reset-to-defaults"; + + if ($_SESSION["profile"]) { + $profile_qpart = "profile = '" . $_SESSION["profile"] . "'"; + } else { + $profile_qpart = "profile IS NULL"; + } + + db_query($this->link, "DELETE FROM ttrss_user_prefs + WHERE $profile_qpart AND owner_uid = ".$_SESSION["uid"]); + + initialize_user_prefs($this->link, $_SESSION["uid"], $_SESSION["profile"]); + + print "PREFS_THEME_CHANGED"; + } + + function index() { + + global $access_level_names; + + $prefs_blacklist = array("HIDE_READ_FEEDS", "FEEDS_SORT_BY_UNREAD", + "STRIP_UNSAFE_TAGS"); + + $profile_blacklist = array("ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS", + "PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP", + "BLACKLISTED_TAGS", "ENABLE_API_ACCESS", "UPDATE_POST_ON_CHECKSUM_CHANGE", + "DEFAULT_UPDATE_INTERVAL", "USER_TIMEZONE", "SORT_HEADLINES_BY_FEED_DATE", + "SSL_CERT_SERIAL"); + + + if (!SINGLE_USER_MODE) { + + $_SESSION["prefs_op_result"] = ""; + + print "
"; + print "
"; + + print "
"; + + print ""; + + print ""; + + $result = db_query($this->link, "SELECT email,full_name, + access_level FROM ttrss_users + WHERE id = ".$_SESSION["uid"]); + + $email = htmlspecialchars(db_fetch_result($result, 0, "email")); + $full_name = htmlspecialchars(db_fetch_result($result, 0, "full_name")); + + print ""; + print ""; + + print ""; + print ""; + + if (!SINGLE_USER_MODE) { + $access_level = db_fetch_result($result, 0, "access_level"); + print ""; + print ""; + } + + print "
".__('Full name')."
".__('E-mail')."
".__('Access level')."" . $access_level_names[$access_level] . "
"; + + print ""; + print ""; + + print "

"; + + print "

"; + + print "
"; # pane + print "
"; + + $result = db_query($this->link, "SELECT id FROM ttrss_users + WHERE id = ".$_SESSION["uid"]." AND pwd_hash + = 'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8'"); + + if (db_num_rows($result) != 0) { + print format_warning(__("Your password is at default value, please change it."), "default_pass_warning"); + } + + print "
"; + + print ""; + + print ""; + + print ""; + print ""; + + print ""; + + print ""; + + print ""; + + print ""; + + print "
".__("Old password")."
".__("New password")."
".__("Confirm password")."
"; + + print ""; + print ""; + + print "

"; + + print "

"; + + print "
"; #pane + } + + print "
"; + + print "
"; + + print ""; + + print '
'; + + print '
'; + + if ($_SESSION["profile"]) { + print_notice("Some preferences are only available in default profile."); + } + + if ($_SESSION["profile"]) { + initialize_user_prefs($this->link, $_SESSION["uid"], $_SESSION["profile"]); + $profile_qpart = "profile = '" . $_SESSION["profile"] . "'"; + } else { + initialize_user_prefs($this->link, $_SESSION["uid"]); + $profile_qpart = "profile IS NULL"; + } + + $result = db_query($this->link, "SELECT + ttrss_user_prefs.pref_name,short_desc,help_text,value,type_name, + section_name,def_value,section_id + FROM ttrss_prefs,ttrss_prefs_types,ttrss_prefs_sections,ttrss_user_prefs + WHERE type_id = ttrss_prefs_types.id AND + $profile_qpart AND + section_id = ttrss_prefs_sections.id AND + ttrss_user_prefs.pref_name = ttrss_prefs.pref_name AND + short_desc != '' AND + owner_uid = ".$_SESSION["uid"]." + ORDER BY section_id,short_desc"); + + $lnum = 0; + + $active_section = ""; + + while ($line = db_fetch_assoc($result)) { + + if (in_array($line["pref_name"], $prefs_blacklist)) { + continue; + } + + if ($_SESSION["profile"] && in_array($line["pref_name"], + $profile_blacklist)) { + continue; + } + + if ($active_section != $line["section_name"]) { + + if ($active_section != "") { + print ""; + } + + print ""; + + $active_section = $line["section_name"]; + + print ""; + + if ($line["section_id"] == 2) { + print ""; + + $user_theme = get_pref($this->link, "_THEME_ID"); + $themes = get_all_themes(); + + print ""; + } + $lnum = 0; + } + + print ""; + + $type_name = $line["type_name"]; + $pref_name = $line["pref_name"]; + $value = $line["value"]; + $def_value = $line["def_value"]; + $help_text = $line["help_text"]; + + print ""; + + print ""; + + print ""; + + $lnum++; + } + + print "

".__($active_section)."

".__("Select theme")."
" . __($line["short_desc"]); + + if ($help_text) print "
".__($help_text)."
"; + + print "
"; + + if ($pref_name == "USER_TIMEZONE") { + + $timezones = explode("\n", file_get_contents("lib/timezones.txt")); + + print_select($pref_name, $value, $timezones, 'dojoType="dijit.form.FilteringSelect"'); + } else if ($pref_name == "USER_STYLESHEET") { + + print ""; + + } else if ($pref_name == "DEFAULT_ARTICLE_LIMIT") { + + $limits = array(15, 30, 45, 60); + + print_select($pref_name, $value, $limits, + 'dojoType="dijit.form.Select"'); + + } else if ($pref_name == "DEFAULT_UPDATE_INTERVAL") { + + global $update_intervals_nodefault; + + print_select_hash($pref_name, $value, $update_intervals_nodefault, + 'dojoType="dijit.form.Select"'); + + } else if ($type_name == "bool") { + + if ($value == "true") { + $value = __("Yes"); + } else { + $value = __("No"); + } + + if ($pref_name == "PURGE_UNREAD_ARTICLES" && FORCE_ARTICLE_PURGE != 0) { + $disabled = "disabled=\"1\""; + $value = __("Yes"); + } else { + $disabled = ""; + } + + print_radio($pref_name, $value, __("Yes"), array(__("Yes"), __("No")), + $disabled); + + } else if (array_search($pref_name, array('FRESH_ARTICLE_MAX_AGE', 'DEFAULT_ARTICLE_LIMIT', + 'PURGE_OLD_DAYS', 'LONG_DATE_FORMAT', 'SHORT_DATE_FORMAT')) !== false) { + + $regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : ''; + + if ($pref_name == "PURGE_OLD_DAYS" && FORCE_ARTICLE_PURGE != 0) { + $disabled = "disabled=\"1\""; + $value = FORCE_ARTICLE_PURGE; + } else { + $disabled = ""; + } + + print ""; + + } else if ($pref_name == "SSL_CERT_SERIAL") { + + print ""; + + $cert_serial = htmlspecialchars(get_ssl_certificate_id()); + $has_serial = ($cert_serial) ? "false" : "true"; + + print " "; + + print " "; + + } else { + $regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : ''; + + print ""; + } + + print "
"; + + print '
'; # inside pane + print '
'; + + print ""; + print ""; + + print " "; + + print " "; + + print ""; + + print '
'; # inner pane + print '
'; # border container + + print "
"; + + print "
"; #pane + print "
"; #container + } +} +?> diff --git a/js/prefs.js b/js/prefs.js index 98b581ca..d1d02afd 100644 --- a/js/prefs.js +++ b/js/prefs.js @@ -955,7 +955,7 @@ function validatePrefsReset() { if (ok) { - query = "?op=pref-prefs&method=reset-config"; + query = "?op=pref-prefs&method=resetconfig"; console.log(query); new Ajax.Request("backend.php", { diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php deleted file mode 100644 index 15fa5349..00000000 --- a/modules/pref-prefs.php +++ /dev/null @@ -1,512 +0,0 @@ - 0) { - $help_text = db_fetch_result($result, 0, "help_text"); - print $help_text; - } else { - printf(__("Unknown option: %s"), $pref_name); - } - - } else if ($method == "change-email") { - - $email = db_escape_string($_POST["email"]); - $full_name = db_escape_string($_POST["full_name"]); - - $active_uid = $_SESSION["uid"]; - - db_query($link, "UPDATE ttrss_users SET email = '$email', - full_name = '$full_name' WHERE id = '$active_uid'"); - - print __("Your personal data has been saved."); - - return; - - } else if ($method == "reset-config") { - - $_SESSION["prefs_op_result"] = "reset-to-defaults"; - - if ($_SESSION["profile"]) { - $profile_qpart = "profile = '" . $_SESSION["profile"] . "'"; - } else { - $profile_qpart = "profile IS NULL"; - } - - db_query($link, "DELETE FROM ttrss_user_prefs - WHERE $profile_qpart AND owner_uid = ".$_SESSION["uid"]); - - initialize_user_prefs($link, $_SESSION["uid"], $_SESSION["profile"]); - - print "PREFS_THEME_CHANGED"; - -// print __("The configuration was reset to defaults."); - - return; - - } else { - - if (!SINGLE_USER_MODE) { - - $_SESSION["prefs_op_result"] = ""; - - print "
"; - print "
"; - - print "
"; - - print ""; - - print ""; - - $result = db_query($link, "SELECT email,full_name, - access_level FROM ttrss_users - WHERE id = ".$_SESSION["uid"]); - - $email = htmlspecialchars(db_fetch_result($result, 0, "email")); - $full_name = htmlspecialchars(db_fetch_result($result, 0, "full_name")); - - print ""; - print ""; - - print ""; - print ""; - - if (!SINGLE_USER_MODE) { - $access_level = db_fetch_result($result, 0, "access_level"); - print ""; - print ""; - } - - print "
".__('Full name')."
".__('E-mail')."
".__('Access level')."" . $access_level_names[$access_level] . "
"; - - print ""; - print ""; - - print "

"; - - print "

"; - - print "
"; # pane - print "
"; - - $result = db_query($link, "SELECT id FROM ttrss_users - WHERE id = ".$_SESSION["uid"]." AND pwd_hash - = 'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8'"); - - if (db_num_rows($result) != 0) { - print format_warning(__("Your password is at default value, please change it."), "default_pass_warning"); - } - - print "
"; - - print ""; - - print ""; - - print ""; - print ""; - - print ""; - - print ""; - - print ""; - - print ""; - - print "
".__("Old password")."
".__("New password")."
".__("Confirm password")."
"; - - print ""; - print ""; - - print "

"; - - print "

"; - - print "
"; #pane - } - - print "
"; - - print "
"; - - print ""; - - - print '
'; - - print '
'; - - if ($_SESSION["profile"]) { - print_notice("Some preferences are only available in default profile."); - } - - if ($_SESSION["profile"]) { - initialize_user_prefs($link, $_SESSION["uid"], $_SESSION["profile"]); - $profile_qpart = "profile = '" . $_SESSION["profile"] . "'"; - } else { - initialize_user_prefs($link, $_SESSION["uid"]); - $profile_qpart = "profile IS NULL"; - } - - $result = db_query($link, "SELECT - ttrss_user_prefs.pref_name,short_desc,help_text,value,type_name, - section_name,def_value,section_id - FROM ttrss_prefs,ttrss_prefs_types,ttrss_prefs_sections,ttrss_user_prefs - WHERE type_id = ttrss_prefs_types.id AND - $profile_qpart AND - section_id = ttrss_prefs_sections.id AND - ttrss_user_prefs.pref_name = ttrss_prefs.pref_name AND - short_desc != '' AND - owner_uid = ".$_SESSION["uid"]." - ORDER BY section_id,short_desc"); - - $lnum = 0; - - $active_section = ""; - - while ($line = db_fetch_assoc($result)) { - - if (in_array($line["pref_name"], $prefs_blacklist)) { - continue; - } - - if ($_SESSION["profile"] && in_array($line["pref_name"], - $profile_blacklist)) { - continue; - } - - if ($active_section != $line["section_name"]) { - - if ($active_section != "") { - print ""; - } - - print ""; - - $active_section = $line["section_name"]; - - print ""; - - if ($line["section_id"] == 2) { - print ""; - - $user_theme = get_pref($link, "_THEME_ID"); - $themes = get_all_themes(); - - print ""; - } - -// print " -// "; - - $lnum = 0; - } - -// $class = ($lnum % 2) ? "even" : "odd"; - - print ""; - - $type_name = $line["type_name"]; - $pref_name = $line["pref_name"]; - $value = $line["value"]; - $def_value = $line["def_value"]; - $help_text = $line["help_text"]; - - print ""; - - print ""; - - print ""; - - $lnum++; - } - - print "

".__($active_section)."

".__("Select theme")."
OptionValue
" . __($line["short_desc"]); - - if ($help_text) print "
".__($help_text)."
"; - - print "
"; - - if ($pref_name == "USER_TIMEZONE") { - - $timezones = explode("\n", file_get_contents("lib/timezones.txt")); - - print_select($pref_name, $value, $timezones, 'dojoType="dijit.form.FilteringSelect"'); - } else if ($pref_name == "USER_STYLESHEET") { - - print ""; - - } else if ($pref_name == "DEFAULT_ARTICLE_LIMIT") { - - $limits = array(15, 30, 45, 60); - - print_select($pref_name, $value, $limits, - 'dojoType="dijit.form.Select"'); - - } else if ($pref_name == "DEFAULT_UPDATE_INTERVAL") { - - global $update_intervals_nodefault; - - print_select_hash($pref_name, $value, $update_intervals_nodefault, - 'dojoType="dijit.form.Select"'); - - } else if ($type_name == "bool") { -// print_select($pref_name, $value, array("true", "false")); - - if ($value == "true") { - $value = __("Yes"); - } else { - $value = __("No"); - } - - if ($pref_name == "PURGE_UNREAD_ARTICLES" && FORCE_ARTICLE_PURGE != 0) { - $disabled = "disabled=\"1\""; - $value = __("Yes"); - } else { - $disabled = ""; - } - - print_radio($pref_name, $value, __("Yes"), array(__("Yes"), __("No")), - $disabled); - - } else if (array_search($pref_name, array('FRESH_ARTICLE_MAX_AGE', 'DEFAULT_ARTICLE_LIMIT', - 'PURGE_OLD_DAYS', 'LONG_DATE_FORMAT', 'SHORT_DATE_FORMAT')) !== false) { - - $regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : ''; - - if ($pref_name == "PURGE_OLD_DAYS" && FORCE_ARTICLE_PURGE != 0) { - $disabled = "disabled=\"1\""; - $value = FORCE_ARTICLE_PURGE; - } else { - $disabled = ""; - } - - print ""; - - } else if ($pref_name == "SSL_CERT_SERIAL") { - - print ""; - - $cert_serial = htmlspecialchars(get_ssl_certificate_id()); - $has_serial = ($cert_serial) ? "false" : "true"; - - print " "; - - print " "; - - } else { - $regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : ''; - - print ""; - } - - print "
"; - - print '
'; # inside pane - print '
'; - - print ""; - print ""; - - print " "; - - print " "; - - print ""; - - print '
'; # inner pane - print '
'; # border container - - print "
"; - - print "
"; #pane - print "
"; #container - - } - } -?>