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

sharepopup: implement assigning labels while sharing

This commit is contained in:
Andrew Dolgov 2012-10-31 12:55:24 +04:00
parent 4021d61ada
commit 1b4d1a6b44
6 changed files with 91 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/api.php
View File

@ -439,7 +439,7 @@ class API extends Handler {
$url = db_escape_string(strip_tags($_REQUEST["url"])); $url = db_escape_string(strip_tags($_REQUEST["url"]));
$content = db_escape_string(strip_tags($_REQUEST["content"])); $content = db_escape_string(strip_tags($_REQUEST["content"]));
if (create_published_article($this->link, $title, $url, $content, $_SESSION["uid"])) { if (create_published_article($this->link, $title, $url, $content, "", $_SESSION["uid"])) {
print $this->wrap(self::STATUS_OK, array("status" => 'OK')); print $this->wrap(self::STATUS_OK, array("status" => 'OK'));
} else { } else {
print $this->wrap(self::STATUS_ERR, array("error" => 'Publishing failed')); print $this->wrap(self::STATUS_ERR, array("error" => 'Publishing failed'));

19
classes/handler/public.php
View File

@ -383,6 +383,7 @@ class Handler_Public extends Handler {
<title>Tiny Tiny RSS</title> <title>Tiny Tiny RSS</title>
<link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\"> <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\">
<script type=\"text/javascript\" src=\"lib/prototype.js\"></script> <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\"/> <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
</head> </head>
<body id='sharepopup'>"; <body id='sharepopup'>";
@ -396,8 +397,10 @@ class Handler_Public extends Handler {
$title = db_escape_string(strip_tags($_REQUEST["title"])); $title = db_escape_string(strip_tags($_REQUEST["title"]));
$url = db_escape_string(strip_tags($_REQUEST["url"])); $url = db_escape_string(strip_tags($_REQUEST["url"]));
$content = db_escape_string(strip_tags($_REQUEST["content"])); $content = db_escape_string(strip_tags($_REQUEST["content"]));
$labels = db_escape_string(strip_tags($_REQUEST["labels"]));
create_published_article($this->link, $title, $url, $content, $_SESSION["uid"]); create_published_article($this->link, $title, $url, $content, $labels,
$_SESSION["uid"]);
print "<script type='text/javascript'>"; print "<script type='text/javascript'>";
print "window.close();"; print "window.close();";
@ -424,9 +427,23 @@ class Handler_Public extends Handler {
<td><input name='url' value="<?php echo $url ?>"></td></tr> <td><input name='url' value="<?php echo $url ?>"></td></tr>
<tr><td align='right'><?php echo __("Content:") ?></td> <tr><td align='right'><?php echo __("Content:") ?></td>
<td><input name='content' value=""></td></tr> <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'>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'> <tr><td colspan='2'>
<div style='float : right' class='insensitive-small'> <div style='float : right' class='insensitive-small'>
<?php echo __("Shared article will appear in the Published feed.") ?> <?php echo __("Shared article will appear in the Published feed.") ?>

2
classes/pref/feeds.php
View File

@ -1479,7 +1479,7 @@ class Pref_Feeds extends Handler_Protected {
print "<p>" . __("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS") . "</p>"; print "<p>" . __("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS") . "</p>";
$bm_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".SELF_URL_PATH."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=200')){l.href=g;}}a();})()"); $bm_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".SELF_URL_PATH."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()");
print "<a href=\"$bm_url\" class='bookmarklet'>" . __('Share with Tiny Tiny RSS'). "</a>"; print "<a href=\"$bm_url\" class='bookmarklet'>" . __('Share with Tiny Tiny RSS'). "</a>";

19
classes/rpc.php
View File

@ -2,7 +2,7 @@
class RPC extends Handler_Protected { class RPC extends Handler_Protected {
function csrf_ignore($method) { function csrf_ignore($method) {
$csrf_ignored = array("sanitycheck", "buttonplugin", "exportget", "sharepopup"); $csrf_ignored = array("sanitycheck", "buttonplugin", "exportget", "completelabels");
return array_search($method, $csrf_ignored) !== false; return array_search($method, $csrf_ignored) !== false;
} }
@ -426,6 +426,23 @@ class RPC extends Handler_Protected {
print json_encode(array("link" => $new_link)); print json_encode(array("link" => $new_link));
} }
function completeLabels() {
$search = db_escape_string($_REQUEST["search"]);
$result = db_query($this->link, "SELECT DISTINCT caption FROM
ttrss_labels2
WHERE owner_uid = '".$_SESSION["uid"]."' AND
LOWER(caption) LIKE LOWER('$search%') ORDER BY caption
LIMIT 5");
print "<ul>";
while ($line = db_fetch_assoc($result)) {
print "<li>" . $line["caption"] . "</li>";
}
print "</ul>";
}
function completeTags() { function completeTags() {
$search = db_escape_string($_REQUEST["search"]); $search = db_escape_string($_REQUEST["search"]);

24
include/functions.php
View File

@ -5545,10 +5545,18 @@
} }
function create_published_article($link, $title, $url, $content, $owner_uid) { function create_published_article($link, $title, $url, $content, $labels_str,
$guid = sha1($url); $owner_uid) {
$guid = sha1($url . $owner_uid); // include owner_uid to prevent global GUID clash
$content_hash = sha1($content); $content_hash = sha1($content);
if ($labels_str != "") {
$labels = explode(",", $labels_str);
} else {
$labels = array();
}
$rc = false; $rc = false;
if (!$title) $title = $url; if (!$title) $title = $url;
@ -5584,6 +5592,12 @@
('$ref_id', '', NULL, NULL, $owner_uid, true, '', '', NOW(), '', false)"); ('$ref_id', '', NULL, NULL, $owner_uid, true, '', '', NOW(), '', false)");
} }
if (count($labels) != 0) {
foreach ($labels as $label) {
label_add_article($link, $ref_id, trim($label), $owner_uid);
}
}
$rc = true; $rc = true;
} else { } else {
@ -5602,6 +5616,12 @@
VALUES VALUES
('$ref_id', '', NULL, NULL, $owner_uid, true, '', '', NOW(), '', false)"); ('$ref_id', '', NULL, NULL, $owner_uid, true, '', '', NOW(), '', false)");
if (count($labels) != 0) {
foreach ($labels as $label) {
label_add_article($link, $ref_id, trim($label), $owner_uid);
}
}
$rc = true; $rc = true;
} }
} }

31
utility.css
View File

@ -151,3 +151,34 @@ body#sharepopup form {
body#sharepopup input { body#sharepopup input {
width : 100%; width : 100%;
} }
div.autocomplete {
position : absolute;
width : 250px;
background-color : white;
border :1px solid #778899;
margin : 0px;
padding : 0px;
z-index : 4;
}
div.autocomplete ul {
list-style-type : none;
margin : 0px;
padding : 0px;
font-size : 10px;
}
div.autocomplete ul li.selected {
background-color : #fff7d5;
}
div.autocomplete ul li {
list-style-type : none;
display : block;
margin : 0;
padding : 2px;
height : 32px;
cursor : pointer;
}