r28276 - /trunk/calendar/inc/class.calendar_ical.inc.php

[jlehrke-2]

Author: jlehrke
Date: Fri Nov  6 16:44:04 2009
New Revision: 28276

URL: http://www.egroupware.org/viewvc/egroupware?rev=28276&view=rev
Log:
make code more comprehensible

Modified:
    trunk/calendar/inc/class.calendar_ical.inc.php

Modified: trunk/calendar/inc/class.calendar_ical.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/calendar/inc/class.calendar_ical.inc.php?rev=28276&r1=28275&r2=28276&view=diff
==============================================================================
--- trunk/calendar/inc/class.calendar_ical.inc.php (original)
+++ trunk/calendar/inc/class.calendar_ical.inc.php Fri Nov  6 16:44:04 2009
@@ -206,12 +206,12 @@
  {
  if (strpos($this->productName, 'palmos'))
  {
- $servertime = true;
+ $utc = false;
  $date_format = 'ts';
  }
  else
  {
- $servertime = false;
+ $utc = true;
  $date_format = 'server';
  }
  if (!is_array($event)
@@ -236,7 +236,7 @@
 
  if ($this->log) error_log(__FILE__.'('.__LINE__.'): '.__METHOD__.' '.array2string($event)."\n",3,$this->logfile);
 
- if (!$servertime
+ if (!$serverTZ
  && $event['recur_type'] != MCAL_RECUR_NONE
  && date('e', $event['start']) != 'UTC')
  {
@@ -248,13 +248,13 @@
  if ($startDST != $finalDST ||
  ($event['recur_enddate'] - $event['start']) > 15778800)
  {
- $servertime = true;
+ $utc = false;
  $serverTZ = true;
  }
  }
  else
  {
- $servertime = true;
+ $utc = false;
  $serverTZ = true;
  }
  if ($serverTZ)
@@ -347,14 +347,14 @@
      break;
 
  case 'DTSTART':
- if ($servertime)
+ if ($utc)
+ {
+ $attributes['DTSTART'] = $event['start'];
+ }
+ else
  {
  $attributes['DTSTART'] = date('Ymd\THis', $event['start']);
  if ($serverTZ) $parameters['DTSTART']['TZID'] = $serverTZ;
- }
- else
- {
- $attributes['DTSTART'] = $event['start'];
  }
  break;
 
@@ -373,14 +373,14 @@
  }
  else
  {
- if ($servertime)
+ if ($utc)
+ {
+ $attributes['DTEND'] = $event['end'];
+ }
+ else
  {
  $attributes['DTEND'] = date('Ymd\THis', $event['end']);
  if ($serverTZ) $parameters['DTEND']['TZID'] = $serverTZ;
- }
- else
- {
- $attributes['DTEND'] = $event['end'];
  }
  }
  break;
@@ -516,7 +516,7 @@
  else
  {
  $value_type = 'DATE-TIME';
- if ($servertime)
+ if (!$utc)
  {
  foreach ($days as $id => $timestamp)
  {
@@ -575,14 +575,14 @@
  }
  else
  {
- if ($servertime)
+ if ($utc)
+ {
+ $attributes[$icalFieldName] = $recur_date;
+ }
+ else
  {
  $attributes[$icalFieldName] = date('Ymd\THis', $recur_date);
  if ($serverTZ) $parameters[$icalFieldName]['TZID'] = $serverTZ;
- }
- else
- {
- $attributes[$icalFieldName] = $recur_date;
  }
  }
  }
@@ -603,15 +603,15 @@
  }
  else
  {
- if ($servertime)
+ if ($utc)
+ {
+ $attributes[$icalFieldName] = $event['recurrence'];
+ }
+ else
  {
  $attributes[$icalFieldName] = date('Ymd\THis', $event['recurrence']);
  if ($serverTZ) $parameters[$icalFieldName]['TZID'] = $serverTZ;
  }
- else
- {
- $attributes[$icalFieldName] = $event['recurrence'];
- }
  }
  unset($revent);
  }
@@ -693,18 +693,18 @@
 
  if ($version == '1.0')
  {
- if ($servertime)
+ if ($utc)
+ {
+ $attributes['DALARM'] = $alarmData['time'];
+ $attributes['AALARM'] = $alarmData['time'];
+ }
+ else
  {
  $attributes['DALARM'] = date('Ymd\THis', $alarmData['time']);
  if ($serverTZ) $parameters['DALARM']['TZID'] = $serverTZ;
  $attributes['AALARM'] = date('Ymd\THis', $alarmData['time']);
  if ($serverTZ) $parameters['AALARM']['TZID'] = $serverTZ;
  }
- else
- {
- $attributes['DALARM'] = $alarmData['time'];
- $attributes['AALARM'] = $alarmData['time'];
- }
  // lets take only the first alarm
  break;
  }
@@ -735,14 +735,14 @@
  else
  {
  $params = array('VALUE' => 'DATE-TIME');
- if ($servertime)
+ if ($utc)
+ {
+ $value = $alarmData['time'];
+ }
+ else
  {
  $value = date('Ymd\THis', $alarmData['time']);
  if ($serverTZ) $params['TZID'] = $serverTZ;
- }
- else
- {
- $value = $alarmData['time'];
  }
  $valarm->setAttribute('TRIGGER', $value, $params);
  }
@@ -2092,10 +2092,10 @@
  *
  * @param int $user account_id
  * @param mixed $end=null end-date, default now+1 month
- * @param boolean $servertime=false if true, use severtime for dates
+ * @param boolean $utc=true if false, use severtime for dates
  * @return string
  */
- function freebusy($user,$end=null,$servertime=false)
+ function freebusy($user,$end=null,$utc=true)
  {
  if (!$end) $end = $this->now_su + 100*DAY_s; // default next 100 days
 
@@ -2111,7 +2111,20 @@
  $GLOBALS['egw']->accounts->id2name($user,'account_lastname'),
  $GLOBALS['egw']->translation->charset(),'utf-8'),
  );
