X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fpref%2Fprefs.php;h=81b19cfb5e92d53eaa469cb74be09b01928c737b;hb=fbff72e081e812926f89e608cf7af1b7d8c841cb;hp=26f65f7ebc88a1e3ee5c43a0abe6517e3b6f51f1;hpb=3ddbefabef8d325556164dbc9082594c88cc320c;p=tt-rss.git diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 26f65f7e..81b19cfb 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -11,8 +11,8 @@ class Pref_Prefs extends Handler_Protected { return array_search($method, $csrf_ignored) !== false; } - function __construct($link, $args) { - parent::__construct($link, $args); + function __construct($args) { + parent::__construct($args); $this->pref_sections = array( 1 => __('General'), @@ -23,14 +23,13 @@ class Pref_Prefs extends Handler_Protected { $this->pref_help = array( "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"), __("Specifies how often each feed gets updated")), + "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")), @@ -40,7 +39,7 @@ class Pref_Prefs extends Handler_Protected { "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"), ""), + "LONG_DATE_FORMAT" => array(__("Long date format"), __("The syntax used is identical to the PHP date() function.")), "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"), ""), @@ -49,51 +48,48 @@ class Pref_Prefs extends Handler_Protected { "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 media in articles"), ""), "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"), ""), + "USER_TIMEZONE" => array(__("Time zone"), ""), "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")) + "USER_LANGUAGE" => array(__("Language")), + "USER_CSS_THEME" => array(__("Theme"), __("Select one of the available CSS themes")) ); } function changepassword() { - $old_pw = $_POST["old_password"]; - $new_pw = $_POST["new_password"]; - $con_pw = $_POST["confirm_password"]; + $old_pw = clean($_POST["old_password"]); + $new_pw = clean($_POST["new_password"]); + $con_pw = clean($_POST["confirm_password"]); if ($old_pw == "") { - print "ERROR: ".__("Old password cannot be blank."); + print "ERROR: ".format_error("Old password cannot be blank."); return; } if ($new_pw == "") { - print "ERROR: ".__("New password cannot be blank."); + print "ERROR: ".format_error("New password cannot be blank."); return; } if ($new_pw != $con_pw) { - print "ERROR: ".__("Entered passwords do not match."); + print "ERROR: ".format_error("Entered passwords do not match."); return; } - global $pluginhost; - $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]); + $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); if (method_exists($authenticator, "change_password")) { - print $authenticator->change_password($_SESSION["uid"], $old_pw, $new_pw); + print format_notice($authenticator->change_password($_SESSION["uid"], $old_pw, $new_pw)); } else { - print "ERROR: ".__("Function not supported by authentication module."); + print "ERROR: ".format_error("Function not supported by authentication module."); } } function saveconfig() { - - $_SESSION["prefs_cache"] = false; - - $boolean_prefs = explode(",", $_POST["boolean_prefs"]); + $boolean_prefs = explode(",", clean($_POST["boolean_prefs"])); foreach ($boolean_prefs as $pref) { if (!isset($_POST[$pref])) $_POST[$pref] = 'false'; @@ -103,30 +99,25 @@ class Pref_Prefs extends Handler_Protected { 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]); + $value = $_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 - last_digest_sent = NULL WHERE id = " . $_SESSION['uid']); + $sth = $this->pdo->prepare("UPDATE ttrss_users SET + last_digest_sent = NULL WHERE id = ?"); + $sth->execute([$_SESSION['uid']]); } } - if ($pref_name == "language") { + if ($pref_name == "USER_LANGUAGE") { if ($_SESSION["language"] != $value) { - setcookie("ttrss_lang", $value, - time() + SESSION_COOKIE_LIFETIME); - $_SESSION["language"] = $value; - $need_reload = true; } - } else { - set_pref($this->link, $pref_name, $value); } + set_pref($pref_name, $value); } if ($need_reload) { @@ -136,30 +127,15 @@ class Pref_Prefs extends Handler_Protected { } } - function getHelp() { - - $pref_name = db_escape_string($this->link, $_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($this->link, $_POST["email"]); - $full_name = db_escape_string($this->link, $_POST["full_name"]); - + $email = clean($_POST["email"]); + $full_name = clean($_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'"); + $sth = $this->pdo->prepare("UPDATE ttrss_users SET email = ?, + full_name = ? WHERE id = ?"); + $sth->execute([$email, $full_name, $active_uid]); print __("Your personal data has been saved."); @@ -170,16 +146,12 @@ class Pref_Prefs extends Handler_Protected { $_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"]); + $sth = $this->pdo->prepare("DELETE FROM ttrss_user_prefs + WHERE (profile = :profile OR (:profile IS NULL AND profile IS NULL)) + AND owner_uid = :uid"); + $sth->execute([":profile" => $_SESSION['profile'], ":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."); } @@ -188,8 +160,9 @@ class Pref_Prefs extends Handler_Protected { global $access_level_names; - $prefs_blacklist = array("STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES", - "SORT_HEADLINES_BY_FEED_DATE", "DEFAULT_ARTICLE_LIMIT"); + $prefs_blacklist = array("ALLOW_DUPLICATE_POSTS", "STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES", + "SORT_HEADLINES_BY_FEED_DATE", "DEFAULT_ARTICLE_LIMIT", + "FEEDS_SORT_BY_UNREAD", "CDM_EXPANDED"); /* "FEEDS_SORT_BY_UNREAD", "HIDE_READ_FEEDS", "REVERSE_HEADLINES" */ @@ -199,6 +172,9 @@ class Pref_Prefs extends Handler_Protected { "DEFAULT_UPDATE_INTERVAL", "USER_TIMEZONE", "SORT_HEADLINES_BY_FEED_DATE", "SSL_CERT_SERIAL", "DIGEST_PREFERRED_TIME"); + $digest_options = array("DIGEST_ENABLE", "DIGEST_CATCHUP", "DIGEST_PREFERRED_TIME"); + + $purge_options = array("PURGE_UNREAD_ARTICLES", "PURGE_OLD_DAYS"); $_SESSION["prefs_op_result"] = ""; @@ -225,13 +201,15 @@ class Pref_Prefs extends Handler_Protected { print "

" . __("Personal data") . "

"; - $result = db_query($this->link, "SELECT email,full_name,otp_enabled, + $sth = $this->pdo->prepare("SELECT email,full_name,otp_enabled, access_level FROM ttrss_users - WHERE id = ".$_SESSION["uid"]); + WHERE id = ?"); + $sth->execute([$_SESSION["uid"]]); + $row = $sth->fetch(); - $email = htmlspecialchars(db_fetch_result($result, 0, "email")); - $full_name = htmlspecialchars(db_fetch_result($result, 0, "full_name")); - $otp_enabled = sql_bool_to_bool(db_fetch_result($result, 0, "otp_enabled")); + $email = htmlspecialchars($row["email"]); + $full_name = htmlspecialchars($row["full_name"]); + $otp_enabled = sql_bool_to_bool($row["otp_enabled"]); print "".__('Full name').""; print "".__('Access level').""; print "" . $access_level_names[$access_level] . ""; } print ""; - print ""; - print ""; + print_hidden("op", "pref-prefs"); + print_hidden("method", "changeemail"); - print "

"; print ""; if ($_SESSION["auth_module"]) { - global $pluginhost; - - $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]); - + $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); } else { $authenticator = false; } @@ -270,13 +245,7 @@ class Pref_Prefs extends Handler_Protected { print "

" . __("Password") . "

"; - $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 "
"; @@ -290,12 +259,20 @@ class Pref_Prefs extends Handler_Protected { onComplete: function(transport) { notify(''); if (transport.responseText.indexOf('ERROR: ') == 0) { - notify_error(transport.responseText.replace('ERROR: ', '')); + + $('pwd_change_infobox').innerHTML = + transport.responseText.replace('ERROR: ', ''); + } else { - notify_info(transport.responseText); + $('pwd_change_infobox').innerHTML = + transport.responseText.replace('ERROR: ', ''); + var warn = $('default_pass_warning'); if (warn) Element.hide(warn); } + + new Effect.Appear('pwd_change_infobox'); + }}); this.reset(); } @@ -321,10 +298,10 @@ class Pref_Prefs extends Handler_Protected { print ""; - print ""; - print ""; + print_hidden("op", "pref-prefs"); + print_hidden("method", "changepassword"); - print "

"; print "

"; @@ -367,17 +344,17 @@ class Pref_Prefs extends Handler_Protected { print ""; - print ""; - print ""; + print_hidden("op", "pref-prefs"); + print_hidden("method", "otpdisable"); print "

"; print ""; - } else { + } else if (function_exists("imagecreatefromstring")) { - print "

".__("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.") . "

"; + print_warning(__("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.")); print "

".__("Scan the following code by the Authenticator application:")."

"; @@ -387,8 +364,8 @@ class Pref_Prefs extends Handler_Protected { print "
"; - print ""; - print ""; + print_hidden("op", "pref-prefs"); + print_hidden("method", "otpenable"); print ""; - print ""; - print ""; + print_hidden("op", "pref-prefs"); + print_hidden("method", "setplugins"); print ""; - print ""; + print ""; print " @@ -765,16 +715,16 @@ class Pref_Prefs extends Handler_Protected { "; $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", $_SESSION['uid']))); - $tmppluginhost = new PluginHost($this->link); - $tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"]); + $tmppluginhost = new PluginHost(); + $tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true); $tmppluginhost->load_data(true); foreach ($tmppluginhost->get_plugins() as $name => $plugin) { $about = $plugin->about(); - if ($about[3] && strpos($name, "example") === FALSE) { + if ($about[3]) { if (in_array($name, $system_enabled)) { $checked = "checked='1'"; } else { @@ -787,10 +737,12 @@ class Pref_Prefs extends Handler_Protected { dojoType=\"dijit.form.CheckBox\" $checked type=\"checkbox\">"; - print ""; + $plugin_icon = $checked ? "plugin.png" : "plugin_disabled.png"; + + print ""; print ""; @@ -822,7 +774,7 @@ class Pref_Prefs extends Handler_Protected { foreach ($tmppluginhost->get_plugins() as $name => $plugin) { $about = $plugin->about(); - if (!$about[3] && strpos($name, "example") === FALSE) { + if (!$about[3]) { if (in_array($name, $system_enabled)) { $checked = "checked='1'"; @@ -840,14 +792,16 @@ class Pref_Prefs extends Handler_Protected { print ""; + $plugin_icon = $checked ? "plugin.png" : "plugin_disabled.png"; + print ""; - print ""; + print ""; print ""; @@ -878,8 +832,7 @@ class Pref_Prefs extends Handler_Protected { print ""; #pane - global $pluginhost; - $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB, + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, "hook_prefs_tab", "prefPrefs"); print ""; #container @@ -890,58 +843,94 @@ class Pref_Prefs extends Handler_Protected { } function otpqrcode() { - require_once "lib/otphp/vendor/base32.php"; - require_once "lib/otphp/lib/otp.php"; - require_once "lib/otphp/lib/totp.php"; require_once "lib/phpqrcode/phpqrcode.php"; - $result = db_query($this->link, "SELECT login,salt,otp_enabled + $sth = $this->pdo->prepare("SELECT login,salt,otp_enabled FROM ttrss_users - WHERE id = ".$_SESSION["uid"]); + WHERE id = ?"); + $sth->execute([$_SESSION['uid']]); + + if ($row = $sth->fetch()) { - $base32 = new Base32(); + $base32 = new \OTPHP\Base32(); - $login = db_fetch_result($result, 0, "login"); - $otp_enabled = sql_bool_to_bool(db_fetch_result($result, 0, "otp_enabled")); + $login = $row["login"]; + $otp_enabled = sql_bool_to_bool($row["otp_enabled"]); - if (!$otp_enabled) { - $secret = $base32->encode(sha1(db_fetch_result($result, 0, "salt"))); - $topt = new \OTPHP\TOTP($secret); - print QRcode::png($topt->provisioning_uri($login)); + if (!$otp_enabled) { + $secret = $base32->encode(sha1($row["salt"])); + + QRcode::png("otpauth://totp/".urlencode($login). + "?secret=$secret&issuer=".urlencode("Tiny Tiny RSS")); + + } } } function otpenable() { - $password = db_escape_string($this->link, $_REQUEST["password"]); - $enable_otp = $_REQUEST["enable_otp"] == "on"; - global $pluginhost; - $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]); + $password = clean($_REQUEST["password"]); + $otp = clean($_REQUEST["otp"]); + + $authenticator = PluginHost::getInstance()->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 - id = " . $_SESSION["uid"]); + $sth = $this->pdo->prepare("SELECT salt + FROM ttrss_users + WHERE id = ?"); + $sth->execute([$_SESSION['uid']]); + + if ($row = $sth->fetch()) { + + $base32 = new \OTPHP\Base32(); - print "OK"; + $secret = $base32->encode(sha1($row["salt"])); + $topt = new \OTPHP\TOTP($secret); + + $otp_check = $topt->now(); + + if ($otp == $otp_check) { + $sth = $this->pdo->prepare("UPDATE ttrss_users + SET otp_enabled = true WHERE id = ?"); + + $sth->execute([$_SESSION['uid']]); + + print "OK"; + } else { + print "ERROR:".__("Incorrect one time password"); + } } + } else { - print "ERROR: ".__("Incorrect password"); + print "ERROR:".__("Incorrect password"); + } + + } + + static function isdefaultpassword() { + $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); + + if ($authenticator && + method_exists($authenticator, "check_password") && + $authenticator->check_password($_SESSION["uid"], "password")) { + + return true; } + return false; } function otpdisable() { - $password = db_escape_string($this->link, $_REQUEST["password"]); + $password = clean($_REQUEST["password"]); - global $pluginhost; - $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]); + $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]); if ($authenticator->check_password($_SESSION["uid"], $password)) { - db_query($this->link, "UPDATE ttrss_users SET otp_enabled = false WHERE - id = " . $_SESSION["uid"]); + $sth = $this->pdo->prepare("UPDATE ttrss_users SET otp_enabled = false WHERE + id = ?"); + $sth->execute([$_SESSION['uid']]); print "OK"; } else { @@ -951,35 +940,34 @@ class Pref_Prefs extends Handler_Protected { } function setplugins() { - if (is_array($_REQUEST["plugins"])) - $plugins = join(",", $_REQUEST["plugins"]); + if (is_array(clean($_REQUEST["plugins"]))) + $plugins = join(",", clean($_REQUEST["plugins"])); else $plugins = ""; - set_pref($this->link, "_ENABLED_PLUGINS", $plugins); + set_pref("_ENABLED_PLUGINS", $plugins, $_SESSION["uid"]); } function clearplugindata() { - $name = db_escape_string($this->link, $_REQUEST["name"]); + $name = clean($_REQUEST["name"]); - global $pluginhost; - $pluginhost->clear_data($pluginhost->get_plugin($name)); + PluginHost::getInstance()->clear_data(PluginHost::getInstance()->get_plugin($name)); } function customizeCSS() { - $value = get_pref($this->link, "USER_STYLESHEET"); + $value = get_pref("USER_STYLESHEET"); $value = str_replace("
", "\n", $value); - print_notice(T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. This file can be used as a baseline.", "tt-rss.css")); + print_notice(T_sprintf("You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. This file can be used as a baseline.", "css/tt-rss.css")); - print ""; - print ""; - print ""; + print_hidden("op", "rpc"); + print_hidden("method", "setpref"); + print_hidden("key", "USER_STYLESHEET"); print "

".__("System plugins")."

".__("System plugins")."

". + format_notice(__("System plugins are enabled in config.php for all users.")). + "
 ".__('Author')."
$name" . htmlspecialchars($about[1]); if (@$about[4]) { - print " — ".__("more info").""; } print "
"; if (@$about[4]) { - print " — ".__("more info").""; } print "
"; print ""; print "
"; @@ -1015,8 +1003,9 @@ class Pref_Prefs extends Handler_Protected { print ""; - $result = db_query($this->link, "SELECT title,id FROM ttrss_settings_profiles - WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title"); + $sth = $this->pdo->prepare("SELECT title,id FROM ttrss_settings_profiles + WHERE owner_uid = ? ORDER BY title"); + $sth->execute([$_SESSION['uid']]); print "
"; @@ -1046,9 +1035,7 @@ class Pref_Prefs extends Handler_Protected { $lnum = 1; - while ($line = db_fetch_assoc($result)) { - - $class = ($lnum % 2) ? "even" : "odd"; + while ($line = $sth->fetch()) { $profile_id = $line["id"]; $this_row_id = "id=\"FCATR-$profile_id\""; @@ -1097,7 +1084,7 @@ class Pref_Prefs extends Handler_Protected { print "
- @@ -1131,4 +1118,3 @@ class Pref_Prefs extends Handler_Protected { return ""; } } -?>