lochmueller / calendarize

Resources/Private/Php/ics-parser/class.iCalReader.php

Indentation +62 added lines, -62 removed lines

@@ -102,8 +102,8 @@ 
                     break; 
                 default:
                     $this->addCalendarComponentWithKeyAndValue($type, 
-                                                               $keyword, 
-                                                               $value);
+                                                                $keyword, 
+                                                                $value);
                     break; 
                 } 
             }
@@ -126,19 +126,19 @@ 
                                                         $value) 
     {
         if (strstr($keyword, ';')) {
-          // Ignore everything in keyword after a ; (things like Language, etc)
-          $keyword = substr($keyword, 0, strpos($keyword, ";"));
+            // Ignore everything in keyword after a ; (things like Language, etc)
+            $keyword = substr($keyword, 0, strpos($keyword, ";"));
         }
         if ($keyword == false) { 
             $keyword = $this->last_keyword; 
             switch ($component) {
             case 'VEVENT': 
                 $value = $this->cal[$component][$this->event_count - 1]
-                                               [$keyword].$value;
+                                                [$keyword].$value;
                 break;
             case 'VTODO' : 
                 $value = $this->cal[$component][$this->todo_count - 1]
-                                               [$keyword].$value;
+                                                [$keyword].$value;
                 break;
             }
         }
@@ -227,13 +227,13 @@ 
         $array = $this->cal;
         $events = $array['VEVENT'];
         foreach ($array['VEVENT'] as $anEvent) {
-          if (isset($anEvent['RRULE']) && $anEvent['RRULE'] != '') {
+            if (isset($anEvent['RRULE']) && $anEvent['RRULE'] != '') {
             // Recurring event, parse RRULE and add appropriate duplicate events
             $rrules = array();
             $rrule_strings = explode(';',$anEvent['RRULE']);
             foreach ($rrule_strings as $s) {
-              list($k,$v) = explode('=', $s);
-              $rrules[$k] = $v;
+                list($k,$v) = explode('=', $s);
+                $rrules[$k] = $v;
             }
             // Get Start timestamp
             $start_timestamp = $this->iCalDateToUnixTimestamp($anEvent['DTSTART']);
@@ -245,20 +245,20 @@ 
             $until = $this->iCalDateToUnixTimestamp($rrules['UNTIL']);
             // Decide how often to add events and do so
             switch ($rrules['FREQ']) {
-              case 'DAILY':
+                case 'DAILY':
                 // Simply add a new event each interval of days until UNTIL is reached
                 $offset = "+$interval day";
                 $recurring_timestamp = strtotime($offset, $start_timestamp);
                 while ($recurring_timestamp <= $until) {
-                  // Add event
-                  $anEvent['DTSTART'] = date('Ymd\THis',$recurring_timestamp);
-                  $anEvent['DTEND'] = date('Ymd\THis',$recurring_timestamp+$event_timestmap_offset);
-                  $events[] = $anEvent;
-                  // Move forward
-                  $recurring_timestamp = strtotime($offset,$recurring_timestamp);
+                    // Add event
+                    $anEvent['DTSTART'] = date('Ymd\THis',$recurring_timestamp);
+                    $anEvent['DTEND'] = date('Ymd\THis',$recurring_timestamp+$event_timestmap_offset);
+                    $events[] = $anEvent;
+                    // Move forward
+                    $recurring_timestamp = strtotime($offset,$recurring_timestamp);
                 }
                 break;
-              case 'WEEKLY':
+                case 'WEEKLY':
                 // Create offset
                 $offset = "+$interval week";
                 // Build list of days of week to add events
@@ -268,58 +268,58 @@ 
                 $week_recurring_timestamp = (date('w', $start_timestamp) == 0) ? $start_timestamp : strtotime('last Sunday '.date('H:i:s',$start_timestamp), $start_timestamp);
                 // Step through weeks
                 while ($week_recurring_timestamp <= $until) {
-                  // Add events for bydays
-                  $day_recurring_timestamp = $week_recurring_timestamp;
-                  foreach ($weekdays as $day) {
+                    // Add events for bydays
+                    $day_recurring_timestamp = $week_recurring_timestamp;
+                    foreach ($weekdays as $day) {
                     // Check if day should be added
                     if (in_array($day, $bydays) && $day_recurring_timestamp > $start_timestamp && $day_recurring_timestamp <= $until) {
-                      // Add event to day
-                      $anEvent['DTSTART'] = date('Ymd\THis',$day_recurring_timestamp);
-                      $anEvent['DTEND'] = date('Ymd\THis',$day_recurring_timestamp+$event_timestmap_offset);
-                      $events[] = $anEvent;
+                        // Add event to day
+                        $anEvent['DTSTART'] = date('Ymd\THis',$day_recurring_timestamp);
+                        $anEvent['DTEND'] = date('Ymd\THis',$day_recurring_timestamp+$event_timestmap_offset);
+                        $events[] = $anEvent;
                     }
                     // Move forward a day
                     $day_recurring_timestamp = strtotime('+1 day',$day_recurring_timestamp);
-                  }
-                  // Move forward $interaval weeks
-                  $week_recurring_timestamp = strtotime($offset,$week_recurring_timestamp);
+                    }
+                    // Move forward $interaval weeks
+                    $week_recurring_timestamp = strtotime($offset,$week_recurring_timestamp);
                 }
                 break;
-              case 'MONTHLY':
+                case 'MONTHLY':
                 // Create offset
                 $offset = "+$interval month";
                 $recurring_timestamp = strtotime($offset, $start_timestamp);
                 if (isset($rrules['BYMONTHDAY']) && $rrules['BYMONTHDAY'] != '') {
-                  // Deal with BYMONTHDAY
-                  while ($recurring_timestamp <= $until) {
+                    // Deal with BYMONTHDAY
+                    while ($recurring_timestamp <= $until) {
                     // Add event
                     $anEvent['DTSTART'] = date('Ym'.sprintf('%02d',$rrules['BYMONTHDAY']).'\THis',$recurring_timestamp);
                     $anEvent['DTEND'] = date('Ymd\THis',$this->iCalDateToUnixTimestamp($anEvent['DTSTART'])+$event_timestmap_offset);
                     $events[] = $anEvent;
                     // Move forward
                     $recurring_timestamp = strtotime($offset,$recurring_timestamp);
-                  }
+                    }
                 } elseif (isset($rrules['BYDAY']) && $rrules['BYDAY'] != '') {
-                  $start_time = date('His',$start_timestamp);
-                  // Deal with BYDAY
-                  $day_number = substr($rrules['BYDAY'], 0, 1);
-                  $week_day = substr($rrules['BYDAY'], 1);
-                  $day_cardinals = array(1 => 'first', 2 => 'second', 3 => 'third', 4 => 'fourth', 5 => 'fifth');
-                  $weekdays = array('SU' => 'sunday','MO' => 'monday','TU' => 'tuesday','WE' => 'wednesday','TH' => 'thursday','FR' => 'friday','SA' => 'saturday');
-                  while ($recurring_timestamp <= $until) {
+                    $start_time = date('His',$start_timestamp);
+                    // Deal with BYDAY
+                    $day_number = substr($rrules['BYDAY'], 0, 1);
+                    $week_day = substr($rrules['BYDAY'], 1);
+                    $day_cardinals = array(1 => 'first', 2 => 'second', 3 => 'third', 4 => 'fourth', 5 => 'fifth');
+                    $weekdays = array('SU' => 'sunday','MO' => 'monday','TU' => 'tuesday','WE' => 'wednesday','TH' => 'thursday','FR' => 'friday','SA' => 'saturday');
+                    while ($recurring_timestamp <= $until) {
                     $event_start_desc = "{$day_cardinals[$day_number]} {$weekdays[$week_day]} of ".date('F',$recurring_timestamp)." ".date('Y',$recurring_timestamp)." ".date('H:i:s',$recurring_timestamp);
                     $event_start_timestamp = strtotime($event_start_desc);
                     if ($event_start_timestamp > $start_timestamp && $event_start_timestamp < $until) {
-                      $anEvent['DTSTART'] = date('Ymd\T',$event_start_timestamp).$start_time;
-                      $anEvent['DTEND'] = date('Ymd\THis',$this->iCalDateToUnixTimestamp($anEvent['DTSTART'])+$event_timestmap_offset);
-                      $events[] = $anEvent;
+                        $anEvent['DTSTART'] = date('Ymd\T',$event_start_timestamp).$start_time;
+                        $anEvent['DTEND'] = date('Ymd\THis',$this->iCalDateToUnixTimestamp($anEvent['DTSTART'])+$event_timestmap_offset);
+                        $events[] = $anEvent;
                     }
                     // Move forward
                     $recurring_timestamp = strtotime($offset,$recurring_timestamp);
-                  }
+                    }
                 }
                 break;
-              case 'YEARLY':
+                case 'YEARLY':
                 // Create offset
                 $offset = "+$interval year";
                 $recurring_timestamp = strtotime($offset, $start_timestamp);
@@ -328,41 +328,41 @@ 
                 $until = strtotime('+2 year',$start_timestamp);
                 // Check if BYDAY rule exists
                 if (isset($rrules['BYDAY']) && $rrules['BYDAY'] != '') {
-                  $start_time = date('His',$start_timestamp);
-                  // Deal with BYDAY
-                  $day_number = substr($rrules['BYDAY'], 0, 1);
-                  $month_day = substr($rrules['BYDAY'], 1);
-                  $day_cardinals = array(1 => 'first', 2 => 'second', 3 => 'third', 4 => 'fourth', 5 => 'fifth');
-                  $weekdays = array('SU' => 'sunday','MO' => 'monday','TU' => 'tuesday','WE' => 'wednesday','TH' => 'thursday','FR' => 'friday','SA' => 'saturday');
-                  while ($recurring_timestamp <= $until) {
+                    $start_time = date('His',$start_timestamp);
+                    // Deal with BYDAY
+                    $day_number = substr($rrules['BYDAY'], 0, 1);
+                    $month_day = substr($rrules['BYDAY'], 1);
+                    $day_cardinals = array(1 => 'first', 2 => 'second', 3 => 'third', 4 => 'fourth', 5 => 'fifth');
+                    $weekdays = array('SU' => 'sunday','MO' => 'monday','TU' => 'tuesday','WE' => 'wednesday','TH' => 'thursday','FR' => 'friday','SA' => 'saturday');
+                    while ($recurring_timestamp <= $until) {
                     $event_start_desc = "{$day_cardinals[$day_number]} {$weekdays[$month_day]} of {$month_names[$rrules['BYMONTH']]} ".date('Y',$recurring_timestamp)." ".date('H:i:s',$recurring_timestamp);
                     $event_start_timestamp = strtotime($event_start_desc);
                     if ($event_start_timestamp > $start_timestamp && $event_start_timestamp < $until) {
-                      $anEvent['DTSTART'] = date('Ymd\T',$event_start_timestamp).$start_time;
-                      $anEvent['DTEND'] = date('Ymd\THis',$this->iCalDateToUnixTimestamp($anEvent['DTSTART'])+$event_timestmap_offset);
-                      $events[] = $anEvent;
+                        $anEvent['DTSTART'] = date('Ymd\T',$event_start_timestamp).$start_time;
+                        $anEvent['DTEND'] = date('Ymd\THis',$this->iCalDateToUnixTimestamp($anEvent['DTSTART'])+$event_timestmap_offset);
+                        $events[] = $anEvent;
                     }
                     // Move forward
                     $recurring_timestamp = strtotime($offset,$recurring_timestamp);
-                  }
+                    }
                 } else {
-                  $day = date('d',$start_timestamp);
-                  // Step throuhg years adding specific month dates
-                  while ($recurring_timestamp <= $until) {
+                    $day = date('d',$start_timestamp);
+                    // Step throuhg years adding specific month dates
+                    while ($recurring_timestamp <= $until) {
                     $event_start_desc = "$day {$month_names[$rrules['BYMONTH']]} ".date('Y',$recurring_timestamp)." ".date('H:i:s',$recurring_timestamp);
                     $event_start_timestamp = strtotime($event_start_desc);
                     if ($event_start_timestamp > $start_timestamp && $event_start_timestamp < $until) {
-                      $anEvent['DTSTART'] = date('Ymd\T',$event_start_timestamp).$start_time;
-                      $anEvent['DTEND'] = date('Ymd\THis',$this->iCalDateToUnixTimestamp($anEvent['DTSTART'])+$event_timestmap_offset);
-                      $events[] = $anEvent;
+                        $anEvent['DTSTART'] = date('Ymd\T',$event_start_timestamp).$start_time;
+                        $anEvent['DTEND'] = date('Ymd\THis',$this->iCalDateToUnixTimestamp($anEvent['DTSTART'])+$event_timestmap_offset);
+                        $events[] = $anEvent;
                     }
                     // Move forward
                     $recurring_timestamp = strtotime($offset,$recurring_timestamp);
-                  }
+                    }
                 }
                 break;
             }
-          }
+            }
         }
         $this->cal['VEVENT'] = $events;
     }

