);
$this->pref_help = array(
- "ALLOW_DUPLICATE_POSTS" => array(__("Allow duplicate posts")),
- "AUTO_ASSIGN_LABELS" => array(__("Assign articles to labels automatically"), __("")),
- "BLACKLISTED_TAGS" => array(__("Blacklisted tags"), __("When auto-detecting tags in articles these tags will not be applied (comma-separated list)")),
- "CDM_AUTO_CATCHUP" => array(__("Automatically mark articles as read"), __("Mark articles as read automatically while you scroll article list.")),
- "CDM_EXPANDED" => array(__("Automatically expand articles in combined mode"), __("")),
+ "ALLOW_DUPLICATE_POSTS" => array(__("Allow duplicate articles"), ""),
+ "AUTO_ASSIGN_LABELS" => array(__("Assign articles to labels automatically"), ""),
+ "BLACKLISTED_TAGS" => array(__("Blacklisted tags"), __("When auto-detecting tags in articles these tags will not be applied (comma-separated list).")),
+ "CDM_AUTO_CATCHUP" => array(__("Automatically mark articles as read"), __("This option enables marking articles as read automatically while you scroll article list.")),
+ "CDM_EXPANDED" => array(__("Automatically expand articles in combined mode"), ""),
"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 feed update interval"), __("")),
- "DIGEST_CATCHUP" => array(__("Mark articles in e-mail digest as read"), __("")),
- "DIGEST_ENABLE" => array(__("Enable email digest"), __("This option enables sending daily digest of new (and unread) headlines on your configured e-mail address")),
+ "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 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")),
- "ENABLE_API_ACCESS" => array(__("Enable external API"), __("")),
- "ENABLE_FEED_CATS" => array(__("Enable feed categories"), __("")),
- "FEEDS_SORT_BY_UNREAD" => array(__("Sort feeds by unread articles count"), __("")),
- "FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles (in hours)"), __("")),
- "HIDE_READ_FEEDS" => array(__("Hide feeds with no unread articles"), __("")),
- "HIDE_READ_SHOWS_SPECIAL" => array(__("Show special feeds and labels when hiding read feeds"), __("")),
- "LONG_DATE_FORMAT" => array(__("Long date format"), __("")),
+ "ENABLE_API_ACCESS" => array(__("Enable API access"), __("Allows external clients to access this account through the API")),
+ "ENABLE_FEED_CATS" => array(__("Enable feed categories"), ""),
+ "FEEDS_SORT_BY_UNREAD" => array(__("Sort feeds by unread articles count"), ""),
+ "FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles (in hours)"), ""),
+ "HIDE_READ_FEEDS" => array(__("Hide feeds with no unread articles"), ""),
+ "HIDE_READ_SHOWS_SPECIAL" => array(__("Show special feeds when hiding read feeds"), ""),
+ "LONG_DATE_FORMAT" => array(__("Long date format"), ""),
"ON_CATCHUP_SHOW_NEXT_FEED" => array(__("On catchup show next feed"), __("Automatically open next feed with unread articles after marking one as read")),
- "PURGE_OLD_DAYS" => array(__("Purge articles after this number of days (0 - disables)"), __("")),
- "PURGE_UNREAD_ARTICLES" => array(__("Purge unread articles"), __("")),
- "REVERSE_HEADLINES" => array(__("Reverse headline order (oldest first)"), __("")),
- "SHORT_DATE_FORMAT" => array(__("Short date format"), __("")),
- "SHOW_CONTENT_PREVIEW" => array(__("Show content preview in headlines list"), __("")),
+ "PURGE_OLD_DAYS" => array(__("Purge articles after this number of days (0 - disables)"), ""),
+ "PURGE_UNREAD_ARTICLES" => array(__("Purge unread articles"), ""),
+ "REVERSE_HEADLINES" => array(__("Reverse headline order (oldest first)"), ""),
+ "SHORT_DATE_FORMAT" => array(__("Short date format"), ""),
+ "SHOW_CONTENT_PREVIEW" => array(__("Show content preview in headlines list"), ""),
"SORT_HEADLINES_BY_FEED_DATE" => array(__("Sort headlines by feed date"), __("Use feed-specified date to sort headlines instead of local import date.")),
"SSL_CERT_SERIAL" => array(__("Login with an SSL certificate"), __("Click to register your SSL client certificate with tt-rss")),
- "STRIP_IMAGES" => array(__("Do not embed images in articles"), __("")),
+ "STRIP_IMAGES" => array(__("Do not embed images in articles"), ""),
"STRIP_UNSAFE_TAGS" => array(__("Strip unsafe tags from articles"), __("Strip all but most common HTML tags when reading articles.")),
- "USER_CSS_THEME" => array(__("Select theme"), __("Select one of the available CSS themes")),
"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"), __("When this option is enabled, headlines in Special feeds and Labels are grouped by feeds"))
+ "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")),
+ "USER_CSS_THEME" => array(__("Select theme"), __("Select one of the available CSS themes"))
);
}
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) {
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.");
$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() {
print "<h2>" . __("Personal data") . "</h2>";
- $result = db_query($this->link, "SELECT email,full_name,otp_enabled,
+ $result = db_query( "SELECT email,full_name,otp_enabled,
access_level FROM ttrss_users
WHERE id = ".$_SESSION["uid"]);
print "<h2>" . __("Password") . "</h2>";
- $result = db_query($this->link, "SELECT id FROM ttrss_users
+ $result = db_query( "SELECT id FROM ttrss_users
WHERE id = ".$_SESSION["uid"]." AND pwd_hash
= 'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8'");
parameters: dojo.objectToQuery(this.getValues()),
onComplete: function(transport) {
notify('');
- if (transport.responseText.indexOf('ERROR: ') == 0) {
- notify_error(transport.responseText.replace('ERROR: ', ''));
+ if (transport.responseText.indexOf('ERROR:') == 0) {
+ notify_error(transport.responseText.replace('ERROR:', ''));
} else {
window.location.reload();
}
print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" type=\"password\" required=\"1\"
name=\"password\"></td></tr>";
- print "<tr><td colspan=\"2\">";
+ print "<tr><td width=\"40%\">".__("Enter the generated one time password")."</td>";
- print "<input dojoType=\"dijit.form.CheckBox\" required=\"1\"
- type=\"checkbox\" id=\"enable_otp\" name=\"enable_otp\"/> ";
- print "<label for=\"enable_otp\">".__("I have scanned the code and would like to enable OTP")."</label>";
+ print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" autocomplete=\"off\"
+ required=\"1\"
+ name=\"otp\"></td></tr>";
+
+ print "<tr><td colspan=\"2\">";
print "</td></tr><tr><td colspan=\"2\">";
print "<form dojoType=\"dijit.form.Form\" id=\"changeSettingsForm\">";
- print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
- evt.preventDefault();
+ print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt, quit\">
+ if (evt) evt.preventDefault();
if (this.validate()) {
console.log(dojo.objectToQuery(this.getValues()));
parameters: dojo.objectToQuery(this.getValues()),
onComplete: function(transport) {
var msg = transport.responseText;
- notify_info(msg);
+ if (quit) {
+ gotoMain();
+ } else {
+ if (msg == 'PREFS_NEED_RELOAD') {
+ window.location.reload();
+ } else {
+ notify_info(msg);
+ }
+ }
} });
}
</script>";
}
if ($_SESSION["profile"]) {
- initialize_user_prefs($this->link, $_SESSION["uid"], $_SESSION["profile"]);
+ initialize_user_prefs( $_SESSION["uid"], $_SESSION["profile"]);
$profile_qpart = "profile = '" . $_SESSION["profile"] . "'";
} else {
- initialize_user_prefs($this->link, $_SESSION["uid"]);
+ initialize_user_prefs( $_SESSION["uid"]);
$profile_qpart = "profile IS NULL";
}
$access_query = 'true';
- $result = db_query($this->link, "SELECT DISTINCT
+ $result = db_query( "SELECT DISTINCT
ttrss_user_prefs.pref_name,value,type_name,
ttrss_prefs_sections.order_id,
def_value,section_id
print "<tr><td colspan=\"3\"><h3>".$section_name."</h3></td></tr>";
$lnum = 0;
+
+ if ($active_section == 2) {
+ print "<tr>";
+
+ print "<td width=\"40%\" class=\"prefName\">";
+ print "<label>";
+ print __("Language:");
+ print "</label>";
+
+ print "<td>";
+ print_select_hash("language", $_COOKIE["ttrss_lang"], get_translations(),
+ "style='width : 220px; margin : 0px' dojoType='dijit.form.Select'");
+ print "</td>";
+ print "</tr>";
+ }
+
}
print "<tr>";
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-prefs\">";
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"saveconfig\">";
- print "<button dojoType=\"dijit.form.Button\" type=\"submit\">".
- __('Save configuration')."</button> ";
+ print "<div dojoType=\"dijit.form.ComboButton\" type=\"submit\">
+ <span>".__('Save configuration')."</span>
+ <div dojoType=\"dijit.DropDownMenu\">
+ <div dojoType=\"dijit.MenuItem\"
+ onclick=\"dijit.byId('changeSettingsForm').onSubmit(null, true)\">".
+ __("Save and exit preferences")."</div>
+ </div>
+ </div>";
print "<button dojoType=\"dijit.form.Button\" onclick=\"return editProfiles()\">".
__('Manage profiles')."</button> ";
<td width='10%'>".__('Author')."</td></tr>";
$system_enabled = array_map("trim", explode(",", PLUGINS));
- $user_enabled = array_map("trim", explode(",", get_pref($this->link, "_ENABLED_PLUGINS")));
+ $user_enabled = array_map("trim", explode(",", get_pref( "_ENABLED_PLUGINS")));
- $tmppluginhost = new PluginHost($this->link);
+ $tmppluginhost = new PluginHost();
$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"]);
$tmppluginhost->load_data(true);
require_once "lib/otphp/lib/totp.php";
require_once "lib/phpqrcode/phpqrcode.php";
- $result = db_query($this->link, "SELECT login,salt,otp_enabled
+ $result = db_query( "SELECT login,salt,otp_enabled
FROM ttrss_users
WHERE id = ".$_SESSION["uid"]);
}
function otpenable() {
- $password = db_escape_string($this->link, $_REQUEST["password"]);
- $enable_otp = $_REQUEST["enable_otp"] == "on";
+ require_once "lib/otphp/vendor/base32.php";
+ require_once "lib/otphp/lib/otp.php";
+ require_once "lib/otphp/lib/totp.php";
+
+ $password = $_REQUEST["password"];
+ $otp = $_REQUEST["otp"];
global $pluginhost;
$authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
if ($authenticator->check_password($_SESSION["uid"], $password)) {
- if ($enable_otp) {
- db_query($this->link, "UPDATE ttrss_users SET otp_enabled = true WHERE
+ $result = db_query( "SELECT salt
+ FROM ttrss_users
+ WHERE id = ".$_SESSION["uid"]);
+
+ $base32 = new Base32();
+
+ $secret = $base32->encode(sha1(db_fetch_result($result, 0, "salt")));
+ $topt = new \OTPHP\TOTP($secret);
+
+ $otp_check = $topt->now();
+
+ if ($otp == $otp_check) {
+ db_query( "UPDATE ttrss_users SET otp_enabled = true WHERE
id = " . $_SESSION["uid"]);
print "OK";
+ } else {
+ print "ERROR:".__("Incorrect one time password");
}
} else {
- print "ERROR: ".__("Incorrect password");
+ print "ERROR:".__("Incorrect password");
}
}
function otpdisable() {
- $password = db_escape_string($this->link, $_REQUEST["password"]);
+ $password = db_escape_string( $_REQUEST["password"]);
global $pluginhost;
$authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
if ($authenticator->check_password($_SESSION["uid"], $password)) {
- db_query($this->link, "UPDATE ttrss_users SET otp_enabled = false WHERE
+ db_query( "UPDATE ttrss_users SET otp_enabled = false WHERE
id = " . $_SESSION["uid"]);
print "OK";
else
$plugins = "";
- set_pref($this->link, "_ENABLED_PLUGINS", $plugins);
+ set_pref( "_ENABLED_PLUGINS", $plugins);
}
function clearplugindata() {
- $name = db_escape_string($this->link, $_REQUEST["name"]);
+ $name = db_escape_string( $_REQUEST["name"]);
global $pluginhost;
$pluginhost->clear_data($pluginhost->get_plugin($name));
}
function customizeCSS() {
- $value = get_pref($this->link, "USER_STYLESHEET");
+ $value = get_pref( "USER_STYLESHEET");
$value = str_replace("<br/>", "\n", $value);
print "</div>";
- $result = db_query($this->link, "SELECT title,id FROM ttrss_settings_profiles
+ $result = db_query( "SELECT title,id FROM ttrss_settings_profiles
WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
print "<div class=\"prefProfileHolder\">";
git.wh0rd.org / tt-rss.git / blobdiff