Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git into tunable-fetches

3 files changed, 7 insertions, 18 deletions

diff --git a/classes/feeds.php b/classes/feeds.php
index ff6b864e5..0c643325f 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -143,6 +143,10 @@ class Feeds extends Handler_Protected {
 
 		//$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;
 	}
 
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index a6ba72fc6..5b8a77fd6 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -24,6 +24,9 @@ class PluginHost {
 	const HOOK_FEED_FETCHED = 12;
 	const HOOK_SANITIZE = 13;
 	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_SYSTEM = 2;
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 5b5120e1b..891a69a52 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -19,15 +19,8 @@ class Pref_Users extends Handler_Protected {
 
 		function userdetails() {
 
-			header("Content-Type: text/xml");
-			print "<dlg>";
-
 			$uid = sprintf("%d", $_REQUEST["id"]);
 
-			print "<title>".__('User details')."</title>";
-
-			print "<content><![CDATA[";
-
 			$result = db_query($this->link, "SELECT login,
 				".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
 				access_level,
@@ -106,22 +99,13 @@ class Pref_Users extends Handler_Protected {
 				<button onclick=\"closeInfoBox()\">".__("Close this window").
 				"</button></div>";
 
-			print "]]></content></dlg>";
-
 			return;
 		}
 
 		function edit() {
 			global $access_level_names;
 
-			header("Content-Type: text/xml");
-
 			$id = db_escape_string($this->link, $_REQUEST["id"]);
-
-			print "<dlg id=\"$method\">";
-			print "<title>".__('User Editor')."</title>";
-			print "<content><![CDATA[";
-
 			print "<form id=\"user_edit_form\" onsubmit='return false'>";
 
 			print "<input type=\"hidden\" name=\"id\" value=\"$id\">";
@@ -193,8 +177,6 @@ class Pref_Users extends Handler_Protected {
 				<button onclick=\"return userEditCancel()\">".
 					__('Cancel')."</button></div>";
 
-			print "]]></content></dlg>";
-
 			return;
 		}