[eGroupWare-cvs] calendar/inc class.uiviews.inc.php,1.11.2.23,1.11.2.24

[<ral...@us...>]

Update of /cvsroot/egroupware/calendar/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4572

Modified Files:
      Tag: contacts_and_resources
	class.uiviews.inc.php 
Log Message:
saving first and last day of the view, so the export can offer the same days as default

Index: class.uiviews.inc.php
===================================================================
RCS file: /cvsroot/egroupware/calendar/inc/class.uiviews.inc.php,v
retrieving revision 1.11.2.23
retrieving revision 1.11.2.24
diff -C2 -d -r1.11.2.23 -r1.11.2.24
*** class.uiviews.inc.php	31 Oct 2005 14:37:27 -0000	1.11.2.23
--- class.uiviews.inc.php	31 Oct 2005 15:03:29 -0000	1.11.2.24
***************
*** 157,172 ****
  			if ($this->day < 15)	// show one complete month
  			{
! 				$this->_week_align_month($first,$this->last);
  				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
  			}
  			else	// show 2 half month
  			{
! 				$this->_week_align_month($first,$this->last,15);
! 				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('F',$first)).' / '.lang(adodb_date('F',$this->last)).' '.$this->year;
  			}
  		}
  		elseif ($this->planner_days >= 5)	// weeekview
  		{
! 			$first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
  			$this->last = $this->bo->date2array($this->first);
  			$this->last['day'] += (int) $this->planner_days - 1;
--- 157,172 ----
  			if ($this->day < 15)	// show one complete month
  			{
! 				$this->_week_align_month($this->first,$this->last);
  				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('F',$this->bo->date2ts($this->date))).' '.$this->year;
  			}
  			else	// show 2 half month
  			{
! 				$this->_week_align_month($this->first,$this->last,15);
! 				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('F',$this->first)).' / '.lang(adodb_date('F',$this->last)).' '.$this->year;
  			}
  		}
  		elseif ($this->planner_days >= 5)	// weeekview
  		{
! 			$this->first = $this->datetime->get_weekday_start($this->year,$this->month,$this->day);
  			$this->last = $this->bo->date2array($this->first);
  			$this->last['day'] += (int) $this->planner_days - 1;
***************
*** 374,378 ****
  		if ($this->debug > 0) $this->bo->debug_message('uiviews::day() date=%1',True,$this->date);
  
! 		$this->first = $this->bo->date2ts((string)$this->date);
  		$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('l',$this->first)).', '.$this->bo->long_date($this->first);
  		
--- 374,378 ----
  		if ($this->debug > 0) $this->bo->debug_message('uiviews::day() date=%1',True,$this->date);
  
! 		$this->last = $this->first = $this->bo->date2ts((string)$this->date);
  		$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(adodb_date('l',$this->first)).', '.$this->bo->long_date($this->first);