class Handler_Public extends Handler {
private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
- $limit, $search, $search_mode, $match_on, $view_mode = false, $format = 'atom') {
+ $limit, $offset, $search, $search_mode,
+ $view_mode = false, $format = 'atom') {
require_once "lib/MiniTemplator.class.php";
$date_sort_field = "date_entered";
}
+ if ($feed == -2)
+ $date_sort_field = "last_published";
+ else if ($feed == -1)
+ $date_sort_field = "last_marked";
+
$qfh_ret = queryFeedHeadlines($this->link, $feed,
$limit, $view_mode, $is_cat, $search, $search_mode,
- $match_on, "$date_sort_field DESC", 0, $owner_uid);
+ "$date_sort_field DESC", $offset, $owner_uid,
+ false, 0, false, true);
$result = $qfh_ret[0];
$feed_title = htmlspecialchars($qfh_ret[1]);
if ($line['note']) {
$content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
$content;
- }
+}
$tpl->setVariable('ARTICLE_CONTENT', $content, true);
$tpl->addBlock('feed');
$tpl->generateOutputToString($tmp);
- header("Content-Type: text/xml; charset=utf-8");
+ if (@!$_REQUEST["noxml"]) {
+ header("Content-Type: text/xml; charset=utf-8");
+ } else {
+ header("Content-Type: text/plain; charset=utf-8");
+ }
print $tmp;
} else if ($format == 'json') {
array_push($feed['articles'], $article);
}
- header("Content-Type: text/plain; charset=utf-8");
-
+ header("Content-Type: text/json; charset=utf-8");
print json_encode($feed);
} else {
}
function getUnread() {
- $login = db_escape_string($_REQUEST["login"]);
+ $login = db_escape_string($this->link, $_REQUEST["login"]);
$fresh = $_REQUEST["fresh"] == "1";
$result = db_query($this->link, "SELECT id FROM ttrss_users WHERE login = '$login'");
}
function getProfiles() {
- $login = db_escape_string($_REQUEST["login"]);
+ $login = db_escape_string($this->link, $_REQUEST["login"]);
$result = db_query($this->link, "SELECT * FROM ttrss_settings_profiles,ttrss_users
WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = '$login' ORDER BY title");
- print "<select style='width: 100%' name='profile'>";
+ print "<select dojoType='dijit.form.Select' style='width : 220px; margin : 0px' name='profile'>";
print "<option value='0'>" . __("Default profile") . "</option>";
}
function pubsub() {
- $mode = db_escape_string($_REQUEST['hub_mode']);
- $feed_id = (int) db_escape_string($_REQUEST['id']);
- $feed_url = db_escape_string($_REQUEST['hub_topic']);
+ $mode = db_escape_string($this->link, $_REQUEST['hub_mode']);
+ $feed_id = (int) db_escape_string($this->link, $_REQUEST['id']);
+ $feed_url = db_escape_string($this->link, $_REQUEST['hub_topic']);
if (!PUBSUBHUBBUB_ENABLED) {
header('HTTP/1.0 404 Not Found');
header("Location: index.php");
}
- function fbexport() {
-
- $access_key = db_escape_string($_POST["key"]);
-
- // TODO: rate limit checking using last_connected
- $result = db_query($this->link, "SELECT id FROM ttrss_linked_instances
- WHERE access_key = '$access_key'");
-
- if (db_num_rows($result) == 1) {
-
- $instance_id = db_fetch_result($result, 0, "id");
-
- $result = db_query($this->link, "SELECT feed_url, site_url, title, subscribers
- FROM ttrss_feedbrowser_cache ORDER BY subscribers DESC LIMIT 100");
-
- $feeds = array();
-
- while ($line = db_fetch_assoc($result)) {
- array_push($feeds, $line);
- }
-
- db_query($this->link, "UPDATE ttrss_linked_instances SET
- last_status_in = 1 WHERE id = '$instance_id'");
-
- print json_encode(array("feeds" => $feeds));
- } else {
- print json_encode(array("error" => array("code" => 6)));
- }
- }
-
function share() {
- $uuid = db_escape_string($_REQUEST["key"]);
+ $uuid = db_escape_string($this->link, $_REQUEST["key"]);
$result = db_query($this->link, "SELECT ref_id, owner_uid FROM ttrss_user_entries WHERE
uuid = '$uuid'");
}
function rss() {
- $feed = db_escape_string($_REQUEST["id"]);
- $key = db_escape_string($_REQUEST["key"]);
+ $feed = db_escape_string($this->link, $_REQUEST["id"]);
+ $key = db_escape_string($this->link, $_REQUEST["key"]);
$is_cat = $_REQUEST["is_cat"] != false;
- $limit = (int)db_escape_string($_REQUEST["limit"]);
+ $limit = (int)db_escape_string($this->link, $_REQUEST["limit"]);
+ $offset = (int)db_escape_string($this->link, $_REQUEST["offset"]);
- $search = db_escape_string($_REQUEST["q"]);
- $match_on = db_escape_string($_REQUEST["m"]);
- $search_mode = db_escape_string($_REQUEST["smode"]);
- $view_mode = db_escape_string($_REQUEST["view-mode"]);
+ $search = db_escape_string($this->link, $_REQUEST["q"]);
+ $search_mode = db_escape_string($this->link, $_REQUEST["smode"]);
+ $view_mode = db_escape_string($this->link, $_REQUEST["view-mode"]);
- $format = db_escape_string($_REQUEST['format']);
+ $format = db_escape_string($this->link, $_REQUEST['format']);
if (!$format) $format = 'atom';
if ($owner_id) {
$this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
- $search, $search_mode, $match_on, $view_mode, $format);
+ $offset, $search, $search_mode, $view_mode, $format);
} else {
header('HTTP/1.1 403 Forbidden');
}
}
function sharepopup() {
+ if (SINGLE_USER_MODE) {
+ login_sequence($this->link);
+ }
+
header('Content-Type: text/html; charset=utf-8');
print "<html>
<head>
<title>Tiny Tiny RSS</title>
<link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\">
<script type=\"text/javascript\" src=\"lib/prototype.js\"></script>
+ <script type=\"text/javascript\" src=\"lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls\"></script>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
</head>
<body id='sharepopup'>";
if ($_SESSION["uid"]) {
- if (!$action) {
-
- print "<table height='100%' width='100%'><tr><td colspan='2'>";
- print "<h1>".__("Share with Tiny Tiny RSS")."</h1>";
- print "</td></tr>";
+ if ($action == 'share') {
- print "<form id='share_form' name='share_form'>";
+ $title = db_escape_string($this->link, strip_tags($_REQUEST["title"]));
+ $url = db_escape_string($this->link, strip_tags($_REQUEST["url"]));
+ $content = db_escape_string($this->link, strip_tags($_REQUEST["content"]));
+ $labels = db_escape_string($this->link, strip_tags($_REQUEST["labels"]));
- print "<input type=\"hidden\" name=\"op\" value=\"sharepopup\">";
- print "<input type=\"hidden\" name=\"action\" value=\"share\">";
-
- $title = htmlspecialchars($_REQUEST["title"]);
- $url = htmlspecialchars($_REQUEST["url"]);
-
- print "<tr><td>".__("Title:")."</td><td width='80%'><input name='title' value=\"$title\"></td></tr>";
- print "<tr><td>".__("URL:")."</td><td><input name='url' value=\"$url\"></td></tr>";
- print "<tr><td>".__("Content:")."</td><td><input name='content' value=\"\"></td></tr>";
+ Article::create_published_article($this->link, $title, $url, $content, $labels,
+ $_SESSION["uid"]);
print "<script type='text/javascript'>";
- print "document.forms[0].title.focus();";
+ print "window.close();";
print "</script>";
- print "<tr><td colspan='2'>
- <div style='float : right' class='insensitive-small'>".
- __("Shared article will appear in the Published feed.").
- "</div><button type=\"submit\">".
- __('Share')."</button>
- <button onclick=\"return window.close()\">".
- __('Cancel')."</button>
- </div>";
-
- print "</form>";
- print "</td></tr></table>";
-
- print "</body></html>";
-
} else {
+ $title = htmlspecialchars($_REQUEST["title"]);
+ $url = htmlspecialchars($_REQUEST["url"]);
- $title = db_escape_string(strip_tags($_REQUEST["title"]));
- $url = db_escape_string(strip_tags($_REQUEST["url"]));
- $content = db_escape_string(strip_tags($_REQUEST["content"]));
-
- create_published_article($this->link, $title, $url, $content, $_SESSION["uid"]);
+ ?>
+
+ <table height='100%' width='100%'><tr><td colspan='2'>
+ <h1><?php echo __("Share with Tiny Tiny RSS") ?></h1>
+ </td></tr>
+
+ <form id='share_form' name='share_form'>
+
+ <input type="hidden" name="op" value="sharepopup">
+ <input type="hidden" name="action" value="share">
+
+ <tr><td align='right'><?php echo __("Title:") ?></td>
+ <td width='80%'><input name='title' value="<?php echo $title ?>"></td></tr>
+ <tr><td align='right'><?php echo __("URL:") ?></td>
+ <td><input name='url' value="<?php echo $url ?>"></td></tr>
+ <tr><td align='right'><?php echo __("Content:") ?></td>
+ <td><input name='content' value=""></td></tr>
+ <tr><td align='right'><?php echo __("Labels:") ?></td>
+ <td><input name='labels' id="labels_value"
+ placeholder='Alpha, Beta, Gamma' value="">
+ </td></tr>
+
+ <tr><td>
+ <div class="autocomplete" id="labels_choices"
+ style="display : block"></div></td></tr>
+
+ <script type='text/javascript'>document.forms[0].title.focus();</script>
+
+ <script type='text/javascript'>
+ new Ajax.Autocompleter('labels_value', 'labels_choices',
+ "backend.php?op=rpc&method=completeLabels",
+ { tokens: ',', paramName: "search" });
+ </script>
+
+ <tr><td colspan='2'>
+ <div style='float : right' class='insensitive-small'>
+ <?php echo __("Shared article will appear in the Published feed.") ?>
+ </div>
+ <button type="submit"><?php echo __('Share') ?></button>
+ <button onclick="return window.close()"><?php echo __('Cancel') ?></button>
+ </div>
+
+ </form>
+ </td></tr></table>
+ </body></html>
+ <?php
- print "<script type='text/javascript'>";
- print "window.close();";
- print "</script>";
}
} else {
- print "<table><tr><td>" . __("Not logged in.") . "</td></tr></table>";
-
+ $return = urlencode($_SERVER["REQUEST_URI"])
+ ?>
+
+ <form action="public.php?return=<?php echo $return ?>"
+ method="POST" id="loginForm" name="loginForm">
+
+ <input type="hidden" name="op" value="login">
+
+ <table height='100%' width='100%'><tr><td colspan='2'>
+ <h1><?php echo __("Not logged in") ?></h1></td></tr>
+
+ <tr><td align="right"><?php echo __("Login:") ?></td>
+ <td align="right"><input name="login"
+ value="<?php echo $_SESSION["fake_login"] ?>"></td></tr>
+ <tr><td align="right"><?php echo __("Password:") ?></td>
+ <td align="right"><input type="password" name="password"
+ value="<?php echo $_SESSION["fake_password"] ?>"></td></tr>
+ <tr><td align="right"><?php echo __("Language:") ?></td>
+ <td align="right">
+ <?php
+ print_select_hash("language", $_COOKIE["ttrss_lang"], get_translations(),
+ "style='width : 100%''");
+
+ ?>
+ </td></tr>
+ <tr><td colspan='2'>
+ <button type="submit">
+ <?php echo __('Log in') ?></button>
+
+ <button onclick="return window.close()">
+ <?php echo __('Cancel') ?></button>
+ </td></tr>
+ </table>
+
+ </form>
+ <?php
}
}
function login() {
- print_r($_REQUEST);
-
$_SESSION["prefs_cache"] = array();
if (!SINGLE_USER_MODE) {
- $login = db_escape_string($_POST["login"]);
+ $login = db_escape_string($this->link, $_POST["login"]);
$password = $_POST["password"];
$remember_me = $_POST["remember_me"];
if ($_POST["profile"]) {
- $profile = db_escape_string($_POST["profile"]);
+ $profile = db_escape_string($this->link, $_POST["profile"]);
$result = db_query($this->link, "SELECT id FROM ttrss_settings_profiles
WHERE id = '$profile' AND owner_uid = " . $_SESSION["uid"]);
}
function subscribe() {
+ if (SINGLE_USER_MODE) {
+ login_sequence($this->link);
+ }
+
if ($_SESSION["uid"]) {
- $feed_url = db_escape_string(trim($_REQUEST["feed_url"]));
+ $feed_url = db_escape_string($this->link, trim($_REQUEST["feed_url"]));
header('Content-Type: text/html; charset=utf-8');
print "<html>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
</head>
<body>
- <img class=\"floatingLogo\" src=\"images/logo_wide.png\"
+ <img class=\"floatingLogo\" src=\"images/logo_small.png\"
alt=\"Tiny Tiny RSS\"/>
- <h1>".__("Subscribe to feed...")."</h1>";
+ <h1>".__("Subscribe to feed...")."</h1><div class='content'>";
$rc = subscribe_to_feed($this->link, $feed_url);
break;
case 4:
print_notice(__("Multiple feed URLs found."));
- $feed_urls = get_feeds_from_html($feed_url);
+ $feed_urls = $rc["feeds"];
break;
case 5:
print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
</form></p>";
- print "</body></html>";
+ print "</div></body></html>";
} else {
render_login_form($this->link);
}
function subscribe2() {
- $feed_url = db_escape_string(trim($_REQUEST["feed_url"]));
- $cat_id = db_escape_string($_REQUEST["cat_id"]);
- $from = db_escape_string($_REQUEST["from"]);
+ $feed_url = db_escape_string($this->link, trim($_REQUEST["feed_url"]));
+ $cat_id = db_escape_string($this->link, $_REQUEST["cat_id"]);
+ $from = db_escape_string($this->link, $_REQUEST["from"]);
/* only read authentication information from POST */
- $auth_login = db_escape_string(trim($_POST["auth_login"]));
- $auth_pass = db_escape_string(trim($_POST["auth_pass"]));
+ $auth_login = db_escape_string($this->link, trim($_POST["auth_login"]));
+ $auth_pass = db_escape_string($this->link, trim($_POST["auth_pass"]));
$rc = subscribe_to_feed($this->link, $feed_url, $cat_id, $auth_login, $auth_pass);
print json_encode(array("error" => array("code" => 7)));
}
+ function forgotpass() {
+ header('Content-Type: text/html; charset=utf-8');
+ print "<html>
+ <head>
+ <title>Tiny Tiny RSS</title>
+ <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\">
+ <script type=\"text/javascript\" src=\"lib/prototype.js\"></script>
+ <script type=\"text/javascript\" src=\"lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls\"></script>
+ <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
+ </head>
+ <body id='forgotpass'>";
+
+ print '<div class="floatingLogo"><img src="images/logo_small.png"></div>';
+ print "<h1>".__("Reset password")."</h1>";
+ print "<div class='content'>";
+
+ @$method = $_POST['method'];
+
+ if (!$method) {
+ $secretkey = uniqid();
+ $_SESSION["secretkey"] = $secretkey;
+
+ print "<form method='POST' action='public.php'>";
+ print "<input type='hidden' name='secretkey' value='$secretkey'>";
+ print "<input type='hidden' name='method' value='do'>";
+ print "<input type='hidden' name='op' value='forgotpass'>";
+
+ print "<fieldset>";
+ print "<label>".__("Login:")."</label>";
+ print "<input type='text' name='login' value='' required>";
+ print "</fieldset>";
+
+ print "<fieldset>";
+ print "<label>".__("Email:")."</label>";
+ print "<input type='email' name='email' value='' required>";
+ print "</fieldset>";
+
+ print "<fieldset>";
+ print "<label>".__("How much is two plus two:")."</label>";
+ print "<input type='text' name='test' value='' required>";
+ print "</fieldset>";
+
+ print "<p/>";
+ print "<button type='submit'>".__("Reset password")."</button>";
+
+ print "</form>";
+ } else if ($method == 'do') {
+
+ $secretkey = $_POST["secretkey"];
+ $login = db_escape_string($this->link, $_POST["login"]);
+ $email = db_escape_string($this->link, $_POST["email"]);
+ $test = db_escape_string($this->link, $_POST["test"]);
+
+ if (($test != 4 && $test != 'four') || !$email || !$login) {
+ print_error(__('Some of the required form parameters are missing or incorrect.'));
+
+ print "<p><a href=\"public.php?op=forgotpass\">".__("Go back")."</a></p>";
+
+ } else if ($_SESSION["secretkey"] == $secretkey) {
+
+ $result = db_query($this->link, "SELECT id FROM ttrss_users
+ WHERE login = '$login' AND email = '$email'");
+
+ if (db_num_rows($result) != 0) {
+ $id = db_fetch_result($result, 0, "id");
+
+ Pref_Users::resetUserPassword($this->link, $id, false);
+
+ print "<p>".__("Completed.")."</p>";
+
+ } else {
+ print_error(__("Sorry, login and email combination not found."));
+ print "<p><a href=\"public.php?op=forgotpass\">".__("Go back")."</a></p>";
+ }
+
+ } else {
+ print_error(__("Form secret key incorrect. Please enable cookies and try again."));
+ print "<p><a href=\"public.php?op=forgotpass\">".__("Go back")."</a></p>";
+
+ }
+
+ }
+
+ print "</div>";
+ print "</body>";
+ print "</html>";
+
+ }
+
}
?>
git.wh0rd.org / tt-rss.git / blobdiff