harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move saved searches to new taxonomy

Browse Source
This commit is contained in:
friendica 2012-07-11 17:54:00 -07:00
parent 3f414aec63
commit 9ac32c49e2
4 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
boot.php
View File

@ -199,12 +199,14 @@ define ( 'NOTIFY_SYSTEM', 0x8000 );
* Tag/term types * Tag/term types
*/ */
define ( 'TERM_UNKNOWN', 0 ); define ( 'TERM_UNKNOWN', 0 );
define ( 'TERM_HASHTAG', 1 ); define ( 'TERM_HASHTAG', 1 );
define ( 'TERM_MENTION', 2 ); define ( 'TERM_MENTION', 2 );
define ( 'TERM_CATEGORY', 3 ); define ( 'TERM_CATEGORY', 3 );
define ( 'TERM_PCATEGORY', 4 ); define ( 'TERM_PCATEGORY', 4 );
define ( 'TERM_FILE', 5 ); define ( 'TERM_FILE', 5 );
define ( 'TERM_SAVEDSEARCH', 6 );
define ( 'TERM_OBJ_POST', 1 ); define ( 'TERM_OBJ_POST', 1 );
define ( 'TERM_OBJ_PHOTO', 2 ); define ( 'TERM_OBJ_PHOTO', 2 );

21
mod/network.php
View File

