A couple of fixes... Not sure, but I do know this also adds in feature #418759.

This commit is contained in:
skeeter 2001-04-28 21:56:24 +00:00
parent eac8c1a938
commit 0cd21d331d
22 changed files with 475 additions and 185 deletions

View File

@ -407,9 +407,16 @@
if ($id > 0)
{
$p->set_var('action_url_button',$phpgw->link('/'.$phpgw_info['flags']['currentapp'].'/delete.php','id='.$id));
$p->set_var('action_text_button',lang('Delete'));
$p->set_var('action_confirm_button',"onClick=\"return confirm('".lang("Are you sure\\nyou want to\\ndelete this entry ?\\n\\nThis will delete\\nthis entry for all users.")."')\"");
$action_url_button = $phpgw->link('/calendar/delete.php','id='.$id);
$action_text_button = lang('Delete');
$action_confirm_button = "onClick=\"return confirm('".lang("Are you sure\\nyou want to \\ndelete this entry?\\n\\nThis will delete\\nthis entry for all users.")."')\"";
$var = Array(
'action_url_button' => $action_url_button,
'action_text_button' => $action_text_button,
'action_confirm_button' => $action_confirm_button,
'action_extra_field' => ''
);
$p->set_var($var);
$p->parse('delete_button','form_button');
$p->pparse('out','edit_entry_end');
}

View File

@ -271,18 +271,20 @@
$phpgw->calendar->event = $event;
$var = Array(
'action_url_button' => $phpgw->link('/calendar/edit_entry_handler.php','readsess='.$event->id.'&year='.$event->start->year.'&month='.$event->start->month.'&day='.$event->start->mday),
'action_text_button' => lang('Ignore Conflict'),
'action_confirm_button' => ''
'action_url_button' => $phpgw->link('/calendar/edit_entry_handler.php','readsess='.$event->id.'&year='.$event->start->year.'&month='.$event->start->month.'&day='.$event->start->mday),
'action_text_button' => lang('Ignore Conflict'),
'action_confirm_button' => '',
'action_extra_field => ''
);
$p->set_var($var);
$p->parse('resubmit_button','form_button');
$var = Array(
'action_url_button' => $phpgw->link('/calendar/edit_entry.php','readsess='.$event->id.'&year='.$event->start->year.'&month='.$event->start->month.'&day='.$event->start->mday),
'action_text_button' => lang('Re-Edit Event'),
'action_confirm_button' => ''
'action_url_button' => $phpgw->link('/calendar/edit_entry.php','readsess='.$event->id.'&year='.$event->start->year.'&month='.$event->start->month.'&day='.$event->start->mday),
'action_text_button' => lang('Re-Edit Event'),
'action_confirm_button' => '',
'action_extra_field' => ''
);
$p->set_var($var);

View File