- if ($servertime)
+ if ($utc)
+ {
+ foreach (array(
+ 'URL' => $this->freebusy_url($user),
+ 'DTSTART' => $this->date2ts($this->now_su,true), // true = server-time
+ 'DTEND' => $this->date2ts($end,true), // true = server-time
+   'ORGANIZER' => $GLOBALS['egw']->accounts->id2name($user,'account_email'),
+ 'DTSTAMP' => time(),
+ ) as $attr => $value)
+ {
+ $vfreebusy->setAttribute($attr, $value);
+ }
+ }
+ else
  {
  foreach (array(
  'URL' => $this->freebusy_url($user),
@@ -2119,19 +2132,6 @@
  'DTEND' => date('Ymd\THis',$this->date2ts($end,true)), // true = server-time
    'ORGANIZER' => $GLOBALS['egw']->accounts->id2name($user,'account_email'),
  'DTSTAMP' => date('Ymd\THis',time()),
- ) as $attr => $value)
- {
- $vfreebusy->setAttribute($attr, $value);
- }
- }
- else
- {
- foreach (array(
- 'URL' => $this->freebusy_url($user),
- 'DTSTART' => $this->date2ts($this->now_su,true), // true = server-time
- 'DTEND' => $this->date2ts($end,true), // true = server-time
-   'ORGANIZER' => $GLOBALS['egw']->accounts->id2name($user,'account_email'),
- 'DTSTAMP' => time(),
  ) as $attr => $value)
  {
  $vfreebusy->setAttribute($attr, $value);
@@ -2150,18 +2150,18 @@
  {
  if ($event['non_blocking']) continue;
 
- if ($servertime)
+ if ($utc)
+ {
+ $vfreebusy->setAttribute('FREEBUSY',array(array(
+ 'start' => $event['start'],
+ 'end' => $event['end'],
+ )));
+ }
+ else
  {
  $vfreebusy->setAttribute('FREEBUSY',array(array(
  'start' => date('Ymd\THis',$event['start']),
  'end' => date('Ymd\THis',$event['end']),
- )));
- }
- else
- {
- $vfreebusy->setAttribute('FREEBUSY',array(array(
- 'start' => $event['start'],
- 'end' => $event['end'],
  )));
  }
  }


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
eGroupWare-cvs mailing list
eGroupWare-cvs@...
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs