mirror of https://tt-rss.org/git/tt-rss.git
public.php: markup cleanup
This commit is contained in:
parent
be322d6fc8
commit
6701497879
|
@ -61,8 +61,7 @@ class Handler_Public extends Handler {
|
||||||
PluginHost::feed_to_pfeed_id($feed));
|
PluginHost::feed_to_pfeed_id($feed));
|
||||||
|
|
||||||
if ($handler) {
|
if ($handler) {
|
||||||
$qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id($feed),
|
$qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id($feed), $params);
|
||||||
$options);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
@ -383,26 +382,6 @@ class Handler_Public extends Handler {
|
||||||
|
|
||||||
$line['content'] = rewrite_cached_urls($line['content']);
|
$line['content'] = rewrite_cached_urls($line['content']);
|
||||||
|
|
||||||
$num_comments = (int) $line["num_comments"];
|
|
||||||
$entry_comments = "";
|
|
||||||
|
|
||||||
if ($num_comments > 0) {
|
|
||||||
if ($line["comments"]) {
|
|
||||||
$comments_url = htmlspecialchars($line["comments"]);
|
|
||||||
} else {
|
|
||||||
$comments_url = htmlspecialchars($line["link"]);
|
|
||||||
}
|
|
||||||
$entry_comments = "<a class=\"comments\"
|
|
||||||
target='_blank' rel=\"noopener noreferrer\" href=\"$comments_url\">$num_comments ".
|
|
||||||
_ngettext("comment", "comments", $num_comments)."</a>";
|
|
||||||
|
|
||||||
} else {
|
|
||||||
if ($line["comments"] && $line["link"] != $line["comments"]) {
|
|
||||||
$entry_comments = "<a class=\"comments\" target='_blank' rel=\"noopener noreferrer\" href=\"".
|
|
||||||
htmlspecialchars($line["comments"])."\">".__("comments")."</a>";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$enclosures = Article::get_article_enclosures($line["id"]);
|
$enclosures = Article::get_article_enclosures($line["id"]);
|
||||||
|
|
||||||
header("Content-Type: text/html");
|
header("Content-Type: text/html");
|
||||||
|
@ -965,34 +944,35 @@ class Handler_Public extends Handler {
|
||||||
} else if (!$method) {
|
} else if (!$method) {
|
||||||
print_notice(__("You will need to provide valid account name and email. Password reset link will be sent to your email address."));
|
print_notice(__("You will need to provide valid account name and email. Password reset link will be sent to your email address."));
|
||||||
|
|
||||||
print "<form method='POST' action='public.php'>";
|
print "<form method='POST' action='public.php'>
|
||||||
print "<input type='hidden' name='method' value='do'>";
|
<input type='hidden' name='method' value='do'>
|
||||||
print "<input type='hidden' name='op' value='forgotpass'>";
|
<input type='hidden' name='op' value='forgotpass'>
|
||||||
|
|
||||||
print "<fieldset>";
|
<fieldset>
|
||||||
print "<label>".__("Login:")."</label>";
|
<label>".__("Login:")."</label>
|
||||||
print "<input dojoType='dijit.form.TextBox' type='text' name='login' value='' required>";
|
<input dojoType='dijit.form.TextBox' type='text' name='login' value='' required>
|
||||||
print "</fieldset>";
|
</fieldset>
|
||||||
|
|
||||||
print "<fieldset>";
|
<fieldset>
|
||||||
print "<label>".__("Email:")."</label>";
|
<label>".__("Email:")."</label>
|
||||||
print "<input dojoType='dijit.form.TextBox' type='email' name='email' value='' required>";
|
<input dojoType='dijit.form.TextBox' type='email' name='email' value='' required>
|
||||||
print "</fieldset>";
|
</fieldset>";
|
||||||
|
|
||||||
$_SESSION["pwdreset:testvalue1"] = rand(1,10);
|
$_SESSION["pwdreset:testvalue1"] = rand(1,10);
|
||||||
$_SESSION["pwdreset:testvalue2"] = rand(1,10);
|
$_SESSION["pwdreset:testvalue2"] = rand(1,10);
|
||||||
|
|
||||||
print "<fieldset>";
|
print "<fieldset>
|
||||||
print "<label>".T_sprintf("How much is %d + %d:", $_SESSION["pwdreset:testvalue1"], $_SESSION["pwdreset:testvalue2"])."</label>";
|
<label>".T_sprintf("How much is %d + %d:", $_SESSION["pwdreset:testvalue1"], $_SESSION["pwdreset:testvalue2"])."</label>
|
||||||
print "<input dojoType='dijit.form.TextBox' type='text' name='test' value='' required>";
|
<input dojoType='dijit.form.TextBox' type='text' name='test' value='' required>
|
||||||
print "</fieldset>";
|
</fieldset>
|
||||||
|
|
||||||
print "<hr/>";
|
<hr/>
|
||||||
print "<fieldset>";
|
<fieldset>
|
||||||
print "<button dojoType='dijit.form.Button' type='submit' class='alt-danger'>".__("Reset password")."</button>";
|
<button dojoType='dijit.form.Button' type='submit' class='alt-danger'>".__("Reset password")."</button>
|
||||||
print "</fieldset>";
|
<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>
|
||||||
|
</fieldset>
|
||||||
print "</form>";
|
|
||||||
|
</form>";
|
||||||
} else if ($method == 'do') {
|
} else if ($method == 'do') {
|
||||||
|
|
||||||
$login = clean($_POST["login"]);
|
$login = clean($_POST["login"]);
|
||||||
|
|
Loading…
Reference in New Issue