Resources/Private/Php/ICalDissect/src/JMBTechnologyLimited/ICalDissect/ICalTimeZone.php

Indentation +17 added lines, -17 removed lines

@@ -12,26 +12,26 @@
 
 class ICalTimeZone
 {
-	protected $timeZone = 'UTC';
+    protected $timeZone = 'UTC';
 
-	public function __construct() {
-	}
+    public function __construct() {
+    }
 
-	public function processLine($keyword, $value) {
-		if ($keyword == 'TZID') {
-			$timezoneIdentifiers = \DateTimeZone::listIdentifiers();
-			if (in_array($value, $timezoneIdentifiers)) {
-				$this->timeZone = $value;
-			}
-		}
-	}
+    public function processLine($keyword, $value) {
+        if ($keyword == 'TZID') {
+            $timezoneIdentifiers = \DateTimeZone::listIdentifiers();
+            if (in_array($value, $timezoneIdentifiers)) {
+                $this->timeZone = $value;
+            }
+        }
+    }
 	
-	public function getTimeZoneIdentifier() {
-		return $this->timeZone;
-	}
+    public function getTimeZoneIdentifier() {
+        return $this->timeZone;
+    }
 	
-	public function getTimeZone() {
-		return new \DateTimeZone($this->timeZone);
-	}
+    public function getTimeZone() {
+        return new \DateTimeZone($this->timeZone);
+    }
 }
 

