return;
}
- $module_class = "auth_" . $_SESSION["auth_module"];
- $authenticator = new $module_class($this->link);
+ global $pluginhost;
+ $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
if (method_exists($authenticator, "change_password")) {
print $authenticator->change_password($_SESSION["uid"], $old_pw, $new_pw);
$_SESSION["prefs_cache"] = false;
- $orig_theme = get_pref($this->link, "_THEME_ID");
+ $boolean_prefs = explode(",", $_POST["boolean_prefs"]);
+
+ foreach ($boolean_prefs as $pref) {
+ if (!isset($_POST[$pref])) $_POST[$pref] = 'false';
+ }
foreach (array_keys($_POST) as $pref_name) {
- $pref_name = db_escape_string($pref_name);
- $value = db_escape_string($_POST[$pref_name]);
+ $pref_name = db_escape_string($this->link, $pref_name);
+ $value = db_escape_string($this->link, $_POST[$pref_name]);
if ($pref_name == 'DIGEST_PREFERRED_TIME') {
if (get_pref($this->link, 'DIGEST_PREFERRED_TIME') != $value) {
}
- if ($orig_theme != get_pref($this->link, "_THEME_ID")) {
- print "PREFS_THEME_CHANGED";
- } else {
- print __("The configuration was saved.");
- }
+ print __("The configuration was saved.");
}
function getHelp() {
- $pref_name = db_escape_string($_REQUEST["pn"]);
+ $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'");
function changeemail() {
- $email = db_escape_string($_POST["email"]);
- $full_name = db_escape_string($_POST["full_name"]);
+ $email = db_escape_string($this->link, $_POST["email"]);
+ $full_name = db_escape_string($this->link, $_POST["full_name"]);
$active_uid = $_SESSION["uid"];
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");
+ $prefs_blacklist = array("STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES",
+ "SORT_HEADLINES_BY_FEED_DATE");
+
+ /* "FEEDS_SORT_BY_UNREAD", "HIDE_READ_FEEDS", "REVERSE_HEADLINES" */
$profile_blacklist = array("ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS",
"PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP",
print "</form>";
- if ($_SESSION["auth_module"]) {
- $module_class = "auth_" . $_SESSION["auth_module"];
- $authenticator = new $module_class($this->link);
+ if ($_SESSION["auth_module"]) {
+ global $pluginhost;
+
+ $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
+
} else {
$authenticator = false;
}
}
</script>";
+ if ($otp_enabled) {
+ print_notice(__("Changing your current password will disable OTP."));
+ }
+
print "<table width=\"100%\" class=\"prefPrefsList\">";
print "<tr><td width=\"40%\">".__("Old password")."</td>";
print "</form>";
- if ($_SESSION["auth_module"] == "internal") {
+ if ($_SESSION["auth_module"] == "auth_internal") {
print "<h2>" . __("One time passwords / Authenticator") . "</h2>";
if ($otp_enabled) {
- print "<p>".__("One time passwords are currently enabled. Change your current password and refresh this page to reconfigure.") . "</p>";
+ print_notice(__("One time passwords are currently enabled. Enter your current password below to disable."));
+
+ print "<form dojoType=\"dijit.form.Form\">";
+
+ print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
+ evt.preventDefault();
+ if (this.validate()) {
+ notify_progress('Disabling OTP', true);
+
+ new Ajax.Request('backend.php', {
+ parameters: dojo.objectToQuery(this.getValues()),
+ onComplete: function(transport) {
+ notify('');
+ if (transport.responseText.indexOf('ERROR: ') == 0) {
+ notify_error(transport.responseText.replace('ERROR: ', ''));
+ } else {
+ window.location.reload();
+ }
+ }});
+ this.reset();
+ }
+ </script>";
+
+ print "<table width=\"100%\" class=\"prefPrefsList\">";
+
+ print "<tr><td width=\"40%\">".__("Enter your password")."</td>";
+
+ print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" type=\"password\" required=\"1\"
+ name=\"password\"></td></tr>";
+
+ print "</table>";
+
+ 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=\"otpdisable\">";
+
+ print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
+ __("Disable OTP")."</button>";
+
+ print "</form>";
} else {
print "<form dojoType=\"dijit.form.Form\" id=\"changeOtpForm\">";
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=\"changeotp\">";
+ print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"otpenable\">";
print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
evt.preventDefault();
new Ajax.Request('backend.php', {
parameters: dojo.objectToQuery(this.getValues()),
onComplete: function(transport) {
- window.location.reload();
+ notify('');
+ if (transport.responseText.indexOf('ERROR: ') == 0) {
+ notify_error(transport.responseText.replace('ERROR: ', ''));
+ } else {
+ window.location.reload();
+ }
} });
}
</script>";
+ print "<table width=\"100%\" class=\"prefPrefsList\">";
+
+ print "<tr><td width=\"40%\">".__("Enter your password")."</td>";
+
+ print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" type=\"password\" required=\"1\"
+ name=\"password\"></td></tr>";
+
+ print "<tr><td colspan=\"2\">";
+
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></tr><tr><td colspan=\"2\">";
+
+ print "</td></tr>";
+ print "</table>";
+
print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
- __("Save OTP setting")."</button>";
+ __("Enable OTP")."</button>";
print "</form>";
}
}
+ global $pluginhost;
+ $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB_SECTION,
+ "hook_prefs_tab_section", "prefPrefsAuth");
+
print "</div>"; #pane
print "<div dojoType=\"dijit.layout.AccordionPane\" selected=\"true\" title=\"".__('Preferences')."\">";
parameters: dojo.objectToQuery(this.getValues()),
onComplete: function(transport) {
var msg = transport.responseText;
- if (msg.match('PREFS_THEME_CHANGED')) {
- window.location.reload();
- } else {
- notify_info(msg);
- }
+ notify_info(msg);
} });
}
</script>";
print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">';
if ($_SESSION["profile"]) {
- print_notice("Some preferences are only available in default profile.");
+ print_notice(__("Some preferences are only available in default profile."));
}
if ($_SESSION["profile"]) {
$profile_qpart = "profile IS NULL";
}
- if ($_SESSION["prefs_show_advanced"])
+ /* if ($_SESSION["prefs_show_advanced"])
$access_query = "true";
else
- $access_query = "(access_level = 0 AND section_id != 3)";
+ $access_query = "(access_level = 0 AND section_id != 3)"; */
+
+ $access_query = 'true';
$result = db_query($this->link, "SELECT DISTINCT
ttrss_user_prefs.pref_name,short_desc,help_text,value,type_name,
$active_section = "";
+ $listed_boolean_prefs = array();
+
while ($line = db_fetch_assoc($result)) {
if (in_array($line["pref_name"], $prefs_blacklist)) {
print "<tr><td colspan=\"3\"><h3>".__($active_section)."</h3></td></tr>";
- if ($line["section_id"] == 2) {
- print "<tr><td width=\"40%\">".__("Select theme")."</td>";
-
- $user_theme = get_pref($this->link, "_THEME_ID");
- $themes = get_all_themes();
-
- print "<td><select name=\"_THEME_ID\" dojoType=\"dijit.form.Select\">";
- print "<option value='Default'>".__('Default')."</option>";
- print "<option value='----------------' disabled=\"1\">--------</option>";
-
- foreach ($themes as $t) {
- $base = $t['base'];
- $name = $t['name'];
-
- if ($base == $user_theme) {
- $selected = "selected=\"1\"";
- } else {
- $selected = "";
- }
-
- print "<option $selected value='$base'>$name</option>";
-
- }
-
- print "</select></td></tr>";
- }
$lnum = 0;
}
$def_value = $line["def_value"];
$help_text = $line["help_text"];
- print "<td width=\"40%\" class=\"prefName\" id=\"$pref_name\">" . __($line["short_desc"]);
+ print "<td width=\"40%\" class=\"prefName\" id=\"$pref_name\">";
+ print "<label for='CB_$pref_name'>";
+ print __($line["short_desc"]);
+ print "</label>";
if ($help_text) print "<div class=\"prefHelp\">".__($help_text)."</div>";
print "<button dojoType=\"dijit.form.Button\"
onclick=\"customizeCSS()\">" . __('Customize') . "</button>";
+ } else if ($pref_name == "USER_CSS_THEME") {
+
+ $themes = array_map("basename", glob("themes/*.css"));
+
+ print_select($pref_name, $value, $themes,
+ 'dojoType="dijit.form.Select"');
+
+
} else if ($pref_name == "DEFAULT_ARTICLE_LIMIT") {
$limits = array(15, 30, 45, 60);
} else if ($type_name == "bool") {
- if ($value == "true") {
- $value = __("Yes");
- } else {
- $value = __("No");
- }
+ array_push($listed_boolean_prefs, $pref_name);
+
+ $checked = ($value == "true") ? "checked=\"checked\"" : "";
if ($pref_name == "PURGE_UNREAD_ARTICLES" && FORCE_ARTICLE_PURGE != 0) {
$disabled = "disabled=\"1\"";
- $value = __("Yes");
+ $checked = "checked=\"checked\"";
} else {
$disabled = "";
}
- print_radio($pref_name, $value, __("Yes"), array(__("Yes"), __("No")),
- $disabled);
+ print "<input type='checkbox' name='$pref_name' $checked $disabled
+ dojoType='dijit.form.CheckBox' id='CB_$pref_name' value='1'>";
} else if (array_search($pref_name, array('FRESH_ARTICLE_MAX_AGE', 'DEFAULT_ARTICLE_LIMIT',
'PURGE_OLD_DAYS', 'LONG_DATE_FORMAT', 'SHORT_DATE_FORMAT')) !== false) {
print "</table>";
+ $listed_boolean_prefs = htmlspecialchars(join(",", $listed_boolean_prefs));
+
+ print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"boolean_prefs\" value=\"$listed_boolean_prefs\">";
+
+ global $pluginhost;
+ $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB_SECTION,
+ "hook_prefs_tab_section", "prefPrefsPrefsInside");
+
print '</div>'; # inside pane
print '<div dojoType="dijit.layout.ContentPane" region="bottom">';
print " ";
- $checked = $_SESSION["prefs_show_advanced"] ? "checked='1'" : "";
+ /* $checked = $_SESSION["prefs_show_advanced"] ? "checked='1'" : "";
print "<input onclick='toggleAdvancedPrefs()'
id='prefs_show_advanced'
$checked
type=\"checkbox\"></input>
<label for='prefs_show_advanced'>" .
- __("Show additional preferences") . "</label>";
+ __("Show additional preferences") . "</label>"; */
+
+ global $pluginhost;
+ $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB_SECTION,
+ "hook_prefs_tab_section", "prefPrefsPrefsOutside");
+ print "</form>";
print '</div>'; # inner pane
print '</div>'; # border container
- print "</form>";
print "</div>"; #pane
+ print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Plugins')."\">";
- if (($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) && CHECK_FOR_NEW_VERSION) {
- print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Update Tiny Tiny RSS')."\">";
+ print "<h2>".__("Plugins")."</h2>";
- if ($_SESSION["pref_last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
- $_SESSION["version_data"] = @check_for_update($this->link);
- $_SESSION["pref_last_version_check"] = time();
- }
+ print "<p>" . __("You will need to reload Tiny Tiny RSS for plugin changes to take effect.") . "</p>";
- if (is_array($_SESSION["version_data"])) {
- $version = $_SESSION["version_data"]["version"];
- print_notice(T_sprintf("New version of Tiny Tiny RSS is available (%s).", "<b>$version</b>"));
+ print_notice(__("Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."));
- print "<p><button dojoType=\"dijit.form.Button\" onclick=\"return updateSelf()\">".
- __('Update Tiny Tiny RSS')."</button></p>";
+ print "<form dojoType=\"dijit.form.Form\" id=\"changePluginsForm\">";
- } else {
- print_notice(__("Your Tiny Tiny RSS installation is up to date."));
- }
+ print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
+ evt.preventDefault();
+ if (this.validate()) {
+ notify_progress('Saving data...', true);
+
+ new Ajax.Request('backend.php', {
+ parameters: dojo.objectToQuery(this.getValues()),
+ onComplete: function(transport) {
+ notify('');
+ if (confirm(__('Selected plugins have been enabled. Reload?'))) {
+ window.location.reload();
+ }
+ } });
- print "</div>"; #pane
}
+ </script>";
- print "</div>"; #container
- }
+ 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=\"setplugins\">";
- function updateSelf() {
- print "<form style='display : block' name='self_update_form' id='self_update_form'>";
+ print "<table width='100%' class='prefPluginsList'>";
- print "<div class='error'>".__("Do not close this dialog until updating is finished. Backup your tt-rss directory before continuing.")."</div>";
+ print "<tr><td colspan='4'><h3>".__("System plugins")."</h3></td></tr>";
- print "<ul class='selfUpdateList' id='self_update_log'>";
- print "<li>" . __("Ready to update.") . "</li>";
- print "</ul>";
+ print "<tr class=\"title\">
+ <td width=\"5%\"> </td>
+ <td width='10%'>".__('Plugin')."</td>
+ <td width=''>".__('Description')."</td>
+ <td width='5%'>".__('Version')."</td>
+ <td width='10%'>".__('Author')."</td></tr>";
- print "<div class='dlgButtons'>";
- print "<button id=\"self_update_start_btn\" dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('updateSelfDlg').start()\" >".
- __("Start update")."</button>";
- print "<button id=\"self_update_stop_btn\" onclick=\"return dijit.byId('updateSelfDlg').close()\" dojoType=\"dijit.form.Button\">".
- __("Close this window")."</button>";
- print "</div>";
- print "</form>";
- }
+ $system_enabled = array_map("trim", explode(",", PLUGINS));
+ $user_enabled = array_map("trim", explode(",", get_pref($this->link, "_ENABLED_PLUGINS")));
+
+ $tmppluginhost = new PluginHost($this->link);
+ $tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"]);
+ $tmppluginhost->load_data(true);
+
+ foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
+ $about = $plugin->about();
+
+ if ($about[3] && strpos($name, "example") === FALSE) {
+ if (in_array($name, $system_enabled)) {
+ $checked = "checked='1'";
+ } else {
+ $checked = "";
+ }
- function performUpdate() {
- $step = (int) $_REQUEST["step"];
- $params = json_decode($_REQUEST["params"], true);
- $force = (bool) $_REQUEST["force"];
+ print "<tr>";
- if (($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) && CHECK_FOR_NEW_VERSION) {
- include "update_self.php";
+ print "<td align='center'><input disabled='1'
+ dojoType=\"dijit.form.CheckBox\" $checked
+ type=\"checkbox\"></td>";
- print json_encode(update_self_step($this->link, $step, $params, $force));
+ print "<td>$name</td>";
+ print "<td>" . htmlspecialchars($about[1]);
+ if (@$about[4]) {
+ print " — <a target=\"_blank\" class=\"visibleLink\"
+ href=\"".htmlspecialchars($about[4])."\">".__("more info")."</a>";
+ }
+ print "</td>";
+ print "<td>" . htmlspecialchars(sprintf("%.2f", $about[0])) . "</td>";
+ print "<td>" . htmlspecialchars($about[2]) . "</td>";
+
+ if (count($tmppluginhost->get_all($plugin)) > 0) {
+ if (in_array($name, $system_enabled)) {
+ print "<td><a href='#' onclick=\"clearPluginData('$name')\"
+ class='visibleLink'>".__("Clear data")."</a></td>";
+ }
+ }
+
+ print "</tr>";
+
+ }
}
+
+ print "<tr><td colspan='4'><h3>".__("User plugins")."</h3></td></tr>";
+
+ print "<tr class=\"title\">
+ <td width=\"5%\"> </td>
+ <td width='10%'>".__('Plugin')."</td>
+ <td width=''>".__('Description')."</td>
+ <td width='5%'>".__('Version')."</td>
+ <td width='10%'>".__('Author')."</td></tr>";
+
+
+ foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
+ $about = $plugin->about();
+
+ if (!$about[3] && strpos($name, "example") === FALSE) {
+
+ if (in_array($name, $system_enabled)) {
+ $checked = "checked='1'";
+ $disabled = "disabled='1'";
+ $rowclass = '';
+ } else if (in_array($name, $user_enabled)) {
+ $checked = "checked='1'";
+ $disabled = "";
+ $rowclass = "Selected";
+ } else {
+ $checked = "";
+ $disabled = "";
+ $rowclass = '';
+ }
+
+ print "<tr class='$rowclass'>";
+
+ print "<td align='center'><input id='FPCHK-$name' name='plugins[]' value='$name' onclick='toggleSelectRow2(this);'
+ dojoType=\"dijit.form.CheckBox\" $checked $disabled
+ type=\"checkbox\"></td>";
+
+ print "<td><label for='FPCHK-$name'>$name</label></td>";
+ print "<td><label for='FPCHK-$name'>" . htmlspecialchars($about[1]) . "</label>";
+ if (@$about[4]) {
+ print " — <a target=\"_blank\" class=\"visibleLink\"
+ href=\"".htmlspecialchars($about[4])."\">".__("more info")."</a>";
+ }
+ print "</td>";
+
+ print "<td>" . htmlspecialchars(sprintf("%.2f", $about[0])) . "</td>";
+ print "<td>" . htmlspecialchars($about[2]) . "</td>";
+
+ if (count($tmppluginhost->get_all($plugin)) > 0) {
+ if (in_array($name, $system_enabled) || in_array($name, $user_enabled)) {
+ print "<td><a href='#' onclick=\"clearPluginData('$name')\" class='visibleLink'>".__("Clear data")."</a></td>";
+ }
+ }
+
+ print "</tr>";
+
+
+
+ }
+
+ }
+
+ print "</table>";
+
+ print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
+ __("Enable selected plugins")."</button></p>";
+
+ print "</form>";
+
+ print "</div>"; #pane
+
+ global $pluginhost;
+ $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB,
+ "hook_prefs_tab", "prefPrefs");
+
+ print "</div>"; #container
}
function toggleAdvanced() {
require_once "lib/otphp/lib/totp.php";
require_once "lib/phpqrcode/phpqrcode.php";
- $result = db_query($this->link, "SELECT login,salt
+ $result = db_query($this->link, "SELECT login,salt,otp_enabled
FROM ttrss_users
WHERE id = ".$_SESSION["uid"]);
$base32 = new Base32();
$login = db_fetch_result($result, 0, "login");
- $secret = $base32->encode(sha1(db_fetch_result($result, 0, "salt")));
+ $otp_enabled = sql_bool_to_bool(db_fetch_result($result, 0, "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));
+ }
+ }
+
+ function otpenable() {
+ $password = db_escape_string($this->link, $_REQUEST["password"]);
+ $enable_otp = $_REQUEST["enable_otp"] == "on";
- $topt = new \OTPHP\TOTP($secret);
+ 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
+ id = " . $_SESSION["uid"]);
+
+ print "OK";
+ }
+ } else {
+ print "ERROR: ".__("Incorrect password");
+ }
- print QRcode::png($topt->provisioning_uri($login));
}
- function changeotp() {
- $enable_otp = $_REQUEST["enable_otp"];
+ function otpdisable() {
+ $password = db_escape_string($this->link, $_REQUEST["password"]);
+
+ global $pluginhost;
+ $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
- if ($enable_otp == "on") {
- db_query($this->link, "UPDATE ttrss_users SET otp_enabled = true WHERE
+ if ($authenticator->check_password($_SESSION["uid"], $password)) {
+
+ db_query($this->link, "UPDATE ttrss_users SET otp_enabled = false WHERE
id = " . $_SESSION["uid"]);
+
+ print "OK";
+ } else {
+ print "ERROR: ".__("Incorrect password");
}
+
+ }
+
+ function setplugins() {
+ if (is_array($_REQUEST["plugins"]))
+ $plugins = join(",", $_REQUEST["plugins"]);
+ else
+ $plugins = "";
+
+ set_pref($this->link, "_ENABLED_PLUGINS", $plugins);
+ }
+
+ function clearplugindata() {
+ $name = db_escape_string($this->link, $_REQUEST["name"]);
+
+ global $pluginhost;
+ $pluginhost->clear_data($pluginhost->get_plugin($name));
}
}
?>