@ -82,13 +82,11 @@ class calendar extends calendar_
}
$this->template_dir = $phpgw->common->get_tpl_dir('calendar');
$this->phpgwapi_template_dir = $phpgw->common->get_image_path('phpgwapi');
$this->phpgwapi_template_dir = PHPGW_IMAGES_DIR;
$this->image_dir = $phpgw->common->get_image_path('calendar');
$this->today = $this->localdates(time());
$this->open('',intval($this->owner));
// $this->end_repeat_day = $this->today['raw'];
// $this->read_repeated_events($this->owner);
$this->set_filter();
$this->tz_offset = ((60 * 60) * intval($phpgw_info['user']['preferences']['common']['tz_offset']));
@ -1538,14 +1536,13 @@ class calendar extends calendar_
}
}
$p = CreateObject('phpgwapi.Template',$phpgw->calendar->template_dir);
$p = CreateObject('phpgwapi.Template',$this->template_dir);
$p->set_unknowns('keep');
$templates = Array(
'view_begin' => 'view.tpl',
'list' => 'list.tpl',
'view_end' => 'view.tpl',
'form_button' => 'form_button_script.tpl'
'view_end' => 'view.tpl'
);
$p->set_file($templates);
@ -1570,7 +1567,9 @@ class calendar extends calendar_
if ($event->category)
{
$cat = $phpgw->categories->return_single($event->category);
$cats = CreateObject('phpgwapi.categories');
$cats->categories($this->owner,'calendar');
$cat = $cats->return_single($event->category);
$var = Array(
'field' => lang('Category'),
'data' => $cat[0]['name']
@ -1780,25 +1779,41 @@ class calendar extends calendar_
'form_button' => 'form_button_script.tpl'
);
$p->set_file($templates);
$p->set_var('action_url_button',$phpgw->link('/calendar/action.php','id='.$this->event->id.'&action='.ACCEPTED));
$p->set_var('action_text_button',' '.lang('Accept').' ');
$p->set_var('action_confirm_button','');
$var = Array(
'action_url_button' => $phpgw->link('/calendar/action.php','id='.$this->event->id.'&action='.ACCEPTED),
'action_text_button' => ' '.lang('Accept').' ',
'action_confirm_button' => '',
'action_extra_field' => ''
);
$p->set_var($var);
$str .= '<td>'.$p->finish($p->parse('out','form_button')).'</td>'."\n";
$p->set_var('action_url_button',$phpgw->link('/calendar/action.php','id='.$this->event->id.'&action='.REJECTED));
$p->set_var('action_text_button',' '.lang('Reject').' ');
$p->set_var('action_confirm_button','');
$var = Array(
'action_url_button' => $phpgw->link('/calendar/action.php','id='.$this->event->id.'&action='.REJECTED),
'action_text_button' => ' '.lang('Reject').' ',
'action_confirm_button' => '',
'action_extra_field' => ''
);
$p->set_var($var);
$str .= '<td>'.$p->finish($p->parse('out','form_button')).'</td>'."\n";
$p->set_var('action_url_button',$phpgw->link('/calendar/action.php','id='.$this->event->id.'&action='.TENTATIVE));
$p->set_var('action_text_button',' '.lang('Tentative').' ');
$p->set_var('action_confirm_button','');
$var = Array(
'action_url_button' => $phpgw->link('/calendar/action.php','id='.$this->event->id.'&action='.TENTATIVE),
'action_text_button' => ' '.lang('Tentative').' ',
'action_confirm_button' => '',
'action_extra_field' => ''
);
$p->set_var($var);
$str .= '<td>'.$p->finish($p->parse('out','form_button')).'</td>'."\n";
$p->set_var('action_url_button',$phpgw->link('/calendar/action.php','id='.$this->event->id.'&action='.NO_RESPONSE));
$p->set_var('action_text_button',' '.lang('No Response').' ');
$p->set_var('action_confirm_button','');
$var = Array(
'action_url_button' => $phpgw->link('/calendar/action.php','id='.$this->event->id.'&action='.NO_RESPONSE),
'action_text_button' => ' '.lang('No Response').' ',
'action_confirm_button' => '',
'action_extra_field' => ''
);
$p->set_var($var);
$str .= '<td>'.$p->finish($p->parse('out','form_button')).'</td>'."\n";
$str .= '</tr></table>';

View File

@ -628,6 +628,7 @@ class calendar_ extends calendar__
. 'mdatetime='.$today.', '
. 'edatetime='.$enddate.', '
. 'priority='.$event->priority.', '
. 'category='.$event->category.', '
. "cal_type='".$type."', "
. 'is_public='.$event->public.', '
. "title='".addslashes($event->title)."', "

View File

@ -16,7 +16,7 @@
if (floor(phpversion()) == 4) {
global $date, $year, $month, $day, $thisyear, $thismonth, $thisday, $filter, $keywords;
global $matrixtype, $participants, $owner, $phpgw, $grants, $rights, $SCRIPT_FILENAME;
global $matrixtype, $participants, $owner, $phpgw, $grants, $rights, $SCRIPT_FILENAME, $remainder;
}
$cols = 8;
@ -24,133 +24,7 @@
{
$cols++;
}
include(PHPGW_APP_TPL.'/header.inc.php');
flush();
?>
<table border="0" width="100%" cols="<?php echo $cols; ?>" cellpadding="0" cellspacing="0">
<tr>
<td width="2%">
&nbsp;
</td>
<td width="2%">
<a href="<?php echo $phpgw->link('/calendar/day.php','day='.$phpgw->calendar->today['day'].'&month='.$phpgw->calendar->today['month'].'&year='.$phpgw->calendar->today['year'].'&owner='.$owner); ?>">
<img src="<?php echo $phpgw_info['server']['app_images']; ?>/today.gif" alt="<?php echo lang('Today'); ?>" border="0">
</a>
</td>
<td width="2%" align="left">
<a href="<?php echo $phpgw->link('/calendar/week.php','day='.$phpgw->calendar->today['day'].'&month='.$phpgw->calendar->today['month'].'&year='.$phpgw->calendar->today['year'].'&owner='.$owner); ?>">
<img src="<?php echo $phpgw_info['server']['app_images']; ?>/week.gif" alt="<?php echo lang('This week'); ?>" border="0">
</a>
</td>
<td width="2%" align="left">
<a href="<?php echo $phpgw->link('/calendar/month.php','day='.$phpgw->calendar->today['day'].'&month='.$phpgw->calendar->today['month'].'&year='.$phpgw->calendar->today['year'].'&owner='.$owner); ?>">
<img src="<?php echo $phpgw_info['server']['app_images']; ?>/month.gif" alt="<?php echo lang('This month'); ?>" border="0">
</a>
</td>
<td width="2%" align="left">
<a href="<?php echo $phpgw->link('/calendar/year.php','day='.$phpgw->calendar->today['day'].'&month='.$phpgw->calendar->today['month'].'&year='.$phpgw->calendar->today['year'].'&owner='.$owner); ?>">
<img src="<?php echo $phpgw_info['server']['app_images']; ?>/year.gif" alt="<?php echo lang('This year'); ?>" border="0">
</a>
</td>
<td width="2%" align="left">
<a href="<?php echo $phpgw->link('/calendar/matrixselect.php','day='.$phpgw->calendar->today['day'].'&month='.$phpgw->calendar->today['month'].'&year='.$phpgw->calendar->today['year'].'&owner='.$owner); ?>">
<img src="<?php echo $phpgw_info['server']['app_images']; ?>/view.gif" alt="<?php echo lang('Daily Matrix View'); ?>" border="0">
</a>
</td>
<?php
$remainder = 65;
if($phpgw->calendar->check_perms(PHPGW_ACL_PRIVATE) == True)
{
$remainder -= 30;
?>
<form action="<?php echo $phpgw->link('/calendar/'.basename($SCRIPT_FILENAME),'owner='.$owner); ?>" method="POST" name="filtermethod">
<td width="30%" align="center" valign="center">
<b><?php echo lang('Filter'); ?>:</b>
<input type="hidden" name="from" value="<?php echo '/calendar/'.basename($SCRIPT_FILENAME); ?>">
<?php if(isset($date) && $date) { ?>
<input type="hidden" name="date" value="<?php echo $date; ?>">
<?php } ?>
<input type="hidden" name="month" value="<?php echo $thismonth; ?>">
<input type="hidden" name="day" value="<?php echo $thisday; ?>">
<input type="hidden" name="year" value="<?php echo $thisyear; ?>">
<?php if(isset($keywords) && $keywords) { ?>
<input type="hidden" name="keywords" value="<?php echo $keywords; ?>">
<?php } ?>
<?php if(isset($matrixtype) && $matrixtype) { ?>
<input type="hidden" name="matrixtype" value="<?php echo $matrixtype; ?>">
<?php }
if(isset($participants) && $participants) {
for ($i=0;$i<count($participants);$i++) {
echo '<input type="hidden" name="participants[]" value="'.$participants[$i].'">';
}
} ?>
<select name="filter" onchange="document.filtermethod.submit()">
<option value="all"<?php if($filter=='all') echo ' selected'; ?>><?php echo lang('All'); ?></option>
<option value="private"<?php if((!isset($filter) || !$filter) || $filter=='private') echo ' selected'; ?>><?php echo lang('Private Only'); ?></option>
<!--
<option value="public"<?php if($filter=='public') echo ' selected'; ?>><?php echo lang('Global Public Only'); ?></option>
<option value="group"<?php if($filter=='group') echo ' selected'; ?>><?php echo lang('Group Public Only'); ?></option>
<option value="private+public"<?php if($filter=='private+public') echo ' selected'; ?>><?php echo lang('Private and Global Public'); ?></option>
<option value="private+group"<?php if($filter=='private+group') echo ' selected'; ?>><?php echo lang('Private and Group Public'); ?></option>
<option value="public+group"<?php if($filter=='public+group') echo ' selected'; ?>><?php echo lang('Global Public and Group Public'); ?></option>
-->
</select>
<NOSCRIPT><INPUT TYPE="submit" VALUE="<?php echo lang('Go!'); ?>"></NOSCRIPT></FONT>
</td>
</form>
<?php
}
if(count($grants) > 0)
{
?>
<form action="<?php echo $phpgw->link('/calendar/'.basename($SCRIPT_FILENAME)); ?>" method="POST" name="setowner">
<td width="<?php echo $remainder; ?>%" align="center" valign="center">
<b><?php echo lang('User'); ?>:</b>
<input type="hidden" name="from" value="<?php echo '/calendar/'.basename($SCRIPT_FILENAME); ?>">
<?php if(isset($date) && $date) { ?>
<input type="hidden" name="date" value="<?php echo $date; ?>">
<?php } ?>
<input type="hidden" name="month" value="<?php echo $thismonth; ?>">
<input type="hidden" name="day" value="<?php echo $thisday; ?>">
<input type="hidden" name="year" value="<?php echo $thisyear; ?>">
<?php if(isset($keywords) && $keywords) { ?>
<input type="hidden" name="keywords" value="<?php echo $keywords; ?>">
<?php } ?>
<?php if(isset($id) && $id != 0) { ?>
<input type="hidden" name="id" value="<?php echo $id; ?>">
<?php } ?>
<select name="owner" onchange="document.setowner.submit()">
<?php
while(list($grantor,$temp_rights) = each($grants))
{
?>
<option value="<?php echo $grantor; ?>"<?php if($grantor==$owner) echo ' selected'; ?>><?php echo $phpgw->common->grab_owner_name($grantor); ?></option>
<?php
}
reset($grants);
?>
</select>
<NOSCRIPT><INPUT TYPE="submit" VALUE="<?php echo lang('Go!'); ?>"></NOSCRIPT></FONT>
</td>
</form>
<?php
}
?>
<form action="<?php echo $phpgw->link('/calendar/search.php','owner='.$owner); ?>" method="POST">
<td align="right" valign="center">
<input type="hidden" name="from" value="<?php echo '/calendar/'.basename($SCRIPT_FILENAME); ?>">
<?php if(isset($date) && $date) { ?>
<input type="hidden" name="date" value="<?php echo $date; ?>">
<?php } ?>
<input type="hidden" name="month" value="<?php echo $thismonth; ?>">
<input type="hidden" name="day" value="<?php echo $thisday; ?>">
<input type="hidden" name="year" value="<?php echo $thisyear; ?>">
<?php if(isset($filter) && $filter) { ?>
<input type="hidden" name="filter" value="<?php echo $filter; ?>">
<?php } ?>
<input name="keywords"<?php if($keywords) echo ' value="'.$keywords.'"'; ?>>
<input type="submit" name="submit" value="<?php echo lang('Search'); ?>">
</td>
</form>
</tr>
</table>
<?php flush(); ?>

View File

@ -40,8 +40,7 @@
reset($event->participants);
$tz_offset = ((60 * 60) * intval($phpgw_info['user']['preferences']['common']['tz_offset']));
$freetime = $phpgw->calendar->localdates(mktime(0,0,0,$event->start->month,$event->start->mday,$event->start->year) - $tz_offset);
$freetime = $phpgw->calendar->localdates(mktime(0,0,0,$event->start->month,$event->start->mday,$event->start->year) - $phpgw->calendar->tz_offset);
echo $phpgw->calendar->timematrix($freetime,$phpgw->calendar->splittime('000000',False),0,$event->participants);
echo '</td></tr><tr><td>';

View File

@ -132,10 +132,11 @@
$p->parse('output','list',True);
$var = Array(
'submit_button' => lang('Submit'),
'action_url_button' => '',
'action_text_button' => lang('Cancel'),
'action_confirm_button' => 'onClick="history.back(-1)"'
'submit_button' => lang('Submit'),
'action_url_button' => '',
'action_text_button' => lang('Cancel'),
'action_confirm_button' => 'onClick="history.back(-1)"',
'action_extra_field' => ''
);
$p->set_var($var);

View File

@ -25,6 +25,7 @@
'noappfooter' => True,
'nofooter' => True
);
$friendly = intval($friendly);
}
else
{
@ -51,7 +52,7 @@
$m = mktime(0,0,0,$thismonth,1,$thisyear);
if ($friendly == 0)
if (intval($friendly) == 0)
{
$printer = '';
$param = 'year='.$thisyear.'&month='.$thismonth.'&friendly=1&filter='.$filter.'&owner='.$owner;

View File

@ -51,16 +51,16 @@
$words = split(' ',$keywords);
for ($i=0;$i<count($words);$i++)
{
$sql = "AND (UPPER(calendar_entry.cal_name) LIKE UPPER('%".$words[$i]."%') OR "
. " UPPER(calendar_entry.cal_description) LIKE UPPER('%".$words[$i]."%')) ";
$sql = "AND (UPPER(phpgw_cal.title) LIKE UPPER('%".$words[$i]."%') OR "
. " UPPER(phpgw_cal.description) LIKE UPPER('%".$words[$i]."%')) ";
// Private
if(strpos($phpgw->calendar->filter,'private'))
{
$sql .= "AND calendar_entry.cal_access='private' ";
$sql .= "AND phpgw_cal.is_public=0 ";
}
$sql .= 'ORDER BY calendar_entry.cal_datetime ASC, calendar_entry.cal_edatetime ASC, calendar_entry.cal_priority ASC';
$sql .= 'ORDER BY phpgw_cal.datetime ASC, phpgw_cal.edatetime ASC, phpgw_cal.priority ASC';
$events = $phpgw->calendar->get_event_ids(True,$sql);
@ -125,7 +125,7 @@
arsort($ids);
for(reset($ids);$key=key($ids);next($ids))
{
$p->set_var('url_result',$phpgw->link('/'.$phpgw_info['flags']['currentapp'].'/view.php','id='.$key.'&owner='.$owner));
$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);
}

View File

@ -0,0 +1,9 @@
<!-- $Id$ -->
<td width="{form_width}%" align="center" valign="bottom">
<form action="{form_link}" method="post" name="{form_name}form">
<b>{title}:</b>
{hidden_vars} <select name="{form_name}" onchange="document.{form_name}form.submit()">
{form_options} </select>
<noscript><input type="submit" value="{button_value}"></noscript>
</form>
</td>

View File

@ -1,6 +1,6 @@
<!-- $Id$ -->
<!-- BEGIN form_button -->
<form action="{action_url_button}" method="post" name="{action_text_button}form">
<input type="submit" value="{action_text_button}" {action_confirm_button}>
{action_extra_field} <input type="submit" value="{action_text_button}" {action_confirm_button}>
</form>
<!-- END form_button -->

View File

@ -0,0 +1,6 @@
<!-- $Id$ -->
<table border="0" width="100%" cols={cols} cellpadding="0" cellspacing="0">
<tr>
{header_column} </tr>
</table>

View File

@ -0,0 +1,2 @@
<!-- $Id$ -->
{str}

View File

@ -0,0 +1,173 @@
<?php
/**************************************************************************\
* phpGroupWare *
* http://www.phpgroupware.org *
* -------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU General Public License as published by the *
* Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. *
\**************************************************************************/
/* $Id$ */
function add_col($str,&$tpl)
{
$tpl->set_var('str',$str);
$tpl->parse('header_column','head_col',True);
}
function add_image_ahref($link,$image,$alt)
{
return '<a href="'.$link.'"><img src="'.PHPGW_IMAGES.'/'.$image.'" alt="'.$alt.'" border="0"></a>';
}
$tpl = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('calendar'));
$tpl->set_unknowns('remove');
$templates = Array(
'head' => 'head.tpl',
'head_col' => 'head_col.tpl',
'form_button_dropdown' => 'form_button_dropdown.tpl',
'form_button_script' => 'form_button_script.tpl'
);
$tpl->set_file($templates);
$tpl->set_block('form_button_script','form_button');
$tpl->set_var('cols',$cols);
$str = ' <td width="2%">&nbsp;</td>';
add_col($str,$tpl);
$link = $phpgw->link('/calendar/day.php','day='.$phpgw->calendar->today['day'].'&month='.$phpgw->calendar->today['month'].'&year='.$phpgw->calendar->today['year'].'&owner='.$owner);
$str = ' <td width="2%">'.add_image_ahref($link,'today.gif',lang('Today')).'</td>';
add_col($str,$tpl);
$link = $phpgw->link('/calendar/week.php','day='.$phpgw->calendar->today['day'].'&month='.$phpgw->calendar->today['month'].'&year='.$phpgw->calendar->today['year'].'&owner='.$owner);
$str = ' <td width="2%" align="left">'.add_image_ahref($link,'week.gif',lang('This week')).'</td>';
add_col($str,$tpl);
$link = $phpgw->link('/calendar/month.php','day='.$phpgw->calendar->today['day'].'&month='.$phpgw->calendar->today['month'].'&year='.$phpgw->calendar->today['year'].'&owner='.$owner);
$str = ' <td width="2%" align="left">'.add_image_ahref($link,'month.gif',lang('This month')).'</td>';
add_col($str,$tpl);
$link = $phpgw->link('/calendar/year.php','day='.$phpgw->calendar->today['day'].'&month='.$phpgw->calendar->today['month'].'&year='.$phpgw->calendar->today['year'].'&owner='.$owner);
$str = ' <td width="2%" align="left">'.add_image_ahref($link,'year.gif',lang('This Year')).'</td>';
add_col($str,$tpl);
$link = $phpgw->link('/calendar/matrixselect.php','day='.$phpgw->calendar->today['day'].'&month='.$phpgw->calendar->today['month'].'&year='.$phpgw->calendar->today['year'].'&owner='.$owner);
$str = ' <td width="2%" align="left">'.add_image_ahref($link,'view.gif',lang('Daily Matrix View')).'</td>';
add_col($str,$tpl);
$base_url = '/calendar/'.basename($SCRIPT_FILENAME);
$remainder = 65;
if($phpgw->calendar->check_perms(PHPGW_ACL_PRIVATE) == True)
{
$remainder -= 30;
$hidden_vars = '<input type="hidden" name="from" value="'.$base_url.'">'."\n";
if(isset($date) && $date)
{
$hidden_vars .= ' <input type="hidden" name="date" value="'.$date.'">'."\n";
}
$hidden_vars .= ' <input type="hidden" name="month" value="'.$thismonth.'">'."\n";
$hidden_vars .= ' <input type="hidden" name="day" value="'.$thisday.'">'."\n";
$hidden_vars .= ' <input type="hidden" name="year" value="'.$thisyear.'">'."\n";
if(isset($keywords) && $keywords)
{
$hidden_vars .= ' <input type="hidden" name="keywords" value="'.$keywords.'">'."\n";
}
if(isset($matrixtype) && $matrixtype)
{
$hidden_vars .= ' <input type="hidden" name="matrixtype" value="'.$matrixtype.'">'."\n";
}
if(isset($participants) && $participants)
{
for ($i=0;$i<count($participants);$i++)
{
$hidden_vars .= ' <input type="hidden" name="participants[]" value="'.$participants[$i].'">'."\n";
}
}
$form_options = '<option value="all"'.($filter=='all'?' selected':'').'>'.lang('All').'</option>'."\n";
$form_options .= ' <option value="private"'.((!isset($filter) || !$filter) || $filter=='private'?' selected':'').'>'.lang('Private Only').'</option>'."\n";
$var = Array(
'form_width' => '30',
'form_link' => $phpgw->link($base_url,'owner='.$owner),
'form_name' => 'filter',
'title' => lang('Filter'),
'hidden_vars' => $hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
);
$tpl->set_var($var);
$tpl->parse('header_column','form_button_dropdown',True);
}
if(count($grants) > 0)
{
$hidden_vars = ' <input type="hidden" name="from" value="'.$base_url.'">'."\n";
if(isset($date) && $date)
{
$hidden_vars .= ' <input type="hidden" name="date" value="'.$date.'">'."\n";
}
$hidden_vars .= ' <input type="hidden" name="month" value="'.$thismonth.'">'."\n";
$hidden_vars .= ' <input type="hidden" name="day" value="'.$thisday.'">'."\n";
$hidden_vars .= ' <input type="hidden" name="year" value="'.$thisyear.'">'."\n";
if(isset($keywords) && $keywords)
{
$hidden_vars .= ' <input type="hidden" name="keywords" value="'.$keywords.'">'."\n";
}
if(isset($id) && $id != 0)
{
$hidden_vars .= ' <input type="hidden" name="id" value="'.$id.'">'."\n";
}
$form_options = '';
while(list($grantor,$temp_rights) = each($grants))
{
$form_options .= ' <option value="'.$grantor.'"'.($grantor==$owner?' selected':'').'>'.$phpgw->common->grab_owner_name($grantor).'</option>'."\n";
}
reset($grants);
$var = Array(
'form_width' => $remainder,
'form_link' => $phpgw->link($base_url),
'form_name' => 'owner',
'title' => lang('User'),
'hidden_vars' => $hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
);
$tpl->set_var($var);
$tpl->parse('header_column','form_button_dropdown',True);
}
$hidden_vars = ' <input type="hidden" name="from" value="'.$base_url.'">'."\n";
if(isset($date) && $date)
{
$hidden_vars .= ' <input type="hidden" name="date" value="'.$date.'">'."\n";
}
$hidden_vars .= ' <input type="hidden" name="month" value="'.$thismonth.'">'."\n";
$hidden_vars .= ' <input type="hidden" name="day" value="'.$thisday.'">'."\n";
$hidden_vars .= ' <input type="hidden" name="year" value="'.$thisyear.'">'."\n";
if(isset($keywords) && $keywords)
{
$hidden_vars .= ' <input type="hidden" name="keywords" value="'.$keywords.'">'."\n";
}
if(isset($filter) && $filter)
{
$hidden_vars .= ' <input type="hidden" name="filter" value="'.$filter.'">'."\n";
}
$extra_field = $hidden_vars.' <input name="keywords"'.($keywords?' value="'.$keywords.'"':'').'>';
$var = Array(
'action_url_button' => $phpgw->link('/calendar/search.php','owner='.$owner),
'action_text_button' => lang('Search'),
'action_confirm_button' => '',
'action_extra_field' => $extra_field
);
$tpl->set_var($var);
$button = $tpl->fp('out','form_button');
$tpl->set_var('str','<td align="right" valign="bottom">'.$button.'</td>');
$tpl->parse('header_column','head_col',True);
echo $tpl->fp('out','head');
unset($tpl);
?>

View File

@ -2,10 +2,12 @@
{printer_friendly}
<head>
<style type="text/css">
<!--
.tablecell {
width: 80px;
height: 80px;
}
-->
</style>
</head>
<table border="0" width="100%">

View File

@ -0,0 +1,9 @@
<!-- $Id$ -->
<td width="{form_width}%" align="center" valign="bottom">
<form action="{form_link}" method="post" name="{form_name}form">
<b>{title}:</b>
{hidden_vars} <select name="{form_name}" onchange="document.{form_name}form.submit()">
{form_options} </select>
<noscript><input type="submit" value="{button_value}"></noscript>
</form>
</td>

View File

@ -1,6 +1,6 @@
<!-- $Id$ -->
<!-- BEGIN form_button -->
<form action="{action_url_button}" method="post" name="{action_text_button}form">
<input type="submit" value="{action_text_button}" {action_confirm_button}>
{action_extra_field} <input type="submit" value="{action_text_button}" {action_confirm_button}>
</form>
<!-- END form_button -->

View File

@ -0,0 +1,6 @@
<!-- $Id$ -->
<table border="0" width="100%" cols={cols} cellpadding="0" cellspacing="0">
<tr>
{header_column} </tr>
</table>

View File

@ -0,0 +1,2 @@
<!-- $Id$ -->
{str}

View File

@ -0,0 +1,173 @@
<?php
/**************************************************************************\
* phpGroupWare *
* http://www.phpgroupware.org *
* -------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU General Public License as published by the *
* Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. *
\**************************************************************************/
/* $Id$ */
function add_col($str,&$tpl)
{
$tpl->set_var('str',$str);
$tpl->parse('header_column','head_col',True);
}
function add_image_ahref($link,$image,$alt)
{
return '<a href="'.$link.'"><img src="'.PHPGW_IMAGES.'/'.$image.'" alt="'.$alt.'" border="0"></a>';
}
$tpl = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('calendar'));
$tpl->set_unknowns('remove');
$templates = Array(
'head' => 'head.tpl',
'head_col' => 'head_col.tpl',
'form_button_dropdown' => 'form_button_dropdown.tpl',
'form_button_script' => 'form_button_script.tpl'
);
$tpl->set_file($templates);
$tpl->set_block('form_button_script','form_button');
$tpl->set_var('cols',$cols);
$str = ' <td width="2%">&nbsp;</td>';
add_col($str,$tpl);
$link = $phpgw->link('/calendar/day.php','day='.$phpgw->calendar->today['day'].'&month='.$phpgw->calendar->today['month'].'&year='.$phpgw->calendar->today['year'].'&owner='.$owner);
$str = ' <td width="2%">'.add_image_ahref($link,'today.gif',lang('Today')).'</td>';
add_col($str,$tpl);
$link = $phpgw->link('/calendar/week.php','day='.$phpgw->calendar->today['day'].'&month='.$phpgw->calendar->today['month'].'&year='.$phpgw->calendar->today['year'].'&owner='.$owner);
$str = ' <td width="2%" align="left">'.add_image_ahref($link,'week.gif',lang('This week')).'</td>';
add_col($str,$tpl);
$link = $phpgw->link('/calendar/month.php','day='.$phpgw->calendar->today['day'].'&month='.$phpgw->calendar->today['month'].'&year='.$phpgw->calendar->today['year'].'&owner='.$owner);
$str = ' <td width="2%" align="left">'.add_image_ahref($link,'month.gif',lang('This month')).'</td>';
add_col($str,$tpl);
$link = $phpgw->link('/calendar/year.php','day='.$phpgw->calendar->today['day'].'&month='.$phpgw->calendar->today['month'].'&year='.$phpgw->calendar->today['year'].'&owner='.$owner);
$str = ' <td width="2%" align="left">'.add_image_ahref($link,'year.gif',lang('This Year')).'</td>';
add_col($str,$tpl);
$link = $phpgw->link('/calendar/matrixselect.php','day='.$phpgw->calendar->today['day'].'&month='.$phpgw->calendar->today['month'].'&year='.$phpgw->calendar->today['year'].'&owner='.$owner);
$str = ' <td width="2%" align="left">'.add_image_ahref($link,'view.gif',lang('Daily Matrix View')).'</td>';
add_col($str,$tpl);
$base_url = '/calendar/'.basename($SCRIPT_FILENAME);
$remainder = 65;
if($phpgw->calendar->check_perms(PHPGW_ACL_PRIVATE) == True)
{
$remainder -= 30;
$hidden_vars = '<input type="hidden" name="from" value="'.$base_url.'">'."\n";
if(isset($date) && $date)
{
$hidden_vars .= ' <input type="hidden" name="date" value="'.$date.'">'."\n";
}
$hidden_vars .= ' <input type="hidden" name="month" value="'.$thismonth.'">'."\n";
$hidden_vars .= ' <input type="hidden" name="day" value="'.$thisday.'">'."\n";
$hidden_vars .= ' <input type="hidden" name="year" value="'.$thisyear.'">'."\n";
if(isset($keywords) && $keywords)
{
$hidden_vars .= ' <input type="hidden" name="keywords" value="'.$keywords.'">'."\n";
}
if(isset($matrixtype) && $matrixtype)
{
$hidden_vars .= ' <input type="hidden" name="matrixtype" value="'.$matrixtype.'">'."\n";
}
if(isset($participants) && $participants)
{
for ($i=0;$i<count($participants);$i++)
{
$hidden_vars .= ' <input type="hidden" name="participants[]" value="'.$participants[$i].'">'."\n";
}
}
$form_options = '<option value="all"'.($filter=='all'?' selected':'').'>'.lang('All').'</option>'."\n";
$form_options .= ' <option value="private"'.((!isset($filter) || !$filter) || $filter=='private'?' selected':'').'>'.lang('Private Only').'</option>'."\n";
$var = Array(
'form_width' => '30',
'form_link' => $phpgw->link($base_url,'owner='.$owner),
'form_name' => 'filter',
'title' => lang('Filter'),
'hidden_vars' => $hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
);
$tpl->set_var($var);
$tpl->parse('header_column','form_button_dropdown',True);
}
if(count($grants) > 0)
{
$hidden_vars = ' <input type="hidden" name="from" value="'.$base_url.'">'."\n";
if(isset($date) && $date)
{
$hidden_vars .= ' <input type="hidden" name="date" value="'.$date.'">'."\n";
}
$hidden_vars .= ' <input type="hidden" name="month" value="'.$thismonth.'">'."\n";
$hidden_vars .= ' <input type="hidden" name="day" value="'.$thisday.'">'."\n";
$hidden_vars .= ' <input type="hidden" name="year" value="'.$thisyear.'">'."\n";
if(isset($keywords) && $keywords)
{
$hidden_vars .= ' <input type="hidden" name="keywords" value="'.$keywords.'">'."\n";
}
if(isset($id) && $id != 0)
{
$hidden_vars .= ' <input type="hidden" name="id" value="'.$id.'">'."\n";
}
$form_options = '';
while(list($grantor,$temp_rights) = each($grants))
{
$form_options .= ' <option value="'.$grantor.'"'.($grantor==$owner?' selected':'').'>'.$phpgw->common->grab_owner_name($grantor).'</option>'."\n";
}
reset($grants);
$var = Array(
'form_width' => $remainder,
'form_link' => $phpgw->link($base_url),
'form_name' => 'owner',
'title' => lang('User'),
'hidden_vars' => $hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
);
$tpl->set_var($var);
$tpl->parse('header_column','form_button_dropdown',True);
}
$hidden_vars = ' <input type="hidden" name="from" value="'.$base_url.'">'."\n";
if(isset($date) && $date)
{
$hidden_vars .= ' <input type="hidden" name="date" value="'.$date.'">'."\n";
}
$hidden_vars .= ' <input type="hidden" name="month" value="'.$thismonth.'">'."\n";
$hidden_vars .= ' <input type="hidden" name="day" value="'.$thisday.'">'."\n";
$hidden_vars .= ' <input type="hidden" name="year" value="'.$thisyear.'">'."\n";
if(isset($keywords) && $keywords)
{
$hidden_vars .= ' <input type="hidden" name="keywords" value="'.$keywords.'">'."\n";
}
if(isset($filter) && $filter)
{
$hidden_vars .= ' <input type="hidden" name="filter" value="'.$filter.'">'."\n";
}
$extra_field = $hidden_vars.' <input name="keywords"'.($keywords?' value="'.$keywords.'"':'').'>';
$var = Array(
'action_url_button' => $phpgw->link('/calendar/search.php','owner='.$owner),
'action_text_button' => lang('Search'),
'action_confirm_button' => '',
'action_extra_field' => $extra_field
);
$tpl->set_var($var);
$button = $tpl->fp('out','form_button');
$tpl->set_var('str','<td align="right" valign="bottom">'.$button.'</td>');
$tpl->parse('header_column','head_col',True);
echo $tpl->fp('out','head');
unset($tpl);
?>

