extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Should fix calendar searching. Searches was previously only searching in repeating events. Now searches either repeating events or std events.

Browse Source
This commit is contained in:
skeeter 2001-05-16 10:47:20 +00:00
parent e4de7df1b1
commit b7a9dac51f
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
calendar/search.php
View File

@ -66,7 +66,7 @@
$sql .= 'ORDER BY phpgw_cal.datetime ASC, phpgw_cal.edatetime ASC, phpgw_cal.priority ASC';
$events = $phpgw->calendar->get_event_ids(True,$sql);
$events = $phpgw->calendar->get_event_ids(False,$sql);
if($events == False)
{
@ -79,11 +79,11 @@
{
$event = $phpgw->calendar->fetch_event($cal_stream,$events[$i]);
$datetime = mktime($event->start->hour,$event->start->min,$event->start->sec,$event->start->month,$event->start->mday,$event->start->year) - ((60 * 60) * intval($phpgw_info['user']['preferences']['common']['tz_offset']));
$datetime = mktime($event->start->hour,$event->start->min,$event->start->sec,$event->start->month,$event->start->mday,$event->start->year) - $phpgw->calendar->tz_offset;
$ids[strval($event->id)]++;
$info[strval($event->id)] = $event->name.' ('
. $phpgw->common->show_date($datetime).')';
$info[strval($event->id)] = $phpgw->common->show_date($datetime).$phpgw->calendar->link_to_entry($event,$event->start->month,$event->start->mday,$event->start->year);
}
$matches = count($events);
}
@ -112,11 +112,14 @@
$p = CreateObject('phpgwapi.Template',$phpgw->calendar->template_dir);
$templates = Array(
'search' => 'search.tpl',
'search_list' => 'search_list.tpl',
'search_form' => 'search.tpl'
);
$p->set_file($templates);
$p->set_block('search_form','search','search');
$p->set_block('search_form','search_list_header','search_list_header');
$p->set_block('search_form','search_list','search_list');
$p->set_block('search_form','search_list_footer','search_list_footer');
$var = Array(
'color' => $phpgw_info['theme']['bg_text'],
'search_text' => lang('Search Results'),
@ -125,15 +128,23 @@
$p->set_var($var);
if($matches > 0)
{
$p->parse('rows','search_list_header',True);
}
// now sort by number of hits
arsort($ids);
for(reset($ids);$key=key($ids);next($ids))
{
$p->set_var('url_result',$phpgw->link('/calendar/view.php','id='.$key.'&owner='.$owner));
$p->set_var('result_desc',$info[$key]);
$p->parse('output','search_list',True);
$p->parse('rows','search_list',True);
}
if($matches > 0)
{
$p->parse('rows','search_list_footer',True);
}
$p->pparse('out','search');
$phpgw->common->phpgw_footer();

14
calendar/templates/default/search.tpl
View File

@ -1,6 +1,16 @@
<!-- $Id$ -->
<!-- BEGIN search -->
<h2><font color="{color}">{search_text}</font></h2>
<b>{quantity}</b><p>
{output}
{rows}
<p>
<!-- END search -->
<!-- BEGIN search_list_header -->
<ul>
<!-- END search_list_header -->
<!-- BEGIN search_list -->
<li>{result_desc}</li>
<!-- END search_list -->
<!-- BEGIN search_list_footer -->
</ul>
<!-- END search_list_footer -->