extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:42:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

More changes to meet new class layout.

Browse Source
This commit is contained in:
skeeter 2001-05-21 11:12:58 +00:00
parent ab83067ef4
commit 25f39e4837
4 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
calendar/matrixselect.php
View File

@ -23,28 +23,26 @@
include('../header.inc.php');
$datetime = mktime(0,0,0,$thismonth,$thisday,$thisyear) - ((60 * 60) * intval($phpgw_info['user']['preferences']['common']['tz_offset']));
$datetime = mktime(0,0,0,$thismonth,$thisday,$thisyear) - $phpgw->calendar->datetime->tz_offset;
$sb = CreateObject('phpgwapi.sbox');
$p = CreateObject('phpgwapi.Template',$phpgw->calendar->template_dir);
$templates = Array(
'matrix_query_begin' => 'matrix_query.tpl',
'list' => 'list.tpl',
'matrix_query_end' => 'matrix_query.tpl',
'mq' => 'matrix_query.tpl',
'form_button' => 'form_button_script.tpl'
);
$p->set_file($templates);
$p->set_block('mq','matrix_query','matrix_query');
$p->set_block('mq','list','list');
$var = Array(
'matrix_action' => lang('Daily Matrix View'),
'action_url' => $phpgw->link('/'.$phpgw_info['flags']['currentapp'].'/viewmatrix.php')
'action_url' => $phpgw->link('/calendar/viewmatrix.php')
);
$p->set_var($var);
$p->parse('out','matrix_query_begin');
// Date
$day_html = $sb->getDays('day',intval($phpgw->common->show_date($datetime,'d')));
@ -57,7 +55,7 @@
);
$p->set_var($var);
$p->parse('output','list',True);
$p->parse('rows','list',True);
// View type
$str = '<select name="matrixtype">';
@ -71,7 +69,7 @@
);
$p->set_var($var);
$p->parse('output','list',True);
$p->parse('rows','list',True);
// Participants
$accounts = $phpgw->acl->get_ids_for_location('run',1,'calendar');
@ -129,7 +127,7 @@
);
$p->set_var($var);
$p->parse('output','list',True);
$p->parse('rows','list',True);
$var = Array(
'submit_button' => lang('Submit'),
@ -142,7 +140,7 @@
$p->set_var($var);
$p->parse('cancel_button','form_button');
$p->pparse('out','matrix_query_end');
$p->pparse('out','matrix_query');
$phpgw->common->phpgw_footer();
?>

6
calendar/search.php
View File

@ -74,12 +74,12 @@
}
else
{
$cal_stream = $phpgw->calendar->open('INBOX',intval($owner),'');
$phpgw->calendar->open('INBOX',intval($owner),'');
for($i=0;$i<count($events);$i++)
{
$event = $phpgw->calendar->fetch_event($cal_stream,$events[$i]);
$event = $phpgw->calendar->fetch_event($events[$i]);
$datetime = mktime($event->start->hour,$event->start->min,$event->start->sec,$event->start->month,$event->start->mday,$event->start->year) - $phpgw->calendar->tz_offset;
$datetime = mktime($event->start->hour,$event->start->min,$event->start->sec,$event->start->month,$event->start->mday,$event->start->year) - $phpgw->calendar->datetime->tz_offset;
$ids[strval($event->id)]++;
$info[strval($event->id)] = $phpgw->common->show_date($datetime).$phpgw->calendar->link_to_entry($event,$event->start->month,$event->start->mday,$event->start->year);

17
calendar/templates/default/matrix_query.tpl
View File

@ -1,19 +1,20 @@
<!-- $Id$ -->
<!-- BEGIN matrix_query_begin -->
<!-- BEGIN matrix_query -->
<center>
<h2><font color="#000000">{matrix_action}</font></h2>
<form target="viewmatrix" action="{action_url}" method="post" name="matrixform">
<table border="0" width="75%">
<!-- END matrix_query_begin -->
{output}
<!-- BEGIN matrix_query_end -->
{rows}
</table>
<input type="submit" value="{submit_button}">
</form>
{cancel_button}
</center>
<!-- END matrix_query_end -->
<!-- END matrix_query -->
<!-- BEGIN list -->
<tr>
<td valign="top" width="35%"><b>{field}:</b></td>
<td valign="top" width="65%">{data}</td>
</tr>
<!-- END list -->

2
calendar/viewmatrix.php
View File

@ -65,7 +65,7 @@
switch($matrixtype)
{
case 'free/busy':
$freetime = $phpgw->calendar->makegmttime(0,0,0,$thismonth,$thisday,$thisyear);
$freetime = $phpgw->calendar->datetime->makegmttime(0,0,0,$thismonth,$thisday,$thisyear);
echo $phpgw->calendar->timematrix($freetime,$phpgw->calendar->splittime('000000',False),0,$participants);
break;
case 'weekly':