This commit is contained in:
Andreas Österreicher
2012-02-09 17:26:20 +00:00
parent 57684e0100
commit f1039a4015
3 changed files with 25 additions and 19 deletions
+6 -1
View File
@@ -24,6 +24,8 @@
require_once('../config/cis.config.inc.php');
require_once('../include/functions.inc.php');
require_once('../include/sprache.class.php');
require_once('../include/phrasen.class.php');
ob_start();
if(isset($_GET['sprache']))
{
@@ -47,6 +49,9 @@ if(isset($_GET['content']))
$content = $_GET['content'];
else
$content = '../cms/news.php';
$sprache = getSprache();
$p = new phrasen($sprache);
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
@@ -124,7 +129,7 @@ function loadampel()
</td>
<td align="right" nowrap>
<form name="searchform" action="private/tools/suche.php" method="GET" target="content" style="display:inline">
<input type="search" size="10" name="search" placeholder="Suchbegriff ..."/>
<input type="search" size="10" name="search" placeholder="<?php echo $p->t('tools/suchbegriff');?> ..."/>
<img src="../skin/images/search.png" height="14px" onclick="document.searchform.submit()" class="suchicon"/>
</form>
</td>
+18 -17
View File
@@ -47,7 +47,7 @@ echo '<h1>',$p->t('tools/suche'),'</h1>';
$search = (isset($_REQUEST['search'])?$_REQUEST['search']:'');
echo '<form action="',$_SERVER['PHP_SELF'],'" name="searchform" method="GET">
<input type="search" placeholder="Suchbegriff ..." size="40" name="search" value="',$db->convert_html_chars($search),'" />
<input type="search" placeholder="'.$p->t('tools/suchbegriff').' ..." size="40" name="search" value="',$db->convert_html_chars($search),'" />
<img src="../../../skin/images/search.png" onclick="document.searchform.submit()" height="15px" class="suchicon"/>
</form>';
@@ -56,9 +56,9 @@ if($search=='')
$searchItems = explode(' ',$search);
searchPerson($searchItems);
searchContent($searchItems);
searchPerson($searchItems);
function searchPerson($searchItems)
@@ -67,10 +67,9 @@ function searchPerson($searchItems)
$bn = new benutzer();
$bn->search($searchItems);
echo '<h2>',$p->t('global/personen'),'</h2>';
if(count($bn->result)>0)
{
echo '<h2>',$p->t('global/personen'),'</h2>';
echo '
<script type="text/javascript">
$(document).ready(function()
@@ -122,20 +121,22 @@ function searchContent($searchItems)
global $db,$p;
$cms = new content();
$cms->search($searchItems);
echo '<h2>',$p->t('tools/content'),'</h2>';
echo '<ul>';
foreach($cms->result as $row)
{
echo '<li><div class="suchergebnis">';
echo '<a href="../../../cms/content.php?content_id=',$db->convert_html_chars($row->content_id),'">',$db->convert_html_chars($row->titel),'</a><br>';
$preview = findAndMark($row->content, $searchItems);
echo $preview;
echo '<br /><br /></div></li>';
}
echo '</ul>';
if(count($cms->result)>0)
{
echo '<h2>',$p->t('tools/content'),'</h2>';
echo '<ul>';
foreach($cms->result as $row)
{
echo '<li><div class="suchergebnis">';
echo '<a href="../../../cms/content.php?content_id=',$db->convert_html_chars($row->content_id),'">',$db->convert_html_chars($row->titel),'</a><br>';
$preview = findAndMark($row->content, $searchItems);
echo $preview;
echo '<br /><br /></div></li>';
}
echo '</ul>';
}
}
function findAndMark($content, $items)
{
+1 -1
View File
@@ -47,7 +47,7 @@ class ical extends basis_db
{
$rows = explode("\n",$ical);
$idx = count($result);
$idx = count($this->result);
$status=0;
$dtstart='';
$dtend='';