@ -68,23 +68,26 @@ function network_init(&$a) {
if(! x($a->page,'aside')) if(! x($a->page,'aside'))
$a->page['aside'] = ''; $a->page['aside'] = '';
$search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : ''); $search = ((x($_GET,'search')) ? $_GET['search'] : '');
if(x($_GET,'save')) { if(x($_GET,'save')) {
$r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1", $r = q("select * from `term` where `uid` = %d and `type` = %d and `term` = '%s' limit 1",
intval(local_user()), intval(local_user()),
intval(TERM_SAVEDSEARCH),
dbesc($search) dbesc($search)
); );
if(! count($r)) { if(! count($r)) {
q("insert into `search` ( `uid`,`term` ) values ( %d, '%s') ", q("insert into `term` ( `uid`,`type`,`term` ) values ( %d, %d, '%s') ",
intval(local_user()), intval(local_user()),
intval(TERM_SAVEDSEARCH),
dbesc($search) dbesc($search)
); );
} }
} }
if(x($_GET,'remove')) { if(x($_GET,'remove')) {
q("delete from `search` where `uid` = %d and `term` = '%s' limit 1", q("delete from `term` where `uid` = %d and `type` = %d and `term` = '%s' limit 1",
intval(local_user()), intval(local_user()),
intval(TERM_SAVEDSEARCH),
dbesc($search) dbesc($search)
); );
} }
@ -114,7 +117,7 @@ function network_init(&$a) {
// search terms header // search terms header
if(x($_GET,'search')) { if(x($_GET,'search')) {
$a->page['content'] .= '<h2>' . t('Search Results For:') . ' ' . $search . '</h2>'; $a->page['content'] .= '<h2>' . t('Search Results For:') . ' ' . htmlspecialchars($search) . '</h2>';
} }
$a->page['aside'] .= group_side('network','network',true,$group_id); $a->page['aside'] .= group_side('network','network',true,$group_id);
@ -141,8 +144,9 @@ function saved_searches($search) {
$o = ''; $o = '';
$r = q("select `id`,`term` from `search` WHERE `uid` = %d", $r = q("select `tid`,`term` from `term` WHERE `uid` = %d and `type` = %d ",
intval(local_user()) intval(local_user()),
intval(TERM_SAVEDSEARCH)
); );
$saved = array(); $saved = array();
@ -150,8 +154,9 @@ function saved_searches($search) {
if(count($r)) { if(count($r)) {
foreach($r as $rr) { foreach($r as $rr) {
$saved[] = array( $saved[] = array(
'id' => $rr['id'], 'id' => $rr['tid'],
'term' => $rr['term'], 'term' => $rr['term'],
'displayterm' => htmlspecialchars($rr['term']),
'encodedterm' => urlencode($rr['term']), 'encodedterm' => urlencode($rr['term']),
'delete' => t('Remove term'), 'delete' => t('Remove term'),
'selected' => ($search==$rr['term']), 'selected' => ($search==$rr['term']),

31
mod/search.php
View File

@ -4,8 +4,9 @@ function search_saved_searches() {
$o = ''; $o = '';
$r = q("select `id`,`term` from `search` WHERE `uid` = %d", $r = q("select `tid`,`term` from `term` WHERE `uid` = %d and type = %d",
intval(local_user()) intval(local_user()),
intval(TERM_SAVEDSEARCH)
); );
if(count($r)) { if(count($r)) {
@ -13,7 +14,7 @@ function search_saved_searches() {
$o .= '<h3>' . t('Saved Searches') . '</h3>' . "\r\n"; $o .= '<h3>' . t('Saved Searches') . '</h3>' . "\r\n";
$o .= '<ul id="saved-search-ul">' . "\r\n"; $o .= '<ul id="saved-search-ul">' . "\r\n";
foreach($r as $rr) { foreach($r as $rr) {
$o .= '<li class="saved-search-li clear"><a href="search/?f=&remove=1&search=' . $rr['term'] . '" class="icon drophide savedsearchdrop" title="' . t('Remove term') . '" onclick="return confirmDelete();" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> <a href="search/?f=&search=' . $rr['term'] . '" class="savedsearchterm" >' . $rr['term'] . '</a></li>' . "\r\n"; $o .= '<li class="saved-search-li clear"><a href="search/?f=&remove=1&search=' . $rr['term'] . '" class="icon drophide savedsearchdrop" title="' . t('Remove term') . '" onclick="return confirmDelete();" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> <a href="search/?f=&search=' . $rr['term'] . '" class="savedsearchterm" >' . htmlspecialchars($rr['term']) . '</a></li>' . "\r\n";
} }
$o .= '</ul><div class="clear"></div></div>' . "\r\n"; $o .= '</ul><div class="clear"></div></div>' . "\r\n";
} }
@ -25,24 +26,27 @@ function search_saved_searches() {
function search_init(&$a) { function search_init(&$a) {
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); $search = ((x($_GET,'search')) ? trim(rawurldecode($_GET['search'])) : '');
if(local_user()) { if(local_user()) {
if(x($_GET,'save') && $search) { if(x($_GET,'save') && $search) {
$r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1", $r = q("select `tid` from `term` where `uid` = %d and `type` = %d and `term` = '%s' limit 1",
intval(local_user()), intval(local_user()),
intval(TERM_SAVEDSEARCH),
dbesc($search) dbesc($search)
); );
if(! count($r)) { if(! count($r)) {
q("insert into `search` ( `uid`,`term` ) values ( %d, '%s') ", q("insert into `term` ( `uid`,`type`,`term` ) values ( %d, %d, '%s') ",
intval(local_user()), intval(local_user()),
intval(TERM_SAVEDSEARCH),
dbesc($search) dbesc($search)
); );
} }
} }
if(x($_GET,'remove') && $search) { if(x($_GET,'remove') && $search) {
q("delete from `search` where `uid` = %d and `term` = '%s' limit 1", q("delete from `term` where `uid` = %d and `type` = %d and `term` = '%s' limit 1",
intval(local_user()), intval(local_user()),
intval(TERM_SAVEDSEARCH),
dbesc($search) dbesc($search)
); );
} }
@ -83,17 +87,16 @@ function search_content(&$a) {
$o .= '<h3>' . t('Search') . '</h3>'; $o .= '<h3>' . t('Search') . '</h3>';
if(x($a->data,'search')) if(x($a->data,'search'))
$search = notags(trim($a->data['search'])); $search = trim($a->data['search']);
else else
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); $search = ((x($_GET,'search')) ? trim(rawurldecode($_GET['search'])) : '');
$tag = false; $tag = false;
if(x($_GET,'tag')) { if(x($_GET,'tag')) {
$tag = true; $tag = true;
$search = ((x($_GET,'tag')) ? notags(trim(rawurldecode($_GET['tag']))) : ''); $search = ((x($_GET,'tag')) ? trim(rawurldecode($_GET['tag'])) : '');
} }
$o .= search($search,'search-box','/search',((local_user()) ? true : false)); $o .= search($search,'search-box','/search',((local_user()) ? true : false));
if(strpos($search,'#') === 0) { if(strpos($search,'#') === 0) {
@ -165,12 +168,12 @@ function search_content(&$a) {
); );
$a = fetch_post_tags($a);
if($tag) if($tag)
$o .= '<h2>Items tagged with: ' . $search . '</h2>'; $o .= '<h2>Items tagged with: ' . htmlspecialchars($search) . '</h2>';
else else
$o .= '<h2>Search results for: ' . $search . '</h2>'; $o .= '<h2>Search results for: ' . htmlspecialchars($search) . '</h2>';
$o .= conversation($a,$r,'search',false); $o .= conversation($a,$r,'search',false);

2
view/saved_searches_aside.tpl
View File

@ -6,7 +6,7 @@
{{ for $saved as $search }} {{ for $saved as $search }}
<li class="saved-search-li clear"> <li class="saved-search-li clear">
<a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a> <a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
<a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a> <a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.displayterm</a>
</li> </li>
{{ endfor }} {{ endfor }}
</ul> </ul>