View File

@ -2,10 +2,12 @@
{printer_friendly}
<head>
<style type="text/css">
<!--
.tablecell {
width: 80px;
height: 80px;
}
-->
</style>
</head>
<table border="0" width="100%">

View File

@ -14,12 +14,10 @@
/* $Id$ */
// $phpgw_flags = array(
// 'currentapp' => 'calendar',
// 'enable_nextmatchs_class' => True
// );
// $phpgw_info['flags'] = $phpgw_flags;
$phpgw_info['flags']['currentapp'] = 'calendar';
$phpgw_flags = array(
'currentapp' => 'calendar',
);
$phpgw_info['flags'] = $phpgw_flags;
include('../header.inc.php');
@ -57,17 +55,25 @@
if (($event->owner == $owner) && ($phpgw->calendar->check_perms(PHPGW_ACL_EDIT) == True))
{
$p->set_var('action_url_button',$phpgw->link('/'.$phpgw_info['flags']['currentapp'].'/edit_entry.php','id='.$id.'&owner='.$owner));
$p->set_var('action_text_button',' '.lang('Edit').' ');
$p->set_var('action_confirm_button','');
$var = Array(
'action_url_button' => $phpgw->link('/calendar/edit_entry.php','id='.$id.'&owner='.$owner),
'action_text_button' => lang('Edit'),
'action_confirm_button' => '',
'action_extra_field' => ''
);
$p->set_var($var);
echo $p->finish($p->parse('out','form_button'));
}
if (($event->owner == $owner) && ($phpgw->calendar->check_perms(PHPGW_ACL_DELETE) == True))
{
$p->set_var('action_url_button',$phpgw->link('/'.$phpgw_info['flags']['currentapp'].'/delete.php','id='.$id.'&owner='.$owner));
$p->set_var('action_text_button',lang('Delete'));
$p->set_var('action_confirm_button',"onClick=\"return confirm('".lang("Are you sure\\nyou want to\\ndelete this entry ?\\n\\nThis will delete\\nthis entry for all users.")."')\"");
$var = Array(
'action_url_button' => $phpgw->link('/'.$phpgw_info['flags']['currentapp'].'/delete.php','id='.$id.'&owner='.$owner),
'action_text_button' => lang('Delete'),
'action_confirm_button' => "onClick=\"return confirm('".lang("Are you sure\\nyou want to\\ndelete this entry ?\\n\\nThis will delete\\nthis entry for all users.")."')\"",
'action_extra_field' => ''
);
$p->set_var($var);
echo $p->finish($p->parse('out','form_button'));
}