Resources/Private/Php/ICalDissect/src/JMBTechnologyLimited/ICalDissect/ICalParser.php

Indentation +75 added lines, -75 removed lines

@@ -13,14 +13,14 @@ 
 class ICalParser
 {
  
-	/** @var ICalTimeZone **/
-	protected $timezone;
+    /** @var ICalTimeZone **/
+    protected $timezone;
 	
-	protected $events = array();
+    protected $events = array();
 	
-	public function __construct() {
-		$this->timezone = new ICalTimeZone();
-	}
+    public function __construct() {
+        $this->timezone = new ICalTimeZone();
+    }
 	
     /**
      * @param {string} $filename The path to the iCal-file
@@ -29,90 +29,90 @@ 
     public function parseFromFile($filename)
     {
 		
-		if (!$filename) {
-			return false;
-		}
+        if (!$filename) {
+            return false;
+        }
         
-		$lines = file($filename, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-		if (count($lines) < 1) {
-			return false;
-		}
+        $lines = file($filename, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+        if (count($lines) < 1) {
+            return false;
+        }
 		
         if (stristr($lines[0], 'BEGIN:VCALENDAR') === false) {
             return false;
         } else {
     
-			# pass1: put multi lines back into one line.
-			$linesCompacted = array();
-			foreach($lines as $line) {
-				if (substr($line,0,1) == ' ') {
-					$linesCompacted[count($linesCompacted)-1] .= substr($line, 1);
-				} else {
-					$linesCompacted[] = trim($line);
-				}
-			};
+            # pass1: put multi lines back into one line.
+            $linesCompacted = array();
+            foreach($lines as $line) {
+                if (substr($line,0,1) == ' ') {
+                    $linesCompacted[count($linesCompacted)-1] .= substr($line, 1);
+                } else {
+                    $linesCompacted[] = trim($line);
+                }
+            };
 						
-			#pass2: turn lines into formatted data
-			$rawLines = array();
-			foreach($linesCompacted as $line) {
-				$bits = explode(":", $line, 2);
-				$kbits = explode(";", $bits[0], 2);
-				$value = count($bits) == 2 ? $bits[1] : '';
-				// http://www.ietf.org/rfc/rfc2445.txt section 4.3.11
-				$value = str_replace('\\\\', '\\', $value);
-				$value = str_replace('\\N', "\n", $value);
-				$value = str_replace('\\n', "\n", $value);
-				$value = str_replace('\\;', ';', $value);
-				$value = str_replace('\,', ',', $value);
-				$rawLines[] = array(
-						'KEYWORD'=>$kbits[0],
-						'KEYWORDOPTIONS'=>count($kbits) == 2 ? $kbits[1] : '',
-						'VALUE'=>$value,
-					);
-			}
+            #pass2: turn lines into formatted data
+            $rawLines = array();
+            foreach($linesCompacted as $line) {
+                $bits = explode(":", $line, 2);
+                $kbits = explode(";", $bits[0], 2);
+                $value = count($bits) == 2 ? $bits[1] : '';
+                // http://www.ietf.org/rfc/rfc2445.txt section 4.3.11
+                $value = str_replace('\\\\', '\\', $value);
+                $value = str_replace('\\N', "\n", $value);
+                $value = str_replace('\\n', "\n", $value);
+                $value = str_replace('\\;', ';', $value);
+                $value = str_replace('\,', ',', $value);
+                $rawLines[] = array(
+                        'KEYWORD'=>$kbits[0],
+                        'KEYWORDOPTIONS'=>count($kbits) == 2 ? $kbits[1] : '',
+                        'VALUE'=>$value,
+                    );
+            }
 			
-			# pass3: finally parse lines
-			$stack = array();
-			foreach($rawLines as $line) {
-				if ($line['KEYWORD'] == 'BEGIN') {
-					$stack[] = $line['VALUE'];
-					if ($line['VALUE'] == 'VEVENT') {
-						$this->events[] = new ICalEvent($this->timezone->getTimeZone());
-					}
-				} else if ($line['KEYWORD'] == 'END') {
-					// TODO check VALUE and last stack match
-					array_pop($stack);
-				} else {
-					$currentlyIn = $stack[count($stack)-1];
-					//print $currentlyIn." with K ".$line['KEYWORD']."\n";
-					if ($currentlyIn == 'VEVENT') {
-						$this->events[count($this->events)-1]->processLine($line['KEYWORD'],$line['VALUE'], $line['KEYWORDOPTIONS']);
-					} elseif ($currentlyIn == 'VTIMEZONE') {
-						$this->timezone->processLine($line['KEYWORD'],$line['VALUE'], $line['KEYWORDOPTIONS']);
-					}
-				}
-			}
+            # pass3: finally parse lines
+            $stack = array();
+            foreach($rawLines as $line) {
+                if ($line['KEYWORD'] == 'BEGIN') {
+                    $stack[] = $line['VALUE'];
+                    if ($line['VALUE'] == 'VEVENT') {
+                        $this->events[] = new ICalEvent($this->timezone->getTimeZone());
+                    }
+                } else if ($line['KEYWORD'] == 'END') {
+                    // TODO check VALUE and last stack match
+                    array_pop($stack);
+                } else {
+                    $currentlyIn = $stack[count($stack)-1];
+                    //print $currentlyIn." with K ".$line['KEYWORD']."\n";
+                    if ($currentlyIn == 'VEVENT') {
+                        $this->events[count($this->events)-1]->processLine($line['KEYWORD'],$line['VALUE'], $line['KEYWORDOPTIONS']);
+                    } elseif ($currentlyIn == 'VTIMEZONE') {
+                        $this->timezone->processLine($line['KEYWORD'],$line['VALUE'], $line['KEYWORDOPTIONS']);
+                    }
+                }
+            }
 			
-			//die();
+            //die();
 			
-			return true;
-		}
+            return true;
+        }
     }
 
-	/**
-	 * This is only for debugging.
-	 * This class ensures all dates returned are in UTC, whatever the input time zone was.
-	 * @return type 
-	 */
-	public function getTimeZoneIdentifier() 
-	{
-		return $this->timezone->getTimeZoneIdentifier();
-	}
+    /**
+     * This is only for debugging.
+     * This class ensures all dates returned are in UTC, whatever the input time zone was.
+     * @return type 
+     */
+    public function getTimeZoneIdentifier() 
+    {
+        return $this->timezone->getTimeZoneIdentifier();
+    }
 
     public function getEvents()
     {
-		return $this->events;
-	}
+        return $this->events;
+    }
 
 }
 

