valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/stickystyle/Tiny-Tiny-RSS

This commit is contained in:
Ryan Parrish 2013-04-01 10:41:20 -04:00
parent 7081aaa09b 837ec70e3e
commit f4bae03a6e
6 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/feeds.php
View File

@ -143,6 +143,10 @@ class Feeds extends Handler_Protected {
//$reply .= "</h2"; //$reply .= "</h2";
foreach ($pluginhost->get_hooks($pluginhost::HOOK_HEADLINE_TOOLBAR_BUTTON) as $p) {
echo $p->hook_headline_toolbar_button($feed_id, $is_cat);
}
return $reply; return $reply;
} }

3
classes/pluginhost.php
View File

@ -24,6 +24,9 @@ class PluginHost {
const HOOK_FEED_FETCHED = 12; const HOOK_FEED_FETCHED = 12;
const HOOK_SANITIZE = 13; const HOOK_SANITIZE = 13;
const HOOK_RENDER_ARTICLE_API = 14; const HOOK_RENDER_ARTICLE_API = 14;
const HOOK_TOOLBAR_BUTTON = 15;
const HOOK_ACTION_ITEM = 16;
const HOOK_HEADLINE_TOOLBAR_BUTTON = 17;
const KIND_ALL = 1; const KIND_ALL = 1;
const KIND_SYSTEM = 2; const KIND_SYSTEM = 2;

1
include/functions.php
View File

@ -621,6 +621,7 @@
$_SESSION["uid"]); $_SESSION["uid"]);
$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"]; $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
$_SESSION["user_agent"] = sha1($_SERVER['HTTP_USER_AGENT']);
$_SESSION["pwd_hash"] = db_fetch_result($result, 0, "pwd_hash"); $_SESSION["pwd_hash"] = db_fetch_result($result, 0, "pwd_hash");
$_SESSION["last_version_check"] = time(); $_SESSION["last_version_check"] = time();

3
include/sessions.php
View File

@ -59,6 +59,9 @@
if ($_SESSION["ref_schema_version"] != session_get_schema_version($link, true)) if ($_SESSION["ref_schema_version"] != session_get_schema_version($link, true))
return false; return false;
if (sha1($_SERVER['HTTP_USER_AGENT']) != $_SESSION["user_agent"])
return false;
if ($_SESSION["uid"]) { if ($_SESSION["uid"]) {
$result = db_query($link, $result = db_query($link,
"SELECT pwd_hash FROM ttrss_users WHERE id = '".$_SESSION["uid"]."'"); "SELECT pwd_hash FROM ttrss_users WHERE id = '".$_SESSION["uid"]."'");

18
index.php
View File

@ -199,12 +199,15 @@
<option value="2weeks"><?php echo __('Older than two weeks') ?></option> <option value="2weeks"><?php echo __('Older than two weeks') ?></option>
</select> </select>
<button dojoType="dijit.form.Button"
onclick="viewCurrentFeed()">
<?php echo __('Refresh') ?></button>
</form> </form>
<?php
global $pluginhost;
foreach ($pluginhost->get_hooks($pluginhost::HOOK_TOOLBAR_BUTTON) as $p) {
echo $p->hook_toolbar_button();
}
?>
<div class="actionChooser"> <div class="actionChooser">
<button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true" <button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true"
@ -243,6 +246,13 @@
<!-- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddLabel')"><?php echo __('Create label...') ?></div> <!-- <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddLabel')"><?php echo __('Create label...') ?></div>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFilter')"><?php echo __('Create filter...') ?></div> --> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFilter')"><?php echo __('Create filter...') ?></div> -->
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
<?php
foreach ($pluginhost->get_hooks($pluginhost::HOOK_ACTION_ITEM) as $p) {
echo $p->hook_action_item();
}
?>
<?php if (!$_SESSION["hide_logout"]) { ?> <?php if (!$_SESSION["hide_logout"]) { ?>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcLogout')"><?php echo __('Logout') ?></div> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcLogout')"><?php echo __('Logout') ?></div>
<?php } ?> <?php } ?>

2
tt-rss.css
View File

@ -972,6 +972,7 @@ div.postHeader span.author {
body#ttrssZoom { body#ttrssZoom {
margin-left : auto; margin-left : auto;
margin-right : auto; margin-right : auto;
padding : 2em;
max-width : 800px; max-width : 800px;
background : #f0f0f0; background : #f0f0f0;
} }
@ -982,7 +983,6 @@ body#ttrssZoom div.postContent p {
body#ttrssZoom div.postReply { body#ttrssZoom div.postReply {
border : 1px solid #ccc; border : 1px solid #ccc;
margin : 20px;
box-shadow : 0px 0px 3px #ccc; box-shadow : 0px 0px 3px #ccc;
} }