[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php class.htm...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php class.htm... |
|
Date: |
Sat, 09 Dec 2006 16:03:50 +0000 |
CVSROOT: /sources/phpgroupware
Module name: calendar
Changes by: Sigurd Nes <sigurdne> 06/12/09 16:03:50
Modified files:
inc : class.bocalendar.inc.php class.html.inc.php
class.uicalendar.inc.php
Log message:
notice
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.bocalendar.inc.php?cvsroot=phpgroupware&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.html.inc.php?cvsroot=phpgroupware&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uicalendar.inc.php?cvsroot=phpgroupware&r1=1.137&r2=1.138
Patches:
Index: class.bocalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- class.bocalendar.inc.php 8 Dec 2006 11:37:54 -0000 1.116
+++ class.bocalendar.inc.php 9 Dec 2006 16:03:50 -0000 1.117
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.bocalendar.inc.php,v 1.116 2006/12/08 11:37:54 sigurdne
Exp $ */
+ /* $Id: class.bocalendar.inc.php,v 1.117 2006/12/09 16:03:50 sigurdne
Exp $ */
class bocalendar
{
@@ -477,7 +477,7 @@
'filter' => $this->filter,
'cat_id' => $this->cat_id,
'owner' => $this->owner,
- 'save_owner' =>
$this->save_owner,
+ 'save_owner' =>
isset($this->save_owner)?$this->save_owner:'',
'year' => $this->year,
'month' => $this->month,
'day' => $this->day,
@@ -2727,7 +2727,7 @@
$already_moved = array();
for($v=$firstday;$v<=$lastday;$v++)
{
- if (!$this->cached_events[$v])
+ if (!isset($this->cached_events[$v]) ||
!$this->cached_events[$v])
{
continue;
}
@@ -2737,7 +2737,7 @@
{
$end =
date('Ymd',$this->maketime($event['end']));
print_debug('EVENT',_debug_array($event,False));
- print_debug('start',$start);
+ // print_debug('start',$start);
print_debug('v',$v);
if
(!isset($already_moved[$event['id']]) || $event['recur_type'] && $v > $end)
Index: class.html.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.html.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- class.html.inc.php 8 Dec 2006 11:37:54 -0000 1.8
+++ class.html.inc.php 9 Dec 2006 16:03:50 -0000 1.9
@@ -10,7 +10,7 @@
* option) any later version.
*
\**************************************************************************/
- /* $Id: class.html.inc.php,v 1.8 2006/12/08 11:37:54 sigurdne Exp $ */
+ /* $Id: class.html.inc.php,v 1.9 2006/12/09 16:03:50 sigurdne Exp $ */
class html
{
@@ -212,11 +212,13 @@
{
$vars = explode('&',$vars);
}
+/*
list($url,$v) = explode('?',$url); // url may contain
additional vars
if ($v)
{
$vars += explode('&',$v);
}
+*/
return $GLOBALS['phpgw']->link($uri, $vars);
}
Index: class.uicalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- class.uicalendar.inc.php 9 Dec 2006 15:33:06 -0000 1.137
+++ class.uicalendar.inc.php 9 Dec 2006 16:03:50 -0000 1.138
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uicalendar.inc.php,v 1.137 2006/12/09 15:33:06 sigurdne
Exp $ */
+ /* $Id: class.uicalendar.inc.php,v 1.138 2006/12/09 16:03:50 sigurdne
Exp $ */
class uicalendar
{
@@ -1364,8 +1364,8 @@
$hdr[0]['.'.$i] = 'classr="'.$cssclass.'"
colspan="'.$cols.'"';
$prev_month =
sprintf('%04d%02d01',$y-($m==1),$m > 1?$m-1:12);
$next_month =
sprintf('%04d%02d01',$y+($m==12),$m < 12?$m+1:1);
- $prev_link =
$GLOBALS['phpgw']->link('/index.php',"menuaction=calendar.uicalendar.planner&date=$prev_month");
- $next_link =
$GLOBALS['phpgw']->link('/index.php',"menuaction=calendar.uicalendar.planner&date=$next_month");
+ $prev_link =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'calendar.uicalendar.planner','date'=>$prev_month));
+ $next_link =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'calendar.uicalendar.planner','date'=>$next_month));
$hdr[0][$i] = "<b><a
href=\"$prev_link\"><<</a>   $month   <a
href=\"$next_link\">>></a></b>";
$add_owner = array(); // if no add-rights on
the showed cal use own cal
@@ -1395,7 +1395,7 @@
{
$cssclass = 'cal_today';
}
- elseif
($this->bo->cached_holidays[$date])
+ elseif
(isset($this->bo->cached_holidays[$date]) && $this->bo->cached_holidays[$date])
{
$cssclass =
$this->bo->holiday_class;
$hdr[2]['.'.$index] .= '
title="'.$this->bo->cached_holidays[$date][0]['name'].'"';
@@ -1807,7 +1807,7 @@
//
for($v=$this->planner_firstday;$v<=$this->planner_lastday;$v++)
{
- $daily = $this->bo->cached_events[$v];
+ $daily =
(isset($this->bo->cached_events[$v])?$this->bo->cached_events[$v]:'');
print_debug('For Date',$v);
print_debug('Count of items',count($daily));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php class.htm...,
Sigurd Nes <=