From: Friendika <info@friendika.com>
Date: Tue, 9 Nov 2010 01:30:00 +0000 (-0800)
Subject: added search
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=45149271285ea3515c3c1a7ea189609969c76748;p=friendica.git
added search
---
diff --git a/boot.php b/boot.php
index 985cc922cb..4fc917bcc7 100644
--- a/boot.php
+++ b/boot.php
@@ -355,10 +355,10 @@ function load_translation_table($lang) {
if(! function_exists('t')) {
function t($s) {
-
+
$a = get_app();
- if($a->strings[$s])
+ if(x($a->strings,$s))
return $a->strings[$s];
return $s;
}}
@@ -1427,3 +1427,14 @@ function contact_block() {
}}
+if(! function_exists('search')) {
+function search($s) {
+ $a = get_app();
+ $o = '<div id="search-box">';
+ $o .= '<form action="' . $a->get_baseurl() . '/search' . '" method="get" >';
+ $o .= '<input type="text" name="search" id="search-text" value="' . $s .'" />';
+ $o .= '<input type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />';
+ $o .= '</form></div>';
+ return $o;
+}}
+
diff --git a/include/nav.php b/include/nav.php
index 7f15ec8056..dfa2dcc911 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,16 +1,16 @@
<?php
-if(! x($a->page,'nav'))
- $a->page['nav'] = '';
+ if(! x($a->page,'nav'))
+ $a->page['nav'] = '';
-$a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
+ $a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
-if(local_user()) {
+ if(local_user()) {
$a->page['nav'] .= '<a id="nav-logout-link" class="nav-link" href="logout">' . t('Logout') . "</a>\r\n";
-}
-else {
+ }
+ else {
$a->page['nav'] .= '<a id="nav-login-link" class="nav-login-link" href="login">' . t('Login') . "</a>\r\n";
-}
+ }
$a->page['nav'] .= "<span id=\"nav-link-wrapper\" >\r\n";
@@ -20,6 +20,7 @@ else {
$a->page['nav'] .= '<a id="nav-register-link" class="nav-commlink" href="register" >'
. t('Register') . "</a>\r\n";
+ $a->page['nav'] .= '<a id="nav-search-link" class="nav-link" href="search">' . t('Search') . "</a>\r\n";
$a->page['nav'] .= '<a id="nav-directory-link" class="nav-link" href="directory">' . t('Directory') . "</a>\r\n";
if(x($_SESSION,'uid')) {
diff --git a/mod/photos.php b/mod/photos.php
index 97587cbb5d..e1926bb568 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -990,7 +990,7 @@ function photos_content(&$a) {
$drop = '';
- if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == local_user()))
+ if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));
diff --git a/mod/search.php b/mod/search.php
new file mode 100644
index 0000000000..d05b3d4e28
--- /dev/null
+++ b/mod/search.php
@@ -0,0 +1,118 @@
+<?php
+
+
+function search_content(&$a) {
+
+ $o = '<div id="live-search"></div>' . "\r\n";
+
+ $o .= '<h3>' . t('Search') . '</h3>';
+
+ $search = ((x($_GET,'search')) ? $_GET['search'] : '');
+
+ $o .= search($search);
+
+ if(! $search)
+ return $o;
+
+ require_once("include/bbcode.php");
+ require_once('include/security.php');
+
+ $sql_extra = "
+ AND `item`.`allow_cid` = ''
+ AND `item`.`allow_gid` = ''
+ AND `item`.`deny_cid` = ''
+ AND `item`.`deny_gid` = ''
+ ";
+
+ $r = q("SELECT COUNT(*) AS `total`
+ FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+ WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0
+ AND `wall` = 1
+ AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )
+ $sql_extra ",
+ dbesc($search)
+ );
+
+ if(count($r))
+ $a->set_pager_total($r[0]['total']);
+
+ if(! $r[0]['total']) {
+ notice('No results.');
+ return $o;
+ }
+
+ $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+ `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+ `contact`.`network`, `contact`.`thumb`, `contact`.`self`,
+ `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
+ `user`.`nickname`
+ FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+ LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
+ WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0
+ AND `wall` = 1
+ AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )
+ $sql_extra
+ ORDER BY `parent` DESC ",
+ dbesc($search)
+ );
+
+ $tpl = load_view_file('view/search_item.tpl');
+ $droptpl = load_view_file('view/wall_fake_drop.tpl');
+
+ $return_url = $_SESSION['return_url'] = $a->cmd;
+
+ if(count($r)) {
+
+ foreach($r as $item) {
+
+ $comment = '';
+ $owner_url = '';
+ $owner_photo = '';
+ $owner_name = '';
+ $sparkle = '';
+
+ if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
+ && ($item['id'] != $item['parent']))
+ continue;
+
+ $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
+ $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
+ $profile_link = ((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
+
+
+ $location = (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+ $coord = (($item['coord']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+ if($coord) {
+ if($location)
+ $location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
+ else
+ $location = '<span class="smalltext">' . $coord . '</span>';
+ }
+
+ $drop = replace_macros($droptpl,array('$id' => $item['id']));
+
+ $o .= replace_macros($tpl,array(
+ '$id' => $item['item_id'],
+ '$profile_url' => $profile_link,
+ '$name' => $profile_name,
+ '$sparkle' => $sparkle,
+ '$thumb' => $profile_avatar,
+ '$title' => $item['title'],
+ '$body' => bbcode($item['body']),
+ '$ago' => relative_date($item['created']),
+ '$location' => $location,
+ '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
+ '$owner_url' => $owner_url,
+ '$owner_photo' => $owner_photo,
+ '$owner_name' => $owner_name,
+ '$drop' => $drop,
+ '$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $item['nickname'] . '/' . $item['id'] . '">' . t('View in context') . '</a>'
+ ));
+
+ }
+ }
+ return $o;
+}
+
diff --git a/util/strings.php b/util/strings.php
index d811e87a6f..49d7acee52 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -208,6 +208,7 @@ $a->strings['Photo not available'] = 'Photo not available';
$a->strings['Edit photo'] = 'Edit photo';
$a->strings['View Full Size'] = 'View Full Size';
$a->strings['Tags: '] = 'Tags: ';
+$a->strings['[Remove any tag]'] = '[Remove any tag]';
$a->strings['Caption'] = 'Caption';
$a->strings['Add a Tag'] = 'Add a Tag';
$a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping';
@@ -257,6 +258,11 @@ $a->strings['Password update failed. Please try again.'] = 'Password update fail
$a->strings['Settings updated.'] = 'Settings updated.';
$a->strings['Profile is <strong>not published</strong>.'] = 'Profile is <strong>not published</strong>.';
$a->strings['Default Post Permissions'] = 'Default Post Permissions';
+$a->strings['Cancel'] = 'Cancel';
+$a->strings['Tag removed'] = 'Tag removed';
+$a->strings['Remove Item Tag'] = 'Remove Item Tag';
+$a->strings['Select a tag to remove: '] = 'Select a tag to remove: ';
+$a->strings['Remove'] = 'Remove';
$a->strings['No contacts.'] = 'No contacts.';
$a->strings['Wall Photos'] = 'Wall Photos';
$a->strings['Logged out.'] = 'Logged out.';
diff --git a/view/search_item.tpl b/view/search_item.tpl
new file mode 100644
index 0000000000..6004ed5a1b
--- /dev/null
+++ b/view/search_item.tpl
@@ -0,0 +1,24 @@
+<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
+ <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
+ <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
+ <a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+ <img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a>
+ </div>
+
+ <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
+ <a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
+ <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
+ <div class="wall-item-location" id="wall-item-location-$id">$location</div>
+ </div>
+ <div class="wall-item-content" id="wall-item-content-$id" >
+ <div class="wall-item-title" id="wall-item-title-$id">$title</div>
+ <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+ </div>
+ $drop
+ </div>
+ <div class="wall-item-wrapper-end"></div>
+</div>
+
+<div class="wall-item-outside-wrapper-end$indent" ></div>
+ <div class="wall-item-conv" id="wall-item-conv-$id" >$conv</div>
+
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 249fb2a951..2dbd3d0623 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -167,7 +167,7 @@ aside {
/*left: 0px;*/
/*top: 60px;*/
/*right: 250px;*/
- width: 250px;
+ width: 230px;
/*margin-left: 20px;*/
/*margin-right: 0px;*/
font-size: 0.9em;
@@ -178,7 +178,7 @@ aside {
}
section {
position: absolute;
- left: 270px;
+ left: 250px;
top: 60px;
margin-top: 25px;
margin-left: 20px;
@@ -240,10 +240,10 @@ footer {
float: right;
margin-left: 0px;
margin-right: 3px;
- padding: 5px;
+ padding: 6px;
/*border: 2px solid #000000;*/
background: #D5D5D5;
- font-size: 90%;
+ font-size: 80%;
font-weight: bold;
-moz-border-radius-topleft: 3px;
-moz-border-radius-topright: 3px;
@@ -294,10 +294,10 @@ footer {
float: left;
margin-left: 3px;
margin-right: 0px;
- padding: 5px;
+ padding: 6px;
/*border: 2px solid #000000;*/
background: #D5D5D5;
- font-size: 90%;
+ font-size: 80%;
font-weight: bold;
text-decoration: none;
-moz-border-radius-topleft: 3px;
@@ -1813,3 +1813,16 @@ a.mail-list-link {
#tagrm-cancel {
margin-left: 15px;
}
+
+.wall-item-conv {
+ margin-top: 5px;
+ margin-bottom: 25px;
+}
+
+#search-submit {
+ margin-left: 15px;
+}
+
+#search-box {
+ margin-bottom: 25px;
+}
\ No newline at end of file