aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-08-28 12:32:32 +1000
committerGitHub <noreply@github.com>2016-08-28 12:32:32 +1000
commit391d7fed523b47e9cceb2f27be7c91bdf47b535c (patch)
tree8fc0a973e1fbcdc945533e94cb0c98176da0e97e
parent381b1a066d83198c6f13f8aa920a6e4537f9404f (diff)
parent07e28a9757d23b4bffa44f54937fe914a6a106db (diff)
downloadvolse-hubzilla-391d7fed523b47e9cceb2f27be7c91bdf47b535c.tar.gz
volse-hubzilla-391d7fed523b47e9cceb2f27be7c91bdf47b535c.tar.bz2
volse-hubzilla-391d7fed523b47e9cceb2f27be7c91bdf47b535c.zip
Merge pull request #501 from anaqreon/doc-search
Display text around the searched query in documentation search
-rw-r--r--Zotlabs/Module/Help.php5
-rw-r--r--include/help.php9
2 files changed, 10 insertions, 4 deletions
diff --git a/Zotlabs/Module/Help.php b/Zotlabs/Module/Help.php
index 479925b66..241354d07 100644
--- a/Zotlabs/Module/Help.php
+++ b/Zotlabs/Module/Help.php
@@ -36,8 +36,9 @@ class Help extends \Zotlabs\Web\Controller {
$fname = substr($fname,0,strrpos($fname,'.'));
$path = trim(substr($dirname,4),'/');
- $o .= '<li><a href="help/' . (($path) ? $path . '/' : '') . $fname . '" >' . ucwords(str_replace('_',' ',notags($fname))) . '</a><br />' .
- str_replace('$Projectname',\Zotlabs\Lib\System::get_platform_name(),substr($rr['text'],0,200)) . '...<br /><br /></li>';
+ $o .= '<li><a href="help/' . (($path) ? $path . '/' : '') . $fname . '" >' . ucwords(str_replace('_',' ',notags($fname))) . '</a><br />'
+ . '<b><i>' . 'help/' . (($path) ? $path . '/' : '') . $fname . '</i></b><br />' .
+ '...' . str_replace('$Projectname',\Zotlabs\Lib\System::get_platform_name(),$rr['text']) . '...<br /><br /></li>';
}
$o .= '</ul>';
diff --git a/include/help.php b/include/help.php
index 7f57f3334..4bcc09670 100644
--- a/include/help.php
+++ b/include/help.php
@@ -40,8 +40,13 @@ function search_doc_files($s) {
$r = fetch_post_tags($r,true);
for($x = 0; $x < count($r); $x ++) {
-
- $r[$x]['text'] = $r[$x]['body'];
+ $position = stripos($r[$x]['body'], $s);
+ $dislen = 300;
+ $start = $position-floor($dislen/2);
+ if ( $start < 0) {
+ $start = 0;
+ }
+ $r[$x]['text'] = substr($r[$x]['body'], $start, $dislen);
$r[$x]['rank'] = 0;
if($r[$x]['term']) {