Resources/Private/Php/ICalDissect/src/JMBTechnologyLimited/ICalDissect/ICalExDate.php

Indentation +24 added lines, -24 removed lines

@@ -13,30 +13,30 @@
 class ICalExDate
 {
 
-	protected $properties;
-	protected $values;
-
-	function __construct($values, $properties)
-	{
-		$this->properties = $properties;
-		$this->values = $values;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getProperties()
-	{
-		return $this->properties;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getValues()
-	{
-		return $this->values;
-	}
+    protected $properties;
+    protected $values;
+
+    function __construct($values, $properties)
+    {
+        $this->properties = $properties;
+        $this->values = $values;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getProperties()
+    {
+        return $this->properties;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getValues()
+    {
+        return $this->values;
+    }
 
 
 

Resources/Private/Php/ICalDissect/src/JMBTechnologyLimited/ICalDissect/ICalEvent.php

Indentation +137 added lines, -137 removed lines

@@ -12,91 +12,91 @@ 
 class ICalEvent
 {
 
-	protected $timeZone;
-	protected $timeZoneUTC;
+    protected $timeZone;
+    protected $timeZoneUTC;
 	
-	/** @var \DateTime **/
-	protected $start;
+    /** @var \DateTime **/
+    protected $start;
 
-	/** @var \DateTime **/
-	protected $end;
+    /** @var \DateTime **/
+    protected $end;
 	
-	protected $summary;
+    protected $summary;
 	
-	protected $location;
+    protected $location;
 	
-	protected $description;
+    protected $description;
 	
-	protected $uid;
+    protected $uid;
 	
-	protected $deleted = false;
+    protected $deleted = false;
 
-	protected $url;
+    protected $url;
 
-	protected $ical_rrule;
+    protected $ical_rrule;
 
-	protected $exdates = array();
+    protected $exdates = array();
 
-	public function __construct(\DateTimeZone $timeZone = null) {
-		$this->timeZoneUTC =  new \DateTimeZone('UTC');
-		$this->timeZone = $timeZone ? $timeZone : $this->timeZoneUTC;
-	} 
+    public function __construct(\DateTimeZone $timeZone = null) {
+        $this->timeZoneUTC =  new \DateTimeZone('UTC');
+        $this->timeZone = $timeZone ? $timeZone : $this->timeZoneUTC;
+    } 
 	
-	public function processLine($keyword, $value, $keywordProperties = "") {
-		if ($keyword == 'UID') {
-			$this->uid = $value;
-		} else if ($keyword == 'LOCATION') {
-			$this->location = $value;
-		} else if ($keyword == 'SUMMARY') {
-			$this->summary = $value;
-		} else if ($keyword == 'DESCRIPTION') {
-			$this->description = $value;
-		} else if ($keyword == 'URL') {
-			$this->url = $value;
-		} else if ($keyword == 'DTSTART') {
-			$this->start = $this->parseDateTime($value, true);
-		} else if ($keyword == 'DTEND') {
-			$this->end = $this->parseDateTime($value, false);
-		} else if ($keyword == 'METHOD' && $value == 'CANCEL') {
-			$this->deleted = true;
-		} else if ($keyword == 'STATUS' && $value == 'CANCELLED') {
-			$this->deleted = true;
-		} else if ($keyword == 'RRULE') {
-			$rrule = array();
-			foreach(explode(";", $value) as $rruleBit) {
-				list($k, $v) = explode("=",$rruleBit,2);
-				$rrule[strtoupper($k)] = $v;
-			}
-			$this->ical_rrule = $rrule;
-		} else if ($keyword == "EXDATE") {
-			$this->exdates[] = new ICalExDate($value, $keywordProperties);
-		}
-
-	}
+    public function processLine($keyword, $value, $keywordProperties = "") {
+        if ($keyword == 'UID') {
+            $this->uid = $value;
+        } else if ($keyword == 'LOCATION') {
+            $this->location = $value;
+        } else if ($keyword == 'SUMMARY') {
+            $this->summary = $value;
+        } else if ($keyword == 'DESCRIPTION') {
+            $this->description = $value;
+        } else if ($keyword == 'URL') {
+            $this->url = $value;
+        } else if ($keyword == 'DTSTART') {
+            $this->start = $this->parseDateTime($value, true);
+        } else if ($keyword == 'DTEND') {
+            $this->end = $this->parseDateTime($value, false);
+        } else if ($keyword == 'METHOD' && $value == 'CANCEL') {
+            $this->deleted = true;
+        } else if ($keyword == 'STATUS' && $value == 'CANCELLED') {
+            $this->deleted = true;
+        } else if ($keyword == 'RRULE') {
+            $rrule = array();
+            foreach(explode(";", $value) as $rruleBit) {
+                list($k, $v) = explode("=",$rruleBit,2);
+                $rrule[strtoupper($k)] = $v;
+            }
+            $this->ical_rrule = $rrule;
+        } else if ($keyword == "EXDATE") {
+            $this->exdates[] = new ICalExDate($value, $keywordProperties);
+        }
+
+    }
 	
 	
-	/*
+    /*
 	 * Based on ....
 	* @author   Martin Thoma <info@martin-thoma.de>
 	* @license  http://www.opensource.org/licenses/mit-license.php  MIT License
 	* @link     http://code.google.com/p/ics-parser/
 	**/
-	protected function parseDateTime($value, $isStart) {
+    protected function parseDateTime($value, $isStart) {
         $value = str_replace('Z', '', $value);
-		$pattern  = '/([0-9]{4})';   // 1: YYYY
+        $pattern  = '/([0-9]{4})';   // 1: YYYY
         $pattern .= '([0-9]{2})';    // 2: MM
         $pattern .= '([0-9]{2})';    // 3: DD
         
-		$hasTimePart = false;
-		if (strpos($value, "T") > 1) {
-			$value = str_replace('T', '', $value);
-			$pattern .= '([0-9]{0,2})';  // 4: HH
-			$pattern .= '([0-9]{0,2})';  // 5: MM
-			$pattern .= '([0-9]{0,2})/'; // 6: SS
-			$hasTimePart = true;
-		} else {
-			$pattern .= '/';
-		}
+        $hasTimePart = false;
+        if (strpos($value, "T") > 1) {
+            $value = str_replace('T', '', $value);
+            $pattern .= '([0-9]{0,2})';  // 4: HH
+            $pattern .= '([0-9]{0,2})';  // 5: MM
+            $pattern .= '([0-9]{0,2})/'; // 6: SS
+            $hasTimePart = true;
+        } else {
+            $pattern .= '/';
+        }
         preg_match($pattern, $value, $date);
 
         // Unix timestamp can't represent dates before 1970
@@ -106,90 +106,90 @@ 
         // Unix timestamps after 03:14:07 UTC 2038-01-19 might cause an overflow
         // if 32 bit integers are used.
 		
-		$out = new \DateTime('', $this->timeZone);
-		$out->setDate((int)$date[1], (int)$date[2], (int)$date[3]);
-		if ($hasTimePart) {
-			$out->setTime((int)$date[4], (int)$date[5], (int)$date[6]);
-		} else if ($isStart) {
-			$out->setTime(0,0,0);
-		} else if (!$isStart) {
-			$out->setTime(23,59,59);
-		}
-		if ($this->timeZone->getName() != 'UTC') {
-			$out->setTimezone($this->timeZoneUTC);
-		}
-		return $out;
-	}
+        $out = new \DateTime('', $this->timeZone);
+        $out->setDate((int)$date[1], (int)$date[2], (int)$date[3]);
+        if ($hasTimePart) {
+            $out->setTime((int)$date[4], (int)$date[5], (int)$date[6]);
+        } else if ($isStart) {
+            $out->setTime(0,0,0);
+        } else if (!$isStart) {
+            $out->setTime(23,59,59);
+        }
+        if ($this->timeZone->getName() != 'UTC') {
+            $out->setTimezone($this->timeZoneUTC);
+        }
+        return $out;
+    }
 			
 	
-	public function getUid() {
-		return $this->uid;
-	}
+    public function getUid() {
+        return $this->uid;
+    }
 	
-	public function setUid($uid) {
-		$this->uid = $uid;
-	}	
+    public function setUid($uid) {
+        $this->uid = $uid;
+    }	
 	
-	public function getStart() {
-		return $this->start;
-	}
+    public function getStart() {
+        return $this->start;
+    }
 
-	public function getEnd() {
-		return $this->end;
-	}
+    public function getEnd() {
+        return $this->end;
+    }
 
-	public function getSummary() {
-		return $this->summary;
-	}
+    public function getSummary() {
+        return $this->summary;
+    }
 
-	public function getLocation() {
-		return $this->location;
-	}
+    public function getLocation() {
+        return $this->location;
+    }
 
-	public function getDescription() {
-		return $this->description;
-	}
+    public function getDescription() {
+        return $this->description;
+    }
 	
-	public function getUrl() {
-		return $this->url;
-	}
-
-	public function isDeleted() {
-		return $this->deleted;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getRRule()
-	{
-		return $this->ical_rrule;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getExDates()
-	{
-		return $this->exdates;
-	}
-
-	/**
-	 * @return ICalExDate
-	 */
-	public function getExDate($position)
-	{
-		return $this->exdates[$position];
-	}
-
-
-	/**
-	 * @return integer
-	 */
-	public function getExDatesCount()
-	{
-		return count($this->exdates);
-	}
+    public function getUrl() {
+        return $this->url;
+    }
+
+    public function isDeleted() {
+        return $this->deleted;
+    }
+
+    /**
+     * @return array
+     */
+    public function getRRule()
+    {
+        return $this->ical_rrule;
+    }
+
+    /**
+     * @return array
+     */
+    public function getExDates()
+    {
+        return $this->exdates;
+    }
+
+    /**
+     * @return ICalExDate
+     */
+    public function getExDate($position)
+    {
+        return $this->exdates[$position];
+    }
+
+
+    /**
+     * @return integer
+     */
+    public function getExDatesCount()
+    {
+        return count($this->exdates);
+    }
 
 
 

Resources/Private/Php/ICalDissect/tests/JMBTechnologyLimited/ICalDissect/LineTest.php

Indentation +17 added lines, -17 removed lines

@@ -13,25 +13,25 @@
 
 
 
-	function dataForTestMultiLineDescription() {
-		return array(
-				array('IcalParserBasicImportMultiLineDescription.ical','Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Lizard'),
-				array('IcalParserBasicImportMultiLineDescription2.ical','Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Lizard:Blue'),
-				array('IcalParserBasicImportMultiLineDescription3.ical','Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Go Miaow Lizard:Blue abcdefgtijklmnopqrstuvwxyz abcdefgtijklmnopqrstuvwxyz 12345'),
-			);
-	}
-
-	/**
+    function dataForTestMultiLineDescription() {
+        return array(
+                array('IcalParserBasicImportMultiLineDescription.ical','Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Lizard'),
+                array('IcalParserBasicImportMultiLineDescription2.ical','Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Lizard:Blue'),
+                array('IcalParserBasicImportMultiLineDescription3.ical','Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Dog Cat Go Miaow Lizard:Blue abcdefgtijklmnopqrstuvwxyz abcdefgtijklmnopqrstuvwxyz 12345'),
+            );
+    }
+
+    /**
      * @dataProvider dataForTestMultiLineDescription
      */		
-	function testMultiLineDescription ($filename, $output) {
-		$parser = new ICalParser();
-		$this->assertTrue($parser->parseFromFile(dirname(__FILE__)."/data/".$filename));
-		$events = $parser->getEvents();
-		$this->assertEquals(1, count($events));
-		$event = $events[0];
-		$this->assertEquals($output, $event->getDescription());
-	}
+    function testMultiLineDescription ($filename, $output) {
+        $parser = new ICalParser();
+        $this->assertTrue($parser->parseFromFile(dirname(__FILE__)."/data/".$filename));
+        $events = $parser->getEvents();
+        $this->assertEquals(1, count($events));
+        $event = $events[0];
+        $this->assertEquals($output, $event->getDescription());
+    }
 
 
 

Resources/Private/Php/ICalDissect/tests/JMBTechnologyLimited/ICalDissect/RRuleTest.php

Indentation +40 added lines, -40 removed lines

@@ -14,46 +14,46 @@
 
 
 
-	function dataForTestRRule() {
-		return array(
-			array('IcalParserRRule1.ics',array("FREQ"=>"WEEKLY","BYDAY"=>"WE")),
-			array('IcalParserRRule2.ics',array("FREQ"=>"WEEKLY","BYDAY"=>"TH","COUNT"=>5)),
-		);
-	}
-
-	/**
-	 * @dataProvider dataForTestRRule
-	 */
-	function testGetByPosition ($filename, $rrule) {
-		$parser = new ICalParser();
-		$this->assertTrue($parser->parseFromFile(dirname(__FILE__)."/data/".$filename));
-		$events = $parser->getEvents();
-		$this->assertEquals(1, count($events));
-		$event = $events[0];
-
-		$eventRRule = $event->getRrule();
-		$this->assertEquals(count(array_keys($rrule)), count(array_keys($eventRRule)));
-		foreach($rrule as $k=>$v) {
-			$this->assertEquals($v, $eventRRule[$k]);
-		}
-	}
-
-	/**
-	 * @dataProvider dataForTestRRule
-	 */
-	function testGetByArray ($filename, $rrule) {
-		$parser = new ICalParser();
-		$this->assertTrue($parser->parseFromFile(dirname(__FILE__)."/data/".$filename));
-		$events = $parser->getEvents();
-		$this->assertEquals(1, count($events));
-		$event = $events[0];
-
-		$eventRRule = $event->getRrule();
-		$this->assertEquals(count(array_keys($rrule)), count(array_keys($eventRRule)));
-		foreach($rrule as $k=>$v) {
-			$this->assertEquals($v, $eventRRule[$k]);
-		}
-	}
+    function dataForTestRRule() {
+        return array(
+            array('IcalParserRRule1.ics',array("FREQ"=>"WEEKLY","BYDAY"=>"WE")),
+            array('IcalParserRRule2.ics',array("FREQ"=>"WEEKLY","BYDAY"=>"TH","COUNT"=>5)),
+        );
+    }
+
+    /**
+     * @dataProvider dataForTestRRule
+     */
+    function testGetByPosition ($filename, $rrule) {
+        $parser = new ICalParser();
+        $this->assertTrue($parser->parseFromFile(dirname(__FILE__)."/data/".$filename));
+        $events = $parser->getEvents();
+        $this->assertEquals(1, count($events));
+        $event = $events[0];
+
+        $eventRRule = $event->getRrule();
+        $this->assertEquals(count(array_keys($rrule)), count(array_keys($eventRRule)));
+        foreach($rrule as $k=>$v) {
+            $this->assertEquals($v, $eventRRule[$k]);
+        }
+    }
+
+    /**
+     * @dataProvider dataForTestRRule
+     */
+    function testGetByArray ($filename, $rrule) {
+        $parser = new ICalParser();
+        $this->assertTrue($parser->parseFromFile(dirname(__FILE__)."/data/".$filename));
+        $events = $parser->getEvents();
+        $this->assertEquals(1, count($events));
+        $event = $events[0];
+
+        $eventRRule = $event->getRrule();
+        $this->assertEquals(count(array_keys($rrule)), count(array_keys($eventRRule)));
+        foreach($rrule as $k=>$v) {
+            $this->assertEquals($v, $eventRRule[$k]);
+        }
+    }
 
 
 

Resources/Private/Php/ICalDissect/tests/JMBTechnologyLimited/ICalDissect/ExDateTest.php

Indentation +24 added lines, -24 removed lines

@@ -12,30 +12,30 @@
 class ExDateTest  extends \PHPUnit_Framework_TestCase {
 
 
-	function test1 () {
-		$parser = new ICalParser();
-		$this->assertTrue($parser->parseFromFile(dirname(__FILE__)."/data/exdate1.ics"));
-		$events = $parser->getEvents();
-		$this->assertEquals(1, count($events));
-
-		/** @var $event ICalEvent */
-		$event = $events[0];
-
-		$eventRRule = $event->getRrule();
-		$rrule = array("FREQ"=>"WEEKLY","INTERVAL"=>"2","BYDAY"=>"TH");
-		$this->assertEquals(count(array_keys($rrule)), count(array_keys($eventRRule)));
-		foreach($rrule as $k=>$v) {
-			$this->assertEquals($v, $eventRRule[$k]);
-		}
-
-
-		$this->assertEquals(1, $event->getExDatesCount());
-		/** @var $exdate ICalExDate */
-		$exdate = $event->getExDate(0);
-		$this->assertEquals("TZID=Europe/London",$exdate->getProperties());
-		$this->assertEquals("20150226T090000",$exdate->getValues());
-
-	}
+    function test1 () {
+        $parser = new ICalParser();
+        $this->assertTrue($parser->parseFromFile(dirname(__FILE__)."/data/exdate1.ics"));
+        $events = $parser->getEvents();
+        $this->assertEquals(1, count($events));
+
+        /** @var $event ICalEvent */
+        $event = $events[0];
+
+        $eventRRule = $event->getRrule();
+        $rrule = array("FREQ"=>"WEEKLY","INTERVAL"=>"2","BYDAY"=>"TH");
+        $this->assertEquals(count(array_keys($rrule)), count(array_keys($eventRRule)));
+        foreach($rrule as $k=>$v) {
+            $this->assertEquals($v, $eventRRule[$k]);
+        }
+
+
+        $this->assertEquals(1, $event->getExDatesCount());
+        /** @var $exdate ICalExDate */
+        $exdate = $event->getExDate(0);
+        $this->assertEquals("TZID=Europe/London",$exdate->getProperties());
+        $this->assertEquals("20150226T090000",$exdate->getValues());
+
+    }
 
 
 

Resources/Private/Php/ICalDissect/tests/JMBTechnologyLimited/ICalDissect/TimezoneTest.php

Indentation +13 added lines, -13 removed lines

@@ -11,22 +11,22 @@
  */
 class TimezoneTest  extends \PHPUnit_Framework_TestCase {
 	
-	function dataForTestTimeZone1() {
-		return array(
-				array('London.ical','Europe/London'),
-				array('UTC.ical','UTC'),
-				array('BasicICAL.ical','UTC'),
-			);
-	}
+    function dataForTestTimeZone1() {
+        return array(
+                array('London.ical','Europe/London'),
+                array('UTC.ical','UTC'),
+                array('BasicICAL.ical','UTC'),
+            );
+    }
 	
-	/**
+    /**
      * @dataProvider dataForTestTimeZone1
      */	
-	function testTimeZone1 ($filename, $timeZone) {
-		$parser = new ICalParser();
-		$this->assertTrue($parser->parseFromFile(dirname(__FILE__)."/data/".$filename));
-		$this->assertEquals($timeZone, $parser->getTimeZoneIdentifier());
-	}
+    function testTimeZone1 ($filename, $timeZone) {
+        $parser = new ICalParser();
+        $this->assertTrue($parser->parseFromFile(dirname(__FILE__)."/data/".$filename));
+        $this->assertEquals($timeZone, $parser->getTimeZoneIdentifier());
+    }
 
 }