chamilo / chamilo-lms

main/inc/lib/icalcreator/iCalcreator.class.php

Doc Comments +25 added lines, -30 removed lines

@@ -137,7 +137,7 @@ 
  * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
  * @since 2.4.8 - 2008-10-21
  * @param string $value
- * @return void
+ * @return false|null
  */
   function setCalscale( $value ) {
     if( empty( $value )) return FALSE;
@@ -273,7 +273,7 @@ 
  * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
  * @since 2.4.8 - 2008-10-23
  * @param string $value
- * @return void
+ * @return boolean
  */
   function setVersion( $value ) {
     if( empty( $value )) return FALSE;
@@ -397,7 +397,7 @@ 
  * @since 2.5.1 - 2008-11-02
  * @param string $propName, optional
  * @param int @propix, optional, if specific property is wanted in case of multiply occurences
- * @param bool $inclParam=FALSE
+ * @param bool $inclParam
  * @return mixed
  */
   function getProperty( $propName=FALSE, $propix=FALSE, $inclParam=FALSE ) {
@@ -448,9 +448,6 @@ 
  *
  * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
  * @since 2.2.13 - 2007-11-04
- * @param mixed $args variable number of function arguments,
- *                    first argument is ALWAYS component name,
- *                    second ALWAYS component value!
  * @return bool
  */
   function setProperty () {
@@ -480,7 +477,7 @@ 
  * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
  * @since 2.4.10 - 2008-10-23
  * @param string $config
- * @return value
+ * @return string
  */
   function getConfig( $config ) {
     switch( strtoupper( $config )) {
@@ -701,7 +698,7 @@ 
  * @since 2.4.10 - 2008-08-05
  * @param mixed $arg1 ordno / component type / component uid
  * @param mixed $arg2 optional, ordno if arg1 = component type
- * @return void
+ * @return boolean
  */
   function deleteComponent( $arg1, $arg2=FALSE  ) {
     $argType = $index = null;
@@ -1060,7 +1057,7 @@ 
  * @param object $component calendar component
  * @param mixed $arg1 optional, ordno/component type/ component uid
  * @param mixed $arg2 optional, ordno if arg1 = component type
- * @return void
+ * @return boolean
  */
   function setComponent( $component, $arg1=FALSE, $arg2=FALSE  ) {
     if( '' >= $component->getConfig( 'language'))
@@ -2309,7 +2306,7 @@ 
  * @param int $min optional
  * @param int $sec optional
  * @param array $params optional
- * @return TRUE
+ * @return boolean
  */
   function setDtstamp( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
     if( empty( $year ))
@@ -2792,7 +2789,7 @@ 
  * @param int $min optional
  * @param int $sec optional
  * @param array $params optional
- * @return boll
+ * @return boolean
  */
   function setLastModified( $year=FALSE, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
     if( empty( $year ))
@@ -3213,7 +3210,6 @@ 
  *
  * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
  * @since 2.5.1 - 2008-11-07
- * @param float $relid
  * @param array $params, optional
  * @param index $index, optional
  * @return bool
@@ -3251,7 +3247,7 @@ 
  * @since 2.4.8 - 2008-11-04
  * @param string $value
  * @param array $params optional
- * @return void
+ * @return boolean
  */
   function setRepeat( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
@@ -3374,7 +3370,7 @@ 
  * @param array $rruleset
  * @param array $params, optional
  * @param integer $index, optional
- * @return void
+ * @return boolean
  */
   function setRrule( $rruleset, $params=FALSE, $index=FALSE ) {
     if( empty( $rruleset )) if( $this->getConfig( 'allowEmpty' )) $rruleset = null; else return FALSE;
@@ -3800,7 +3796,7 @@ 
  * @since 2.4.8 - 2008-11-04
  * @param string $value
  * @param string $params optional
- * @return boll
+ * @return boolean
  */
   function setTzurl( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
@@ -3929,7 +3925,7 @@ 
  * @param string $label
  * @param mixed $value
  * @param array $params optional
- * @return bool
+ * @return null|boolean
  */
   function setXprop( $label, $value, $params=FALSE ) {
     if( empty( $label )) return;
@@ -4096,7 +4092,7 @@ 
  * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
  * @since 0.9.22 - 2007-04-10
  * @param array $params  optional
- * @param array $ctrKeys optional
+ * @param string[] $ctrKeys optional
  * @return string
  */
   function _createParams( $params=array(), $ctrKeys=array() ) {
@@ -4138,7 +4134,6 @@ 
  *
  * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
  * @since 2.4.16 - 2008-10-25
- * @param array $date, date to check
  * @param int $parno, no of date parts (i.e. year, month.. .)
  * @return array $params, property parameters
  */
@@ -4194,7 +4189,6 @@ 
  * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
  * @since 2.2.11 - 2007-11-03
  * @param array $startdate, optional
- * @param array $duration, optional
  * @return array duration
  */
   function _date2duration( $startdate=FALSE, $enddate=FALSE ) {
@@ -4228,7 +4222,7 @@ 
  * @since 2.4.8 - 2008-10-30
  * @param array  $datetime  datetime/(date)
  * @param string $tz        timezone
- * @return timestamp
+ * @return integer
  */
   function _date2timestamp( $datetime, $tz=null ) {
     $output = null;
@@ -4541,6 +4535,7 @@ 
  * @param int $hitVal optional, return value if found
  * @param int $elseVal optional, return value if not found
  * @param int $preSet optional, return value if already preset
+ * @param string $expkey
  * @return int
  */
   function _existRem( &$array, $expkey, $expval=FALSE, $hitVal=null, $elseVal=null, $preSet=null ) {
@@ -4650,7 +4645,7 @@ 
  *
  * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
  * @since 2.4.8 - 2008-10-22
- * @param array $recurlabel
+ * @param string $recurlabel
  * @param array $recurdata
  * @return string
  */
@@ -5196,6 +5191,10 @@ 
     else
       return FALSE;
   }
+
+  /**
+   * @param integer $wkst
+   */
   function _recurIntervalIx( $freq, $date, $wkst ) {
             /* create interval index */
     switch( $freq ) {
@@ -5504,7 +5503,6 @@ 
  *
  * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
  * @since 2.4.16 - 2008-10-19
- * @param string $offset
  * @return integer
  */
   function _tz2offset( $tz ) {
@@ -5966,8 +5964,8 @@ 
  * @since 2.5.1 - 2008-11-02
  * @param string $propName, optional
  * @param int @propix, optional, if specific property is wanted in case of multiply occurences
- * @param bool $inclParam=FALSE
- * @param bool $specform=FALSE
+ * @param bool $inclParam
+ * @param bool $specform
  * @return mixed
  */
   function getProperty( $propName=FALSE, $propix=FALSE, $inclParam=FALSE, $specform=FALSE ) {
@@ -6160,9 +6158,6 @@ 
  *
  * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
  * @since 2.5.1 - 2008-11-05
- * @param mixed $args variable number of function arguments,
- *                    first argument is ALWAYS component name,
- *                    second ALWAYS component value!
  * @return void
  */
   function setProperty() {
@@ -6276,7 +6271,7 @@ 
  * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
  * @since 2.5.2 - 2008-10-23
  * @param mixed $unparsedtext, optional, strict rfc2445 formatted, single property string or array of property strings
- * @return bool FALSE if error occurs during parsing
+ * @return boolean|null FALSE if error occurs during parsing
  *
  */
   function parse( $unparsedtext=null ) {
@@ -6578,7 +6573,7 @@ 
  * @since 2.5.1 - 2008-10-15
  * @param mixed $arg1 ordno / component type / component uid
  * @param mixed $arg2 optional, ordno if arg1 = component type
- * @return void
+ * @return boolean
  */
   function deleteComponent( $arg1, $arg2=FALSE  ) {
     if( !isset( $this->components )) return FALSE;
@@ -6781,7 +6776,7 @@ 
  *
  * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
  * @since 2.2.8 - 2006-09-03
- * @param string $value
+ * @param string $string
  * @return string
  */
   function _size75( $string ) {

Spacing +2505 added lines, -2505 removed lines

@@ -44,10 +44,10 @@ 
 }
 */
             /* only for phpversion 5.x, date management, default timezone setting */
-if( substr( phpversion(), 0, 1) >= '5' ) // && ( 'UTC' == date_default_timezone_get() )) {
-  date_default_timezone_set( 'Europe/Stockholm' );
+if (substr(phpversion(), 0, 1) >= '5') // && ( 'UTC' == date_default_timezone_get() )) {
+  date_default_timezone_set('Europe/Stockholm');
             /* version string, do NOT remove!! */
-define( 'ICALCREATOR_VERSION', 'iCalcreator 2.6' );
+define('ICALCREATOR_VERSION', 'iCalcreator 2.6');
 /*********************************************************************************/
 /*********************************************************************************/
 /**
@@ -87,7 +87,7 @@ 
  * @since 2.2.13 - 2007-12-30
  * @return void
  */
-  function vcalendar () {
+  function vcalendar() {
     $this->_makeVersion();
     $this->calscale   = null;
     $this->method     = null;
@@ -97,15 +97,15 @@ 
 /**
  *   language = <Text identifying a language, as defined in [RFC 1766]>
  */
-    if( defined( 'ICAL_LANG' ))
-      $this->setConfig( 'language', ICAL_LANG );
-    $this->setConfig( 'allowEmpty', TRUE );
-    $this->setConfig( 'nl',         "\n" );
-    $this->setConfig( 'format',     'iCal');
+    if (defined('ICAL_LANG'))
+      $this->setConfig('language', ICAL_LANG);
+    $this->setConfig('allowEmpty', TRUE);
+    $this->setConfig('nl', "\n");
+    $this->setConfig('format', 'iCal');
     $this->directory  = null;
     $this->filename   = null;
     $this->url        = null;
-    $this->setConfig( 'delimiter',  DIRECTORY_SEPARATOR );
+    $this->setConfig('delimiter', DIRECTORY_SEPARATOR);
     $this->xcaldecl   = array();
     $this->components = array();
   }
@@ -121,8 +121,8 @@ 
  * @return string
  */
   function createCalscale() {
-    if( empty( $this->calscale )) return FALSE;
-    switch( $this->format ) {
+    if (empty($this->calscale)) return FALSE;
+    switch ($this->format) {
       case 'xcal':
         return ' calscale="'.$this->calscale.'"'.$this->nl;
         break;
@@ -139,8 +139,8 @@ 
  * @param string $value
  * @return void
  */
-  function setCalscale( $value ) {
-    if( empty( $value )) return FALSE;
+  function setCalscale($value) {
+    if (empty($value)) return FALSE;
     $this->calscale = $value;
   }
 /*********************************************************************************/
@@ -155,8 +155,8 @@ 
  * @return string
  */
   function createMethod() {
-    if( empty( $this->method )) return FALSE;
-    switch( $this->format ) {
+    if (empty($this->method)) return FALSE;
+    switch ($this->format) {
       case 'xcal':
         return ' method="'.$this->method.'"'.$this->nl;
         break;
@@ -173,8 +173,8 @@ 
  * @param string $value
  * @return bool
  */
-  function setMethod( $value ) {
-    if( empty( $value )) return FALSE;
+  function setMethod($value) {
+    if (empty($value)) return FALSE;
     $this->method = $value;
     return TRUE;
   }
@@ -194,9 +194,9 @@ 
  * @return string
  */
   function createProdid() {
-    if( !isset( $this->prodid ))
+    if (!isset($this->prodid))
       $this->_makeProdid();
-    switch( $this->format ) {
+    switch ($this->format) {
       case 'xcal':
         return ' prodid="'.$this->prodid.'"'.$this->nl;
         break;
@@ -213,7 +213,7 @@ 
  * @return void
  */
   function _makeProdid() {
-    $this->prodid  = '-//'.$this->unique_id.'//NONSGML '.ICALCREATOR_VERSION.'//'.strtoupper( $this->language );
+    $this->prodid = '-//'.$this->unique_id.'//NONSGML '.ICALCREATOR_VERSION.'//'.strtoupper($this->language);
   }
 /**
  * Conformance: The property MUST be specified once in an iCalendar object.
@@ -229,7 +229,7 @@ 
  * @return void
  */
   function _makeUnique_id() {
-    $this->unique_id  = ( isset( $_SERVER['SERVER_NAME'] )) ? gethostbyname( $_SERVER['SERVER_NAME'] ) : 'localhost';
+    $this->unique_id = (isset($_SERVER['SERVER_NAME'])) ? gethostbyname($_SERVER['SERVER_NAME']) : 'localhost';
   }
 /*********************************************************************************/
 /**
@@ -246,9 +246,9 @@ 
  * @return string
  */
   function createVersion() {
-    if( empty( $this->version ))
+    if (empty($this->version))
       $this->_makeVersion();
-    switch( $this->format ) {
+    switch ($this->format) {
       case 'xcal':
         return ' version="'.$this->version.'"'.$this->nl;
         break;
@@ -275,8 +275,8 @@ 
  * @param string $value
  * @return void
  */
-  function setVersion( $value ) {
-    if( empty( $value )) return FALSE;
+  function setVersion($value) {
+    if (empty($value)) return FALSE;
     $this->version = $value;
     return TRUE;
   }
@@ -292,29 +292,29 @@ 
  * @return string
  */
   function createXprop() {
-    if( 'xcal' == $this->format )
+    if ('xcal' == $this->format)
       return false;
-    if( 0 >= count( $this->xprop ))
+    if (0 >= count($this->xprop))
       return;
     $output = null;
     $toolbox = new calendarComponent();
-    $toolbox->setConfig( 'language', $this->getConfig( 'language' ));
-    $toolbox->setConfig( 'nl',       $this->getConfig( 'nl' ));
-    $toolbox->_createFormat(         $this->getConfig( 'format' ));
-    foreach( $this->xprop as $label => $xpropPart ) {
-      if( empty( $xpropPart['value'] )) {
-        $output  .= $toolbox->_createElement( $label );
+    $toolbox->setConfig('language', $this->getConfig('language'));
+    $toolbox->setConfig('nl', $this->getConfig('nl'));
+    $toolbox->_createFormat($this->getConfig('format'));
+    foreach ($this->xprop as $label => $xpropPart) {
+      if (empty($xpropPart['value'])) {
+        $output  .= $toolbox->_createElement($label);
         continue;
       }
-      $attributes = $toolbox->_createParams( $xpropPart['params'], array( 'LANGUAGE' ));
-      if( is_array( $xpropPart['value'] )) {
-        foreach( $xpropPart['value'] as $pix => $theXpart )
-          $xpropPart['value'][$pix] = $toolbox->_strrep( $theXpart );
-        $xpropPart['value']  = implode( ',', $xpropPart['value'] );
+      $attributes = $toolbox->_createParams($xpropPart['params'], array('LANGUAGE'));
+      if (is_array($xpropPart['value'])) {
+        foreach ($xpropPart['value'] as $pix => $theXpart)
+          $xpropPart['value'][$pix] = $toolbox->_strrep($theXpart);
+        $xpropPart['value'] = implode(',', $xpropPart['value']);
       }
       else
-        $xpropPart['value'] = $toolbox->_strrep( $xpropPart['value'] );
-      $output    .= $toolbox->_createElement( $label, $attributes, $xpropPart['value'] );
+        $xpropPart['value'] = $toolbox->_strrep($xpropPart['value']);
+      $output .= $toolbox->_createElement($label, $attributes, $xpropPart['value']);
     }
     return $output;
   }
@@ -328,14 +328,14 @@ 
  * @param array $params optional
  * @return bool
  */
-  function setXprop( $label, $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    if( empty( $label )) return FALSE;
-    $xprop           = array( 'value' => $value );
+  function setXprop($label, $value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    if (empty($label)) return FALSE;
+    $xprop           = array('value' => $value);
     $toolbox         = new calendarComponent();
-    $xprop['params'] = $toolbox->_setParams( $params );
-    if( !is_array( $this->xprop )) $this->xprop = array();
-    $this->xprop[strtoupper( $label )] = $xprop;
+    $xprop['params'] = $toolbox->_setParams($params);
+    if (!is_array($this->xprop)) $this->xprop = array();
+    $this->xprop[strtoupper($label)] = $xprop;
     return TRUE;
   }
 /*********************************************************************************/
@@ -348,39 +348,39 @@ 
  * @param int @propix, optional, if specific property is wanted in case of multiply occurences
  * @return bool, if successfull delete
  */
-  function deleteProperty( $propName, $propix=FALSE ) {
-    $propName = ( $propName ) ? strtoupper( $propName ) : 'X-PROP';
-    if( !$propix )
-      $propix = ( isset( $this->propdelix[$propName] )) ? $this->propdelix[$propName] + 2 : 1;
+  function deleteProperty($propName, $propix = FALSE) {
+    $propName = ($propName) ? strtoupper($propName) : 'X-PROP';
+    if (!$propix)
+      $propix = (isset($this->propdelix[$propName])) ? $this->propdelix[$propName] + 2 : 1;
     $this->propdelix[$propName] = --$propix;
     $return = FALSE;
-    switch( $propName ) {
+    switch ($propName) {
       case 'CALSCALE':
-        if( isset( $this->calscale )) {
+        if (isset($this->calscale)) {
           $this->calscale = null;
           $return = TRUE;
         }
         break;
       case 'METHOD':
-        if( isset( $this->method )) {
-          $this->method   = null;
+        if (isset($this->method)) {
+          $this->method = null;
           $return = TRUE;
         }
         break;
       default:
         $reduced = array();
-        if( $propName != 'X-PROP' ) {
-          if( !isset( $this->xprop[$propName] )) return FALSE;
-          foreach( $this->xprop as $k => $a ) {
-            if(( $k != $propName ) && !empty( $a ))
+        if ($propName != 'X-PROP') {
+          if (!isset($this->xprop[$propName])) return FALSE;
+          foreach ($this->xprop as $k => $a) {
+            if (($k != $propName) && !empty($a))
               $reduced[$k] = $a;
           }
         }
         else {
-          if( count( $this->xprop ) <= $propix )  return FALSE;
+          if (count($this->xprop) <= $propix)  return FALSE;
           $xpropno = 0;
-          foreach( $this->xprop as $xpropkey => $xpropvalue ) {
-            if( $propix != $xpropno )
+          foreach ($this->xprop as $xpropkey => $xpropvalue) {
+            if ($propix != $xpropno)
               $reduced[$xpropkey] = $xpropvalue;
             $xpropno++;
           }
@@ -400,41 +400,41 @@ 
  * @param bool $inclParam=FALSE
  * @return mixed
  */
-  function getProperty( $propName=FALSE, $propix=FALSE, $inclParam=FALSE ) {
-    $propName = ( $propName ) ? strtoupper( $propName ) : 'X-PROP';
-    if( 'X-PROP' == $propName ) {
-      if( !$propix )
-        $propix = ( isset( $this->propix[$propName] )) ? $this->propix[$propName] + 2 : 1;
+  function getProperty($propName = FALSE, $propix = FALSE, $inclParam = FALSE) {
+    $propName = ($propName) ? strtoupper($propName) : 'X-PROP';
+    if ('X-PROP' == $propName) {
+      if (!$propix)
+        $propix = (isset($this->propix[$propName])) ? $this->propix[$propName] + 2 : 1;
       $this->propix[$propName] = --$propix;
     }
-    switch( $propName ) {
+    switch ($propName) {
       case 'CALSCALE':
-        return ( !empty( $this->calscale )) ? $this->calscale : null;
+        return (!empty($this->calscale)) ? $this->calscale : null;
         break;
       case 'METHOD':
-        return ( !empty( $this->method )) ? $this->method : null;
+        return (!empty($this->method)) ? $this->method : null;
         break;
       case 'PRODID':
-        if( empty( $this->prodid ))
+        if (empty($this->prodid))
           $this->_makeProdid();
         return $this->prodid;
         break;
       case 'VERSION':
-        return ( !empty( $this->version )) ? $this->version : null;
+        return (!empty($this->version)) ? $this->version : null;
         break;
       default:
-        if( $propName != 'X-PROP' ) {
-          if( !isset( $this->xprop[$propName] )) return FALSE;
-          return ( $inclParam ) ? array( $propName, $this->xprop[$propName] )
-                                : array( $propName, $this->xprop[$propName]['value'] );
+        if ($propName != 'X-PROP') {
+          if (!isset($this->xprop[$propName])) return FALSE;
+          return ($inclParam) ? array($propName, $this->xprop[$propName])
+                                : array($propName, $this->xprop[$propName]['value']);
         }
         else {
-          if( empty( $this->xprop )) return FALSE;
+          if (empty($this->xprop)) return FALSE;
           $xpropno = 0;
-          foreach( $this->xprop as $xpropkey => $xpropvalue ) {
-            if( $propix == $xpropno )
-              return ( $inclParam ) ? array( $xpropkey, $this->xprop[$xpropkey] )
-                                    : array( $xpropkey, $this->xprop[$xpropkey]['value'] );
+          foreach ($this->xprop as $xpropkey => $xpropvalue) {
+            if ($propix == $xpropno)
+              return ($inclParam) ? array($xpropkey, $this->xprop[$xpropkey])
+                                    : array($xpropkey, $this->xprop[$xpropkey]['value']);
             else
               $xpropno++;
           }
@@ -453,23 +453,23 @@ 
  *                    second ALWAYS component value!
  * @return bool
  */
-  function setProperty () {
+  function setProperty() {
     $numargs    = func_num_args();
-    if( 1 > $numargs )
+    if (1 > $numargs)
       return FALSE;
     $arglist    = func_get_args();
-    $arglist[0] = strtoupper( $arglist[0] );
-    switch( $arglist[0] ) {
+    $arglist[0] = strtoupper($arglist[0]);
+    switch ($arglist[0]) {
       case 'CALSCALE':
-        return $this->setCalscale( $arglist[1] );
+        return $this->setCalscale($arglist[1]);
       case 'METHOD':
-        return $this->setMethod( $arglist[1] );
+        return $this->setMethod($arglist[1]);
       case 'VERSION':
-        return $this->setVersion( $arglist[1] );
+        return $this->setVersion($arglist[1]);
       default:
-        if( !isset( $arglist[1] )) $arglist[1] = null;
-        if( !isset( $arglist[2] )) $arglist[2] = null;
-        return $this->setXprop( $arglist[0], $arglist[1], $arglist[2] );
+        if (!isset($arglist[1])) $arglist[1] = null;
+        if (!isset($arglist[2])) $arglist[2] = null;
+        return $this->setXprop($arglist[0], $arglist[1], $arglist[2]);
     }
     return FALSE;
   }
@@ -482,23 +482,23 @@ 
  * @param string $config
  * @return value
  */
-  function getConfig( $config ) {
-    switch( strtoupper( $config )) {
+  function getConfig($config) {
+    switch (strtoupper($config)) {
       case 'ALLOWEMPTY':
         return $this->allowEmpty;
         break;
       case 'COMPSINFO':
-        unset( $this->compix );
+        unset($this->compix);
         $info = array();
-        foreach( $this->components as $cix => $component ) {
-          if( empty( $component )) continue;
-          unset( $component->propix );
+        foreach ($this->components as $cix => $component) {
+          if (empty($component)) continue;
+          unset($component->propix);
           $info[$cix]['ordno'] = $cix + 1;
           $info[$cix]['type']  = $component->objName;
-          $info[$cix]['uid']   = $component->getProperty( 'uid' );
-          $info[$cix]['props'] = $component->getConfig( 'propinfo' );
-          $info[$cix]['sub']   = $component->getConfig( 'compsinfo' );
-          unset( $component->propix );
+          $info[$cix]['uid']   = $component->getProperty('uid');
+          $info[$cix]['props'] = $component->getConfig('propinfo');
+          $info[$cix]['sub']   = $component->getConfig('compsinfo');
+          unset($component->propix);
         }
         return $info;
         break;
@@ -506,32 +506,32 @@ 
         return $this->delimiter;
         break;
       case 'DIRECTORY':
-        if( empty( $this->directory ))
+        if (empty($this->directory))
           $this->directory = '.';
         return $this->directory;
         break;
       case 'DIRFILE':
-        return $this->getConfig( 'directory' ).$this->getConfig( 'delimiter' ).$this->getConfig( 'filename' );
+        return $this->getConfig('directory').$this->getConfig('delimiter').$this->getConfig('filename');
         break;
       case 'FILEINFO':
-        return array( $this->getConfig( 'directory' )
-                    , $this->getConfig( 'filename' )
-                    , $this->getConfig( 'filesize' ));
+        return array($this->getConfig('directory')
+                    , $this->getConfig('filename')
+                    , $this->getConfig('filesize'));
         break;
       case 'FILENAME':
-        if( empty( $this->filename )) {
-          if( 'xcal' == $this->format )
-            $this->filename = date( 'YmdHis' ).'.xml'; // recommended xcs.. .
+        if (empty($this->filename)) {
+          if ('xcal' == $this->format)
+            $this->filename = date('YmdHis').'.xml'; // recommended xcs.. .
           else
-            $this->filename = date( 'YmdHis' ).'.ics';
+            $this->filename = date('YmdHis').'.ics';
         }
         return $this->filename;
         break;
       case 'FILESIZE':
-        $size    = 0;
-        if( empty( $this->url )) {
-          $dirfile = $this->getConfig( 'dirfile' );
-          if( FALSE === ( $size = filesize( $dirfile )))
+        $size = 0;
+        if (empty($this->url)) {
+          $dirfile = $this->getConfig('dirfile');
+          if (FALSE === ($size = filesize($dirfile)))
             $size = 0;
           clearstatcache();
         }
@@ -552,7 +552,7 @@ 
         return $this->unique_id;
         break;
       case 'URL':
-        if( !empty( $this->url ))
+        if (!empty($this->url))
           return $this->url;
         else
           return FALSE;
@@ -568,12 +568,12 @@ 
  * @param string $value
  * @return void
  */
-  function setConfig( $config, $value ) {
+  function setConfig($config, $value) {
     $res = FALSE;
-    switch( strtoupper( $config )) {
+    switch (strtoupper($config)) {
       case 'ALLOWEMPTY':
         $this->allowEmpty = $value;
-        $subcfg  = array( 'ALLOWEMPTY' => $value );
+        $subcfg = array('ALLOWEMPTY' => $value);
         $res = TRUE;
         break;
       case 'DELIMITER':
@@ -581,11 +581,11 @@ 
         return TRUE;
         break;
       case 'DIRECTORY':
-        $value   = trim( $value );
+        $value   = trim($value);
         $nl      = $this->getConfig('delimiter');
-        if( $nl == substr( $value, ( 0 - strlen( $nl ))))
-          $value = substr( $value, 0, ( strlen( $value ) - strlen( $nl )));
-        if( is_dir( $value )) {
+        if ($nl == substr($value, (0 - strlen($nl))))
+          $value = substr($value, 0, (strlen($value) - strlen($nl)));
+        if (is_dir($value)) {
             /* local directory */
           clearstatcache();
           $this->directory = $value;
@@ -596,16 +596,16 @@ 
           return FALSE;
         break;
       case 'FILENAME':
-        $value   = trim( $value );
-        if( !empty( $this->url )) {
+        $value = trim($value);
+        if (!empty($this->url)) {
             /* remote directory+file - URL */
           $this->filename = $value;
           return TRUE;
         }
-        $dirfile = $this->getConfig( 'directory' ).$this->getConfig( 'delimiter' ).$value;
-        if( file_exists( $dirfile )) {
+        $dirfile = $this->getConfig('directory').$this->getConfig('delimiter').$value;
+        if (file_exists($dirfile)) {
             /* local existing file */
-          if( is_readable( $dirfile ) || is_writable( $dirfile )) {
+          if (is_readable($dirfile) || is_writable($dirfile)) {
             clearstatcache();
             $this->filename = $value;
             return TRUE;
@@ -613,7 +613,7 @@ 
           else
             return FALSE;
         }
-        elseif( FALSE !== touch( $dirfile )) {
+        elseif (FALSE !== touch($dirfile)) {
             /* new local file created */
           $this->filename = $value;
           return TRUE;
@@ -622,8 +622,8 @@ 
           return FALSE;
         break;
       case 'FORMAT':
-        $value   = trim( $value );
-        if( 'xcal' == strtolower( $value )) {
+        $value = trim($value);
+        if ('xcal' == strtolower($value)) {
           $this->format             = 'xcal';
           $this->attributeDelimiter = $this->nl;
           $this->valueInit          = null;
@@ -633,46 +633,46 @@ 
           $this->attributeDelimiter = ';';
           $this->valueInit          = ':';
         }
-        $subcfg  = array( 'FORMAT' => $value );
+        $subcfg = array('FORMAT' => $value);
         $res = TRUE;
         break;
       case 'LANGUAGE':
          // set language for calendar component as defined in [RFC 1766]
-        $value   = trim( $value );
+        $value   = trim($value);
         $this->language = $value;
-        $subcfg  = array( 'LANGUAGE' => $value );
+        $subcfg  = array('LANGUAGE' => $value);
         $res = TRUE;
         break;
       case 'NL':
       case 'NEWLINECHAR':
         $this->nl = $value;
-        $subcfg  = array( 'NL' => $value );
+        $subcfg = array('NL' => $value);
         $res = TRUE;
         break;
       case 'UNIQUE_ID':
-        $value   = trim( $value );
+        $value   = trim($value);
         $this->unique_id = $value;
-        $subcfg  = array( 'UNIQUE_ID' => $value );
+        $subcfg  = array('UNIQUE_ID' => $value);
         $res = TRUE;
         break;
       case 'URL':
             /* remote file - URL */
-        $value     = trim( $value );
-        $value     = str_replace( 'HTTP://',   'http://', $value );
-        $value     = str_replace( 'WEBCAL://', 'http://', $value );
-        $value     = str_replace( 'webcal://', 'http://', $value );
+        $value     = trim($value);
+        $value     = str_replace('HTTP://', 'http://', $value);
+        $value     = str_replace('WEBCAL://', 'http://', $value);
+        $value     = str_replace('webcal://', 'http://', $value);
         $this->url = $value;
         $this->directory = null;
-        $parts     = pathinfo( $value );
-        return $this->setConfig( 'filename',  $parts['basename'] );
+        $parts     = pathinfo($value);
+        return $this->setConfig('filename', $parts['basename']);
         break;
     }
-    if( !$res ) return FALSE;
-    if( isset( $subcfg ) && !empty( $this->components )) {
-      foreach( $subcfg as $cfgkey => $cfgvalue ) {
-        foreach( $this->components as $cix => $component ) {
-          $res = $component->setConfig( $cfgkey, $cfgvalue );
-          if( !$res )
+    if (!$res) return FALSE;
+    if (isset($subcfg) && !empty($this->components)) {
+      foreach ($subcfg as $cfgkey => $cfgvalue) {
+        foreach ($this->components as $cix => $component) {
+          $res = $component->setConfig($cfgkey, $cfgvalue);
+          if (!$res)
             break 2;
           $this->components[$cix] = $component->copy(); // PHP4 compliant
         }
@@ -691,8 +691,8 @@ 
  * @param object $component calendar component
  * @return void
  */
-  function addComponent( $component ) {
-    $this->setComponent( $component );
+  function addComponent($component) {
+    $this->setComponent($component);
   }
 /**
  * delete calendar component from container
@@ -703,33 +703,33 @@ 
  * @param mixed $arg2 optional, ordno if arg1 = component type
  * @return void
  */
-  function deleteComponent( $arg1, $arg2=FALSE  ) {
+  function deleteComponent($arg1, $arg2 = FALSE) {
     $argType = $index = null;
-    if ( ctype_digit( (string) $arg1 )) {
+    if (ctype_digit((string) $arg1)) {
       $argType = 'INDEX';
       $index   = (int) $arg1 - 1;
     }
-    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
-      $argType = strtolower( $arg1 );
-      $index   = ( !empty( $arg2 ) && ctype_digit( (string) $arg2 )) ? (( int ) $arg2 - 1 ) : 0;
+    elseif ((strlen($arg1) <= strlen('vfreebusy')) && (FALSE === strpos($arg1, '@'))) {
+      $argType = strtolower($arg1);
+      $index   = (!empty($arg2) && ctype_digit((string) $arg2)) ? ((int) $arg2 - 1) : 0;
     }
     $cix1dC = 0;
-    foreach ( $this->components as $cix => $component) {
-      if( empty( $component )) continue;
-      unset( $component->propix );
-      if(( 'INDEX' == $argType ) && ( $index == $cix )) {
-        unset( $this->components[$cix] );
+    foreach ($this->components as $cix => $component) {
+      if (empty($component)) continue;
+      unset($component->propix);
+      if (('INDEX' == $argType) && ($index == $cix)) {
+        unset($this->components[$cix]);
         return TRUE;
       }
-      elseif( $argType == $component->objName ) {
-        if( $index == $cix1dC ) {
-          unset( $this->components[$cix] );
+      elseif ($argType == $component->objName) {
+        if ($index == $cix1dC) {
+          unset($this->components[$cix]);
           return TRUE;
         }
         $cix1dC++;
       }
-      elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
-        unset( $this->components[$cix] );
+      elseif (!$argType && ($arg1 == $component->getProperty('uid'))) {
+        unset($this->components[$cix]);
         return TRUE;
       }
     }
@@ -744,49 +744,49 @@ 
  * @param mixed $arg2 optional, ordno if arg1 = component type
  * @return object
  */
-  function getComponent( $arg1=FALSE, $arg2=FALSE ) {
+  function getComponent($arg1 = FALSE, $arg2 = FALSE) {
     $index = $argType = null;
-    if ( !$arg1 ) {
+    if (!$arg1) {
       $argType = 'INDEX';
       $index   = $this->compix['INDEX'] =
-        ( isset( $this->compix['INDEX'] )) ? $this->compix['INDEX'] + 1 : 1;
+        (isset($this->compix['INDEX'])) ? $this->compix['INDEX'] + 1 : 1;
     }
-    elseif ( ctype_digit( (string) $arg1 )) {
+    elseif (ctype_digit((string) $arg1)) {
       $argType = 'INDEX';
       $index   = (int) $arg1;
-      unset( $this->compix );
+      unset($this->compix);
     }
-    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
-      unset( $this->compix['INDEX'] );
-      $argType = strtolower( $arg1 );
-      if( !$arg2 )
+    elseif ((strlen($arg1) <= strlen('vfreebusy')) && (FALSE === strpos($arg1, '@'))) {
+      unset($this->compix['INDEX']);
+      $argType = strtolower($arg1);
+      if (!$arg2)
         $index = $this->compix[$argType] =
-        ( isset( $this->compix[$argType] )) ? $this->compix[$argType] + 1 : 1;
+        (isset($this->compix[$argType])) ? $this->compix[$argType] + 1 : 1;
       else
         $index = (int) $arg2;
     }
-    $index  -= 1;
-    $ckeys =  array_keys( $this->components );
-    if( !empty( $index) && ( $index > end(  $ckeys )))
+    $index -= 1;
+    $ckeys = array_keys($this->components);
+    if (!empty($index) && ($index > end($ckeys)))
       return FALSE;
     $cix1gC = 0;
-    foreach ( $this->components as $cix => $component) {
-      if( empty( $component )) continue;
-      unset( $component->propix );
-      if(( 'INDEX' == $argType ) && ( $index == $cix ))
+    foreach ($this->components as $cix => $component) {
+      if (empty($component)) continue;
+      unset($component->propix);
+      if (('INDEX' == $argType) && ($index == $cix))
         return $component->copy();
-      elseif( $argType == $component->objName ) {
-         if( $index == $cix1gC )
+      elseif ($argType == $component->objName) {
+         if ($index == $cix1gC)
            return $component->copy();
          $cix1gC++;
       }
-      elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
-        unset( $component->propix );
+      elseif (!$argType && ($arg1 == $component->getProperty('uid'))) {
+        unset($component->propix);
         return $component->copy();
       }
     }
             /* not found.. . */
-    unset( $this->compix );
+    unset($this->compix);
     return FALSE;
   }
 /**
@@ -813,242 +813,242 @@ 
  *                               FALSE - one occurance of component only in output array</tr>
  * @return array or FALSE
  */
-  function selectComponents( $startY=FALSE, $startM=FALSE, $startD=FALSE, $endY=FALSE, $endM=FALSE, $endD=FALSE, $cType=FALSE, $flat=FALSE, $any=TRUE, $split=TRUE ) {
+  function selectComponents($startY = FALSE, $startM = FALSE, $startD = FALSE, $endY = FALSE, $endM = FALSE, $endD = FALSE, $cType = FALSE, $flat = FALSE, $any = TRUE, $split = TRUE) {
             /* check  if empty calendar */
-    if( 0 >= count( $this->components )) return FALSE;
+    if (0 >= count($this->components)) return FALSE;
             /* check default dates */
-    if( !$startY ) $startY = date( 'Y' );
-    if( !$startM ) $startM = date( 'm' );
-    if( !$startD ) $startD = date( 'd' );
-    $startDate = mktime( 0, 0, 0, $startM, $startD, $startY );
-    if( !$endY )   $endY   = $startY;
-    if( !$endM )   $endM   = $startM;
-    if( !$endD )   $endD   = $startD;
-    $endDate   = mktime( 23, 59, 59, $endM, $endD, $endY );
+    if (!$startY) $startY = date('Y');
+    if (!$startM) $startM = date('m');
+    if (!$startD) $startD = date('d');
+    $startDate = mktime(0, 0, 0, $startM, $startD, $startY);
+    if (!$endY)   $endY   = $startY;
+    if (!$endM)   $endM   = $startM;
+    if (!$endD)   $endD   = $startD;
+    $endDate = mktime(23, 59, 59, $endM, $endD, $endY);
             /* check component types */
-    $validTypes = array('vevent', 'vtodo', 'vjournal', 'vfreebusy' );
-    if( is_array( $cType )) {
-      foreach( $cType as $cix => $theType ) {
-        $cType[$cix] = $theType = strtolower( $theType );
-        if( !in_array( $theType, $validTypes ))
+    $validTypes = array('vevent', 'vtodo', 'vjournal', 'vfreebusy');
+    if (is_array($cType)) {
+      foreach ($cType as $cix => $theType) {
+        $cType[$cix] = $theType = strtolower($theType);
+        if (!in_array($theType, $validTypes))
           $cType[$cix] = 'vevent';
       }
-      $cType = array_unique( $cType );
+      $cType = array_unique($cType);
     }
-    elseif( !empty( $cType )) {
-      $cType = strtolower( $cType );
-      if( !in_array( $cType, $validTypes ))
-        $cType = array( 'vevent' );
+    elseif (!empty($cType)) {
+      $cType = strtolower($cType);
+      if (!in_array($cType, $validTypes))
+        $cType = array('vevent');
       else
-        $cType = array( $cType );
+        $cType = array($cType);
     }
     else
       $cType = $validTypes;
-    if( 0 >= count( $cType ))
+    if (0 >= count($cType))
       $cType = $validTypes;
             /* iterate components */
     $result = array();
-    foreach ( $this->components as $cix => $component ) {
-      if( empty( $component )) continue;
-      unset( $component->propix, $start );
+    foreach ($this->components as $cix => $component) {
+      if (empty($component)) continue;
+      unset($component->propix, $start);
             /* deselect unvalid type components */
-      if( !in_array( $component->objName, $cType )) continue;
+      if (!in_array($component->objName, $cType)) continue;
             /* deselect components without dtstart set */
-      if( FALSE === ( $start = $component->getProperty( 'dtstart' ))) continue;
+      if (FALSE === ($start = $component->getProperty('dtstart'))) continue;
       $dtendExist = $dueExist = $durationExist = $endAllDayEvent = FALSE;
-      unset( $end, $startWdate, $endWdate, $rdurWsecs, $rdur, $exdatelist, $workstart, $workend ); // clean up
-      $startWdate = $component->_date2timestamp( $start );
-      $startDateFormat = ( isset( $start['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d';
+      unset($end, $startWdate, $endWdate, $rdurWsecs, $rdur, $exdatelist, $workstart, $workend); // clean up
+      $startWdate = $component->_date2timestamp($start);
+      $startDateFormat = (isset($start['hour'])) ? 'Y-m-d H:i:s' : 'Y-m-d';
             /* get end date from dtend/due/duration properties */
-      $end = $component->getProperty( 'dtend' );
-      if( !empty( $end )) {
+      $end = $component->getProperty('dtend');
+      if (!empty($end)) {
         $dtendExist = TRUE;
-        $endDateFormat = ( isset( $end['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d';
+        $endDateFormat = (isset($end['hour'])) ? 'Y-m-d H:i:s' : 'Y-m-d';
       }
    // if( !empty($end))  echo 'selectComp 1 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
-      if( empty($end) && ( $component->objName == 'vtodo' )) {
-        $end = $component->getProperty( 'due' );
-        if( !empty( $end )) {
+      if (empty($end) && ($component->objName == 'vtodo')) {
+        $end = $component->getProperty('due');
+        if (!empty($end)) {
           $dueExist = TRUE;
-          $endDateFormat = ( isset( $end['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d';
+          $endDateFormat = (isset($end['hour'])) ? 'Y-m-d H:i:s' : 'Y-m-d';
         }
    // if( !empty($end))  echo 'selectComp 2 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
       }
-      if( !empty( $end ) && !isset( $end['hour'] )) {
+      if (!empty($end) && !isset($end['hour'])) {
           /* a DTEND without time part regards an event that ends the day before,
              for an all-day event DTSTART=20071201 DTEND=20071202 (taking place 20071201!!! */
         $endAllDayEvent = TRUE;
-        $endWdate = mktime( 23, 59, 59, $end['month'], ($end['day'] - 1), $end['year'] );
-        $end['year']  = date( 'Y', $endWdate );
-        $end['month'] = date( 'm', $endWdate );
-        $end['day']   = date( 'd', $endWdate );
+        $endWdate = mktime(23, 59, 59, $end['month'], ($end['day'] - 1), $end['year']);
+        $end['year']  = date('Y', $endWdate);
+        $end['month'] = date('m', $endWdate);
+        $end['day']   = date('d', $endWdate);
         $end['hour']  = 23;
         $end['min']   = $end['sec'] = 59;
    // if( !empty($end))  echo 'selectComp 3 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
       }
-      if( empty( $end )) {
-        $end = $component->getProperty( 'duration', FALSE, FALSE, TRUE );// in dtend (array) format
-        if( !empty( $end ))
+      if (empty($end)) {
+        $end = $component->getProperty('duration', FALSE, FALSE, TRUE); // in dtend (array) format
+        if (!empty($end))
           $durationExist = TRUE;
    // if( !empty($end))  echo 'selectComp 4 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
       }
-      if( empty( $end )) { // assume one day duration if missing end date
-        $end = array( 'year' => $start['year'], 'month' => $start['month'], 'day' => $start['day'], 'hour' => 23, 'min' => 59, 'sec' => 59 );
+      if (empty($end)) { // assume one day duration if missing end date
+        $end = array('year' => $start['year'], 'month' => $start['month'], 'day' => $start['day'], 'hour' => 23, 'min' => 59, 'sec' => 59);
    // if( isset($end))  echo 'selectComp 5 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
       }
-      $endWdate = $component->_date2timestamp( $end );
-      if( $endWdate < $startWdate ) { // MUST be after start date!!
-        $end = array( 'year' => $start['year'], 'month' => $start['month'], 'day' => $start['day'], 'hour' => 23, 'min' => 59, 'sec' => 59 );
-        $endWdate = $component->_date2timestamp( $end );
+      $endWdate = $component->_date2timestamp($end);
+      if ($endWdate < $startWdate) { // MUST be after start date!!
+        $end = array('year' => $start['year'], 'month' => $start['month'], 'day' => $start['day'], 'hour' => 23, 'min' => 59, 'sec' => 59);
+        $endWdate = $component->_date2timestamp($end);
       }
       $rdurWsecs  = $endWdate - $startWdate; // compute component duration in seconds
-      $rdur       = $component->_date2duration( $start, $end ); // compute component duration, array
+      $rdur       = $component->_date2duration($start, $end); // compute component duration, array
             /* make a list of optional exclude dates for component occurence from exrule and exdate */
       $exdatelist = array();
-      $workstart  = $component->_timestamp2date(( $startDate - $rdurWsecs ), 6);
-      $workend    = $component->_timestamp2date(( $endDate + $rdurWsecs ), 6);
-      while( FALSE !== ( $exrule = $component->getProperty( 'exrule' )))    // check exrule
-        $component->_recur2date( $exdatelist, $exrule, $start, $workstart, $workend );
-      while( FALSE !== ( $exdate = $component->getProperty( 'exdate' ))) {  // check exdate
-        foreach( $exdate as $theExdate ) {
-          $exWdate = $component->_date2timestamp( $theExdate );
-          if((( $startDate - $rdurWsecs ) <= $exWdate ) && ( $endDate >= $exWdate ))
+      $workstart  = $component->_timestamp2date(($startDate - $rdurWsecs), 6);
+      $workend    = $component->_timestamp2date(($endDate + $rdurWsecs), 6);
+      while (FALSE !== ($exrule = $component->getProperty('exrule')))    // check exrule
+        $component->_recur2date($exdatelist, $exrule, $start, $workstart, $workend);
+      while (FALSE !== ($exdate = $component->getProperty('exdate'))) {  // check exdate
+        foreach ($exdate as $theExdate) {
+          $exWdate = $component->_date2timestamp($theExdate);
+          if ((($startDate - $rdurWsecs) <= $exWdate) && ($endDate >= $exWdate))
             $exdatelist[$exWdate] = TRUE;
         }
       }
             /* if 'any' components, check repeating components, removing all excluding dates */
-      if( TRUE === $any ) {
+      if (TRUE === $any) {
             /* make a list of optional repeating dates for component occurence, rrule, rdate */
         $recurlist = array();
-        while( FALSE !== ( $rrule = $component->getProperty( 'rrule' )))    // check rrule
-          $component->_recur2date( $recurlist, $rrule, $start, $workstart, $workend );
-        foreach( $recurlist as $recurkey => $recurvalue ) // key=match date as timestamp
+        while (FALSE !== ($rrule = $component->getProperty('rrule')))    // check rrule
+          $component->_recur2date($recurlist, $rrule, $start, $workstart, $workend);
+        foreach ($recurlist as $recurkey => $recurvalue) // key=match date as timestamp
           $recurlist[$recurkey] = $rdurWsecs; // add duration in seconds
-        while( FALSE !== ( $rdate = $component->getProperty( 'rdate' ))) {  // check rdate
-          foreach( $rdate as $theRdate ) {
-            if( is_array( $theRdate ) && ( 2 == count( $theRdate )) &&  // all days within PERIOD
-                   array_key_exists( '0', $theRdate ) &&  array_key_exists( '1', $theRdate )) {
-              $rstart = $component->_date2timestamp( $theRdate[0] );
-              if(( $rstart < ( $startDate - $rdurWsecs )) || ( $rstart > $endDate ))
+        while (FALSE !== ($rdate = $component->getProperty('rdate'))) {  // check rdate
+          foreach ($rdate as $theRdate) {
+            if (is_array($theRdate) && (2 == count($theRdate)) && // all days within PERIOD
+                   array_key_exists('0', $theRdate) && array_key_exists('1', $theRdate)) {
+              $rstart = $component->_date2timestamp($theRdate[0]);
+              if (($rstart < ($startDate - $rdurWsecs)) || ($rstart > $endDate))
                 continue;
-              if( isset( $theRdate[1]['year'] )) // date-date period
-                $rend = $component->_date2timestamp( $theRdate[1] );
+              if (isset($theRdate[1]['year'])) // date-date period
+                $rend = $component->_date2timestamp($theRdate[1]);
               else {                             // date-duration period
-                $rend = $component->duration2date( $theRdate[0], $theRdate[1] );
-                $rend = $component->_date2timestamp( $rend );
+                $rend = $component->duration2date($theRdate[0], $theRdate[1]);
+                $rend = $component->_date2timestamp($rend);
               }
-              if((( $startDate - $rdurWsecs ) <= $rstart ) && ( $endDate >= $rstart ))
-                $recurlist[$rstart] = ( $rstart - $rend ); // set start date + rdate duration in seconds
+              if ((($startDate - $rdurWsecs) <= $rstart) && ($endDate >= $rstart))
+                $recurlist[$rstart] = ($rstart - $rend); // set start date + rdate duration in seconds
             } // PERIOD end
             else { // single date
-              $theRdate = $component->_date2timestamp( $theRdate );
-              if((( $startDate - $rdurWsecs ) <= $theRdate ) && ( $endDate >= $theRdate ))
+              $theRdate = $component->_date2timestamp($theRdate);
+              if ((($startDate - $rdurWsecs) <= $theRdate) && ($endDate >= $theRdate))
                 $recurlist[$theRdate] = $rdurWsecs; // set start date + event duration in seconds
             }
           }
         }
-        if( 0 < count( $recurlist )) {
-          ksort( $recurlist );
-          foreach( $recurlist as $recurkey => $durvalue ) {
-            if((( $startDate - $rdurWsecs ) > $recurkey ) || ( $endDate < $recurkey )) // not within period
+        if (0 < count($recurlist)) {
+          ksort($recurlist);
+          foreach ($recurlist as $recurkey => $durvalue) {
+            if ((($startDate - $rdurWsecs) > $recurkey) || ($endDate < $recurkey)) // not within period
               continue;
-            if( isset( $exdatelist[$recurkey] )) // check excluded dates
+            if (isset($exdatelist[$recurkey])) // check excluded dates
               continue;
-            if( $startWdate >= $recurkey ) // exclude component start date
+            if ($startWdate >= $recurkey) // exclude component start date
               continue;
             $component2   = $component->copy();
-            $rstart       = $component2->_timestamp2date( $recurkey, 6);
+            $rstart       = $component2->_timestamp2date($recurkey, 6);
             $datevalue    = $rstart['month'].'/'.$rstart['day'].'/'.$rstart['year'];
-            if( isset( $start['hour'] ) || isset( $start['min'] ) || isset( $start['sec'] )) {
-              $datevalue .= ( isset( $rstart['hour'] )) ? ' '.$rstart['hour'] : ' 00';
-              $datevalue .= ( isset( $rstart['min'] ))  ? ':'.$rstart['min']  : ':00';
-              $datevalue .= ( isset( $rstart['sec'] ))  ? ':'.$rstart['sec']  : ':00';
+            if (isset($start['hour']) || isset($start['min']) || isset($start['sec'])) {
+              $datevalue .= (isset($rstart['hour'])) ? ' '.$rstart['hour'] : ' 00';
+              $datevalue .= (isset($rstart['min'])) ? ':'.$rstart['min'] : ':00';
+              $datevalue .= (isset($rstart['sec'])) ? ':'.$rstart['sec'] : ':00';
             }
-            $datestring = date( $startDateFormat, strtotime( $datevalue ));
-            if( isset( $start['tz'] ))
+            $datestring = date($startDateFormat, strtotime($datevalue));
+            if (isset($start['tz']))
               $datestring .= ' '.$start['tz'];
-            $component2->setProperty( 'X-CURRENT-DTSTART', $datestring );
-            $rend   = $component2->_timestamp2date(( $recurkey + $durvalue ), 6);
-            if( $dtendExist || $dueExist ) {
-              if( $endAllDayEvent ) {
-                $rend2 = mktime( 0, 0, 0, $rend['month'], ($rend['day'] + 1), $rend['year'] );
-                $datevalue  = date( 'm', $rend2 ).'/'.date( 'd', $rend2 ).'/'.date( 'Y', $rend2 );
+            $component2->setProperty('X-CURRENT-DTSTART', $datestring);
+            $rend = $component2->_timestamp2date(($recurkey + $durvalue), 6);
+            if ($dtendExist || $dueExist) {
+              if ($endAllDayEvent) {
+                $rend2 = mktime(0, 0, 0, $rend['month'], ($rend['day'] + 1), $rend['year']);
+                $datevalue  = date('m', $rend2).'/'.date('d', $rend2).'/'.date('Y', $rend2);
               }
               else {
                 $datevalue  = $rend['month'].'/'.$rend['day'].'/'.$rend['year'];
-                if( isset( $end['hour'] ) || isset( $end['min'] ) || isset( $end['sec'] )) {
-                  $datevalue .= ( isset( $rend['hour'] )) ? ' '.$rend['hour'] : ' 00';
-                  $datevalue .= ( isset( $rend['min'] ))  ? ':'.$rend['min']  : ':00';
-                  $datevalue .= ( isset( $rend['sec'] ))  ? ':'.$rend['sec']  : ':00';
+                if (isset($end['hour']) || isset($end['min']) || isset($end['sec'])) {
+                  $datevalue .= (isset($rend['hour'])) ? ' '.$rend['hour'] : ' 00';
+                  $datevalue .= (isset($rend['min'])) ? ':'.$rend['min'] : ':00';
+                  $datevalue .= (isset($rend['sec'])) ? ':'.$rend['sec'] : ':00';
                 }
               }
-              $datestring = date( $endDateFormat, strtotime( $datevalue ));
-              if( isset( $end['tz'] ))
+              $datestring = date($endDateFormat, strtotime($datevalue));
+              if (isset($end['tz']))
                 $datestring .= ' '.$end['tz'];
-              if( $dtendExist )
-                $component2->setProperty( 'X-CURRENT-DTEND', $datestring );
-              elseif( $dueExist )
-                $component2->setProperty( 'X-CURRENT-DUE', $datestring );
+              if ($dtendExist)
+                $component2->setProperty('X-CURRENT-DTEND', $datestring);
+              elseif ($dueExist)
+                $component2->setProperty('X-CURRENT-DUE', $datestring);
             }
-            $rend   = $component2->_date2timestamp( $rend );
+            $rend   = $component2->_date2timestamp($rend);
             $rstart = $recurkey;
             /* add repeating components within valid dates to output array, only start date */
-            if( $flat )
+            if ($flat)
               $result[] = $component2->copy(); // copy to output
-            elseif( $split ) {
-              if( $rend > $endDate )
+            elseif ($split) {
+              if ($rend > $endDate)
                 $rend = $endDate;
-              while( $rstart <= $rend ) { // iterate
-                $wd = getdate( $rstart );
-                if(( $rstart > $startDate ) &&      // date after dtstart
-                    !isset( $exdatelist[$rstart] )) // check exclude date
+              while ($rstart <= $rend) { // iterate
+                $wd = getdate($rstart);
+                if (($rstart > $startDate) && // date after dtstart
+                    !isset($exdatelist[$rstart])) // check exclude date
                   $result[$wd['year']][$wd['mon']][$wd['mday']][] = $component2->copy(); // copy to output
-                $rstart += ( 24*60*60 ); // step one day
+                $rstart += (24 * 60 * 60); // step one day
               }
             }
-            elseif(( $rstart >= $startDate ) &&     // date within period
-                  !isset( $exdatelist[$rstart] )) { // check exclude date
-              $wd = getdate( $rstart );
+            elseif (($rstart >= $startDate) && // date within period
+                  !isset($exdatelist[$rstart])) { // check exclude date
+              $wd = getdate($rstart);
               $result[$wd['year']][$wd['mon']][$wd['mday']][] = $component2->copy(); // copy to output
             }
           }
         }
             /* deselect components with startdate/enddate not within period */
-        if(( $endWdate < $startDate ) || ( $startWdate > $endDate )) continue;
+        if (($endWdate < $startDate) || ($startWdate > $endDate)) continue;
       }
             /* deselect components with startdate not within period */
-      elseif(( $startWdate < $startDate ) || ( $startWdate > $endDate )) continue;
+      elseif (($startWdate < $startDate) || ($startWdate > $endDate)) continue;
             /* add selected components within valid dates to output array */
-      if( $flat )
+      if ($flat)
         $result[] = $component->copy(); // copy to output;
-      elseif( $split ) {
-        if( $endWdate > $endDate )
-          $endWdate = $endDate;     // use period end date
-        if( !isset( $exdatelist[$startWdate] ))  { // check excluded dates
-          if( $startWdate < $startDate )
+      elseif ($split) {
+        if ($endWdate > $endDate)
+          $endWdate = $endDate; // use period end date
+        if (!isset($exdatelist[$startWdate])) { // check excluded dates
+          if ($startWdate < $startDate)
             $startWdate = $startDate; // use period start date
-          while( $startWdate <= $endWdate ) { // iterate
-            $wd = getdate( $startWdate );
+          while ($startWdate <= $endWdate) { // iterate
+            $wd = getdate($startWdate);
             $result[$wd['year']][$wd['mon']][$wd['mday']][] = $component->copy(); // copy to output
-            $startWdate += ( 24*60*60 ); // step one day
+            $startWdate += (24 * 60 * 60); // step one day
           }
         }
       } // use component date
-      elseif( !isset( $exdatelist[$startWdate] ) &&   // check excluded dates
-            ( $startWdate >= $startDate )) {          // within period
-        $wd = getdate( $startWdate );
+      elseif (!isset($exdatelist[$startWdate]) && // check excluded dates
+            ($startWdate >= $startDate)) {          // within period
+        $wd = getdate($startWdate);
         $result[$wd['year']][$wd['mon']][$wd['mday']][] = $component->copy(); // copy to output
       }
     }
-    if( 0 >= count( $result )) return FALSE;
-    elseif( !$flat ) {
-      foreach( $result as $y => $yeararr ) {
-        foreach( $yeararr as $m => $montharr ) {
-          ksort( $result[$y][$m] );
+    if (0 >= count($result)) return FALSE;
+    elseif (!$flat) {
+      foreach ($result as $y => $yeararr) {
+        foreach ($yeararr as $m => $montharr) {
+          ksort($result[$y][$m]);
         }
-        ksort( $result[$y] );
+        ksort($result[$y]);
       }
-      ksort( $result );
+      ksort($result);
     }
     return $result;
   }
@@ -1062,48 +1062,48 @@ 
  * @param mixed $arg2 optional, ordno if arg1 = component type
  * @return void
  */
-  function setComponent( $component, $arg1=FALSE, $arg2=FALSE  ) {
-    if( '' >= $component->getConfig( 'language'))
-      $component->setConfig( 'language',  $this->getConfig( 'language' ));
-    $component->setConfig( 'allowEmpty',  $this->getConfig( 'allowEmpty' ));
-    $component->setConfig( 'nl',          $this->getConfig( 'nl' ));
-    $component->setConfig( 'unique_id',   $this->getConfig( 'unique_id' ));
-    $component->setConfig( 'format',      $this->getConfig( 'format' ));
-    if( !in_array( $component->objName, array( 'valarm', 'vtimezone' ))) {
-      unset( $component->propix );
+  function setComponent($component, $arg1 = FALSE, $arg2 = FALSE) {
+    if ('' >= $component->getConfig('language'))
+      $component->setConfig('language', $this->getConfig('language'));
+    $component->setConfig('allowEmpty', $this->getConfig('allowEmpty'));
+    $component->setConfig('nl', $this->getConfig('nl'));
+    $component->setConfig('unique_id', $this->getConfig('unique_id'));
+    $component->setConfig('format', $this->getConfig('format'));
+    if (!in_array($component->objName, array('valarm', 'vtimezone'))) {
+      unset($component->propix);
             /* make sure dtstamp and uid is set */
-      $dummy1 = $component->getProperty( 'dtstamp' );
-      $dummy2 = $component->getProperty( 'uid' );
+      $dummy1 = $component->getProperty('dtstamp');
+      $dummy2 = $component->getProperty('uid');
     }
-    if( !$arg1 ) {
+    if (!$arg1) {
       $this->components[] = $component->copy();
       return TRUE;
     }
     $argType = $index = null;
-    if ( ctype_digit( (string) $arg1 )) {
+    if (ctype_digit((string) $arg1)) {
       $argType = 'INDEX';
       $index   = (int) $arg1 - 1;
     }
-    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
-      $argType = strtolower( $arg1 );
-      $index = ( ctype_digit( (string) $arg2 )) ? ((int) $arg2) - 1 : 0;
+    elseif ((strlen($arg1) <= strlen('vfreebusy')) && (FALSE === strpos($arg1, '@'))) {
+      $argType = strtolower($arg1);
+      $index = (ctype_digit((string) $arg2)) ? ((int) $arg2) - 1 : 0;
     }
     $cix1sC = 0;
-    foreach ( $this->components as $cix => $component2) {
-      if( empty( $component2 )) continue;
-      unset( $component2->propix );
-      if(( 'INDEX' == $argType ) && ( $index == $cix )) {
+    foreach ($this->components as $cix => $component2) {
+      if (empty($component2)) continue;
+      unset($component2->propix);
+      if (('INDEX' == $argType) && ($index == $cix)) {
         $this->components[$cix] = $component->copy();
         return TRUE;
       }
-      elseif( $argType == $component2->objName ) {
-        if( $index == $cix1sC ) {
+      elseif ($argType == $component2->objName) {
+        if ($index == $cix1sC) {
           $this->components[$cix] = $component->copy();
           return TRUE;
         }
         $cix1sC++;
       }
-      elseif( !$argType && ( $arg1 == $component2->getProperty( 'uid' ))) {
+      elseif (!$argType && ($arg1 == $component2->getProperty('uid'))) {
         $this->components[$cix] = $component->copy();
         return TRUE;
       }
@@ -1124,79 +1124,79 @@ 
  *
  */
   function sort() {
-    if( is_array( $this->components )) {
-      $this->_sortkeys = array( 'year', 'month', 'day', 'hour', 'min', 'sec' );
-      usort( $this->components, array( $this, '_cmpfcn' ));
-    }
-  }
-  function _cmpfcn( $a, $b ) {
-    if( empty( $a ))                                   return -1;
-    if( empty( $b ))                                   return  1;
-    if(  'vtimezone' == $a->objName)                   return -1;
-    if(  'vtimezone' == $b->objName)                   return  1;
-    $astart = ( isset( $a->xprop['X-CURRENT-DTSTART']['value'] )) ? $a->_date_time_string( $a->xprop['X-CURRENT-DTSTART']['value'] ) : null;
-    if( empty( $astart ) && isset( $a->dtstart['value'] ))
+    if (is_array($this->components)) {
+      $this->_sortkeys = array('year', 'month', 'day', 'hour', 'min', 'sec');
+      usort($this->components, array($this, '_cmpfcn'));
+    }
+  }
+  function _cmpfcn($a, $b) {
+    if (empty($a))                                   return -1;
+    if (empty($b))                                   return  1;
+    if ('vtimezone' == $a->objName)                   return -1;
+    if ('vtimezone' == $b->objName)                   return  1;
+    $astart = (isset($a->xprop['X-CURRENT-DTSTART']['value'])) ? $a->_date_time_string($a->xprop['X-CURRENT-DTSTART']['value']) : null;
+    if (empty($astart) && isset($a->dtstart['value']))
       $astart = & $a->dtstart['value'];
-    $bstart = ( isset( $b->xprop['X-CURRENT-DTSTART']['value'] )) ? $b->_date_time_string( $b->xprop['X-CURRENT-DTSTART']['value'] ) : null;
-    if( empty( $bstart ) && isset( $b->dtstart['value'] ))
+    $bstart = (isset($b->xprop['X-CURRENT-DTSTART']['value'])) ? $b->_date_time_string($b->xprop['X-CURRENT-DTSTART']['value']) : null;
+    if (empty($bstart) && isset($b->dtstart['value']))
       $bstart = & $b->dtstart['value'];
-    if(     empty( $astart ))                          return -1;
-    elseif( empty( $bstart ))                          return  1;
-    foreach( $this->_sortkeys as $key ) {
-      if    ( empty( $astart[$key] ))                  return -1;
-      elseif( empty( $bstart[$key] ))                  return  1;
-      if    (        $astart[$key] == $bstart[$key])   continue;
-      if    (( (int) $astart[$key] ) < ((int) $bstart[$key] ))
+    if (empty($astart))                          return -1;
+    elseif (empty($bstart))                          return  1;
+    foreach ($this->_sortkeys as $key) {
+      if (empty($astart[$key]))                  return -1;
+      elseif (empty($bstart[$key]))                  return  1;
+      if ($astart[$key] == $bstart[$key])   continue;
+      if (((int) $astart[$key]) < ((int) $bstart[$key]))
                                                        return -1;
-      elseif(( (int) $astart[$key] ) > ((int) $bstart[$key] ))
+      elseif (((int) $astart[$key]) > ((int) $bstart[$key]))
                                                        return  1;
     }
-    $c   = ( isset( $a->xprop['X-CURRENT-DTEND']['value'] )) ? $a->_date_time_string( $a->xprop['X-CURRENT-DTEND']['value'] ) : null;
-    if(     empty( $c ) && !empty( $a->dtend['value'] ))
+    $c   = (isset($a->xprop['X-CURRENT-DTEND']['value'])) ? $a->_date_time_string($a->xprop['X-CURRENT-DTEND']['value']) : null;
+    if (empty($c) && !empty($a->dtend['value']))
       $c = & $a->dtend['value'];
-    if(     empty( $c ) && isset( $a->xprop['X-CURRENT-DUE']['value'] ))
-      $c = $a->_date_time_string( $a->xprop['X-CURRENT-DUE']['value'] );
-    if(     empty( $c ) && !empty( $a->due['value'] ))
+    if (empty($c) && isset($a->xprop['X-CURRENT-DUE']['value']))
+      $c = $a->_date_time_string($a->xprop['X-CURRENT-DUE']['value']);
+    if (empty($c) && !empty($a->due['value']))
       $c = & $a->due['value'];
-    if(     empty( $c ) && !empty( $a->duration['value'] ))
+    if (empty($c) && !empty($a->duration['value']))
       $c = $a->duration2date();
-    $d   = ( isset( $b->xprop['X-CURRENT-DTEND']['value'] )) ? $b->_date_time_string( $b->xprop['X-CURRENT-DTEND']['value'] ) : null;
-    if(     empty( $d ) && !empty( $b->dtend['value'] ))
+    $d   = (isset($b->xprop['X-CURRENT-DTEND']['value'])) ? $b->_date_time_string($b->xprop['X-CURRENT-DTEND']['value']) : null;
+    if (empty($d) && !empty($b->dtend['value']))
       $d = & $b->dtend['value'];
-    if(     empty( $d ) && isset( $b->xprop['X-CURRENT-DUE']['value'] ))
-      $d = $b->_date_time_string( $b->xprop['X-CURRENT-DUE']['value'] );
-    if(     empty( $d ) && !empty( $b->due['value'] ))
+    if (empty($d) && isset($b->xprop['X-CURRENT-DUE']['value']))
+      $d = $b->_date_time_string($b->xprop['X-CURRENT-DUE']['value']);
+    if (empty($d) && !empty($b->due['value']))
       $d = & $b->due['value'];
-    if(     empty( $d ) && !empty( $b->duration['value'] ))
+    if (empty($d) && !empty($b->duration['value']))
       $d = $b->duration2date();
-    if(     empty( $c ))                               return -1;
-    elseif( empty( $d ))                               return  1;
-    foreach( $this->_sortkeys as $key ) {
-      if    ( !isset( $c[$key] ))                      return -1;
-      elseif( !isset( $d[$key] ))                      return  1;
-      if    (         $c[$key] == $d[$key] )           continue;
-      if    ((  (int) $c[$key] ) < ((int) $d[$key]))   return -1;
-      elseif((  (int) $c[$key] ) > ((int) $d[$key]))   return  1;
-    }
-    if( isset( $a->created['value'] ))
+    if (empty($c))                               return -1;
+    elseif (empty($d))                               return  1;
+    foreach ($this->_sortkeys as $key) {
+      if (!isset($c[$key]))                      return -1;
+      elseif (!isset($d[$key]))                      return  1;
+      if ($c[$key] == $d[$key])           continue;
+      if (((int) $c[$key]) < ((int) $d[$key]))   return -1;
+      elseif (((int) $c[$key]) > ((int) $d[$key]))   return  1;
+    }
+    if (isset($a->created['value']))
      $e = & $a->created['value'];
     else
      $e = & $a->dtstamp['value'];
-    if( isset( $b->created['value'] ))
+    if (isset($b->created['value']))
       $f = & $b->created['value'];
     else
       $f = & $b->dtstamp['value'];
-    foreach( $this->_sortkeys as $key ) {
-      if(       !isset( $e[$key] ))                    return -1;
-      elseif(   !isset( $f[$key] ))                    return  1;
-      if    (           $e[$key] == $f[$key] )         continue;
-      if    ((    (int) $e[$key] ) < ((int) $f[$key])) return -1;
-      elseif((    (int) $e[$key] ) > ((int) $f[$key])) return  1;
-    }
-    if    ((            $a->uid['value'] ) <
-           (            $b->uid['value'] ))            return -1;
-    elseif((            $a->uid['value'] ) >
-           (            $b->uid['value'] ))            return  1;
+    foreach ($this->_sortkeys as $key) {
+      if (!isset($e[$key]))                    return -1;
+      elseif (!isset($f[$key]))                    return  1;
+      if ($e[$key] == $f[$key])         continue;
+      if (((int) $e[$key]) < ((int) $f[$key])) return -1;
+      elseif (((int) $e[$key]) > ((int) $f[$key])) return  1;
+    }
+    if (($a->uid['value']) <
+           ($b->uid['value']))            return -1;
+    elseif (($a->uid['value']) >
+           ($b->uid['value']))            return  1;
     return 0;
   }
 /**
@@ -1208,104 +1208,104 @@ 
  * @return bool FALSE if error occurs during parsing
  *
  */
-  function parse( $filename=FALSE ) {
-    if( !$filename ) {
+  function parse($filename = FALSE) {
+    if (!$filename) {
             /* directory/filename previous set via setConfig directory+filename / url */
-      if( FALSE === ( $filename = $this->getConfig( 'url' )))
-        $filename = $this->getConfig( 'dirfile' );
+      if (FALSE === ($filename = $this->getConfig('url')))
+        $filename = $this->getConfig('dirfile');
     }
-    elseif(( 'http://'   == strtolower( substr( $filename, 0, 7 ))) ||
-           ( 'webcal://' == strtolower( substr( $filename, 0, 9 ))))  {
+    elseif (('http://' == strtolower(substr($filename, 0, 7))) ||
+           ('webcal://' == strtolower(substr($filename, 0, 9)))) {
             /* remote file - URL */
-      $this->setConfig( 'URL', $filename );
-      if( !$filename = $this->getConfig( 'url' ))
-        return FALSE;                 /* err 2 */
+      $this->setConfig('URL', $filename);
+      if (!$filename = $this->getConfig('url'))
+        return FALSE; /* err 2 */
     }
     else {
             /* local directory/filename */
-      $parts = pathinfo( $filename );
-      if( !empty( $parts['dirname'] ) && ( '.' != $parts['dirname'] )) {
-        if( !$this->setConfig( 'directory', $parts['dirname'] ))
-          return FALSE;               /* err 3 */
+      $parts = pathinfo($filename);
+      if (!empty($parts['dirname']) && ('.' != $parts['dirname'])) {
+        if (!$this->setConfig('directory', $parts['dirname']))
+          return FALSE; /* err 3 */
       }
-      if( !$this->setConfig( 'filename', $parts['basename'] ))
-        return FALSE;                 /* err 4 */
+      if (!$this->setConfig('filename', $parts['basename']))
+        return FALSE; /* err 4 */
     }
-    if( 'http://' != substr( $filename, 0, 7 )) {
+    if ('http://' != substr($filename, 0, 7)) {
             /* local file error tests */
-      if( !is_file( $filename ))      /* err 5 */
+      if (!is_file($filename))      /* err 5 */
         return FALSE;
-      if( !is_readable( $filename ))
-        return FALSE;                 /* err 6 */
-      if( !filesize( $filename ))
-        return FALSE;                 /* err 7 */
+      if (!is_readable($filename))
+        return FALSE; /* err 6 */
+      if (!filesize($filename))
+        return FALSE; /* err 7 */
       clearstatcache();
     }
             /* READ FILE */
-    if( FALSE === ( $rows = file( $filename )))
-      return FALSE;                   /* err 1 */
+    if (FALSE === ($rows = file($filename)))
+      return FALSE; /* err 1 */
             /* identify BEGIN:VCALENDAR, MUST be first row */
-    if( 'BEGIN:VCALENDAR' != strtoupper( trim( $rows[0] )))
-      return FALSE;                   /* err 8 */
+    if ('BEGIN:VCALENDAR' != strtoupper(trim($rows[0])))
+      return FALSE; /* err 8 */
             /* remove empty trailing lines */
-    while( '' == trim( $rows[count( $rows ) - 1] )) {
-      unset( $rows[count( $rows ) - 1] );
-      $rows  = array_values( $rows );
+    while ('' == trim($rows[count($rows) - 1])) {
+      unset($rows[count($rows) - 1]);
+      $rows = array_values($rows);
     }
             /* identify ending END:VCALENDAR row */
-    if( 'END:VCALENDAR'   != strtoupper( trim( $rows[count( $rows ) - 1] ))) {
-      return FALSE;                   /* err 9 */
+    if ('END:VCALENDAR' != strtoupper(trim($rows[count($rows) - 1]))) {
+      return FALSE; /* err 9 */
     }
-    if( 3 > count( $rows ))
-      return FALSE;                   /* err 10 */
+    if (3 > count($rows))
+      return FALSE; /* err 10 */
     $comp    = $subcomp = null;
     $actcomp = & $this;
-    $nl      = $this->getConfig( 'nl' );
+    $nl      = $this->getConfig('nl');
     $calsync = 0;
             /* identify components and update unparsed data within component */
-    foreach( $rows as $line ) {
-      if( '' == trim( $line ))
+    foreach ($rows as $line) {
+      if ('' == trim($line))
         continue;
-      if( $nl == substr( $line, 0 - strlen( $nl )))
-        $line = substr( $line, 0, ( strlen( $line ) - strlen( $nl ))).'\n';
-      if( 'BEGIN:VCALENDAR' == strtoupper( substr( $line, 0, 15 ))) {
+      if ($nl == substr($line, 0 - strlen($nl)))
+        $line = substr($line, 0, (strlen($line) - strlen($nl))).'\n';
+      if ('BEGIN:VCALENDAR' == strtoupper(substr($line, 0, 15))) {
         $calsync++;
         continue;
       }
-      elseif( 'END:VCALENDAR' == strtoupper( substr( $line, 0, 13 ))) {
+      elseif ('END:VCALENDAR' == strtoupper(substr($line, 0, 13))) {
         $calsync--;
         continue;
       }
-      elseif( 1 != $calsync )
-        return FALSE;                 /* err 20 */
-      if( 'END:' == strtoupper( substr( $line, 0, 4 ))) {
-        if( null != $subcomp ) {
-          $comp->setComponent( $subcomp );
+      elseif (1 != $calsync)
+        return FALSE; /* err 20 */
+      if ('END:' == strtoupper(substr($line, 0, 4))) {
+        if (null != $subcomp) {
+          $comp->setComponent($subcomp);
           $subcomp = null;
         }
         else {
-          $this->setComponent( $comp );
+          $this->setComponent($comp);
           $comp = null;
         }
         $actcomp = null;
         continue;
       } // end - if ( 'END:' ==.. .
-      elseif( 'BEGIN:' == strtoupper( substr( $line, 0, 6 ))) {
-        $line = str_replace( '\n', '', $line );
-        $compname = trim (strtoupper( substr( $line, 6 )));
-        if( null != $comp ) {
-          if( 'VALARM' == $compname )
+      elseif ('BEGIN:' == strtoupper(substr($line, 0, 6))) {
+        $line = str_replace('\n', '', $line);
+        $compname = trim(strtoupper(substr($line, 6)));
+        if (null != $comp) {
+          if ('VALARM' == $compname)
             $subcomp = new valarm();
-          elseif( 'STANDARD' == $compname )
-            $subcomp = new vtimezone( 'STANDARD' );
-          elseif( 'DAYLIGHT' == $compname )
-            $subcomp = new vtimezone( 'DAYLIGHT' );
+          elseif ('STANDARD' == $compname)
+            $subcomp = new vtimezone('STANDARD');
+          elseif ('DAYLIGHT' == $compname)
+            $subcomp = new vtimezone('DAYLIGHT');
           else
             return FALSE; /* err 6 */
           $actcomp = & $subcomp;
         }
         else {
-          switch( $compname ) {
+          switch ($compname) {
             case 'VALARM':
               $comp = new valarm();
               break;
@@ -1336,74 +1336,74 @@ 
       $actcomp->unparsed[] = $line;
     } // end - foreach( rows.. .
             /* parse data for calendar (this) object */
-    if( is_array( $this->unparsed ) && ( 0 < count( $this->unparsed ))) {
+    if (is_array($this->unparsed) && (0 < count($this->unparsed))) {
             /* concatenate property values spread over several lines */
       $lastix    = -1;
-      $propnames = array( 'calscale','method','prodid','version','x-' );
+      $propnames = array('calscale', 'method', 'prodid', 'version', 'x-');
       $proprows  = array();
-      foreach( $this->unparsed as $line ) {
+      foreach ($this->unparsed as $line) {
         $newProp = FALSE;
-        foreach ( $propnames as $propname ) {
-          if( $propname == strtolower( substr( $line, 0, strlen( $propname )))) {
+        foreach ($propnames as $propname) {
+          if ($propname == strtolower(substr($line, 0, strlen($propname)))) {
             $newProp = TRUE;
             break;
           }
         }
-        if( $newProp ) {
+        if ($newProp) {
           $newProp = FALSE;
           $lastix++;
-          $proprows[$lastix]  = $line;
+          $proprows[$lastix] = $line;
         }
         else {
             /* remove line breaks */
-          if(( '\n' == substr( $proprows[$lastix], -2 )) &&
-             (  ' ' == substr( $line, 0, 1 ))) {
-            $proprows[$lastix] = substr( $proprows[$lastix], 0, strlen( $proprows[$lastix] ) - 2 );
-            $line = substr( $line, 1 );
+          if (('\n' == substr($proprows[$lastix], -2)) &&
+             (' ' == substr($line, 0, 1))) {
+            $proprows[$lastix] = substr($proprows[$lastix], 0, strlen($proprows[$lastix]) - 2);
+            $line = substr($line, 1);
           }
           $proprows[$lastix] .= $line;
         }
       }
       $toolbox = new calendarComponent();
-      foreach( $proprows as $line ) {
-        if( '\n' == substr( $line, -2 ))
-          $line = substr( $line, 0, strlen( $line ) - 2 );
+      foreach ($proprows as $line) {
+        if ('\n' == substr($line, -2))
+          $line = substr($line, 0, strlen($line) - 2);
             /* get propname */
         $cix = $propname = null;
-        for( $cix=0; $cix < strlen( $line ); $cix++ ) {
-          if( in_array( $line{$cix}, array( ':', ';' )))
+        for ($cix = 0; $cix < strlen($line); $cix++) {
+          if (in_array($line{$cix}, array(':', ';')))
             break;
           else
             $propname .= $line{$cix};
         }
             /* ignore version/prodid properties */
-        if( in_array( strtoupper( $propname ), array( 'VERSION', 'PRODID' )))
+        if (in_array(strtoupper($propname), array('VERSION', 'PRODID')))
           continue;
-        $line = substr( $line, $cix);
+        $line = substr($line, $cix);
             /* separate attributes from value */
         $attr   = array();
         $attrix = -1;
-        $strlen = strlen( $line );
-        for( $cix=0; $cix < $strlen; $cix++ ) {
-          if((       ':'   == $line{$cix} )             &&
-                   ( '://' != substr( $line, $cix, 3 )) &&
-             ( 'mailto:'   != strtolower( substr( $line, $cix - 6, 7 )))) {
+        $strlen = strlen($line);
+        for ($cix = 0; $cix < $strlen; $cix++) {
+          if ((':' == $line{$cix} ) &&
+                   ('://' != substr($line, $cix, 3)) &&
+             ('mailto:' != strtolower(substr($line, $cix - 6, 7)))) {
             $attrEnd = TRUE;
-            if(( $cix < ( $strlen - 4 )) &&
-                 ctype_digit( substr( $line, $cix+1, 4 ))) { // an URI with a (4pos) portnr??
-              for( $c2ix = $cix; 3 < $c2ix; $c2ix-- ) {
-                if( '://' == substr( $line, $c2ix - 2, 3 )) {
+            if (($cix < ($strlen - 4)) &&
+                 ctype_digit(substr($line, $cix + 1, 4))) { // an URI with a (4pos) portnr??
+              for ($c2ix = $cix; 3 < $c2ix; $c2ix--) {
+                if ('://' == substr($line, $c2ix - 2, 3)) {
                   $attrEnd = FALSE;
                   break; // an URI with a portnr!!
                 }
               }
             }
-            if( $attrEnd) {
-              $line = substr( $line, $cix + 1 );
+            if ($attrEnd) {
+              $line = substr($line, $cix + 1);
               break;
             }
           }
-          if( ';' == $line{$cix} )
+          if (';' == $line{$cix} )
             $attr[++$attrix] = null;
           else
             $attr[$attrix] .= $line{$cix};
@@ -1411,46 +1411,46 @@ 
 
             /* make attributes in array format */
         $propattr = array();
-        foreach( $attr as $attribute ) {
-          $attrsplit = explode( '=', $attribute, 2 );
-          if( 1 < count( $attrsplit ))
+        foreach ($attr as $attribute) {
+          $attrsplit = explode('=', $attribute, 2);
+          if (1 < count($attrsplit))
             $propattr[$attrsplit[0]] = $attrsplit[1];
           else
             $propattr[] = $attribute;
         }
             /* update Property */
-        if( FALSE !== strpos( $line, ',' )) {
-          $content  = explode( ',', $line );
-          $clen     = count( $content );
-          for( $cix = 0; $cix < $clen; $cix++ ) {
-            if( "\\" == substr( $content[$cix], -1 )) {
+        if (FALSE !== strpos($line, ',')) {
+          $content  = explode(',', $line);
+          $clen     = count($content);
+          for ($cix = 0; $cix < $clen; $cix++) {
+            if ("\\" == substr($content[$cix], -1)) {
               $content[$cix] .= ','.$content[$cix + 1];
-              unset( $content[$cix + 1] );
+              unset($content[$cix + 1]);
               $cix++;
             }
           }
-          if( 1 < count( $content )) {
-            foreach( $content as $cix => $contentPart )
-              $content[$cix] = $toolbox->_strunrep( $contentPart );
-            $this->setProperty( $propname, $content, $propattr );
+          if (1 < count($content)) {
+            foreach ($content as $cix => $contentPart)
+              $content[$cix] = $toolbox->_strunrep($contentPart);
+            $this->setProperty($propname, $content, $propattr);
             continue;
           }
           else
-            $line = reset( $content );
-          $line = $toolbox->_strunrep( $line );
+            $line = reset($content);
+          $line = $toolbox->_strunrep($line);
         }
-        $this->setProperty( $propname, trim( $line ), $propattr );
+        $this->setProperty($propname, trim($line), $propattr);
       } // end - foreach( $this->unparsed.. .
     } // end - if( is_array( $this->unparsed.. .
             /* parse Components */
-    if( is_array( $this->components ) && ( 0 < count( $this->components ))) {
-      for( $six = 0; $six < count( $this->components ); $six++ ) {
-        if( !empty( $this->components[$six] ))
+    if (is_array($this->components) && (0 < count($this->components))) {
+      for ($six = 0; $six < count($this->components); $six++) {
+        if (!empty($this->components[$six]))
           $this->components[$six]->parse();
       }
     }
     else
-      return FALSE;                   /* err 91 or something.. . */
+      return FALSE; /* err 91 or something.. . */
     return TRUE;
   }
 /*********************************************************************************/
@@ -1463,7 +1463,7 @@ 
  */
   function createCalendar() {
     $calendarInit1 = $calendarInit2 = $calendarxCaldecl = $calendarStart = $calendar = null;
-    switch( $this->format ) {
+    switch ($this->format) {
       case 'xcal':
         $calendarInit1 = '<?xml version="1.0" encoding="UTF-8"?>'.$this->nl.
                          '<!DOCTYPE iCalendar PUBLIC "-//IETF//DTD XCAL/iCalendar XML//EN"'.$this->nl.
@@ -1479,38 +1479,38 @@ 
     $calendarStart .= $this->createMethod();
     $calendarStart .= $this->createProdid();
     $calendarStart .= $this->createVersion();
-    switch( $this->format ) {
+    switch ($this->format) {
       case 'xcal':
-        $nlstrlen = strlen( $this->nl );
-        if( $this->nl == substr( $calendarStart, ( 0 - $nlstrlen )))
-          $calendarStart = substr( $calendarStart, 0, ( strlen( $calendarStart ) - $nlstrlen ));
+        $nlstrlen = strlen($this->nl);
+        if ($this->nl == substr($calendarStart, (0 - $nlstrlen)))
+          $calendarStart = substr($calendarStart, 0, (strlen($calendarStart) - $nlstrlen));
         $calendarStart .= '>'.$this->nl;
         break;
       default:
         break;
     }
     $calendar .= $this->createXprop();
-    foreach( $this->components as $component ) {
-      if( empty( $component )) continue;
-      if( '' >= $component->getConfig( 'language'))
-        $component->setConfig( 'language',  $this->getConfig( 'language' ));
-      $component->setConfig( 'allowEmpty',  $this->getConfig( 'allowEmpty' ));
-      $component->setConfig( 'nl',          $this->getConfig( 'nl' ));
-      $component->setConfig( 'unique_id',   $this->getConfig( 'unique_id' ));
-      $component->setConfig( 'format',      $this->getConfig( 'format' ));
-      $calendar .= $component->createComponent( $this->xcaldecl );
-    }
-    if(( 0 < count( $this->xcaldecl )) && ( 'xcal' == $this->format )) { // xCal only
+    foreach ($this->components as $component) {
+      if (empty($component)) continue;
+      if ('' >= $component->getConfig('language'))
+        $component->setConfig('language', $this->getConfig('language'));
+      $component->setConfig('allowEmpty', $this->getConfig('allowEmpty'));
+      $component->setConfig('nl', $this->getConfig('nl'));
+      $component->setConfig('unique_id', $this->getConfig('unique_id'));
+      $component->setConfig('format', $this->getConfig('format'));
+      $calendar .= $component->createComponent($this->xcaldecl);
+    }
+    if ((0 < count($this->xcaldecl)) && ('xcal' == $this->format)) { // xCal only
       $calendarInit1 .= $this->nl.'['.$this->nl;
       $old_xcaldecl = array();
-      foreach( $this->xcaldecl as $declix => $declPart ) {
-        if(( 0 < count( $old_xcaldecl)) &&
-           ( in_array( $declPart['uri'],      $old_xcaldecl['uri'] )) &&
-           ( in_array( $declPart['external'], $old_xcaldecl['external'] )))
+      foreach ($this->xcaldecl as $declix => $declPart) {
+        if ((0 < count($old_xcaldecl)) &&
+           (in_array($declPart['uri'], $old_xcaldecl['uri'])) &&
+           (in_array($declPart['external'], $old_xcaldecl['external'])))
           continue; // no duplicate uri and ext. references
         $calendarxCaldecl .= '<!';
-        foreach( $declPart as $declKey => $declValue ) {
-          switch( $declKey ) {                    // index
+        foreach ($declPart as $declKey => $declValue) {
+          switch ($declKey) {                    // index
             case 'xmldecl':                       // no 1
               $calendarxCaldecl .= $declValue.' ';
               break;
@@ -1537,7 +1537,7 @@ 
       }
       $calendarInit2 = ']'.$calendarInit2;
     }
-    switch( $this->format ) {
+    switch ($this->format) {
       case 'xcal':
         $calendar .= '</vcalendar>'.$this->nl;
         break;
@@ -1555,18 +1555,18 @@ 
  * @return redirect
  */
   function returnCalendar() {
-    $filename = $this->getConfig( 'filename' );
+    $filename = $this->getConfig('filename');
     $output   = $this->createCalendar();
-    $filesize = strlen( $output );
+    $filesize = strlen($output);
 //    if( headers_sent( $filename, $linenum ))
 //      die( "Headers already sent in $filename on line $linenum\n" );
-    if( 'xcal' == $this->format )
-      header( 'Content-Type: application/calendar+xml; charset=utf-8' );
+    if ('xcal' == $this->format)
+      header('Content-Type: application/calendar+xml; charset=utf-8');
     else
-      header( 'Content-Type: text/calendar; charset=utf-8' );
-    header( 'Content-Length: '.$filesize );
-    header( 'Content-Disposition: attachment; filename="'.$filename.'"' );
-    header( 'Cache-Control: max-age=10' );
+      header('Content-Type: text/calendar; charset=utf-8');
+    header('Content-Length: '.$filesize);
+    header('Content-Disposition: attachment; filename="'.$filename.'"');
+    header('Cache-Control: max-age=10');
     echo $output;
     die();
   }
@@ -1580,20 +1580,20 @@ 
  * @param string $delimiter optional
  * @return bool
  */
-  function saveCalendar( $directory=FALSE, $filename=FALSE, $delimiter=FALSE ) {
-    if( $directory )
-      $this->setConfig( 'directory', $directory );
-    if( $filename )
-      $this->setConfig( 'filename',  $filename );
-    if( $delimiter && ($delimiter != DIRECTORY_SEPARATOR ))
-      $this->setConfig( 'delimiter', $delimiter );
-    if( FALSE === ( $dirfile = $this->getConfig( 'url' )))
-      $dirfile = $this->getConfig( 'dirfile' );
-    $iCalFile = @fopen( $dirfile, 'w' );
-    if( $iCalFile ) {
-      if( FALSE === fwrite( $iCalFile, $this->createCalendar() ))
+  function saveCalendar($directory = FALSE, $filename = FALSE, $delimiter = FALSE) {
+    if ($directory)
+      $this->setConfig('directory', $directory);
+    if ($filename)
+      $this->setConfig('filename', $filename);
+    if ($delimiter && ($delimiter != DIRECTORY_SEPARATOR))
+      $this->setConfig('delimiter', $delimiter);
+    if (FALSE === ($dirfile = $this->getConfig('url')))
+      $dirfile = $this->getConfig('dirfile');
+    $iCalFile = @fopen($dirfile, 'w');
+    if ($iCalFile) {
+      if (FALSE === fwrite($iCalFile, $this->createCalendar()))
         return FALSE;
-      fclose( $iCalFile );
+      fclose($iCalFile);
       return TRUE;
     }
     else
@@ -1611,38 +1611,38 @@ 
  * @param int timeout optional, default 3600 sec
  * @return redirect/FALSE
  */
-  function useCachedCalendar( $directory=FALSE, $filename=FALSE, $delimiter=FALSE, $timeout=3600) {
-    if ( $directory && ctype_digit( (string) $directory ) && !$filename ) {
+  function useCachedCalendar($directory = FALSE, $filename = FALSE, $delimiter = FALSE, $timeout = 3600) {
+    if ($directory && ctype_digit((string) $directory) && !$filename) {
       $timeout   = (int) $directory;
       $directory = FALSE;
     }
-    if( $directory )
-      $this->setConfig( 'directory', $directory );
-    if( $filename )
-      $this->setConfig( 'filename',  $filename );
-    if( $delimiter && ( $delimiter != DIRECTORY_SEPARATOR ))
-      $this->setConfig( 'delimiter', $delimiter );
-    $filesize    = $this->getConfig( 'filesize' );
-    if( 0 >= $filesize )
+    if ($directory)
+      $this->setConfig('directory', $directory);
+    if ($filename)
+      $this->setConfig('filename', $filename);
+    if ($delimiter && ($delimiter != DIRECTORY_SEPARATOR))
+      $this->setConfig('delimiter', $delimiter);
+    $filesize    = $this->getConfig('filesize');
+    if (0 >= $filesize)
       return FALSE;
-    $dirfile     = $this->getConfig( 'dirfile' );
-    if( time() - filemtime( $dirfile ) < $timeout) {
+    $dirfile     = $this->getConfig('dirfile');
+    if (time() - filemtime($dirfile) < $timeout) {
       clearstatcache();
-      $dirfile   = $this->getConfig( 'dirfile' );
-      $filename  = $this->getConfig( 'filename' );
+      $dirfile   = $this->getConfig('dirfile');
+      $filename  = $this->getConfig('filename');
 //    if( headers_sent( $filename, $linenum ))
 //      die( "Headers already sent in $filename on line $linenum\n" );
-      if( 'xcal' == $this->format )
-        header( 'Content-Type: application/calendar+xml; charset=utf-8' );
+      if ('xcal' == $this->format)
+        header('Content-Type: application/calendar+xml; charset=utf-8');
       else
-        header( 'Content-Type: text/calendar; charset=utf-8' );
-      header( 'Content-Length: '.$filesize );
-      header( 'Content-Disposition: attachment; filename="'.$filename.'"' );
-      header( 'Cache-Control: max-age=10' );
-      $fp = @$fopen( $dirfile, 'r' );
-      if( $fp ) {
-        fpassthru( $fp );
-        fclose( $fp );
+        header('Content-Type: text/calendar; charset=utf-8');
+      header('Content-Length: '.$filesize);
+      header('Content-Disposition: attachment; filename="'.$filename.'"');
+      header('Cache-Control: max-age=10');
+      $fp = @$fopen($dirfile, 'r');
+      if ($fp) {
+        fpassthru($fp);
+        fclose($fp);
       }
       die();
     }
@@ -1691,8 +1691,8 @@ 
  * @since 2.4.19 - 2008-10-23
  */
   function calendarComponent() {
-    $this->objName         = ( isset( $this->timezonetype )) ?
-                          strtolower( $this->timezonetype )  :  get_class ( $this );
+    $this->objName         = (isset($this->timezonetype)) ?
+                          strtolower($this->timezonetype) : get_class($this);
     $this->uid             = array();
     $this->dtstamp         = array();
 
@@ -1718,11 +1718,11 @@ 
  * @return string
  */
   function createAction() {
-    if( empty( $this->action )) return FALSE;
-    if( empty( $this->action['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'ACTION' ) : FALSE;
-    $attributes = $this->_createParams( $this->action['params'] );
-    return $this->_createElement( 'ACTION', $attributes, $this->action['value'] );
+    if (empty($this->action)) return FALSE;
+    if (empty($this->action['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('ACTION') : FALSE;
+    $attributes = $this->_createParams($this->action['params']);
+    return $this->_createElement('ACTION', $attributes, $this->action['value']);
   }
 /**
  * set calendar component property action
@@ -1733,9 +1733,9 @@ 
  * @param mixed $params
  * @return bool
  */
-  function setAction( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->action = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setAction($value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->action = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -1750,14 +1750,14 @@ 
  * @return string
  */
   function createAttach() {
-    if( empty( $this->attach )) return FALSE;
-    $output       = null;
-    foreach( $this->attach as $attachPart ) {
-      if(! empty( $attachPart['value'] )) {
-        $attributes = $this->_createParams( $attachPart['params'] );
-        $output    .= $this->_createElement( 'ATTACH', $attributes, $attachPart['value'] );
+    if (empty($this->attach)) return FALSE;
+    $output = null;
+    foreach ($this->attach as $attachPart) {
+      if (!empty($attachPart['value'])) {
+        $attributes = $this->_createParams($attachPart['params']);
+        $output    .= $this->_createElement('ATTACH', $attributes, $attachPart['value']);
       }
-      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'ATTACH' );
+      elseif ($this->getConfig('allowEmpty')) $output .= $this->_createElement('ATTACH');
     }
     return $output;
   }
@@ -1771,9 +1771,9 @@ 
  * @param integer $index, optional
  * @return bool
  */
-  function setAttach( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->_setMval( $this->attach, $value, $params, FALSE, $index );
+  function setAttach($value, $params = FALSE, $index = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->_setMval($this->attach, $value, $params, FALSE, $index);
     return TRUE;
   }
 /*********************************************************************************/
@@ -1788,26 +1788,26 @@ 
  * @return string
  */
   function createAttendee() {
-    if( empty( $this->attendee )) return FALSE;
+    if (empty($this->attendee)) return FALSE;
     $output = null;
-    foreach( $this->attendee as $attendeePart ) {                      // start foreach 1
-      if( empty( $attendeePart['value'] )) {
-        if( $this->getConfig( 'allowEmpty' ))
-          $output .= $this->_createElement( 'ATTENDEE' );
+    foreach ($this->attendee as $attendeePart) {                      // start foreach 1
+      if (empty($attendeePart['value'])) {
+        if ($this->getConfig('allowEmpty'))
+          $output .= $this->_createElement('ATTENDEE');
         continue;
       }
       $attendee1 = $attendee2 = $attendeeLANG = $attendeeCN = null;
-      foreach( $attendeePart as $paramlabel => $paramvalue ) {         // start foreach 2
-        if( 'value' == $paramlabel )
-          $attendee2  .= 'MAILTO:'.$paramvalue;
-        elseif(( 'params' == $paramlabel ) && ( is_array( $paramvalue ))) { // start elseif
-          foreach( $paramvalue as $optparamlabel => $optparamvalue ) { // start foreach 3
+      foreach ($attendeePart as $paramlabel => $paramvalue) {         // start foreach 2
+        if ('value' == $paramlabel)
+          $attendee2 .= 'MAILTO:'.$paramvalue;
+        elseif (('params' == $paramlabel) && (is_array($paramvalue))) { // start elseif
+          foreach ($paramvalue as $optparamlabel => $optparamvalue) { // start foreach 3
             $attendee11 = $attendee12 = null;
-            if( is_int( $optparamlabel )) {
+            if (is_int($optparamlabel)) {
               $attendee1 .= $this->intAttrDelimiter.$optparamvalue;
               continue;
             }
-            switch( $optparamlabel ) {                                 // start switch
+            switch ($optparamlabel) {                                 // start switch
               case 'CUTYPE':
               case 'PARTSTAT':
               case 'ROLE':
@@ -1820,11 +1820,11 @@ 
               case 'MEMBER':
                 $attendee11 = $this->intAttrDelimiter.'MEMBER=';
               case 'DELEGATED-TO':
-                $attendee11 = ( !$attendee11 ) ? $this->intAttrDelimiter.'DELEGATED-TO='   : $attendee11;
+                $attendee11 = (!$attendee11) ? $this->intAttrDelimiter.'DELEGATED-TO=' : $attendee11;
               case 'DELEGATED-FROM':
-                $attendee11 = ( !$attendee11 ) ? $this->intAttrDelimiter.'DELEGATED-FROM=' : $attendee11;
-                foreach( $optparamvalue  as $cix => $calUserAddress ) {
-                  $attendee12 .= ( $cix ) ? ',' : null;
+                $attendee11 = (!$attendee11) ? $this->intAttrDelimiter.'DELEGATED-FROM=' : $attendee11;
+                foreach ($optparamvalue  as $cix => $calUserAddress) {
+                  $attendee12 .= ($cix) ? ',' : null;
                   $attendee12 .= '"MAILTO:'.$calUserAddress.'"';
                 }
                 $attendee1  .= $attendee11.$attendee12;
@@ -1845,7 +1845,7 @@ 
           }      // end foreach 3
         }        // end elseif
       }          // end foreach 2
-      $output .= $this->_createElement( 'ATTENDEE', $attendee1.$attendeeLANG.$attendeeCN, $attendee2 );
+      $output .= $this->_createElement('ATTENDEE', $attendee1.$attendeeLANG.$attendeeCN, $attendee2);
     }              // end foreach 1
     return $output;
   }
@@ -1859,63 +1859,63 @@ 
  * @param integer $index, optional
  * @return bool
  */
-  function setAttendee( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $value = str_replace ( 'MAILTO:', '', $value );
-    $value = str_replace ( 'mailto:', '', $value );
+  function setAttendee($value, $params = FALSE, $index = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $value = str_replace('MAILTO:', '', $value);
+    $value = str_replace('mailto:', '', $value);
     $params2 = array();
-    if( is_array($params )) {
+    if (is_array($params)) {
       $optarrays = array();
-      foreach( $params as $optparamlabel => $optparamvalue ) {
-        $optparamlabel = strtoupper( $optparamlabel );
-        switch( $optparamlabel ) {
+      foreach ($params as $optparamlabel => $optparamvalue) {
+        $optparamlabel = strtoupper($optparamlabel);
+        switch ($optparamlabel) {
           case 'MEMBER':
           case 'DELEGATED-TO':
           case 'DELEGATED-FROM':
-            if( is_array( $optparamvalue )) {
-              foreach( $optparamvalue as $part ) {
-                $part = str_replace( 'MAILTO:', '', $part );
-                $part = str_replace( 'mailto:', '', $part );
-                if(( '"' == $part{0} ) && ( '"' == $part{strlen($part)-1} ))
-                  $part = substr( $part, 1, ( strlen($part)-2 ));
+            if (is_array($optparamvalue)) {
+              foreach ($optparamvalue as $part) {
+                $part = str_replace('MAILTO:', '', $part);
+                $part = str_replace('mailto:', '', $part);
+                if (('"' == $part{0} ) && ('"' == $part{strlen($part) - 1} ))
+                  $part = substr($part, 1, (strlen($part) - 2));
                 $optarrays[$optparamlabel][] = $part;
               }
             }
             else {
-              $part = str_replace( 'MAILTO:', '', $optparamvalue );
-              $part = str_replace( 'mailto:', '', $part );
-              if(( '"' == $part{0} ) && ( '"' == $part{strlen($part)-1} ))
-                $part = substr( $part, 1, ( strlen($part)-2 ));
+              $part = str_replace('MAILTO:', '', $optparamvalue);
+              $part = str_replace('mailto:', '', $part);
+              if (('"' == $part{0} ) && ('"' == $part{strlen($part) - 1} ))
+                $part = substr($part, 1, (strlen($part) - 2));
               $optarrays[$optparamlabel][] = $part;
             }
             break;
           default:
-            if( 'SENT-BY' ==  $optparamlabel ) {
-              $optparamvalue = str_replace( 'MAILTO:', '', $optparamvalue );
-              $optparamvalue = str_replace( 'mailto:', '', $optparamvalue );
+            if ('SENT-BY' == $optparamlabel) {
+              $optparamvalue = str_replace('MAILTO:', '', $optparamvalue);
+              $optparamvalue = str_replace('mailto:', '', $optparamvalue);
             }
-            if(( '"' == substr( $optparamvalue, 0, 1 )) &&
-               ( '"' == substr( $optparamvalue, -1 )))
-              $optparamvalue = substr( $optparamvalue, 1, ( strlen( $optparamvalue ) - 2 ));
+            if (('"' == substr($optparamvalue, 0, 1)) &&
+               ('"' == substr($optparamvalue, -1)))
+              $optparamvalue = substr($optparamvalue, 1, (strlen($optparamvalue) - 2));
             $params2[$optparamlabel] = $optparamvalue;
             break;
         } // end switch( $optparamlabel.. .
       } // end foreach( $optparam.. .
-      foreach( $optarrays as $optparamlabel => $optparams )
+      foreach ($optarrays as $optparamlabel => $optparams)
         $params2[$optparamlabel] = $optparams;
     }
         // remove defaults
-    $this->_existRem( $params2, 'CUTYPE',   'INDIVIDUAL' );
-    $this->_existRem( $params2, 'PARTSTAT', 'NEEDS-ACTION' );
-    $this->_existRem( $params2, 'ROLE',     'REQ-PARTICIPANT' );
-    $this->_existRem( $params2, 'RSVP',     'FALSE' );
+    $this->_existRem($params2, 'CUTYPE', 'INDIVIDUAL');
+    $this->_existRem($params2, 'PARTSTAT', 'NEEDS-ACTION');
+    $this->_existRem($params2, 'ROLE', 'REQ-PARTICIPANT');
+    $this->_existRem($params2, 'RSVP', 'FALSE');
         // check language setting
-    if( isset( $params2['CN' ] )) {
-      $lang = $this->getConfig( 'language' );
-      if( !isset( $params2['LANGUAGE' ] ) && !empty( $lang ))
-        $params2['LANGUAGE' ] = $lang;
+    if (isset($params2['CN'])) {
+      $lang = $this->getConfig('language');
+      if (!isset($params2['LANGUAGE']) && !empty($lang))
+        $params2['LANGUAGE'] = $lang;
     }
-    $this->_setMval( $this->attendee, $value, $params2, FALSE, $index );
+    $this->_setMval($this->attendee, $value, $params2, FALSE, $index);
     return TRUE;
   }
 /*********************************************************************************/
@@ -1930,23 +1930,23 @@ 
  * @return string
  */
   function createCategories() {
-    if( empty( $this->categories )) return FALSE;
+    if (empty($this->categories)) return FALSE;
     $output = null;
-    foreach( $this->categories as $category ) {
-      if( empty( $category['value'] )) {
-        if ( $this->getConfig( 'allowEmpty' ))
-          $output .= $this->_createElement( 'CATEGORIES' );
+    foreach ($this->categories as $category) {
+      if (empty($category['value'])) {
+        if ($this->getConfig('allowEmpty'))
+          $output .= $this->_createElement('CATEGORIES');
         continue;
       }
-      $attributes = $this->_createParams( $category['params'], array( 'LANGUAGE' ));
-      if( is_array( $category['value'] )) {
-        foreach( $category['value'] as $cix => $categoryPart )
-          $category['value'][$cix] = $this->_strrep( $categoryPart );
-        $content  = implode( ',', $category['value'] );
+      $attributes = $this->_createParams($category['params'], array('LANGUAGE'));
+      if (is_array($category['value'])) {
+        foreach ($category['value'] as $cix => $categoryPart)
+          $category['value'][$cix] = $this->_strrep($categoryPart);
+        $content  = implode(',', $category['value']);
       }
       else
-        $content  = $this->_strrep( $category['value'] );
-      $output    .= $this->_createElement( 'CATEGORIES', $attributes, $content );
+        $content  = $this->_strrep($category['value']);
+      $output    .= $this->_createElement('CATEGORIES', $attributes, $content);
     }
     return $output;
   }
@@ -1960,9 +1960,9 @@ 
  * @param integer $index, optional
  * @return bool
  */
-  function setCategories( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->_setMval( $this->categories, $value, $params, FALSE, $index );
+  function setCategories($value, $params = FALSE, $index = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->_setMval($this->categories, $value, $params, FALSE, $index);
     return TRUE;
  }
 /*********************************************************************************/
@@ -1977,11 +1977,11 @@ 
  * @return string
  */
   function createClass() {
-    if( empty( $this->class )) return FALSE;
-    if( empty( $this->class['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'CLASS' ) : FALSE;
-    $attributes = $this->_createParams( $this->class['params'] );
-    return $this->_createElement( 'CLASS', $attributes, $this->class['value'] );
+    if (empty($this->class)) return FALSE;
+    if (empty($this->class['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('CLASS') : FALSE;
+    $attributes = $this->_createParams($this->class['params']);
+    return $this->_createElement('CLASS', $attributes, $this->class['value']);
   }
 /**
  * set calendar component property class
@@ -1992,9 +1992,9 @@ 
  * @param array $params optional
  * @return bool
  */
-  function setClass( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->class = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setClass($value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->class = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -2009,16 +2009,16 @@ 
  * @return string
  */
   function createComment() {
-    if( empty( $this->comment )) return FALSE;
+    if (empty($this->comment)) return FALSE;
     $output = null;
-    foreach( $this->comment as $commentPart ) {
-      if( empty( $commentPart['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'COMMENT' );
+    foreach ($this->comment as $commentPart) {
+      if (empty($commentPart['value'])) {
+        if ($this->getConfig('allowEmpty')) $output .= $this->_createElement('COMMENT');
         continue;
       }
-      $attributes = $this->_createParams( $commentPart['params'], array( 'ALTREP', 'LANGUAGE' ));
-      $content    = $this->_strrep( $commentPart['value'] );
-      $output    .= $this->_createElement( 'COMMENT', $attributes, $content );
+      $attributes = $this->_createParams($commentPart['params'], array('ALTREP', 'LANGUAGE'));
+      $content    = $this->_strrep($commentPart['value']);
+      $output    .= $this->_createElement('COMMENT', $attributes, $content);
     }
     return $output;
   }
@@ -2032,9 +2032,9 @@ 
  * @param integer $index, optional
  * @return bool
  */
-  function setComment( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->_setMval( $this->comment, $value, $params, FALSE, $index );
+  function setComment($value, $params = FALSE, $index = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->_setMval($this->comment, $value, $params, FALSE, $index);
     return TRUE;
   }
 /*********************************************************************************/
@@ -2049,19 +2049,19 @@ 
  * @return string
  */
   function createCompleted( ) {
-    if( empty( $this->completed )) return FALSE;
-    if( !isset( $this->completed['value']['year'] )  &&
-        !isset( $this->completed['value']['month'] ) &&
-        !isset( $this->completed['value']['day'] )   &&
-        !isset( $this->completed['value']['hour'] )  &&
-        !isset( $this->completed['value']['min'] )   &&
-        !isset( $this->completed['value']['sec'] ))
-      if( $this->getConfig( 'allowEmpty' ))
-        return $this->_createElement( 'COMPLETED' );
+    if (empty($this->completed)) return FALSE;
+    if (!isset($this->completed['value']['year']) &&
+        !isset($this->completed['value']['month']) &&
+        !isset($this->completed['value']['day']) &&
+        !isset($this->completed['value']['hour']) &&
+        !isset($this->completed['value']['min']) &&
+        !isset($this->completed['value']['sec']))
+      if ($this->getConfig('allowEmpty'))
+        return $this->_createElement('COMPLETED');
       else return FALSE;
-    $formatted  = $this->_format_date_time( $this->completed['value'], 7 );
-    $attributes = $this->_createParams( $this->completed['params'] );
-    return $this->_createElement( 'COMPLETED', $attributes, $formatted );
+    $formatted  = $this->_format_date_time($this->completed['value'], 7);
+    $attributes = $this->_createParams($this->completed['params']);
+    return $this->_createElement('COMPLETED', $attributes, $formatted);
   }
 /**
  * set calendar component property completed
@@ -2077,16 +2077,16 @@ 
  * @param array $params optional
  * @return bool
  */
-  function setCompleted( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
-    if( empty( $year )) {
-      if( $this->getConfig( 'allowEmpty' )) {
-        $this->completed = array( 'value' => null, 'params' => $this->_setParams( $params ));
+  function setCompleted($year, $month = FALSE, $day = FALSE, $hour = FALSE, $min = FALSE, $sec = FALSE, $params = FALSE) {
+    if (empty($year)) {
+      if ($this->getConfig('allowEmpty')) {
+        $this->completed = array('value' => null, 'params' => $this->_setParams($params));
         return TRUE;
       }
       else
         return FALSE;
     }
-    $this->completed = $this->_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
+    $this->completed = $this->_setDate2($year, $month, $day, $hour, $min, $sec, $params);
     return TRUE;
   }
 /*********************************************************************************/
@@ -2101,15 +2101,15 @@ 
  * @return string
  */
   function createContact() {
-    if( empty( $this->contact )) return FALSE;
+    if (empty($this->contact)) return FALSE;
     $output = null;
-    foreach( $this->contact as $contact ) {
-      if( !empty( $contact['value'] )) {
-        $attributes = $this->_createParams( $contact['params'], array( 'ALTREP', 'LANGUAGE' ));
-        $content    = $this->_strrep( $contact['value'] );
-        $output    .= $this->_createElement( 'CONTACT', $attributes, $content );
+    foreach ($this->contact as $contact) {
+      if (!empty($contact['value'])) {
+        $attributes = $this->_createParams($contact['params'], array('ALTREP', 'LANGUAGE'));
+        $content    = $this->_strrep($contact['value']);
+        $output    .= $this->_createElement('CONTACT', $attributes, $content);
       }
-      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'CONTACT' );
+      elseif ($this->getConfig('allowEmpty')) $output .= $this->_createElement('CONTACT');
     }
     return $output;
   }
@@ -2123,9 +2123,9 @@ 
  * @param integer $index, optional
  * @return bool
  */
-  function setContact( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->_setMval( $this->contact, $value, $params, FALSE, $index );
+  function setContact($value, $params = FALSE, $index = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->_setMval($this->contact, $value, $params, FALSE, $index);
     return TRUE;
   }
 /*********************************************************************************/
@@ -2140,10 +2140,10 @@ 
  * @return string
  */
   function createCreated() {
-    if( empty( $this->created )) return FALSE;
-    $formatted  = $this->_format_date_time( $this->created['value'], 7 );
-    $attributes = $this->_createParams( $this->created['params'] );
-    return $this->_createElement( 'CREATED', $attributes, $formatted );
+    if (empty($this->created)) return FALSE;
+    $formatted  = $this->_format_date_time($this->created['value'], 7);
+    $attributes = $this->_createParams($this->created['params']);
+    return $this->_createElement('CREATED', $attributes, $formatted);
   }
 /**
  * set calendar component property created
@@ -2159,11 +2159,11 @@ 
  * @param mixed $params optional
  * @return bool
  */
-  function setCreated( $year=FALSE, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
-    if( !isset( $year )) {
-      $year = date('Ymd\THis', mktime( date( 'H' ), date( 'i' ), date( 's' ) - date( 'Z'), date( 'm' ), date( 'd' ), date( 'Y' )));
+  function setCreated($year = FALSE, $month = FALSE, $day = FALSE, $hour = FALSE, $min = FALSE, $sec = FALSE, $params = FALSE) {
+    if (!isset($year)) {
+      $year = date('Ymd\THis', mktime(date('H'), date('i'), date('s') - date('Z'), date('m'), date('d'), date('Y')));
     }
-    $this->created = $this->_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
+    $this->created = $this->_setDate2($year, $month, $day, $hour, $min, $sec, $params);
     return TRUE;
   }
 /*********************************************************************************/
@@ -2178,15 +2178,15 @@ 
  * @return string
  */
   function createDescription() {
-    if( empty( $this->description )) return FALSE;
-    $output       = null;
-    foreach( $this->description as $description ) {
-      if( !empty( $description['value'] )) {
-        $attributes = $this->_createParams( $description['params'], array( 'ALTREP', 'LANGUAGE' ));
-        $content    = $this->_strrep( $description['value'] );
-        $output    .= $this->_createElement( 'DESCRIPTION', $attributes, $content );
+    if (empty($this->description)) return FALSE;
+    $output = null;
+    foreach ($this->description as $description) {
+      if (!empty($description['value'])) {
+        $attributes = $this->_createParams($description['params'], array('ALTREP', 'LANGUAGE'));
+        $content    = $this->_strrep($description['value']);
+        $output    .= $this->_createElement('DESCRIPTION', $attributes, $content);
       }
-      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'DESCRIPTION' );
+      elseif ($this->getConfig('allowEmpty')) $output .= $this->_createElement('DESCRIPTION');
     }
     return $output;
   }
@@ -2200,9 +2200,9 @@ 
  * @param integer $index, optional
  * @return bool
  */
-  function setDescription( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) { if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; }
-    $this->_setMval( $this->description, $value, $params, FALSE, $index );
+  function setDescription($value, $params = FALSE, $index = FALSE) {
+    if (empty($value)) { if ($this->getConfig('allowEmpty')) $value = null; else return FALSE; }
+    $this->_setMval($this->description, $value, $params, FALSE, $index);
     return TRUE;
   }
 /*********************************************************************************/
@@ -2217,19 +2217,19 @@ 
  * @return string
  */
   function createDtend() {
-    if( empty( $this->dtend )) return FALSE;
-    if( !isset( $this->dtend['value']['year'] )  &&
-        !isset( $this->dtend['value']['month'] ) &&
-        !isset( $this->dtend['value']['day'] )   &&
-        !isset( $this->dtend['value']['hour'] )  &&
-        !isset( $this->dtend['value']['min'] )   &&
-        !isset( $this->dtend['value']['sec'] ))
-      if( $this->getConfig( 'allowEmpty' ))
-        return $this->_createElement( 'DTEND' );
+    if (empty($this->dtend)) return FALSE;
+    if (!isset($this->dtend['value']['year']) &&
+        !isset($this->dtend['value']['month']) &&
+        !isset($this->dtend['value']['day']) &&
+        !isset($this->dtend['value']['hour']) &&
+        !isset($this->dtend['value']['min']) &&
+        !isset($this->dtend['value']['sec']))
+      if ($this->getConfig('allowEmpty'))
+        return $this->_createElement('DTEND');
       else return FALSE;
-    $formatted  = $this->_format_date_time( $this->dtend['value'] );
-    $attributes = $this->_createParams( $this->dtend['params'] );
-    return $this->_createElement( 'DTEND', $attributes, $formatted );
+    $formatted  = $this->_format_date_time($this->dtend['value']);
+    $attributes = $this->_createParams($this->dtend['params']);
+    return $this->_createElement('DTEND', $attributes, $formatted);
   }
 /**
  * set calendar component property dtend
@@ -2246,16 +2246,16 @@ 
  * @param array params optional
  * @return bool
  */
-  function setDtend( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
-    if( empty( $year )) {
-      if( $this->getConfig( 'allowEmpty' )) {
-        $this->dtend = array( 'value' => null, 'params' => $this->_setParams( $params ));
+  function setDtend($year, $month = FALSE, $day = FALSE, $hour = FALSE, $min = FALSE, $sec = FALSE, $tz = FALSE, $params = FALSE) {
+    if (empty($year)) {
+      if ($this->getConfig('allowEmpty')) {
+        $this->dtend = array('value' => null, 'params' => $this->_setParams($params));
         return TRUE;
       }
       else
         return FALSE;
     }
-    $this->dtend = $this->_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params );
+    $this->dtend = $this->_setDate($year, $month, $day, $hour, $min, $sec, $tz, $params);
     return TRUE;
   }
 /*********************************************************************************/
@@ -2270,16 +2270,16 @@ 
  * @return string
  */
   function createDtstamp() {
-    if( !isset( $this->dtstamp['value']['year'] )  &&
-        !isset( $this->dtstamp['value']['month'] ) &&
-        !isset( $this->dtstamp['value']['day'] )   &&
-        !isset( $this->dtstamp['value']['hour'] )  &&
-        !isset( $this->dtstamp['value']['min'] )   &&
-        !isset( $this->dtstamp['value']['sec'] ))
+    if (!isset($this->dtstamp['value']['year']) &&
+        !isset($this->dtstamp['value']['month']) &&
+        !isset($this->dtstamp['value']['day']) &&
+        !isset($this->dtstamp['value']['hour']) &&
+        !isset($this->dtstamp['value']['min']) &&
+        !isset($this->dtstamp['value']['sec']))
       $this->_makeDtstamp();
-    $formatted  = $this->_format_date_time( $this->dtstamp['value'], 7 );
-    $attributes = $this->_createParams( $this->dtstamp['params'] );
-    return $this->_createElement( 'DTSTAMP', $attributes, $formatted );
+    $formatted  = $this->_format_date_time($this->dtstamp['value'], 7);
+    $attributes = $this->_createParams($this->dtstamp['params']);
+    return $this->_createElement('DTSTAMP', $attributes, $formatted);
   }
 /**
  * computes datestamp for calendar component object instance dtstamp
@@ -2289,12 +2289,12 @@ 
  * @return void
  */
   function _makeDtstamp() {
-    $this->dtstamp['value'] = array( 'year'  => date( 'Y' )
-                                   , 'month' => date( 'm' )
-                                   , 'day'   => date( 'd' )
-                                   , 'hour'  => date( 'H' )
-                                   , 'min'   => date( 'i' )
-                                   , 'sec'   => date( 's' ) - date( 'Z' ));
+    $this->dtstamp['value'] = array('year'  => date('Y')
+                                   , 'month' => date('m')
+                                   , 'day'   => date('d')
+                                   , 'hour'  => date('H')
+                                   , 'min'   => date('i')
+                                   , 'sec'   => date('s') - date('Z'));
     $this->dtstamp['params'] = null;
   }
 /**
@@ -2311,11 +2311,11 @@ 
  * @param array $params optional
  * @return TRUE
  */
-  function setDtstamp( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
-    if( empty( $year ))
+  function setDtstamp($year, $month = FALSE, $day = FALSE, $hour = FALSE, $min = FALSE, $sec = FALSE, $params = FALSE) {
+    if (empty($year))
       $this->_makeDtstamp();
     else
-      $this->dtstamp = $this->_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
+      $this->dtstamp = $this->_setDate2($year, $month, $day, $hour, $min, $sec, $params);
     return TRUE;
   }
 /*********************************************************************************/
@@ -2330,21 +2330,21 @@ 
  * @return string
  */
   function createDtstart() {
-    if( empty( $this->dtstart )) return FALSE;
-    if( !isset( $this->dtstart['value']['year'] )  &&
-        !isset( $this->dtstart['value']['month'] ) &&
-        !isset( $this->dtstart['value']['day'] )   &&
-        !isset( $this->dtstart['value']['hour'] )  &&
-        !isset( $this->dtstart['value']['min'] )   &&
-        !isset( $this->dtstart['value']['sec'] ))
-    if( $this->getConfig( 'allowEmpty' ))
-      return $this->_createElement( 'DTSTART' );
+    if (empty($this->dtstart)) return FALSE;
+    if (!isset($this->dtstart['value']['year']) &&
+        !isset($this->dtstart['value']['month']) &&
+        !isset($this->dtstart['value']['day']) &&
+        !isset($this->dtstart['value']['hour']) &&
+        !isset($this->dtstart['value']['min']) &&
+        !isset($this->dtstart['value']['sec']))
+    if ($this->getConfig('allowEmpty'))
+      return $this->_createElement('DTSTART');
     else return FALSE;
-    if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' )))
-      unset( $this->dtstart['value']['tz'], $this->dtstart['params']['TZID'] );
-    $formatted  = $this->_format_date_time( $this->dtstart['value'] );
-    $attributes = $this->_createParams( $this->dtstart['params'] );
-    return $this->_createElement( 'DTSTART', $attributes, $formatted );
+    if (in_array($this->objName, array('vtimezone', 'standard', 'daylight')))
+      unset($this->dtstart['value']['tz'], $this->dtstart['params']['TZID']);
+    $formatted  = $this->_format_date_time($this->dtstart['value']);
+    $attributes = $this->_createParams($this->dtstart['params']);
+    return $this->_createElement('DTSTART', $attributes, $formatted);
   }
 /**
  * set calendar component property dtstart
@@ -2361,16 +2361,16 @@ 
  * @param array $params optional
  * @return bool
  */
-  function setDtstart( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
-    if( empty( $year )) {
-      if( $this->getConfig( 'allowEmpty' )) {
-        $this->dtstart = array( 'value' => null, 'params' => $this->_setParams( $params ));
+  function setDtstart($year, $month = FALSE, $day = FALSE, $hour = FALSE, $min = FALSE, $sec = FALSE, $tz = FALSE, $params = FALSE) {
+    if (empty($year)) {
+      if ($this->getConfig('allowEmpty')) {
+        $this->dtstart = array('value' => null, 'params' => $this->_setParams($params));
         return TRUE;
       }
       else
         return FALSE;
     }
-    $this->dtstart = $this->_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params, 'dtstart' );
+    $this->dtstart = $this->_setDate($year, $month, $day, $hour, $min, $sec, $tz, $params, 'dtstart');
     return TRUE;
   }
 /*********************************************************************************/
@@ -2385,19 +2385,19 @@ 
  * @return string
  */
   function createDue() {
-    if( empty( $this->due )) return FALSE;
-    if( !isset( $this->due['value']['year'] )  &&
-        !isset( $this->due['value']['month'] ) &&
-        !isset( $this->due['value']['day'] )   &&
-        !isset( $this->due['value']['hour'] )  &&
-        !isset( $this->due['value']['min'] )   &&
-        !isset( $this->due['value']['sec'] ))
-      if( $this->getConfig( 'allowEmpty' ))
-        return $this->_createElement( 'DUE' );
+    if (empty($this->due)) return FALSE;
+    if (!isset($this->due['value']['year']) &&
+        !isset($this->due['value']['month']) &&
+        !isset($this->due['value']['day']) &&
+        !isset($this->due['value']['hour']) &&
+        !isset($this->due['value']['min']) &&
+        !isset($this->due['value']['sec']))
+      if ($this->getConfig('allowEmpty'))
+        return $this->_createElement('DUE');
       else return FALSE;
-    $formatted  = $this->_format_date_time( $this->due['value'] );
-    $attributes = $this->_createParams( $this->due['params'] );
-    return $this->_createElement( 'DUE', $attributes, $formatted );
+    $formatted  = $this->_format_date_time($this->due['value']);
+    $attributes = $this->_createParams($this->due['params']);
+    return $this->_createElement('DUE', $attributes, $formatted);
   }
 /**
  * set calendar component property due
@@ -2413,16 +2413,16 @@ 
  * @param array $params optional
  * @return bool
  */
-  function setDue( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
-    if( empty( $year )) {
-      if( $this->getConfig( 'allowEmpty' )) {
-        $this->due = array( 'value' => null, 'params' => $this->_setParams( $params ));
+  function setDue($year, $month = FALSE, $day = FALSE, $hour = FALSE, $min = FALSE, $sec = FALSE, $tz = FALSE, $params = FALSE) {
+    if (empty($year)) {
+      if ($this->getConfig('allowEmpty')) {
+        $this->due = array('value' => null, 'params' => $this->_setParams($params));
         return TRUE;
       }
       else
         return FALSE;
     }
-    $this->due = $this->_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params );
+    $this->due = $this->_setDate($year, $month, $day, $hour, $min, $sec, $tz, $params);
     return TRUE;
   }
 /*********************************************************************************/
@@ -2437,17 +2437,17 @@ 
  * @return string
  */
   function createDuration() {
-    if( empty( $this->duration )) return FALSE;
-    if( !isset( $this->duration['value']['week'] ) &&
-        !isset( $this->duration['value']['day'] )  &&
-        !isset( $this->duration['value']['hour'] ) &&
-        !isset( $this->duration['value']['min'] )  &&
-        !isset( $this->duration['value']['sec'] ))
-      if( $this->getConfig( 'allowEmpty' ))
-        return $this->_createElement( 'DURATION', array(), null );
+    if (empty($this->duration)) return FALSE;
+    if (!isset($this->duration['value']['week']) &&
+        !isset($this->duration['value']['day']) &&
+        !isset($this->duration['value']['hour']) &&
+        !isset($this->duration['value']['min']) &&
+        !isset($this->duration['value']['sec']))
+      if ($this->getConfig('allowEmpty'))
+        return $this->_createElement('DURATION', array(), null);
       else return FALSE;
-    $attributes = $this->_createParams( $this->duration['params'] );
-    return $this->_createElement( 'DURATION', $attributes, $this->_format_duration( $this->duration['value'] ));
+    $attributes = $this->_createParams($this->duration['params']);
+    return $this->_createElement('DURATION', $attributes, $this->_format_duration($this->duration['value']));
   }
 /**
  * set calendar component property duration
@@ -2462,20 +2462,20 @@ 
  * @param array $params optional
  * @return bool
  */
-  function setDuration( $week, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
-    if( empty( $week )) if( $this->getConfig( 'allowEmpty' )) $week = null; else return FALSE;
-    if( is_array( $week ) && ( 1 <= count( $week )))
-      $this->duration = array( 'value' => $this->_duration_array( $week ), 'params' => $this->_setParams( $day ));
-    elseif( is_string( $week ) && ( 3 <= strlen( trim( $week )))) {
-      $week = trim( $week );
-      if( in_array( substr( $week, 0, 1 ), array( '+', '-' )))
-        $week = substr( $week, 1 );
-      $this->duration = array( 'value' => $this->_duration_string( $week ), 'params' => $this->_setParams( $day ));
-    }
-    elseif( empty( $week ) && empty( $day ) && empty( $hour ) && empty( $min ) && empty( $sec ))
+  function setDuration($week, $day = FALSE, $hour = FALSE, $min = FALSE, $sec = FALSE, $params = FALSE) {
+    if (empty($week)) if ($this->getConfig('allowEmpty')) $week = null; else return FALSE;
+    if (is_array($week) && (1 <= count($week)))
+      $this->duration = array('value' => $this->_duration_array($week), 'params' => $this->_setParams($day));
+    elseif (is_string($week) && (3 <= strlen(trim($week)))) {
+      $week = trim($week);
+      if (in_array(substr($week, 0, 1), array('+', '-')))
+        $week = substr($week, 1);
+      $this->duration = array('value' => $this->_duration_string($week), 'params' => $this->_setParams($day));
+    }
+    elseif (empty($week) && empty($day) && empty($hour) && empty($min) && empty($sec))
       return FALSE;
     else
-      $this->duration = array( 'value' => $this->_duration_array( array( $week, $day, $hour, $min, $sec )), 'params' => $this->_setParams( $params ));
+      $this->duration = array('value' => $this->_duration_array(array($week, $day, $hour, $min, $sec)), 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -2490,36 +2490,36 @@ 
  * @return string
  */
   function createExdate() {
-    if( empty( $this->exdate )) return FALSE;
+    if (empty($this->exdate)) return FALSE;
     $output = null;
-    foreach( $this->exdate as $ex => $theExdate ) {
-      if( empty( $theExdate['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'EXDATE' );
+    foreach ($this->exdate as $ex => $theExdate) {
+      if (empty($theExdate['value'])) {
+        if ($this->getConfig('allowEmpty')) $output .= $this->_createElement('EXDATE');
         continue;
       }
       $content = $attributes = null;
-      foreach( $theExdate['value'] as $eix => $exdatePart ) {
-        $parno = count( $exdatePart );
-        $formatted = $this->_format_date_time( $exdatePart, $parno );
-        if( isset( $theExdate['params']['TZID'] ))
-          $formatted = str_replace( 'Z', '', $formatted);
-        if( 0 < $eix ) {
-          if( isset( $theExdate['value'][0]['tz'] )) {
-            if( ctype_digit( substr( $theExdate['value'][0]['tz'], -4 )) ||
-               ( 'Z' == $theExdate['value'][0]['tz'] )) {
-              if( 'Z' != substr( $formatted, -1 ))
+      foreach ($theExdate['value'] as $eix => $exdatePart) {
+        $parno = count($exdatePart);
+        $formatted = $this->_format_date_time($exdatePart, $parno);
+        if (isset($theExdate['params']['TZID']))
+          $formatted = str_replace('Z', '', $formatted);
+        if (0 < $eix) {
+          if (isset($theExdate['value'][0]['tz'])) {
+            if (ctype_digit(substr($theExdate['value'][0]['tz'], -4)) ||
+               ('Z' == $theExdate['value'][0]['tz'])) {
+              if ('Z' != substr($formatted, -1))
                 $formatted .= 'Z';
             }
             else
-              $formatted = str_replace( 'Z', '', $formatted );
+              $formatted = str_replace('Z', '', $formatted);
           }
           else
-            $formatted = str_replace( 'Z', '', $formatted );
+            $formatted = str_replace('Z', '', $formatted);
         }
-        $content .= ( 0 < $eix ) ? ','.$formatted : $formatted;
+        $content .= (0 < $eix) ? ','.$formatted : $formatted;
       }
-      $attributes .= $this->_createParams( $theExdate['params'] );
-      $output .= $this->_createElement( 'EXDATE', $attributes, $content );
+      $attributes .= $this->_createParams($theExdate['params']);
+      $output .= $this->_createElement('EXDATE', $attributes, $content);
     }
     return $output;
   }
@@ -2533,44 +2533,44 @@ 
  * @param integer $index, optional
  * @return bool
  */
-  function setExdate( $exdates, $params=FALSE, $index=FALSE ) {
-    if( empty( $exdates )) {
-      if( $this->getConfig( 'allowEmpty' )) {
-        $this->_setMval( $this->exdate, null, $params, FALSE, $index );
+  function setExdate($exdates, $params = FALSE, $index = FALSE) {
+    if (empty($exdates)) {
+      if ($this->getConfig('allowEmpty')) {
+        $this->_setMval($this->exdate, null, $params, FALSE, $index);
         return TRUE;
       }
       else
         return FALSE;
     }
-    $input  = array( 'params' => $this->_setParams( $params, array( 'VALUE' => 'DATE-TIME' )));
+    $input = array('params' => $this->_setParams($params, array('VALUE' => 'DATE-TIME')));
             /* ev. check 1:st date and save ev. timezone **/
-    $this->_chkdatecfg( reset( $exdates ), $parno, $input['params'] );
-    $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME' ); // remove default parameter
-    foreach( $exdates as $eix => $theExdate ) {
-      if( $this->_isArrayTimestampDate( $theExdate ))
-        $exdatea = $this->_timestamp2date( $theExdate, $parno );
-      elseif(  is_array( $theExdate ))
-        $exdatea = $this->_date_time_array( $theExdate, $parno );
-      elseif( 8 <= strlen( trim( $theExdate ))) // ex. 2006-08-03 10:12:18
-        $exdatea = $this->_date_time_string( $theExdate, $parno );
-      if( 3 == $parno )
-        unset( $exdatea['hour'], $exdatea['min'], $exdatea['sec'], $exdatea['tz'] );
-      elseif( isset( $exdatea['tz'] ))
+    $this->_chkdatecfg(reset($exdates), $parno, $input['params']);
+    $this->_existRem($input['params'], 'VALUE', 'DATE-TIME'); // remove default parameter
+    foreach ($exdates as $eix => $theExdate) {
+      if ($this->_isArrayTimestampDate($theExdate))
+        $exdatea = $this->_timestamp2date($theExdate, $parno);
+      elseif (is_array($theExdate))
+        $exdatea = $this->_date_time_array($theExdate, $parno);
+      elseif (8 <= strlen(trim($theExdate))) // ex. 2006-08-03 10:12:18
+        $exdatea = $this->_date_time_string($theExdate, $parno);
+      if (3 == $parno)
+        unset($exdatea['hour'], $exdatea['min'], $exdatea['sec'], $exdatea['tz']);
+      elseif (isset($exdatea['tz']))
         $exdatea['tz'] = (string) $exdatea['tz'];
-      if(  isset( $input['params']['TZID'] ) ||
-         ( isset( $exdatea['tz'] ) && !$this->_isOffset( $exdatea['tz'] )) ||
-         ( isset( $input['value'][0] ) && ( !isset( $input['value'][0]['tz'] ))) ||
-         ( isset( $input['value'][0]['tz'] ) && !$this->_isOffset( $input['value'][0]['tz'] )))
-        unset( $exdatea['tz'] );
+      if (isset($input['params']['TZID']) ||
+         (isset($exdatea['tz']) && !$this->_isOffset($exdatea['tz'])) ||
+         (isset($input['value'][0]) && (!isset($input['value'][0]['tz']))) ||
+         (isset($input['value'][0]['tz']) && !$this->_isOffset($input['value'][0]['tz'])))
+        unset($exdatea['tz']);
       $input['value'][] = $exdatea;
     }
-    if( 0 >= count( $input['value'] ))
+    if (0 >= count($input['value']))
       return FALSE;
-    if( 3 == $parno ) {
+    if (3 == $parno) {
       $input['params']['VALUE'] = 'DATE';
-      unset( $input['params']['TZID'] );
+      unset($input['params']['TZID']);
     }
-    $this->_setMval( $this->exdate, $input['value'], $input['params'], FALSE, $index );
+    $this->_setMval($this->exdate, $input['value'], $input['params'], FALSE, $index);
     return TRUE;
   }
 /*********************************************************************************/
@@ -2585,8 +2585,8 @@ 
  * @return string
  */
   function createExrule() {
-    if( empty( $this->exrule )) return FALSE;
-    return $this->_format_recur( 'EXRULE', $this->exrule );
+    if (empty($this->exrule)) return FALSE;
+    return $this->_format_recur('EXRULE', $this->exrule);
   }
 /**
  * set calendar component property exdate
@@ -2598,9 +2598,9 @@ 
  * @param integer $index, optional
  * @return bool
  */
-  function setExrule( $exruleset, $params=FALSE, $index=FALSE ) {
-    if( empty( $exruleset )) if( $this->getConfig( 'allowEmpty' )) $exruleset = null; else return FALSE;
-    $this->_setMval( $this->exrule, $this->_setRexrule( $exruleset ), $params, FALSE, $index );
+  function setExrule($exruleset, $params = FALSE, $index = FALSE) {
+    if (empty($exruleset)) if ($this->getConfig('allowEmpty')) $exruleset = null; else return FALSE;
+    $this->_setMval($this->exrule, $this->_setRexrule($exruleset), $params, FALSE, $index);
     return TRUE;
   }
 /*********************************************************************************/
@@ -2615,47 +2615,47 @@ 
  * @return string
  */
   function createFreebusy() {
-    if( empty( $this->freebusy )) return FALSE;
+    if (empty($this->freebusy)) return FALSE;
     $output = null;
-    foreach( $this->freebusy as $freebusyPart ) {
-      if( empty( $freebusyPart['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'FREEBUSY' );
+    foreach ($this->freebusy as $freebusyPart) {
+      if (empty($freebusyPart['value'])) {
+        if ($this->getConfig('allowEmpty')) $output .= $this->_createElement('FREEBUSY');
         continue;
       }
       $attributes = $content = null;
-      if( isset( $freebusyPart['value']['fbtype'] )) {
+      if (isset($freebusyPart['value']['fbtype'])) {
         $attributes .= $this->intAttrDelimiter.'FBTYPE='.$freebusyPart['value']['fbtype'];
-        unset( $freebusyPart['value']['fbtype'] );
-        $freebusyPart['value'] = array_values( $freebusyPart['value'] );
+        unset($freebusyPart['value']['fbtype']);
+        $freebusyPart['value'] = array_values($freebusyPart['value']);
       }
       else
         $attributes .= $this->intAttrDelimiter.'FBTYPE=BUSY';
-      $attributes .= $this->_createParams( $freebusyPart['params'] );
+      $attributes .= $this->_createParams($freebusyPart['params']);
       $fno = 1;
-      $cnt = count( $freebusyPart['value']);
-      foreach( $freebusyPart['value'] as $periodix => $freebusyPeriod ) {
-        $formatted   = $this->_format_date_time( $freebusyPeriod[0] );
+      $cnt = count($freebusyPart['value']);
+      foreach ($freebusyPart['value'] as $periodix => $freebusyPeriod) {
+        $formatted = $this->_format_date_time($freebusyPeriod[0]);
         $content .= $formatted;
         $content .= '/';
-        $cnt2 = count( $freebusyPeriod[1]);
-        if( array_key_exists( 'year', $freebusyPeriod[1] ))      // date-time
+        $cnt2 = count($freebusyPeriod[1]);
+        if (array_key_exists('year', $freebusyPeriod[1]))      // date-time
           $cnt2 = 7;
-        elseif( array_key_exists( 'week', $freebusyPeriod[1] ))  // duration
+        elseif (array_key_exists('week', $freebusyPeriod[1]))  // duration
           $cnt2 = 5;
-        if(( 7 == $cnt2 )   &&    // period=  -> date-time
-            isset( $freebusyPeriod[1]['year'] )  &&
-            isset( $freebusyPeriod[1]['month'] ) &&
-            isset( $freebusyPeriod[1]['day'] )) {
-          $content .= $this->_format_date_time( $freebusyPeriod[1] );
+        if ((7 == $cnt2) && // period=  -> date-time
+            isset($freebusyPeriod[1]['year']) &&
+            isset($freebusyPeriod[1]['month']) &&
+            isset($freebusyPeriod[1]['day'])) {
+          $content .= $this->_format_date_time($freebusyPeriod[1]);
         }
         else {                                  // period=  -> dur-time
-          $content .= $this->_format_duration( $freebusyPeriod[1] );
+          $content .= $this->_format_duration($freebusyPeriod[1]);
         }
-        if( $fno < $cnt )
+        if ($fno < $cnt)
           $content .= ',';
         $fno++;
       }
-      $output .= $this->_createElement( 'FREEBUSY', $attributes, $content );
+      $output .= $this->_createElement('FREEBUSY', $attributes, $content);
     }
     return $output;
   }
@@ -2670,52 +2670,52 @@ 
  * @param integer $index, optional
  * @return bool
  */
-  function setFreebusy( $fbType, $fbValues, $params=FALSE, $index=FALSE ) {
-    if( empty( $fbValues )) {
-      if( $this->getConfig( 'allowEmpty' )) {
-        $this->_setMval( $this->freebusy, null, $params, FALSE, $index );
+  function setFreebusy($fbType, $fbValues, $params = FALSE, $index = FALSE) {
+    if (empty($fbValues)) {
+      if ($this->getConfig('allowEmpty')) {
+        $this->_setMval($this->freebusy, null, $params, FALSE, $index);
         return TRUE;
       }
       else
         return FALSE;
     }
-    $fbType = strtoupper( $fbType );
-    if(( !in_array( $fbType, array( 'FREE', 'BUSY', 'BUSY-UNAVAILABLE', 'BUSY-TENTATIVE' ))) &&
-       ( 'X-' != substr( $fbType, 0, 2 )))
+    $fbType = strtoupper($fbType);
+    if ((!in_array($fbType, array('FREE', 'BUSY', 'BUSY-UNAVAILABLE', 'BUSY-TENTATIVE'))) &&
+       ('X-' != substr($fbType, 0, 2)))
       $fbType = 'BUSY';
-    $input = array( 'fbtype' => $fbType );
-    foreach( $fbValues as $fbPeriod ) {   // periods => period
+    $input = array('fbtype' => $fbType);
+    foreach ($fbValues as $fbPeriod) {   // periods => period
       $freebusyPeriod = array();
-      foreach( $fbPeriod as $fbMember ) { // pairs => singlepart
+      foreach ($fbPeriod as $fbMember) { // pairs => singlepart
         $freebusyPairMember = array();
-        if( is_array( $fbMember )) {
-          if( $this->_isArrayDate( $fbMember )) { // date-time value
-            $freebusyPairMember       = $this->_date_time_array( $fbMember, 7 );
+        if (is_array($fbMember)) {
+          if ($this->_isArrayDate($fbMember)) { // date-time value
+            $freebusyPairMember       = $this->_date_time_array($fbMember, 7);
             $freebusyPairMember['tz'] = 'Z';
           }
-          elseif( $this->_isArrayTimestampDate( $fbMember )) { // timestamp value
-            $freebusyPairMember       = $this->_timestamp2date( $fbMember['timestamp'], 7 );
+          elseif ($this->_isArrayTimestampDate($fbMember)) { // timestamp value
+            $freebusyPairMember       = $this->_timestamp2date($fbMember['timestamp'], 7);
             $freebusyPairMember['tz'] = 'Z';
           }
           else {                                         // array format duration
-            $freebusyPairMember = $this->_duration_array( $fbMember );
+            $freebusyPairMember = $this->_duration_array($fbMember);
           }
         }
-        elseif(( 3 <= strlen( trim( $fbMember ))) &&    // string format duration
-               ( in_array( $fbMember{0}, array( 'P', '+', '-' )))) {
-          if( 'P' != $fbMember{0} )
-            $fbmember = substr( $fbMember, 1 );
-          $freebusyPairMember = $this->_duration_string( $fbMember );
+        elseif ((3 <= strlen(trim($fbMember))) && // string format duration
+               (in_array($fbMember{0}, array('P', '+', '-')))) {
+          if ('P' != $fbMember{0} )
+            $fbmember = substr($fbMember, 1);
+          $freebusyPairMember = $this->_duration_string($fbMember);
         }
-        elseif( 8 <= strlen( trim( $fbMember ))) { // text date ex. 2006-08-03 10:12:18
-          $freebusyPairMember       = $this->_date_time_string( $fbMember, 7 );
+        elseif (8 <= strlen(trim($fbMember))) { // text date ex. 2006-08-03 10:12:18
+          $freebusyPairMember       = $this->_date_time_string($fbMember, 7);
           $freebusyPairMember['tz'] = 'Z';
         }
         $freebusyPeriod[]   = $freebusyPairMember;
       }
       $input[]              = $freebusyPeriod;
     }
-    $this->_setMval( $this->freebusy, $input, $params, FALSE, $index );
+    $this->_setMval($this->freebusy, $input, $params, FALSE, $index);
     return TRUE;
   }
 /*********************************************************************************/
@@ -2730,15 +2730,15 @@ 
  * @return string
  */
   function createGeo() {
-    if( empty( $this->geo )) return FALSE;
-    if( empty( $this->geo['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'GEO' ) : FALSE;
-    $attributes = $this->_createParams( $this->geo['params'] );
+    if (empty($this->geo)) return FALSE;
+    if (empty($this->geo['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('GEO') : FALSE;
+    $attributes = $this->_createParams($this->geo['params']);
     $content    = null;
-    $content   .= number_format( (float) $this->geo['value']['latitude'], 6, '.', '');
+    $content   .= number_format((float) $this->geo['value']['latitude'], 6, '.', '');
     $content   .= ';';
-    $content   .= number_format( (float) $this->geo['value']['longitude'], 6, '.', '');
-    return $this->_createElement( 'GEO', $attributes, $content );
+    $content   .= number_format((float) $this->geo['value']['longitude'], 6, '.', '');
+    return $this->_createElement('GEO', $attributes, $content);
   }
 /**
  * set calendar component property geo
@@ -2750,15 +2750,15 @@ 
  * @param array $params optional
  * @return bool
  */
-  function setGeo( $latitude, $longitude, $params=FALSE ) {
-    if( !empty( $latitude ) && !empty( $longitude )) {
-      if( !is_array( $this->geo )) $this->geo = array();
+  function setGeo($latitude, $longitude, $params = FALSE) {
+    if (!empty($latitude) && !empty($longitude)) {
+      if (!is_array($this->geo)) $this->geo = array();
       $this->geo['value']['latitude']  = $latitude;
       $this->geo['value']['longitude'] = $longitude;
-      $this->geo['params'] = $this->_setParams( $params );
+      $this->geo['params'] = $this->_setParams($params);
     }
-    elseif( $this->getConfig( 'allowEmpty' ))
-      $this->geo = array( 'value' => null, 'params' => $this->_setParams( $params ) );
+    elseif ($this->getConfig('allowEmpty'))
+      $this->geo = array('value' => null, 'params' => $this->_setParams($params));
     else
       return FALSE;
     return TRUE;
@@ -2775,10 +2775,10 @@ 
  * @return string
  */
   function createLastModified() {
-    if( empty( $this->lastmodified )) return FALSE;
-    $attributes = $this->_createParams( $this->lastmodified['params'] );
-    $formatted  = $this->_format_date_time( $this->lastmodified['value'], 7 );
-    return $this->_createElement( 'LAST-MODIFIED', $attributes, $formatted );
+    if (empty($this->lastmodified)) return FALSE;
+    $attributes = $this->_createParams($this->lastmodified['params']);
+    $formatted  = $this->_format_date_time($this->lastmodified['value'], 7);
+    return $this->_createElement('LAST-MODIFIED', $attributes, $formatted);
   }
 /**
  * set calendar component property completed
@@ -2794,10 +2794,10 @@ 
  * @param array $params optional
  * @return boll
  */
-  function setLastModified( $year=FALSE, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
-    if( empty( $year ))
-      $year = date('Ymd\THis', mktime( date( 'H' ), date( 'i' ), date( 's' ) - date( 'Z'), date( 'm' ), date( 'd' ), date( 'Y' )));
-    $this->lastmodified = $this->_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
+  function setLastModified($year = FALSE, $month = FALSE, $day = FALSE, $hour = FALSE, $min = FALSE, $sec = FALSE, $params = FALSE) {
+    if (empty($year))
+      $year = date('Ymd\THis', mktime(date('H'), date('i'), date('s') - date('Z'), date('m'), date('d'), date('Y')));
+    $this->lastmodified = $this->_setDate2($year, $month, $day, $hour, $min, $sec, $params);
     return TRUE;
   }
 /*********************************************************************************/
@@ -2812,12 +2812,12 @@ 
  * @return string
  */
   function createLocation() {
-    if( empty( $this->location )) return FALSE;
-    if( empty( $this->location['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'LOCATION' ) : FALSE;
-    $attributes = $this->_createParams( $this->location['params'], array( 'ALTREP', 'LANGUAGE' ));
-    $content    = $this->_strrep( $this->location['value'] );
-    return $this->_createElement( 'LOCATION', $attributes, $content );
+    if (empty($this->location)) return FALSE;
+    if (empty($this->location['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('LOCATION') : FALSE;
+    $attributes = $this->_createParams($this->location['params'], array('ALTREP', 'LANGUAGE'));
+    $content    = $this->_strrep($this->location['value']);
+    return $this->_createElement('LOCATION', $attributes, $content);
   }
 /**
  * set calendar component property location
@@ -2828,9 +2828,9 @@ 
  * @param array params optional
  * @return bool
  */
-  function setLocation( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->location = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setLocation($value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->location = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -2845,13 +2845,13 @@ 
  * @return string
  */
   function createOrganizer() {
-    if( empty( $this->organizer )) return FALSE;
-    if( empty( $this->organizer['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'ORGANIZER' ) : FALSE;
-    $attributes = $this->_createParams( $this->organizer['params']
-                                      , array( 'CN', 'DIR', 'LANGUAGE', 'SENT-BY' ));
+    if (empty($this->organizer)) return FALSE;
+    if (empty($this->organizer['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('ORGANIZER') : FALSE;
+    $attributes = $this->_createParams($this->organizer['params']
+                                      , array('CN', 'DIR', 'LANGUAGE', 'SENT-BY'));
     $content    = 'MAILTO:'.$this->organizer['value'];
-    return $this->_createElement( 'ORGANIZER', $attributes, $content );
+    return $this->_createElement('ORGANIZER', $attributes, $content);
   }
 /**
  * set calendar component property organizer
@@ -2862,14 +2862,14 @@ 
  * @param array params optional
  * @return bool
  */
-  function setOrganizer( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $value = str_replace ( 'MAILTO:', '', $value );
-    $value = str_replace ( 'mailto:', '', $value );
-    $this->organizer = array( 'value' => $value, 'params' => $this->_setParams( $params ));
-    if( isset( $this->organizer['params']['SENT-BY'] )) {
-      if( 'MAILTO' == strtoupper( substr( $this->organizer['params']['SENT-BY'], 0, 6 )))
-        $this->organizer['params']['SENT-BY'] = substr( $this->organizer['params']['SENT-BY'], 7 );
+  function setOrganizer($value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $value = str_replace('MAILTO:', '', $value);
+    $value = str_replace('mailto:', '', $value);
+    $this->organizer = array('value' => $value, 'params' => $this->_setParams($params));
+    if (isset($this->organizer['params']['SENT-BY'])) {
+      if ('MAILTO' == strtoupper(substr($this->organizer['params']['SENT-BY'], 0, 6)))
+        $this->organizer['params']['SENT-BY'] = substr($this->organizer['params']['SENT-BY'], 7);
     }
     return TRUE;
   }
@@ -2885,11 +2885,11 @@ 
  * @return string
  */
   function createPercentComplete() {
-    if( empty( $this->percentcomplete )) return FALSE;
-    if( empty( $this->percentcomplete['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'PERCENT-COMPLETE' ) : FALSE;
-    $attributes = $this->_createParams( $this->percentcomplete['params'] );
-    return $this->_createElement( 'PERCENT-COMPLETE', $attributes, $this->percentcomplete['value'] );
+    if (empty($this->percentcomplete)) return FALSE;
+    if (empty($this->percentcomplete['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('PERCENT-COMPLETE') : FALSE;
+    $attributes = $this->_createParams($this->percentcomplete['params']);
+    return $this->_createElement('PERCENT-COMPLETE', $attributes, $this->percentcomplete['value']);
   }
 /**
  * set calendar component property percent-complete
@@ -2900,9 +2900,9 @@ 
  * @param array $params optional
  * @return bool
  */
-  function setPercentComplete( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->percentcomplete = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setPercentComplete($value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->percentcomplete = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -2917,11 +2917,11 @@ 
  * @return string
  */
   function createPriority() {
-    if( empty( $this->priority )) return FALSE;
-    if( empty( $this->priority['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'PRIORITY' ) : FALSE;
-    $attributes = $this->_createParams( $this->priority['params'] );
-    return $this->_createElement( 'PRIORITY', $attributes, $this->priority['value'] );
+    if (empty($this->priority)) return FALSE;
+    if (empty($this->priority['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('PRIORITY') : FALSE;
+    $attributes = $this->_createParams($this->priority['params']);
+    return $this->_createElement('PRIORITY', $attributes, $this->priority['value']);
   }
 /**
  * set calendar component property priority
@@ -2932,9 +2932,9 @@ 
  * @param array $params optional
  * @return bool
  */
-  function setPriority( $value, $params=FALSE  ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->priority = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setPriority($value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->priority = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -2949,91 +2949,91 @@ 
  * @return string
  */
   function createRdate() {
-    if( empty( $this->rdate )) return FALSE;
-    $utctime = ( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) ? TRUE : FALSE;
+    if (empty($this->rdate)) return FALSE;
+    $utctime = (in_array($this->objName, array('vtimezone', 'standard', 'daylight'))) ? TRUE : FALSE;
     $output = null;
-    if( $utctime  )
-      unset( $this->rdate['params']['TZID'] );
-    foreach( $this->rdate as $theRdate ) {
-      if( empty( $theRdate['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'RDATE' );
+    if ($utctime)
+      unset($this->rdate['params']['TZID']);
+    foreach ($this->rdate as $theRdate) {
+      if (empty($theRdate['value'])) {
+        if ($this->getConfig('allowEmpty')) $output .= $this->_createElement('RDATE');
         continue;
       }
-      if( $utctime  )
-        unset( $theRdate['params']['TZID'] );
-      $attributes = $this->_createParams( $theRdate['params'] );
-      $cnt = count( $theRdate['value'] );
+      if ($utctime)
+        unset($theRdate['params']['TZID']);
+      $attributes = $this->_createParams($theRdate['params']);
+      $cnt = count($theRdate['value']);
       $content = null;
       $rno = 1;
-      foreach( $theRdate['value'] as $rpix => $rdatePart ) {
+      foreach ($theRdate['value'] as $rpix => $rdatePart) {
         $contentPart = null;
-        if( is_array( $rdatePart ) &&
-            isset( $theRdate['params']['VALUE'] ) && ( 'PERIOD' == $theRdate['params']['VALUE'] )) { // PERIOD
-          if( $utctime )
-            unset( $rdatePart[0]['tz'] );
-          $formatted = $this->_format_date_time( $rdatePart[0]); // PERIOD part 1
-          if( $utctime || !empty( $theRdate['params']['TZID'] ))
-            $formatted = str_replace( 'Z', '', $formatted);
-          if( 0 < $rpix ) {
-            if( !empty( $rdatePart[0]['tz'] ) && $this->_isOffset( $rdatePart[0]['tz'] )) {
-              if( 'Z' != substr( $formatted, -1 )) $formatted .= 'Z';
+        if (is_array($rdatePart) &&
+            isset($theRdate['params']['VALUE']) && ('PERIOD' == $theRdate['params']['VALUE'])) { // PERIOD
+          if ($utctime)
+            unset($rdatePart[0]['tz']);
+          $formatted = $this->_format_date_time($rdatePart[0]); // PERIOD part 1
+          if ($utctime || !empty($theRdate['params']['TZID']))
+            $formatted = str_replace('Z', '', $formatted);
+          if (0 < $rpix) {
+            if (!empty($rdatePart[0]['tz']) && $this->_isOffset($rdatePart[0]['tz'])) {
+              if ('Z' != substr($formatted, -1)) $formatted .= 'Z';
             }
             else
-              $formatted = str_replace( 'Z', '', $formatted );
+              $formatted = str_replace('Z', '', $formatted);
           }
           $contentPart .= $formatted;
           $contentPart .= '/';
-          $cnt2 = count( $rdatePart[1]);
-          if( array_key_exists( 'year', $rdatePart[1] )) {
-            if( array_key_exists( 'hour', $rdatePart[1] ))
-              $cnt2 = 7;                                      // date-time
+          $cnt2 = count($rdatePart[1]);
+          if (array_key_exists('year', $rdatePart[1])) {
+            if (array_key_exists('hour', $rdatePart[1]))
+              $cnt2 = 7; // date-time
             else
-              $cnt2 = 3;                                      // date
+              $cnt2 = 3; // date
           }
-          elseif( array_key_exists( 'week', $rdatePart[1] ))  // duration
+          elseif (array_key_exists('week', $rdatePart[1]))  // duration
             $cnt2 = 5;
-          if(( 7 == $cnt2 )   &&    // period=  -> date-time
-              isset( $rdatePart[1]['year'] )  &&
-              isset( $rdatePart[1]['month'] ) &&
-              isset( $rdatePart[1]['day'] )) {
-            if( $utctime )
-              unset( $rdatePart[1]['tz'] );
-            $formatted = $this->_format_date_time( $rdatePart[1] ); // PERIOD part 2
-            if( $utctime || !empty( $theRdate['params']['TZID'] ))
-              $formatted = str_replace( 'Z', '', $formatted);
-            if( !empty( $rdatePart[0]['tz'] ) && $this->_isOffset( $rdatePart[0]['tz'] )) {
-              if( 'Z' != substr( $formatted, -1 )) $formatted .= 'Z';
+          if ((7 == $cnt2) && // period=  -> date-time
+              isset($rdatePart[1]['year']) &&
+              isset($rdatePart[1]['month']) &&
+              isset($rdatePart[1]['day'])) {
+            if ($utctime)
+              unset($rdatePart[1]['tz']);
+            $formatted = $this->_format_date_time($rdatePart[1]); // PERIOD part 2
+            if ($utctime || !empty($theRdate['params']['TZID']))
+              $formatted = str_replace('Z', '', $formatted);
+            if (!empty($rdatePart[0]['tz']) && $this->_isOffset($rdatePart[0]['tz'])) {
+              if ('Z' != substr($formatted, -1)) $formatted .= 'Z';
             }
             else
-              $formatted = str_replace( 'Z', '', $formatted );
+              $formatted = str_replace('Z', '', $formatted);
            $contentPart .= $formatted;
           }
           else {                                  // period=  -> dur-time
-            $contentPart .= $this->_format_duration( $rdatePart[1] );
+            $contentPart .= $this->_format_duration($rdatePart[1]);
           }
         } // PERIOD end
         else { // SINGLE date start
-          if( $utctime )
-            unset( $rdatePart['tz'] );
-          $formatted = $this->_format_date_time( $rdatePart);
-          if( $utctime || !empty( $theRdate['params']['TZID'] ))
-            $formatted = str_replace( 'Z', '', $formatted);
-          if( !$utctime && ( 0 < $rpix )) {
-            if( !empty( $theRdate['value'][0]['tz'] ) && $this->_isOffset( $theRdate['value'][0]['tz'] )) {
-              if( 'Z' != substr( $formatted, -1 ))
+          if ($utctime)
+            unset($rdatePart['tz']);
+          $formatted = $this->_format_date_time($rdatePart);
+          if ($utctime || !empty($theRdate['params']['TZID']))
+            $formatted = str_replace('Z', '', $formatted);
+          if (!$utctime && (0 < $rpix)) {
+            if (!empty($theRdate['value'][0]['tz']) && $this->_isOffset($theRdate['value'][0]['tz'])) {
+              if ('Z' != substr($formatted, -1))
                 $formatted .= 'Z';
             }
             else
-              $formatted = str_replace( 'Z', '', $formatted );
+              $formatted = str_replace('Z', '', $formatted);
           }
           $contentPart .= $formatted;
         }
         $content .= $contentPart;
-        if( $rno < $cnt )
+        if ($rno < $cnt)
           $content .= ',';
         $rno++;
       }
-      $output    .= $this->_createElement( 'RDATE', $attributes, $content );
+      $output .= $this->_createElement('RDATE', $attributes, $content);
     }
     return $output;
   }
@@ -3047,93 +3047,93 @@ 
  * @param integer $index, optional
  * @return bool
  */
-  function setRdate( $rdates, $params=FALSE, $index=FALSE ) {
-    if( empty( $rdates )) {
-      if( $this->getConfig( 'allowEmpty' )) {
-        $this->_setMval( $this->rdate, null, $params, FALSE, $index );
+  function setRdate($rdates, $params = FALSE, $index = FALSE) {
+    if (empty($rdates)) {
+      if ($this->getConfig('allowEmpty')) {
+        $this->_setMval($this->rdate, null, $params, FALSE, $index);
         return TRUE;
       }
       else
         return FALSE;
     }
-    $input = array( 'params' => $this->_setParams( $params, array( 'VALUE' => 'DATE-TIME' )));
-    if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) {
-      unset( $input['params']['TZID'] );
+    $input = array('params' => $this->_setParams($params, array('VALUE' => 'DATE-TIME')));
+    if (in_array($this->objName, array('vtimezone', 'standard', 'daylight'))) {
+      unset($input['params']['TZID']);
       $input['params']['VALUE'] = 'DATE-TIME';
     }
             /*  check if PERIOD, if not set */
-    if((!isset( $input['params']['VALUE'] ) || !in_array( $input['params']['VALUE'], array( 'DATE', 'PERIOD' ))) &&
-          isset( $rdates[0] )    && is_array( $rdates[0] ) && ( 2 == count( $rdates[0] )) &&
-          isset( $rdates[0][0] ) &&    isset( $rdates[0][1] ) && !isset( $rdates[0]['timestamp'] ) &&
-    (( is_array( $rdates[0][0] ) && ( isset( $rdates[0][0]['timestamp'] ) ||
-                                      $this->_isArrayDate( $rdates[0][0] ))) ||
-                                    ( is_string( $rdates[0][0] ) && ( 8 <= strlen( trim( $rdates[0][0] )))))  &&
-     ( is_array( $rdates[0][1] ) || ( is_string( $rdates[0][1] ) && ( 3 <= strlen( trim( $rdates[0][1] ))))))
+    if ((!isset($input['params']['VALUE']) || !in_array($input['params']['VALUE'], array('DATE', 'PERIOD'))) &&
+          isset($rdates[0]) && is_array($rdates[0]) && (2 == count($rdates[0])) &&
+          isset($rdates[0][0]) && isset($rdates[0][1]) && !isset($rdates[0]['timestamp']) &&
+    ((is_array($rdates[0][0]) && (isset($rdates[0][0]['timestamp']) ||
+                                      $this->_isArrayDate($rdates[0][0]))) ||
+                                    (is_string($rdates[0][0]) && (8 <= strlen(trim($rdates[0][0]))))) &&
+     (is_array($rdates[0][1]) || (is_string($rdates[0][1]) && (3 <= strlen(trim($rdates[0][1]))))))
       $input['params']['VALUE'] = 'PERIOD';
             /* check 1:st date, upd. $parno (opt) and save ev. timezone **/
-    $date  = reset( $rdates );
-    if( isset( $input['params']['VALUE'] ) && ( 'PERIOD' == $input['params']['VALUE'] )) // PERIOD
-      $date  = reset( $date );
-    $this->_chkdatecfg( $date, $parno, $input['params'] );
-    if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' )))
-      unset( $input['params']['TZID'] );
-    $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME' ); // remove default
-    foreach( $rdates as $rpix => $theRdate ) {
+    $date = reset($rdates);
+    if (isset($input['params']['VALUE']) && ('PERIOD' == $input['params']['VALUE'])) // PERIOD
+      $date = reset($date);
+    $this->_chkdatecfg($date, $parno, $input['params']);
+    if (in_array($this->objName, array('vtimezone', 'standard', 'daylight')))
+      unset($input['params']['TZID']);
+    $this->_existRem($input['params'], 'VALUE', 'DATE-TIME'); // remove default
+    foreach ($rdates as $rpix => $theRdate) {
       $inputa = null;
-      if( is_array( $theRdate )) {
-        if( isset( $input['params']['VALUE'] ) && ( 'PERIOD' == $input['params']['VALUE'] )) { // PERIOD
-          foreach( $theRdate as $rix => $rPeriod ) {
-            if( is_array( $rPeriod )) {
-              if( $this->_isArrayTimestampDate( $rPeriod ))      // timestamp
-                $inputab  = ( isset( $rPeriod['tz'] )) ? $this->_timestamp2date( $rPeriod, $parno ) : $this->_timestamp2date( $rPeriod, 6 );
-              elseif( $this->_isArrayDate( $rPeriod ))
-                $inputab  = ( 3 < count ( $rPeriod )) ? $this->_date_time_array( $rPeriod, $parno ) : $this->_date_time_array( $rPeriod, 6 );
-              elseif (( 1 == count( $rPeriod )) && ( 8 <= strlen( reset( $rPeriod ))))  // text-date
-                $inputab  = $this->_date_time_string( reset( $rPeriod ), $parno );
+      if (is_array($theRdate)) {
+        if (isset($input['params']['VALUE']) && ('PERIOD' == $input['params']['VALUE'])) { // PERIOD
+          foreach ($theRdate as $rix => $rPeriod) {
+            if (is_array($rPeriod)) {
+              if ($this->_isArrayTimestampDate($rPeriod))      // timestamp
+                $inputab  = (isset($rPeriod['tz'])) ? $this->_timestamp2date($rPeriod, $parno) : $this->_timestamp2date($rPeriod, 6);
+              elseif ($this->_isArrayDate($rPeriod))
+                $inputab  = (3 < count($rPeriod)) ? $this->_date_time_array($rPeriod, $parno) : $this->_date_time_array($rPeriod, 6);
+              elseif ((1 == count($rPeriod)) && (8 <= strlen(reset($rPeriod))))  // text-date
+                $inputab  = $this->_date_time_string(reset($rPeriod), $parno);
               else                                               // array format duration
-                $inputab  = $this->_duration_array( $rPeriod );
+                $inputab  = $this->_duration_array($rPeriod);
             }
-            elseif(( 3 <= strlen( trim( $rPeriod ))) &&          // string format duration
-                   ( in_array( $rPeriod{0}, array( 'P', '+', '-' )))) {
-              if( 'P' != $rPeriod{0} )
-                $rPeriod  = substr( $rPeriod, 1 );
-              $inputab    = $this->_duration_string( $rPeriod );
+            elseif ((3 <= strlen(trim($rPeriod))) && // string format duration
+                   (in_array($rPeriod{0}, array('P', '+', '-')))) {
+              if ('P' != $rPeriod{0} )
+                $rPeriod  = substr($rPeriod, 1);
+              $inputab    = $this->_duration_string($rPeriod);
             }
-            elseif( 8 <= strlen( trim( $rPeriod )))              // text date ex. 2006-08-03 10:12:18
-              $inputab    = $this->_date_time_string( $rPeriod, $parno );
-            if(  isset( $input['params']['TZID'] ) ||
-               ( isset( $inputab['tz'] )   && !$this->_isOffset( $inputab['tz'] )) ||
-               ( isset( $inputa[0] )       && ( !isset( $inputa[0]['tz'] )))       ||
-               ( isset( $inputa[0]['tz'] ) && !$this->_isOffset( $inputa[0]['tz'] )))
-              unset( $inputab['tz'] );
-            $inputa[]     = $inputab;
+            elseif (8 <= strlen(trim($rPeriod)))              // text date ex. 2006-08-03 10:12:18
+              $inputab    = $this->_date_time_string($rPeriod, $parno);
+            if (isset($input['params']['TZID']) ||
+               (isset($inputab['tz']) && !$this->_isOffset($inputab['tz'])) ||
+               (isset($inputa[0]) && (!isset($inputa[0]['tz']))) ||
+               (isset($inputa[0]['tz']) && !$this->_isOffset($inputa[0]['tz'])))
+              unset($inputab['tz']);
+            $inputa[] = $inputab;
           }
         } // PERIOD end
-        elseif ( $this->_isArrayTimestampDate( $theRdate ))      // timestamp
-          $inputa = $this->_timestamp2date( $theRdate, $parno );
+        elseif ($this->_isArrayTimestampDate($theRdate))      // timestamp
+          $inputa = $this->_timestamp2date($theRdate, $parno);
         else                                                     // date[-time]
-          $inputa = $this->_date_time_array( $theRdate, $parno );
+          $inputa = $this->_date_time_array($theRdate, $parno);
       }
-      elseif( 8 <= strlen( trim( $theRdate )))                   // text date ex. 2006-08-03 10:12:18
-        $inputa       = $this->_date_time_string( $theRdate, $parno );
-      if( !isset( $input['params']['VALUE'] ) || ( 'PERIOD' != $input['params']['VALUE'] )) { // no PERIOD
-        if( 3 == $parno )
-          unset( $inputa['hour'], $inputa['min'], $inputa['sec'], $inputa['tz'] );
-        elseif( isset( $inputa['tz'] ))
+      elseif (8 <= strlen(trim($theRdate)))                   // text date ex. 2006-08-03 10:12:18
+        $inputa = $this->_date_time_string($theRdate, $parno);
+      if (!isset($input['params']['VALUE']) || ('PERIOD' != $input['params']['VALUE'])) { // no PERIOD
+        if (3 == $parno)
+          unset($inputa['hour'], $inputa['min'], $inputa['sec'], $inputa['tz']);
+        elseif (isset($inputa['tz']))
           $inputa['tz'] = (string) $inputa['tz'];
-        if(  isset( $input['params']['TZID'] ) ||
-           ( isset( $inputa['tz'] )            && !$this->_isOffset( $inputa['tz'] ))     ||
-           ( isset( $input['value'][0] )       && ( !isset( $input['value'][0]['tz'] )))  ||
-           ( isset( $input['value'][0]['tz'] ) && !$this->_isOffset( $input['value'][0]['tz'] )))
-          unset( $inputa['tz'] );
+        if (isset($input['params']['TZID']) ||
+           (isset($inputa['tz']) && !$this->_isOffset($inputa['tz'])) ||
+           (isset($input['value'][0]) && (!isset($input['value'][0]['tz']))) ||
+           (isset($input['value'][0]['tz']) && !$this->_isOffset($input['value'][0]['tz'])))
+          unset($inputa['tz']);
       }
       $input['value'][] = $inputa;
     }
-    if( 3 == $parno ) {
+    if (3 == $parno) {
       $input['params']['VALUE'] = 'DATE';
-      unset( $input['params']['TZID'] );
+      unset($input['params']['TZID']);
     }
-    $this->_setMval( $this->rdate, $input['value'], $input['params'], FALSE, $index );
+    $this->_setMval($this->rdate, $input['value'], $input['params'], FALSE, $index);
     return TRUE;
   }
 /*********************************************************************************/
@@ -3148,12 +3148,12 @@ 
  * @return string
  */
   function createRecurrenceid() {
-    if( empty( $this->recurrenceid )) return FALSE;
-    if( empty( $this->recurrenceid['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'RECURRENCE-ID' ) : FALSE;
-    $formatted  = $this->_format_date_time( $this->recurrenceid['value'] );
-    $attributes = $this->_createParams( $this->recurrenceid['params'] );
-    return $this->_createElement( 'RECURRENCE-ID', $attributes, $formatted );
+    if (empty($this->recurrenceid)) return FALSE;
+    if (empty($this->recurrenceid['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('RECURRENCE-ID') : FALSE;
+    $formatted  = $this->_format_date_time($this->recurrenceid['value']);
+    $attributes = $this->_createParams($this->recurrenceid['params']);
+    return $this->_createElement('RECURRENCE-ID', $attributes, $formatted);
   }
 /**
  * set calendar component property recurrence-id
@@ -3169,16 +3169,16 @@ 
  * @param array $params optional
  * @return bool
  */
-  function setRecurrenceid( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
-    if( empty( $year )) {
-      if( $this->getConfig( 'allowEmpty' )) {
-        $this->recurrenceid = array( 'value' => null, 'params' => null );
+  function setRecurrenceid($year, $month = FALSE, $day = FALSE, $hour = FALSE, $min = FALSE, $sec = FALSE, $tz = FALSE, $params = FALSE) {
+    if (empty($year)) {
+      if ($this->getConfig('allowEmpty')) {
+        $this->recurrenceid = array('value' => null, 'params' => null);
         return TRUE;
       }
       else
         return FALSE;
     }
-    $this->recurrenceid = $this->_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params );
+    $this->recurrenceid = $this->_setDate($year, $month, $day, $hour, $min, $sec, $tz, $params);
     return TRUE;
   }
 /*********************************************************************************/
@@ -3193,18 +3193,18 @@ 
  * @return string
  */
   function createRelatedTo() {
-    if( empty( $this->relatedto )) return FALSE;
+    if (empty($this->relatedto)) return FALSE;
     $output = null;
-    foreach( $this->relatedto as $relation ) {
-      if( empty( $relation['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output.= $this->_createElement( 'RELATED-TO', $this->_createParams( $relation['params'] ));
+    foreach ($this->relatedto as $relation) {
+      if (empty($relation['value'])) {
+        if ($this->getConfig('allowEmpty')) $output .= $this->_createElement('RELATED-TO', $this->_createParams($relation['params']));
         continue;
       }
-      $attributes = $this->_createParams( $relation['params'] );
-      $content    = ( 'xcal' != $this->format ) ? '<' : '';
-      $content   .= $this->_strrep( $relation['value'] );
-      $content   .= ( 'xcal' != $this->format ) ? '>' : '';
-      $output    .= $this->_createElement( 'RELATED-TO', $attributes, $content );
+      $attributes = $this->_createParams($relation['params']);
+      $content    = ('xcal' != $this->format) ? '<' : '';
+      $content   .= $this->_strrep($relation['value']);
+      $content   .= ('xcal' != $this->format) ? '>' : '';
+      $output    .= $this->_createElement('RELATED-TO', $attributes, $content);
     }
     return $output;
   }
@@ -3218,12 +3218,12 @@ 
  * @param index $index, optional
  * @return bool
  */
-  function setRelatedTo( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    if(( '<' == substr( $value, 0, 1 )) && ( '>' == substr( $value, -1 )))
-      $value = substr( $value, 1, ( strlen( $value ) - 2 ));
-    $this->_existRem( $params, 'RELTYPE', 'PARENT', TRUE ); // remove default
-    $this->_setMval( $this->relatedto, $value, $params, FALSE, $index );
+  function setRelatedTo($value, $params = FALSE, $index = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    if (('<' == substr($value, 0, 1)) && ('>' == substr($value, -1)))
+      $value = substr($value, 1, (strlen($value) - 2));
+    $this->_existRem($params, 'RELTYPE', 'PARENT', TRUE); // remove default
+    $this->_setMval($this->relatedto, $value, $params, FALSE, $index);
     return TRUE;
   }
 /*********************************************************************************/
@@ -3238,11 +3238,11 @@ 
  * @return string
  */
   function createRepeat() {
-    if( empty( $this->repeat )) return FALSE;
-    if( empty( $this->repeat['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'REPEAT' ) : FALSE;
-    $attributes = $this->_createParams( $this->repeat['params'] );
-    return $this->_createElement( 'REPEAT', $attributes, $this->repeat['value'] );
+    if (empty($this->repeat)) return FALSE;
+    if (empty($this->repeat['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('REPEAT') : FALSE;
+    $attributes = $this->_createParams($this->repeat['params']);
+    return $this->_createElement('REPEAT', $attributes, $this->repeat['value']);
   }
 /**
  * set calendar component property transp
@@ -3253,9 +3253,9 @@ 
  * @param array $params optional
  * @return void
  */
-  function setRepeat( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->repeat = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setRepeat($value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->repeat = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -3269,19 +3269,19 @@ 
  * @return string
  */
   function createRequestStatus() {
-    if( empty( $this->requeststatus )) return FALSE;
+    if (empty($this->requeststatus)) return FALSE;
     $output = null;
-    foreach( $this->requeststatus as $rstat ) {
-      if( empty( $rstat['value']['statcode'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'REQUEST-STATUS' );
+    foreach ($this->requeststatus as $rstat) {
+      if (empty($rstat['value']['statcode'])) {
+        if ($this->getConfig('allowEmpty')) $output .= $this->_createElement('REQUEST-STATUS');
         continue;
       }
-      $attributes  = $this->_createParams( $rstat['params'], array( 'LANGUAGE' ));
-      $content     = number_format( (float) $rstat['value']['statcode'], 2, '.', '');
-      $content    .= ';'.$this->_strrep( $rstat['value']['text'] );
-      if( isset( $rstat['value']['extdata'] ))
-        $content  .= ';'.$this->_strrep( $rstat['value']['extdata'] );
-      $output     .= $this->_createElement( 'REQUEST-STATUS', $attributes, $content );
+      $attributes  = $this->_createParams($rstat['params'], array('LANGUAGE'));
+      $content     = number_format((float) $rstat['value']['statcode'], 2, '.', '');
+      $content    .= ';'.$this->_strrep($rstat['value']['text']);
+      if (isset($rstat['value']['extdata']))
+        $content  .= ';'.$this->_strrep($rstat['value']['extdata']);
+      $output     .= $this->_createElement('REQUEST-STATUS', $attributes, $content);
     }
     return $output;
   }
@@ -3297,12 +3297,12 @@ 
  * @param integer $index, optional
  * @return bool
  */
-  function setRequestStatus( $statcode, $text, $extdata=FALSE, $params=FALSE, $index=FALSE ) {
-    if( empty( $statcode ) || empty( $text )) if( $this->getConfig( 'allowEmpty' )) $statcode = $text = null; else return FALSE;
-    $input              = array( 'statcode' => $statcode, 'text' => $text );
-    if( $extdata )
+  function setRequestStatus($statcode, $text, $extdata = FALSE, $params = FALSE, $index = FALSE) {
+    if (empty($statcode) || empty($text)) if ($this->getConfig('allowEmpty')) $statcode = $text = null; else return FALSE;
+    $input              = array('statcode' => $statcode, 'text' => $text);
+    if ($extdata)
       $input['extdata'] = $extdata;
-    $this->_setMval( $this->requeststatus, $input, $params, FALSE, $index );
+    $this->_setMval($this->requeststatus, $input, $params, FALSE, $index);
     return TRUE;
   }
 /*********************************************************************************/
@@ -3317,22 +3317,22 @@ 
  * @return string
  */
   function createResources() {
-    if( empty( $this->resources )) return FALSE;
+    if (empty($this->resources)) return FALSE;
     $output = null;
-    foreach( $this->resources as $resource ) {
-      if( empty( $resource['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'RESOURCES' );
+    foreach ($this->resources as $resource) {
+      if (empty($resource['value'])) {
+        if ($this->getConfig('allowEmpty')) $output .= $this->_createElement('RESOURCES');
         continue;
       }
-      $attributes  = $this->_createParams( $resource['params'], array( 'ALTREP', 'LANGUAGE' ));
-      if( is_array( $resource['value'] )) {
-        foreach( $resource['value'] as $rix => $resourcePart )
-          $resource['value'][$rix] = $this->_strrep( $resourcePart );
-        $content   = implode( ',', $resource['value'] );
+      $attributes = $this->_createParams($resource['params'], array('ALTREP', 'LANGUAGE'));
+      if (is_array($resource['value'])) {
+        foreach ($resource['value'] as $rix => $resourcePart)
+          $resource['value'][$rix] = $this->_strrep($resourcePart);
+        $content   = implode(',', $resource['value']);
       }
       else
-        $content   = $this->_strrep( $resource['value'] );
-      $output     .= $this->_createElement( 'RESOURCES', $attributes, $content );
+        $content   = $this->_strrep($resource['value']);
+      $output     .= $this->_createElement('RESOURCES', $attributes, $content);
     }
     return $output;
   }
@@ -3346,9 +3346,9 @@ 
  * @param integer $index, optional
  * @return bool
  */
-  function setResources( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->_setMval( $this->resources, $value, $params, FALSE, $index );
+  function setResources($value, $params = FALSE, $index = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->_setMval($this->resources, $value, $params, FALSE, $index);
     return TRUE;
   }
 /*********************************************************************************/
@@ -3363,8 +3363,8 @@ 
  * @return string
  */
   function createRrule() {
-    if( empty( $this->rrule )) return FALSE;
-    return $this->_format_recur( 'RRULE', $this->rrule );
+    if (empty($this->rrule)) return FALSE;
+    return $this->_format_recur('RRULE', $this->rrule);
   }
 /**
  * set calendar component property rrule
@@ -3376,9 +3376,9 @@ 
  * @param integer $index, optional
  * @return void
  */
-  function setRrule( $rruleset, $params=FALSE, $index=FALSE ) {
-    if( empty( $rruleset )) if( $this->getConfig( 'allowEmpty' )) $rruleset = null; else return FALSE;
-    $this->_setMval( $this->rrule, $this->_setRexrule( $rruleset ), $params, FALSE, $index );
+  function setRrule($rruleset, $params = FALSE, $index = FALSE) {
+    if (empty($rruleset)) if ($this->getConfig('allowEmpty')) $rruleset = null; else return FALSE;
+    $this->_setMval($this->rrule, $this->_setRexrule($rruleset), $params, FALSE, $index);
     return TRUE;
   }
 /*********************************************************************************/
@@ -3392,11 +3392,11 @@ 
  * @return string
  */
   function createSequence() {
-    if( empty( $this->sequence )) return FALSE;
-    if( empty( $this->sequence['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'SEQUENCE' ) : FALSE;
-    $attributes = $this->_createParams( $this->sequence['params'] );
-    return $this->_createElement( 'SEQUENCE', $attributes, $this->sequence['value'] );
+    if (empty($this->sequence)) return FALSE;
+    if (empty($this->sequence['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('SEQUENCE') : FALSE;
+    $attributes = $this->_createParams($this->sequence['params']);
+    return $this->_createElement('SEQUENCE', $attributes, $this->sequence['value']);
   }
 /**
  * set calendar component property sequence
@@ -3406,10 +3406,10 @@ 
  * @param array $params optional
  * @return bool
  */
-  function setSequence( $value=FALSE, $params=FALSE ) {
-    if( empty( $value ))
-      $value = ( isset( $this->sequence['value'] ) && ( 0 < $this->sequence['value'] )) ? $this->sequence['value'] + 1 : 1;
-    $this->sequence = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setSequence($value = FALSE, $params = FALSE) {
+    if (empty($value))
+      $value = (isset($this->sequence['value']) && (0 < $this->sequence['value'])) ? $this->sequence['value'] + 1 : 1;
+    $this->sequence = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -3424,11 +3424,11 @@ 
  * @return string
  */
   function createStatus() {
-    if( empty( $this->status )) return FALSE;
-    if( empty( $this->status['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'STATUS' ) : FALSE;
-    $attributes = $this->_createParams( $this->status['params'] );
-    return $this->_createElement( 'STATUS', $attributes, $this->status['value'] );
+    if (empty($this->status)) return FALSE;
+    if (empty($this->status['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('STATUS') : FALSE;
+    $attributes = $this->_createParams($this->status['params']);
+    return $this->_createElement('STATUS', $attributes, $this->status['value']);
   }
 /**
  * set calendar component property status
@@ -3439,9 +3439,9 @@ 
  * @param array $params optional
  * @return bool
  */
-  function setStatus( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->status = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setStatus($value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->status = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -3456,12 +3456,12 @@ 
  * @return string
  */
   function createSummary() {
-    if( empty( $this->summary )) return FALSE;
-    if( empty( $this->summary['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'SUMMARY' ) : FALSE;
-    $attributes = $this->_createParams( $this->summary['params'], array( 'ALTREP', 'LANGUAGE' ));
-    $content    = $this->_strrep( $this->summary['value'] );
-    return $this->_createElement( 'SUMMARY', $attributes, $content );
+    if (empty($this->summary)) return FALSE;
+    if (empty($this->summary['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('SUMMARY') : FALSE;
+    $attributes = $this->_createParams($this->summary['params'], array('ALTREP', 'LANGUAGE'));
+    $content    = $this->_strrep($this->summary['value']);
+    return $this->_createElement('SUMMARY', $attributes, $content);
   }
 /**
  * set calendar component property summary
@@ -3472,9 +3472,9 @@ 
  * @param string $params optional
  * @return bool
  */
-  function setSummary( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->summary = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setSummary($value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->summary = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -3489,11 +3489,11 @@ 
  * @return string
  */
   function createTransp() {
-    if( empty( $this->transp )) return FALSE;
-    if( empty( $this->transp['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TRANSP' ) : FALSE;
-    $attributes = $this->_createParams( $this->transp['params'] );
-    return $this->_createElement( 'TRANSP', $attributes, $this->transp['value'] );
+    if (empty($this->transp)) return FALSE;
+    if (empty($this->transp['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('TRANSP') : FALSE;
+    $attributes = $this->_createParams($this->transp['params']);
+    return $this->_createElement('TRANSP', $attributes, $this->transp['value']);
   }
 /**
  * set calendar component property transp
@@ -3504,9 +3504,9 @@ 
  * @param string $params optional
  * @return bool
  */
-  function setTransp( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->transp = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setTransp($value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->transp = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -3521,23 +3521,23 @@ 
  * @return string
  */
   function createTrigger() {
-    if( empty( $this->trigger )) return FALSE;
-    if( empty( $this->trigger['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TRIGGER' ) : FALSE;
+    if (empty($this->trigger)) return FALSE;
+    if (empty($this->trigger['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('TRIGGER') : FALSE;
     $content = $attributes = null;
-    if( isset( $this->trigger['value']['year'] )   &&
-        isset( $this->trigger['value']['month'] )  &&
-        isset( $this->trigger['value']['day'] ))
-      $content      .= $this->_format_date_time( $this->trigger['value'] );
+    if (isset($this->trigger['value']['year']) &&
+        isset($this->trigger['value']['month']) &&
+        isset($this->trigger['value']['day']))
+      $content      .= $this->_format_date_time($this->trigger['value']);
     else {
-      if( TRUE !== $this->trigger['value']['relatedStart'] )
+      if (TRUE !== $this->trigger['value']['relatedStart'])
         $attributes .= $this->intAttrDelimiter.'RELATED=END';
-      if( $this->trigger['value']['before'] )
+      if ($this->trigger['value']['before'])
         $content    .= '-';
-      $content      .= $this->_format_duration( $this->trigger['value'] );
+      $content      .= $this->_format_duration($this->trigger['value']);
     }
-    $attributes     .= $this->_createParams( $this->trigger['params'] );
-    return $this->_createElement( 'TRIGGER', $attributes, $content );
+    $attributes     .= $this->_createParams($this->trigger['params']);
+    return $this->_createElement('TRIGGER', $attributes, $content);
   }
 /**
  * set calendar component property trigger
@@ -3556,86 +3556,86 @@ 
  * @param array $params optional
  * @return bool
  */
-  function setTrigger( $year, $month=null, $day=null, $week=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $relatedStart=TRUE, $before=TRUE, $params=FALSE ) {
-    if( empty( $year ) && empty( $month ) && empty( $day ) && empty( $week ) && empty( $hour ) && empty( $min ) && empty( $sec ))
-      if( $this->getConfig( 'allowEmpty' )) {
-        $this->trigger = array( 'value' => null, 'params' => $this->_setParams( $params ) );
+  function setTrigger($year, $month = null, $day = null, $week = FALSE, $hour = FALSE, $min = FALSE, $sec = FALSE, $relatedStart = TRUE, $before = TRUE, $params = FALSE) {
+    if (empty($year) && empty($month) && empty($day) && empty($week) && empty($hour) && empty($min) && empty($sec))
+      if ($this->getConfig('allowEmpty')) {
+        $this->trigger = array('value' => null, 'params' => $this->_setParams($params));
         return TRUE;
       }
       else
         return FALSE;
-    if( $this->_isArrayTimestampDate( $year )) { // timestamp
-      $params = $this->_setParams( $month );
-      $date   = $this->_timestamp2date( $year, 7 );
-      foreach( $date as $k => $v )
+    if ($this->_isArrayTimestampDate($year)) { // timestamp
+      $params = $this->_setParams($month);
+      $date   = $this->_timestamp2date($year, 7);
+      foreach ($date as $k => $v)
         $$k = $v;
     }
-    elseif( is_array( $year ) && ( is_array( $month ) || empty( $month ))) {
-      $params = $this->_setParams( $month );
-      if(!(array_key_exists( 'year',  $year ) &&   // exclude date-time
-           array_key_exists( 'month', $year ) &&
-           array_key_exists( 'day',   $year ))) {  // so this must be a duration
-        if( isset( $params['RELATED'] ) && ( 'END' == $params['RELATED'] ))
+    elseif (is_array($year) && (is_array($month) || empty($month))) {
+      $params = $this->_setParams($month);
+      if (!(array_key_exists('year', $year) && // exclude date-time
+           array_key_exists('month', $year) &&
+           array_key_exists('day', $year))) {  // so this must be a duration
+        if (isset($params['RELATED']) && ('END' == $params['RELATED']))
           $relatedStart = FALSE;
         else
-          $relatedStart = ( array_key_exists( 'relatedStart', $year ) && ( TRUE !== $year['relatedStart'] )) ? FALSE : TRUE;
-        $before         = ( array_key_exists( 'before', $year )       && ( TRUE !== $year['before'] ))       ? FALSE : TRUE;
+          $relatedStart = (array_key_exists('relatedStart', $year) && (TRUE !== $year['relatedStart'])) ? FALSE : TRUE;
+        $before         = (array_key_exists('before', $year) && (TRUE !== $year['before'])) ? FALSE : TRUE;
       }
-      $SSYY  = ( array_key_exists( 'year',  $year )) ? $year['year']  : null;
-      $month = ( array_key_exists( 'month', $year )) ? $year['month'] : null;
-      $day   = ( array_key_exists( 'day',   $year )) ? $year['day']   : null;
-      $week  = ( array_key_exists( 'week',  $year )) ? $year['week']  : null;
-      $hour  = ( array_key_exists( 'hour',  $year )) ? $year['hour']  : 0; //null;
-      $min   = ( array_key_exists( 'min',   $year )) ? $year['min']   : 0; //null;
-      $sec   = ( array_key_exists( 'sec',   $year )) ? $year['sec']   : 0; //null;
+      $SSYY  = (array_key_exists('year', $year)) ? $year['year'] : null;
+      $month = (array_key_exists('month', $year)) ? $year['month'] : null;
+      $day   = (array_key_exists('day', $year)) ? $year['day'] : null;
+      $week  = (array_key_exists('week', $year)) ? $year['week'] : null;
+      $hour  = (array_key_exists('hour', $year)) ? $year['hour'] : 0; //null;
+      $min   = (array_key_exists('min', $year)) ? $year['min'] : 0; //null;
+      $sec   = (array_key_exists('sec', $year)) ? $year['sec'] : 0; //null;
       $year  = $SSYY;
     }
-    elseif(is_string( $year ) && ( is_array( $month ) || empty( $month ))) {  // duration or date in a string
-      $params = $this->_setParams( $month );
-      if( in_array( $year{0}, array( 'P', '+', '-' ))) { // duration
-        $relatedStart = ( isset( $params['RELATED'] ) && ( 'END' == $params['RELATED'] )) ? FALSE : TRUE;
-        $before       = ( '-'  == $year{0} ) ? TRUE : FALSE;
-        if(     'P'  != $year{0} )
-          $year       = substr( $year, 1 );
-        $date         = $this->_duration_string( $year);
+    elseif (is_string($year) && (is_array($month) || empty($month))) {  // duration or date in a string
+      $params = $this->_setParams($month);
+      if (in_array($year{0}, array('P', '+', '-'))) { // duration
+        $relatedStart = (isset($params['RELATED']) && ('END' == $params['RELATED'])) ? FALSE : TRUE;
+        $before       = ('-' == $year{0} ) ? TRUE : FALSE;
+        if ('P' != $year{0} )
+          $year       = substr($year, 1);
+        $date         = $this->_duration_string($year);
       }
       else   // date
-        $date    = $this->_date_time_string( $year, 7 );
-      unset( $year, $month, $day );
-      foreach( $date as $k => $v )
+        $date = $this->_date_time_string($year, 7);
+      unset($year, $month, $day);
+      foreach ($date as $k => $v)
         $$k = $v;
     }
     else // single values in function input parameters
-      $params = $this->_setParams( $params );
-    if( !empty( $year ) && !empty( $month ) && !empty( $day )) { // date
+      $params = $this->_setParams($params);
+    if (!empty($year) && !empty($month) && !empty($day)) { // date
       $params['VALUE'] = 'DATE-TIME';
-      $hour = ( $hour ) ? $hour : 0;
-      $min  = ( $min  ) ? $min  : 0;
-      $sec  = ( $sec  ) ? $sec  : 0;
-      $this->trigger = array( 'params' => $params );
-      $this->trigger['value'] = array( 'year'  => $year
+      $hour = ($hour) ? $hour : 0;
+      $min  = ($min) ? $min : 0;
+      $sec  = ($sec) ? $sec : 0;
+      $this->trigger = array('params' => $params);
+      $this->trigger['value'] = array('year'  => $year
                                      , 'month' => $month
                                      , 'day'   => $day
                                      , 'hour'  => $hour
                                      , 'min'   => $min
                                      , 'sec'   => $sec
-                                     , 'tz'    => 'Z' );
+                                     , 'tz'    => 'Z');
       return TRUE;
     }
-    elseif(( empty( $year ) && empty( $month )) &&    // duration
-           (!empty( $week ) || !empty( $day ) || !empty( $hour ) || !empty( $min ) || !empty( $sec ))) {
-      unset( $params['RELATED'] ); // set at output creation (END only)
-      unset( $params['VALUE'] );   // 'DURATION' default
-      $this->trigger = array( 'params' => $params );
-      $relatedStart = ( FALSE !== $relatedStart ) ? TRUE : FALSE;
-      $before       = ( FALSE !== $before )       ? TRUE : FALSE;
-      $this->trigger['value']  = array( 'relatedStart' => $relatedStart
-                                      , 'before'       => $before );
-      if( !empty( $week )) $this->trigger['value']['week'] = $week;
-      if( !empty( $day  )) $this->trigger['value']['day']  = $day;
-      if( !empty( $hour )) $this->trigger['value']['hour'] = $hour;
-      if( !empty( $min  )) $this->trigger['value']['min']  = $min;
-      if( !empty( $sec  )) $this->trigger['value']['sec']  = $sec;
+    elseif ((empty($year) && empty($month)) && // duration
+           (!empty($week) || !empty($day) || !empty($hour) || !empty($min) || !empty($sec))) {
+      unset($params['RELATED']); // set at output creation (END only)
+      unset($params['VALUE']); // 'DURATION' default
+      $this->trigger = array('params' => $params);
+      $relatedStart = (FALSE !== $relatedStart) ? TRUE : FALSE;
+      $before       = (FALSE !== $before) ? TRUE : FALSE;
+      $this->trigger['value'] = array('relatedStart' => $relatedStart
+                                      , 'before'       => $before);
+      if (!empty($week)) $this->trigger['value']['week'] = $week;
+      if (!empty($day)) $this->trigger['value']['day']  = $day;
+      if (!empty($hour)) $this->trigger['value']['hour'] = $hour;
+      if (!empty($min)) $this->trigger['value']['min']  = $min;
+      if (!empty($sec)) $this->trigger['value']['sec']  = $sec;
       return TRUE;
     }
     return FALSE;
@@ -3652,11 +3652,11 @@ 
  * @return string
  */
   function createTzid() {
-    if( empty( $this->tzid )) return FALSE;
-    if( empty( $this->tzid['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZID' ) : FALSE;
-    $attributes = $this->_createParams( $this->tzid['params'] );
-    return $this->_createElement( 'TZID', $attributes, $this->_strrep( $this->tzid['value'] ));
+    if (empty($this->tzid)) return FALSE;
+    if (empty($this->tzid['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('TZID') : FALSE;
+    $attributes = $this->_createParams($this->tzid['params']);
+    return $this->_createElement('TZID', $attributes, $this->_strrep($this->tzid['value']));
   }
 /**
  * set calendar component property tzid
@@ -3667,9 +3667,9 @@ 
  * @param array $params optional
  * @return bool
  */
-  function setTzid( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->tzid = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setTzid($value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->tzid = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -3685,14 +3685,14 @@ 
  * @return string
  */
   function createTzname() {
-    if( empty( $this->tzname )) return FALSE;
+    if (empty($this->tzname)) return FALSE;
     $output = null;
-    foreach( $this->tzname as $theName ) {
-      if( !empty( $theName['value'] )) {
-        $attributes = $this->_createParams( $theName['params'], array( 'LANGUAGE' ));
-        $output    .= $this->_createElement( 'TZNAME', $attributes, $this->_strrep( $theName['value'] ));
+    foreach ($this->tzname as $theName) {
+      if (!empty($theName['value'])) {
+        $attributes = $this->_createParams($theName['params'], array('LANGUAGE'));
+        $output    .= $this->_createElement('TZNAME', $attributes, $this->_strrep($theName['value']));
       }
-      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'TZNAME' );
+      elseif ($this->getConfig('allowEmpty')) $output .= $this->_createElement('TZNAME');
     }
     return $output;
   }
@@ -3706,9 +3706,9 @@ 
  * @param integer $index, optional
  * @return bool
  */
-  function setTzname( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->_setMval( $this->tzname, $value, $params, FALSE, $index );
+  function setTzname($value, $params = FALSE, $index = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->_setMval($this->tzname, $value, $params, FALSE, $index);
     return TRUE;
   }
 /*********************************************************************************/
@@ -3723,11 +3723,11 @@ 
  * @return string
  */
   function createTzoffsetfrom() {
-    if( empty( $this->tzoffsetfrom )) return FALSE;
-    if( empty( $this->tzoffsetfrom['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZOFFSETFROM' ) : FALSE;
-    $attributes = $this->_createParams( $this->tzoffsetfrom['params'] );
-    return $this->_createElement( 'TZOFFSETFROM', $attributes, $this->tzoffsetfrom['value'] );
+    if (empty($this->tzoffsetfrom)) return FALSE;
+    if (empty($this->tzoffsetfrom['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('TZOFFSETFROM') : FALSE;
+    $attributes = $this->_createParams($this->tzoffsetfrom['params']);
+    return $this->_createElement('TZOFFSETFROM', $attributes, $this->tzoffsetfrom['value']);
   }
 /**
  * set calendar component property tzoffsetfrom
@@ -3738,9 +3738,9 @@ 
  * @param string $params optional
  * @return bool
  */
-  function setTzoffsetfrom( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->tzoffsetfrom = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setTzoffsetfrom($value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->tzoffsetfrom = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -3755,11 +3755,11 @@ 
  * @return string
  */
   function createTzoffsetto() {
-    if( empty( $this->tzoffsetto )) return FALSE;
-    if( empty( $this->tzoffsetto['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZOFFSETTO' ) : FALSE;
-    $attributes = $this->_createParams( $this->tzoffsetto['params'] );
-    return $this->_createElement( 'TZOFFSETTO', $attributes, $this->tzoffsetto['value'] );
+    if (empty($this->tzoffsetto)) return FALSE;
+    if (empty($this->tzoffsetto['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('TZOFFSETTO') : FALSE;
+    $attributes = $this->_createParams($this->tzoffsetto['params']);
+    return $this->_createElement('TZOFFSETTO', $attributes, $this->tzoffsetto['value']);
   }
 /**
  * set calendar component property tzoffsetto
@@ -3770,9 +3770,9 @@ 
  * @param string $params optional
  * @return bool
  */
-  function setTzoffsetto( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->tzoffsetto = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setTzoffsetto($value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->tzoffsetto = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -3787,11 +3787,11 @@ 
  * @return string
  */
   function createTzurl() {
-    if( empty( $this->tzurl )) return FALSE;
-    if( empty( $this->tzurl['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZURL' ) : FALSE;
-    $attributes = $this->_createParams( $this->tzurl['params'] );
-    return $this->_createElement( 'TZURL', $attributes, $this->tzurl['value'] );
+    if (empty($this->tzurl)) return FALSE;
+    if (empty($this->tzurl['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('TZURL') : FALSE;
+    $attributes = $this->_createParams($this->tzurl['params']);
+    return $this->_createElement('TZURL', $attributes, $this->tzurl['value']);
   }
 /**
  * set calendar component property tzurl
@@ -3802,9 +3802,9 @@ 
  * @param string $params optional
  * @return boll
  */
-  function setTzurl( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->tzurl = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setTzurl($value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->tzurl = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -3819,10 +3819,10 @@ 
  * @return string
  */
   function createUid() {
-    if( 0 >= count( $this->uid ))
+    if (0 >= count($this->uid))
       $this->_makeuid();
-    $attributes = $this->_createParams( $this->uid['params'] );
-    return $this->_createElement( 'UID', $attributes, $this->uid['value'] );
+    $attributes = $this->_createParams($this->uid['params']);
+    return $this->_createElement('UID', $attributes, $this->uid['value']);
   }
 /**
  * create an unique id for this calendar component object instance
@@ -3836,13 +3836,13 @@ 
     $unique = substr(microtime(), 2, 4);
     $base   = 'aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPrRsStTuUvVxXuUvVwWzZ1234567890';
     $start  = 0;
-    $end    = strlen( $base ) - 1;
+    $end    = strlen($base) - 1;
     $length = 6;
     $str    = null;
-    for( $p = 0; $p < $length; $p++ )
-      $unique .= $base{mt_rand( $start, $end )};
-    $this->uid = array( 'params' => null );
-    $this->uid['value']  = $date.'-'.$unique.'@'.$this->getConfig( 'unique_id' );
+    for ($p = 0; $p < $length; $p++)
+      $unique .= $base{mt_rand($start, $end)};
+    $this->uid = array('params' => null);
+    $this->uid['value'] = $date.'-'.$unique.'@'.$this->getConfig('unique_id');
   }
 /**
  * set calendar component property uid
@@ -3853,9 +3853,9 @@ 
  * @param string $params optional
  * @return bool
  */
-  function setUid( $value, $params=FALSE ) {
-    if( empty( $value )) return FALSE; // no allowEmpty check here !!!!
-    $this->uid = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setUid($value, $params = FALSE) {
+    if (empty($value)) return FALSE; // no allowEmpty check here !!!!
+    $this->uid = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -3870,11 +3870,11 @@ 
  * @return string
  */
   function createUrl() {
-    if( empty( $this->url )) return FALSE;
-    if( empty( $this->url['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'URL' ) : FALSE;
-    $attributes = $this->_createParams( $this->url['params'] );
-    return $this->_createElement( 'URL', $attributes, $this->url['value'] );
+    if (empty($this->url)) return FALSE;
+    if (empty($this->url['value']))
+      return ($this->getConfig('allowEmpty')) ? $this->_createElement('URL') : FALSE;
+    $attributes = $this->_createParams($this->url['params']);
+    return $this->_createElement('URL', $attributes, $this->url['value']);
   }
 /**
  * set calendar component property url
@@ -3885,9 +3885,9 @@ 
  * @param string $params optional
  * @return bool
  */
-  function setUrl( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $this->url = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+  function setUrl($value, $params = FALSE) {
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $this->url = array('value' => $value, 'params' => $this->_setParams($params));
     return TRUE;
   }
 /*********************************************************************************/
@@ -3902,22 +3902,22 @@ 
  * @return string
  */
   function createXprop() {
-    if( empty( $this->xprop )) return FALSE;
+    if (empty($this->xprop)) return FALSE;
     $output = null;
-    foreach( $this->xprop as $label => $xpropPart ) {
-      if( empty( $xpropPart['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( $label );
+    foreach ($this->xprop as $label => $xpropPart) {
+      if (empty($xpropPart['value'])) {
+        if ($this->getConfig('allowEmpty')) $output .= $this->_createElement($label);
         continue;
       }
-      $attributes = $this->_createParams( $xpropPart['params'], array( 'LANGUAGE' ));
-      if( is_array( $xpropPart['value'] )) {
-        foreach( $xpropPart['value'] as $pix => $theXpart )
-          $xpropPart['value'][$pix] = $this->_strrep( $theXpart );
-        $xpropPart['value']  = implode( ',', $xpropPart['value'] );
+      $attributes = $this->_createParams($xpropPart['params'], array('LANGUAGE'));
+      if (is_array($xpropPart['value'])) {
+        foreach ($xpropPart['value'] as $pix => $theXpart)
+          $xpropPart['value'][$pix] = $this->_strrep($theXpart);
+        $xpropPart['value'] = implode(',', $xpropPart['value']);
       }
       else
-        $xpropPart['value'] = $this->_strrep( $xpropPart['value'] );
-      $output    .= $this->_createElement( $label, $attributes, $xpropPart['value'] );
+        $xpropPart['value'] = $this->_strrep($xpropPart['value']);
+      $output .= $this->_createElement($label, $attributes, $xpropPart['value']);
     }
     return $output;
   }
@@ -3931,14 +3931,14 @@ 
  * @param array $params optional
  * @return bool
  */
-  function setXprop( $label, $value, $params=FALSE ) {
-    if( empty( $label )) return;
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    $xprop           = array( 'value' => $value );
+  function setXprop($label, $value, $params = FALSE) {
+    if (empty($label)) return;
+    if (empty($value)) if ($this->getConfig('allowEmpty')) $value = null; else return FALSE;
+    $xprop           = array('value' => $value);
     $toolbox         = new calendarComponent();
-    $xprop['params'] = $toolbox->_setParams( $params );
-    if( !is_array( $this->xprop )) $this->xprop = array();
-    $this->xprop[strtoupper( $label )] = $xprop;
+    $xprop['params'] = $toolbox->_setParams($params);
+    if (!is_array($this->xprop)) $this->xprop = array();
+    $this->xprop[strtoupper($label)] = $xprop;
     return TRUE;
   }
 /*********************************************************************************/
@@ -3952,10 +3952,10 @@ 
  */
   function _createFormat() {
     $objectname                   = null;
-    switch( $this->format ) {
+    switch ($this->format) {
       case 'xcal':
-        $objectname               = ( isset( $this->timezonetype )) ?
-                                 strtolower( $this->timezonetype )  :  strtolower( $this->objName );
+        $objectname               = (isset($this->timezonetype)) ?
+                                 strtolower($this->timezonetype) : strtolower($this->objName);
         $this->componentStart1    = $this->elementStart1 = '<';
         $this->componentStart2    = $this->elementStart2 = '>';
         $this->componentEnd1      = $this->elementEnd1   = '</';
@@ -3965,8 +3965,8 @@ 
         $this->valueInit          = null;
         break;
       default:
-        $objectname               = ( isset( $this->timezonetype )) ?
-                                 strtoupper( $this->timezonetype )  :  strtoupper( $this->objName );
+        $objectname               = (isset($this->timezonetype)) ?
+                                 strtoupper($this->timezonetype) : strtoupper($this->objName);
         $this->componentStart1    = 'BEGIN:';
         $this->componentStart2    = null;
         $this->componentEnd1      = 'END:';
@@ -3992,82 +3992,82 @@ 
  * @param string $content property content (optional)
  * @return string
  */
-  function _createElement( $label, $attributes=null, $content=FALSE ) {
-    $label  = $this->_formatPropertyName( $label );
+  function _createElement($label, $attributes = null, $content = FALSE) {
+    $label  = $this->_formatPropertyName($label);
     $output = $this->elementStart1.$label;
     $categoriesAttrLang = null;
     $attachInlineBinary = FALSE;
     $attachfmttype      = null;
-    if( !empty( $attributes ))  {
-      $attributes  = trim( $attributes );
-      if ( 'xcal' == $this->format) {
-        $attributes2 = explode( $this->intAttrDelimiter, $attributes );
+    if (!empty($attributes)) {
+      $attributes = trim($attributes);
+      if ('xcal' == $this->format) {
+        $attributes2 = explode($this->intAttrDelimiter, $attributes);
         $attributes  = null;
-        foreach( $attributes2 as $attribute ) {
-          $attrKVarr = explode( '=', $attribute );
-          if( empty( $attrKVarr[0] ))
+        foreach ($attributes2 as $attribute) {
+          $attrKVarr = explode('=', $attribute);
+          if (empty($attrKVarr[0]))
             continue;
-          if( !isset( $attrKVarr[1] )) {
+          if (!isset($attrKVarr[1])) {
             $attrValue = $attrKVarr[0];
             $attrKey   = null;
           }
-          elseif( 2 == count( $attrKVarr)) {
-            $attrKey   = strtolower( $attrKVarr[0] );
+          elseif (2 == count($attrKVarr)) {
+            $attrKey   = strtolower($attrKVarr[0]);
             $attrValue = $attrKVarr[1];
           }
           else {
-            $attrKey   = strtolower( $attrKVarr[0] );
-            unset( $attrKVarr[0] );
-            $attrValue = implode( '=', $attrKVarr );
+            $attrKey   = strtolower($attrKVarr[0]);
+            unset($attrKVarr[0]);
+            $attrValue = implode('=', $attrKVarr);
           }
-          if(( 'attach' == $label ) && ( in_array( $attrKey, array( 'fmttype', 'encoding', 'value' )))) {
+          if (('attach' == $label) && (in_array($attrKey, array('fmttype', 'encoding', 'value')))) {
             $attachInlineBinary = TRUE;
-            if( 'fmttype' == $attrKey )
+            if ('fmttype' == $attrKey)
               $attachfmttype = $attrKey.'='.$attrValue;
             continue;
           }
-          elseif(( 'categories' == $label ) && ( 'language' == $attrKey ))
+          elseif (('categories' == $label) && ('language' == $attrKey))
             $categoriesAttrLang = $attrKey.'='.$attrValue;
           else {
-            $attributes .= ( empty( $attributes )) ? ' ' : $this->attributeDelimiter.' ';
-            $attributes .= ( !empty( $attrKey )) ? $attrKey.'=' : null;
-            if(( '"' == substr( $attrValue, 0, 1 )) && ( '"' == substr( $attrValue, -1 ))) {
-              $attrValue = substr( $attrValue, 1, ( strlen( $attrValue ) - 2 ));
-              $attrValue = str_replace( '"', '', $attrValue );
+            $attributes .= (empty($attributes)) ? ' ' : $this->attributeDelimiter.' ';
+            $attributes .= (!empty($attrKey)) ? $attrKey.'=' : null;
+            if (('"' == substr($attrValue, 0, 1)) && ('"' == substr($attrValue, -1))) {
+              $attrValue = substr($attrValue, 1, (strlen($attrValue) - 2));
+              $attrValue = str_replace('"', '', $attrValue);
             }
-            $attributes .= '"'.htmlspecialchars( $attrValue ).'"';
+            $attributes .= '"'.htmlspecialchars($attrValue).'"';
           }
         }
       }
       else {
-        $attributes = str_replace( $this->intAttrDelimiter, $this->attributeDelimiter, $attributes );
+        $attributes = str_replace($this->intAttrDelimiter, $this->attributeDelimiter, $attributes);
       }
     }
-    if(((( 'attach' == $label ) && !$attachInlineBinary ) ||
-         ( in_array( $label, array( 'tzurl', 'url' ))))      && ( 'xcal' == $this->format)) {
+    if (((('attach' == $label) && !$attachInlineBinary) ||
+         (in_array($label, array('tzurl', 'url')))) && ('xcal' == $this->format)) {
       $pos = strrpos($content, "/");
-      $docname = ( $pos !== false) ? substr( $content, (1 - strlen( $content ) + $pos )) : $content;
-      $this->xcaldecl[] = array( 'xmldecl'  => 'ENTITY'
+      $docname = ($pos !== false) ? substr($content, (1 - strlen($content) + $pos)) : $content;
+      $this->xcaldecl[] = array('xmldecl'  => 'ENTITY'
                                , 'uri'      => $docname
                                , 'ref'      => 'SYSTEM'
                                , 'external' => $content
                                , 'type'     => 'NDATA'
-                               , 'type2'    => 'BINERY' );
-      $attributes .= ( empty( $attributes )) ? ' ' : $this->attributeDelimiter.' ';
+                               , 'type2'    => 'BINERY');
+      $attributes .= (empty($attributes)) ? ' ' : $this->attributeDelimiter.' ';
       $attributes .= 'uri="'.$docname.'"';
       $content = null;
-      if( 'attach' == $label ) {
-        $attributes = str_replace( $this->attributeDelimiter, $this->intAttrDelimiter, $attributes );
-        $content = $this->_createElement( 'extref', $attributes, null );
+      if ('attach' == $label) {
+        $attributes = str_replace($this->attributeDelimiter, $this->intAttrDelimiter, $attributes);
+        $content = $this->_createElement('extref', $attributes, null);
         $attributes = null;
       }
     }
-    elseif(( 'attach' == $label ) && $attachInlineBinary && ( 'xcal' == $this->format)) {
-      $content = $this->nl.$this->_createElement( 'b64bin', $attachfmttype, $content ); // max one attribute
+    elseif (('attach' == $label) && $attachInlineBinary && ('xcal' == $this->format)) {
+      $content = $this->nl.$this->_createElement('b64bin', $attachfmttype, $content); // max one attribute
     }
     $output .= $attributes;
-    if( !$content ) {
-      switch( $this->format ) {
+    if (!$content) {
+      switch ($this->format) {
         case 'xcal':
           $output .= ' /';
           $output .= $this->elementStart2;
@@ -4075,18 +4075,18 @@ 
           break;
         default:
           $output .= $this->elementStart2.$this->valueInit;
-          return $this->_size75( $output );
+          return $this->_size75($output);
           break;
       }
     }
     $output .= $this->elementStart2;
     $output .= $this->valueInit.$content;
-    switch( $this->format ) {
+    switch ($this->format) {
       case 'xcal':
         return $output.$this->elementEnd1.$label.$this->elementEnd2;
         break;
       default:
-        return $this->_size75( $output );
+        return $this->_size75($output);
         break;
     }
   }
@@ -4099,36 +4099,36 @@ 
  * @param array $ctrKeys optional
  * @return string
  */
-  function _createParams( $params=array(), $ctrKeys=array() ) {
+  function _createParams($params = array(), $ctrKeys = array()) {
     $attrLANG = $attr1 = $attr2 = null;
-    $CNattrKey   = ( in_array( 'CN',       $ctrKeys )) ? TRUE : FALSE ;
-    $LANGattrKey = ( in_array( 'LANGUAGE', $ctrKeys )) ? TRUE : FALSE ;
+    $CNattrKey   = (in_array('CN', $ctrKeys)) ? TRUE : FALSE;
+    $LANGattrKey = (in_array('LANGUAGE', $ctrKeys)) ? TRUE : FALSE;
     $CNattrExist = $LANGattrExist = FALSE;
-    if( is_array( $params )) {
-      foreach( $params as $paramKey => $paramValue ) {
-        if( is_int( $paramKey ))
+    if (is_array($params)) {
+      foreach ($params as $paramKey => $paramValue) {
+        if (is_int($paramKey))
           $attr2            .= $this->intAttrDelimiter.$paramValue;
-        elseif(( 'LANGUAGE' == $paramKey ) && $LANGattrKey ) {
+        elseif (('LANGUAGE' == $paramKey) && $LANGattrKey) {
           $attrLANG         .= $this->intAttrDelimiter."LANGUAGE=$paramValue";
           $LANGattrExist     = TRUE;
         }
-        elseif(( 'CN'       == $paramKey ) && $CNattrKey ) {
+        elseif (('CN' == $paramKey) && $CNattrKey) {
           $attr1             = $this->intAttrDelimiter.'CN="'.$paramValue.'"';
           $CNattrExist       = TRUE;
         }
-        elseif(( 'ALTREP'   == $paramKey ) && in_array( $paramKey, $ctrKeys ))
+        elseif (('ALTREP' == $paramKey) && in_array($paramKey, $ctrKeys))
           $attr2            .= $this->intAttrDelimiter.'ALTREP="'.$paramValue.'"';
-        elseif(( 'DIR'      == $paramKey ) && in_array( $paramKey, $ctrKeys ))
+        elseif (('DIR' == $paramKey) && in_array($paramKey, $ctrKeys))
           $attr2            .= $this->intAttrDelimiter.'DIR="'.$paramValue.'"';
-        elseif(( 'SENT-BY'  == $paramKey ) && in_array( $paramKey, $ctrKeys ))
+        elseif (('SENT-BY' == $paramKey) && in_array($paramKey, $ctrKeys))
           $attr2            .= $this->intAttrDelimiter.'SENT-BY="MAILTO:'.$paramValue.'"';
         else
           $attr2            .= $this->intAttrDelimiter."$paramKey=$paramValue";
       }
     }
-    if( !$LANGattrExist ) {
-      $lang = $this->getConfig( 'language' );
-      if(( $CNattrExist || $LANGattrKey ) && $lang )
+    if (!$LANGattrExist) {
+      $lang = $this->getConfig('language');
+      if (($CNattrExist || $LANGattrKey) && $lang)
         $attrLANG .= $this->intAttrDelimiter.'LANGUAGE='.$lang;
     }
     return $attrLANG.$attr1.$attr2;
@@ -4142,47 +4142,47 @@ 
  * @param int $parno, no of date parts (i.e. year, month.. .)
  * @return array $params, property parameters
  */
-  function _chkdatecfg( $theDate, & $parno, & $params ) {
-    if( isset( $params['TZID'] ))
+  function _chkdatecfg($theDate, & $parno, & $params) {
+    if (isset($params['TZID']))
       $parno = 6;
-    elseif( isset( $params['VALUE'] ) && ( 'DATE' == $params['VALUE'] ))
+    elseif (isset($params['VALUE']) && ('DATE' == $params['VALUE']))
       $parno = 3;
     else {
-      if( isset( $params['VALUE'] ) && ( 'PERIOD' == $params['VALUE'] ))
+      if (isset($params['VALUE']) && ('PERIOD' == $params['VALUE']))
         $parno = 7;
-      if( is_array( $theDate )) {
-        if( isset( $theDate['timestamp'] ))
-          $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : null;
+      if (is_array($theDate)) {
+        if (isset($theDate['timestamp']))
+          $tzid = (isset($theDate['tz'])) ? $theDate['tz'] : null;
         else
-          $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : ( 7 == count( $theDate )) ? end( $theDate ) : null;
-        if( !empty( $tzid )) {
+          $tzid = (isset($theDate['tz'])) ? $theDate['tz'] : (7 == count($theDate)) ? end($theDate) : null;
+        if (!empty($tzid)) {
           $parno = 7;
-          if( !$this->_isOffset( $tzid ))
+          if (!$this->_isOffset($tzid))
             $params['TZID'] = $tzid; // save only timezone
         }
-        elseif( !$parno && ( 3 == count( $theDate )) && 
-          ( isset( $params['VALUE'] ) && ( 'DATE' == $params['VALUE'] )))
+        elseif (!$parno && (3 == count($theDate)) && 
+          (isset($params['VALUE']) && ('DATE' == $params['VALUE'])))
           $parno = 3;
         else
           $parno = 6;
       }
       else { // string
-        $date = trim( $theDate );
-        if( 'Z' == substr( $date, -1 ))
+        $date = trim($theDate);
+        if ('Z' == substr($date, -1))
           $parno = 7; // UTC DATE-TIME
-        elseif((( 8 == strlen( $date ) && ctype_digit( $date )) || ( 11 >= strlen( $date ))) && 
-          ( !isset( $params['VALUE'] ) || !in_array( $params['VALUE'], array( 'DATE-TIME', 'PERIOD' ))))
+        elseif (((8 == strlen($date) && ctype_digit($date)) || (11 >= strlen($date))) && 
+          (!isset($params['VALUE']) || !in_array($params['VALUE'], array('DATE-TIME', 'PERIOD'))))
           $parno = 3; // DATE
-        $date = $this->_date_time_string( $date, $parno );
-        if( !empty( $date['tz'] )) {
+        $date = $this->_date_time_string($date, $parno);
+        if (!empty($date['tz'])) {
           $parno = 7;
-          if( !$this->_isOffset( $date['tz'] ))
+          if (!$this->_isOffset($date['tz']))
             $params['TZID'] = $date['tz']; // save only timezone
         }
-        elseif( empty( $parno ))
+        elseif (empty($parno))
           $parno = 6;
       }
-      if( isset( $params['TZID'] ))
+      if (isset($params['TZID']))
         $parno = 6;
     }
   }
@@ -4197,28 +4197,28 @@ 
  * @param array $duration, optional
  * @return array duration
  */
-  function _date2duration( $startdate=FALSE, $enddate=FALSE ) {
-    if( !$startdate || !$enddate ) {
-      if(   FALSE === ( $startdate = $this->getProperty( 'dtstart' )))
+  function _date2duration($startdate = FALSE, $enddate = FALSE) {
+    if (!$startdate || !$enddate) {
+      if (FALSE === ($startdate = $this->getProperty('dtstart')))
         return null;
-      if(   FALSE === ( $enddate   = $this->getProperty( 'dtend' )))    // vevent/vfreebusy
-        if( FALSE === ( $enddate   = $this->getProperty( 'due' )))      // vtodo
+      if (FALSE === ($enddate   = $this->getProperty('dtend')))    // vevent/vfreebusy
+        if (FALSE === ($enddate   = $this->getProperty('due')))      // vtodo
           return null;
     }
-    if( !$startdate || !$enddate )
+    if (!$startdate || !$enddate)
       return null;
-    $startWdate  = mktime( 0, 0, 0, $startdate['month'], $startdate['day'], $startdate['year'] );
-    $endWdate    = mktime( 0, 0, 0, $enddate['month'],   $enddate['day'],   $enddate['year'] );
+    $startWdate  = mktime(0, 0, 0, $startdate['month'], $startdate['day'], $startdate['year']);
+    $endWdate    = mktime(0, 0, 0, $enddate['month'], $enddate['day'], $enddate['year']);
     $wduration   = $endWdate - $startWdate;
     $dur         = array();
-    $dur['week'] = (int) floor( $wduration / ( 7 * 24 * 60 * 60 ));
-    $wduration   =              $wduration % ( 7 * 24 * 60 * 60 );
-    $dur['day']  = (int) floor( $wduration / ( 24 * 60 * 60 ));
-    $wduration   =              $wduration % ( 24 * 60 * 60 );
-    $dur['hour'] = (int) floor( $wduration / ( 60 * 60 ));
-    $wduration   =              $wduration % ( 60 * 60 );
-    $dur['min']  = (int) floor( $wduration / ( 60 ));
-    $dur['sec']  = (int)        $wduration % ( 60 );
+    $dur['week'] = (int) floor($wduration / (7 * 24 * 60 * 60));
+    $wduration   = $wduration % (7 * 24 * 60 * 60);
+    $dur['day']  = (int) floor($wduration / (24 * 60 * 60));
+    $wduration   = $wduration % (24 * 60 * 60);
+    $dur['hour'] = (int) floor($wduration / (60 * 60));
+    $wduration   = $wduration % (60 * 60);
+    $dur['min']  = (int) floor($wduration / (60));
+    $dur['sec']  = (int) $wduration % (60);
     return $dur;
   }
 /**
@@ -4230,19 +4230,19 @@ 
  * @param string $tz        timezone
  * @return timestamp
  */
-  function _date2timestamp( $datetime, $tz=null ) {
+  function _date2timestamp($datetime, $tz = null) {
     $output = null;
-    if( !isset( $datetime['hour'] )) $datetime['hour'] = '0';
-    if( !isset( $datetime['min'] ))  $datetime['min']  = '0';
-    if( !isset( $datetime['sec'] ))  $datetime['sec']  = '0';
-    foreach( $datetime as $dkey => $dvalue ) {
-      if( 'tz' != $dkey )
+    if (!isset($datetime['hour'])) $datetime['hour'] = '0';
+    if (!isset($datetime['min']))  $datetime['min']  = '0';
+    if (!isset($datetime['sec']))  $datetime['sec']  = '0';
+    foreach ($datetime as $dkey => $dvalue) {
+      if ('tz' != $dkey)
         $datetime[$dkey] = (integer) $dvalue;
     }
-    if( $tz )
+    if ($tz)
       $datetime['tz'] = $tz;
-    $offset = ( isset( $datetime['tz'] ) && ( '' < trim ( $datetime['tz'] ))) ? $this->_tz2offset( $datetime['tz'] ) : 0;
-    $output = mktime( $datetime['hour'], $datetime['min'], ($datetime['sec'] + $offset), $datetime['month'], $datetime['day'], $datetime['year'] );
+    $offset = (isset($datetime['tz']) && ('' < trim($datetime['tz']))) ? $this->_tz2offset($datetime['tz']) : 0;
+    $output = mktime($datetime['hour'], $datetime['min'], ($datetime['sec'] + $offset), $datetime['month'], $datetime['day'], $datetime['year']);
     return $output;
   }
 /**
@@ -4254,16 +4254,16 @@ 
  * @param int $parno optional, default FALSE
  * @return array
  */
-  function _date_time_array( $datetime, $parno=FALSE ) {
+  function _date_time_array($datetime, $parno = FALSE) {
     $output = array();
-    foreach( $datetime as $dateKey => $datePart ) {
-      switch ( $dateKey ) {
+    foreach ($datetime as $dateKey => $datePart) {
+      switch ($dateKey) {
         case '0': case 'year':   $output['year']  = $datePart; break;
         case '1': case 'month':  $output['month'] = $datePart; break;
         case '2': case 'day':    $output['day']   = $datePart; break;
       }
-      if( 3 != $parno ) {
-        switch ( $dateKey ) {
+      if (3 != $parno) {
+        switch ($dateKey) {
           case '0':
           case '1':
           case '2': break;
@@ -4274,12 +4274,12 @@ 
         }
       }
     }
-    if( 3 != $parno ) {
-      if( !isset( $output['hour'] ))
+    if (3 != $parno) {
+      if (!isset($output['hour']))
         $output['hour'] = 0;
-      if( !isset( $output['min']  ))
+      if (!isset($output['min']))
         $output['min'] = 0;
-      if( !isset( $output['sec']  ))
+      if (!isset($output['sec']))
         $output['sec'] = 0;
     }
     return $output;
@@ -4293,88 +4293,88 @@ 
  * @param int $parno optional, default FALSE
  * @return array
  */
-  function _date_time_string( $datetime, $parno=FALSE ) {
-    $datetime = (string) trim( $datetime );
+  function _date_time_string($datetime, $parno = FALSE) {
+    $datetime = (string) trim($datetime);
     $tz  = null;
-    $len = strlen( $datetime ) - 1;
-    if( 'Z' == substr( $datetime, -1 )) {
+    $len = strlen($datetime) - 1;
+    if ('Z' == substr($datetime, -1)) {
       $tz = 'Z';
-      $datetime = trim( substr( $datetime, 0, $len ));
+      $datetime = trim(substr($datetime, 0, $len));
     }
-    elseif( ( ctype_digit( substr( $datetime, -2, 2 ))) && // time or date
-                  ( '-' == substr( $datetime, -3, 1 )) ||
-                  ( ':' == substr( $datetime, -3, 1 )) ||
-                  ( '.' == substr( $datetime, -3, 1 ))) {
+    elseif ((ctype_digit(substr($datetime, -2, 2))) && // time or date
+                  ('-' == substr($datetime, -3, 1)) ||
+                  (':' == substr($datetime, -3, 1)) ||
+                  ('.' == substr($datetime, -3, 1))) {
       $continue = TRUE;
     }
-    elseif( ( ctype_digit( substr( $datetime, -4, 4 ))) && // 4 pos offset
-            ( ' +' == substr( $datetime, -6, 2 )) ||
-            ( ' -' == substr( $datetime, -6, 2 ))) {
-      $tz = substr( $datetime, -5, 5 );
-      $datetime = substr( $datetime, 0, ($len - 5));
+    elseif ((ctype_digit(substr($datetime, -4, 4))) && // 4 pos offset
+            (' +' == substr($datetime, -6, 2)) ||
+            (' -' == substr($datetime, -6, 2))) {
+      $tz = substr($datetime, -5, 5);
+      $datetime = substr($datetime, 0, ($len - 5));
     }
-    elseif( ( ctype_digit( substr( $datetime, -6, 6 ))) && // 6 pos offset
-            ( ' +' == substr( $datetime, -8, 2 )) ||
-            ( ' -' == substr( $datetime, -8, 2 ))) {
-      $tz = substr( $datetime, -7, 7 );
-      $datetime = substr( $datetime, 0, ($len - 7));
+    elseif ((ctype_digit(substr($datetime, -6, 6))) && // 6 pos offset
+            (' +' == substr($datetime, -8, 2)) ||
+            (' -' == substr($datetime, -8, 2))) {
+      $tz = substr($datetime, -7, 7);
+      $datetime = substr($datetime, 0, ($len - 7));
     }
-    elseif( ( 6 < $len ) && ( ctype_digit( substr( $datetime, -6, 6 )))) {
+    elseif ((6 < $len) && (ctype_digit(substr($datetime, -6, 6)))) {
       $continue = TRUE;
     }
-    elseif( 'T' ==  substr( $datetime, -7, 1 )) {
+    elseif ('T' == substr($datetime, -7, 1)) {
       $continue = TRUE;
     }
     else {
-      $cx  = $tx = 0;    //  19970415T133000 US-Eastern
-      for( $cx = -1; $cx > ( 9 - $len ); $cx-- ) {
-        if(( ' ' == substr( $datetime, $cx, 1 )) || ctype_digit( substr( $datetime, $cx, 1 )))
+      $cx = $tx = 0; //  19970415T133000 US-Eastern
+      for ($cx = -1; $cx > (9 - $len); $cx--) {
+        if ((' ' == substr($datetime, $cx, 1)) || ctype_digit(substr($datetime, $cx, 1)))
           break; // if exists, tz ends here.. . ?
-        elseif( ctype_alpha( substr( $datetime, $cx, 1 )) ||
-             ( in_array( substr( $datetime, $cx, 1 ), array( '-', '/' ))))
+        elseif (ctype_alpha(substr($datetime, $cx, 1)) ||
+             (in_array(substr($datetime, $cx, 1), array('-', '/'))))
           $tx--; // tz length counter
       }
-      if( 0 > $tx ) {
-        $tz = substr( $datetime, $tx );
-        $datetime = trim( substr( $datetime, 0, $len + $tx + 1 ));
+      if (0 > $tx) {
+        $tz = substr($datetime, $tx);
+        $datetime = trim(substr($datetime, 0, $len + $tx + 1));
       }
     }
-    if( 0 < substr_count( $datetime, '-' )) {
-      $datetime = str_replace( '-', '/', $datetime );
-    }
-    elseif( ctype_digit( substr( $datetime, 0, 8 )) &&
-           ( 'T' ==      substr( $datetime, 8, 1 )) &&
-            ctype_digit( substr( $datetime, 9, 6 ))) {
-      $datetime = substr( $datetime,  4, 2 )
-             .'/'.substr( $datetime,  6, 2 )
-             .'/'.substr( $datetime,  0, 4 )
-             .' '.substr( $datetime,  9, 2 )
-             .':'.substr( $datetime, 11, 2 )
-             .':'.substr( $datetime, 13);
-    }
-    $datestring = date( 'Y-m-d H:i:s', strtotime( $datetime ));
-    $tz                = trim( $tz );
+    if (0 < substr_count($datetime, '-')) {
+      $datetime = str_replace('-', '/', $datetime);
+    }
+    elseif (ctype_digit(substr($datetime, 0, 8)) &&
+           ('T' == substr($datetime, 8, 1)) &&
+            ctype_digit(substr($datetime, 9, 6))) {
+      $datetime = substr($datetime, 4, 2)
+             .'/'.substr($datetime, 6, 2)
+             .'/'.substr($datetime, 0, 4)
+             .' '.substr($datetime, 9, 2)
+             .':'.substr($datetime, 11, 2)
+             .':'.substr($datetime, 13);
+    }
+    $datestring = date('Y-m-d H:i:s', strtotime($datetime));
+    $tz                = trim($tz);
     $output            = array();
-    $output['year']    = substr( $datestring, 0, 4 );
-    $output['month']   = substr( $datestring, 5, 2 );
-    $output['day']     = substr( $datestring, 8, 2 );
-    if(( 6 == $parno ) || ( 7 == $parno )) {
-      $output['hour']  = substr( $datestring, 11, 2 );
-      $output['min']   = substr( $datestring, 14, 2 );
-      $output['sec']   = substr( $datestring, 17, 2 );
-      if( !empty( $tz ))
+    $output['year']    = substr($datestring, 0, 4);
+    $output['month']   = substr($datestring, 5, 2);
+    $output['day']     = substr($datestring, 8, 2);
+    if ((6 == $parno) || (7 == $parno)) {
+      $output['hour']  = substr($datestring, 11, 2);
+      $output['min']   = substr($datestring, 14, 2);
+      $output['sec']   = substr($datestring, 17, 2);
+      if (!empty($tz))
         $output['tz']  = $tz;
     }
-    elseif( 3 != $parno ) {
-      if(( '00' < substr( $datestring, 11, 2 )) ||
-         ( '00' < substr( $datestring, 14, 2 )) ||
-         ( '00' < substr( $datestring, 17, 2 ))) {
-        $output['hour']  = substr( $datestring, 11, 2 );
-        $output['min']   = substr( $datestring, 14, 2 );
-        $output['sec']   = substr( $datestring, 17, 2 );
+    elseif (3 != $parno) {
+      if (('00' < substr($datestring, 11, 2)) ||
+         ('00' < substr($datestring, 14, 2)) ||
+         ('00' < substr($datestring, 17, 2))) {
+        $output['hour']  = substr($datestring, 11, 2);
+        $output['min']   = substr($datestring, 14, 2);
+        $output['sec']   = substr($datestring, 17, 2);
       }
-      if( !empty( $tz ))
-        $output['tz']  = $tz;
+      if (!empty($tz))
+        $output['tz'] = $tz;
     }
     return $output;
   }
@@ -4386,26 +4386,26 @@ 
  * @param array $duration
  * @return array
  */
-  function _duration_array( $duration ) {
+  function _duration_array($duration) {
     $output = array();
-    if(    is_array( $duration )        &&
-       ( 1 == count( $duration ))       &&
-              isset( $duration['sec'] ) &&
-              ( 60 < $duration['sec'] )) {
+    if (is_array($duration) &&
+       (1 == count($duration)) &&
+              isset($duration['sec']) &&
+              (60 < $duration['sec'])) {
       $durseconds  = $duration['sec'];
-      $output['week'] = floor( $durseconds / ( 60 * 60 * 24 * 7 ));
-      $durseconds  =           $durseconds % ( 60 * 60 * 24 * 7 );
-      $output['day']  = floor( $durseconds / ( 60 * 60 * 24 ));
-      $durseconds  =           $durseconds % ( 60 * 60 * 24 );
-      $output['hour'] = floor( $durseconds / ( 60 * 60 ));
-      $durseconds  =           $durseconds % ( 60 * 60 );
-      $output['min']  = floor( $durseconds / ( 60 ));
-      $output['sec']  =      ( $durseconds % ( 60 ));
+      $output['week'] = floor($durseconds / (60 * 60 * 24 * 7));
+      $durseconds  = $durseconds % (60 * 60 * 24 * 7);
+      $output['day']  = floor($durseconds / (60 * 60 * 24));
+      $durseconds  = $durseconds % (60 * 60 * 24);
+      $output['hour'] = floor($durseconds / (60 * 60));
+      $durseconds  = $durseconds % (60 * 60);
+      $output['min']  = floor($durseconds / (60));
+      $output['sec']  = ($durseconds % (60));
     }
     else {
-      foreach( $duration as $durKey => $durValue ) {
-        if( empty( $durValue )) continue;
-        switch ( $durKey ) {
+      foreach ($duration as $durKey => $durValue) {
+        if (empty($durValue)) continue;
+        switch ($durKey) {
           case '0': case 'week': $output['week']  = $durValue; break;
           case '1': case 'day':  $output['day']   = $durValue; break;
           case '2': case 'hour': $output['hour']  = $durValue; break;
@@ -4414,19 +4414,19 @@ 
         }
       }
     }
-    if( isset( $output['week'] ) && ( 0 < $output['week'] )) {
-      unset( $output['day'], $output['hour'], $output['min'], $output['sec'] );
+    if (isset($output['week']) && (0 < $output['week'])) {
+      unset($output['day'], $output['hour'], $output['min'], $output['sec']);
       return $output;
     }
-    unset( $output['week'] );
-    if( empty( $output['day'] ))
-      unset( $output['day'] );
-    if ( isset( $output['hour'] ) || isset( $output['min'] ) || isset( $output['sec'] )) {
-      if( !isset( $output['hour'] )) $output['hour'] = 0;
-      if( !isset( $output['min']  )) $output['min']  = 0;
-      if( !isset( $output['sec']  )) $output['sec']  = 0;
-      if(( 0 == $output['hour'] ) && ( 0 == $output['min'] ) && ( 0 == $output['sec'] ))
-        unset( $output['hour'], $output['min'], $output['sec'] );
+    unset($output['week']);
+    if (empty($output['day']))
+      unset($output['day']);
+    if (isset($output['hour']) || isset($output['min']) || isset($output['sec'])) {
+      if (!isset($output['hour'])) $output['hour'] = 0;
+      if (!isset($output['min'])) $output['min']  = 0;
+      if (!isset($output['sec'])) $output['sec']  = 0;
+      if ((0 == $output['hour']) && (0 == $output['min']) && (0 == $output['sec']))
+        unset($output['hour'], $output['min'], $output['sec']);
     }
     return $output;
   }
@@ -4439,43 +4439,43 @@ 
  * @param array $duration, optional
  * @return array, date format
  */
-  function duration2date( $startdate=FALSE, $duration=FALSE ) {
-    if( $startdate && $duration ) {
+  function duration2date($startdate = FALSE, $duration = FALSE) {
+    if ($startdate && $duration) {
       $d1               = $startdate;
       $dur              = $duration;
     }
-    elseif( isset( $this->dtstart['value'] ) && isset( $this->duration['value'] )) {
+    elseif (isset($this->dtstart['value']) && isset($this->duration['value'])) {
       $d1               = $this->dtstart['value'];
       $dur              = $this->duration['value'];
     }
     else
       return null;
-    $dateOnly         = ( isset( $d1['hour'] ) || isset( $d1['min'] ) || isset( $d1['sec'] )) ? FALSE : TRUE;
-    $d1['hour']       = ( isset( $d1['hour'] )) ? $d1['hour'] : 0;
-    $d1['min']        = ( isset( $d1['min'] ))  ? $d1['min']  : 0;
-    $d1['sec']        = ( isset( $d1['sec'] ))  ? $d1['sec']  : 0;
-    $dtend = mktime( $d1['hour'], $d1['min'], $d1['sec'], $d1['month'], $d1['day'], $d1['year'] );
-    if( isset( $dur['week'] ))
-      $dtend += ( $dur['week'] * 7 * 24 * 60 * 60 );
-    if( isset( $dur['day'] ))
-      $dtend += ( $dur['day'] * 24 * 60 * 60 );
-    if( isset( $dur['hour'] ))
-      $dtend += ( $dur['hour'] * 60 *60 );
-    if( isset( $dur['min'] ))
-      $dtend += ( $dur['min'] * 60 );
-    if( isset( $dur['sec'] ))
-      $dtend +=   $dur['sec'];
+    $dateOnly         = (isset($d1['hour']) || isset($d1['min']) || isset($d1['sec'])) ? FALSE : TRUE;
+    $d1['hour']       = (isset($d1['hour'])) ? $d1['hour'] : 0;
+    $d1['min']        = (isset($d1['min'])) ? $d1['min'] : 0;
+    $d1['sec']        = (isset($d1['sec'])) ? $d1['sec'] : 0;
+    $dtend = mktime($d1['hour'], $d1['min'], $d1['sec'], $d1['month'], $d1['day'], $d1['year']);
+    if (isset($dur['week']))
+      $dtend += ($dur['week'] * 7 * 24 * 60 * 60);
+    if (isset($dur['day']))
+      $dtend += ($dur['day'] * 24 * 60 * 60);
+    if (isset($dur['hour']))
+      $dtend += ($dur['hour'] * 60 * 60);
+    if (isset($dur['min']))
+      $dtend += ($dur['min'] * 60);
+    if (isset($dur['sec']))
+      $dtend += $dur['sec'];
     $dtend2 = array();
-    $dtend2['year']   = date('Y', $dtend );
-    $dtend2['month']  = date('m', $dtend );
-    $dtend2['day']    = date('d', $dtend );
-    $dtend2['hour']   = date('H', $dtend );
-    $dtend2['min']    = date('i', $dtend );
-    $dtend2['sec']    = date('s', $dtend );
-    if( isset( $d1['tz'] ))
+    $dtend2['year']   = date('Y', $dtend);
+    $dtend2['month']  = date('m', $dtend);
+    $dtend2['day']    = date('d', $dtend);
+    $dtend2['hour']   = date('H', $dtend);
+    $dtend2['min']    = date('i', $dtend);
+    $dtend2['sec']    = date('s', $dtend);
+    if (isset($d1['tz']))
       $dtend2['tz']   = $d1['tz'];
-    if( $dateOnly && (( 0 == $dtend2['hour'] ) && ( 0 == $dtend2['min'] ) && ( 0 == $dtend2['sec'] )))
-      unset( $dtend2['hour'], $dtend2['min'], $dtend2['sec'] );
+    if ($dateOnly && ((0 == $dtend2['hour']) && (0 == $dtend2['min']) && (0 == $dtend2['sec'])))
+      unset($dtend2['hour'], $dtend2['min'], $dtend2['sec']);
     return $dtend2;
   }
 /**
@@ -4486,21 +4486,21 @@ 
  * @param string $duration
  * @return array
  */
-  function _duration_string( $duration ) {
-   $duration = (string) trim( $duration );
-   while( 'P' != strtoupper( substr( $duration, 0, 1 ))) {
-     if( 0 < strlen( $duration ))
-       $duration = substr( $duration, 1 );
+  function _duration_string($duration) {
+   $duration = (string) trim($duration);
+   while ('P' != strtoupper(substr($duration, 0, 1))) {
+     if (0 < strlen($duration))
+       $duration = substr($duration, 1);
      else
        return false; // no leading P !?!?
    }
-   $duration = substr( $duration, 1 ); // skip P
-   $duration = str_replace ( 't', 'T', $duration );
-   $duration = str_replace ( 'T', '', $duration );
+   $duration = substr($duration, 1); // skip P
+   $duration = str_replace('t', 'T', $duration);
+   $duration = str_replace('T', '', $duration);
    $output = array();
    $val    = null;
-   for( $ix=0; $ix < strlen( $duration ); $ix++ ) {
-     switch( strtoupper( $duration{$ix} )) {
+   for ($ix = 0; $ix < strlen($duration); $ix++) {
+     switch (strtoupper($duration{$ix} )) {
       case 'W':
         $output['week'] = $val;
         $val            = null;
@@ -4522,13 +4522,13 @@ 
         $val            = null;
         break;
       default:
-        if( !ctype_digit( $duration{$ix} ))
+        if (!ctype_digit($duration{$ix} ))
           return false; // unknown duration controll character  !?!?
         else
           $val .= $duration{$ix};
      }
    }
-   return $this->_duration_array( $output );
+   return $this->_duration_array($output);
   }
 /**
  * if not preSet, if exist, remove key with expected value from array and return hit value else return elseValue
@@ -4543,15 +4543,15 @@ 
  * @param int $preSet optional, return value if already preset
  * @return int
  */
-  function _existRem( &$array, $expkey, $expval=FALSE, $hitVal=null, $elseVal=null, $preSet=null ) {
-    if( $preSet )
+  function _existRem(&$array, $expkey, $expval = FALSE, $hitVal = null, $elseVal = null, $preSet = null) {
+    if ($preSet)
       return $preSet;
-    if( !is_array( $array ) || ( 0 == count( $array )))
+    if (!is_array($array) || (0 == count($array)))
       return $elseVal;
-    foreach( $array as $key => $value ) {
-      if( strtoupper( $expkey ) == strtoupper( $key )) {
-        if( !$expval || ( strtoupper( $expval ) == strtoupper( $array[$key] ))) {
-          unset( $array[$key] );
+    foreach ($array as $key => $value) {
+      if (strtoupper($expkey) == strtoupper($key)) {
+        if (!$expval || (strtoupper($expval) == strtoupper($array[$key]))) {
+          unset($array[$key]);
           return $hitVal;
         }
       }
@@ -4567,48 +4567,48 @@ 
  * @param int     $parno, optional, default 6
  * @return string
  */
-  function _format_date_time( $datetime, $parno=6 ) {
-    if( !isset( $datetime['year'] )  &&
-        !isset( $datetime['month'] ) &&
-        !isset( $datetime['day'] )   &&
-        !isset( $datetime['hour'] )  &&
-        !isset( $datetime['min'] )   &&
-        !isset( $datetime['sec'] ))
-      return ;
+  function _format_date_time($datetime, $parno = 6) {
+    if (!isset($datetime['year']) &&
+        !isset($datetime['month']) &&
+        !isset($datetime['day']) &&
+        !isset($datetime['hour']) &&
+        !isset($datetime['min']) &&
+        !isset($datetime['sec']))
+      return;
     $output = null;
     // if( !isset( $datetime['day'] )) { $o=''; foreach($datetime as $k=>$v) {if(is_array($v)) $v=implode('-',$v);$o.=" $k=>$v";} echo " day SAKNAS : $o <br />\n"; }
-    foreach( $datetime as $dkey => $dvalue ) {
-      if( 'tz' != $dkey )
+    foreach ($datetime as $dkey => $dvalue) {
+      if ('tz' != $dkey)
         $datetime[$dkey] = (integer) $dvalue;
     }
-    $output = date('Ymd', mktime( 0, 0, 0, $datetime['month'], $datetime['day'], $datetime['year']));
-    if( isset( $datetime['hour'] )  ||
-        isset( $datetime['min'] )   ||
-        isset( $datetime['sec'] )   ||
-        isset( $datetime['tz'] )) {
-      if( isset( $datetime['tz'] )  &&
-         !isset( $datetime['hour'] ))
+    $output = date('Ymd', mktime(0, 0, 0, $datetime['month'], $datetime['day'], $datetime['year']));
+    if (isset($datetime['hour']) ||
+        isset($datetime['min']) ||
+        isset($datetime['sec']) ||
+        isset($datetime['tz'])) {
+      if (isset($datetime['tz']) &&
+         !isset($datetime['hour']))
         $datetime['hour'] = 0;
-      if( isset( $datetime['hour'] )  &&
-         !isset( $datetime['min'] ))
+      if (isset($datetime['hour']) &&
+         !isset($datetime['min']))
         $datetime['min'] = 0;
-      if( isset( $datetime['hour'] )  &&
-          isset( $datetime['min'] )   &&
-         !isset( $datetime['sec'] ))
+      if (isset($datetime['hour']) &&
+          isset($datetime['min']) &&
+         !isset($datetime['sec']))
         $datetime['sec'] = 0;
-      $date = mktime( $datetime['hour'], $datetime['min'], $datetime['sec'], $datetime['month'], $datetime['day'], $datetime['year']);
-      $output .= date('\THis', $date );
-      if( isset( $datetime['tz'] ) && ( '' < trim ( $datetime['tz'] ))) {
-        $datetime['tz'] = trim( $datetime['tz'] );
-        if( 'Z' == $datetime['tz'] )
+      $date = mktime($datetime['hour'], $datetime['min'], $datetime['sec'], $datetime['month'], $datetime['day'], $datetime['year']);
+      $output .= date('\THis', $date);
+      if (isset($datetime['tz']) && ('' < trim($datetime['tz']))) {
+        $datetime['tz'] = trim($datetime['tz']);
+        if ('Z' == $datetime['tz'])
           $output .= 'Z';
-        $offset = $this->_tz2offset( $datetime['tz'] );
-        if( 0 != $offset ) {
-          $date = mktime( $datetime['hour'], $datetime['min'], ($datetime['sec'] + $offset), $datetime['month'], $datetime['day'], $datetime['year']);
-          $output    = date( 'Ymd\THis\Z', $date );
+        $offset = $this->_tz2offset($datetime['tz']);
+        if (0 != $offset) {
+          $date = mktime($datetime['hour'], $datetime['min'], ($datetime['sec'] + $offset), $datetime['month'], $datetime['day'], $datetime['year']);
+          $output = date('Ymd\THis\Z', $date);
         }
       }
-      elseif( 7 == $parno )
+      elseif (7 == $parno)
         $output .= 'Z';
     }
     return $output;
@@ -4621,26 +4621,26 @@ 
  * @param array $duration ( week, day, hour, min, sec )
  * @return string
  */
-  function _format_duration( $duration ) {
-    if( !isset( $duration['week'] ) &&
-        !isset( $duration['day'] )  &&
-        !isset( $duration['hour'] ) &&
-        !isset( $duration['min'] )  &&
-        !isset( $duration['sec'] ))
+  function _format_duration($duration) {
+    if (!isset($duration['week']) &&
+        !isset($duration['day']) &&
+        !isset($duration['hour']) &&
+        !isset($duration['min']) &&
+        !isset($duration['sec']))
       return;
     $output = 'P';
-    if( isset( $duration['week'] ) && ( 0 < $duration['week'] ))
+    if (isset($duration['week']) && (0 < $duration['week']))
       $output   .= $duration['week'].'W';
     else {
-      if( isset($duration['day'] ) && ( 0 < $duration['day'] ))
+      if (isset($duration['day']) && (0 < $duration['day']))
         $output .= $duration['day'].'D';
-      if(( isset( $duration['hour']) && ( 0 < $duration['hour'] )) ||
-         ( isset( $duration['min'])  && ( 0 < $duration['min'] ))  ||
-         ( isset( $duration['sec'])  && ( 0 < $duration['sec'] ))) {
+      if ((isset($duration['hour']) && (0 < $duration['hour'])) ||
+         (isset($duration['min']) && (0 < $duration['min'])) ||
+         (isset($duration['sec']) && (0 < $duration['sec']))) {
         $output .= 'T';
-        $output .= ( isset( $duration['hour']) && ( 0 < $duration['hour'] )) ? $duration['hour'].'H' : '0H';
-        $output .= ( isset( $duration['min'])  && ( 0 < $duration['min'] ))  ? $duration['min']. 'M' : '0M';
-        $output .= ( isset( $duration['sec'])  && ( 0 < $duration['sec'] ))  ? $duration['sec']. 'S' : '0S';
+        $output .= (isset($duration['hour']) && (0 < $duration['hour'])) ? $duration['hour'].'H' : '0H';
+        $output .= (isset($duration['min']) && (0 < $duration['min'])) ? $duration['min'].'M' : '0M';
+        $output .= (isset($duration['sec']) && (0 < $duration['sec'])) ? $duration['sec'].'S' : '0S';
       }
     }
     return $output;
@@ -4654,24 +4654,24 @@ 
  * @param array $recurdata
  * @return string
  */
-  function _format_recur( $recurlabel, $recurdata ) {
+  function _format_recur($recurlabel, $recurdata) {
     $output = null;
-    foreach( $recurdata as $therule ) {
-      if( empty( $therule['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( $recurlabel );
+    foreach ($recurdata as $therule) {
+      if (empty($therule['value'])) {
+        if ($this->getConfig('allowEmpty')) $output .= $this->_createElement($recurlabel);
         continue;
       }
-      $attributes = ( isset( $therule['params'] )) ? $this->_createParams( $therule['params'] ) : null;
-      $content1  = $content2  = null;
-      foreach( $therule['value'] as $rulelabel => $rulevalue ) {
-        switch( $rulelabel ) {
+      $attributes = (isset($therule['params'])) ? $this->_createParams($therule['params']) : null;
+      $content1 = $content2 = null;
+      foreach ($therule['value'] as $rulelabel => $rulevalue) {
+        switch ($rulelabel) {
           case 'FREQ': {
             $content1 .= "FREQ=$rulevalue";
             break;
           }
           case 'UNTIL': {
             $content2 .= ";UNTIL=";
-            $content2 .= $this->_format_date_time( $rulevalue );
+            $content2 .= $this->_format_date_time($rulevalue);
             break;
           }
           case 'COUNT':
@@ -4689,9 +4689,9 @@ 
           case 'BYMONTH':
           case 'BYSETPOS': {
             $content2 .= ";$rulelabel=";
-            if( is_array( $rulevalue )) {
-              foreach( $rulevalue as $vix => $valuePart ) {
-                $content2 .= ( $vix ) ? ',' : null;
+            if (is_array($rulevalue)) {
+              foreach ($rulevalue as $vix => $valuePart) {
+                $content2 .= ($vix) ? ',' : null;
                 $content2 .= $valuePart;
               }
             }
@@ -4702,12 +4702,12 @@ 
           case 'BYDAY': {
             $content2 .= ";$rulelabel=";
             $bydaycnt = 0;
-            foreach( $rulevalue as $vix => $valuePart ) {
+            foreach ($rulevalue as $vix => $valuePart) {
               $content21 = $content22 = null;
-              if( is_array( $valuePart )) {
-                $content2 .= ( $bydaycnt ) ? ',' : null;
-                foreach( $valuePart as $vix2 => $valuePart2 ) {
-                  if( 'DAY' != strtoupper( $vix2 ))
+              if (is_array($valuePart)) {
+                $content2 .= ($bydaycnt) ? ',' : null;
+                foreach ($valuePart as $vix2 => $valuePart2) {
+                  if ('DAY' != strtoupper($vix2))
                       $content21 .= $valuePart2;
                   else
                     $content22 .= $valuePart2;
@@ -4716,8 +4716,8 @@ 
                 $bydaycnt++;
               }
               else {
-                $content2 .= ( $bydaycnt ) ? ',' : null;
-                if( 'DAY' != strtoupper( $vix ))
+                $content2 .= ($bydaycnt) ? ',' : null;
+                if ('DAY' != strtoupper($vix))
                     $content21 .= $valuePart;
                 else {
                   $content22 .= $valuePart;
@@ -4734,7 +4734,7 @@ 
           }
         }
       }
-      $output .= $this->_createElement( $recurlabel, $attributes, $content1.$content2 );
+      $output .= $this->_createElement($recurlabel, $attributes, $content1.$content2);
     }
     return $output;
   }
@@ -4746,13 +4746,13 @@ 
  * @param string $propertyName
  * @return string
  */
-  function _formatPropertyName( $propertyName ) {
-    switch( $this->format ) {
+  function _formatPropertyName($propertyName) {
+    switch ($this->format) {
       case 'xcal':
-        return strtolower( $propertyName );
+        return strtolower($propertyName);
         break;
       default:
-        return strtoupper( $propertyName );
+        return strtoupper($propertyName);
         break;
     }
   }
@@ -4764,25 +4764,25 @@ 
  * @param array $input
  * @return bool
  */
-  function _isArrayDate( $input ) {
-    if( isset( $input['week'] ) || ( !in_array( count( $input ), array( 3, 6, 7 ))))
+  function _isArrayDate($input) {
+    if (isset($input['week']) || (!in_array(count($input), array(3, 6, 7))))
       return FALSE;
-    if( 7 == count( $input ))
+    if (7 == count($input))
       return TRUE;
-    if( isset( $input['year'] ) && isset( $input['month'] ) && isset( $input['day'] ))
-      return checkdate( (int) $input['month'], (int) $input['day'], (int) $input['year'] );
-    if( isset( $input['day'] ) || isset( $input['hour'] ) || isset( $input['min'] ) || isset( $input['sec'] ))
+    if (isset($input['year']) && isset($input['month']) && isset($input['day']))
+      return checkdate((int) $input['month'], (int) $input['day'], (int) $input['year']);
+    if (isset($input['day']) || isset($input['hour']) || isset($input['min']) || isset($input['sec']))
       return FALSE;
-    if( in_array( 0, $input ))
+    if (in_array(0, $input))
       return FALSE;
-    if(( 1970 > $input[0] ) || ( 12 < $input[1] ) || ( 31 < $input[2] ))
+    if ((1970 > $input[0]) || (12 < $input[1]) || (31 < $input[2]))
       return FALSE;
-    if(( isset( $input[0] ) && isset( $input[1] ) && isset( $input[2] )) &&
-         checkdate( (int) $input[1], (int) $input[2], (int) $input[0] ))
+    if ((isset($input[0]) && isset($input[1]) && isset($input[2])) &&
+         checkdate((int) $input[1], (int) $input[2], (int) $input[0]))
       return TRUE;
-    $input = $this->_date_time_string( $input[1].'/'.$input[2].'/'.$input[0], 3 ); //  m - d - Y
-    if( isset( $input['year'] ) && isset( $input['month'] ) && isset( $input['day'] ))
-      return checkdate( (int) $input['month'], (int) $input['day'], (int) $input['year'] );
+    $input = $this->_date_time_string($input[1].'/'.$input[2].'/'.$input[0], 3); //  m - d - Y
+    if (isset($input['year']) && isset($input['month']) && isset($input['day']))
+      return checkdate((int) $input['month'], (int) $input['day'], (int) $input['year']);
     return FALSE;
   }
 /**
@@ -4793,8 +4793,8 @@ 
  * @param array $input
  * @return bool
  */
-  function _isArrayTimestampDate( $input ) {
-    return ( is_array( $input ) && isset( $input['timestamp'] )) ? TRUE : FALSE ;
+  function _isArrayTimestampDate($input) {
+    return (is_array($input) && isset($input['timestamp'])) ? TRUE : FALSE;
   }
 /**
  * controll if input string contains traling UTC offset
@@ -4804,17 +4804,17 @@ 
  * @param string $input
  * @return bool
  */
-  function _isOffset( $input ) {
-    $input         = trim( (string) $input );
-    if( 'Z' == substr( $input, -1 ))
+  function _isOffset($input) {
+    $input = trim((string) $input);
+    if ('Z' == substr($input, -1))
       return TRUE;
-    elseif((   5 <= strlen( $input )) &&
-       ( in_array( substr( $input, -5, 1 ), array( '+', '-' ))) &&
-       (   '0000'  < substr( $input, -4 )) && (   '9999' >= substr( $input, -4 )))
+    elseif ((5 <= strlen($input)) &&
+       (in_array(substr($input, -5, 1), array('+', '-'))) &&
+       ('0000' < substr($input, -4)) && ('9999' >= substr($input, -4)))
       return TRUE;
-    elseif((    7 <= strlen( $input )) &&
-       ( in_array( substr( $input, -7, 1 ), array( '+', '-' ))) &&
-       ( '000000'  < substr( $input, -6 )) && ( '999999' >= substr( $input, -6 )))
+    elseif ((7 <= strlen($input)) &&
+       (in_array(substr($input, -7, 1), array('+', '-'))) &&
+       ('000000' < substr($input, -6)) && ('999999' >= substr($input, -6)))
       return TRUE;
     return FALSE;
 
@@ -4827,15 +4827,15 @@ 
  * @param string $propName
  * @return bool
  */
-  function _notExistProp( $propName ) {
-    if( empty( $propName )) return FALSE; // when deleting x-prop, an empty propName may be used=allowed
-    $propName = strtolower( $propName );
-    if(     'last-modified'    == $propName )  { if( !isset( $this->lastmodified ))    return TRUE; }
-    elseif( 'percent-complete' == $propName )  { if( !isset( $this->percentcomplete )) return TRUE; }
-    elseif( 'recurrence-id'    == $propName )  { if( !isset( $this->recurrenceid ))    return TRUE; }
-    elseif( 'related-to'       == $propName )  { if( !isset( $this->relatedto ))       return TRUE; }
-    elseif( 'request-status'   == $propName )  { if( !isset( $this->requeststatus ))   return TRUE; }
-    elseif((       'x-' != substr($propName,0,2)) && !isset( $this->$propName ))       return TRUE;
+  function _notExistProp($propName) {
+    if (empty($propName)) return FALSE; // when deleting x-prop, an empty propName may be used=allowed
+    $propName = strtolower($propName);
+    if ('last-modified' == $propName) { if (!isset($this->lastmodified))    return TRUE; }
+    elseif ('percent-complete' == $propName) { if (!isset($this->percentcomplete)) return TRUE; }
+    elseif ('recurrence-id' == $propName) { if (!isset($this->recurrenceid))    return TRUE; }
+    elseif ('related-to' == $propName) { if (!isset($this->relatedto))       return TRUE; }
+    elseif ('request-status' == $propName) { if (!isset($this->requeststatus))   return TRUE; }
+    elseif (('x-' != substr($propName, 0, 2)) && !isset($this->$propName))       return TRUE;
     return FALSE;
   }
 /**
@@ -4853,101 +4853,101 @@ 
  * @return array of recurrence (start-)dates as index
  * @todo BYHOUR, BYMINUTE, BYSECOND, ev. BYSETPOS due to ambiguity, WEEKLY at year end/start
  */
-  function _recur2date( & $result, $recur, $wdate, $startdate, $enddate=FALSE ) {
-    foreach( $wdate as $k => $v ) if( ctype_digit( $v )) $wdate[$k] = (int) $v;
-    $wdatets     = $this->_date2timestamp( $wdate );
-    $startdatets = $this->_date2timestamp( $startdate );
-    if( !$enddate ) {
+  function _recur2date(& $result, $recur, $wdate, $startdate, $enddate = FALSE) {
+    foreach ($wdate as $k => $v) if (ctype_digit($v)) $wdate[$k] = (int) $v;
+    $wdatets     = $this->_date2timestamp($wdate);
+    $startdatets = $this->_date2timestamp($startdate);
+    if (!$enddate) {
       $enddate = $startdate;
       $enddate['year'] += 1;
 // echo "recur __in_ ".implode('-',$startdate)." period start ".implode('-',$wdate)." period end ".implode('-',$enddate)."<br />\n";print_r($recur);echo "<br />\n";//test###
     }
-    $endDatets = $this->_date2timestamp( $enddate ); // fix break
-    if( !isset( $recur['COUNT'] ) && !isset( $recur['UNTIL'] ))
+    $endDatets = $this->_date2timestamp($enddate); // fix break
+    if (!isset($recur['COUNT']) && !isset($recur['UNTIL']))
       $recur['UNTIL'] = $enddate; // create break
-    if( isset( $recur['UNTIL'] )) {
-      $tdatets = $this->_date2timestamp( $recur['UNTIL'] );
-      if( $endDatets > $tdatets ) {
+    if (isset($recur['UNTIL'])) {
+      $tdatets = $this->_date2timestamp($recur['UNTIL']);
+      if ($endDatets > $tdatets) {
         $endDatets = $tdatets; // emergency break
-        $enddate   = $this->_timestamp2date( $endDatets, 6 );
+        $enddate   = $this->_timestamp2date($endDatets, 6);
       }
       else
-        $recur['UNTIL'] = $this->_timestamp2date( $endDatets, 6 );
+        $recur['UNTIL'] = $this->_timestamp2date($endDatets, 6);
     }
-    if( $wdatets > $endDatets ) {
+    if ($wdatets > $endDatets) {
      //echo "recur out of date ".implode('-',$this->_date_time_string(date('Y-m-d H:i:s',$wdatets),6))."<br />\n";//test
       return array(); // nothing to do.. .
     }
-    if( !isset( $recur['FREQ'] )) // "MUST be specified.. ."
+    if (!isset($recur['FREQ'])) // "MUST be specified.. ."
       $recur['FREQ'] = 'DAILY'; // ??
-    $wkst = ( isset( $recur['WKST'] ) && ( 'SU' == $recur['WKST'] )) ? 24*60*60 : 0; // ??
-    if( !isset( $recur['INTERVAL'] ))
+    $wkst = (isset($recur['WKST']) && ('SU' == $recur['WKST'])) ? 24 * 60 * 60 : 0; // ??
+    if (!isset($recur['INTERVAL']))
       $recur['INTERVAL'] = 1;
-    $countcnt = ( !isset( $recur['BYSETPOS'] )) ? 1 : 0; // DTSTART counts as the first occurrence
+    $countcnt = (!isset($recur['BYSETPOS'])) ? 1 : 0; // DTSTART counts as the first occurrence
             /* find out how to step up dates and set index for interval count */
     $step = array();
-    if( 'YEARLY' == $recur['FREQ'] )
+    if ('YEARLY' == $recur['FREQ'])
       $step['year']  = 1;
-    elseif( 'MONTHLY' == $recur['FREQ'] )
+    elseif ('MONTHLY' == $recur['FREQ'])
       $step['month'] = 1;
-    elseif( 'WEEKLY' == $recur['FREQ'] )
+    elseif ('WEEKLY' == $recur['FREQ'])
       $step['day']   = 7;
     else
       $step['day']   = 1;
-    if( isset( $step['year'] ) && isset( $recur['BYMONTH'] ))
-      $step = array( 'month' => 1 );
-    if( empty( $step ) && isset( $recur['BYWEEKNO'] )) // ??
-      $step = array( 'day' => 7 );
-    if( isset( $recur['BYYEARDAY'] ) || isset( $recur['BYMONTHDAY'] ) || isset( $recur['BYDAY'] ))
-      $step = array( 'day' => 1 );
+    if (isset($step['year']) && isset($recur['BYMONTH']))
+      $step = array('month' => 1);
+    if (empty($step) && isset($recur['BYWEEKNO'])) // ??
+      $step = array('day' => 7);
+    if (isset($recur['BYYEARDAY']) || isset($recur['BYMONTHDAY']) || isset($recur['BYDAY']))
+      $step = array('day' => 1);
     $intervalarr = array();
-    if( 1 < $recur['INTERVAL'] ) {
-      $intervalix = $this->_recurIntervalIx( $recur['FREQ'], $wdate, $wkst );
-      $intervalarr = array( $intervalix => 0 );
+    if (1 < $recur['INTERVAL']) {
+      $intervalix = $this->_recurIntervalIx($recur['FREQ'], $wdate, $wkst);
+      $intervalarr = array($intervalix => 0);
     }
-    if( isset( $recur['BYSETPOS'] )) { // save start date + weekno
+    if (isset($recur['BYSETPOS'])) { // save start date + weekno
       $bysetposymd1 = $bysetposymd2 = $bysetposw1 = $bysetposw2 = array();
-      $bysetposWold = (int) date( 'W', ( $wdatets + $wkst ));
+      $bysetposWold = (int) date('W', ($wdatets + $wkst));
       $bysetposYold = $wdate['year'];
       $bysetposMold = $wdate['month'];
       $bysetposDold = $wdate['day'];
-      if( is_array( $recur['BYSETPOS'] )) {
-        foreach( $recur['BYSETPOS'] as $bix => $bval )
+      if (is_array($recur['BYSETPOS'])) {
+        foreach ($recur['BYSETPOS'] as $bix => $bval)
           $recur['BYSETPOS'][$bix] = (int) $bval;
       }
       else
-        $recur['BYSETPOS'] = array( (int) $recur['BYSETPOS'] );
-      $this->_stepdate( $enddate, $endDatets, $step); // make sure to count whole last period
+        $recur['BYSETPOS'] = array((int) $recur['BYSETPOS']);
+      $this->_stepdate($enddate, $endDatets, $step); // make sure to count whole last period
     }
-    $this->_stepdate( $wdate, $wdatets, $step);
+    $this->_stepdate($wdate, $wdatets, $step);
     $year_old     = null;
-    $daynames     = array( 'SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA' );
+    $daynames     = array('SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA');
              /* MAIN LOOP */
      // echo "recur start ".implode('-',$wdate)." end ".implode('-',$enddate)."<br />\n";//test
-    while( TRUE ) {
-      if( isset( $endDatets ) && ( $wdatets > $endDatets ))
+    while (TRUE) {
+      if (isset($endDatets) && ($wdatets > $endDatets))
         break;
-      if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] ))
+      if (isset($recur['COUNT']) && ($countcnt >= $recur['COUNT']))
         break;
-      if( $year_old != $wdate['year'] ) {
+      if ($year_old != $wdate['year']) {
         $year_old   = $wdate['year'];
         $daycnts    = array();
         $yeardays   = $weekno = 0;
         $yeardaycnt = array();
-        for( $m = 1; $m <= 12; $m++ ) { // count up and update up-counters
+        for ($m = 1; $m <= 12; $m++) { // count up and update up-counters
           $daycnts[$m] = array();
           $weekdaycnt = array();
-          foreach( $daynames as $dn )
+          foreach ($daynames as $dn)
             $yeardaycnt[$dn] = $weekdaycnt[$dn] = 0;
-          $mcnt     = date( 't', mktime( 0, 0, 0, $m, 1, $wdate['year'] ));
-          for( $d   = 1; $d <= $mcnt; $d++ ) {
+          $mcnt     = date('t', mktime(0, 0, 0, $m, 1, $wdate['year']));
+          for ($d   = 1; $d <= $mcnt; $d++) {
             $daycnts[$m][$d] = array();
-            if( isset( $recur['BYYEARDAY'] )) {
+            if (isset($recur['BYYEARDAY'])) {
               $yeardays++;
               $daycnts[$m][$d]['yearcnt_up'] = $yeardays;
             }
-            if( isset( $recur['BYDAY'] )) {
-              $day    = date( 'w', mktime( 0, 0, 0, $m, $d, $wdate['year'] ));
+            if (isset($recur['BYDAY'])) {
+              $day    = date('w', mktime(0, 0, 0, $m, $d, $wdate['year']));
               $day    = $daynames[$day];
               $daycnts[$m][$d]['DAY'] = $day;
               $weekdaycnt[$day]++;
@@ -4955,64 +4955,64 @@ 
               $yeardaycnt[$day]++;
               $daycnts[$m][$d]['yeardayno_up'] = $yeardaycnt[$day];
             }
-            if(  isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' ))
-              $daycnts[$m][$d]['weekno_up'] =(int)date('W',mktime(0,0,$wkst,$m,$d,$wdate['year']));
+            if (isset($recur['BYWEEKNO']) || ($recur['FREQ'] == 'WEEKLY'))
+              $daycnts[$m][$d]['weekno_up'] = (int) date('W', mktime(0, 0, $wkst, $m, $d, $wdate['year']));
           }
         }
         $daycnt = 0;
         $yeardaycnt = array();
-        if(  isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' )) {
+        if (isset($recur['BYWEEKNO']) || ($recur['FREQ'] == 'WEEKLY')) {
           $weekno = null;
-          for( $d=31; $d > 25; $d-- ) { // get last weekno for year
-            if( !$weekno )
+          for ($d = 31; $d > 25; $d--) { // get last weekno for year
+            if (!$weekno)
               $weekno = $daycnts[12][$d]['weekno_up'];
-            elseif( $weekno < $daycnts[12][$d]['weekno_up'] ) {
+            elseif ($weekno < $daycnts[12][$d]['weekno_up']) {
               $weekno = $daycnts[12][$d]['weekno_up'];
               break;
             }
           }
         }
-        for( $m = 12; $m > 0; $m-- ) { // count down and update down-counters
+        for ($m = 12; $m > 0; $m--) { // count down and update down-counters
           $weekdaycnt = array();
-          foreach( $daynames as $dn )
+          foreach ($daynames as $dn)
             $yeardaycnt[$dn] = $weekdaycnt[$dn] = 0;
           $monthcnt = 0;
-          $mcnt     = date( 't', mktime( 0, 0, 0, $m, 1, $wdate['year'] ));
-          for( $d   = $mcnt; $d > 0; $d-- ) {
-            if( isset( $recur['BYYEARDAY'] )) {
+          $mcnt     = date('t', mktime(0, 0, 0, $m, 1, $wdate['year']));
+          for ($d   = $mcnt; $d > 0; $d--) {
+            if (isset($recur['BYYEARDAY'])) {
               $daycnt -= 1;
               $daycnts[$m][$d]['yearcnt_down'] = $daycnt;
             }
-            if( isset( $recur['BYMONTHDAY'] )) {
+            if (isset($recur['BYMONTHDAY'])) {
               $monthcnt -= 1;
               $daycnts[$m][$d]['monthcnt_down'] = $monthcnt;
             }
-            if( isset( $recur['BYDAY'] )) {
-              $day  = $daycnts[$m][$d]['DAY'];
+            if (isset($recur['BYDAY'])) {
+              $day = $daycnts[$m][$d]['DAY'];
               $weekdaycnt[$day] -= 1;
               $daycnts[$m][$d]['monthdayno_down'] = $weekdaycnt[$day];
               $yeardaycnt[$day] -= 1;
               $daycnts[$m][$d]['yeardayno_down'] = $yeardaycnt[$day];
             }
-            if(  isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' ))
+            if (isset($recur['BYWEEKNO']) || ($recur['FREQ'] == 'WEEKLY'))
               $daycnts[$m][$d]['weekno_down'] = ($daycnts[$m][$d]['weekno_up'] - $weekno - 1);
           }
         }
       }
             /* check interval */
-      if( 1 < $recur['INTERVAL'] ) {
+      if (1 < $recur['INTERVAL']) {
             /* create interval index */
-        $intervalix = $this->_recurIntervalIx( $recur['FREQ'], $wdate, $wkst );
+        $intervalix = $this->_recurIntervalIx($recur['FREQ'], $wdate, $wkst);
             /* check interval */
-        $currentKey = array_keys( $intervalarr );
-        $currentKey = end( $currentKey ); // get last index
-        if( $currentKey != $intervalix )
-          $intervalarr = array( $intervalix => ( $intervalarr[$currentKey] + 1 ));
-        if(( $recur['INTERVAL'] != $intervalarr[$intervalix] ) &&
-           ( 0 != $intervalarr[$intervalix] )) {
+        $currentKey = array_keys($intervalarr);
+        $currentKey = end($currentKey); // get last index
+        if ($currentKey != $intervalix)
+          $intervalarr = array($intervalix => ($intervalarr[$currentKey] + 1));
+        if (($recur['INTERVAL'] != $intervalarr[$intervalix]) &&
+           (0 != $intervalarr[$intervalix])) {
             /* step up date */
     //echo "skip: ".implode('-',$wdate)." ix=$intervalix old=$currentKey interval=".$intervalarr[$intervalix]."<br />\n";//test
-          $this->_stepdate( $wdate, $wdatets, $step);
+          $this->_stepdate($wdate, $wdatets, $step);
           continue;
         }
         else // continue within the selected interval
@@ -5020,69 +5020,69 @@ 
    //echo "cont: ".implode('-',$wdate)." ix=$intervalix old=$currentKey interval=".$intervalarr[$intervalix]."<br />\n";//test
       }
       $updateOK = TRUE;
-      if( $updateOK && isset( $recur['BYMONTH'] ))
-        $updateOK = $this->_recurBYcntcheck( $recur['BYMONTH']
+      if ($updateOK && isset($recur['BYMONTH']))
+        $updateOK = $this->_recurBYcntcheck($recur['BYMONTH']
                                            , $wdate['month']
                                            ,($wdate['month'] - 13));
-      if( $updateOK && isset( $recur['BYWEEKNO'] ))
-        $updateOK = $this->_recurBYcntcheck( $recur['BYWEEKNO']
+      if ($updateOK && isset($recur['BYWEEKNO']))
+        $updateOK = $this->_recurBYcntcheck($recur['BYWEEKNO']
                                            , $daycnts[$wdate['month']][$wdate['day']]['weekno_up']
-                                           , $daycnts[$wdate['month']][$wdate['day']]['weekno_down'] );
-      if( $updateOK && isset( $recur['BYYEARDAY'] ))
-        $updateOK = $this->_recurBYcntcheck( $recur['BYYEARDAY']
+                                           , $daycnts[$wdate['month']][$wdate['day']]['weekno_down']);
+      if ($updateOK && isset($recur['BYYEARDAY']))
+        $updateOK = $this->_recurBYcntcheck($recur['BYYEARDAY']
                                            , $daycnts[$wdate['month']][$wdate['day']]['yearcnt_up']
-                                           , $daycnts[$wdate['month']][$wdate['day']]['yearcnt_down'] );
-      if( $updateOK && isset( $recur['BYMONTHDAY'] ))
-        $updateOK = $this->_recurBYcntcheck( $recur['BYMONTHDAY']
+                                           , $daycnts[$wdate['month']][$wdate['day']]['yearcnt_down']);
+      if ($updateOK && isset($recur['BYMONTHDAY']))
+        $updateOK = $this->_recurBYcntcheck($recur['BYMONTHDAY']
                                            , $wdate['day']
-                                           , $daycnts[$wdate['month']][$wdate['day']]['monthcnt_down'] );
+                                           , $daycnts[$wdate['month']][$wdate['day']]['monthcnt_down']);
     //echo "efter BYMONTHDAY: ".implode('-',$wdate).' status: '; echo ($updateOK) ? 'TRUE' : 'FALSE'; echo "<br />\n";//test###
-      if( $updateOK && isset( $recur['BYDAY'] )) {
+      if ($updateOK && isset($recur['BYDAY'])) {
         $updateOK = FALSE;
         $m = $wdate['month'];
         $d = $wdate['day'];
-        if( isset( $recur['BYDAY']['DAY'] )) { // single day, opt with year/month day order no
-          $daynoexists = $daynosw = $daynamesw =  FALSE;
-          if( $recur['BYDAY']['DAY'] == $daycnts[$m][$d]['DAY'] )
+        if (isset($recur['BYDAY']['DAY'])) { // single day, opt with year/month day order no
+          $daynoexists = $daynosw = $daynamesw = FALSE;
+          if ($recur['BYDAY']['DAY'] == $daycnts[$m][$d]['DAY'])
             $daynamesw = TRUE;
-          if( isset( $recur['BYDAY'][0] )) {
+          if (isset($recur['BYDAY'][0])) {
             $daynoexists = TRUE;
-            if(( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'MONTHLY' )) || isset( $recur['BYMONTH'] ))
-              $daynosw = $this->_recurBYcntcheck( $recur['BYDAY'][0]
+            if ((isset($recur['FREQ']) && ($recur['FREQ'] == 'MONTHLY')) || isset($recur['BYMONTH']))
+              $daynosw = $this->_recurBYcntcheck($recur['BYDAY'][0]
                                                 , $daycnts[$m][$d]['monthdayno_up']
-                                                , $daycnts[$m][$d]['monthdayno_down'] );
-            elseif( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'YEARLY' ))
-              $daynosw = $this->_recurBYcntcheck( $recur['BYDAY'][0]
+                                                , $daycnts[$m][$d]['monthdayno_down']);
+            elseif (isset($recur['FREQ']) && ($recur['FREQ'] == 'YEARLY'))
+              $daynosw = $this->_recurBYcntcheck($recur['BYDAY'][0]
                                                 , $daycnts[$m][$d]['yeardayno_up']
-                                                , $daycnts[$m][$d]['yeardayno_down'] );
+                                                , $daycnts[$m][$d]['yeardayno_down']);
           }
-          if((  $daynoexists &&  $daynosw && $daynamesw ) ||
-             ( !$daynoexists && !$daynosw && $daynamesw )) {
+          if (($daynoexists && $daynosw && $daynamesw) ||
+             (!$daynoexists && !$daynosw && $daynamesw)) {
             $updateOK = TRUE;
           }
         //echo "daynoexists:$daynoexists daynosw:$daynosw daynamesw:$daynamesw<br />\n"; // test ###
         }
         else {
-          foreach( $recur['BYDAY'] as $bydayvalue ) {
+          foreach ($recur['BYDAY'] as $bydayvalue) {
             $daynoexists = $daynosw = $daynamesw = FALSE;
-            if( isset( $bydayvalue['DAY'] ) &&
-                     ( $bydayvalue['DAY'] == $daycnts[$m][$d]['DAY'] ))
+            if (isset($bydayvalue['DAY']) &&
+                     ($bydayvalue['DAY'] == $daycnts[$m][$d]['DAY']))
               $daynamesw = TRUE;
-            if( isset( $bydayvalue[0] )) {
+            if (isset($bydayvalue[0])) {
               $daynoexists = TRUE;
-              if(( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'MONTHLY' )) ||
-                   isset( $recur['BYMONTH'] ))
-                $daynosw = $this->_recurBYcntcheck( $bydayvalue['0']
+              if ((isset($recur['FREQ']) && ($recur['FREQ'] == 'MONTHLY')) ||
+                   isset($recur['BYMONTH']))
+                $daynosw = $this->_recurBYcntcheck($bydayvalue['0']
                                                   , $daycnts[$m][$d]['monthdayno_up']
-                                                  , $daycnts[$m][$d]['monthdayno_down'] );
-              elseif( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'YEARLY' ))
-                $daynosw = $this->_recurBYcntcheck( $bydayvalue['0']
+                                                  , $daycnts[$m][$d]['monthdayno_down']);
+              elseif (isset($recur['FREQ']) && ($recur['FREQ'] == 'YEARLY'))
+                $daynosw = $this->_recurBYcntcheck($bydayvalue['0']
                                                   , $daycnts[$m][$d]['yeardayno_up']
-                                                  , $daycnts[$m][$d]['yeardayno_down'] );
+                                                  , $daycnts[$m][$d]['yeardayno_down']);
             }
         //echo "daynoexists:$daynoexists daynosw:$daynosw daynamesw:$daynamesw<br />\n"; // test ###
-            if((  $daynoexists &&  $daynosw && $daynamesw ) ||
-               ( !$daynoexists && !$daynosw && $daynamesw )) {
+            if (($daynoexists && $daynosw && $daynamesw) ||
+               (!$daynoexists && !$daynosw && $daynamesw)) {
               $updateOK = TRUE;
               break;
             }
@@ -5091,25 +5091,25 @@ 
       }
       //echo "efter BYDAY: ".implode('-',$wdate).' status: '; echo ($updateOK) ? 'TRUE' : 'FALSE'; echo "<br />\n"; // test ###
             /* check BYSETPOS */
-      if( $updateOK ) {
-        if( isset( $recur['BYSETPOS'] ) &&
-          ( in_array( $recur['FREQ'], array( 'YEARLY', 'MONTHLY', 'WEEKLY', 'DAILY' )))) {
-          if( isset( $recur['WEEKLY'] )) {
-            if( $bysetposWold == $daycnts[$wdate['month']][$wdate['day']]['weekno_up'] )
+      if ($updateOK) {
+        if (isset($recur['BYSETPOS']) &&
+          (in_array($recur['FREQ'], array('YEARLY', 'MONTHLY', 'WEEKLY', 'DAILY')))) {
+          if (isset($recur['WEEKLY'])) {
+            if ($bysetposWold == $daycnts[$wdate['month']][$wdate['day']]['weekno_up'])
               $bysetposw1[] = $wdatets;
             else
               $bysetposw2[] = $wdatets;
           }
           else {
-            if(( isset( $recur['FREQ'] ) && ( 'YEARLY'      == $recur['FREQ'] )  &&
-                                            ( $bysetposYold == $wdate['year'] ))   ||
-               ( isset( $recur['FREQ'] ) && ( 'MONTHLY'     == $recur['FREQ'] )  &&
-                                           (( $bysetposYold == $wdate['year'] )  &&
-                                            ( $bysetposMold == $wdate['month'] ))) ||
-               ( isset( $recur['FREQ'] ) && ( 'MONTHLY'     == $recur['FREQ'] )  &&
-                                           (( $bysetposYold == $wdate['year'] )  &&
-                                            ( $bysetposMold == $wdate['month'])  &&
-                                            ( $bysetposDold == $wdate['sday'] ))))
+            if ((isset($recur['FREQ']) && ('YEARLY' == $recur['FREQ']) &&
+                                            ($bysetposYold == $wdate['year'])) ||
+               (isset($recur['FREQ']) && ('MONTHLY' == $recur['FREQ']) &&
+                                           (($bysetposYold == $wdate['year']) &&
+                                            ($bysetposMold == $wdate['month']))) ||
+               (isset($recur['FREQ']) && ('MONTHLY' == $recur['FREQ']) &&
+                                           (($bysetposYold == $wdate['year']) &&
+                                            ($bysetposMold == $wdate['month']) &&
+                                            ($bysetposDold == $wdate['sday']))))
               $bysetposymd1[] = $wdatets;
             else
               $bysetposymd2[] = $wdatets;
@@ -5118,7 +5118,7 @@ 
         else {
             /* update result array if BYSETPOS is set */
           $countcnt++;
-          if( $startdatets <= $wdatets ) { // only output within period
+          if ($startdatets <= $wdatets) { // only output within period
             $result[$wdatets] = TRUE;
           //echo "recur ".implode('-',$this->_date_time_string(date('Y-m-d H:i:s',$wdatets),6))."<br />\n";//test
           }
@@ -5127,39 +5127,39 @@ 
         }
       }
             /* step up date */
-      $this->_stepdate( $wdate, $wdatets, $step);
+      $this->_stepdate($wdate, $wdatets, $step);
             /* check if BYSETPOS is set for updating result array */
-      if( $updateOK && isset( $recur['BYSETPOS'] )) {
+      if ($updateOK && isset($recur['BYSETPOS'])) {
         $bysetpos       = FALSE;
-        if( isset( $recur['FREQ'] ) && ( 'YEARLY'  == $recur['FREQ'] ) &&
-          ( $bysetposYold != $wdate['year'] )) {
+        if (isset($recur['FREQ']) && ('YEARLY' == $recur['FREQ']) &&
+          ($bysetposYold != $wdate['year'])) {
           $bysetpos     = TRUE;
           $bysetposYold = $wdate['year'];
         }
-        elseif( isset( $recur['FREQ'] ) && ( 'MONTHLY' == $recur['FREQ'] &&
-         (( $bysetposYold != $wdate['year'] ) || ( $bysetposMold != $wdate['month'] )))) {
+        elseif (isset($recur['FREQ']) && ('MONTHLY' == $recur['FREQ'] &&
+         (($bysetposYold != $wdate['year']) || ($bysetposMold != $wdate['month'])))) {
           $bysetpos     = TRUE;
           $bysetposYold = $wdate['year'];
           $bysetposMold = $wdate['month'];
         }
-        elseif( isset( $recur['FREQ'] ) && ( 'WEEKLY'  == $recur['FREQ'] )) {
-          $weekno = (int) date( 'W', mktime( 0, 0, $wkst, $wdate['month'], $wdate['day'], $wdate['year']));
-          if( $bysetposWold != $weekno ) {
+        elseif (isset($recur['FREQ']) && ('WEEKLY' == $recur['FREQ'])) {
+          $weekno = (int) date('W', mktime(0, 0, $wkst, $wdate['month'], $wdate['day'], $wdate['year']));
+          if ($bysetposWold != $weekno) {
             $bysetposWold = $weekno;
             $bysetpos     = TRUE;
           }
         }
-        elseif( isset( $recur['FREQ'] ) && ( 'DAILY'   == $recur['FREQ'] ) &&
-         (( $bysetposYold != $wdate['year'] )  ||
-          ( $bysetposMold != $wdate['month'] ) ||
-          ( $bysetposDold != $wdate['sday'] ))) {
+        elseif (isset($recur['FREQ']) && ('DAILY' == $recur['FREQ']) &&
+         (($bysetposYold != $wdate['year']) ||
+          ($bysetposMold != $wdate['month']) ||
+          ($bysetposDold != $wdate['sday']))) {
           $bysetpos     = TRUE;
           $bysetposYold = $wdate['year'];
           $bysetposMold = $wdate['month'];
           $bysetposDold = $wdate['day'];
         }
-        if( $bysetpos ) {
-          if( isset( $recur['BYWEEKNO'] )) {
+        if ($bysetpos) {
+          if (isset($recur['BYWEEKNO'])) {
             $bysetposarr1 = & $bysetposw1;
             $bysetposarr2 = & $bysetposw2;
           }
@@ -5167,18 +5167,18 @@ 
             $bysetposarr1 = & $bysetposymd1;
             $bysetposarr2 = & $bysetposymd2;
           }
-          foreach( $recur['BYSETPOS'] as $ix ) {
-            if( 0 > $ix ) // both positive and negative BYSETPOS allowed
-              $ix = ( count( $bysetposarr1 ) + $ix + 1);
+          foreach ($recur['BYSETPOS'] as $ix) {
+            if (0 > $ix) // both positive and negative BYSETPOS allowed
+              $ix = (count($bysetposarr1) + $ix + 1);
             $ix--;
-            if( isset( $bysetposarr1[$ix] )) {
-              if( $startdatets <= $bysetposarr1[$ix] ) { // only output within period
+            if (isset($bysetposarr1[$ix])) {
+              if ($startdatets <= $bysetposarr1[$ix]) { // only output within period
                 $result[$bysetposarr1[$ix]] = TRUE;
        //echo "recur ".implode('-',$this->_date_time_string(date('Y-m-d H:i:s',$bysetposarr1[$ix]),6))."<br />\n";//test
               }
               $countcnt++;
             }
-            if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] ))
+            if (isset($recur['COUNT']) && ($countcnt >= $recur['COUNT']))
               break;
           }
           $bysetposarr1 = $bysetposarr2;
@@ -5187,18 +5187,18 @@ 
       }
     }
   }
-  function _recurBYcntcheck( $BYvalue, $upValue, $downValue ) {
-    if( is_array( $BYvalue ) &&
-      ( in_array( $upValue, $BYvalue ) || in_array( $downValue, $BYvalue )))
+  function _recurBYcntcheck($BYvalue, $upValue, $downValue) {
+    if (is_array($BYvalue) &&
+      (in_array($upValue, $BYvalue) || in_array($downValue, $BYvalue)))
       return TRUE;
-    elseif(( $BYvalue == $upValue ) || ( $BYvalue == $downValue ))
+    elseif (($BYvalue == $upValue) || ($BYvalue == $downValue))
       return TRUE;
     else
       return FALSE;
   }
-  function _recurIntervalIx( $freq, $date, $wkst ) {
+  function _recurIntervalIx($freq, $date, $wkst) {
             /* create interval index */
-    switch( $freq ) {
+    switch ($freq) {
       case 'YEARLY':
         $intervalix = $date['year'];
         break;
@@ -5206,8 +5206,8 @@ 
         $intervalix = $date['year'].'-'.$date['month'];
         break;
       case 'WEEKLY':
-        $wdatets    = $this->_date2timestamp( $date );
-        $intervalix = (int) date( 'W', ( $wdatets + $wkst ));
+        $wdatets    = $this->_date2timestamp($date);
+        $intervalix = (int) date('W', ($wdatets + $wkst));
        break;
       case 'DAILY':
            default:
@@ -5224,22 +5224,22 @@ 
  * @param array $rexrule
  * @return array
  */
-  function _setRexrule( $rexrule ) {
-    $input          = array();
-    if( empty( $rexrule ))
+  function _setRexrule($rexrule) {
+    $input = array();
+    if (empty($rexrule))
       return $input;
-    foreach( $rexrule as $rexrulelabel => $rexrulevalue ) {
-      $rexrulelabel = strtoupper( $rexrulelabel );
-      if( 'UNTIL'  != $rexrulelabel )
+    foreach ($rexrule as $rexrulelabel => $rexrulevalue) {
+      $rexrulelabel = strtoupper($rexrulelabel);
+      if ('UNTIL' != $rexrulelabel)
         $input[$rexrulelabel]   = $rexrulevalue;
       else {
-        if( $this->_isArrayTimestampDate( $rexrulevalue )) // timestamp date
-          $input[$rexrulelabel] = $this->_timestamp2date( $rexrulevalue, 6 );
-        elseif( $this->_isArrayDate( $rexrulevalue )) // date-time
-          $input[$rexrulelabel] = $this->_date_time_array( $rexrulevalue, 6 );
-        elseif( 8 <= strlen( trim( $rexrulevalue ))) // ex. 2006-08-03 10:12:18
-          $input[$rexrulelabel] = $this->_date_time_string( $rexrulevalue );
-        if(( 3 < count( $input[$rexrulelabel] )) && !isset( $input[$rexrulelabel]['tz'] ))
+        if ($this->_isArrayTimestampDate($rexrulevalue)) // timestamp date
+          $input[$rexrulelabel] = $this->_timestamp2date($rexrulevalue, 6);
+        elseif ($this->_isArrayDate($rexrulevalue)) // date-time
+          $input[$rexrulelabel] = $this->_date_time_array($rexrulevalue, 6);
+        elseif (8 <= strlen(trim($rexrulevalue))) // ex. 2006-08-03 10:12:18
+          $input[$rexrulelabel] = $this->_date_time_string($rexrulevalue);
+        if ((3 < count($input[$rexrulelabel])) && !isset($input[$rexrulelabel]['tz']))
           $input[$rexrulelabel]['tz'] = 'Z';
       }
     }
@@ -5260,85 +5260,85 @@ 
  * @param string $caller optional
  * @return array
  */
-  function _setDate( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE, $caller=null ) {
+  function _setDate($year, $month = FALSE, $day = FALSE, $hour = FALSE, $min = FALSE, $sec = FALSE, $tz = FALSE, $params = FALSE, $caller = null) {
     $input = $parno = null;
-    $localtime = (( 'dtstart' == $caller ) && in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) ? TRUE : FALSE;
-    if( $this->_isArrayDate( $year )) {
-      if( $localtime ) unset ( $month['VALUE'], $month['TZID'] );
-      $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
-      if( isset( $input['params']['TZID'] )) {
+    $localtime = (('dtstart' == $caller) && in_array($this->objName, array('vtimezone', 'standard', 'daylight'))) ? TRUE : FALSE;
+    if ($this->_isArrayDate($year)) {
+      if ($localtime) unset ($month['VALUE'], $month['TZID']);
+      $input['params'] = $this->_setParams($month, array('VALUE' => 'DATE-TIME'));
+      if (isset($input['params']['TZID'])) {
         $input['params']['VALUE'] = 'DATE-TIME';
-        unset( $year['tz'] );
+        unset($year['tz']);
       }
-      $hitval          = (( !empty( $year['tz'] ) || !empty( $year[6] ))) ? 7 : 6;
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval );
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE', 3, count( $year ), $parno );
-      $input['value']  = $this->_date_time_array( $year, $parno );
-    }
-    elseif( $this->_isArrayTimestampDate( $year )) {
-      if( $localtime ) unset ( $month['VALUE'], $month['TZID'] );
-      $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
-      if( isset( $input['params']['TZID'] )) {
+      $hitval          = ((!empty($year['tz']) || !empty($year[6]))) ? 7 : 6;
+      $parno           = $this->_existRem($input['params'], 'VALUE', 'DATE-TIME', $hitval);
+      $parno           = $this->_existRem($input['params'], 'VALUE', 'DATE', 3, count($year), $parno);
+      $input['value']  = $this->_date_time_array($year, $parno);
+    }
+    elseif ($this->_isArrayTimestampDate($year)) {
+      if ($localtime) unset ($month['VALUE'], $month['TZID']);
+      $input['params'] = $this->_setParams($month, array('VALUE' => 'DATE-TIME'));
+      if (isset($input['params']['TZID'])) {
         $input['params']['VALUE'] = 'DATE-TIME';
-        unset( $year['tz'] );
+        unset($year['tz']);
       }
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE', 3 );
-      $hitval          = ( isset( $year['tz'] )) ? 7 : 6;
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval, $parno );
-      $input['value']  = $this->_timestamp2date( $year, $parno );
-    }
-    elseif( 8 <= strlen( trim( $year ))) { // ex. 2006-08-03 10:12:18
-      if( $localtime ) unset ( $month['VALUE'], $month['TZID'] );
-      $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
-      if( isset( $input['params']['TZID'] )) {
+      $parno           = $this->_existRem($input['params'], 'VALUE', 'DATE', 3);
+      $hitval          = (isset($year['tz'])) ? 7 : 6;
+      $parno           = $this->_existRem($input['params'], 'VALUE', 'DATE-TIME', $hitval, $parno);
+      $input['value']  = $this->_timestamp2date($year, $parno);
+    }
+    elseif (8 <= strlen(trim($year))) { // ex. 2006-08-03 10:12:18
+      if ($localtime) unset ($month['VALUE'], $month['TZID']);
+      $input['params'] = $this->_setParams($month, array('VALUE' => 'DATE-TIME'));
+      if (isset($input['params']['TZID'])) {
         $input['params']['VALUE'] = 'DATE-TIME';
         $parno = 6;
       }
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', 7, $parno );
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE', 3, $parno, $parno );
-      $input['value']  = $this->_date_time_string( $year, $parno );
+      $parno           = $this->_existRem($input['params'], 'VALUE', 'DATE-TIME', 7, $parno);
+      $parno           = $this->_existRem($input['params'], 'VALUE', 'DATE', 3, $parno, $parno);
+      $input['value']  = $this->_date_time_string($year, $parno);
     }
     else {
-      if( is_array( $params )) {
-        if( $localtime ) unset ( $params['VALUE'], $params['TZID'] );
-        $input['params'] = $this->_setParams( $params, array( 'VALUE' => 'DATE-TIME' ));
+      if (is_array($params)) {
+        if ($localtime) unset ($params['VALUE'], $params['TZID']);
+        $input['params'] = $this->_setParams($params, array('VALUE' => 'DATE-TIME'));
       }
-      elseif( is_array( $tz )) {
-        $input['params'] = $this->_setParams( $tz,     array( 'VALUE' => 'DATE-TIME' ));
+      elseif (is_array($tz)) {
+        $input['params'] = $this->_setParams($tz, array('VALUE' => 'DATE-TIME'));
         $tz = FALSE;
       }
-      elseif( is_array( $hour )) {
-        $input['params'] = $this->_setParams( $hour,   array( 'VALUE' => 'DATE-TIME' ));
+      elseif (is_array($hour)) {
+        $input['params'] = $this->_setParams($hour, array('VALUE' => 'DATE-TIME'));
         $hour = $min = $sec = $tz = FALSE;
       }
-      if( isset( $input['params']['TZID'] )) {
+      if (isset($input['params']['TZID'])) {
         $tz            = null;
         $input['params']['VALUE'] = 'DATE-TIME';
       }
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE', 3 );
-      $hitval          = ( !empty( $tz )) ? 7 : 6;
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval, $parno, $parno );
-      $input['value']  = array( 'year'  => $year, 'month' => $month, 'day'   => $day );
-      if( 3 != $parno ) {
-        $input['value']['hour'] = ( $hour ) ? $hour : '0';
-        $input['value']['min']  = ( $min )  ? $min  : '0';
-        $input['value']['sec']  = ( $sec )  ? $sec  : '0';
-        if( !empty( $tz ))
+      $parno           = $this->_existRem($input['params'], 'VALUE', 'DATE', 3);
+      $hitval          = (!empty($tz)) ? 7 : 6;
+      $parno           = $this->_existRem($input['params'], 'VALUE', 'DATE-TIME', $hitval, $parno, $parno);
+      $input['value']  = array('year'  => $year, 'month' => $month, 'day'   => $day);
+      if (3 != $parno) {
+        $input['value']['hour'] = ($hour) ? $hour : '0';
+        $input['value']['min']  = ($min) ? $min : '0';
+        $input['value']['sec']  = ($sec) ? $sec : '0';
+        if (!empty($tz))
           $input['value']['tz'] = $tz;
       }
     }
-    if( 3 == $parno ) {
+    if (3 == $parno) {
       $input['params']['VALUE'] = 'DATE';
-      unset( $input['value']['tz'] );
-      unset( $input['params']['TZID'] );
+      unset($input['value']['tz']);
+      unset($input['params']['TZID']);
     }
-    elseif( isset( $input['params']['TZID'] ))
-      unset( $input['value']['tz'] );
-    if( $localtime ) unset( $input['value']['tz'], $input['params']['TZID'] );
-    if( isset( $input['value']['tz'] ))
+    elseif (isset($input['params']['TZID']))
+      unset($input['value']['tz']);
+    if ($localtime) unset($input['value']['tz'], $input['params']['TZID']);
+    if (isset($input['value']['tz']))
       $input['value']['tz'] = (string) $input['value']['tz'];
-    if( !empty( $input['value']['tz'] ) && ( 'Z' != $input['value']['tz'] ) &&
-      ( !$this->_isOffset( $input['value']['tz'] )))
+    if (!empty($input['value']['tz']) && ('Z' != $input['value']['tz']) &&
+      (!$this->_isOffset($input['value']['tz'])))
       $input['params']['TZID'] = $input['value']['tz'];
     return $input;
   }
@@ -5356,37 +5356,37 @@ 
  * @param array $params optional
  * @return array
  */
-  function _setDate2( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
+  function _setDate2($year, $month = FALSE, $day = FALSE, $hour = FALSE, $min = FALSE, $sec = FALSE, $params = FALSE) {
     $input = null;
-    if( $this->_isArrayDate( $year )) {
-      $input['value']  = $this->_date_time_array( $year, 7 );
-      $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ) );
+    if ($this->_isArrayDate($year)) {
+      $input['value']  = $this->_date_time_array($year, 7);
+      $input['params'] = $this->_setParams($month, array('VALUE' => 'DATE-TIME'));
     }
-    elseif( $this->_isArrayTimestampDate( $year )) {
-      $input['value']  = $this->_timestamp2date( $year, 7 );
-      $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ) );
+    elseif ($this->_isArrayTimestampDate($year)) {
+      $input['value']  = $this->_timestamp2date($year, 7);
+      $input['params'] = $this->_setParams($month, array('VALUE' => 'DATE-TIME'));
     }
-    elseif( 8 <= strlen( trim( $year ))) { // ex. 2006-08-03 10:12:18
-      $input['value']  = $this->_date_time_string( $year, 7 );
-      $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ) );
+    elseif (8 <= strlen(trim($year))) { // ex. 2006-08-03 10:12:18
+      $input['value']  = $this->_date_time_string($year, 7);
+      $input['params'] = $this->_setParams($month, array('VALUE' => 'DATE-TIME'));
     }
     else {
-      $input['value']  = array( 'year'  => $year
+      $input['value']  = array('year'  => $year
                               , 'month' => $month
                               , 'day'   => $day
                               , 'hour'  => $hour
                               , 'min'   => $min
-                              , 'sec'   => $sec );
-      $input['params'] = $this->_setParams( $params, array( 'VALUE' => 'DATE-TIME' ));
+                              , 'sec'   => $sec);
+      $input['params'] = $this->_setParams($params, array('VALUE' => 'DATE-TIME'));
     }
-    $parno = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', 7 ); // remove default
-    if( !isset( $input['value']['hour'] ))
+    $parno = $this->_existRem($input['params'], 'VALUE', 'DATE-TIME', 7); // remove default
+    if (!isset($input['value']['hour']))
       $input['value']['hour'] = 0;
-    if( !isset( $input['value']['min'] ))
+    if (!isset($input['value']['min']))
       $input['value']['min'] = 0;
-    if( !isset( $input['value']['sec'] ))
+    if (!isset($input['value']['sec']))
       $input['value']['sec'] = 0;
-    if( !isset( $input['value']['tz'] ) || !$this->_isOffset( $input['value']['tz'] ))
+    if (!isset($input['value']['tz']) || !$this->_isOffset($input['value']['tz']))
       $input['value']['tz'] = 'Z';
     return $input;
   }
@@ -5402,18 +5402,18 @@ 
  * @param int $index
  * @return void
  */
-  function _setMval( & $valArr, $value, $params=FALSE, $defaults=FALSE, $index=FALSE ) {
-    if( !is_array( $valArr )) $valArr = array();
-    if( $index )
+  function _setMval(& $valArr, $value, $params = FALSE, $defaults = FALSE, $index = FALSE) {
+    if (!is_array($valArr)) $valArr = array();
+    if ($index)
       $index = $index - 1;
-    elseif( 0 < count( $valArr )) {
-      $index = end( array_keys( $valArr ));
+    elseif (0 < count($valArr)) {
+      $index = end(array_keys($valArr));
       $index += 1;
     }
     else
       $index = 0;
-    $valArr[$index] = array( 'value' => $value, 'params' => $this->_setParams( $params, $defaults ));
-    ksort( $valArr );
+    $valArr[$index] = array('value' => $value, 'params' => $this->_setParams($params, $defaults));
+    ksort($valArr);
   }
 /**
  * set input (formatted) parameters- component property attributes
@@ -5426,31 +5426,31 @@ 
  * @param array $defaults
  * @return array
  */
-  function _setParams( $params, $defaults=FALSE ) {
-    if( !is_array( $params))
+  function _setParams($params, $defaults = FALSE) {
+    if (!is_array($params))
       $params = array();
     $input = array();
-    foreach( $params as $paramKey => $paramValue ) {
-      if( is_array( $paramValue )) {
-        foreach( $paramValue as $pkey => $pValue ) {
-          if(( '"' == substr( $pValue, 0, 1 )) && ( '"' == substr( $pValue, -1 )))
-            $paramValue[$pkey] = substr( $pValue, 1, ( strlen( $pValue ) - 2 ));
+    foreach ($params as $paramKey => $paramValue) {
+      if (is_array($paramValue)) {
+        foreach ($paramValue as $pkey => $pValue) {
+          if (('"' == substr($pValue, 0, 1)) && ('"' == substr($pValue, -1)))
+            $paramValue[$pkey] = substr($pValue, 1, (strlen($pValue) - 2));
         }
       }
-      elseif(( '"' == substr( $paramValue, 0, 1 )) && ( '"' == substr( $paramValue, -1 )))
-        $paramValue = substr( $paramValue, 1, ( strlen( $paramValue ) - 2 ));
-      if( 'VALUE' == strtoupper( $paramKey ))
-        $input['VALUE']                 = strtoupper( $paramValue );
+      elseif (('"' == substr($paramValue, 0, 1)) && ('"' == substr($paramValue, -1)))
+        $paramValue = substr($paramValue, 1, (strlen($paramValue) - 2));
+      if ('VALUE' == strtoupper($paramKey))
+        $input['VALUE']                 = strtoupper($paramValue);
       else
-        $input[strtoupper( $paramKey )] = $paramValue;
+        $input[strtoupper($paramKey)] = $paramValue;
     }
-    if( is_array( $defaults )) {
-      foreach( $defaults as $paramKey => $paramValue ) {
-        if( !isset( $input[$paramKey] ))
+    if (is_array($defaults)) {
+      foreach ($defaults as $paramKey => $paramValue) {
+        if (!isset($input[$paramKey]))
           $input[$paramKey] = $paramValue;
       }
     }
-    return (0 < count( $input )) ? $input : null;
+    return (0 < count($input)) ? $input : null;
   }
 /**
  * step date, return updated date, array and timpstamp
@@ -5462,13 +5462,13 @@ 
  * @param array $step, default array( 'day' => 1 )
  * @return void
  */
-  function _stepdate( &$date, &$timestamp, $step=array( 'day' => 1 )) {
-    foreach( $step as $stepix => $stepvalue )
+  function _stepdate(&$date, &$timestamp, $step = array('day' => 1)) {
+    foreach ($step as $stepix => $stepvalue)
       $date[$stepix] += $stepvalue;
-    $timestamp  = $this->_date2timestamp( $date );
-    $date       = $this->_timestamp2date( $timestamp, 6 );
-    foreach( $date as $k => $v ) {
-      if( ctype_digit( $v ))
+    $timestamp  = $this->_date2timestamp($date);
+    $date       = $this->_timestamp2date($timestamp, 6);
+    foreach ($date as $k => $v) {
+      if (ctype_digit($v))
         $date[$k] = (int) $v;
     }
   }
@@ -5481,20 +5481,20 @@ 
  * @param int $parno
  * @return array
  */
-  function _timestamp2date( $timestamp, $parno=6 ) {
-    if( is_array( $timestamp )) {
-      if(( 7 == $parno ) && !empty( $timestamp['tz'] ))
+  function _timestamp2date($timestamp, $parno = 6) {
+    if (is_array($timestamp)) {
+      if ((7 == $parno) && !empty($timestamp['tz']))
         $tz = $timestamp['tz'];
       $timestamp = $timestamp['timestamp'];
     }
-    $output = array( 'year'  => date( 'Y', $timestamp )
-                   , 'month' => date( 'm', $timestamp )
-                   , 'day'   => date( 'd', $timestamp ));
-    if( 3 != $parno ) {
-             $output['hour'] =  date( 'H', $timestamp );
-             $output['min']  =  date( 'i', $timestamp );
-             $output['sec']  =  date( 's', $timestamp );
-      if( isset( $tz ))
+    $output = array('year'  => date('Y', $timestamp)
+                   , 'month' => date('m', $timestamp)
+                   , 'day'   => date('d', $timestamp));
+    if (3 != $parno) {
+             $output['hour'] = date('H', $timestamp);
+             $output['min']  = date('i', $timestamp);
+             $output['sec']  = date('s', $timestamp);
+      if (isset($tz))
         $output['tz'] = $tz;
     }
     return $output;
@@ -5507,19 +5507,19 @@ 
  * @param string $offset
  * @return integer
  */
-  function _tz2offset( $tz ) {
-    $tz           = trim( (string) $tz );
+  function _tz2offset($tz) {
+    $tz           = trim((string) $tz);
     $offset       = 0;
-    if(((     5  != strlen( $tz )) && ( 7  != strlen( $tz ))) ||
-       ((    '+' != substr( $tz, 0, 1 )) && ( '-' != substr( $tz, 0, 1 ))) ||
-       (( '0000' >= substr( $tz, 1, 4 )) && ( '9999' < substr( $tz, 1, 4 ))) ||
-           (( 7  == strlen( $tz )) && ( '00' > substr( $tz, 5, 2 )) && ( '99' < substr( $tz, 5, 2 ))))
+    if (((5 != strlen($tz)) && (7 != strlen($tz))) ||
+       (('+' != substr($tz, 0, 1)) && ('-' != substr($tz, 0, 1))) ||
+       (('0000' >= substr($tz, 1, 4)) && ('9999' < substr($tz, 1, 4))) ||
+           ((7 == strlen($tz)) && ('00' > substr($tz, 5, 2)) && ('99' < substr($tz, 5, 2))))
       return $offset;
-    $hours2sec    = (int) substr( $tz, 1, 2 ) * 3600;
-    $min2sec      = (int) substr( $tz, 3, 2 ) *   60;
-    $sec          = ( 7  == strlen( $tz )) ? (int) substr( $tz, -2 ) : '00';
+    $hours2sec    = (int) substr($tz, 1, 2) * 3600;
+    $min2sec      = (int) substr($tz, 3, 2) * 60;
+    $sec          = (7 == strlen($tz)) ? (int) substr($tz, -2) : '00';
     $offset       = $hours2sec + $min2sec + $sec;
-    $offset       = ('-' == substr( $tz, 0, 1 )) ? $offset : -1 * $offset;
+    $offset       = ('-' == substr($tz, 0, 1)) ? $offset : -1 * $offset;
     return $offset;
   }
 /*********************************************************************************/
@@ -5532,24 +5532,24 @@ 
  * @param string $config
  * @return value
  */
-  function getConfig( $config ) {
-    switch( strtoupper( $config )) {
+  function getConfig($config) {
+    switch (strtoupper($config)) {
       case 'ALLOWEMPTY':
         return $this->allowEmpty;
         break;
       case 'COMPSINFO':
-        unset( $this->compix );
+        unset($this->compix);
         $info = array();
-        if( isset( $this->components )) {
-          foreach( $this->components as $cix => $component ) {
-            if( empty( $component )) continue;
-            unset( $component->propix );
+        if (isset($this->components)) {
+          foreach ($this->components as $cix => $component) {
+            if (empty($component)) continue;
+            unset($component->propix);
             $info[$cix]['ordno'] = $cix + 1;
             $info[$cix]['type']  = $component->objName;
-            $info[$cix]['uid']   = $component->getProperty( 'uid' );
-            $info[$cix]['props'] = $component->getConfig( 'propinfo' );
-            $info[$cix]['sub']   = $component->getConfig( 'compsinfo' );
-            unset( $component->propix );
+            $info[$cix]['uid']   = $component->getProperty('uid');
+            $info[$cix]['props'] = $component->getConfig('propinfo');
+            $info[$cix]['sub']   = $component->getConfig('compsinfo');
+            unset($component->propix);
           }
         }
         return $info;
@@ -5567,58 +5567,58 @@ 
         break;
       case 'PROPINFO':
         $output = array();
-        if( !in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) {
-          if( empty( $this->uid['value'] )) $this->_makeuid();
+        if (!in_array($this->objName, array('valarm', 'vtimezone', 'standard', 'daylight'))) {
+          if (empty($this->uid['value'])) $this->_makeuid();
                                               $output['UID']              = 1;
         }
-        if( !empty( $this->dtstamp ))         $output['DTSTAMP']          = 1;
-        if( !empty( $this->summary ))         $output['SUMMARY']          = 1;
-        if( !empty( $this->description ))     $output['DESCRIPTION']      = count( $this->description );
-        if( !empty( $this->dtstart ))         $output['DTSTART']          = 1;
-        if( !empty( $this->dtend ))           $output['DTEND']            = 1;
-        if( !empty( $this->due ))             $output['DUE']              = 1;
-        if( !empty( $this->duration ))        $output['DURATION']         = 1;
-        if( !empty( $this->rrule ))           $output['RRULE']            = count( $this->rrule );
-        if( !empty( $this->rdate ))           $output['RDATE']            = count( $this->rdate );
-        if( !empty( $this->exdate ))          $output['EXDATE']           = count( $this->exdate );
-        if( !empty( $this->exrule ))          $output['EXRULE']           = count( $this->exrule );
-        if( !empty( $this->action ))          $output['ACTION']           = 1;
-        if( !empty( $this->attach ))          $output['ATTACH']           = count( $this->attach );
-        if( !empty( $this->attendee ))        $output['ATTENDEE']         = count( $this->attendee );
-        if( !empty( $this->categories ))      $output['CATEGORIES']       = count( $this->categories );
-        if( !empty( $this->class ))           $output['CLASS']            = 1;
-        if( !empty( $this->comment ))         $output['COMMENT']          = count( $this->comment );
-        if( !empty( $this->completed ))       $output['COMPLETED']        = 1;
-        if( !empty( $this->contact ))         $output['CONTACT']          = count( $this->contact );
-        if( !empty( $this->created ))         $output['CREATED']          = 1;
-        if( !empty( $this->freebusy ))        $output['FREEBUSY']         = count( $this->freebusy );
-        if( !empty( $this->geo ))             $output['GEO']              = 1;
-        if( !empty( $this->lastmodified ))    $output['LAST-MODIFIED']    = 1;
-        if( !empty( $this->location ))        $output['LOCATION']         = 1;
-        if( !empty( $this->organizer ))       $output['ORGANIZER']        = 1;
-        if( !empty( $this->percentcomplete )) $output['PERCENT-COMPLETE'] = 1;
-        if( !empty( $this->priority ))        $output['PRIORITY']         = 1;
-        if( !empty( $this->recurrenceid ))    $output['RECURRENCE-ID']    = 1;
-        if( !empty( $this->relatedto ))       $output['RELATED-TO']       = count( $this->relatedto );
-        if( !empty( $this->repeat ))          $output['REPEAT']           = 1;
-        if( !empty( $this->requeststatus ))   $output['REQUEST-STATUS']   = count( $this->requeststatus );
-        if( !empty( $this->resources ))       $output['RESOURCES']        = count( $this->resources );
-        if( !empty( $this->sequence ))        $output['SEQUENCE']         = 1;
-        if( !empty( $this->status ))          $output['STATUS']           = 1;
-        if( !empty( $this->transp ))          $output['TRANSP']           = 1;
-        if( !empty( $this->trigger ))         $output['TRIGGER']          = 1;
-        if( !empty( $this->tzid ))            $output['TZID']             = 1;
-        if( !empty( $this->tzname ))          $output['TZNAME']           = count( $this->tzname );
-        if( !empty( $this->tzoffsetfrom ))    $output['TZOFFSETTFROM']    = 1;
-        if( !empty( $this->tzoffsetto ))      $output['TZOFFSETTO']       = 1;
-        if( !empty( $this->tzurl ))           $output['TZURL']            = 1;
-        if( !empty( $this->url ))             $output['URL']              = 1;
-        if( !empty( $this->xprop ))           $output['X-PROP']           = count( $this->xprop );
+        if (!empty($this->dtstamp))         $output['DTSTAMP']          = 1;
+        if (!empty($this->summary))         $output['SUMMARY']          = 1;
+        if (!empty($this->description))     $output['DESCRIPTION']      = count($this->description);
+        if (!empty($this->dtstart))         $output['DTSTART']          = 1;
+        if (!empty($this->dtend))           $output['DTEND']            = 1;
+        if (!empty($this->due))             $output['DUE']              = 1;
+        if (!empty($this->duration))        $output['DURATION']         = 1;
+        if (!empty($this->rrule))           $output['RRULE']            = count($this->rrule);
+        if (!empty($this->rdate))           $output['RDATE']            = count($this->rdate);
+        if (!empty($this->exdate))          $output['EXDATE']           = count($this->exdate);
+        if (!empty($this->exrule))          $output['EXRULE']           = count($this->exrule);
+        if (!empty($this->action))          $output['ACTION']           = 1;
+        if (!empty($this->attach))          $output['ATTACH']           = count($this->attach);
+        if (!empty($this->attendee))        $output['ATTENDEE']         = count($this->attendee);
+        if (!empty($this->categories))      $output['CATEGORIES']       = count($this->categories);
+        if (!empty($this->class))           $output['CLASS']            = 1;
+        if (!empty($this->comment))         $output['COMMENT']          = count($this->comment);
+        if (!empty($this->completed))       $output['COMPLETED']        = 1;
+        if (!empty($this->contact))         $output['CONTACT']          = count($this->contact);
+        if (!empty($this->created))         $output['CREATED']          = 1;
+        if (!empty($this->freebusy))        $output['FREEBUSY']         = count($this->freebusy);
+        if (!empty($this->geo))             $output['GEO']              = 1;
+        if (!empty($this->lastmodified))    $output['LAST-MODIFIED']    = 1;
+        if (!empty($this->location))        $output['LOCATION']         = 1;
+        if (!empty($this->organizer))       $output['ORGANIZER']        = 1;
+        if (!empty($this->percentcomplete)) $output['PERCENT-COMPLETE'] = 1;
+        if (!empty($this->priority))        $output['PRIORITY']         = 1;
+        if (!empty($this->recurrenceid))    $output['RECURRENCE-ID']    = 1;
+        if (!empty($this->relatedto))       $output['RELATED-TO']       = count($this->relatedto);
+        if (!empty($this->repeat))          $output['REPEAT']           = 1;
+        if (!empty($this->requeststatus))   $output['REQUEST-STATUS']   = count($this->requeststatus);
+        if (!empty($this->resources))       $output['RESOURCES']        = count($this->resources);
+        if (!empty($this->sequence))        $output['SEQUENCE']         = 1;
+        if (!empty($this->status))          $output['STATUS']           = 1;
+        if (!empty($this->transp))          $output['TRANSP']           = 1;
+        if (!empty($this->trigger))         $output['TRIGGER']          = 1;
+        if (!empty($this->tzid))            $output['TZID']             = 1;
+        if (!empty($this->tzname))          $output['TZNAME']           = count($this->tzname);
+        if (!empty($this->tzoffsetfrom))    $output['TZOFFSETTFROM']    = 1;
+        if (!empty($this->tzoffsetto))      $output['TZOFFSETTO']       = 1;
+        if (!empty($this->tzurl))           $output['TZURL']            = 1;
+        if (!empty($this->url))             $output['URL']              = 1;
+        if (!empty($this->xprop))           $output['X-PROP']           = count($this->xprop);
         return $output;
         break;
       case 'UNIQUE_ID':
-        if( empty( $this->unique_id ))
-          $this->unique_id  = ( isset( $_SERVER['SERVER_NAME'] )) ? gethostbyname( $_SERVER['SERVER_NAME'] ) : 'localhost';
+        if (empty($this->unique_id))
+          $this->unique_id = (isset($_SERVER['SERVER_NAME'])) ? gethostbyname($_SERVER['SERVER_NAME']) : 'localhost';
         return $this->unique_id;
         break;
     }
@@ -5632,47 +5632,47 @@ 
  * @param string $value
  * @return void
  */
-  function setConfig( $config, $value ) {
+  function setConfig($config, $value) {
     $res = FALSE;
-    switch( strtoupper( $config )) {
+    switch (strtoupper($config)) {
       case 'ALLOWEMPTY':
         $this->allowEmpty = $value;
-        $subcfg = array( 'ALLOWEMPTY' => $value );
+        $subcfg = array('ALLOWEMPTY' => $value);
         $res    = TRUE;
         break;
       case 'FORMAT':
-        $value  = trim( $value );
+        $value  = trim($value);
         $this->format = $value;
         $this->_createFormat();
-        $subcfg = array( 'FORMAT' => $value );
+        $subcfg = array('FORMAT' => $value);
         $res    = TRUE;
         break;
       case 'LANGUAGE':
          // set language for calendar component as defined in [RFC 1766]
-        $value  = trim( $value );
+        $value  = trim($value);
         $this->language = $value;
-        $subcfg = array( 'LANGUAGE' => $value );
+        $subcfg = array('LANGUAGE' => $value);
         $res    = TRUE;
         break;
       case 'NL':
       case 'NEWLINECHAR':
         $this->nl = $value;
-        $subcfg = array( 'NL' => $value );
+        $subcfg = array('NL' => $value);
         $res    = TRUE;
         break;
       case 'UNIQUE_ID':
-        $value  = trim( $value );
+        $value  = trim($value);
         $this->unique_id = $value;
-        $subcfg = array( 'UNIQUE_ID' => $value );
+        $subcfg = array('UNIQUE_ID' => $value);
         $res    = TRUE;
         break;
     }
-    if( !$res ) return FALSE;
-    if( isset( $subcfg ) && !empty( $this->components )) {
-      foreach( $subcfg as $cfgkey => $cfgvalue ) {
-        foreach( $this->components as $cix => $component ) {
-          $res = $component->setConfig( $cfgkey, $cfgvalue );
-          if( !$res )
+    if (!$res) return FALSE;
+    if (isset($subcfg) && !empty($this->components)) {
+      foreach ($subcfg as $cfgkey => $cfgvalue) {
+        foreach ($this->components as $cix => $component) {
+          $res = $component->setConfig($cfgkey, $cfgvalue);
+          if (!$res)
             break 2;
           $this->components[$cix] = $component; // PHP4 compliant
         }
@@ -5690,248 +5690,248 @@ 
  * @param int @propix, optional, if specific property is wanted in case of multiply occurences
  * @return bool, if successfull delete TRUE
  */
-  function deleteProperty( $propName, $propix=FALSE ) {
-    if( $this->_notExistProp( $propName )) return FALSE;
-    $propName = strtoupper( $propName );
-    if( in_array( $propName, array( 'ATTACH',   'ATTENDEE', 'CATEGORIES', 'COMMENT',   'CONTACT', 'DESCRIPTION',    'EXDATE', 'EXRULE',
-                                    'FREEBUSY', 'RDATE',    'RELATED-TO', 'RESOURCES', 'RRULE',   'REQUEST-STATUS', 'TZNAME', 'X-PROP'  ))) {
-      if( !$propix )
-        $propix = ( isset( $this->propdelix[$propName] )) ? $this->propdelix[$propName] + 2 : 1;
+  function deleteProperty($propName, $propix = FALSE) {
+    if ($this->_notExistProp($propName)) return FALSE;
+    $propName = strtoupper($propName);
+    if (in_array($propName, array('ATTACH', 'ATTENDEE', 'CATEGORIES', 'COMMENT', 'CONTACT', 'DESCRIPTION', 'EXDATE', 'EXRULE',
+                                    'FREEBUSY', 'RDATE', 'RELATED-TO', 'RESOURCES', 'RRULE', 'REQUEST-STATUS', 'TZNAME', 'X-PROP'))) {
+      if (!$propix)
+        $propix = (isset($this->propdelix[$propName])) ? $this->propdelix[$propName] + 2 : 1;
       $this->propdelix[$propName] = --$propix;
     }
     $return = FALSE;
-    switch( $propName ) {
+    switch ($propName) {
       case 'ACTION':
-        if( !empty( $this->action )) {
+        if (!empty($this->action)) {
           $this->action = '';
           $return = TRUE;
         }
         break;
       case 'ATTACH':
-        return $this->deletePropertyM( $this->attach, $propix );
+        return $this->deletePropertyM($this->attach, $propix);
         break;
       case 'ATTENDEE':
-        return $this->deletePropertyM( $this->attendee, $propix );
+        return $this->deletePropertyM($this->attendee, $propix);
         break;
       case 'CATEGORIES':
-        return $this->deletePropertyM( $this->categories, $propix );
+        return $this->deletePropertyM($this->categories, $propix);
         break;
       case 'CLASS':
-        if( !empty( $this->class )) {
+        if (!empty($this->class)) {
           $this->class = '';
           $return = TRUE;
         }
         break;
       case 'COMMENT':
-        return $this->deletePropertyM( $this->comment, $propix );
+        return $this->deletePropertyM($this->comment, $propix);
         break;
       case 'COMPLETED':
-        if( !empty( $this->completed )) {
+        if (!empty($this->completed)) {
           $this->completed = '';
           $return = TRUE;
         }
         break;
       case 'CONTACT':
-        return $this->deletePropertyM( $this->contact, $propix );
+        return $this->deletePropertyM($this->contact, $propix);
         break;
       case 'CREATED':
-        if( !empty( $this->created )) {
+        if (!empty($this->created)) {
           $this->created = '';
           $return = TRUE;
         }
         break;
       case 'DESCRIPTION':
-        return $this->deletePropertyM( $this->description, $propix );
+        return $this->deletePropertyM($this->description, $propix);
         break;
       case 'DTEND':
-        if( !empty( $this->dtend )) {
+        if (!empty($this->dtend)) {
           $this->dtend = '';
           $return = TRUE;
         }
         break;
       case 'DTSTAMP':
-        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
+        if (in_array($this->objName, array('valarm', 'vtimezone', 'standard', 'daylight')))
           return FALSE;
-        if( !empty( $this->dtstamp )) {
+        if (!empty($this->dtstamp)) {
           $this->dtstamp = '';
           $return = TRUE;
         }
         break;
       case 'DTSTART':
-        if( !empty( $this->dtstart )) {
+        if (!empty($this->dtstart)) {
           $this->dtstart = '';
           $return = TRUE;
         }
         break;
       case 'DUE':
-        if( !empty( $this->due )) {
+        if (!empty($this->due)) {
           $this->due = '';
           $return = TRUE;
         }
         break;
       case 'DURATION':
-        if( !empty( $this->duration )) {
+        if (!empty($this->duration)) {
           $this->duration = '';
           $return = TRUE;
         }
         break;
       case 'EXDATE':
-        return $this->deletePropertyM( $this->exdate, $propix );
+        return $this->deletePropertyM($this->exdate, $propix);
         break;
       case 'EXRULE':
-        return $this->deletePropertyM( $this->exrule, $propix );
+        return $this->deletePropertyM($this->exrule, $propix);
         break;
       case 'FREEBUSY':
-        return $this->deletePropertyM( $this->freebusy, $propix );
+        return $this->deletePropertyM($this->freebusy, $propix);
         break;
       case 'GEO':
-        if( !empty( $this->geo )) {
+        if (!empty($this->geo)) {
           $this->geo = '';
           $return = TRUE;
         }
         break;
       case 'LAST-MODIFIED':
-        if( !empty( $this->lastmodified )) {
+        if (!empty($this->lastmodified)) {
           $this->lastmodified = '';
           $return = TRUE;
         }
         break;
       case 'LOCATION':
-        if( !empty( $this->location )) {
+        if (!empty($this->location)) {
           $this->location = '';
           $return = TRUE;
         }
         break;
       case 'ORGANIZER':
-        if( !empty( $this->organizer )) {
+        if (!empty($this->organizer)) {
           $this->organizer = '';
           $return = TRUE;
         }
         break;
       case 'PERCENT-COMPLETE':
-        if( !empty( $this->percentcomplete )) {
+        if (!empty($this->percentcomplete)) {
           $this->percentcomplete = '';
           $return = TRUE;
         }
         break;
       case 'PRIORITY':
-        if( !empty( $this->priority )) {
+        if (!empty($this->priority)) {
           $this->priority = '';
           $return = TRUE;
         }
         break;
       case 'RDATE':
-        return $this->deletePropertyM( $this->rdate, $propix );
+        return $this->deletePropertyM($this->rdate, $propix);
         break;
       case 'RECURRENCE-ID':
-        if( !empty( $this->recurrenceid )) {
+        if (!empty($this->recurrenceid)) {
           $this->recurrenceid = '';
           $return = TRUE;
         }
         break;
       case 'RELATED-TO':
-        return $this->deletePropertyM( $this->relatedto, $propix );
+        return $this->deletePropertyM($this->relatedto, $propix);
         break;
       case 'REPEAT':
-        if( !empty( $this->repeat )) {
+        if (!empty($this->repeat)) {
           $this->repeat = '';
           $return = TRUE;
         }
         break;
       case 'REQUEST-STATUS':
-        return $this->deletePropertyM( $this->requeststatus, $propix );
+        return $this->deletePropertyM($this->requeststatus, $propix);
         break;
       case 'RESOURCES':
-        return $this->deletePropertyM( $this->resources, $propix );
+        return $this->deletePropertyM($this->resources, $propix);
         break;
       case 'RRULE':
-        return $this->deletePropertyM( $this->rrule, $propix );
+        return $this->deletePropertyM($this->rrule, $propix);
         break;
       case 'SEQUENCE':
-        if( !empty( $this->sequence )) {
+        if (!empty($this->sequence)) {
           $this->sequence = '';
           $return = TRUE;
         }
         break;
       case 'STATUS':
-        if( !empty( $this->status )) {
+        if (!empty($this->status)) {
           $this->status = '';
           $return = TRUE;
         }
         break;
       case 'SUMMARY':
-        if( !empty( $this->summary )) {
+        if (!empty($this->summary)) {
           $this->summary = '';
           $return = TRUE;
         }
         break;
       case 'TRANSP':
-        if( !empty( $this->transp )) {
+        if (!empty($this->transp)) {
           $this->transp = '';
           $return = TRUE;
         }
         break;
       case 'TRIGGER':
-        if( !empty( $this->trigger )) {
+        if (!empty($this->trigger)) {
           $this->trigger = '';
           $return = TRUE;
         }
         break;
       case 'TZID':
-        if( !empty( $this->tzid )) {
+        if (!empty($this->tzid)) {
           $this->tzid = '';
           $return = TRUE;
         }
         break;
       case 'TZNAME':
-        return $this->deletePropertyM( $this->tzname, $propix );
+        return $this->deletePropertyM($this->tzname, $propix);
         break;
       case 'TZOFFSETFROM':
-        if( !empty( $this->tzoffsetfrom )) {
+        if (!empty($this->tzoffsetfrom)) {
           $this->tzoffsetfrom = '';
           $return = TRUE;
         }
         break;
       case 'TZOFFSETTO':
-        if( !empty( $this->tzoffsetto )) {
+        if (!empty($this->tzoffsetto)) {
           $this->tzoffsetto = '';
           $return = TRUE;
         }
         break;
       case 'TZURL':
-        if( !empty( $this->tzurl )) {
+        if (!empty($this->tzurl)) {
           $this->tzurl = '';
           $return = TRUE;
         }
         break;
       case 'UID':
-        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
+        if (in_array($this->objName, array('valarm', 'vtimezone', 'standard', 'daylight')))
           return FALSE;
-        if( !empty( $this->uid )) {
+        if (!empty($this->uid)) {
           $this->uid = '';
           $return = TRUE;
         }
         break;
       case 'URL':
-        if( !empty( $this->url )) {
+        if (!empty($this->url)) {
           $this->url = '';
           $return = TRUE;
         }
         break;
       default:
         $reduced = '';
-        if( $propName != 'X-PROP' ) {
-          if( !isset( $this->xprop[$propName] )) return FALSE;
-          foreach( $this->xprop as $k => $a ) {
-            if(( $k != $propName ) && !empty( $a ))
+        if ($propName != 'X-PROP') {
+          if (!isset($this->xprop[$propName])) return FALSE;
+          foreach ($this->xprop as $k => $a) {
+            if (($k != $propName) && !empty($a))
               $reduced[$k] = $a;
           }
         }
         else {
-          if( count( $this->xprop ) <= $propix )  return FALSE;
+          if (count($this->xprop) <= $propix)  return FALSE;
           $xpropno = 0;
-          foreach( $this->xprop as $xpropkey => $xpropvalue ) {
-            if( $propix != $xpropno )
+          foreach ($this->xprop as $xpropkey => $xpropvalue) {
+            if ($propix != $xpropno)
               $reduced[$xpropkey] = $xpropvalue;
             $xpropno++;
           }
@@ -5951,11 +5951,11 @@ 
  * @param int @propix, default 0
  * @return bool TRUE
  */
-  function deletePropertyM( & $multiprop, $propix=0 ) {
-    if( !isset( $multiprop[$propix])) return FALSE;
-    unset( $multiprop[$propix] );
-    if( empty( $multiprop )) $multiprop = '';
-    return ( isset( $this->multiprop[$propix] )) ? FALSE : TRUE;
+  function deletePropertyM(& $multiprop, $propix = 0) {
+    if (!isset($multiprop[$propix])) return FALSE;
+    unset($multiprop[$propix]);
+    if (empty($multiprop)) $multiprop = '';
+    return (isset($this->multiprop[$propix])) ? FALSE : TRUE;
   }
 /**
  * get component property value/params
@@ -5970,183 +5970,183 @@ 
  * @param bool $specform=FALSE
  * @return mixed
  */
-  function getProperty( $propName=FALSE, $propix=FALSE, $inclParam=FALSE, $specform=FALSE ) {
-    if( $this->_notExistProp( $propName )) return FALSE;
-    $propName = ( $propName ) ? strtoupper( $propName ) : 'X-PROP';
-    if( in_array( $propName, array( 'ATTACH',   'ATTENDEE', 'CATEGORIES', 'COMMENT',   'CONTACT', 'DESCRIPTION',    'EXDATE', 'EXRULE',
-                                    'FREEBUSY', 'RDATE',    'RELATED-TO', 'RESOURCES', 'RRULE',   'REQUEST-STATUS', 'TZNAME', 'X-PROP'  ))) {
-      if( !$propix )
-        $propix = ( isset( $this->propix[$propName] )) ? $this->propix[$propName] + 2 : 1;
+  function getProperty($propName = FALSE, $propix = FALSE, $inclParam = FALSE, $specform = FALSE) {
+    if ($this->_notExistProp($propName)) return FALSE;
+    $propName = ($propName) ? strtoupper($propName) : 'X-PROP';
+    if (in_array($propName, array('ATTACH', 'ATTENDEE', 'CATEGORIES', 'COMMENT', 'CONTACT', 'DESCRIPTION', 'EXDATE', 'EXRULE',
+                                    'FREEBUSY', 'RDATE', 'RELATED-TO', 'RESOURCES', 'RRULE', 'REQUEST-STATUS', 'TZNAME', 'X-PROP'))) {
+      if (!$propix)
+        $propix = (isset($this->propix[$propName])) ? $this->propix[$propName] + 2 : 1;
       $this->propix[$propName] = --$propix;
     }
-    switch( $propName ) {
+    switch ($propName) {
       case 'ACTION':
-        if( !empty( $this->action['value'] )) return ( $inclParam ) ? $this->action : $this->action['value'];
+        if (!empty($this->action['value'])) return ($inclParam) ? $this->action : $this->action['value'];
         break;
       case 'ATTACH':
-        if( !isset( $this->attach[$propix] )) return FALSE;
-        return ( $inclParam ) ? $this->attach[$propix] : $this->attach[$propix]['value'];
+        if (!isset($this->attach[$propix])) return FALSE;
+        return ($inclParam) ? $this->attach[$propix] : $this->attach[$propix]['value'];
         break;
       case 'ATTENDEE':
-        if( !isset( $this->attendee[$propix] )) return FALSE;
-        return ( $inclParam ) ? $this->attendee[$propix] : $this->attendee[$propix]['value'];
+        if (!isset($this->attendee[$propix])) return FALSE;
+        return ($inclParam) ? $this->attendee[$propix] : $this->attendee[$propix]['value'];
         break;
       case 'CATEGORIES':
-        if( !isset( $this->categories[$propix] )) return FALSE;
-        return ( $inclParam ) ? $this->categories[$propix] : $this->categories[$propix]['value'];
+        if (!isset($this->categories[$propix])) return FALSE;
+        return ($inclParam) ? $this->categories[$propix] : $this->categories[$propix]['value'];
         break;
       case 'CLASS':
-        if( !empty( $this->class['value'] )) return ( $inclParam ) ? $this->class : $this->class['value'];
+        if (!empty($this->class['value'])) return ($inclParam) ? $this->class : $this->class['value'];
         break;
       case 'COMMENT':
-        if( !isset( $this->comment[$propix] )) return FALSE;
-        return ( $inclParam ) ? $this->comment[$propix] : $this->comment[$propix]['value'];
+        if (!isset($this->comment[$propix])) return FALSE;
+        return ($inclParam) ? $this->comment[$propix] : $this->comment[$propix]['value'];
         break;
       case 'COMPLETED':
-        if( !empty( $this->completed['value'] )) return ( $inclParam ) ? $this->completed : $this->completed['value'];
+        if (!empty($this->completed['value'])) return ($inclParam) ? $this->completed : $this->completed['value'];
         break;
       case 'CONTACT':
-        if( !isset( $this->contact[$propix] )) return FALSE;
-        return ( $inclParam ) ? $this->contact[$propix] : $this->contact[$propix]['value'];
+        if (!isset($this->contact[$propix])) return FALSE;
+        return ($inclParam) ? $this->contact[$propix] : $this->contact[$propix]['value'];
         break;
       case 'CREATED':
-        if( !empty( $this->created['value'] )) return ( $inclParam ) ? $this->created : $this->created['value'];
+        if (!empty($this->created['value'])) return ($inclParam) ? $this->created : $this->created['value'];
         break;
       case 'DESCRIPTION':
-        if( !isset( $this->description[$propix] )) return FALSE;
-        return ( $inclParam ) ? $this->description[$propix] : $this->description[$propix]['value'];
+        if (!isset($this->description[$propix])) return FALSE;
+        return ($inclParam) ? $this->description[$propix] : $this->description[$propix]['value'];
         break;
       case 'DTEND':
-        if( !empty( $this->dtend['value'] )) return ( $inclParam ) ? $this->dtend : $this->dtend['value'];
+        if (!empty($this->dtend['value'])) return ($inclParam) ? $this->dtend : $this->dtend['value'];
         break;
       case 'DTSTAMP':
-        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
+        if (in_array($this->objName, array('valarm', 'vtimezone', 'standard', 'daylight')))
           return;
-        if( !isset( $this->dtstamp['value'] ))
+        if (!isset($this->dtstamp['value']))
           $this->_makeDtstamp();
-        return ( $inclParam ) ? $this->dtstamp : $this->dtstamp['value'];
+        return ($inclParam) ? $this->dtstamp : $this->dtstamp['value'];
         break;
       case 'DTSTART':
-        if( !empty( $this->dtstart['value'] )) return ( $inclParam ) ? $this->dtstart : $this->dtstart['value'];
+        if (!empty($this->dtstart['value'])) return ($inclParam) ? $this->dtstart : $this->dtstart['value'];
         break;
       case 'DUE':
-        if( !empty( $this->due['value'] )) return ( $inclParam ) ? $this->due : $this->due['value'];
+        if (!empty($this->due['value'])) return ($inclParam) ? $this->due : $this->due['value'];
         break;
       case 'DURATION':
-        if( !isset( $this->duration['value'] )) return FALSE;
-        $value = ( $specform ) ? $this->duration2date() : $this->duration['value'];
-        return ( $inclParam ) ? array( 'value' => $value, 'params' =>  $this->duration['params'] ) : $value;
+        if (!isset($this->duration['value'])) return FALSE;
+        $value = ($specform) ? $this->duration2date() : $this->duration['value'];
+        return ($inclParam) ? array('value' => $value, 'params' =>  $this->duration['params']) : $value;
         break;
       case 'EXDATE':
-        if( !isset( $this->exdate[$propix] )) return FALSE;
-        return ( $inclParam ) ? $this->exdate[$propix] : $this->exdate[$propix]['value'];
+        if (!isset($this->exdate[$propix])) return FALSE;
+        return ($inclParam) ? $this->exdate[$propix] : $this->exdate[$propix]['value'];
         break;
       case 'EXRULE':
-        if( !isset( $this->exrule[$propix] )) return FALSE;
-        return ( $inclParam ) ? $this->exrule[$propix] : $this->exrule[$propix]['value'];
+        if (!isset($this->exrule[$propix])) return FALSE;
+        return ($inclParam) ? $this->exrule[$propix] : $this->exrule[$propix]['value'];
         break;
       case 'FREEBUSY':
-        if( !isset( $this->freebusy[$propix] )) return FALSE;
-        return ( $inclParam ) ? $this->freebusy[$propix] : $this->freebusy[$propix]['value'];
+        if (!isset($this->freebusy[$propix])) return FALSE;
+        return ($inclParam) ? $this->freebusy[$propix] : $this->freebusy[$propix]['value'];
         break;
       case 'GEO':
-        if( !empty( $this->geo['value'] )) return ( $inclParam ) ? $this->geo : $this->geo['value'];
+        if (!empty($this->geo['value'])) return ($inclParam) ? $this->geo : $this->geo['value'];
         break;
       case 'LAST-MODIFIED':
-        if( !empty( $this->lastmodified['value'] )) return ( $inclParam ) ? $this->lastmodified : $this->lastmodified['value'];
+        if (!empty($this->lastmodified['value'])) return ($inclParam) ? $this->lastmodified : $this->lastmodified['value'];
         break;
       case 'LOCATION':
-        if( !empty( $this->location['value'] )) return ( $inclParam ) ? $this->location : $this->location['value'];
+        if (!empty($this->location['value'])) return ($inclParam) ? $this->location : $this->location['value'];
         break;
       case 'ORGANIZER':
-        if( !empty( $this->organizer['value'] )) return ( $inclParam ) ? $this->organizer : $this->organizer['value'];
+        if (!empty($this->organizer['value'])) return ($inclParam) ? $this->organizer : $this->organizer['value'];
         break;
       case 'PERCENT-COMPLETE':
-        if( !empty( $this->percentcomplete['value'] )) return ( $inclParam ) ? $this->percentcomplete : $this->percentcomplete['value'];
+        if (!empty($this->percentcomplete['value'])) return ($inclParam) ? $this->percentcomplete : $this->percentcomplete['value'];
         break;
       case 'PRIORITY':
-        if( !empty( $this->priority['value'] )) return ( $inclParam ) ? $this->priority : $this->priority['value'];
+        if (!empty($this->priority['value'])) return ($inclParam) ? $this->priority : $this->priority['value'];
         break;
       case 'RDATE':
-        if( !isset( $this->rdate[$propix] )) return FALSE;
-        return ( $inclParam ) ? $this->rdate[$propix] : $this->rdate[$propix]['value'];
+        if (!isset($this->rdate[$propix])) return FALSE;
+        return ($inclParam) ? $this->rdate[$propix] : $this->rdate[$propix]['value'];
         break;
       case 'RECURRENCE-ID':
-        if( !empty( $this->recurrenceid['value'] )) return ( $inclParam ) ? $this->recurrenceid : $this->recurrenceid['value'];
+        if (!empty($this->recurrenceid['value'])) return ($inclParam) ? $this->recurrenceid : $this->recurrenceid['value'];
         break;
       case 'RELATED-TO':
-        if( !isset( $this->relatedto[$propix] )) return FALSE;
-        return ( $inclParam ) ? $this->relatedto[$propix] : $this->relatedto[$propix]['value'];
+        if (!isset($this->relatedto[$propix])) return FALSE;
+        return ($inclParam) ? $this->relatedto[$propix] : $this->relatedto[$propix]['value'];
         break;
       case 'REPEAT':
-        if( !empty( $this->repeat['value'] )) return ( $inclParam ) ? $this->repeat : $this->repeat['value'];
+        if (!empty($this->repeat['value'])) return ($inclParam) ? $this->repeat : $this->repeat['value'];
         break;
       case 'REQUEST-STATUS':
-        if( !isset( $this->requeststatus[$propix] )) return FALSE;
-        return ( $inclParam ) ? $this->requeststatus[$propix] : $this->requeststatus[$propix]['value'];
+        if (!isset($this->requeststatus[$propix])) return FALSE;
+        return ($inclParam) ? $this->requeststatus[$propix] : $this->requeststatus[$propix]['value'];
         break;
       case 'RESOURCES':
-        if( !isset( $this->resources[$propix] )) return FALSE;
-        return ( $inclParam ) ? $this->resources[$propix] : $this->resources[$propix]['value'];
+        if (!isset($this->resources[$propix])) return FALSE;
+        return ($inclParam) ? $this->resources[$propix] : $this->resources[$propix]['value'];
         break;
       case 'RRULE':
-        if( !isset( $this->rrule[$propix] )) return FALSE;
-        return ( $inclParam ) ? $this->rrule[$propix] : $this->rrule[$propix]['value'];
+        if (!isset($this->rrule[$propix])) return FALSE;
+        return ($inclParam) ? $this->rrule[$propix] : $this->rrule[$propix]['value'];
         break;
       case 'SEQUENCE':
-        if( !empty( $this->sequence['value'] )) return ( $inclParam ) ? $this->sequence : $this->sequence['value'];
+        if (!empty($this->sequence['value'])) return ($inclParam) ? $this->sequence : $this->sequence['value'];
         break;
       case 'STATUS':
-        if( !empty( $this->status['value'] )) return ( $inclParam ) ? $this->status : $this->status['value'];
+        if (!empty($this->status['value'])) return ($inclParam) ? $this->status : $this->status['value'];
         break;
       case 'SUMMARY':
-        if( !empty( $this->summary['value'] )) return ( $inclParam ) ? $this->summary : $this->summary['value'];
+        if (!empty($this->summary['value'])) return ($inclParam) ? $this->summary : $this->summary['value'];
         break;
       case 'TRANSP':
-        if( !empty( $this->transp['value'] )) return ( $inclParam ) ? $this->transp : $this->transp['value'];
+        if (!empty($this->transp['value'])) return ($inclParam) ? $this->transp : $this->transp['value'];
         break;
       case 'TRIGGER':
-        if( !empty( $this->trigger['value'] )) return ( $inclParam ) ? $this->trigger : $this->trigger['value'];
+        if (!empty($this->trigger['value'])) return ($inclParam) ? $this->trigger : $this->trigger['value'];
         break;
       case 'TZID':
-        if( !empty( $this->tzid['value'] )) return ( $inclParam ) ? $this->tzid : $this->tzid['value'];
+        if (!empty($this->tzid['value'])) return ($inclParam) ? $this->tzid : $this->tzid['value'];
         break;
       case 'TZNAME':
-        if( !isset( $this->tzname[$propix] )) return FALSE;
-        return ( $inclParam ) ? $this->tzname[$propix] : $this->tzname[$propix]['value'];
+        if (!isset($this->tzname[$propix])) return FALSE;
+        return ($inclParam) ? $this->tzname[$propix] : $this->tzname[$propix]['value'];
         break;
       case 'TZOFFSETFROM':
-        if( !empty( $this->tzoffsetfrom['value'] )) return ( $inclParam ) ? $this->tzoffsetfrom : $this->tzoffsetfrom['value'];
+        if (!empty($this->tzoffsetfrom['value'])) return ($inclParam) ? $this->tzoffsetfrom : $this->tzoffsetfrom['value'];
         break;
       case 'TZOFFSETTO':
-        if( !empty( $this->tzoffsetto['value'] )) return ( $inclParam ) ? $this->tzoffsetto : $this->tzoffsetto['value'];
+        if (!empty($this->tzoffsetto['value'])) return ($inclParam) ? $this->tzoffsetto : $this->tzoffsetto['value'];
         break;
       case 'TZURL':
-        if( !empty( $this->tzurl['value'] )) return ( $inclParam ) ? $this->tzurl : $this->tzurl['value'];
+        if (!empty($this->tzurl['value'])) return ($inclParam) ? $this->tzurl : $this->tzurl['value'];
         break;
       case 'UID':
-        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
+        if (in_array($this->objName, array('valarm', 'vtimezone', 'standard', 'daylight')))
           return FALSE;
-        if( empty( $this->uid['value'] ))
+        if (empty($this->uid['value']))
           $this->_makeuid();
-        return ( $inclParam ) ? $this->uid : $this->uid['value'];
+        return ($inclParam) ? $this->uid : $this->uid['value'];
         break;
       case 'URL':
-        if( !empty( $this->url['value'] )) return ( $inclParam ) ? $this->url : $this->url['value'];
+        if (!empty($this->url['value'])) return ($inclParam) ? $this->url : $this->url['value'];
         break;
       default:
-        if( $propName != 'X-PROP' ) {
-          if( !isset( $this->xprop[$propName] )) return FALSE;
-          return ( $inclParam ) ? array( $propName, $this->xprop[$propName] )
-                                : array( $propName, $this->xprop[$propName]['value'] );
+        if ($propName != 'X-PROP') {
+          if (!isset($this->xprop[$propName])) return FALSE;
+          return ($inclParam) ? array($propName, $this->xprop[$propName])
+                                : array($propName, $this->xprop[$propName]['value']);
         }
         else {
-          if( empty( $this->xprop )) return FALSE;
+          if (empty($this->xprop)) return FALSE;
           $xpropno = 0;
-          foreach( $this->xprop as $xpropkey => $xpropvalue ) {
-            if( $propix == $xpropno )
-              return ( $inclParam ) ? array( $xpropkey, $this->xprop[$xpropkey] )
-                                    : array( $xpropkey, $this->xprop[$xpropkey]['value'] );
+          foreach ($this->xprop as $xpropkey => $xpropvalue) {
+            if ($propix == $xpropno)
+              return ($inclParam) ? array($xpropkey, $this->xprop[$xpropkey])
+                                    : array($xpropkey, $this->xprop[$xpropkey]['value']);
             else
               $xpropno++;
           }
@@ -6167,105 +6167,105 @@ 
  */
   function setProperty() {
     $numargs    = func_num_args();
-    if( 1 > $numargs ) return FALSE;
+    if (1 > $numargs) return FALSE;
     $arglist    = func_get_args();
-    if( $this->_notExistProp( $arglist[0] )) return FALSE;
-    if( !$this->getConfig( 'allowEmpty' ) && ( !isset( $arglist[1] ) || empty( $arglist[1] )))
+    if ($this->_notExistProp($arglist[0])) return FALSE;
+    if (!$this->getConfig('allowEmpty') && (!isset($arglist[1]) || empty($arglist[1])))
       return FALSE;
-    $arglist[0] = strtoupper( $arglist[0] );
-    for( $argix=$numargs; $argix < 12; $argix++ ) {
-      if( !isset( $arglist[$argix] ))
+    $arglist[0] = strtoupper($arglist[0]);
+    for ($argix = $numargs; $argix < 12; $argix++) {
+      if (!isset($arglist[$argix]))
         $arglist[$argix] = null;
     }
-    switch( $arglist[0] ) {
+    switch ($arglist[0]) {
       case 'ACTION':
-        return $this->setAction( $arglist[1], $arglist[2] );
+        return $this->setAction($arglist[1], $arglist[2]);
       case 'ATTACH':
-        return $this->setAttach( $arglist[1], $arglist[2], $arglist[3] );
+        return $this->setAttach($arglist[1], $arglist[2], $arglist[3]);
       case 'ATTENDEE':
-        return $this->setAttendee( $arglist[1], $arglist[2], $arglist[3] );
+        return $this->setAttendee($arglist[1], $arglist[2], $arglist[3]);
       case 'CATEGORIES':
-        return $this->setCategories( $arglist[1], $arglist[2], $arglist[3] );
+        return $this->setCategories($arglist[1], $arglist[2], $arglist[3]);
       case 'CLASS':
-        return $this->setClass( $arglist[1], $arglist[2] );
+        return $this->setClass($arglist[1], $arglist[2]);
       case 'COMMENT':
-        return $this->setComment( $arglist[1], $arglist[2], $arglist[3] );
+        return $this->setComment($arglist[1], $arglist[2], $arglist[3]);
       case 'COMPLETED':
-        return $this->setCompleted( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] );
+        return $this->setCompleted($arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7]);
       case 'CONTACT':
-        return $this->setContact( $arglist[1], $arglist[2], $arglist[3] );
+        return $this->setContact($arglist[1], $arglist[2], $arglist[3]);
       case 'CREATED':
-        return $this->setCreated( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] );
+        return $this->setCreated($arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7]);
       case 'DESCRIPTION':
-        return $this->setDescription( $arglist[1], $arglist[2], $arglist[3] );
+        return $this->setDescription($arglist[1], $arglist[2], $arglist[3]);
       case 'DTEND':
-        return $this->setDtend( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] );
+        return $this->setDtend($arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8]);
       case 'DTSTAMP':
-        return $this->setDtstamp( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] );
+        return $this->setDtstamp($arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7]);
       case 'DTSTART':
-        return $this->setDtstart( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] );
+        return $this->setDtstart($arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8]);
       case 'DUE':
-        return $this->setDue( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] );
+        return $this->setDue($arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8]);
       case 'DURATION':
-        return $this->setDuration( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6] );
+        return $this->setDuration($arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6]);
       case 'EXDATE':
-        return $this->setExdate( $arglist[1], $arglist[2], $arglist[3] );
+        return $this->setExdate($arglist[1], $arglist[2], $arglist[3]);
       case 'EXRULE':
-        return $this->setExrule( $arglist[1], $arglist[2], $arglist[3] );
+        return $this->setExrule($arglist[1], $arglist[2], $arglist[3]);
       case 'FREEBUSY':
-        return $this->setFreebusy( $arglist[1], $arglist[2], $arglist[3], $arglist[4] );
+        return $this->setFreebusy($arglist[1], $arglist[2], $arglist[3], $arglist[4]);
       case 'GEO':
-        return $this->setGeo( $arglist[1], $arglist[2], $arglist[3] );
+        return $this->setGeo($arglist[1], $arglist[2], $arglist[3]);
       case 'LAST-MODIFIED':
-        return $this->setLastModified( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] );
+        return $this->setLastModified($arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7]);
       case 'LOCATION':
-        return $this->setLocation( $arglist[1], $arglist[2] );
+        return $this->setLocation($arglist[1], $arglist[2]);
       case 'ORGANIZER':
-        return $this->setOrganizer( $arglist[1], $arglist[2] );
+        return $this->setOrganizer($arglist[1], $arglist[2]);
       case 'PERCENT-COMPLETE':
-        return $this->setPercentComplete( $arglist[1], $arglist[2] );
+        return $this->setPercentComplete($arglist[1], $arglist[2]);
       case 'PRIORITY':
-        return $this->setPriority( $arglist[1], $arglist[2] );
+        return $this->setPriority($arglist[1], $arglist[2]);
       case 'RDATE':
-        return $this->setRdate( $arglist[1], $arglist[2], $arglist[3] );
+        return $this->setRdate($arglist[1], $arglist[2], $arglist[3]);
       case 'RECURRENCE-ID':
-       return $this->setRecurrenceid( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] );
+       return $this->setRecurrenceid($arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8]);
       case 'RELATED-TO':
-        return $this->setRelatedTo( $arglist[1], $arglist[2], $arglist[3] );
+        return $this->setRelatedTo($arglist[1], $arglist[2], $arglist[3]);
       case 'REPEAT':
-        return $this->setRepeat( $arglist[1], $arglist[2] );
+        return $this->setRepeat($arglist[1], $arglist[2]);
       case 'REQUEST-STATUS':
-        return $this->setRequestStatus( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5] );
+        return $this->setRequestStatus($arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5]);
       case 'RESOURCES':
-        return $this->setResources( $arglist[1], $arglist[2], $arglist[3] );
+        return $this->setResources($arglist[1], $arglist[2], $arglist[3]);
       case 'RRULE':
-        return $this->setRrule( $arglist[1], $arglist[2], $arglist[3] );
+        return $this->setRrule($arglist[1], $arglist[2], $arglist[3]);
       case 'SEQUENCE':
-        return $this->setSequence( $arglist[1], $arglist[2] );
+        return $this->setSequence($arglist[1], $arglist[2]);
       case 'STATUS':
-        return $this->setStatus( $arglist[1], $arglist[2] );
+        return $this->setStatus($arglist[1], $arglist[2]);
       case 'SUMMARY':
-        return $this->setSummary( $arglist[1], $arglist[2] );
+        return $this->setSummary($arglist[1], $arglist[2]);
       case 'TRANSP':
-        return $this->setTransp( $arglist[1], $arglist[2] );
+        return $this->setTransp($arglist[1], $arglist[2]);
       case 'TRIGGER':
-        return $this->setTrigger( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8], $arglist[9], $arglist[10], $arglist[11] );
+        return $this->setTrigger($arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8], $arglist[9], $arglist[10], $arglist[11]);
       case 'TZID':
-        return $this->setTzid( $arglist[1], $arglist[2] );
+        return $this->setTzid($arglist[1], $arglist[2]);
       case 'TZNAME':
-        return $this->setTzname( $arglist[1], $arglist[2], $arglist[3] );
+        return $this->setTzname($arglist[1], $arglist[2], $arglist[3]);
       case 'TZOFFSETFROM':
-        return $this->setTzoffsetfrom( $arglist[1], $arglist[2] );
+        return $this->setTzoffsetfrom($arglist[1], $arglist[2]);
       case 'TZOFFSETTO':
-        return $this->setTzoffsetto( $arglist[1], $arglist[2] );
+        return $this->setTzoffsetto($arglist[1], $arglist[2]);
       case 'TZURL':
-        return $this->setTzurl( $arglist[1], $arglist[2] );
+        return $this->setTzurl($arglist[1], $arglist[2]);
       case 'UID':
-        return $this->setUid( $arglist[1], $arglist[2] );
+        return $this->setUid($arglist[1], $arglist[2]);
       case 'URL':
-        return $this->setUrl( $arglist[1], $arglist[2] );
+        return $this->setUrl($arglist[1], $arglist[2]);
       default:
-        return $this->setXprop( $arglist[0], $arglist[1], $arglist[2] );
+        return $this->setXprop($arglist[0], $arglist[1], $arglist[2]);
     }
     return FALSE;
   }
@@ -6279,18 +6279,18 @@ 
  * @return bool FALSE if error occurs during parsing
  *
  */
-  function parse( $unparsedtext=null ) {
-    if( $unparsedtext ) {
+  function parse($unparsedtext = null) {
+    if ($unparsedtext) {
       $this->unparsed = array();
-      if( is_array( $unparsedtext )) {
+      if (is_array($unparsedtext)) {
         $comp = & $this;
-        foreach ( $unparsedtext as $line ) {
-          if( 'END:VALARM' == strtoupper( substr( $line, 0, 10 ))) {
-            $this->setComponent( $comp );
-            $comp =  & $this;
+        foreach ($unparsedtext as $line) {
+          if ('END:VALARM' == strtoupper(substr($line, 0, 10))) {
+            $this->setComponent($comp);
+            $comp = & $this;
             continue;
           }
-          elseif( 'BEGIN:VALARM' == strtoupper( substr( $line, 0, 12 ))) {
+          elseif ('BEGIN:VALARM' == strtoupper(substr($line, 0, 12))) {
             $comp = new valarm();
             continue;
           }
@@ -6299,215 +6299,215 @@ 
         }
       }
       else
-        $this->unparsed = array( trim( $unparsedtext ));
+        $this->unparsed = array(trim($unparsedtext));
     }
-    elseif( !isset( $this->unparsed ))
+    elseif (!isset($this->unparsed))
       $this->unparsed = array();
             /* concatenate property values spread over several lines */
     $lastix    = -1;
-    $propnames = array( 'action', 'attach', 'attendee', 'categories', 'comment', 'completed'
+    $propnames = array('action', 'attach', 'attendee', 'categories', 'comment', 'completed'
                       , 'contact', 'class', 'created', 'description', 'dtend', 'dtstart'
                       , 'dtstamp', 'due', 'duration', 'exdate', 'exrule', 'freebusy', 'geo'
                       , 'last-modified', 'location', 'organizer', 'percent-complete'
                       , 'priority', 'rdate', 'recurrence-id', 'related-to', 'repeat'
                       , 'request-status', 'resources', 'rrule', 'sequence', 'status'
                       , 'summary', 'transp', 'trigger', 'tzid', 'tzname', 'tzoffsetfrom'
-                      , 'tzoffsetto', 'tzurl', 'uid', 'url', 'x-' );
+                      , 'tzoffsetto', 'tzurl', 'uid', 'url', 'x-');
     $proprows  = array();
-    foreach( $this->unparsed as $line ) {
+    foreach ($this->unparsed as $line) {
       $newProp = FALSE;
-      foreach ( $propnames as $propname ) {
-        if( $propname == strtolower( substr( $line, 0, strlen( $propname )))) {
+      foreach ($propnames as $propname) {
+        if ($propname == strtolower(substr($line, 0, strlen($propname)))) {
           $newProp = TRUE;
           break;
         }
       }
-      if( $newProp ) {
+      if ($newProp) {
         $newProp = FALSE;
         $lastix++;
-        $proprows[$lastix]  = $line;
+        $proprows[$lastix] = $line;
       }
       else {
             /* remove line breaks */
-        if(( '\n' == substr( $proprows[$lastix], -2 )) &&
-           (  ' ' == substr( $line, 0, 1 ))) {
-          $proprows[$lastix] = substr( $proprows[$lastix], 0, strlen( $proprows[$lastix] ) - 2 );
-          $line = substr( $line, 1 );
+        if (('\n' == substr($proprows[$lastix], -2)) &&
+           (' ' == substr($line, 0, 1))) {
+          $proprows[$lastix] = substr($proprows[$lastix], 0, strlen($proprows[$lastix]) - 2);
+          $line = substr($line, 1);
         }
         $proprows[$lastix] .= $line;
       }
     }
             /* parse each property 'line' */
-    foreach( $proprows as $line ) {
-      $line = str_replace( "\n ", '', $line );
-      if( '\n' == substr( $line, -2 ))
-        $line = substr( $line, 0, strlen( $line ) - 2 );
+    foreach ($proprows as $line) {
+      $line = str_replace("\n ", '', $line);
+      if ('\n' == substr($line, -2))
+        $line = substr($line, 0, strlen($line) - 2);
             /* get propname, (problem with x-properties, otherwise in previous loop) */
       $cix = $propname = null;
-      for( $cix=0; $cix < strlen( $line ); $cix++ ) {
-        if( in_array( $line{$cix}, array( ':', ';' )))
+      for ($cix = 0; $cix < strlen($line); $cix++) {
+        if (in_array($line{$cix}, array(':', ';')))
           break;
         else {
           $propname .= $line{$cix};
         }
       }
-      if(( 'x-' == substr( $propname, 0, 2 )) || ( 'X-' == substr( $propname, 0, 2 ))) {
+      if (('x-' == substr($propname, 0, 2)) || ('X-' == substr($propname, 0, 2))) {
         $propname2 = $propname;
         $propname  = 'X-';
       }
             /* rest of the line is opt.params and value */
-      $line = substr( $line, $cix );
+      $line = substr($line, $cix);
             /* separate attributes from value */
       $attr   = array();
       $attrix = -1;
-      $strlen = strlen( $line );
-      for( $cix=0; $cix < $strlen; $cix++ ) {
-        if((       ':'   == $line{$cix} )             &&
-                 ( '://' != substr( $line, $cix, 3 )) &&
-           ( 'mailto:'   != strtolower( substr( $line, $cix - 6, 7 )))) {
+      $strlen = strlen($line);
+      for ($cix = 0; $cix < $strlen; $cix++) {
+        if ((':' == $line{$cix} ) &&
+                 ('://' != substr($line, $cix, 3)) &&
+           ('mailto:' != strtolower(substr($line, $cix - 6, 7)))) {
           $attrEnd = TRUE;
-          if(( $cix < ( $strlen - 4 )) &&
-               ctype_digit( substr( $line, $cix+1, 4 ))) { // an URI with a (4pos) portnr??
-            for( $c2ix = $cix; 3 < $c2ix; $c2ix-- ) {
-              if( '://' == substr( $line, $c2ix - 2, 3 )) {
+          if (($cix < ($strlen - 4)) &&
+               ctype_digit(substr($line, $cix + 1, 4))) { // an URI with a (4pos) portnr??
+            for ($c2ix = $cix; 3 < $c2ix; $c2ix--) {
+              if ('://' == substr($line, $c2ix - 2, 3)) {
                 $attrEnd = FALSE;
                 break; // an URI with a portnr!!
               }
             }
           }
-          if( $attrEnd) {
-            $line = substr( $line, $cix + 1 );
+          if ($attrEnd) {
+            $line = substr($line, $cix + 1);
             break;
           }
         }
-        if( ';' == $line{$cix} )
+        if (';' == $line{$cix} )
           $attr[++$attrix] = null;
         else
           $attr[$attrix] .= $line{$cix};
       }
             /* make attributes in array format */
       $propattr = array();
-      foreach( $attr as $attribute ) {
-        $attrsplit = explode( '=', $attribute, 2 );
-        if( 1 < count( $attrsplit ))
+      foreach ($attr as $attribute) {
+        $attrsplit = explode('=', $attribute, 2);
+        if (1 < count($attrsplit))
           $propattr[$attrsplit[0]] = $attrsplit[1];
         else
           $propattr[] = $attribute;
       }
             /* call setProperty( $propname.. . */
-      switch( $propname ) {
+      switch ($propname) {
         case 'ATTENDEE':
-          foreach( $propattr as $pix => $attr ) {
-            $attr2 = explode( ',', $attr );
-              if( 1 < count( $attr2 ))
+          foreach ($propattr as $pix => $attr) {
+            $attr2 = explode(',', $attr);
+              if (1 < count($attr2))
                 $propattr[$pix] = $attr2;
           }
-          $this->setProperty( $propname, $line, $propattr );
+          $this->setProperty($propname, $line, $propattr);
           break;
         case 'CATEGORIES':
         case 'RESOURCES':
-          if( FALSE !== strpos( $line, ',' )) {
-            $content  = explode( ',', $line );
-            $clen     = count( $content );
-            for( $cix = 0; $cix < $clen; $cix++ ) {
-              if( "\\" == substr($content[$cix], -1)) {
+          if (FALSE !== strpos($line, ',')) {
+            $content  = explode(',', $line);
+            $clen     = count($content);
+            for ($cix = 0; $cix < $clen; $cix++) {
+              if ("\\" == substr($content[$cix], -1)) {
                 $content[$cix] .= ','.$content[$cix + 1];
                 unset($content[$cix + 1]);
                 $cix++;
               }
             }
-            if( 1 < count( $content )) {
-              $content = array_values( $content );
-              foreach( $content as $cix => $contentPart )
-                $content[$cix] = $this->_strunrep( $contentPart );
-              $this->setProperty( $propname, $content, $propattr );
+            if (1 < count($content)) {
+              $content = array_values($content);
+              foreach ($content as $cix => $contentPart)
+                $content[$cix] = $this->_strunrep($contentPart);
+              $this->setProperty($propname, $content, $propattr);
               break;
             }
             else
-              $line = reset( $content );
+              $line = reset($content);
           }
         case 'X-':
-          $propname = ( isset( $propname2 )) ? $propname2 : $propname;
+          $propname = (isset($propname2)) ? $propname2 : $propname;
         case 'COMMENT':
         case 'CONTACT':
         case 'DESCRIPTION':
         case 'LOCATION':
         case 'SUMMARY':
-          if( empty( $line ))
+          if (empty($line))
             $propattr = null;
-          $this->setProperty( $propname, $this->_strunrep( $line ), $propattr );
-          unset( $propname2 );
+          $this->setProperty($propname, $this->_strunrep($line), $propattr);
+          unset($propname2);
           break;
         case 'REQUEST-STATUS':
-          $values    = explode( ';', $line, 3 );
-          $values[1] = ( !isset( $values[1] )) ? null : $this->_strunrep( $values[1] );
-          $values[2] = ( !isset( $values[2] )) ? null : $this->_strunrep( $values[2] );
-          $this->setProperty( $propname
+          $values    = explode(';', $line, 3);
+          $values[1] = (!isset($values[1])) ? null : $this->_strunrep($values[1]);
+          $values[2] = (!isset($values[2])) ? null : $this->_strunrep($values[2]);
+          $this->setProperty($propname
                             , $values[0]  // statcode
                             , $values[1]  // statdesc
                             , $values[2]  // extdata
-                            , $propattr );
+                            , $propattr);
           break;
         case 'FREEBUSY':
-          $fbtype = ( isset( $propattr['FBTYPE'] )) ? $propattr['FBTYPE'] : ''; // force setting default, if missing
-          unset( $propattr['FBTYPE'] );
-          $values = explode( ',', $line );
-          foreach( $values as $vix => $value ) {
-            $value2 = explode( '/', $value );
-            if( 1 < count( $value2 ))
+          $fbtype = (isset($propattr['FBTYPE'])) ? $propattr['FBTYPE'] : ''; // force setting default, if missing
+          unset($propattr['FBTYPE']);
+          $values = explode(',', $line);
+          foreach ($values as $vix => $value) {
+            $value2 = explode('/', $value);
+            if (1 < count($value2))
               $values[$vix] = $value2;
           }
-          $this->setProperty( $propname, $fbtype, $values, $propattr );
+          $this->setProperty($propname, $fbtype, $values, $propattr);
           break;
         case 'GEO':
-          $value = explode( ';', $line, 2 );
-          if( 2 > count( $value ))
+          $value = explode(';', $line, 2);
+          if (2 > count($value))
             $value[1] = null;
-          $this->setProperty( $propname, $value[0], $value[1], $propattr );
+          $this->setProperty($propname, $value[0], $value[1], $propattr);
           break;
         case 'EXDATE':
-          $values = ( !empty( $line )) ? explode( ',', $line ) : null;
-          $this->setProperty( $propname, $values, $propattr );
+          $values = (!empty($line)) ? explode(',', $line) : null;
+          $this->setProperty($propname, $values, $propattr);
           break;
         case 'RDATE':
-          if( empty( $line )) {
-            $this->setProperty( $propname, $line, $propattr );
+          if (empty($line)) {
+            $this->setProperty($propname, $line, $propattr);
             break;
           }
-          $values = explode( ',', $line );
-          foreach( $values as $vix => $value ) {
-            $value2 = explode( '/', $value );
-            if( 1 < count( $value2 ))
+          $values = explode(',', $line);
+          foreach ($values as $vix => $value) {
+            $value2 = explode('/', $value);
+            if (1 < count($value2))
               $values[$vix] = $value2;
           }
-          $this->setProperty( $propname, $values, $propattr );
+          $this->setProperty($propname, $values, $propattr);
           break;
         case 'EXRULE':
         case 'RRULE':
-          $values = explode( ';', $line );
+          $values = explode(';', $line);
           $recur = array();
-          foreach( $values as $value2 ) {
-            if( empty( $value2 ))
+          foreach ($values as $value2) {
+            if (empty($value2))
               continue; // ;-char in ending position ???
-            $value3 = explode( '=', $value2, 2 );
-            $rulelabel = strtoupper( $value3[0] );
-            switch( $rulelabel ) {
+            $value3 = explode('=', $value2, 2);
+            $rulelabel = strtoupper($value3[0]);
+            switch ($rulelabel) {
               case 'BYDAY': {
-                $value4 = explode( ',', $value3[1] );
-                if( 1 < count( $value4 )) {
-                  foreach( $value4 as $v5ix => $value5 ) {
+                $value4 = explode(',', $value3[1]);
+                if (1 < count($value4)) {
+                  foreach ($value4 as $v5ix => $value5) {
                     $value6 = array();
                     $dayno = $dayname = null;
-                    $value5 = trim( (string) $value5 );
-                    if(( ctype_alpha( substr( $value5, -1 ))) &&
-                       ( ctype_alpha( substr( $value5, -2, 1 )))) {
-                      $dayname = substr( $value5, -2, 2 );
-                      if( 2 < strlen( $value5 ))
-                        $dayno = substr( $value5, 0, ( strlen( $value5 ) - 2 ));
+                    $value5 = trim((string) $value5);
+                    if ((ctype_alpha(substr($value5, -1))) &&
+                       (ctype_alpha(substr($value5, -2, 1)))) {
+                      $dayname = substr($value5, -2, 2);
+                      if (2 < strlen($value5))
+                        $dayno = substr($value5, 0, (strlen($value5) - 2));
                     }
-                    if( $dayno )
+                    if ($dayno)
                       $value6[] = $dayno;
-                    if( $dayname )
+                    if ($dayname)
                       $value6['DAY'] = $dayname;
                     $value4[$v5ix] = $value6;
                   }
@@ -6515,41 +6515,41 @@ 
                 else {
                   $value4 = array();
                   $dayno  = $dayname = null;
-                  $value5 = trim( (string) $value3[1] );
-                  if(( ctype_alpha( substr( $value5, -1 ))) &&
-                     ( ctype_alpha( substr( $value5, -2, 1 )))) {
-                      $dayname = substr( $value5, -2, 2 );
-                    if( 2 < strlen( $value5 ))
-                      $dayno = substr( $value5, 0, ( strlen( $value5 ) - 2 ));
+                  $value5 = trim((string) $value3[1]);
+                  if ((ctype_alpha(substr($value5, -1))) &&
+                     (ctype_alpha(substr($value5, -2, 1)))) {
+                      $dayname = substr($value5, -2, 2);
+                    if (2 < strlen($value5))
+                      $dayno = substr($value5, 0, (strlen($value5) - 2));
                   }
-                  if( $dayno )
+                  if ($dayno)
                     $value4[] = $dayno;
-                  if( $dayname )
+                  if ($dayname)
                     $value4['DAY'] = $dayname;
                 }
                 $recur[$rulelabel] = $value4;
                 break;
               }
               default: {
-                $value4 = explode( ',', $value3[1] );
-                if( 1 < count( $value4 ))
+                $value4 = explode(',', $value3[1]);
+                if (1 < count($value4))
                   $value3[1] = $value4;
                 $recur[$rulelabel] = $value3[1];
                 break;
               }
             } // end - switch $rulelabel
           } // end - foreach( $values.. .
-          $this->setProperty( $propname, $recur, $propattr );
+          $this->setProperty($propname, $recur, $propattr);
           break;
         default:
-          $this->setProperty( $propname, $line, $propattr );
+          $this->setProperty($propname, $line, $propattr);
           break;
       } // end  switch( $propname.. .
     } // end - foreach( $proprows.. .
-    unset( $this->unparsed, $proprows );
-    if( isset( $this->components ) && is_array( $this->components ) && ( 0 < count( $this->components ))) {
-      for( $six = 0; $six < count( $this->components ); $six++ ) {
-        if( !empty( $this->components[$six]->unparsed ))
+    unset($this->unparsed, $proprows);
+    if (isset($this->components) && is_array($this->components) && (0 < count($this->components))) {
+      for ($six = 0; $six < count($this->components); $six++) {
+        if (!empty($this->components[$six]->unparsed))
           $this->components[$six]->parse();
       }
     }
@@ -6566,7 +6566,7 @@ 
   function copy() {
     $serialized_contents = serialize($this);
     $copy = unserialize($serialized_contents);
-    unset( $copy->propix );
+    unset($copy->propix);
     return $copy;
  }
 /*********************************************************************************/
@@ -6580,34 +6580,34 @@ 
  * @param mixed $arg2 optional, ordno if arg1 = component type
  * @return void
  */
-  function deleteComponent( $arg1, $arg2=FALSE  ) {
-    if( !isset( $this->components )) return FALSE;
+  function deleteComponent($arg1, $arg2 = FALSE) {
+    if (!isset($this->components)) return FALSE;
     $argType = $index = null;
-    if ( ctype_digit( (string) $arg1 )) {
+    if (ctype_digit((string) $arg1)) {
       $argType = 'INDEX';
       $index   = (int) $arg1 - 1;
     }
-    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
-      $argType = strtolower( $arg1 );
-      $index   = ( !empty( $arg2 ) && ctype_digit( (string) $arg2 )) ? (( int ) $arg2 - 1 ) : 0;
+    elseif ((strlen($arg1) <= strlen('vfreebusy')) && (FALSE === strpos($arg1, '@'))) {
+      $argType = strtolower($arg1);
+      $index   = (!empty($arg2) && ctype_digit((string) $arg2)) ? ((int) $arg2 - 1) : 0;
     }
     $cix2dC = 0;
-    foreach ( $this->components as $cix => $component) {
-      if( empty( $component )) continue;
-      unset( $component->propix );
-      if(( 'INDEX' == $argType ) && ( $index == $cix )) {
-        unset( $this->components[$cix] );
+    foreach ($this->components as $cix => $component) {
+      if (empty($component)) continue;
+      unset($component->propix);
+      if (('INDEX' == $argType) && ($index == $cix)) {
+        unset($this->components[$cix]);
         return TRUE;
       }
-      elseif( $argType == $component->objName ) {
-        if( $index == $cix2dC ) {
-          unset( $this->components[$cix] );
+      elseif ($argType == $component->objName) {
+        if ($index == $cix2dC) {
+          unset($this->components[$cix]);
           return TRUE;
         }
         $cix2dC++;
       }
-      elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
-        unset( $this->components[$cix] );
+      elseif (!$argType && ($arg1 == $component->getProperty('uid'))) {
+        unset($this->components[$cix]);
         return TRUE;
       }
     }
@@ -6622,50 +6622,50 @@ 
  * @param mixed $arg2 optional, ordno if arg1 = component type
  * @return object
  */
-  function getComponent ( $arg1=FALSE, $arg2=FALSE ) {
-    if( !isset( $this->components )) return FALSE;
+  function getComponent($arg1 = FALSE, $arg2 = FALSE) {
+    if (!isset($this->components)) return FALSE;
     $index = $argType = null;
-    if ( !$arg1 ) {
+    if (!$arg1) {
       $argType = 'INDEX';
       $index   = $this->compix['INDEX'] =
-        ( isset( $this->compix['INDEX'] )) ? $this->compix['INDEX'] + 1 : 1;
+        (isset($this->compix['INDEX'])) ? $this->compix['INDEX'] + 1 : 1;
     }
-    elseif ( ctype_digit( (string) $arg1 )) {
+    elseif (ctype_digit((string) $arg1)) {
       $argType = 'INDEX';
       $index   = (int) $arg1;
-      unset( $this->compix );
+      unset($this->compix);
     }
-    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
-      unset( $this->compix['INDEX'] );
-      $argType = strtolower( $arg1 );
-      if( !$arg2 )
+    elseif ((strlen($arg1) <= strlen('vfreebusy')) && (FALSE === strpos($arg1, '@'))) {
+      unset($this->compix['INDEX']);
+      $argType = strtolower($arg1);
+      if (!$arg2)
         $index = $this->compix[$argType] =
-        ( isset( $this->compix[$argType] )) ? $this->compix[$argType] + 1 : 1;
+        (isset($this->compix[$argType])) ? $this->compix[$argType] + 1 : 1;
       else
         $index = (int) $arg2;
     }
-    $index  -= 1;
-    $ckeys = array_keys( $this->components );
-    if( !empty( $index) && ( $index > end( $ckeys )))
+    $index -= 1;
+    $ckeys = array_keys($this->components);
+    if (!empty($index) && ($index > end($ckeys)))
       return FALSE;
     $cix2gC = 0;
-    foreach( $this->components as $cix => $component ) {
-      if( empty( $component )) continue;
-      unset( $component->propix );
-      if(( 'INDEX' == $argType ) && ( $index == $cix ))
+    foreach ($this->components as $cix => $component) {
+      if (empty($component)) continue;
+      unset($component->propix);
+      if (('INDEX' == $argType) && ($index == $cix))
         return $component->copy();
-      elseif( $argType == $component->objName ) {
-         if( $index == $cix2gC )
+      elseif ($argType == $component->objName) {
+         if ($index == $cix2gC)
            return $component->copy();
          $cix2gC++;
       }
-      elseif( !$argType && ( $arg1 == $component->getProperty( 'uid' ))) {
-        unset( $component->propix );
+      elseif (!$argType && ($arg1 == $component->getProperty('uid'))) {
+        unset($component->propix);
         return $component->copy();
       }
     }
             /* not found.. . */
-    unset( $this->compix );
+    unset($this->compix);
     return false;
   }
 /**
@@ -6676,8 +6676,8 @@ 
  * @param object $component calendar component
  * @return void
  */
-  function addSubComponent ( $component ) {
-    $this->setComponent( $component );
+  function addSubComponent($component) {
+    $this->setComponent($component);
   }
 /**
  * add calendar component as subcomponent to container for subcomponents
@@ -6689,49 +6689,49 @@ 
  * @param mixed $arg2 optional, ordno if arg1 = component type
  * @return bool
  */
-  function setComponent( $component, $arg1=FALSE, $arg2=FALSE  ) {
-    if( !isset( $this->components )) return FALSE;
-    if( '' >= $component->getConfig( 'language'))
-      $component->setConfig( 'language',  $this->getConfig( 'language' ));
-    $component->setConfig( 'allowEmpty',  $this->getConfig( 'allowEmpty' ));
-    $component->setConfig( 'nl',          $this->getConfig( 'nl' ));
-    $component->setConfig( 'unique_id',   $this->getConfig( 'unique_id' ));
-    $component->setConfig( 'format',      $this->getConfig( 'format' ));
-    if( !in_array( $component->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) {
-      unset( $component->propix );
+  function setComponent($component, $arg1 = FALSE, $arg2 = FALSE) {
+    if (!isset($this->components)) return FALSE;
+    if ('' >= $component->getConfig('language'))
+      $component->setConfig('language', $this->getConfig('language'));
+    $component->setConfig('allowEmpty', $this->getConfig('allowEmpty'));
+    $component->setConfig('nl', $this->getConfig('nl'));
+    $component->setConfig('unique_id', $this->getConfig('unique_id'));
+    $component->setConfig('format', $this->getConfig('format'));
+    if (!in_array($component->objName, array('valarm', 'vtimezone', 'standard', 'daylight'))) {
+      unset($component->propix);
             /* make sure dtstamp and uid is set */
-      $dummy = $component->getProperty( 'dtstamp' );
-      $dummy = $component->getProperty( 'uid' );
+      $dummy = $component->getProperty('dtstamp');
+      $dummy = $component->getProperty('uid');
     }
-    if( !$arg1 ) {
+    if (!$arg1) {
       $this->components[] = $component->copy();
       return TRUE;
     }
     $argType = $index = null;
-    if ( ctype_digit( (string) $arg1 )) {
+    if (ctype_digit((string) $arg1)) {
       $argType = 'INDEX';
       $index   = (int) $arg1 - 1;
     }
-    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
-      $argType = strtolower( $arg1 );
-      $index = ( ctype_digit( (string) $arg2 )) ? ((int) $arg2) - 1 : 0;
+    elseif ((strlen($arg1) <= strlen('vfreebusy')) && (FALSE === strpos($arg1, '@'))) {
+      $argType = strtolower($arg1);
+      $index = (ctype_digit((string) $arg2)) ? ((int) $arg2) - 1 : 0;
     }
     $cix2sC = 0;
-    foreach ( $this->components as $cix => $component2 ) {
-      if( empty( $component2 )) continue;
-      unset( $component2->propix );
-      if(( 'INDEX' == $argType ) && ( $index == $cix )) {
+    foreach ($this->components as $cix => $component2) {
+      if (empty($component2)) continue;
+      unset($component2->propix);
+      if (('INDEX' == $argType) && ($index == $cix)) {
         $this->components[$cix] = $component->copy();
         return TRUE;
       }
-      elseif( $argType == $component2->objName ) {
-        if( $index == $cix2sC ) {
+      elseif ($argType == $component2->objName) {
+        if ($index == $cix2sC) {
           $this->components[$cix] = $component->copy();
           return TRUE;
         }
         $cix2sC++;
       }
-      elseif( !$argType && ($arg1 == $component2->getProperty( 'uid' ))) {
+      elseif (!$argType && ($arg1 == $component2->getProperty('uid'))) {
         $this->components[$cix] = $component->copy();
         return TRUE;
       }
@@ -6749,15 +6749,15 @@ 
  */
   function createSubComponent() {
     $output = null;
-    foreach( $this->components as $component ) {
-      if( empty( $component )) continue;
-      if( '' >= $component->getConfig( 'language'))
-        $component->setConfig( 'language',  $this->getConfig( 'language' ));
-      $component->setConfig( 'allowEmpty',  $this->getConfig( 'allowEmpty' ));
-      $component->setConfig( 'nl',          $this->getConfig( 'nl' ));
-      $component->setConfig( 'unique_id',   $this->getConfig( 'unique_id' ));
-      $component->setConfig( 'format',      $this->getConfig( 'format' ));
-      $output .= $component->createComponent( $this->xcaldecl );
+    foreach ($this->components as $component) {
+      if (empty($component)) continue;
+      if ('' >= $component->getConfig('language'))
+        $component->setConfig('language', $this->getConfig('language'));
+      $component->setConfig('allowEmpty', $this->getConfig('allowEmpty'));
+      $component->setConfig('nl', $this->getConfig('nl'));
+      $component->setConfig('unique_id', $this->getConfig('unique_id'));
+      $component->setConfig('format', $this->getConfig('format'));
+      $output .= $component->createComponent($this->xcaldecl);
     }
     return $output;
   }
@@ -6784,21 +6784,21 @@ 
  * @param string $value
  * @return string
  */
-  function _size75( $string ) {
-    $strlen = strlen( $string );
+  function _size75($string) {
+    $strlen = strlen($string);
     $tmp    = $string;
     $string = null;
-    while( $strlen > 75 ) {
+    while ($strlen > 75) {
        $breakAtChar = 75;
-       if( substr( $tmp, ( $breakAtChar - 1 ), strlen( '\n' )) == '\n' )
+       if (substr($tmp, ($breakAtChar - 1), strlen('\n')) == '\n')
          $breakAtChar = $breakAtChar - 1;
-       $string .= substr( $tmp, 0, $breakAtChar );
+       $string .= substr($tmp, 0, $breakAtChar);
        $string .= $this->nl;
-       $tmp     = ' '.substr( $tmp, $breakAtChar );
-       $strlen  = strlen( $tmp );
+       $tmp     = ' '.substr($tmp, $breakAtChar);
+       $strlen  = strlen($tmp);
     } // while
-    $string .= rtrim( $tmp ); // the rest
-    if( $this->nl != substr( $string, ( 0 - strlen( $this->nl ))))
+    $string .= rtrim($tmp); // the rest
+    if ($this->nl != substr($string, (0 - strlen($this->nl))))
       $string .= $this->nl;
     return $string;
   }
@@ -6810,38 +6810,38 @@ 
  * @param string $string
  * @return string
  */
-  function _strrep( $string ) {
-    switch( $this->format ) {
+  function _strrep($string) {
+    switch ($this->format) {
       case 'xcal':
-        $string = str_replace( '\n',  $this->nl, $string);
-        $string = htmlspecialchars( strip_tags( stripslashes( urldecode ( $string ))));
+        $string = str_replace('\n', $this->nl, $string);
+        $string = htmlspecialchars(strip_tags(stripslashes(urldecode($string))));
         break;
       default:
         $pos = 0;
-        while( $pos <= strlen( $string )) {
-          $pos = strpos( $string, "\\", $pos );
-          if( FALSE === $pos )
+        while ($pos <= strlen($string)) {
+          $pos = strpos($string, "\\", $pos);
+          if (FALSE === $pos)
             break;
-          if( !in_array( $string{($pos + 1)}, array( 'n', 'N', 'r', ',', ';' ))) {
-            $string = substr( $string, 0, $pos )."\\".substr( $string, ( $pos + 1 ));
+          if (!in_array($string{($pos + 1)}, array('n', 'N', 'r', ',', ';'))) {
+            $string = substr($string, 0, $pos)."\\".substr($string, ($pos + 1));
             $pos += 1;
           }
           $pos += 1;
         }
-        if( FALSE !== strpos( $string, '"' ))
-          $string = str_replace('"',   "'",       $string);
-        if( FALSE !== strpos( $string, ',' ))
-          $string = str_replace(',',   '\,',      $string);
-        if( FALSE !== strpos( $string, ';' ))
-          $string = str_replace(';',   '\;',      $string);
-        if( FALSE !== strpos( $string, "\r\n" ))
-          $string = str_replace( "\r\n", '\n',    $string);
-        elseif( FALSE !== strpos( $string, "\r" ))
-          $string = str_replace( "\r", '\n',      $string);
-        if( FALSE !== strpos( $string, '\N' ))
-          $string = str_replace( '\N', '\n',      $string);
+        if (FALSE !== strpos($string, '"'))
+          $string = str_replace('"', "'", $string);
+        if (FALSE !== strpos($string, ','))
+          $string = str_replace(',', '\,', $string);
+        if (FALSE !== strpos($string, ';'))
+          $string = str_replace(';', '\;', $string);
+        if (FALSE !== strpos($string, "\r\n"))
+          $string = str_replace("\r\n", '\n', $string);
+        elseif (FALSE !== strpos($string, "\r"))
+          $string = str_replace("\r", '\n', $string);
+        if (FALSE !== strpos($string, '\N'))
+          $string = str_replace('\N', '\n', $string);
 //        if( FALSE !== strpos( $string, $this->nl ))
-          $string = str_replace( $this->nl, '\n', $string);
+          $string = str_replace($this->nl, '\n', $string);
         break;
     }
     return $string;
@@ -6854,10 +6854,10 @@ 
  * @param string $string
  * @return string
  */
-  function _strunrep( $string ) {
-    $string = str_replace( '\\\\', '\\',     $string);
-    $string = str_replace( '\,',   ',',      $string);
-    $string = str_replace( '\;',   ';',      $string);
+  function _strunrep($string) {
+    $string = str_replace('\\\\', '\\', $string);
+    $string = str_replace('\,', ',', $string);
+    $string = str_replace('\;', ';', $string);
 //    $string = str_replace( '\n',  $this->nl, $string); // ??
     return $string;
   }
@@ -6955,7 +6955,7 @@ 
  * @param array $xcaldecl
  * @return string
  */
-  function createComponent( &$xcaldecl ) {
+  function createComponent(&$xcaldecl) {
     $objectname    = $this->_createFormat();
     $component     = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
     $component    .= $this->createUid();
@@ -6992,8 +6992,8 @@ 
     $component    .= $this->createXprop();
     $component    .= $this->createSubComponent();
     $component    .= $this->componentEnd1.$objectname.$this->componentEnd2;
-    if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
-      foreach( $this->xcaldecl as $localxcaldecl )
+    if (is_array($this->xcaldecl) && (0 < count($this->xcaldecl))) {
+      foreach ($this->xcaldecl as $localxcaldecl)
         $xcaldecl[] = $localxcaldecl;
     }
     return $component;
@@ -7093,7 +7093,7 @@ 
  * @param array $xcaldecl
  * @return string
  */
-  function createComponent( &$xcaldecl ) {
+  function createComponent(&$xcaldecl) {
     $objectname    = $this->_createFormat();
     $component     = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
     $component    .= $this->createUid();
@@ -7131,8 +7131,8 @@ 
     $component    .= $this->createXprop();
     $component    .= $this->createSubComponent();
     $component    .= $this->componentEnd1.$objectname.$this->componentEnd2;
-    if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
-      foreach( $this->xcaldecl as $localxcaldecl )
+    if (is_array($this->xcaldecl) && (0 < count($this->xcaldecl))) {
+      foreach ($this->xcaldecl as $localxcaldecl)
         $xcaldecl[] = $localxcaldecl;
     }
     return $component;
@@ -7212,7 +7212,7 @@ 
  * @param array $xcaldecl
  * @return string
  */
-  function createComponent( &$xcaldecl ) {
+  function createComponent(&$xcaldecl) {
     $objectname = $this->_createFormat();
     $component  = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
     $component .= $this->createUid();
@@ -7241,8 +7241,8 @@ 
     $component .= $this->createUrl();
     $component .= $this->createXprop();
     $component .= $this->componentEnd1.$objectname.$this->componentEnd2;
-    if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
-      foreach( $this->xcaldecl as $localxcaldecl )
+    if (is_array($this->xcaldecl) && (0 < count($this->xcaldecl))) {
+      foreach ($this->xcaldecl as $localxcaldecl)
         $xcaldecl[] = $localxcaldecl;
     }
     return $component;
@@ -7300,7 +7300,7 @@ 
  * @param array $xcaldecl
  * @return string
  */
-  function createComponent( &$xcaldecl ) {
+  function createComponent(&$xcaldecl) {
     $objectname = $this->_createFormat();
     $component  = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
     $component .= $this->createUid();
@@ -7317,8 +7317,8 @@ 
     $component .= $this->createUrl();
     $component .= $this->createXprop();
     $component .= $this->componentEnd1.$objectname.$this->componentEnd2;
-    if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
-      foreach( $this->xcaldecl as $localxcaldecl )
+    if (is_array($this->xcaldecl) && (0 < count($this->xcaldecl))) {
+      foreach ($this->xcaldecl as $localxcaldecl)
         $xcaldecl[] = $localxcaldecl;
     }
     return $component;
@@ -7370,7 +7370,7 @@ 
  * @param array $xcaldecl
  * @return string
  */
-  function createComponent( &$xcaldecl ) {
+  function createComponent(&$xcaldecl) {
     $objectname    = $this->_createFormat();
     $component     = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
     $component    .= $this->createAction();
@@ -7418,11 +7418,11 @@ 
  * @param string $timezonetype optional, default FALSE ( STANDARD / DAYLIGHT )
  * @return void
  */
-  function vtimezone( $timezonetype=FALSE ) {
-    if( !$timezonetype )
+  function vtimezone($timezonetype = FALSE) {
+    if (!$timezonetype)
       $this->timezonetype = 'VTIMEZONE';
     else
-      $this->timezonetype = strtoupper( $timezonetype );
+      $this->timezonetype = strtoupper($timezonetype);
     $this->calendarComponent();
 
     $this->comment         = '';
@@ -7447,7 +7447,7 @@ 
  * @param array $xcaldecl
  * @return string
  */
-  function createComponent( &$xcaldecl ) {
+  function createComponent(&$xcaldecl) {
     $objectname    = $this->_createFormat();
     $component     = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
     $component    .= $this->createTzid();
@@ -7463,8 +7463,8 @@ 
     $component    .= $this->createXprop();
     $component    .= $this->createSubComponent();
     $component    .= $this->componentEnd1.$objectname.$this->componentEnd2;
-    if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
-      foreach( $this->xcaldecl as $localxcaldecl )
+    if (is_array($this->xcaldecl) && (0 < count($this->xcaldecl))) {
+      foreach ($this->xcaldecl as $localxcaldecl)
         $xcaldecl[] = $localxcaldecl;
     }
     return $component;

Braces +2276 added lines, -1351 removed lines

@@ -44,8 +44,10 @@ 
 }
 */
             /* only for phpversion 5.x, date management, default timezone setting */
-if( substr( phpversion(), 0, 1) >= '5' ) // && ( 'UTC' == date_default_timezone_get() )) {
+if( substr( phpversion(), 0, 1) >= '5' ) {
+    // && ( 'UTC' == date_default_timezone_get() )) {
   date_default_timezone_set( 'Europe/Stockholm' );
+}
             /* version string, do NOT remove!! */
 define( 'ICALCREATOR_VERSION', 'iCalcreator 2.6' );
 /*********************************************************************************/
@@ -97,8 +99,9 @@ 
 /**
  *   language = <Text identifying a language, as defined in [RFC 1766]>
  */
-    if( defined( 'ICAL_LANG' ))
-      $this->setConfig( 'language', ICAL_LANG );
+    if( defined( 'ICAL_LANG' )) {
+          $this->setConfig( 'language', ICAL_LANG );
+    }
     $this->setConfig( 'allowEmpty', TRUE );
     $this->setConfig( 'nl',         "\n" );
     $this->setConfig( 'format',     'iCal');
@@ -121,7 +124,9 @@ 
  * @return string
  */
   function createCalscale() {
-    if( empty( $this->calscale )) return FALSE;
+    if( empty( $this->calscale )) {
+        return FALSE;
+    }
     switch( $this->format ) {
       case 'xcal':
         return ' calscale="'.$this->calscale.'"'.$this->nl;
@@ -140,7 +145,9 @@ 
  * @return void
  */
   function setCalscale( $value ) {
-    if( empty( $value )) return FALSE;
+    if( empty( $value )) {
+        return FALSE;
+    }
     $this->calscale = $value;
   }
 /*********************************************************************************/
@@ -155,7 +162,9 @@ 
  * @return string
  */
   function createMethod() {
-    if( empty( $this->method )) return FALSE;
+    if( empty( $this->method )) {
+        return FALSE;
+    }
     switch( $this->format ) {
       case 'xcal':
         return ' method="'.$this->method.'"'.$this->nl;
@@ -174,7 +183,9 @@ 
  * @return bool
  */
   function setMethod( $value ) {
-    if( empty( $value )) return FALSE;
+    if( empty( $value )) {
+        return FALSE;
+    }
     $this->method = $value;
     return TRUE;
   }
@@ -194,8 +205,9 @@ 
  * @return string
  */
   function createProdid() {
-    if( !isset( $this->prodid ))
-      $this->_makeProdid();
+    if( !isset( $this->prodid )) {
+          $this->_makeProdid();
+    }
     switch( $this->format ) {
       case 'xcal':
         return ' prodid="'.$this->prodid.'"'.$this->nl;
@@ -246,8 +258,9 @@ 
  * @return string
  */
   function createVersion() {
-    if( empty( $this->version ))
-      $this->_makeVersion();
+    if( empty( $this->version )) {
+          $this->_makeVersion();
+    }
     switch( $this->format ) {
       case 'xcal':
         return ' version="'.$this->version.'"'.$this->nl;
@@ -276,7 +289,9 @@ 
  * @return void
  */
   function setVersion( $value ) {
-    if( empty( $value )) return FALSE;
+    if( empty( $value )) {
+        return FALSE;
+    }
     $this->version = $value;
     return TRUE;
   }
@@ -292,10 +307,12 @@ 
  * @return string
  */
   function createXprop() {
-    if( 'xcal' == $this->format )
-      return false;
-    if( 0 >= count( $this->xprop ))
-      return;
+    if( 'xcal' == $this->format ) {
+          return false;
+    }
+    if( 0 >= count( $this->xprop )) {
+          return;
+    }
     $output = null;
     $toolbox = new calendarComponent();
     $toolbox->setConfig( 'language', $this->getConfig( 'language' ));
@@ -308,12 +325,13 @@ 
       }
       $attributes = $toolbox->_createParams( $xpropPart['params'], array( 'LANGUAGE' ));
       if( is_array( $xpropPart['value'] )) {
-        foreach( $xpropPart['value'] as $pix => $theXpart )
-          $xpropPart['value'][$pix] = $toolbox->_strrep( $theXpart );
+        foreach( $xpropPart['value'] as $pix => $theXpart ) {
+                  $xpropPart['value'][$pix] = $toolbox->_strrep( $theXpart );
+        }
         $xpropPart['value']  = implode( ',', $xpropPart['value'] );
+      } else {
+              $xpropPart['value'] = $toolbox->_strrep( $xpropPart['value'] );
       }
-      else
-        $xpropPart['value'] = $toolbox->_strrep( $xpropPart['value'] );
       $output    .= $toolbox->_createElement( $label, $attributes, $xpropPart['value'] );
     }
     return $output;
@@ -329,12 +347,20 @@ 
  * @return bool
  */
   function setXprop( $label, $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    if( empty( $label )) return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
+    if( empty( $label )) {
+        return FALSE;
+    }
     $xprop           = array( 'value' => $value );
     $toolbox         = new calendarComponent();
     $xprop['params'] = $toolbox->_setParams( $params );
-    if( !is_array( $this->xprop )) $this->xprop = array();
+    if( !is_array( $this->xprop )) {
+        $this->xprop = array();
+    }
     $this->xprop[strtoupper( $label )] = $xprop;
     return TRUE;
   }
@@ -350,8 +376,9 @@ 
  */
   function deleteProperty( $propName, $propix=FALSE ) {
     $propName = ( $propName ) ? strtoupper( $propName ) : 'X-PROP';
-    if( !$propix )
-      $propix = ( isset( $this->propdelix[$propName] )) ? $this->propdelix[$propName] + 2 : 1;
+    if( !$propix ) {
+          $propix = ( isset( $this->propdelix[$propName] )) ? $this->propdelix[$propName] + 2 : 1;
+    }
     $this->propdelix[$propName] = --$propix;
     $return = FALSE;
     switch( $propName ) {
@@ -370,18 +397,23 @@ 
       default:
         $reduced = array();
         if( $propName != 'X-PROP' ) {
-          if( !isset( $this->xprop[$propName] )) return FALSE;
+          if( !isset( $this->xprop[$propName] )) {
+              return FALSE;
+          }
           foreach( $this->xprop as $k => $a ) {
-            if(( $k != $propName ) && !empty( $a ))
-              $reduced[$k] = $a;
+            if(( $k != $propName ) && !empty( $a )) {
+                          $reduced[$k] = $a;
+            }
+          }
+        } else {
+          if( count( $this->xprop ) <= $propix ) {
+              return FALSE;
           }
-        }
-        else {
-          if( count( $this->xprop ) <= $propix )  return FALSE;
           $xpropno = 0;
           foreach( $this->xprop as $xpropkey => $xpropvalue ) {
-            if( $propix != $xpropno )
-              $reduced[$xpropkey] = $xpropvalue;
+            if( $propix != $xpropno ) {
+                          $reduced[$xpropkey] = $xpropvalue;
+            }
             $xpropno++;
           }
         }
@@ -403,8 +435,9 @@ 
   function getProperty( $propName=FALSE, $propix=FALSE, $inclParam=FALSE ) {
     $propName = ( $propName ) ? strtoupper( $propName ) : 'X-PROP';
     if( 'X-PROP' == $propName ) {
-      if( !$propix )
-        $propix = ( isset( $this->propix[$propName] )) ? $this->propix[$propName] + 2 : 1;
+      if( !$propix ) {
+              $propix = ( isset( $this->propix[$propName] )) ? $this->propix[$propName] + 2 : 1;
+      }
       $this->propix[$propName] = --$propix;
     }
     switch( $propName ) {
@@ -415,8 +448,9 @@ 
         return ( !empty( $this->method )) ? $this->method : null;
         break;
       case 'PRODID':
-        if( empty( $this->prodid ))
-          $this->_makeProdid();
+        if( empty( $this->prodid )) {
+                  $this->_makeProdid();
+        }
         return $this->prodid;
         break;
       case 'VERSION':
@@ -424,19 +458,23 @@ 
         break;
       default:
         if( $propName != 'X-PROP' ) {
-          if( !isset( $this->xprop[$propName] )) return FALSE;
+          if( !isset( $this->xprop[$propName] )) {
+              return FALSE;
+          }
           return ( $inclParam ) ? array( $propName, $this->xprop[$propName] )
                                 : array( $propName, $this->xprop[$propName]['value'] );
-        }
-        else {
-          if( empty( $this->xprop )) return FALSE;
+        } else {
+          if( empty( $this->xprop )) {
+              return FALSE;
+          }
           $xpropno = 0;
           foreach( $this->xprop as $xpropkey => $xpropvalue ) {
-            if( $propix == $xpropno )
-              return ( $inclParam ) ? array( $xpropkey, $this->xprop[$xpropkey] )
+            if( $propix == $xpropno ) {
+                          return ( $inclParam ) ? array( $xpropkey, $this->xprop[$xpropkey] )
                                     : array( $xpropkey, $this->xprop[$xpropkey]['value'] );
-            else
-              $xpropno++;
+            } else {
+                          $xpropno++;
+            }
           }
           return FALSE; // not found ??
         }
@@ -455,8 +493,9 @@ 
  */
   function setProperty () {
     $numargs    = func_num_args();
-    if( 1 > $numargs )
-      return FALSE;
+    if( 1 > $numargs ) {
+          return FALSE;
+    }
     $arglist    = func_get_args();
     $arglist[0] = strtoupper( $arglist[0] );
     switch( $arglist[0] ) {
@@ -467,8 +506,12 @@ 
       case 'VERSION':
         return $this->setVersion( $arglist[1] );
       default:
-        if( !isset( $arglist[1] )) $arglist[1] = null;
-        if( !isset( $arglist[2] )) $arglist[2] = null;
+        if( !isset( $arglist[1] )) {
+            $arglist[1] = null;
+        }
+        if( !isset( $arglist[2] )) {
+            $arglist[2] = null;
+        }
         return $this->setXprop( $arglist[0], $arglist[1], $arglist[2] );
     }
     return FALSE;
@@ -491,7 +534,9 @@ 
         unset( $this->compix );
         $info = array();
         foreach( $this->components as $cix => $component ) {
-          if( empty( $component )) continue;
+          if( empty( $component )) {
+              continue;
+          }
           unset( $component->propix );
           $info[$cix]['ordno'] = $cix + 1;
           $info[$cix]['type']  = $component->objName;
@@ -506,8 +551,9 @@ 
         return $this->delimiter;
         break;
       case 'DIRECTORY':
-        if( empty( $this->directory ))
-          $this->directory = '.';
+        if( empty( $this->directory )) {
+                  $this->directory = '.';
+        }
         return $this->directory;
         break;
       case 'DIRFILE':
@@ -520,10 +566,13 @@ 
         break;
       case 'FILENAME':
         if( empty( $this->filename )) {
-          if( 'xcal' == $this->format )
-            $this->filename = date( 'YmdHis' ).'.xml'; // recommended xcs.. .
-          else
-            $this->filename = date( 'YmdHis' ).'.ics';
+          if( 'xcal' == $this->format ) {
+                      $this->filename = date( 'YmdHis' ).'.xml';
+          }
+          // recommended xcs.. .
+          else {
+                      $this->filename = date( 'YmdHis' ).'.ics';
+          }
         }
         return $this->filename;
         break;
@@ -531,8 +580,9 @@ 
         $size    = 0;
         if( empty( $this->url )) {
           $dirfile = $this->getConfig( 'dirfile' );
-          if( FALSE === ( $size = filesize( $dirfile )))
-            $size = 0;
+          if( FALSE === ( $size = filesize( $dirfile ))) {
+                      $size = 0;
+          }
           clearstatcache();
         }
         return $size;
@@ -552,10 +602,11 @@ 
         return $this->unique_id;
         break;
       case 'URL':
-        if( !empty( $this->url ))
-          return $this->url;
-        else
-          return FALSE;
+        if( !empty( $this->url )) {
+                  return $this->url;
+        } else {
+                  return FALSE;
+        }
         break;
     }
   }
@@ -583,17 +634,18 @@ 
       case 'DIRECTORY':
         $value   = trim( $value );
         $nl      = $this->getConfig('delimiter');
-        if( $nl == substr( $value, ( 0 - strlen( $nl ))))
-          $value = substr( $value, 0, ( strlen( $value ) - strlen( $nl )));
+        if( $nl == substr( $value, ( 0 - strlen( $nl )))) {
+                  $value = substr( $value, 0, ( strlen( $value ) - strlen( $nl )));
+        }
         if( is_dir( $value )) {
             /* local directory */
           clearstatcache();
           $this->directory = $value;
           $this->url       = null;
           return TRUE;
+        } else {
+                  return FALSE;
         }
-        else
-          return FALSE;
         break;
       case 'FILENAME':
         $value   = trim( $value );
@@ -609,17 +661,16 @@ 
             clearstatcache();
             $this->filename = $value;
             return TRUE;
+          } else {
+                      return FALSE;
           }
-          else
-            return FALSE;
-        }
-        elseif( FALSE !== touch( $dirfile )) {
+        } elseif( FALSE !== touch( $dirfile )) {
             /* new local file created */
           $this->filename = $value;
           return TRUE;
+        } else {
+                  return FALSE;
         }
-        else
-          return FALSE;
         break;
       case 'FORMAT':
         $value   = trim( $value );
@@ -627,8 +678,7 @@ 
           $this->format             = 'xcal';
           $this->attributeDelimiter = $this->nl;
           $this->valueInit          = null;
-        }
-        else {
+        } else {
           $this->format             = null;
           $this->attributeDelimiter = ';';
           $this->valueInit          = ':';
@@ -667,13 +717,16 @@ 
         return $this->setConfig( 'filename',  $parts['basename'] );
         break;
     }
-    if( !$res ) return FALSE;
+    if( !$res ) {
+        return FALSE;
+    }
     if( isset( $subcfg ) && !empty( $this->components )) {
       foreach( $subcfg as $cfgkey => $cfgvalue ) {
         foreach( $this->components as $cix => $component ) {
           $res = $component->setConfig( $cfgkey, $cfgvalue );
-          if( !$res )
-            break 2;
+          if( !$res ) {
+                      break 2;
+          }
           $this->components[$cix] = $component->copy(); // PHP4 compliant
         }
       }
@@ -708,27 +761,26 @@ 
     if ( ctype_digit( (string) $arg1 )) {
       $argType = 'INDEX';
       $index   = (int) $arg1 - 1;
-    }
-    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
+    } elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
       $argType = strtolower( $arg1 );
       $index   = ( !empty( $arg2 ) && ctype_digit( (string) $arg2 )) ? (( int ) $arg2 - 1 ) : 0;
     }
     $cix1dC = 0;
     foreach ( $this->components as $cix => $component) {
-      if( empty( $component )) continue;
+      if( empty( $component )) {
+          continue;
+      }
       unset( $component->propix );
       if(( 'INDEX' == $argType ) && ( $index == $cix )) {
         unset( $this->components[$cix] );
         return TRUE;
-      }
-      elseif( $argType == $component->objName ) {
+      } elseif( $argType == $component->objName ) {
         if( $index == $cix1dC ) {
           unset( $this->components[$cix] );
           return TRUE;
         }
         $cix1dC++;
-      }
-      elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
+      } elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
         unset( $this->components[$cix] );
         return TRUE;
       }
@@ -750,37 +802,39 @@ 
       $argType = 'INDEX';
       $index   = $this->compix['INDEX'] =
         ( isset( $this->compix['INDEX'] )) ? $this->compix['INDEX'] + 1 : 1;
-    }
-    elseif ( ctype_digit( (string) $arg1 )) {
+    } elseif ( ctype_digit( (string) $arg1 )) {
       $argType = 'INDEX';
       $index   = (int) $arg1;
       unset( $this->compix );
-    }
-    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
+    } elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
       unset( $this->compix['INDEX'] );
       $argType = strtolower( $arg1 );
-      if( !$arg2 )
-        $index = $this->compix[$argType] =
+      if( !$arg2 ) {
+              $index = $this->compix[$argType] =
         ( isset( $this->compix[$argType] )) ? $this->compix[$argType] + 1 : 1;
-      else
-        $index = (int) $arg2;
+      } else {
+              $index = (int) $arg2;
+      }
     }
     $index  -= 1;
     $ckeys =  array_keys( $this->components );
-    if( !empty( $index) && ( $index > end(  $ckeys )))
-      return FALSE;
+    if( !empty( $index) && ( $index > end(  $ckeys ))) {
+          return FALSE;
+    }
     $cix1gC = 0;
     foreach ( $this->components as $cix => $component) {
-      if( empty( $component )) continue;
+      if( empty( $component )) {
+          continue;
+      }
       unset( $component->propix );
-      if(( 'INDEX' == $argType ) && ( $index == $cix ))
-        return $component->copy();
-      elseif( $argType == $component->objName ) {
-         if( $index == $cix1gC )
-           return $component->copy();
+      if(( 'INDEX' == $argType ) && ( $index == $cix )) {
+              return $component->copy();
+      } elseif( $argType == $component->objName ) {
+         if( $index == $cix1gC ) {
+                    return $component->copy();
+         }
          $cix1gC++;
-      }
-      elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
+      } elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
         unset( $component->propix );
         return $component->copy();
       }
@@ -815,46 +869,68 @@ 
  */
   function selectComponents( $startY=FALSE, $startM=FALSE, $startD=FALSE, $endY=FALSE, $endM=FALSE, $endD=FALSE, $cType=FALSE, $flat=FALSE, $any=TRUE, $split=TRUE ) {
             /* check  if empty calendar */
-    if( 0 >= count( $this->components )) return FALSE;
+    if( 0 >= count( $this->components )) {
+        return FALSE;
+    }
             /* check default dates */
-    if( !$startY ) $startY = date( 'Y' );
-    if( !$startM ) $startM = date( 'm' );
-    if( !$startD ) $startD = date( 'd' );
+    if( !$startY ) {
+        $startY = date( 'Y' );
+    }
+    if( !$startM ) {
+        $startM = date( 'm' );
+    }
+    if( !$startD ) {
+        $startD = date( 'd' );
+    }
     $startDate = mktime( 0, 0, 0, $startM, $startD, $startY );
-    if( !$endY )   $endY   = $startY;
-    if( !$endM )   $endM   = $startM;
-    if( !$endD )   $endD   = $startD;
+    if( !$endY ) {
+        $endY   = $startY;
+    }
+    if( !$endM ) {
+        $endM   = $startM;
+    }
+    if( !$endD ) {
+        $endD   = $startD;
+    }
     $endDate   = mktime( 23, 59, 59, $endM, $endD, $endY );
             /* check component types */
     $validTypes = array('vevent', 'vtodo', 'vjournal', 'vfreebusy' );
     if( is_array( $cType )) {
       foreach( $cType as $cix => $theType ) {
         $cType[$cix] = $theType = strtolower( $theType );
-        if( !in_array( $theType, $validTypes ))
-          $cType[$cix] = 'vevent';
+        if( !in_array( $theType, $validTypes )) {
+                  $cType[$cix] = 'vevent';
+        }
       }
       $cType = array_unique( $cType );
-    }
-    elseif( !empty( $cType )) {
+    } elseif( !empty( $cType )) {
       $cType = strtolower( $cType );
-      if( !in_array( $cType, $validTypes ))
-        $cType = array( 'vevent' );
-      else
-        $cType = array( $cType );
-    }
-    else
-      $cType = $validTypes;
-    if( 0 >= count( $cType ))
-      $cType = $validTypes;
+      if( !in_array( $cType, $validTypes )) {
+              $cType = array( 'vevent' );
+      } else {
+              $cType = array( $cType );
+      }
+    } else {
+          $cType = $validTypes;
+    }
+    if( 0 >= count( $cType )) {
+          $cType = $validTypes;
+    }
             /* iterate components */
     $result = array();
     foreach ( $this->components as $cix => $component ) {
-      if( empty( $component )) continue;
+      if( empty( $component )) {
+          continue;
+      }
       unset( $component->propix, $start );
             /* deselect unvalid type components */
-      if( !in_array( $component->objName, $cType )) continue;
+      if( !in_array( $component->objName, $cType )) {
+          continue;
+      }
             /* deselect components without dtstart set */
-      if( FALSE === ( $start = $component->getProperty( 'dtstart' ))) continue;
+      if( FALSE === ( $start = $component->getProperty( 'dtstart' ))) {
+          continue;
+      }
       $dtendExist = $dueExist = $durationExist = $endAllDayEvent = FALSE;
       unset( $end, $startWdate, $endWdate, $rdurWsecs, $rdur, $exdatelist, $workstart, $workend ); // clean up
       $startWdate = $component->_date2timestamp( $start );
@@ -888,8 +964,9 @@ 
       }
       if( empty( $end )) {
         $end = $component->getProperty( 'duration', FALSE, FALSE, TRUE );// in dtend (array) format
-        if( !empty( $end ))
-          $durationExist = TRUE;
+        if( !empty( $end )) {
+                  $durationExist = TRUE;
+        }
    // if( !empty($end))  echo 'selectComp 4 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
       }
       if( empty( $end )) { // assume one day duration if missing end date
@@ -907,55 +984,75 @@ 
       $exdatelist = array();
       $workstart  = $component->_timestamp2date(( $startDate - $rdurWsecs ), 6);
       $workend    = $component->_timestamp2date(( $endDate + $rdurWsecs ), 6);
-      while( FALSE !== ( $exrule = $component->getProperty( 'exrule' )))    // check exrule
+      while( FALSE !== ( $exrule = $component->getProperty( 'exrule' ))) {
+          // check exrule
         $component->_recur2date( $exdatelist, $exrule, $start, $workstart, $workend );
+      }
       while( FALSE !== ( $exdate = $component->getProperty( 'exdate' ))) {  // check exdate
         foreach( $exdate as $theExdate ) {
           $exWdate = $component->_date2timestamp( $theExdate );
-          if((( $startDate - $rdurWsecs ) <= $exWdate ) && ( $endDate >= $exWdate ))
-            $exdatelist[$exWdate] = TRUE;
+          if((( $startDate - $rdurWsecs ) <= $exWdate ) && ( $endDate >= $exWdate )) {
+                      $exdatelist[$exWdate] = TRUE;
+          }
         }
       }
             /* if 'any' components, check repeating components, removing all excluding dates */
       if( TRUE === $any ) {
             /* make a list of optional repeating dates for component occurence, rrule, rdate */
         $recurlist = array();
-        while( FALSE !== ( $rrule = $component->getProperty( 'rrule' )))    // check rrule
+        while( FALSE !== ( $rrule = $component->getProperty( 'rrule' ))) {
+            // check rrule
           $component->_recur2date( $recurlist, $rrule, $start, $workstart, $workend );
-        foreach( $recurlist as $recurkey => $recurvalue ) // key=match date as timestamp
-          $recurlist[$recurkey] = $rdurWsecs; // add duration in seconds
+        }
+        foreach( $recurlist as $recurkey => $recurvalue ) {
+            // key=match date as timestamp
+          $recurlist[$recurkey] = $rdurWsecs;
+        }
+        // add duration in seconds
         while( FALSE !== ( $rdate = $component->getProperty( 'rdate' ))) {  // check rdate
           foreach( $rdate as $theRdate ) {
             if( is_array( $theRdate ) && ( 2 == count( $theRdate )) &&  // all days within PERIOD
                    array_key_exists( '0', $theRdate ) &&  array_key_exists( '1', $theRdate )) {
               $rstart = $component->_date2timestamp( $theRdate[0] );
-              if(( $rstart < ( $startDate - $rdurWsecs )) || ( $rstart > $endDate ))
-                continue;
-              if( isset( $theRdate[1]['year'] )) // date-date period
+              if(( $rstart < ( $startDate - $rdurWsecs )) || ( $rstart > $endDate )) {
+                              continue;
+              }
+              if( isset( $theRdate[1]['year'] )) {
+                  // date-date period
                 $rend = $component->_date2timestamp( $theRdate[1] );
-              else {                             // date-duration period
+              } else {                             // date-duration period
                 $rend = $component->duration2date( $theRdate[0], $theRdate[1] );
                 $rend = $component->_date2timestamp( $rend );
               }
-              if((( $startDate - $rdurWsecs ) <= $rstart ) && ( $endDate >= $rstart ))
-                $recurlist[$rstart] = ( $rstart - $rend ); // set start date + rdate duration in seconds
+              if((( $startDate - $rdurWsecs ) <= $rstart ) && ( $endDate >= $rstart )) {
+                              $recurlist[$rstart] = ( $rstart - $rend );
+              }
+              // set start date + rdate duration in seconds
             } // PERIOD end
             else { // single date
               $theRdate = $component->_date2timestamp( $theRdate );
-              if((( $startDate - $rdurWsecs ) <= $theRdate ) && ( $endDate >= $theRdate ))
-                $recurlist[$theRdate] = $rdurWsecs; // set start date + event duration in seconds
+              if((( $startDate - $rdurWsecs ) <= $theRdate ) && ( $endDate >= $theRdate )) {
+                              $recurlist[$theRdate] = $rdurWsecs;
+              }
+              // set start date + event duration in seconds
             }
           }
         }
         if( 0 < count( $recurlist )) {
           ksort( $recurlist );
           foreach( $recurlist as $recurkey => $durvalue ) {
-            if((( $startDate - $rdurWsecs ) > $recurkey ) || ( $endDate < $recurkey )) // not within period
+            if((( $startDate - $rdurWsecs ) > $recurkey ) || ( $endDate < $recurkey )) {
+                // not within period
               continue;
-            if( isset( $exdatelist[$recurkey] )) // check excluded dates
+            }
+            if( isset( $exdatelist[$recurkey] )) {
+                // check excluded dates
               continue;
-            if( $startWdate >= $recurkey ) // exclude component start date
+            }
+            if( $startWdate >= $recurkey ) {
+                // exclude component start date
               continue;
+            }
             $component2   = $component->copy();
             $rstart       = $component2->_timestamp2date( $recurkey, 6);
             $datevalue    = $rstart['month'].'/'.$rstart['day'].'/'.$rstart['year'];
@@ -965,16 +1062,16 @@ 
               $datevalue .= ( isset( $rstart['sec'] ))  ? ':'.$rstart['sec']  : ':00';
             }
             $datestring = date( $startDateFormat, strtotime( $datevalue ));
-            if( isset( $start['tz'] ))
-              $datestring .= ' '.$start['tz'];
+            if( isset( $start['tz'] )) {
+                          $datestring .= ' '.$start['tz'];
+            }
             $component2->setProperty( 'X-CURRENT-DTSTART', $datestring );
             $rend   = $component2->_timestamp2date(( $recurkey + $durvalue ), 6);
             if( $dtendExist || $dueExist ) {
               if( $endAllDayEvent ) {
                 $rend2 = mktime( 0, 0, 0, $rend['month'], ($rend['day'] + 1), $rend['year'] );
                 $datevalue  = date( 'm', $rend2 ).'/'.date( 'd', $rend2 ).'/'.date( 'Y', $rend2 );
-              }
-              else {
+              } else {
                 $datevalue  = $rend['month'].'/'.$rend['day'].'/'.$rend['year'];
                 if( isset( $end['hour'] ) || isset( $end['min'] ) || isset( $end['sec'] )) {
                   $datevalue .= ( isset( $rend['hour'] )) ? ' '.$rend['hour'] : ' 00';
@@ -983,30 +1080,37 @@ 
                 }
               }
               $datestring = date( $endDateFormat, strtotime( $datevalue ));
-              if( isset( $end['tz'] ))
-                $datestring .= ' '.$end['tz'];
-              if( $dtendExist )
-                $component2->setProperty( 'X-CURRENT-DTEND', $datestring );
-              elseif( $dueExist )
-                $component2->setProperty( 'X-CURRENT-DUE', $datestring );
+              if( isset( $end['tz'] )) {
+                              $datestring .= ' '.$end['tz'];
+              }
+              if( $dtendExist ) {
+                              $component2->setProperty( 'X-CURRENT-DTEND', $datestring );
+              } elseif( $dueExist ) {
+                              $component2->setProperty( 'X-CURRENT-DUE', $datestring );
+              }
             }
             $rend   = $component2->_date2timestamp( $rend );
             $rstart = $recurkey;
             /* add repeating components within valid dates to output array, only start date */
-            if( $flat )
-              $result[] = $component2->copy(); // copy to output
+            if( $flat ) {
+                          $result[] = $component2->copy();
+            }
+            // copy to output
             elseif( $split ) {
-              if( $rend > $endDate )
-                $rend = $endDate;
+              if( $rend > $endDate ) {
+                              $rend = $endDate;
+              }
               while( $rstart <= $rend ) { // iterate
                 $wd = getdate( $rstart );
                 if(( $rstart > $startDate ) &&      // date after dtstart
-                    !isset( $exdatelist[$rstart] )) // check exclude date
-                  $result[$wd['year']][$wd['mon']][$wd['mday']][] = $component2->copy(); // copy to output
+                    !isset( $exdatelist[$rstart] )) {
+                    // check exclude date
+                  $result[$wd['year']][$wd['mon']][$wd['mday']][] = $component2->copy();
+                }
+                // copy to output
                 $rstart += ( 24*60*60 ); // step one day
               }
-            }
-            elseif(( $rstart >= $startDate ) &&     // date within period
+            } elseif(( $rstart >= $startDate ) &&     // date within period
                   !isset( $exdatelist[$rstart] )) { // check exclude date
               $wd = getdate( $rstart );
               $result[$wd['year']][$wd['mon']][$wd['mday']][] = $component2->copy(); // copy to output
@@ -1014,19 +1118,29 @@ 
           }
         }
             /* deselect components with startdate/enddate not within period */
-        if(( $endWdate < $startDate ) || ( $startWdate > $endDate )) continue;
+        if(( $endWdate < $startDate ) || ( $startWdate > $endDate )) {
+            continue;
+        }
       }
             /* deselect components with startdate not within period */
-      elseif(( $startWdate < $startDate ) || ( $startWdate > $endDate )) continue;
+      elseif(( $startWdate < $startDate ) || ( $startWdate > $endDate )) {
+          continue;
+      }
             /* add selected components within valid dates to output array */
-      if( $flat )
-        $result[] = $component->copy(); // copy to output;
+      if( $flat ) {
+              $result[] = $component->copy();
+      }
+      // copy to output;
       elseif( $split ) {
-        if( $endWdate > $endDate )
-          $endWdate = $endDate;     // use period end date
+        if( $endWdate > $endDate ) {
+                  $endWdate = $endDate;
+        }
+        // use period end date
         if( !isset( $exdatelist[$startWdate] ))  { // check excluded dates
-          if( $startWdate < $startDate )
-            $startWdate = $startDate; // use period start date
+          if( $startWdate < $startDate ) {
+                      $startWdate = $startDate;
+          }
+          // use period start date
           while( $startWdate <= $endWdate ) { // iterate
             $wd = getdate( $startWdate );
             $result[$wd['year']][$wd['mon']][$wd['mday']][] = $component->copy(); // copy to output
@@ -1040,8 +1154,9 @@ 
         $result[$wd['year']][$wd['mon']][$wd['mday']][] = $component->copy(); // copy to output
       }
     }
-    if( 0 >= count( $result )) return FALSE;
-    elseif( !$flat ) {
+    if( 0 >= count( $result )) {
+        return FALSE;
+    } elseif( !$flat ) {
       foreach( $result as $y => $yeararr ) {
         foreach( $yeararr as $m => $montharr ) {
           ksort( $result[$y][$m] );
@@ -1063,8 +1178,9 @@ 
  * @return void
  */
   function setComponent( $component, $arg1=FALSE, $arg2=FALSE  ) {
-    if( '' >= $component->getConfig( 'language'))
-      $component->setConfig( 'language',  $this->getConfig( 'language' ));
+    if( '' >= $component->getConfig( 'language')) {
+          $component->setConfig( 'language',  $this->getConfig( 'language' ));
+    }
     $component->setConfig( 'allowEmpty',  $this->getConfig( 'allowEmpty' ));
     $component->setConfig( 'nl',          $this->getConfig( 'nl' ));
     $component->setConfig( 'unique_id',   $this->getConfig( 'unique_id' ));
@@ -1083,27 +1199,26 @@ 
     if ( ctype_digit( (string) $arg1 )) {
       $argType = 'INDEX';
       $index   = (int) $arg1 - 1;
-    }
-    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
+    } elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
       $argType = strtolower( $arg1 );
       $index = ( ctype_digit( (string) $arg2 )) ? ((int) $arg2) - 1 : 0;
     }
     $cix1sC = 0;
     foreach ( $this->components as $cix => $component2) {
-      if( empty( $component2 )) continue;
+      if( empty( $component2 )) {
+          continue;
+      }
       unset( $component2->propix );
       if(( 'INDEX' == $argType ) && ( $index == $cix )) {
         $this->components[$cix] = $component->copy();
         return TRUE;
-      }
-      elseif( $argType == $component2->objName ) {
+      } elseif( $argType == $component2->objName ) {
         if( $index == $cix1sC ) {
           $this->components[$cix] = $component->copy();
           return TRUE;
         }
         $cix1sC++;
-      }
-      elseif( !$argType && ( $arg1 == $component2->getProperty( 'uid' ))) {
+      } elseif( !$argType && ( $arg1 == $component2->getProperty( 'uid' ))) {
         $this->components[$cix] = $component->copy();
         return TRUE;
       }
@@ -1130,73 +1245,124 @@ 
     }
   }
   function _cmpfcn( $a, $b ) {
-    if( empty( $a ))                                   return -1;
-    if( empty( $b ))                                   return  1;
-    if(  'vtimezone' == $a->objName)                   return -1;
-    if(  'vtimezone' == $b->objName)                   return  1;
+    if( empty( $a )) {
+        return -1;
+    }
+    if( empty( $b )) {
+        return  1;
+    }
+    if(  'vtimezone' == $a->objName) {
+        return -1;
+    }
+    if(  'vtimezone' == $b->objName) {
+        return  1;
+    }
     $astart = ( isset( $a->xprop['X-CURRENT-DTSTART']['value'] )) ? $a->_date_time_string( $a->xprop['X-CURRENT-DTSTART']['value'] ) : null;
-    if( empty( $astart ) && isset( $a->dtstart['value'] ))
-      $astart = & $a->dtstart['value'];
+    if( empty( $astart ) && isset( $a->dtstart['value'] )) {
+          $astart = & $a->dtstart['value'];
+    }
     $bstart = ( isset( $b->xprop['X-CURRENT-DTSTART']['value'] )) ? $b->_date_time_string( $b->xprop['X-CURRENT-DTSTART']['value'] ) : null;
-    if( empty( $bstart ) && isset( $b->dtstart['value'] ))
-      $bstart = & $b->dtstart['value'];
-    if(     empty( $astart ))                          return -1;
-    elseif( empty( $bstart ))                          return  1;
+    if( empty( $bstart ) && isset( $b->dtstart['value'] )) {
+          $bstart = & $b->dtstart['value'];
+    }
+    if(     empty( $astart )) {
+        return -1;
+    } elseif( empty( $bstart )) {
+        return  1;
+    }
     foreach( $this->_sortkeys as $key ) {
-      if    ( empty( $astart[$key] ))                  return -1;
-      elseif( empty( $bstart[$key] ))                  return  1;
-      if    (        $astart[$key] == $bstart[$key])   continue;
-      if    (( (int) $astart[$key] ) < ((int) $bstart[$key] ))
-                                                       return -1;
-      elseif(( (int) $astart[$key] ) > ((int) $bstart[$key] ))
-                                                       return  1;
+      if    ( empty( $astart[$key] )) {
+          return -1;
+      } elseif( empty( $bstart[$key] )) {
+          return  1;
+      }
+      if    (        $astart[$key] == $bstart[$key]) {
+          continue;
+      }
+      if    (( (int) $astart[$key] ) < ((int) $bstart[$key] )) {
+                                                             return -1;
+      } elseif(( (int) $astart[$key] ) > ((int) $bstart[$key] )) {
+                                                             return  1;
+      }
     }
     $c   = ( isset( $a->xprop['X-CURRENT-DTEND']['value'] )) ? $a->_date_time_string( $a->xprop['X-CURRENT-DTEND']['value'] ) : null;
-    if(     empty( $c ) && !empty( $a->dtend['value'] ))
-      $c = & $a->dtend['value'];
-    if(     empty( $c ) && isset( $a->xprop['X-CURRENT-DUE']['value'] ))
-      $c = $a->_date_time_string( $a->xprop['X-CURRENT-DUE']['value'] );
-    if(     empty( $c ) && !empty( $a->due['value'] ))
-      $c = & $a->due['value'];
-    if(     empty( $c ) && !empty( $a->duration['value'] ))
-      $c = $a->duration2date();
+    if(     empty( $c ) && !empty( $a->dtend['value'] )) {
+          $c = & $a->dtend['value'];
+    }
+    if(     empty( $c ) && isset( $a->xprop['X-CURRENT-DUE']['value'] )) {
+          $c = $a->_date_time_string( $a->xprop['X-CURRENT-DUE']['value'] );
+    }
+    if(     empty( $c ) && !empty( $a->due['value'] )) {
+          $c = & $a->due['value'];
+    }
+    if(     empty( $c ) && !empty( $a->duration['value'] )) {
+          $c = $a->duration2date();
+    }
     $d   = ( isset( $b->xprop['X-CURRENT-DTEND']['value'] )) ? $b->_date_time_string( $b->xprop['X-CURRENT-DTEND']['value'] ) : null;
-    if(     empty( $d ) && !empty( $b->dtend['value'] ))
-      $d = & $b->dtend['value'];
-    if(     empty( $d ) && isset( $b->xprop['X-CURRENT-DUE']['value'] ))
-      $d = $b->_date_time_string( $b->xprop['X-CURRENT-DUE']['value'] );
-    if(     empty( $d ) && !empty( $b->due['value'] ))
-      $d = & $b->due['value'];
-    if(     empty( $d ) && !empty( $b->duration['value'] ))
-      $d = $b->duration2date();
-    if(     empty( $c ))                               return -1;
-    elseif( empty( $d ))                               return  1;
+    if(     empty( $d ) && !empty( $b->dtend['value'] )) {
+          $d = & $b->dtend['value'];
+    }
+    if(     empty( $d ) && isset( $b->xprop['X-CURRENT-DUE']['value'] )) {
+          $d = $b->_date_time_string( $b->xprop['X-CURRENT-DUE']['value'] );
+    }
+    if(     empty( $d ) && !empty( $b->due['value'] )) {
+          $d = & $b->due['value'];
+    }
+    if(     empty( $d ) && !empty( $b->duration['value'] )) {
+          $d = $b->duration2date();
+    }
+    if(     empty( $c )) {
+        return -1;
+    } elseif( empty( $d )) {
+        return  1;
+    }
     foreach( $this->_sortkeys as $key ) {
-      if    ( !isset( $c[$key] ))                      return -1;
-      elseif( !isset( $d[$key] ))                      return  1;
-      if    (         $c[$key] == $d[$key] )           continue;
-      if    ((  (int) $c[$key] ) < ((int) $d[$key]))   return -1;
-      elseif((  (int) $c[$key] ) > ((int) $d[$key]))   return  1;
-    }
-    if( isset( $a->created['value'] ))
-     $e = & $a->created['value'];
-    else
-     $e = & $a->dtstamp['value'];
-    if( isset( $b->created['value'] ))
-      $f = & $b->created['value'];
-    else
-      $f = & $b->dtstamp['value'];
+      if    ( !isset( $c[$key] )) {
+          return -1;
+      } elseif( !isset( $d[$key] )) {
+          return  1;
+      }
+      if    (         $c[$key] == $d[$key] ) {
+          continue;
+      }
+      if    ((  (int) $c[$key] ) < ((int) $d[$key])) {
+          return -1;
+      } elseif((  (int) $c[$key] ) > ((int) $d[$key])) {
+          return  1;
+      }
+    }
+    if( isset( $a->created['value'] )) {
+         $e = & $a->created['value'];
+    } else {
+         $e = & $a->dtstamp['value'];
+    }
+    if( isset( $b->created['value'] )) {
+          $f = & $b->created['value'];
+    } else {
+          $f = & $b->dtstamp['value'];
+    }
     foreach( $this->_sortkeys as $key ) {
-      if(       !isset( $e[$key] ))                    return -1;
-      elseif(   !isset( $f[$key] ))                    return  1;
-      if    (           $e[$key] == $f[$key] )         continue;
-      if    ((    (int) $e[$key] ) < ((int) $f[$key])) return -1;
-      elseif((    (int) $e[$key] ) > ((int) $f[$key])) return  1;
+      if(       !isset( $e[$key] )) {
+          return -1;
+      } elseif(   !isset( $f[$key] )) {
+          return  1;
+      }
+      if    (           $e[$key] == $f[$key] ) {
+          continue;
+      }
+      if    ((    (int) $e[$key] ) < ((int) $f[$key])) {
+          return -1;
+      } elseif((    (int) $e[$key] ) > ((int) $f[$key])) {
+          return  1;
+      }
     }
     if    ((            $a->uid['value'] ) <
-           (            $b->uid['value'] ))            return -1;
-    elseif((            $a->uid['value'] ) >
-           (            $b->uid['value'] ))            return  1;
+           (            $b->uid['value'] )) {
+        return -1;
+    } elseif((            $a->uid['value'] ) >
+           (            $b->uid['value'] )) {
+        return  1;
+    }
     return 0;
   }
 /**
@@ -1211,42 +1377,57 @@ 
   function parse( $filename=FALSE ) {
     if( !$filename ) {
             /* directory/filename previous set via setConfig directory+filename / url */
-      if( FALSE === ( $filename = $this->getConfig( 'url' )))
-        $filename = $this->getConfig( 'dirfile' );
-    }
-    elseif(( 'http://'   == strtolower( substr( $filename, 0, 7 ))) ||
+      if( FALSE === ( $filename = $this->getConfig( 'url' ))) {
+              $filename = $this->getConfig( 'dirfile' );
+      }
+    } elseif(( 'http://'   == strtolower( substr( $filename, 0, 7 ))) ||
            ( 'webcal://' == strtolower( substr( $filename, 0, 9 ))))  {
             /* remote file - URL */
       $this->setConfig( 'URL', $filename );
-      if( !$filename = $this->getConfig( 'url' ))
-        return FALSE;                 /* err 2 */
-    }
-    else {
+      if( !$filename = $this->getConfig( 'url' )) {
+              return FALSE;
+      }
+      /* err 2 */
+    } else {
             /* local directory/filename */
       $parts = pathinfo( $filename );
       if( !empty( $parts['dirname'] ) && ( '.' != $parts['dirname'] )) {
-        if( !$this->setConfig( 'directory', $parts['dirname'] ))
-          return FALSE;               /* err 3 */
+        if( !$this->setConfig( 'directory', $parts['dirname'] )) {
+                  return FALSE;
+        }
+        /* err 3 */
+      }
+      if( !$this->setConfig( 'filename', $parts['basename'] )) {
+              return FALSE;
       }
-      if( !$this->setConfig( 'filename', $parts['basename'] ))
-        return FALSE;                 /* err 4 */
+      /* err 4 */
     }
     if( 'http://' != substr( $filename, 0, 7 )) {
             /* local file error tests */
-      if( !is_file( $filename ))      /* err 5 */
+      if( !is_file( $filename )) {
+          /* err 5 */
         return FALSE;
-      if( !is_readable( $filename ))
-        return FALSE;                 /* err 6 */
-      if( !filesize( $filename ))
-        return FALSE;                 /* err 7 */
+      }
+      if( !is_readable( $filename )) {
+              return FALSE;
+      }
+      /* err 6 */
+      if( !filesize( $filename )) {
+              return FALSE;
+      }
+      /* err 7 */
       clearstatcache();
     }
             /* READ FILE */
-    if( FALSE === ( $rows = file( $filename )))
-      return FALSE;                   /* err 1 */
+    if( FALSE === ( $rows = file( $filename ))) {
+          return FALSE;
+    }
+    /* err 1 */
             /* identify BEGIN:VCALENDAR, MUST be first row */
-    if( 'BEGIN:VCALENDAR' != strtoupper( trim( $rows[0] )))
-      return FALSE;                   /* err 8 */
+    if( 'BEGIN:VCALENDAR' != strtoupper( trim( $rows[0] ))) {
+          return FALSE;
+    }
+    /* err 8 */
             /* remove empty trailing lines */
     while( '' == trim( $rows[count( $rows ) - 1] )) {
       unset( $rows[count( $rows ) - 1] );
@@ -1256,34 +1437,37 @@ 
     if( 'END:VCALENDAR'   != strtoupper( trim( $rows[count( $rows ) - 1] ))) {
       return FALSE;                   /* err 9 */
     }
-    if( 3 > count( $rows ))
-      return FALSE;                   /* err 10 */
+    if( 3 > count( $rows )) {
+          return FALSE;
+    }
+    /* err 10 */
     $comp    = $subcomp = null;
     $actcomp = & $this;
     $nl      = $this->getConfig( 'nl' );
     $calsync = 0;
             /* identify components and update unparsed data within component */
     foreach( $rows as $line ) {
-      if( '' == trim( $line ))
-        continue;
-      if( $nl == substr( $line, 0 - strlen( $nl )))
-        $line = substr( $line, 0, ( strlen( $line ) - strlen( $nl ))).'\n';
+      if( '' == trim( $line )) {
+              continue;
+      }
+      if( $nl == substr( $line, 0 - strlen( $nl ))) {
+              $line = substr( $line, 0, ( strlen( $line ) - strlen( $nl ))).'\n';
+      }
       if( 'BEGIN:VCALENDAR' == strtoupper( substr( $line, 0, 15 ))) {
         $calsync++;
         continue;
-      }
-      elseif( 'END:VCALENDAR' == strtoupper( substr( $line, 0, 13 ))) {
+      } elseif( 'END:VCALENDAR' == strtoupper( substr( $line, 0, 13 ))) {
         $calsync--;
         continue;
+      } elseif( 1 != $calsync ) {
+              return FALSE;
       }
-      elseif( 1 != $calsync )
-        return FALSE;                 /* err 20 */
+      /* err 20 */
       if( 'END:' == strtoupper( substr( $line, 0, 4 ))) {
         if( null != $subcomp ) {
           $comp->setComponent( $subcomp );
           $subcomp = null;
-        }
-        else {
+        } else {
           $this->setComponent( $comp );
           $comp = null;
         }
@@ -1294,17 +1478,18 @@ 
         $line = str_replace( '\n', '', $line );
         $compname = trim (strtoupper( substr( $line, 6 )));
         if( null != $comp ) {
-          if( 'VALARM' == $compname )
-            $subcomp = new valarm();
-          elseif( 'STANDARD' == $compname )
-            $subcomp = new vtimezone( 'STANDARD' );
-          elseif( 'DAYLIGHT' == $compname )
-            $subcomp = new vtimezone( 'DAYLIGHT' );
-          else
-            return FALSE; /* err 6 */
+          if( 'VALARM' == $compname ) {
+                      $subcomp = new valarm();
+          } elseif( 'STANDARD' == $compname ) {
+                      $subcomp = new vtimezone( 'STANDARD' );
+          } elseif( 'DAYLIGHT' == $compname ) {
+                      $subcomp = new vtimezone( 'DAYLIGHT' );
+          } else {
+                      return FALSE;
+          }
+          /* err 6 */
           $actcomp = & $subcomp;
-        }
-        else {
+        } else {
           switch( $compname ) {
             case 'VALARM':
               $comp = new valarm();
@@ -1353,8 +1538,7 @@ 
           $newProp = FALSE;
           $lastix++;
           $proprows[$lastix]  = $line;
-        }
-        else {
+        } else {
             /* remove line breaks */
           if(( '\n' == substr( $proprows[$lastix], -2 )) &&
              (  ' ' == substr( $line, 0, 1 ))) {
@@ -1366,19 +1550,22 @@ 
       }
       $toolbox = new calendarComponent();
       foreach( $proprows as $line ) {
-        if( '\n' == substr( $line, -2 ))
-          $line = substr( $line, 0, strlen( $line ) - 2 );
+        if( '\n' == substr( $line, -2 )) {
+                  $line = substr( $line, 0, strlen( $line ) - 2 );
+        }
             /* get propname */
         $cix = $propname = null;
         for( $cix=0; $cix < strlen( $line ); $cix++ ) {
-          if( in_array( $line{$cix}, array( ':', ';' )))
-            break;
-          else
-            $propname .= $line{$cix};
+          if( in_array( $line{$cix}, array( ':', ';' ))) {
+                      break;
+          } else {
+                      $propname .= $line{$cix};
+          }
         }
             /* ignore version/prodid properties */
-        if( in_array( strtoupper( $propname ), array( 'VERSION', 'PRODID' )))
-          continue;
+        if( in_array( strtoupper( $propname ), array( 'VERSION', 'PRODID' ))) {
+                  continue;
+        }
         $line = substr( $line, $cix);
             /* separate attributes from value */
         $attr   = array();
@@ -1403,20 +1590,22 @@ 
               break;
             }
           }
-          if( ';' == $line{$cix} )
-            $attr[++$attrix] = null;
-          else
-            $attr[$attrix] .= $line{$cix};
+          if( ';' == $line{$cix} ) {
+                      $attr[++$attrix] = null;
+          } else {
+                      $attr[$attrix] .= $line{$cix};
+          }
         }
 
             /* make attributes in array format */
         $propattr = array();
         foreach( $attr as $attribute ) {
           $attrsplit = explode( '=', $attribute, 2 );
-          if( 1 < count( $attrsplit ))
-            $propattr[$attrsplit[0]] = $attrsplit[1];
-          else
-            $propattr[] = $attribute;
+          if( 1 < count( $attrsplit )) {
+                      $propattr[$attrsplit[0]] = $attrsplit[1];
+          } else {
+                      $propattr[] = $attribute;
+          }
         }
             /* update Property */
         if( FALSE !== strpos( $line, ',' )) {
@@ -1430,13 +1619,14 @@ 
             }
           }
           if( 1 < count( $content )) {
-            foreach( $content as $cix => $contentPart )
-              $content[$cix] = $toolbox->_strunrep( $contentPart );
+            foreach( $content as $cix => $contentPart ) {
+                          $content[$cix] = $toolbox->_strunrep( $contentPart );
+            }
             $this->setProperty( $propname, $content, $propattr );
             continue;
+          } else {
+                      $line = reset( $content );
           }
-          else
-            $line = reset( $content );
           $line = $toolbox->_strunrep( $line );
         }
         $this->setProperty( $propname, trim( $line ), $propattr );
@@ -1445,12 +1635,14 @@ 
             /* parse Components */
     if( is_array( $this->components ) && ( 0 < count( $this->components ))) {
       for( $six = 0; $six < count( $this->components ); $six++ ) {
-        if( !empty( $this->components[$six] ))
-          $this->components[$six]->parse();
+        if( !empty( $this->components[$six] )) {
+                  $this->components[$six]->parse();
+        }
       }
+    } else {
+          return FALSE;
     }
-    else
-      return FALSE;                   /* err 91 or something.. . */
+    /* err 91 or something.. . */
     return TRUE;
   }
 /*********************************************************************************/
@@ -1482,8 +1674,9 @@ 
     switch( $this->format ) {
       case 'xcal':
         $nlstrlen = strlen( $this->nl );
-        if( $this->nl == substr( $calendarStart, ( 0 - $nlstrlen )))
-          $calendarStart = substr( $calendarStart, 0, ( strlen( $calendarStart ) - $nlstrlen ));
+        if( $this->nl == substr( $calendarStart, ( 0 - $nlstrlen ))) {
+                  $calendarStart = substr( $calendarStart, 0, ( strlen( $calendarStart ) - $nlstrlen ));
+        }
         $calendarStart .= '>'.$this->nl;
         break;
       default:
@@ -1491,9 +1684,12 @@ 
     }
     $calendar .= $this->createXprop();
     foreach( $this->components as $component ) {
-      if( empty( $component )) continue;
-      if( '' >= $component->getConfig( 'language'))
-        $component->setConfig( 'language',  $this->getConfig( 'language' ));
+      if( empty( $component )) {
+          continue;
+      }
+      if( '' >= $component->getConfig( 'language')) {
+              $component->setConfig( 'language',  $this->getConfig( 'language' ));
+      }
       $component->setConfig( 'allowEmpty',  $this->getConfig( 'allowEmpty' ));
       $component->setConfig( 'nl',          $this->getConfig( 'nl' ));
       $component->setConfig( 'unique_id',   $this->getConfig( 'unique_id' ));
@@ -1506,8 +1702,10 @@ 
       foreach( $this->xcaldecl as $declix => $declPart ) {
         if(( 0 < count( $old_xcaldecl)) &&
            ( in_array( $declPart['uri'],      $old_xcaldecl['uri'] )) &&
-           ( in_array( $declPart['external'], $old_xcaldecl['external'] )))
-          continue; // no duplicate uri and ext. references
+           ( in_array( $declPart['external'], $old_xcaldecl['external'] ))) {
+                  continue;
+        }
+        // no duplicate uri and ext. references
         $calendarxCaldecl .= '<!';
         foreach( $declPart as $declKey => $declValue ) {
           switch( $declKey ) {                    // index
@@ -1560,10 +1758,11 @@ 
     $filesize = strlen( $output );
 //    if( headers_sent( $filename, $linenum ))
 //      die( "Headers already sent in $filename on line $linenum\n" );
-    if( 'xcal' == $this->format )
-      header( 'Content-Type: application/calendar+xml; charset=utf-8' );
-    else
-      header( 'Content-Type: text/calendar; charset=utf-8' );
+    if( 'xcal' == $this->format ) {
+          header( 'Content-Type: application/calendar+xml; charset=utf-8' );
+    } else {
+          header( 'Content-Type: text/calendar; charset=utf-8' );
+    }
     header( 'Content-Length: '.$filesize );
     header( 'Content-Disposition: attachment; filename="'.$filename.'"' );
     header( 'Cache-Control: max-age=10' );
@@ -1581,23 +1780,28 @@ 
  * @return bool
  */
   function saveCalendar( $directory=FALSE, $filename=FALSE, $delimiter=FALSE ) {
-    if( $directory )
-      $this->setConfig( 'directory', $directory );
-    if( $filename )
-      $this->setConfig( 'filename',  $filename );
-    if( $delimiter && ($delimiter != DIRECTORY_SEPARATOR ))
-      $this->setConfig( 'delimiter', $delimiter );
-    if( FALSE === ( $dirfile = $this->getConfig( 'url' )))
-      $dirfile = $this->getConfig( 'dirfile' );
+    if( $directory ) {
+          $this->setConfig( 'directory', $directory );
+    }
+    if( $filename ) {
+          $this->setConfig( 'filename',  $filename );
+    }
+    if( $delimiter && ($delimiter != DIRECTORY_SEPARATOR )) {
+          $this->setConfig( 'delimiter', $delimiter );
+    }
+    if( FALSE === ( $dirfile = $this->getConfig( 'url' ))) {
+          $dirfile = $this->getConfig( 'dirfile' );
+    }
     $iCalFile = @fopen( $dirfile, 'w' );
     if( $iCalFile ) {
-      if( FALSE === fwrite( $iCalFile, $this->createCalendar() ))
-        return FALSE;
+      if( FALSE === fwrite( $iCalFile, $this->createCalendar() )) {
+              return FALSE;
+      }
       fclose( $iCalFile );
       return TRUE;
+    } else {
+          return FALSE;
     }
-    else
-      return FALSE;
   }
 /**
  * if recent version of calendar file exists (default one hour), an HTTP redirect header is sent
@@ -1616,15 +1820,19 @@ 
       $timeout   = (int) $directory;
       $directory = FALSE;
     }
-    if( $directory )
-      $this->setConfig( 'directory', $directory );
-    if( $filename )
-      $this->setConfig( 'filename',  $filename );
-    if( $delimiter && ( $delimiter != DIRECTORY_SEPARATOR ))
-      $this->setConfig( 'delimiter', $delimiter );
+    if( $directory ) {
+          $this->setConfig( 'directory', $directory );
+    }
+    if( $filename ) {
+          $this->setConfig( 'filename',  $filename );
+    }
+    if( $delimiter && ( $delimiter != DIRECTORY_SEPARATOR )) {
+          $this->setConfig( 'delimiter', $delimiter );
+    }
     $filesize    = $this->getConfig( 'filesize' );
-    if( 0 >= $filesize )
-      return FALSE;
+    if( 0 >= $filesize ) {
+          return FALSE;
+    }
     $dirfile     = $this->getConfig( 'dirfile' );
     if( time() - filemtime( $dirfile ) < $timeout) {
       clearstatcache();
@@ -1632,10 +1840,11 @@ 
       $filename  = $this->getConfig( 'filename' );
 //    if( headers_sent( $filename, $linenum ))
 //      die( "Headers already sent in $filename on line $linenum\n" );
-      if( 'xcal' == $this->format )
-        header( 'Content-Type: application/calendar+xml; charset=utf-8' );
-      else
-        header( 'Content-Type: text/calendar; charset=utf-8' );
+      if( 'xcal' == $this->format ) {
+              header( 'Content-Type: application/calendar+xml; charset=utf-8' );
+      } else {
+              header( 'Content-Type: text/calendar; charset=utf-8' );
+      }
       header( 'Content-Length: '.$filesize );
       header( 'Content-Disposition: attachment; filename="'.$filename.'"' );
       header( 'Cache-Control: max-age=10' );
@@ -1645,9 +1854,9 @@ 
         fclose( $fp );
       }
       die();
+    } else {
+          return FALSE;
     }
-    else
-      return FALSE;
   }
 }
 /*********************************************************************************/
@@ -1718,9 +1927,12 @@ 
  * @return string
  */
   function createAction() {
-    if( empty( $this->action )) return FALSE;
-    if( empty( $this->action['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'ACTION' ) : FALSE;
+    if( empty( $this->action )) {
+        return FALSE;
+    }
+    if( empty( $this->action['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'ACTION' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->action['params'] );
     return $this->_createElement( 'ACTION', $attributes, $this->action['value'] );
   }
@@ -1734,7 +1946,11 @@ 
  * @return bool
  */
   function setAction( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->action = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -1750,14 +1966,17 @@ 
  * @return string
  */
   function createAttach() {
-    if( empty( $this->attach )) return FALSE;
+    if( empty( $this->attach )) {
+        return FALSE;
+    }
     $output       = null;
     foreach( $this->attach as $attachPart ) {
       if(! empty( $attachPart['value'] )) {
         $attributes = $this->_createParams( $attachPart['params'] );
         $output    .= $this->_createElement( 'ATTACH', $attributes, $attachPart['value'] );
+      } elseif( $this->getConfig( 'allowEmpty' )) {
+          $output .= $this->_createElement( 'ATTACH' );
       }
-      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'ATTACH' );
     }
     return $output;
   }
@@ -1772,7 +1991,11 @@ 
  * @return bool
  */
   function setAttach( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->_setMval( $this->attach, $value, $params, FALSE, $index );
     return TRUE;
   }
@@ -1788,19 +2011,22 @@ 
  * @return string
  */
   function createAttendee() {
-    if( empty( $this->attendee )) return FALSE;
+    if( empty( $this->attendee )) {
+        return FALSE;
+    }
     $output = null;
     foreach( $this->attendee as $attendeePart ) {                      // start foreach 1
       if( empty( $attendeePart['value'] )) {
-        if( $this->getConfig( 'allowEmpty' ))
-          $output .= $this->_createElement( 'ATTENDEE' );
+        if( $this->getConfig( 'allowEmpty' )) {
+                  $output .= $this->_createElement( 'ATTENDEE' );
+        }
         continue;
       }
       $attendee1 = $attendee2 = $attendeeLANG = $attendeeCN = null;
       foreach( $attendeePart as $paramlabel => $paramvalue ) {         // start foreach 2
-        if( 'value' == $paramlabel )
-          $attendee2  .= 'MAILTO:'.$paramvalue;
-        elseif(( 'params' == $paramlabel ) && ( is_array( $paramvalue ))) { // start elseif
+        if( 'value' == $paramlabel ) {
+                  $attendee2  .= 'MAILTO:'.$paramvalue;
+        } elseif(( 'params' == $paramlabel ) && ( is_array( $paramvalue ))) { // start elseif
           foreach( $paramvalue as $optparamlabel => $optparamvalue ) { // start foreach 3
             $attendee11 = $attendee12 = null;
             if( is_int( $optparamlabel )) {
@@ -1860,7 +2086,11 @@ 
  * @return bool
  */
   function setAttendee( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $value = str_replace ( 'MAILTO:', '', $value );
     $value = str_replace ( 'mailto:', '', $value );
     $params2 = array();
@@ -1876,16 +2106,17 @@ 
               foreach( $optparamvalue as $part ) {
                 $part = str_replace( 'MAILTO:', '', $part );
                 $part = str_replace( 'mailto:', '', $part );
-                if(( '"' == $part{0} ) && ( '"' == $part{strlen($part)-1} ))
-                  $part = substr( $part, 1, ( strlen($part)-2 ));
+                if(( '"' == $part{0} ) && ( '"' == $part{strlen($part)-1} )) {
+                                  $part = substr( $part, 1, ( strlen($part)-2 ));
+                }
                 $optarrays[$optparamlabel][] = $part;
               }
-            }
-            else {
+            } else {
               $part = str_replace( 'MAILTO:', '', $optparamvalue );
               $part = str_replace( 'mailto:', '', $part );
-              if(( '"' == $part{0} ) && ( '"' == $part{strlen($part)-1} ))
-                $part = substr( $part, 1, ( strlen($part)-2 ));
+              if(( '"' == $part{0} ) && ( '"' == $part{strlen($part)-1} )) {
+                              $part = substr( $part, 1, ( strlen($part)-2 ));
+              }
               $optarrays[$optparamlabel][] = $part;
             }
             break;
@@ -1895,14 +2126,16 @@ 
               $optparamvalue = str_replace( 'mailto:', '', $optparamvalue );
             }
             if(( '"' == substr( $optparamvalue, 0, 1 )) &&
-               ( '"' == substr( $optparamvalue, -1 )))
-              $optparamvalue = substr( $optparamvalue, 1, ( strlen( $optparamvalue ) - 2 ));
+               ( '"' == substr( $optparamvalue, -1 ))) {
+                          $optparamvalue = substr( $optparamvalue, 1, ( strlen( $optparamvalue ) - 2 ));
+            }
             $params2[$optparamlabel] = $optparamvalue;
             break;
         } // end switch( $optparamlabel.. .
       } // end foreach( $optparam.. .
-      foreach( $optarrays as $optparamlabel => $optparams )
-        $params2[$optparamlabel] = $optparams;
+      foreach( $optarrays as $optparamlabel => $optparams ) {
+              $params2[$optparamlabel] = $optparams;
+      }
     }
         // remove defaults
     $this->_existRem( $params2, 'CUTYPE',   'INDIVIDUAL' );
@@ -1912,8 +2145,9 @@ 
         // check language setting
     if( isset( $params2['CN' ] )) {
       $lang = $this->getConfig( 'language' );
-      if( !isset( $params2['LANGUAGE' ] ) && !empty( $lang ))
-        $params2['LANGUAGE' ] = $lang;
+      if( !isset( $params2['LANGUAGE' ] ) && !empty( $lang )) {
+              $params2['LANGUAGE' ] = $lang;
+      }
     }
     $this->_setMval( $this->attendee, $value, $params2, FALSE, $index );
     return TRUE;
@@ -1930,22 +2164,26 @@ 
  * @return string
  */
   function createCategories() {
-    if( empty( $this->categories )) return FALSE;
+    if( empty( $this->categories )) {
+        return FALSE;
+    }
     $output = null;
     foreach( $this->categories as $category ) {
       if( empty( $category['value'] )) {
-        if ( $this->getConfig( 'allowEmpty' ))
-          $output .= $this->_createElement( 'CATEGORIES' );
+        if ( $this->getConfig( 'allowEmpty' )) {
+                  $output .= $this->_createElement( 'CATEGORIES' );
+        }
         continue;
       }
       $attributes = $this->_createParams( $category['params'], array( 'LANGUAGE' ));
       if( is_array( $category['value'] )) {
-        foreach( $category['value'] as $cix => $categoryPart )
-          $category['value'][$cix] = $this->_strrep( $categoryPart );
+        foreach( $category['value'] as $cix => $categoryPart ) {
+                  $category['value'][$cix] = $this->_strrep( $categoryPart );
+        }
         $content  = implode( ',', $category['value'] );
+      } else {
+              $content  = $this->_strrep( $category['value'] );
       }
-      else
-        $content  = $this->_strrep( $category['value'] );
       $output    .= $this->_createElement( 'CATEGORIES', $attributes, $content );
     }
     return $output;
@@ -1961,7 +2199,11 @@ 
  * @return bool
  */
   function setCategories( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->_setMval( $this->categories, $value, $params, FALSE, $index );
     return TRUE;
  }
@@ -1977,9 +2219,12 @@ 
  * @return string
  */
   function createClass() {
-    if( empty( $this->class )) return FALSE;
-    if( empty( $this->class['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'CLASS' ) : FALSE;
+    if( empty( $this->class )) {
+        return FALSE;
+    }
+    if( empty( $this->class['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'CLASS' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->class['params'] );
     return $this->_createElement( 'CLASS', $attributes, $this->class['value'] );
   }
@@ -1993,7 +2238,11 @@ 
  * @return bool
  */
   function setClass( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->class = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -2009,11 +2258,15 @@ 
  * @return string
  */
   function createComment() {
-    if( empty( $this->comment )) return FALSE;
-    $output = null;
+    if( empty( $this->comment )) {
+        return FALSE;
+    }
+    $output = null;
     foreach( $this->comment as $commentPart ) {
       if( empty( $commentPart['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'COMMENT' );
+        if( $this->getConfig( 'allowEmpty' )) {
+            $output .= $this->_createElement( 'COMMENT' );
+        }
         continue;
       }
       $attributes = $this->_createParams( $commentPart['params'], array( 'ALTREP', 'LANGUAGE' ));
@@ -2033,7 +2286,11 @@ 
  * @return bool
  */
   function setComment( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->_setMval( $this->comment, $value, $params, FALSE, $index );
     return TRUE;
   }
@@ -2049,16 +2306,20 @@ 
  * @return string
  */
   function createCompleted( ) {
-    if( empty( $this->completed )) return FALSE;
+    if( empty( $this->completed )) {
+        return FALSE;
+    }
     if( !isset( $this->completed['value']['year'] )  &&
         !isset( $this->completed['value']['month'] ) &&
         !isset( $this->completed['value']['day'] )   &&
         !isset( $this->completed['value']['hour'] )  &&
         !isset( $this->completed['value']['min'] )   &&
-        !isset( $this->completed['value']['sec'] ))
-      if( $this->getConfig( 'allowEmpty' ))
+        !isset( $this->completed['value']['sec'] )) {
+          if( $this->getConfig( 'allowEmpty' ))
         return $this->_createElement( 'COMPLETED' );
-      else return FALSE;
+    } else {
+          return FALSE;
+      }
     $formatted  = $this->_format_date_time( $this->completed['value'], 7 );
     $attributes = $this->_createParams( $this->completed['params'] );
     return $this->_createElement( 'COMPLETED', $attributes, $formatted );
@@ -2082,9 +2343,9 @@ 
       if( $this->getConfig( 'allowEmpty' )) {
         $this->completed = array( 'value' => null, 'params' => $this->_setParams( $params ));
         return TRUE;
+      } else {
+              return FALSE;
       }
-      else
-        return FALSE;
     }
     $this->completed = $this->_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
     return TRUE;
@@ -2101,15 +2362,18 @@ 
  * @return string
  */
   function createContact() {
-    if( empty( $this->contact )) return FALSE;
+    if( empty( $this->contact )) {
+        return FALSE;
+    }
     $output = null;
     foreach( $this->contact as $contact ) {
       if( !empty( $contact['value'] )) {
         $attributes = $this->_createParams( $contact['params'], array( 'ALTREP', 'LANGUAGE' ));
         $content    = $this->_strrep( $contact['value'] );
         $output    .= $this->_createElement( 'CONTACT', $attributes, $content );
+      } elseif( $this->getConfig( 'allowEmpty' )) {
+          $output .= $this->_createElement( 'CONTACT' );
       }
-      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'CONTACT' );
     }
     return $output;
   }
@@ -2124,7 +2388,11 @@ 
  * @return bool
  */
   function setContact( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->_setMval( $this->contact, $value, $params, FALSE, $index );
     return TRUE;
   }
@@ -2140,7 +2408,9 @@ 
  * @return string
  */
   function createCreated() {
-    if( empty( $this->created )) return FALSE;
+    if( empty( $this->created )) {
+        return FALSE;
+    }
     $formatted  = $this->_format_date_time( $this->created['value'], 7 );
     $attributes = $this->_createParams( $this->created['params'] );
     return $this->_createElement( 'CREATED', $attributes, $formatted );
@@ -2178,15 +2448,18 @@ 
  * @return string
  */
   function createDescription() {
-    if( empty( $this->description )) return FALSE;
+    if( empty( $this->description )) {
+        return FALSE;
+    }
     $output       = null;
     foreach( $this->description as $description ) {
       if( !empty( $description['value'] )) {
         $attributes = $this->_createParams( $description['params'], array( 'ALTREP', 'LANGUAGE' ));
         $content    = $this->_strrep( $description['value'] );
         $output    .= $this->_createElement( 'DESCRIPTION', $attributes, $content );
+      } elseif( $this->getConfig( 'allowEmpty' )) {
+          $output .= $this->_createElement( 'DESCRIPTION' );
       }
-      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'DESCRIPTION' );
     }
     return $output;
   }
@@ -2201,7 +2474,12 @@ 
  * @return bool
  */
   function setDescription( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) { if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; }
+    if( empty( $value )) { if( $this->getConfig( 'allowEmpty' )) {
+        $value = null;
+    } else {
+        return FALSE;
+    }
+    }
     $this->_setMval( $this->description, $value, $params, FALSE, $index );
     return TRUE;
   }
@@ -2217,16 +2495,20 @@ 
  * @return string
  */
   function createDtend() {
-    if( empty( $this->dtend )) return FALSE;
+    if( empty( $this->dtend )) {
+        return FALSE;
+    }
     if( !isset( $this->dtend['value']['year'] )  &&
         !isset( $this->dtend['value']['month'] ) &&
         !isset( $this->dtend['value']['day'] )   &&
         !isset( $this->dtend['value']['hour'] )  &&
         !isset( $this->dtend['value']['min'] )   &&
-        !isset( $this->dtend['value']['sec'] ))
-      if( $this->getConfig( 'allowEmpty' ))
+        !isset( $this->dtend['value']['sec'] )) {
+          if( $this->getConfig( 'allowEmpty' ))
         return $this->_createElement( 'DTEND' );
-      else return FALSE;
+    } else {
+          return FALSE;
+      }
     $formatted  = $this->_format_date_time( $this->dtend['value'] );
     $attributes = $this->_createParams( $this->dtend['params'] );
     return $this->_createElement( 'DTEND', $attributes, $formatted );
@@ -2251,9 +2533,9 @@ 
       if( $this->getConfig( 'allowEmpty' )) {
         $this->dtend = array( 'value' => null, 'params' => $this->_setParams( $params ));
         return TRUE;
+      } else {
+              return FALSE;
       }
-      else
-        return FALSE;
     }
     $this->dtend = $this->_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params );
     return TRUE;
@@ -2275,8 +2557,9 @@ 
         !isset( $this->dtstamp['value']['day'] )   &&
         !isset( $this->dtstamp['value']['hour'] )  &&
         !isset( $this->dtstamp['value']['min'] )   &&
-        !isset( $this->dtstamp['value']['sec'] ))
-      $this->_makeDtstamp();
+        !isset( $this->dtstamp['value']['sec'] )) {
+          $this->_makeDtstamp();
+    }
     $formatted  = $this->_format_date_time( $this->dtstamp['value'], 7 );
     $attributes = $this->_createParams( $this->dtstamp['params'] );
     return $this->_createElement( 'DTSTAMP', $attributes, $formatted );
@@ -2312,10 +2595,11 @@ 
  * @return TRUE
  */
   function setDtstamp( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
-    if( empty( $year ))
-      $this->_makeDtstamp();
-    else
-      $this->dtstamp = $this->_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
+    if( empty( $year )) {
+          $this->_makeDtstamp();
+    } else {
+          $this->dtstamp = $this->_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
+    }
     return TRUE;
   }
 /*********************************************************************************/
@@ -2330,18 +2614,23 @@ 
  * @return string
  */
   function createDtstart() {
-    if( empty( $this->dtstart )) return FALSE;
+    if( empty( $this->dtstart )) {
+        return FALSE;
+    }
     if( !isset( $this->dtstart['value']['year'] )  &&
         !isset( $this->dtstart['value']['month'] ) &&
         !isset( $this->dtstart['value']['day'] )   &&
         !isset( $this->dtstart['value']['hour'] )  &&
         !isset( $this->dtstart['value']['min'] )   &&
-        !isset( $this->dtstart['value']['sec'] ))
-    if( $this->getConfig( 'allowEmpty' ))
+        !isset( $this->dtstart['value']['sec'] )) {
+        if( $this->getConfig( 'allowEmpty' ))
       return $this->_createElement( 'DTSTART' );
-    else return FALSE;
-    if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' )))
-      unset( $this->dtstart['value']['tz'], $this->dtstart['params']['TZID'] );
+    } else {
+        return FALSE;
+    }
+    if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) {
+          unset( $this->dtstart['value']['tz'], $this->dtstart['params']['TZID'] );
+    }
     $formatted  = $this->_format_date_time( $this->dtstart['value'] );
     $attributes = $this->_createParams( $this->dtstart['params'] );
     return $this->_createElement( 'DTSTART', $attributes, $formatted );
@@ -2366,9 +2655,9 @@ 
       if( $this->getConfig( 'allowEmpty' )) {
         $this->dtstart = array( 'value' => null, 'params' => $this->_setParams( $params ));
         return TRUE;
+      } else {
+              return FALSE;
       }
-      else
-        return FALSE;
     }
     $this->dtstart = $this->_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params, 'dtstart' );
     return TRUE;
@@ -2385,16 +2674,20 @@ 
  * @return string
  */
   function createDue() {
-    if( empty( $this->due )) return FALSE;
+    if( empty( $this->due )) {
+        return FALSE;
+    }
     if( !isset( $this->due['value']['year'] )  &&
         !isset( $this->due['value']['month'] ) &&
         !isset( $this->due['value']['day'] )   &&
         !isset( $this->due['value']['hour'] )  &&
         !isset( $this->due['value']['min'] )   &&
-        !isset( $this->due['value']['sec'] ))
-      if( $this->getConfig( 'allowEmpty' ))
+        !isset( $this->due['value']['sec'] )) {
+          if( $this->getConfig( 'allowEmpty' ))
         return $this->_createElement( 'DUE' );
-      else return FALSE;
+    } else {
+          return FALSE;
+      }
     $formatted  = $this->_format_date_time( $this->due['value'] );
     $attributes = $this->_createParams( $this->due['params'] );
     return $this->_createElement( 'DUE', $attributes, $formatted );
@@ -2418,9 +2711,9 @@ 
       if( $this->getConfig( 'allowEmpty' )) {
         $this->due = array( 'value' => null, 'params' => $this->_setParams( $params ));
         return TRUE;
+      } else {
+              return FALSE;
       }
-      else
-        return FALSE;
     }
     $this->due = $this->_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params );
     return TRUE;
@@ -2437,15 +2730,19 @@ 
  * @return string
  */
   function createDuration() {
-    if( empty( $this->duration )) return FALSE;
+    if( empty( $this->duration )) {
+        return FALSE;
+    }
     if( !isset( $this->duration['value']['week'] ) &&
         !isset( $this->duration['value']['day'] )  &&
         !isset( $this->duration['value']['hour'] ) &&
         !isset( $this->duration['value']['min'] )  &&
-        !isset( $this->duration['value']['sec'] ))
-      if( $this->getConfig( 'allowEmpty' ))
+        !isset( $this->duration['value']['sec'] )) {
+          if( $this->getConfig( 'allowEmpty' ))
         return $this->_createElement( 'DURATION', array(), null );
-      else return FALSE;
+    } else {
+          return FALSE;
+      }
     $attributes = $this->_createParams( $this->duration['params'] );
     return $this->_createElement( 'DURATION', $attributes, $this->_format_duration( $this->duration['value'] ));
   }
@@ -2463,19 +2760,24 @@ 
  * @return bool
  */
   function setDuration( $week, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
-    if( empty( $week )) if( $this->getConfig( 'allowEmpty' )) $week = null; else return FALSE;
-    if( is_array( $week ) && ( 1 <= count( $week )))
-      $this->duration = array( 'value' => $this->_duration_array( $week ), 'params' => $this->_setParams( $day ));
-    elseif( is_string( $week ) && ( 3 <= strlen( trim( $week )))) {
+    if( empty( $week )) {
+        if( $this->getConfig( 'allowEmpty' )) $week = null;
+    } else {
+        return FALSE;
+    }
+    if( is_array( $week ) && ( 1 <= count( $week ))) {
+          $this->duration = array( 'value' => $this->_duration_array( $week ), 'params' => $this->_setParams( $day ));
+    } elseif( is_string( $week ) && ( 3 <= strlen( trim( $week )))) {
       $week = trim( $week );
-      if( in_array( substr( $week, 0, 1 ), array( '+', '-' )))
-        $week = substr( $week, 1 );
+      if( in_array( substr( $week, 0, 1 ), array( '+', '-' ))) {
+              $week = substr( $week, 1 );
+      }
       $this->duration = array( 'value' => $this->_duration_string( $week ), 'params' => $this->_setParams( $day ));
+    } elseif( empty( $week ) && empty( $day ) && empty( $hour ) && empty( $min ) && empty( $sec )) {
+          return FALSE;
+    } else {
+          $this->duration = array( 'value' => $this->_duration_array( array( $week, $day, $hour, $min, $sec )), 'params' => $this->_setParams( $params ));
     }
-    elseif( empty( $week ) && empty( $day ) && empty( $hour ) && empty( $min ) && empty( $sec ))
-      return FALSE;
-    else
-      $this->duration = array( 'value' => $this->_duration_array( array( $week, $day, $hour, $min, $sec )), 'params' => $this->_setParams( $params ));
     return TRUE;
   }
 /*********************************************************************************/
@@ -2490,31 +2792,37 @@ 
  * @return string
  */
   function createExdate() {
-    if( empty( $this->exdate )) return FALSE;
+    if( empty( $this->exdate )) {
+        return FALSE;
+    }
     $output = null;
     foreach( $this->exdate as $ex => $theExdate ) {
       if( empty( $theExdate['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'EXDATE' );
+        if( $this->getConfig( 'allowEmpty' )) {
+            $output .= $this->_createElement( 'EXDATE' );
+        }
         continue;
       }
       $content = $attributes = null;
       foreach( $theExdate['value'] as $eix => $exdatePart ) {
         $parno = count( $exdatePart );
         $formatted = $this->_format_date_time( $exdatePart, $parno );
-        if( isset( $theExdate['params']['TZID'] ))
-          $formatted = str_replace( 'Z', '', $formatted);
+        if( isset( $theExdate['params']['TZID'] )) {
+                  $formatted = str_replace( 'Z', '', $formatted);
+        }
         if( 0 < $eix ) {
           if( isset( $theExdate['value'][0]['tz'] )) {
             if( ctype_digit( substr( $theExdate['value'][0]['tz'], -4 )) ||
                ( 'Z' == $theExdate['value'][0]['tz'] )) {
-              if( 'Z' != substr( $formatted, -1 ))
-                $formatted .= 'Z';
+              if( 'Z' != substr( $formatted, -1 )) {
+                              $formatted .= 'Z';
+              }
+            } else {
+                          $formatted = str_replace( 'Z', '', $formatted );
             }
-            else
-              $formatted = str_replace( 'Z', '', $formatted );
+          } else {
+                      $formatted = str_replace( 'Z', '', $formatted );
           }
-          else
-            $formatted = str_replace( 'Z', '', $formatted );
         }
         $content .= ( 0 < $eix ) ? ','.$formatted : $formatted;
       }
@@ -2538,34 +2846,39 @@ 
       if( $this->getConfig( 'allowEmpty' )) {
         $this->_setMval( $this->exdate, null, $params, FALSE, $index );
         return TRUE;
+      } else {
+              return FALSE;
       }
-      else
-        return FALSE;
     }
     $input  = array( 'params' => $this->_setParams( $params, array( 'VALUE' => 'DATE-TIME' )));
             /* ev. check 1:st date and save ev. timezone **/
     $this->_chkdatecfg( reset( $exdates ), $parno, $input['params'] );
     $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME' ); // remove default parameter
     foreach( $exdates as $eix => $theExdate ) {
-      if( $this->_isArrayTimestampDate( $theExdate ))
-        $exdatea = $this->_timestamp2date( $theExdate, $parno );
-      elseif(  is_array( $theExdate ))
-        $exdatea = $this->_date_time_array( $theExdate, $parno );
-      elseif( 8 <= strlen( trim( $theExdate ))) // ex. 2006-08-03 10:12:18
+      if( $this->_isArrayTimestampDate( $theExdate )) {
+              $exdatea = $this->_timestamp2date( $theExdate, $parno );
+      } elseif(  is_array( $theExdate )) {
+              $exdatea = $this->_date_time_array( $theExdate, $parno );
+      } elseif( 8 <= strlen( trim( $theExdate ))) {
+          // ex. 2006-08-03 10:12:18
         $exdatea = $this->_date_time_string( $theExdate, $parno );
-      if( 3 == $parno )
-        unset( $exdatea['hour'], $exdatea['min'], $exdatea['sec'], $exdatea['tz'] );
-      elseif( isset( $exdatea['tz'] ))
-        $exdatea['tz'] = (string) $exdatea['tz'];
+      }
+      if( 3 == $parno ) {
+              unset( $exdatea['hour'], $exdatea['min'], $exdatea['sec'], $exdatea['tz'] );
+      } elseif( isset( $exdatea['tz'] )) {
+              $exdatea['tz'] = (string) $exdatea['tz'];
+      }
       if(  isset( $input['params']['TZID'] ) ||
          ( isset( $exdatea['tz'] ) && !$this->_isOffset( $exdatea['tz'] )) ||
          ( isset( $input['value'][0] ) && ( !isset( $input['value'][0]['tz'] ))) ||
-         ( isset( $input['value'][0]['tz'] ) && !$this->_isOffset( $input['value'][0]['tz'] )))
-        unset( $exdatea['tz'] );
+         ( isset( $input['value'][0]['tz'] ) && !$this->_isOffset( $input['value'][0]['tz'] ))) {
+              unset( $exdatea['tz'] );
+      }
       $input['value'][] = $exdatea;
     }
-    if( 0 >= count( $input['value'] ))
-      return FALSE;
+    if( 0 >= count( $input['value'] )) {
+          return FALSE;
+    }
     if( 3 == $parno ) {
       $input['params']['VALUE'] = 'DATE';
       unset( $input['params']['TZID'] );
@@ -2585,7 +2898,9 @@ 
  * @return string
  */
   function createExrule() {
-    if( empty( $this->exrule )) return FALSE;
+    if( empty( $this->exrule )) {
+        return FALSE;
+    }
     return $this->_format_recur( 'EXRULE', $this->exrule );
   }
 /**
@@ -2599,7 +2914,11 @@ 
  * @return bool
  */
   function setExrule( $exruleset, $params=FALSE, $index=FALSE ) {
-    if( empty( $exruleset )) if( $this->getConfig( 'allowEmpty' )) $exruleset = null; else return FALSE;
+    if( empty( $exruleset )) {
+        if( $this->getConfig( 'allowEmpty' )) $exruleset = null;
+    } else {
+        return FALSE;
+    }
     $this->_setMval( $this->exrule, $this->_setRexrule( $exruleset ), $params, FALSE, $index );
     return TRUE;
   }
@@ -2615,11 +2934,15 @@ 
  * @return string
  */
   function createFreebusy() {
-    if( empty( $this->freebusy )) return FALSE;
+    if( empty( $this->freebusy )) {
+        return FALSE;
+    }
     $output = null;
     foreach( $this->freebusy as $freebusyPart ) {
       if( empty( $freebusyPart['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'FREEBUSY' );
+        if( $this->getConfig( 'allowEmpty' )) {
+            $output .= $this->_createElement( 'FREEBUSY' );
+        }
         continue;
       }
       $attributes = $content = null;
@@ -2627,9 +2950,9 @@ 
         $attributes .= $this->intAttrDelimiter.'FBTYPE='.$freebusyPart['value']['fbtype'];
         unset( $freebusyPart['value']['fbtype'] );
         $freebusyPart['value'] = array_values( $freebusyPart['value'] );
+      } else {
+              $attributes .= $this->intAttrDelimiter.'FBTYPE=BUSY';
       }
-      else
-        $attributes .= $this->intAttrDelimiter.'FBTYPE=BUSY';
       $attributes .= $this->_createParams( $freebusyPart['params'] );
       $fno = 1;
       $cnt = count( $freebusyPart['value']);
@@ -2638,21 +2961,24 @@ 
         $content .= $formatted;
         $content .= '/';
         $cnt2 = count( $freebusyPeriod[1]);
-        if( array_key_exists( 'year', $freebusyPeriod[1] ))      // date-time
+        if( array_key_exists( 'year', $freebusyPeriod[1] )) {
+            // date-time
           $cnt2 = 7;
-        elseif( array_key_exists( 'week', $freebusyPeriod[1] ))  // duration
+        } elseif( array_key_exists( 'week', $freebusyPeriod[1] )) {
+            // duration
           $cnt2 = 5;
+        }
         if(( 7 == $cnt2 )   &&    // period=  -> date-time
             isset( $freebusyPeriod[1]['year'] )  &&
             isset( $freebusyPeriod[1]['month'] ) &&
             isset( $freebusyPeriod[1]['day'] )) {
           $content .= $this->_format_date_time( $freebusyPeriod[1] );
-        }
-        else {                                  // period=  -> dur-time
+        } else {                                  // period=  -> dur-time
           $content .= $this->_format_duration( $freebusyPeriod[1] );
         }
-        if( $fno < $cnt )
-          $content .= ',';
+        if( $fno < $cnt ) {
+                  $content .= ',';
+        }
         $fno++;
       }
       $output .= $this->_createElement( 'FREEBUSY', $attributes, $content );
@@ -2675,14 +3001,15 @@ 
       if( $this->getConfig( 'allowEmpty' )) {
         $this->_setMval( $this->freebusy, null, $params, FALSE, $index );
         return TRUE;
+      } else {
+              return FALSE;
       }
-      else
-        return FALSE;
     }
     $fbType = strtoupper( $fbType );
     if(( !in_array( $fbType, array( 'FREE', 'BUSY', 'BUSY-UNAVAILABLE', 'BUSY-TENTATIVE' ))) &&
-       ( 'X-' != substr( $fbType, 0, 2 )))
-      $fbType = 'BUSY';
+       ( 'X-' != substr( $fbType, 0, 2 ))) {
+          $fbType = 'BUSY';
+    }
     $input = array( 'fbtype' => $fbType );
     foreach( $fbValues as $fbPeriod ) {   // periods => period
       $freebusyPeriod = array();
@@ -2692,22 +3019,19 @@ 
           if( $this->_isArrayDate( $fbMember )) { // date-time value
             $freebusyPairMember       = $this->_date_time_array( $fbMember, 7 );
             $freebusyPairMember['tz'] = 'Z';
-          }
-          elseif( $this->_isArrayTimestampDate( $fbMember )) { // timestamp value
+          } elseif( $this->_isArrayTimestampDate( $fbMember )) { // timestamp value
             $freebusyPairMember       = $this->_timestamp2date( $fbMember['timestamp'], 7 );
             $freebusyPairMember['tz'] = 'Z';
-          }
-          else {                                         // array format duration
+          } else {                                         // array format duration
             $freebusyPairMember = $this->_duration_array( $fbMember );
           }
-        }
-        elseif(( 3 <= strlen( trim( $fbMember ))) &&    // string format duration
+        } elseif(( 3 <= strlen( trim( $fbMember ))) &&    // string format duration
                ( in_array( $fbMember{0}, array( 'P', '+', '-' )))) {
-          if( 'P' != $fbMember{0} )
-            $fbmember = substr( $fbMember, 1 );
+          if( 'P' != $fbMember{0} ) {
+                      $fbmember = substr( $fbMember, 1 );
+          }
           $freebusyPairMember = $this->_duration_string( $fbMember );
-        }
-        elseif( 8 <= strlen( trim( $fbMember ))) { // text date ex. 2006-08-03 10:12:18
+        } elseif( 8 <= strlen( trim( $fbMember ))) { // text date ex. 2006-08-03 10:12:18
           $freebusyPairMember       = $this->_date_time_string( $fbMember, 7 );
           $freebusyPairMember['tz'] = 'Z';
         }
@@ -2730,9 +3054,12 @@ 
  * @return string
  */
   function createGeo() {
-    if( empty( $this->geo )) return FALSE;
-    if( empty( $this->geo['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'GEO' ) : FALSE;
+    if( empty( $this->geo )) {
+        return FALSE;
+    }
+    if( empty( $this->geo['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'GEO' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->geo['params'] );
     $content    = null;
     $content   .= number_format( (float) $this->geo['value']['latitude'], 6, '.', '');
@@ -2752,15 +3079,17 @@ 
  */
   function setGeo( $latitude, $longitude, $params=FALSE ) {
     if( !empty( $latitude ) && !empty( $longitude )) {
-      if( !is_array( $this->geo )) $this->geo = array();
+      if( !is_array( $this->geo )) {
+          $this->geo = array();
+      }
       $this->geo['value']['latitude']  = $latitude;
       $this->geo['value']['longitude'] = $longitude;
       $this->geo['params'] = $this->_setParams( $params );
+    } elseif( $this->getConfig( 'allowEmpty' )) {
+          $this->geo = array( 'value' => null, 'params' => $this->_setParams( $params ) );
+    } else {
+          return FALSE;
     }
-    elseif( $this->getConfig( 'allowEmpty' ))
-      $this->geo = array( 'value' => null, 'params' => $this->_setParams( $params ) );
-    else
-      return FALSE;
     return TRUE;
   }
 /*********************************************************************************/
@@ -2775,7 +3104,9 @@ 
  * @return string
  */
   function createLastModified() {
-    if( empty( $this->lastmodified )) return FALSE;
+    if( empty( $this->lastmodified )) {
+        return FALSE;
+    }
     $attributes = $this->_createParams( $this->lastmodified['params'] );
     $formatted  = $this->_format_date_time( $this->lastmodified['value'], 7 );
     return $this->_createElement( 'LAST-MODIFIED', $attributes, $formatted );
@@ -2795,8 +3126,9 @@ 
  * @return boll
  */
   function setLastModified( $year=FALSE, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
-    if( empty( $year ))
-      $year = date('Ymd\THis', mktime( date( 'H' ), date( 'i' ), date( 's' ) - date( 'Z'), date( 'm' ), date( 'd' ), date( 'Y' )));
+    if( empty( $year )) {
+          $year = date('Ymd\THis', mktime( date( 'H' ), date( 'i' ), date( 's' ) - date( 'Z'), date( 'm' ), date( 'd' ), date( 'Y' )));
+    }
     $this->lastmodified = $this->_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
     return TRUE;
   }
@@ -2812,9 +3144,12 @@ 
  * @return string
  */
   function createLocation() {
-    if( empty( $this->location )) return FALSE;
-    if( empty( $this->location['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'LOCATION' ) : FALSE;
+    if( empty( $this->location )) {
+        return FALSE;
+    }
+    if( empty( $this->location['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'LOCATION' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->location['params'], array( 'ALTREP', 'LANGUAGE' ));
     $content    = $this->_strrep( $this->location['value'] );
     return $this->_createElement( 'LOCATION', $attributes, $content );
@@ -2829,7 +3164,11 @@ 
  * @return bool
  */
   function setLocation( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->location = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -2845,9 +3184,12 @@ 
  * @return string
  */
   function createOrganizer() {
-    if( empty( $this->organizer )) return FALSE;
-    if( empty( $this->organizer['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'ORGANIZER' ) : FALSE;
+    if( empty( $this->organizer )) {
+        return FALSE;
+    }
+    if( empty( $this->organizer['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'ORGANIZER' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->organizer['params']
                                       , array( 'CN', 'DIR', 'LANGUAGE', 'SENT-BY' ));
     $content    = 'MAILTO:'.$this->organizer['value'];
@@ -2863,13 +3205,18 @@ 
  * @return bool
  */
   function setOrganizer( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $value = str_replace ( 'MAILTO:', '', $value );
     $value = str_replace ( 'mailto:', '', $value );
     $this->organizer = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     if( isset( $this->organizer['params']['SENT-BY'] )) {
-      if( 'MAILTO' == strtoupper( substr( $this->organizer['params']['SENT-BY'], 0, 6 )))
-        $this->organizer['params']['SENT-BY'] = substr( $this->organizer['params']['SENT-BY'], 7 );
+      if( 'MAILTO' == strtoupper( substr( $this->organizer['params']['SENT-BY'], 0, 6 ))) {
+              $this->organizer['params']['SENT-BY'] = substr( $this->organizer['params']['SENT-BY'], 7 );
+      }
     }
     return TRUE;
   }
@@ -2885,9 +3232,12 @@ 
  * @return string
  */
   function createPercentComplete() {
-    if( empty( $this->percentcomplete )) return FALSE;
-    if( empty( $this->percentcomplete['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'PERCENT-COMPLETE' ) : FALSE;
+    if( empty( $this->percentcomplete )) {
+        return FALSE;
+    }
+    if( empty( $this->percentcomplete['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'PERCENT-COMPLETE' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->percentcomplete['params'] );
     return $this->_createElement( 'PERCENT-COMPLETE', $attributes, $this->percentcomplete['value'] );
   }
@@ -2901,7 +3251,11 @@ 
  * @return bool
  */
   function setPercentComplete( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->percentcomplete = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -2917,9 +3271,12 @@ 
  * @return string
  */
   function createPriority() {
-    if( empty( $this->priority )) return FALSE;
-    if( empty( $this->priority['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'PRIORITY' ) : FALSE;
+    if( empty( $this->priority )) {
+        return FALSE;
+    }
+    if( empty( $this->priority['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'PRIORITY' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->priority['params'] );
     return $this->_createElement( 'PRIORITY', $attributes, $this->priority['value'] );
   }
@@ -2933,7 +3290,11 @@ 
  * @return bool
  */
   function setPriority( $value, $params=FALSE  ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->priority = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -2949,18 +3310,24 @@ 
  * @return string
  */
   function createRdate() {
-    if( empty( $this->rdate )) return FALSE;
+    if( empty( $this->rdate )) {
+        return FALSE;
+    }
     $utctime = ( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) ? TRUE : FALSE;
     $output = null;
-    if( $utctime  )
-      unset( $this->rdate['params']['TZID'] );
+    if( $utctime  ) {
+          unset( $this->rdate['params']['TZID'] );
+    }
     foreach( $this->rdate as $theRdate ) {
       if( empty( $theRdate['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'RDATE' );
+        if( $this->getConfig( 'allowEmpty' )) {
+            $output .= $this->_createElement( 'RDATE' );
+        }
         continue;
       }
-      if( $utctime  )
-        unset( $theRdate['params']['TZID'] );
+      if( $utctime  ) {
+              unset( $theRdate['params']['TZID'] );
+      }
       $attributes = $this->_createParams( $theRdate['params'] );
       $cnt = count( $theRdate['value'] );
       $content = null;
@@ -2969,68 +3336,84 @@ 
         $contentPart = null;
         if( is_array( $rdatePart ) &&
             isset( $theRdate['params']['VALUE'] ) && ( 'PERIOD' == $theRdate['params']['VALUE'] )) { // PERIOD
-          if( $utctime )
-            unset( $rdatePart[0]['tz'] );
+          if( $utctime ) {
+                      unset( $rdatePart[0]['tz'] );
+          }
           $formatted = $this->_format_date_time( $rdatePart[0]); // PERIOD part 1
-          if( $utctime || !empty( $theRdate['params']['TZID'] ))
-            $formatted = str_replace( 'Z', '', $formatted);
+          if( $utctime || !empty( $theRdate['params']['TZID'] )) {
+                      $formatted = str_replace( 'Z', '', $formatted);
+          }
           if( 0 < $rpix ) {
             if( !empty( $rdatePart[0]['tz'] ) && $this->_isOffset( $rdatePart[0]['tz'] )) {
-              if( 'Z' != substr( $formatted, -1 )) $formatted .= 'Z';
+              if( 'Z' != substr( $formatted, -1 )) {
+                  $formatted .= 'Z';
+              }
+            } else {
+                          $formatted = str_replace( 'Z', '', $formatted );
             }
-            else
-              $formatted = str_replace( 'Z', '', $formatted );
           }
           $contentPart .= $formatted;
           $contentPart .= '/';
           $cnt2 = count( $rdatePart[1]);
           if( array_key_exists( 'year', $rdatePart[1] )) {
-            if( array_key_exists( 'hour', $rdatePart[1] ))
-              $cnt2 = 7;                                      // date-time
-            else
-              $cnt2 = 3;                                      // date
-          }
-          elseif( array_key_exists( 'week', $rdatePart[1] ))  // duration
+            if( array_key_exists( 'hour', $rdatePart[1] )) {
+                          $cnt2 = 7;
+            }
+            // date-time
+            else {
+                          $cnt2 = 3;
+            }
+            // date
+          } elseif( array_key_exists( 'week', $rdatePart[1] )) {
+              // duration
             $cnt2 = 5;
+          }
           if(( 7 == $cnt2 )   &&    // period=  -> date-time
               isset( $rdatePart[1]['year'] )  &&
               isset( $rdatePart[1]['month'] ) &&
               isset( $rdatePart[1]['day'] )) {
-            if( $utctime )
-              unset( $rdatePart[1]['tz'] );
+            if( $utctime ) {
+                          unset( $rdatePart[1]['tz'] );
+            }
             $formatted = $this->_format_date_time( $rdatePart[1] ); // PERIOD part 2
-            if( $utctime || !empty( $theRdate['params']['TZID'] ))
-              $formatted = str_replace( 'Z', '', $formatted);
+            if( $utctime || !empty( $theRdate['params']['TZID'] )) {
+                          $formatted = str_replace( 'Z', '', $formatted);
+            }
             if( !empty( $rdatePart[0]['tz'] ) && $this->_isOffset( $rdatePart[0]['tz'] )) {
-              if( 'Z' != substr( $formatted, -1 )) $formatted .= 'Z';
+              if( 'Z' != substr( $formatted, -1 )) {
+                  $formatted .= 'Z';
+              }
+            } else {
+                          $formatted = str_replace( 'Z', '', $formatted );
             }
-            else
-              $formatted = str_replace( 'Z', '', $formatted );
            $contentPart .= $formatted;
-          }
-          else {                                  // period=  -> dur-time
+          } else {                                  // period=  -> dur-time
             $contentPart .= $this->_format_duration( $rdatePart[1] );
           }
         } // PERIOD end
         else { // SINGLE date start
-          if( $utctime )
-            unset( $rdatePart['tz'] );
+          if( $utctime ) {
+                      unset( $rdatePart['tz'] );
+          }
           $formatted = $this->_format_date_time( $rdatePart);
-          if( $utctime || !empty( $theRdate['params']['TZID'] ))
-            $formatted = str_replace( 'Z', '', $formatted);
+          if( $utctime || !empty( $theRdate['params']['TZID'] )) {
+                      $formatted = str_replace( 'Z', '', $formatted);
+          }
           if( !$utctime && ( 0 < $rpix )) {
             if( !empty( $theRdate['value'][0]['tz'] ) && $this->_isOffset( $theRdate['value'][0]['tz'] )) {
-              if( 'Z' != substr( $formatted, -1 ))
-                $formatted .= 'Z';
+              if( 'Z' != substr( $formatted, -1 )) {
+                              $formatted .= 'Z';
+              }
+            } else {
+                          $formatted = str_replace( 'Z', '', $formatted );
             }
-            else
-              $formatted = str_replace( 'Z', '', $formatted );
           }
           $contentPart .= $formatted;
         }
         $content .= $contentPart;
-        if( $rno < $cnt )
-          $content .= ',';
+        if( $rno < $cnt ) {
+                  $content .= ',';
+        }
         $rno++;
       }
       $output    .= $this->_createElement( 'RDATE', $attributes, $content );
@@ -3052,9 +3435,9 @@ 
       if( $this->getConfig( 'allowEmpty' )) {
         $this->_setMval( $this->rdate, null, $params, FALSE, $index );
         return TRUE;
+      } else {
+              return FALSE;
       }
-      else
-        return FALSE;
     }
     $input = array( 'params' => $this->_setParams( $params, array( 'VALUE' => 'DATE-TIME' )));
     if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) {
@@ -3068,15 +3451,19 @@ 
     (( is_array( $rdates[0][0] ) && ( isset( $rdates[0][0]['timestamp'] ) ||
                                       $this->_isArrayDate( $rdates[0][0] ))) ||
                                     ( is_string( $rdates[0][0] ) && ( 8 <= strlen( trim( $rdates[0][0] )))))  &&
-     ( is_array( $rdates[0][1] ) || ( is_string( $rdates[0][1] ) && ( 3 <= strlen( trim( $rdates[0][1] ))))))
-      $input['params']['VALUE'] = 'PERIOD';
+     ( is_array( $rdates[0][1] ) || ( is_string( $rdates[0][1] ) && ( 3 <= strlen( trim( $rdates[0][1] )))))) {
+          $input['params']['VALUE'] = 'PERIOD';
+    }
             /* check 1:st date, upd. $parno (opt) and save ev. timezone **/
     $date  = reset( $rdates );
-    if( isset( $input['params']['VALUE'] ) && ( 'PERIOD' == $input['params']['VALUE'] )) // PERIOD
+    if( isset( $input['params']['VALUE'] ) && ( 'PERIOD' == $input['params']['VALUE'] )) {
+        // PERIOD
       $date  = reset( $date );
+    }
     $this->_chkdatecfg( $date, $parno, $input['params'] );
-    if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' )))
-      unset( $input['params']['TZID'] );
+    if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) {
+          unset( $input['params']['TZID'] );
+    }
     $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME' ); // remove default
     foreach( $rdates as $rpix => $theRdate ) {
       $inputa = null;
@@ -3084,48 +3471,60 @@ 
         if( isset( $input['params']['VALUE'] ) && ( 'PERIOD' == $input['params']['VALUE'] )) { // PERIOD
           foreach( $theRdate as $rix => $rPeriod ) {
             if( is_array( $rPeriod )) {
-              if( $this->_isArrayTimestampDate( $rPeriod ))      // timestamp
+              if( $this->_isArrayTimestampDate( $rPeriod )) {
+                  // timestamp
                 $inputab  = ( isset( $rPeriod['tz'] )) ? $this->_timestamp2date( $rPeriod, $parno ) : $this->_timestamp2date( $rPeriod, 6 );
-              elseif( $this->_isArrayDate( $rPeriod ))
-                $inputab  = ( 3 < count ( $rPeriod )) ? $this->_date_time_array( $rPeriod, $parno ) : $this->_date_time_array( $rPeriod, 6 );
-              elseif (( 1 == count( $rPeriod )) && ( 8 <= strlen( reset( $rPeriod ))))  // text-date
+              } elseif( $this->_isArrayDate( $rPeriod )) {
+                              $inputab  = ( 3 < count ( $rPeriod )) ? $this->_date_time_array( $rPeriod, $parno ) : $this->_date_time_array( $rPeriod, 6 );
+              } elseif (( 1 == count( $rPeriod )) && ( 8 <= strlen( reset( $rPeriod )))) {
+                  // text-date
                 $inputab  = $this->_date_time_string( reset( $rPeriod ), $parno );
-              else                                               // array format duration
+              } else {
+                  // array format duration
                 $inputab  = $this->_duration_array( $rPeriod );
-            }
-            elseif(( 3 <= strlen( trim( $rPeriod ))) &&          // string format duration
+              }
+            } elseif(( 3 <= strlen( trim( $rPeriod ))) &&          // string format duration
                    ( in_array( $rPeriod{0}, array( 'P', '+', '-' )))) {
-              if( 'P' != $rPeriod{0} )
-                $rPeriod  = substr( $rPeriod, 1 );
+              if( 'P' != $rPeriod{0} ) {
+                              $rPeriod  = substr( $rPeriod, 1 );
+              }
               $inputab    = $this->_duration_string( $rPeriod );
-            }
-            elseif( 8 <= strlen( trim( $rPeriod )))              // text date ex. 2006-08-03 10:12:18
+            } elseif( 8 <= strlen( trim( $rPeriod ))) {
+                // text date ex. 2006-08-03 10:12:18
               $inputab    = $this->_date_time_string( $rPeriod, $parno );
+            }
             if(  isset( $input['params']['TZID'] ) ||
                ( isset( $inputab['tz'] )   && !$this->_isOffset( $inputab['tz'] )) ||
                ( isset( $inputa[0] )       && ( !isset( $inputa[0]['tz'] )))       ||
-               ( isset( $inputa[0]['tz'] ) && !$this->_isOffset( $inputa[0]['tz'] )))
-              unset( $inputab['tz'] );
+               ( isset( $inputa[0]['tz'] ) && !$this->_isOffset( $inputa[0]['tz'] ))) {
+                          unset( $inputab['tz'] );
+            }
             $inputa[]     = $inputab;
           }
         } // PERIOD end
-        elseif ( $this->_isArrayTimestampDate( $theRdate ))      // timestamp
+        elseif ( $this->_isArrayTimestampDate( $theRdate )) {
+            // timestamp
           $inputa = $this->_timestamp2date( $theRdate, $parno );
-        else                                                     // date[-time]
+        } else {
+            // date[-time]
           $inputa = $this->_date_time_array( $theRdate, $parno );
-      }
-      elseif( 8 <= strlen( trim( $theRdate )))                   // text date ex. 2006-08-03 10:12:18
+        }
+      } elseif( 8 <= strlen( trim( $theRdate ))) {
+          // text date ex. 2006-08-03 10:12:18
         $inputa       = $this->_date_time_string( $theRdate, $parno );
+      }
       if( !isset( $input['params']['VALUE'] ) || ( 'PERIOD' != $input['params']['VALUE'] )) { // no PERIOD
-        if( 3 == $parno )
-          unset( $inputa['hour'], $inputa['min'], $inputa['sec'], $inputa['tz'] );
-        elseif( isset( $inputa['tz'] ))
-          $inputa['tz'] = (string) $inputa['tz'];
+        if( 3 == $parno ) {
+                  unset( $inputa['hour'], $inputa['min'], $inputa['sec'], $inputa['tz'] );
+        } elseif( isset( $inputa['tz'] )) {
+                  $inputa['tz'] = (string) $inputa['tz'];
+        }
         if(  isset( $input['params']['TZID'] ) ||
            ( isset( $inputa['tz'] )            && !$this->_isOffset( $inputa['tz'] ))     ||
            ( isset( $input['value'][0] )       && ( !isset( $input['value'][0]['tz'] )))  ||
-           ( isset( $input['value'][0]['tz'] ) && !$this->_isOffset( $input['value'][0]['tz'] )))
-          unset( $inputa['tz'] );
+           ( isset( $input['value'][0]['tz'] ) && !$this->_isOffset( $input['value'][0]['tz'] ))) {
+                  unset( $inputa['tz'] );
+        }
       }
       $input['value'][] = $inputa;
     }
@@ -3148,9 +3547,12 @@ 
  * @return string
  */
   function createRecurrenceid() {
-    if( empty( $this->recurrenceid )) return FALSE;
-    if( empty( $this->recurrenceid['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'RECURRENCE-ID' ) : FALSE;
+    if( empty( $this->recurrenceid )) {
+        return FALSE;
+    }
+    if( empty( $this->recurrenceid['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'RECURRENCE-ID' ) : FALSE;
+    }
     $formatted  = $this->_format_date_time( $this->recurrenceid['value'] );
     $attributes = $this->_createParams( $this->recurrenceid['params'] );
     return $this->_createElement( 'RECURRENCE-ID', $attributes, $formatted );
@@ -3174,9 +3576,9 @@ 
       if( $this->getConfig( 'allowEmpty' )) {
         $this->recurrenceid = array( 'value' => null, 'params' => null );
         return TRUE;
+      } else {
+              return FALSE;
       }
-      else
-        return FALSE;
     }
     $this->recurrenceid = $this->_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params );
     return TRUE;
@@ -3193,11 +3595,15 @@ 
  * @return string
  */
   function createRelatedTo() {
-    if( empty( $this->relatedto )) return FALSE;
+    if( empty( $this->relatedto )) {
+        return FALSE;
+    }
     $output = null;
     foreach( $this->relatedto as $relation ) {
       if( empty( $relation['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output.= $this->_createElement( 'RELATED-TO', $this->_createParams( $relation['params'] ));
+        if( $this->getConfig( 'allowEmpty' )) {
+            $output.= $this->_createElement( 'RELATED-TO', $this->_createParams( $relation['params'] ));
+        }
         continue;
       }
       $attributes = $this->_createParams( $relation['params'] );
@@ -3219,9 +3625,14 @@ 
  * @return bool
  */
   function setRelatedTo( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
-    if(( '<' == substr( $value, 0, 1 )) && ( '>' == substr( $value, -1 )))
-      $value = substr( $value, 1, ( strlen( $value ) - 2 ));
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
+    if(( '<' == substr( $value, 0, 1 )) && ( '>' == substr( $value, -1 ))) {
+          $value = substr( $value, 1, ( strlen( $value ) - 2 ));
+    }
     $this->_existRem( $params, 'RELTYPE', 'PARENT', TRUE ); // remove default
     $this->_setMval( $this->relatedto, $value, $params, FALSE, $index );
     return TRUE;
@@ -3238,9 +3649,12 @@ 
  * @return string
  */
   function createRepeat() {
-    if( empty( $this->repeat )) return FALSE;
-    if( empty( $this->repeat['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'REPEAT' ) : FALSE;
+    if( empty( $this->repeat )) {
+        return FALSE;
+    }
+    if( empty( $this->repeat['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'REPEAT' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->repeat['params'] );
     return $this->_createElement( 'REPEAT', $attributes, $this->repeat['value'] );
   }
@@ -3254,7 +3668,11 @@ 
  * @return void
  */
   function setRepeat( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->repeat = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -3269,18 +3687,23 @@ 
  * @return string
  */
   function createRequestStatus() {
-    if( empty( $this->requeststatus )) return FALSE;
+    if( empty( $this->requeststatus )) {
+        return FALSE;
+    }
     $output = null;
     foreach( $this->requeststatus as $rstat ) {
       if( empty( $rstat['value']['statcode'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'REQUEST-STATUS' );
+        if( $this->getConfig( 'allowEmpty' )) {
+            $output .= $this->_createElement( 'REQUEST-STATUS' );
+        }
         continue;
       }
       $attributes  = $this->_createParams( $rstat['params'], array( 'LANGUAGE' ));
       $content     = number_format( (float) $rstat['value']['statcode'], 2, '.', '');
       $content    .= ';'.$this->_strrep( $rstat['value']['text'] );
-      if( isset( $rstat['value']['extdata'] ))
-        $content  .= ';'.$this->_strrep( $rstat['value']['extdata'] );
+      if( isset( $rstat['value']['extdata'] )) {
+              $content  .= ';'.$this->_strrep( $rstat['value']['extdata'] );
+      }
       $output     .= $this->_createElement( 'REQUEST-STATUS', $attributes, $content );
     }
     return $output;
@@ -3298,10 +3721,15 @@ 
  * @return bool
  */
   function setRequestStatus( $statcode, $text, $extdata=FALSE, $params=FALSE, $index=FALSE ) {
-    if( empty( $statcode ) || empty( $text )) if( $this->getConfig( 'allowEmpty' )) $statcode = $text = null; else return FALSE;
+    if( empty( $statcode ) || empty( $text )) {
+        if( $this->getConfig( 'allowEmpty' )) $statcode = $text = null;
+    } else {
+        return FALSE;
+    }
     $input              = array( 'statcode' => $statcode, 'text' => $text );
-    if( $extdata )
-      $input['extdata'] = $extdata;
+    if( $extdata ) {
+          $input['extdata'] = $extdata;
+    }
     $this->_setMval( $this->requeststatus, $input, $params, FALSE, $index );
     return TRUE;
   }
@@ -3317,21 +3745,26 @@ 
  * @return string
  */
   function createResources() {
-    if( empty( $this->resources )) return FALSE;
+    if( empty( $this->resources )) {
+        return FALSE;
+    }
     $output = null;
     foreach( $this->resources as $resource ) {
       if( empty( $resource['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'RESOURCES' );
+        if( $this->getConfig( 'allowEmpty' )) {
+            $output .= $this->_createElement( 'RESOURCES' );
+        }
         continue;
       }
       $attributes  = $this->_createParams( $resource['params'], array( 'ALTREP', 'LANGUAGE' ));
       if( is_array( $resource['value'] )) {
-        foreach( $resource['value'] as $rix => $resourcePart )
-          $resource['value'][$rix] = $this->_strrep( $resourcePart );
+        foreach( $resource['value'] as $rix => $resourcePart ) {
+                  $resource['value'][$rix] = $this->_strrep( $resourcePart );
+        }
         $content   = implode( ',', $resource['value'] );
+      } else {
+              $content   = $this->_strrep( $resource['value'] );
       }
-      else
-        $content   = $this->_strrep( $resource['value'] );
       $output     .= $this->_createElement( 'RESOURCES', $attributes, $content );
     }
     return $output;
@@ -3347,7 +3780,11 @@ 
  * @return bool
  */
   function setResources( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->_setMval( $this->resources, $value, $params, FALSE, $index );
     return TRUE;
   }
@@ -3363,7 +3800,9 @@ 
  * @return string
  */
   function createRrule() {
-    if( empty( $this->rrule )) return FALSE;
+    if( empty( $this->rrule )) {
+        return FALSE;
+    }
     return $this->_format_recur( 'RRULE', $this->rrule );
   }
 /**
@@ -3377,7 +3816,11 @@ 
  * @return void
  */
   function setRrule( $rruleset, $params=FALSE, $index=FALSE ) {
-    if( empty( $rruleset )) if( $this->getConfig( 'allowEmpty' )) $rruleset = null; else return FALSE;
+    if( empty( $rruleset )) {
+        if( $this->getConfig( 'allowEmpty' )) $rruleset = null;
+    } else {
+        return FALSE;
+    }
     $this->_setMval( $this->rrule, $this->_setRexrule( $rruleset ), $params, FALSE, $index );
     return TRUE;
   }
@@ -3392,9 +3835,12 @@ 
  * @return string
  */
   function createSequence() {
-    if( empty( $this->sequence )) return FALSE;
-    if( empty( $this->sequence['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'SEQUENCE' ) : FALSE;
+    if( empty( $this->sequence )) {
+        return FALSE;
+    }
+    if( empty( $this->sequence['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'SEQUENCE' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->sequence['params'] );
     return $this->_createElement( 'SEQUENCE', $attributes, $this->sequence['value'] );
   }
@@ -3407,8 +3853,9 @@ 
  * @return bool
  */
   function setSequence( $value=FALSE, $params=FALSE ) {
-    if( empty( $value ))
-      $value = ( isset( $this->sequence['value'] ) && ( 0 < $this->sequence['value'] )) ? $this->sequence['value'] + 1 : 1;
+    if( empty( $value )) {
+          $value = ( isset( $this->sequence['value'] ) && ( 0 < $this->sequence['value'] )) ? $this->sequence['value'] + 1 : 1;
+    }
     $this->sequence = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -3424,9 +3871,12 @@ 
  * @return string
  */
   function createStatus() {
-    if( empty( $this->status )) return FALSE;
-    if( empty( $this->status['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'STATUS' ) : FALSE;
+    if( empty( $this->status )) {
+        return FALSE;
+    }
+    if( empty( $this->status['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'STATUS' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->status['params'] );
     return $this->_createElement( 'STATUS', $attributes, $this->status['value'] );
   }
@@ -3440,7 +3890,11 @@ 
  * @return bool
  */
   function setStatus( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->status = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -3456,9 +3910,12 @@ 
  * @return string
  */
   function createSummary() {
-    if( empty( $this->summary )) return FALSE;
-    if( empty( $this->summary['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'SUMMARY' ) : FALSE;
+    if( empty( $this->summary )) {
+        return FALSE;
+    }
+    if( empty( $this->summary['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'SUMMARY' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->summary['params'], array( 'ALTREP', 'LANGUAGE' ));
     $content    = $this->_strrep( $this->summary['value'] );
     return $this->_createElement( 'SUMMARY', $attributes, $content );
@@ -3473,7 +3930,11 @@ 
  * @return bool
  */
   function setSummary( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->summary = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -3489,9 +3950,12 @@ 
  * @return string
  */
   function createTransp() {
-    if( empty( $this->transp )) return FALSE;
-    if( empty( $this->transp['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TRANSP' ) : FALSE;
+    if( empty( $this->transp )) {
+        return FALSE;
+    }
+    if( empty( $this->transp['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TRANSP' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->transp['params'] );
     return $this->_createElement( 'TRANSP', $attributes, $this->transp['value'] );
   }
@@ -3505,7 +3969,11 @@ 
  * @return bool
  */
   function setTransp( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->transp = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -3521,19 +3989,24 @@ 
  * @return string
  */
   function createTrigger() {
-    if( empty( $this->trigger )) return FALSE;
-    if( empty( $this->trigger['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TRIGGER' ) : FALSE;
+    if( empty( $this->trigger )) {
+        return FALSE;
+    }
+    if( empty( $this->trigger['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TRIGGER' ) : FALSE;
+    }
     $content = $attributes = null;
     if( isset( $this->trigger['value']['year'] )   &&
         isset( $this->trigger['value']['month'] )  &&
-        isset( $this->trigger['value']['day'] ))
-      $content      .= $this->_format_date_time( $this->trigger['value'] );
-    else {
-      if( TRUE !== $this->trigger['value']['relatedStart'] )
-        $attributes .= $this->intAttrDelimiter.'RELATED=END';
-      if( $this->trigger['value']['before'] )
-        $content    .= '-';
+        isset( $this->trigger['value']['day'] )) {
+          $content      .= $this->_format_date_time( $this->trigger['value'] );
+    } else {
+      if( TRUE !== $this->trigger['value']['relatedStart'] ) {
+              $attributes .= $this->intAttrDelimiter.'RELATED=END';
+      }
+      if( $this->trigger['value']['before'] ) {
+              $content    .= '-';
+      }
       $content      .= $this->_format_duration( $this->trigger['value'] );
     }
     $attributes     .= $this->_createParams( $this->trigger['params'] );
@@ -3557,28 +4030,30 @@ 
  * @return bool
  */
   function setTrigger( $year, $month=null, $day=null, $week=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $relatedStart=TRUE, $before=TRUE, $params=FALSE ) {
-    if( empty( $year ) && empty( $month ) && empty( $day ) && empty( $week ) && empty( $hour ) && empty( $min ) && empty( $sec ))
-      if( $this->getConfig( 'allowEmpty' )) {
+    if( empty( $year ) && empty( $month ) && empty( $day ) && empty( $week ) && empty( $hour ) && empty( $min ) && empty( $sec )) {
+          if( $this->getConfig( 'allowEmpty' )) {
         $this->trigger = array( 'value' => null, 'params' => $this->_setParams( $params ) );
+    }
         return TRUE;
+      } else {
+              return FALSE;
       }
-      else
-        return FALSE;
     if( $this->_isArrayTimestampDate( $year )) { // timestamp
       $params = $this->_setParams( $month );
       $date   = $this->_timestamp2date( $year, 7 );
-      foreach( $date as $k => $v )
-        $$k = $v;
-    }
-    elseif( is_array( $year ) && ( is_array( $month ) || empty( $month ))) {
+      foreach( $date as $k => $v ) {
+              $$k = $v;
+      }
+    } elseif( is_array( $year ) && ( is_array( $month ) || empty( $month ))) {
       $params = $this->_setParams( $month );
       if(!(array_key_exists( 'year',  $year ) &&   // exclude date-time
            array_key_exists( 'month', $year ) &&
            array_key_exists( 'day',   $year ))) {  // so this must be a duration
-        if( isset( $params['RELATED'] ) && ( 'END' == $params['RELATED'] ))
-          $relatedStart = FALSE;
-        else
-          $relatedStart = ( array_key_exists( 'relatedStart', $year ) && ( TRUE !== $year['relatedStart'] )) ? FALSE : TRUE;
+        if( isset( $params['RELATED'] ) && ( 'END' == $params['RELATED'] )) {
+                  $relatedStart = FALSE;
+        } else {
+                  $relatedStart = ( array_key_exists( 'relatedStart', $year ) && ( TRUE !== $year['relatedStart'] )) ? FALSE : TRUE;
+        }
         $before         = ( array_key_exists( 'before', $year )       && ( TRUE !== $year['before'] ))       ? FALSE : TRUE;
       }
       $SSYY  = ( array_key_exists( 'year',  $year )) ? $year['year']  : null;
@@ -3589,24 +4064,27 @@ 
       $min   = ( array_key_exists( 'min',   $year )) ? $year['min']   : 0; //null;
       $sec   = ( array_key_exists( 'sec',   $year )) ? $year['sec']   : 0; //null;
       $year  = $SSYY;
-    }
-    elseif(is_string( $year ) && ( is_array( $month ) || empty( $month ))) {  // duration or date in a string
+    } elseif(is_string( $year ) && ( is_array( $month ) || empty( $month ))) {  // duration or date in a string
       $params = $this->_setParams( $month );
       if( in_array( $year{0}, array( 'P', '+', '-' ))) { // duration
         $relatedStart = ( isset( $params['RELATED'] ) && ( 'END' == $params['RELATED'] )) ? FALSE : TRUE;
         $before       = ( '-'  == $year{0} ) ? TRUE : FALSE;
-        if(     'P'  != $year{0} )
-          $year       = substr( $year, 1 );
+        if(     'P'  != $year{0} ) {
+                  $year       = substr( $year, 1 );
+        }
         $date         = $this->_duration_string( $year);
-      }
-      else   // date
+      } else {
+          // date
         $date    = $this->_date_time_string( $year, 7 );
+      }
       unset( $year, $month, $day );
-      foreach( $date as $k => $v )
-        $$k = $v;
-    }
-    else // single values in function input parameters
+      foreach( $date as $k => $v ) {
+              $$k = $v;
+      }
+    } else {
+        // single values in function input parameters
       $params = $this->_setParams( $params );
+    }
     if( !empty( $year ) && !empty( $month ) && !empty( $day )) { // date
       $params['VALUE'] = 'DATE-TIME';
       $hour = ( $hour ) ? $hour : 0;
@@ -3621,8 +4099,7 @@ 
                                      , 'sec'   => $sec
                                      , 'tz'    => 'Z' );
       return TRUE;
-    }
-    elseif(( empty( $year ) && empty( $month )) &&    // duration
+    } elseif(( empty( $year ) && empty( $month )) &&    // duration
            (!empty( $week ) || !empty( $day ) || !empty( $hour ) || !empty( $min ) || !empty( $sec ))) {
       unset( $params['RELATED'] ); // set at output creation (END only)
       unset( $params['VALUE'] );   // 'DURATION' default
@@ -3631,11 +4108,21 @@ 
       $before       = ( FALSE !== $before )       ? TRUE : FALSE;
       $this->trigger['value']  = array( 'relatedStart' => $relatedStart
                                       , 'before'       => $before );
-      if( !empty( $week )) $this->trigger['value']['week'] = $week;
-      if( !empty( $day  )) $this->trigger['value']['day']  = $day;
-      if( !empty( $hour )) $this->trigger['value']['hour'] = $hour;
-      if( !empty( $min  )) $this->trigger['value']['min']  = $min;
-      if( !empty( $sec  )) $this->trigger['value']['sec']  = $sec;
+      if( !empty( $week )) {
+          $this->trigger['value']['week'] = $week;
+      }
+      if( !empty( $day  )) {
+          $this->trigger['value']['day']  = $day;
+      }
+      if( !empty( $hour )) {
+          $this->trigger['value']['hour'] = $hour;
+      }
+      if( !empty( $min  )) {
+          $this->trigger['value']['min']  = $min;
+      }
+      if( !empty( $sec  )) {
+          $this->trigger['value']['sec']  = $sec;
+      }
       return TRUE;
     }
     return FALSE;
@@ -3652,9 +4139,12 @@ 
  * @return string
  */
   function createTzid() {
-    if( empty( $this->tzid )) return FALSE;
-    if( empty( $this->tzid['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZID' ) : FALSE;
+    if( empty( $this->tzid )) {
+        return FALSE;
+    }
+    if( empty( $this->tzid['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZID' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->tzid['params'] );
     return $this->_createElement( 'TZID', $attributes, $this->_strrep( $this->tzid['value'] ));
   }
@@ -3668,7 +4158,11 @@ 
  * @return bool
  */
   function setTzid( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->tzid = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -3685,14 +4179,17 @@ 
  * @return string
  */
   function createTzname() {
-    if( empty( $this->tzname )) return FALSE;
+    if( empty( $this->tzname )) {
+        return FALSE;
+    }
     $output = null;
     foreach( $this->tzname as $theName ) {
       if( !empty( $theName['value'] )) {
         $attributes = $this->_createParams( $theName['params'], array( 'LANGUAGE' ));
         $output    .= $this->_createElement( 'TZNAME', $attributes, $this->_strrep( $theName['value'] ));
+      } elseif( $this->getConfig( 'allowEmpty' )) {
+          $output .= $this->_createElement( 'TZNAME' );
       }
-      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'TZNAME' );
     }
     return $output;
   }
@@ -3707,7 +4204,11 @@ 
  * @return bool
  */
   function setTzname( $value, $params=FALSE, $index=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->_setMval( $this->tzname, $value, $params, FALSE, $index );
     return TRUE;
   }
@@ -3723,9 +4224,12 @@ 
  * @return string
  */
   function createTzoffsetfrom() {
-    if( empty( $this->tzoffsetfrom )) return FALSE;
-    if( empty( $this->tzoffsetfrom['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZOFFSETFROM' ) : FALSE;
+    if( empty( $this->tzoffsetfrom )) {
+        return FALSE;
+    }
+    if( empty( $this->tzoffsetfrom['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZOFFSETFROM' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->tzoffsetfrom['params'] );
     return $this->_createElement( 'TZOFFSETFROM', $attributes, $this->tzoffsetfrom['value'] );
   }
@@ -3739,7 +4243,11 @@ 
  * @return bool
  */
   function setTzoffsetfrom( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->tzoffsetfrom = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -3755,9 +4263,12 @@ 
  * @return string
  */
   function createTzoffsetto() {
-    if( empty( $this->tzoffsetto )) return FALSE;
-    if( empty( $this->tzoffsetto['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZOFFSETTO' ) : FALSE;
+    if( empty( $this->tzoffsetto )) {
+        return FALSE;
+    }
+    if( empty( $this->tzoffsetto['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZOFFSETTO' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->tzoffsetto['params'] );
     return $this->_createElement( 'TZOFFSETTO', $attributes, $this->tzoffsetto['value'] );
   }
@@ -3771,7 +4282,11 @@ 
  * @return bool
  */
   function setTzoffsetto( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->tzoffsetto = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -3787,9 +4302,12 @@ 
  * @return string
  */
   function createTzurl() {
-    if( empty( $this->tzurl )) return FALSE;
-    if( empty( $this->tzurl['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZURL' ) : FALSE;
+    if( empty( $this->tzurl )) {
+        return FALSE;
+    }
+    if( empty( $this->tzurl['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZURL' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->tzurl['params'] );
     return $this->_createElement( 'TZURL', $attributes, $this->tzurl['value'] );
   }
@@ -3803,7 +4321,11 @@ 
  * @return boll
  */
   function setTzurl( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->tzurl = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -3819,8 +4341,9 @@ 
  * @return string
  */
   function createUid() {
-    if( 0 >= count( $this->uid ))
-      $this->_makeuid();
+    if( 0 >= count( $this->uid )) {
+          $this->_makeuid();
+    }
     $attributes = $this->_createParams( $this->uid['params'] );
     return $this->_createElement( 'UID', $attributes, $this->uid['value'] );
   }
@@ -3839,8 +4362,9 @@ 
     $end    = strlen( $base ) - 1;
     $length = 6;
     $str    = null;
-    for( $p = 0; $p < $length; $p++ )
-      $unique .= $base{mt_rand( $start, $end )};
+    for( $p = 0; $p < $length; $p++ ) {
+          $unique .= $base{mt_rand( $start, $end )};
+    }
     $this->uid = array( 'params' => null );
     $this->uid['value']  = $date.'-'.$unique.'@'.$this->getConfig( 'unique_id' );
   }
@@ -3854,7 +4378,10 @@ 
  * @return bool
  */
   function setUid( $value, $params=FALSE ) {
-    if( empty( $value )) return FALSE; // no allowEmpty check here !!!!
+    if( empty( $value )) {
+        return FALSE;
+    }
+    // no allowEmpty check here !!!!
     $this->uid = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -3870,9 +4397,12 @@ 
  * @return string
  */
   function createUrl() {
-    if( empty( $this->url )) return FALSE;
-    if( empty( $this->url['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'URL' ) : FALSE;
+    if( empty( $this->url )) {
+        return FALSE;
+    }
+    if( empty( $this->url['value'] )) {
+          return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'URL' ) : FALSE;
+    }
     $attributes = $this->_createParams( $this->url['params'] );
     return $this->_createElement( 'URL', $attributes, $this->url['value'] );
   }
@@ -3886,7 +4416,11 @@ 
  * @return bool
  */
   function setUrl( $value, $params=FALSE ) {
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $this->url = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
   }
@@ -3902,21 +4436,26 @@ 
  * @return string
  */
   function createXprop() {
-    if( empty( $this->xprop )) return FALSE;
+    if( empty( $this->xprop )) {
+        return FALSE;
+    }
     $output = null;
     foreach( $this->xprop as $label => $xpropPart ) {
       if( empty( $xpropPart['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( $label );
+        if( $this->getConfig( 'allowEmpty' )) {
+            $output .= $this->_createElement( $label );
+        }
         continue;
       }
       $attributes = $this->_createParams( $xpropPart['params'], array( 'LANGUAGE' ));
       if( is_array( $xpropPart['value'] )) {
-        foreach( $xpropPart['value'] as $pix => $theXpart )
-          $xpropPart['value'][$pix] = $this->_strrep( $theXpart );
+        foreach( $xpropPart['value'] as $pix => $theXpart ) {
+                  $xpropPart['value'][$pix] = $this->_strrep( $theXpart );
+        }
         $xpropPart['value']  = implode( ',', $xpropPart['value'] );
+      } else {
+              $xpropPart['value'] = $this->_strrep( $xpropPart['value'] );
       }
-      else
-        $xpropPart['value'] = $this->_strrep( $xpropPart['value'] );
       $output    .= $this->_createElement( $label, $attributes, $xpropPart['value'] );
     }
     return $output;
@@ -3932,12 +4471,20 @@ 
  * @return bool
  */
   function setXprop( $label, $value, $params=FALSE ) {
-    if( empty( $label )) return;
-    if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+    if( empty( $label )) {
+        return;
+    }
+    if( empty( $value )) {
+        if( $this->getConfig( 'allowEmpty' )) $value = null;
+    } else {
+        return FALSE;
+    }
     $xprop           = array( 'value' => $value );
     $toolbox         = new calendarComponent();
     $xprop['params'] = $toolbox->_setParams( $params );
-    if( !is_array( $this->xprop )) $this->xprop = array();
+    if( !is_array( $this->xprop )) {
+        $this->xprop = array();
+    }
     $this->xprop[strtoupper( $label )] = $xprop;
     return TRUE;
   }
@@ -4005,30 +4552,29 @@ 
         $attributes  = null;
         foreach( $attributes2 as $attribute ) {
           $attrKVarr = explode( '=', $attribute );
-          if( empty( $attrKVarr[0] ))
-            continue;
+          if( empty( $attrKVarr[0] )) {
+                      continue;
+          }
           if( !isset( $attrKVarr[1] )) {
             $attrValue = $attrKVarr[0];
             $attrKey   = null;
-          }
-          elseif( 2 == count( $attrKVarr)) {
+          } elseif( 2 == count( $attrKVarr)) {
             $attrKey   = strtolower( $attrKVarr[0] );
             $attrValue = $attrKVarr[1];
-          }
-          else {
+          } else {
             $attrKey   = strtolower( $attrKVarr[0] );
             unset( $attrKVarr[0] );
             $attrValue = implode( '=', $attrKVarr );
           }
           if(( 'attach' == $label ) && ( in_array( $attrKey, array( 'fmttype', 'encoding', 'value' )))) {
             $attachInlineBinary = TRUE;
-            if( 'fmttype' == $attrKey )
-              $attachfmttype = $attrKey.'='.$attrValue;
+            if( 'fmttype' == $attrKey ) {
+                          $attachfmttype = $attrKey.'='.$attrValue;
+            }
             continue;
-          }
-          elseif(( 'categories' == $label ) && ( 'language' == $attrKey ))
-            $categoriesAttrLang = $attrKey.'='.$attrValue;
-          else {
+          } elseif(( 'categories' == $label ) && ( 'language' == $attrKey )) {
+                      $categoriesAttrLang = $attrKey.'='.$attrValue;
+          } else {
             $attributes .= ( empty( $attributes )) ? ' ' : $this->attributeDelimiter.' ';
             $attributes .= ( !empty( $attrKey )) ? $attrKey.'=' : null;
             if(( '"' == substr( $attrValue, 0, 1 )) && ( '"' == substr( $attrValue, -1 ))) {
@@ -4038,8 +4584,7 @@ 
             $attributes .= '"'.htmlspecialchars( $attrValue ).'"';
           }
         }
-      }
-      else {
+      } else {
         $attributes = str_replace( $this->intAttrDelimiter, $this->attributeDelimiter, $attributes );
       }
     }
@@ -4061,8 +4606,7 @@ 
         $content = $this->_createElement( 'extref', $attributes, null );
         $attributes = null;
       }
-    }
-    elseif(( 'attach' == $label ) && $attachInlineBinary && ( 'xcal' == $this->format)) {
+    } elseif(( 'attach' == $label ) && $attachInlineBinary && ( 'xcal' == $this->format)) {
       $content = $this->nl.$this->_createElement( 'b64bin', $attachfmttype, $content ); // max one attribute
     }
     $output .= $attributes;
@@ -4106,30 +4650,30 @@ 
     $CNattrExist = $LANGattrExist = FALSE;
     if( is_array( $params )) {
       foreach( $params as $paramKey => $paramValue ) {
-        if( is_int( $paramKey ))
-          $attr2            .= $this->intAttrDelimiter.$paramValue;
-        elseif(( 'LANGUAGE' == $paramKey ) && $LANGattrKey ) {
+        if( is_int( $paramKey )) {
+                  $attr2            .= $this->intAttrDelimiter.$paramValue;
+        } elseif(( 'LANGUAGE' == $paramKey ) && $LANGattrKey ) {
           $attrLANG         .= $this->intAttrDelimiter."LANGUAGE=$paramValue";
           $LANGattrExist     = TRUE;
-        }
-        elseif(( 'CN'       == $paramKey ) && $CNattrKey ) {
+        } elseif(( 'CN'       == $paramKey ) && $CNattrKey ) {
           $attr1             = $this->intAttrDelimiter.'CN="'.$paramValue.'"';
           $CNattrExist       = TRUE;
+        } elseif(( 'ALTREP'   == $paramKey ) && in_array( $paramKey, $ctrKeys )) {
+                  $attr2            .= $this->intAttrDelimiter.'ALTREP="'.$paramValue.'"';
+        } elseif(( 'DIR'      == $paramKey ) && in_array( $paramKey, $ctrKeys )) {
+                  $attr2            .= $this->intAttrDelimiter.'DIR="'.$paramValue.'"';
+        } elseif(( 'SENT-BY'  == $paramKey ) && in_array( $paramKey, $ctrKeys )) {
+                  $attr2            .= $this->intAttrDelimiter.'SENT-BY="MAILTO:'.$paramValue.'"';
+        } else {
+                  $attr2            .= $this->intAttrDelimiter."$paramKey=$paramValue";
         }
-        elseif(( 'ALTREP'   == $paramKey ) && in_array( $paramKey, $ctrKeys ))
-          $attr2            .= $this->intAttrDelimiter.'ALTREP="'.$paramValue.'"';
-        elseif(( 'DIR'      == $paramKey ) && in_array( $paramKey, $ctrKeys ))
-          $attr2            .= $this->intAttrDelimiter.'DIR="'.$paramValue.'"';
-        elseif(( 'SENT-BY'  == $paramKey ) && in_array( $paramKey, $ctrKeys ))
-          $attr2            .= $this->intAttrDelimiter.'SENT-BY="MAILTO:'.$paramValue.'"';
-        else
-          $attr2            .= $this->intAttrDelimiter."$paramKey=$paramValue";
       }
     }
     if( !$LANGattrExist ) {
       $lang = $this->getConfig( 'language' );
-      if(( $CNattrExist || $LANGattrKey ) && $lang )
-        $attrLANG .= $this->intAttrDelimiter.'LANGUAGE='.$lang;
+      if(( $CNattrExist || $LANGattrKey ) && $lang ) {
+              $attrLANG .= $this->intAttrDelimiter.'LANGUAGE='.$lang;
+      }
     }
     return $attrLANG.$attr1.$attr2;
   }
@@ -4143,47 +4687,57 @@ 
  * @return array $params, property parameters
  */
   function _chkdatecfg( $theDate, & $parno, & $params ) {
-    if( isset( $params['TZID'] ))
-      $parno = 6;
-    elseif( isset( $params['VALUE'] ) && ( 'DATE' == $params['VALUE'] ))
-      $parno = 3;
-    else {
-      if( isset( $params['VALUE'] ) && ( 'PERIOD' == $params['VALUE'] ))
-        $parno = 7;
+    if( isset( $params['TZID'] )) {
+          $parno = 6;
+    } elseif( isset( $params['VALUE'] ) && ( 'DATE' == $params['VALUE'] )) {
+          $parno = 3;
+    } else {
+      if( isset( $params['VALUE'] ) && ( 'PERIOD' == $params['VALUE'] )) {
+              $parno = 7;
+      }
       if( is_array( $theDate )) {
-        if( isset( $theDate['timestamp'] ))
-          $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : null;
-        else
-          $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : ( 7 == count( $theDate )) ? end( $theDate ) : null;
+        if( isset( $theDate['timestamp'] )) {
+                  $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : null;
+        } else {
+                  $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : ( 7 == count( $theDate )) ? end( $theDate ) : null;
+        }
         if( !empty( $tzid )) {
           $parno = 7;
-          if( !$this->_isOffset( $tzid ))
-            $params['TZID'] = $tzid; // save only timezone
+          if( !$this->_isOffset( $tzid )) {
+                      $params['TZID'] = $tzid;
+          }
+          // save only timezone
+        } elseif( !$parno && ( 3 == count( $theDate )) && 
+          ( isset( $params['VALUE'] ) && ( 'DATE' == $params['VALUE'] ))) {
+                  $parno = 3;
+        } else {
+                  $parno = 6;
         }
-        elseif( !$parno && ( 3 == count( $theDate )) && 
-          ( isset( $params['VALUE'] ) && ( 'DATE' == $params['VALUE'] )))
-          $parno = 3;
-        else
-          $parno = 6;
-      }
-      else { // string
+      } else { // string
         $date = trim( $theDate );
-        if( 'Z' == substr( $date, -1 ))
-          $parno = 7; // UTC DATE-TIME
+        if( 'Z' == substr( $date, -1 )) {
+                  $parno = 7;
+        }
+        // UTC DATE-TIME
         elseif((( 8 == strlen( $date ) && ctype_digit( $date )) || ( 11 >= strlen( $date ))) && 
-          ( !isset( $params['VALUE'] ) || !in_array( $params['VALUE'], array( 'DATE-TIME', 'PERIOD' ))))
-          $parno = 3; // DATE
+          ( !isset( $params['VALUE'] ) || !in_array( $params['VALUE'], array( 'DATE-TIME', 'PERIOD' )))) {
+                  $parno = 3;
+        }
+        // DATE
         $date = $this->_date_time_string( $date, $parno );
         if( !empty( $date['tz'] )) {
           $parno = 7;
-          if( !$this->_isOffset( $date['tz'] ))
-            $params['TZID'] = $date['tz']; // save only timezone
+          if( !$this->_isOffset( $date['tz'] )) {
+                      $params['TZID'] = $date['tz'];
+          }
+          // save only timezone
+        } elseif( empty( $parno )) {
+                  $parno = 6;
         }
-        elseif( empty( $parno ))
-          $parno = 6;
       }
-      if( isset( $params['TZID'] ))
-        $parno = 6;
+      if( isset( $params['TZID'] )) {
+              $parno = 6;
+      }
     }
   }
 /**
@@ -4199,14 +4753,18 @@ 
  */
   function _date2duration( $startdate=FALSE, $enddate=FALSE ) {
     if( !$startdate || !$enddate ) {
-      if(   FALSE === ( $startdate = $this->getProperty( 'dtstart' )))
-        return null;
-      if(   FALSE === ( $enddate   = $this->getProperty( 'dtend' )))    // vevent/vfreebusy
+      if(   FALSE === ( $startdate = $this->getProperty( 'dtstart' ))) {
+              return null;
+      }
+      if(   FALSE === ( $enddate   = $this->getProperty( 'dtend' ))) {
+          // vevent/vfreebusy
         if( FALSE === ( $enddate   = $this->getProperty( 'due' )))      // vtodo
           return null;
+      }
+    }
+    if( !$startdate || !$enddate ) {
+          return null;
     }
-    if( !$startdate || !$enddate )
-      return null;
     $startWdate  = mktime( 0, 0, 0, $startdate['month'], $startdate['day'], $startdate['year'] );
     $endWdate    = mktime( 0, 0, 0, $enddate['month'],   $enddate['day'],   $enddate['year'] );
     $wduration   = $endWdate - $startWdate;
@@ -4232,15 +4790,23 @@ 
  */
   function _date2timestamp( $datetime, $tz=null ) {
     $output = null;
-    if( !isset( $datetime['hour'] )) $datetime['hour'] = '0';
-    if( !isset( $datetime['min'] ))  $datetime['min']  = '0';
-    if( !isset( $datetime['sec'] ))  $datetime['sec']  = '0';
+    if( !isset( $datetime['hour'] )) {
+        $datetime['hour'] = '0';
+    }
+    if( !isset( $datetime['min'] )) {
+        $datetime['min']  = '0';
+    }
+    if( !isset( $datetime['sec'] )) {
+        $datetime['sec']  = '0';
+    }
     foreach( $datetime as $dkey => $dvalue ) {
-      if( 'tz' != $dkey )
-        $datetime[$dkey] = (integer) $dvalue;
+      if( 'tz' != $dkey ) {
+              $datetime[$dkey] = (integer) $dvalue;
+      }
+    }
+    if( $tz ) {
+          $datetime['tz'] = $tz;
     }
-    if( $tz )
-      $datetime['tz'] = $tz;
     $offset = ( isset( $datetime['tz'] ) && ( '' < trim ( $datetime['tz'] ))) ? $this->_tz2offset( $datetime['tz'] ) : 0;
     $output = mktime( $datetime['hour'], $datetime['min'], ($datetime['sec'] + $offset), $datetime['month'], $datetime['day'], $datetime['year'] );
     return $output;
@@ -4275,12 +4841,15 @@ 
       }
     }
     if( 3 != $parno ) {
-      if( !isset( $output['hour'] ))
-        $output['hour'] = 0;
-      if( !isset( $output['min']  ))
-        $output['min'] = 0;
-      if( !isset( $output['sec']  ))
-        $output['sec'] = 0;
+      if( !isset( $output['hour'] )) {
+              $output['hour'] = 0;
+      }
+      if( !isset( $output['min']  )) {
+              $output['min'] = 0;
+      }
+      if( !isset( $output['sec']  )) {
+              $output['sec'] = 0;
+      }
     }
     return $output;
   }
@@ -4300,39 +4869,37 @@ 
     if( 'Z' == substr( $datetime, -1 )) {
       $tz = 'Z';
       $datetime = trim( substr( $datetime, 0, $len ));
-    }
-    elseif( ( ctype_digit( substr( $datetime, -2, 2 ))) && // time or date
+    } elseif( ( ctype_digit( substr( $datetime, -2, 2 ))) && // time or date
                   ( '-' == substr( $datetime, -3, 1 )) ||
                   ( ':' == substr( $datetime, -3, 1 )) ||
                   ( '.' == substr( $datetime, -3, 1 ))) {
       $continue = TRUE;
-    }
-    elseif( ( ctype_digit( substr( $datetime, -4, 4 ))) && // 4 pos offset
+    } elseif( ( ctype_digit( substr( $datetime, -4, 4 ))) && // 4 pos offset
             ( ' +' == substr( $datetime, -6, 2 )) ||
             ( ' -' == substr( $datetime, -6, 2 ))) {
       $tz = substr( $datetime, -5, 5 );
       $datetime = substr( $datetime, 0, ($len - 5));
-    }
-    elseif( ( ctype_digit( substr( $datetime, -6, 6 ))) && // 6 pos offset
+    } elseif( ( ctype_digit( substr( $datetime, -6, 6 ))) && // 6 pos offset
             ( ' +' == substr( $datetime, -8, 2 )) ||
             ( ' -' == substr( $datetime, -8, 2 ))) {
       $tz = substr( $datetime, -7, 7 );
       $datetime = substr( $datetime, 0, ($len - 7));
-    }
-    elseif( ( 6 < $len ) && ( ctype_digit( substr( $datetime, -6, 6 )))) {
+    } elseif( ( 6 < $len ) && ( ctype_digit( substr( $datetime, -6, 6 )))) {
       $continue = TRUE;
-    }
-    elseif( 'T' ==  substr( $datetime, -7, 1 )) {
+    } elseif( 'T' ==  substr( $datetime, -7, 1 )) {
       $continue = TRUE;
-    }
-    else {
+    } else {
       $cx  = $tx = 0;    //  19970415T133000 US-Eastern
       for( $cx = -1; $cx > ( 9 - $len ); $cx-- ) {
-        if(( ' ' == substr( $datetime, $cx, 1 )) || ctype_digit( substr( $datetime, $cx, 1 )))
-          break; // if exists, tz ends here.. . ?
+        if(( ' ' == substr( $datetime, $cx, 1 )) || ctype_digit( substr( $datetime, $cx, 1 ))) {
+                  break;
+        }
+        // if exists, tz ends here.. . ?
         elseif( ctype_alpha( substr( $datetime, $cx, 1 )) ||
-             ( in_array( substr( $datetime, $cx, 1 ), array( '-', '/' ))))
-          $tx--; // tz length counter
+             ( in_array( substr( $datetime, $cx, 1 ), array( '-', '/' )))) {
+                  $tx--;
+        }
+        // tz length counter
       }
       if( 0 > $tx ) {
         $tz = substr( $datetime, $tx );
@@ -4341,8 +4908,7 @@ 
     }
     if( 0 < substr_count( $datetime, '-' )) {
       $datetime = str_replace( '-', '/', $datetime );
-    }
-    elseif( ctype_digit( substr( $datetime, 0, 8 )) &&
+    } elseif( ctype_digit( substr( $datetime, 0, 8 )) &&
            ( 'T' ==      substr( $datetime, 8, 1 )) &&
             ctype_digit( substr( $datetime, 9, 6 ))) {
       $datetime = substr( $datetime,  4, 2 )
@@ -4362,10 +4928,10 @@ 
       $output['hour']  = substr( $datestring, 11, 2 );
       $output['min']   = substr( $datestring, 14, 2 );
       $output['sec']   = substr( $datestring, 17, 2 );
-      if( !empty( $tz ))
-        $output['tz']  = $tz;
-    }
-    elseif( 3 != $parno ) {
+      if( !empty( $tz )) {
+              $output['tz']  = $tz;
+      }
+    } elseif( 3 != $parno ) {
       if(( '00' < substr( $datestring, 11, 2 )) ||
          ( '00' < substr( $datestring, 14, 2 )) ||
          ( '00' < substr( $datestring, 17, 2 ))) {
@@ -4373,8 +4939,9 @@ 
         $output['min']   = substr( $datestring, 14, 2 );
         $output['sec']   = substr( $datestring, 17, 2 );
       }
-      if( !empty( $tz ))
-        $output['tz']  = $tz;
+      if( !empty( $tz )) {
+              $output['tz']  = $tz;
+      }
     }
     return $output;
   }
@@ -4401,10 +4968,11 @@ 
       $durseconds  =           $durseconds % ( 60 * 60 );
       $output['min']  = floor( $durseconds / ( 60 ));
       $output['sec']  =      ( $durseconds % ( 60 ));
-    }
-    else {
+    } else {
       foreach( $duration as $durKey => $durValue ) {
-        if( empty( $durValue )) continue;
+        if( empty( $durValue )) {
+            continue;
+        }
         switch ( $durKey ) {
           case '0': case 'week': $output['week']  = $durValue; break;
           case '1': case 'day':  $output['day']   = $durValue; break;
@@ -4419,14 +4987,22 @@ 
       return $output;
     }
     unset( $output['week'] );
-    if( empty( $output['day'] ))
-      unset( $output['day'] );
+    if( empty( $output['day'] )) {
+          unset( $output['day'] );
+    }
     if ( isset( $output['hour'] ) || isset( $output['min'] ) || isset( $output['sec'] )) {
-      if( !isset( $output['hour'] )) $output['hour'] = 0;
-      if( !isset( $output['min']  )) $output['min']  = 0;
-      if( !isset( $output['sec']  )) $output['sec']  = 0;
-      if(( 0 == $output['hour'] ) && ( 0 == $output['min'] ) && ( 0 == $output['sec'] ))
-        unset( $output['hour'], $output['min'], $output['sec'] );
+      if( !isset( $output['hour'] )) {
+          $output['hour'] = 0;
+      }
+      if( !isset( $output['min']  )) {
+          $output['min']  = 0;
+      }
+      if( !isset( $output['sec']  )) {
+          $output['sec']  = 0;
+      }
+      if(( 0 == $output['hour'] ) && ( 0 == $output['min'] ) && ( 0 == $output['sec'] )) {
+              unset( $output['hour'], $output['min'], $output['sec'] );
+      }
     }
     return $output;
   }
@@ -4443,28 +5019,32 @@ 
     if( $startdate && $duration ) {
       $d1               = $startdate;
       $dur              = $duration;
-    }
-    elseif( isset( $this->dtstart['value'] ) && isset( $this->duration['value'] )) {
+    } elseif( isset( $this->dtstart['value'] ) && isset( $this->duration['value'] )) {
       $d1               = $this->dtstart['value'];
       $dur              = $this->duration['value'];
+    } else {
+          return null;
     }
-    else
-      return null;
     $dateOnly         = ( isset( $d1['hour'] ) || isset( $d1['min'] ) || isset( $d1['sec'] )) ? FALSE : TRUE;
     $d1['hour']       = ( isset( $d1['hour'] )) ? $d1['hour'] : 0;
     $d1['min']        = ( isset( $d1['min'] ))  ? $d1['min']  : 0;
     $d1['sec']        = ( isset( $d1['sec'] ))  ? $d1['sec']  : 0;
     $dtend = mktime( $d1['hour'], $d1['min'], $d1['sec'], $d1['month'], $d1['day'], $d1['year'] );
-    if( isset( $dur['week'] ))
-      $dtend += ( $dur['week'] * 7 * 24 * 60 * 60 );
-    if( isset( $dur['day'] ))
-      $dtend += ( $dur['day'] * 24 * 60 * 60 );
-    if( isset( $dur['hour'] ))
-      $dtend += ( $dur['hour'] * 60 *60 );
-    if( isset( $dur['min'] ))
-      $dtend += ( $dur['min'] * 60 );
-    if( isset( $dur['sec'] ))
-      $dtend +=   $dur['sec'];
+    if( isset( $dur['week'] )) {
+          $dtend += ( $dur['week'] * 7 * 24 * 60 * 60 );
+    }
+    if( isset( $dur['day'] )) {
+          $dtend += ( $dur['day'] * 24 * 60 * 60 );
+    }
+    if( isset( $dur['hour'] )) {
+          $dtend += ( $dur['hour'] * 60 *60 );
+    }
+    if( isset( $dur['min'] )) {
+          $dtend += ( $dur['min'] * 60 );
+    }
+    if( isset( $dur['sec'] )) {
+          $dtend +=   $dur['sec'];
+    }
     $dtend2 = array();
     $dtend2['year']   = date('Y', $dtend );
     $dtend2['month']  = date('m', $dtend );
@@ -4472,10 +5052,12 @@ 
     $dtend2['hour']   = date('H', $dtend );
     $dtend2['min']    = date('i', $dtend );
     $dtend2['sec']    = date('s', $dtend );
-    if( isset( $d1['tz'] ))
-      $dtend2['tz']   = $d1['tz'];
-    if( $dateOnly && (( 0 == $dtend2['hour'] ) && ( 0 == $dtend2['min'] ) && ( 0 == $dtend2['sec'] )))
-      unset( $dtend2['hour'], $dtend2['min'], $dtend2['sec'] );
+    if( isset( $d1['tz'] )) {
+          $dtend2['tz']   = $d1['tz'];
+    }
+    if( $dateOnly && (( 0 == $dtend2['hour'] ) && ( 0 == $dtend2['min'] ) && ( 0 == $dtend2['sec'] ))) {
+          unset( $dtend2['hour'], $dtend2['min'], $dtend2['sec'] );
+    }
     return $dtend2;
   }
 /**
@@ -4489,10 +5071,12 @@ 
   function _duration_string( $duration ) {
    $duration = (string) trim( $duration );
    while( 'P' != strtoupper( substr( $duration, 0, 1 ))) {
-     if( 0 < strlen( $duration ))
-       $duration = substr( $duration, 1 );
-     else
-       return false; // no leading P !?!?
+     if( 0 < strlen( $duration )) {
+            $duration = substr( $duration, 1 );
+     } else {
+            return false;
+     }
+     // no leading P !?!?
    }
    $duration = substr( $duration, 1 ); // skip P
    $duration = str_replace ( 't', 'T', $duration );
@@ -4522,10 +5106,13 @@ 
         $val            = null;
         break;
       default:
-        if( !ctype_digit( $duration{$ix} ))
-          return false; // unknown duration controll character  !?!?
-        else
-          $val .= $duration{$ix};
+        if( !ctype_digit( $duration{$ix} )) {
+                  return false;
+        }
+        // unknown duration controll character  !?!?
+        else {
+                  $val .= $duration{$ix};
+        }
      }
    }
    return $this->_duration_array( $output );
@@ -4544,10 +5131,12 @@ 
  * @return int
  */
   function _existRem( &$array, $expkey, $expval=FALSE, $hitVal=null, $elseVal=null, $preSet=null ) {
-    if( $preSet )
-      return $preSet;
-    if( !is_array( $array ) || ( 0 == count( $array )))
-      return $elseVal;
+    if( $preSet ) {
+          return $preSet;
+    }
+    if( !is_array( $array ) || ( 0 == count( $array ))) {
+          return $elseVal;
+    }
     foreach( $array as $key => $value ) {
       if( strtoupper( $expkey ) == strtoupper( $key )) {
         if( !$expval || ( strtoupper( $expval ) == strtoupper( $array[$key] ))) {
@@ -4573,13 +5162,15 @@ 
         !isset( $datetime['day'] )   &&
         !isset( $datetime['hour'] )  &&
         !isset( $datetime['min'] )   &&
-        !isset( $datetime['sec'] ))
-      return ;
+        !isset( $datetime['sec'] )) {
+          return ;
+    }
     $output = null;
     // if( !isset( $datetime['day'] )) { $o=''; foreach($datetime as $k=>$v) {if(is_array($v)) $v=implode('-',$v);$o.=" $k=>$v";} echo " day SAKNAS : $o <br />\n"; }
     foreach( $datetime as $dkey => $dvalue ) {
-      if( 'tz' != $dkey )
-        $datetime[$dkey] = (integer) $dvalue;
+      if( 'tz' != $dkey ) {
+              $datetime[$dkey] = (integer) $dvalue;
+      }
     }
     $output = date('Ymd', mktime( 0, 0, 0, $datetime['month'], $datetime['day'], $datetime['year']));
     if( isset( $datetime['hour'] )  ||
@@ -4587,29 +5178,33 @@ 
         isset( $datetime['sec'] )   ||
         isset( $datetime['tz'] )) {
       if( isset( $datetime['tz'] )  &&
-         !isset( $datetime['hour'] ))
-        $datetime['hour'] = 0;
+         !isset( $datetime['hour'] )) {
+              $datetime['hour'] = 0;
+      }
       if( isset( $datetime['hour'] )  &&
-         !isset( $datetime['min'] ))
-        $datetime['min'] = 0;
+         !isset( $datetime['min'] )) {
+              $datetime['min'] = 0;
+      }
       if( isset( $datetime['hour'] )  &&
           isset( $datetime['min'] )   &&
-         !isset( $datetime['sec'] ))
-        $datetime['sec'] = 0;
+         !isset( $datetime['sec'] )) {
+              $datetime['sec'] = 0;
+      }
       $date = mktime( $datetime['hour'], $datetime['min'], $datetime['sec'], $datetime['month'], $datetime['day'], $datetime['year']);
       $output .= date('\THis', $date );
       if( isset( $datetime['tz'] ) && ( '' < trim ( $datetime['tz'] ))) {
         $datetime['tz'] = trim( $datetime['tz'] );
-        if( 'Z' == $datetime['tz'] )
-          $output .= 'Z';
+        if( 'Z' == $datetime['tz'] ) {
+                  $output .= 'Z';
+        }
         $offset = $this->_tz2offset( $datetime['tz'] );
         if( 0 != $offset ) {
           $date = mktime( $datetime['hour'], $datetime['min'], ($datetime['sec'] + $offset), $datetime['month'], $datetime['day'], $datetime['year']);
           $output    = date( 'Ymd\THis\Z', $date );
         }
+      } elseif( 7 == $parno ) {
+              $output .= 'Z';
       }
-      elseif( 7 == $parno )
-        $output .= 'Z';
     }
     return $output;
   }
@@ -4626,14 +5221,16 @@ 
         !isset( $duration['day'] )  &&
         !isset( $duration['hour'] ) &&
         !isset( $duration['min'] )  &&
-        !isset( $duration['sec'] ))
-      return;
+        !isset( $duration['sec'] )) {
+          return;
+    }
     $output = 'P';
-    if( isset( $duration['week'] ) && ( 0 < $duration['week'] ))
-      $output   .= $duration['week'].'W';
-    else {
-      if( isset($duration['day'] ) && ( 0 < $duration['day'] ))
-        $output .= $duration['day'].'D';
+    if( isset( $duration['week'] ) && ( 0 < $duration['week'] )) {
+          $output   .= $duration['week'].'W';
+    } else {
+      if( isset($duration['day'] ) && ( 0 < $duration['day'] )) {
+              $output .= $duration['day'].'D';
+      }
       if(( isset( $duration['hour']) && ( 0 < $duration['hour'] )) ||
          ( isset( $duration['min'])  && ( 0 < $duration['min'] ))  ||
          ( isset( $duration['sec'])  && ( 0 < $duration['sec'] ))) {
@@ -4658,7 +5255,9 @@ 
     $output = null;
     foreach( $recurdata as $therule ) {
       if( empty( $therule['value'] )) {
-        if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( $recurlabel );
+        if( $this->getConfig( 'allowEmpty' )) {
+            $output .= $this->_createElement( $recurlabel );
+        }
         continue;
       }
       $attributes = ( isset( $therule['params'] )) ? $this->_createParams( $therule['params'] ) : null;
@@ -4694,9 +5293,9 @@ 
                 $content2 .= ( $vix ) ? ',' : null;
                 $content2 .= $valuePart;
               }
+            } else {
+                         $content2 .= $rulevalue;
             }
-            else
-             $content2 .= $rulevalue;
             break;
           }
           case 'BYDAY': {
@@ -4707,19 +5306,19 @@ 
               if( is_array( $valuePart )) {
                 $content2 .= ( $bydaycnt ) ? ',' : null;
                 foreach( $valuePart as $vix2 => $valuePart2 ) {
-                  if( 'DAY' != strtoupper( $vix2 ))
-                      $content21 .= $valuePart2;
-                  else
-                    $content22 .= $valuePart2;
+                  if( 'DAY' != strtoupper( $vix2 )) {
+                                        $content21 .= $valuePart2;
+                  } else {
+                                      $content22 .= $valuePart2;
+                  }
                 }
                 $content2 .= $content21.$content22;
                 $bydaycnt++;
-              }
-              else {
+              } else {
                 $content2 .= ( $bydaycnt ) ? ',' : null;
-                if( 'DAY' != strtoupper( $vix ))
-                    $content21 .= $valuePart;
-                else {
+                if( 'DAY' != strtoupper( $vix )) {
+                                    $content21 .= $valuePart;
+                } else {
                   $content22 .= $valuePart;
                   $bydaycnt++;
                 }
@@ -4765,24 +5364,32 @@ 
  * @return bool
  */
   function _isArrayDate( $input ) {
-    if( isset( $input['week'] ) || ( !in_array( count( $input ), array( 3, 6, 7 ))))
-      return FALSE;
-    if( 7 == count( $input ))
-      return TRUE;
-    if( isset( $input['year'] ) && isset( $input['month'] ) && isset( $input['day'] ))
-      return checkdate( (int) $input['month'], (int) $input['day'], (int) $input['year'] );
-    if( isset( $input['day'] ) || isset( $input['hour'] ) || isset( $input['min'] ) || isset( $input['sec'] ))
-      return FALSE;
-    if( in_array( 0, $input ))
-      return FALSE;
-    if(( 1970 > $input[0] ) || ( 12 < $input[1] ) || ( 31 < $input[2] ))
-      return FALSE;
+    if( isset( $input['week'] ) || ( !in_array( count( $input ), array( 3, 6, 7 )))) {
+          return FALSE;
+    }
+    if( 7 == count( $input )) {
+          return TRUE;
+    }
+    if( isset( $input['year'] ) && isset( $input['month'] ) && isset( $input['day'] )) {
+          return checkdate( (int) $input['month'], (int) $input['day'], (int) $input['year'] );
+    }
+    if( isset( $input['day'] ) || isset( $input['hour'] ) || isset( $input['min'] ) || isset( $input['sec'] )) {
+          return FALSE;
+    }
+    if( in_array( 0, $input )) {
+          return FALSE;
+    }
+    if(( 1970 > $input[0] ) || ( 12 < $input[1] ) || ( 31 < $input[2] )) {
+          return FALSE;
+    }
     if(( isset( $input[0] ) && isset( $input[1] ) && isset( $input[2] )) &&
-         checkdate( (int) $input[1], (int) $input[2], (int) $input[0] ))
-      return TRUE;
+         checkdate( (int) $input[1], (int) $input[2], (int) $input[0] )) {
+          return TRUE;
+    }
     $input = $this->_date_time_string( $input[1].'/'.$input[2].'/'.$input[0], 3 ); //  m - d - Y
-    if( isset( $input['year'] ) && isset( $input['month'] ) && isset( $input['day'] ))
-      return checkdate( (int) $input['month'], (int) $input['day'], (int) $input['year'] );
+    if( isset( $input['year'] ) && isset( $input['month'] ) && isset( $input['day'] )) {
+          return checkdate( (int) $input['month'], (int) $input['day'], (int) $input['year'] );
+    }
     return FALSE;
   }
 /**
@@ -4806,16 +5413,17 @@ 
  */
   function _isOffset( $input ) {
     $input         = trim( (string) $input );
-    if( 'Z' == substr( $input, -1 ))
-      return TRUE;
-    elseif((   5 <= strlen( $input )) &&
+    if( 'Z' == substr( $input, -1 )) {
+          return TRUE;
+    } elseif((   5 <= strlen( $input )) &&
        ( in_array( substr( $input, -5, 1 ), array( '+', '-' ))) &&
-       (   '0000'  < substr( $input, -4 )) && (   '9999' >= substr( $input, -4 )))
-      return TRUE;
-    elseif((    7 <= strlen( $input )) &&
+       (   '0000'  < substr( $input, -4 )) && (   '9999' >= substr( $input, -4 ))) {
+          return TRUE;
+    } elseif((    7 <= strlen( $input )) &&
        ( in_array( substr( $input, -7, 1 ), array( '+', '-' ))) &&
-       ( '000000'  < substr( $input, -6 )) && ( '999999' >= substr( $input, -6 )))
-      return TRUE;
+       ( '000000'  < substr( $input, -6 )) && ( '999999' >= substr( $input, -6 ))) {
+          return TRUE;
+    }
     return FALSE;
 
   }
@@ -4828,14 +5436,29 @@ 
  * @return bool
  */
   function _notExistProp( $propName ) {
-    if( empty( $propName )) return FALSE; // when deleting x-prop, an empty propName may be used=allowed
+    if( empty( $propName )) {
+        return FALSE;
+    }
+    // when deleting x-prop, an empty propName may be used=allowed
     $propName = strtolower( $propName );
-    if(     'last-modified'    == $propName )  { if( !isset( $this->lastmodified ))    return TRUE; }
-    elseif( 'percent-complete' == $propName )  { if( !isset( $this->percentcomplete )) return TRUE; }
-    elseif( 'recurrence-id'    == $propName )  { if( !isset( $this->recurrenceid ))    return TRUE; }
-    elseif( 'related-to'       == $propName )  { if( !isset( $this->relatedto ))       return TRUE; }
-    elseif( 'request-status'   == $propName )  { if( !isset( $this->requeststatus ))   return TRUE; }
-    elseif((       'x-' != substr($propName,0,2)) && !isset( $this->$propName ))       return TRUE;
+    if(     'last-modified'    == $propName )  { if( !isset( $this->lastmodified )) {
+        return TRUE;
+    }
+    } elseif( 'percent-complete' == $propName )  { if( !isset( $this->percentcomplete )) {
+        return TRUE;
+    }
+    } elseif( 'recurrence-id'    == $propName )  { if( !isset( $this->recurrenceid )) {
+        return TRUE;
+    }
+    } elseif( 'related-to'       == $propName )  { if( !isset( $this->relatedto )) {
+        return TRUE;
+    }
+    } elseif( 'request-status'   == $propName )  { if( !isset( $this->requeststatus )) {
+        return TRUE;
+    }
+    } elseif((       'x-' != substr($propName,0,2)) && !isset( $this->$propName )) {
+        return TRUE;
+    }
     return FALSE;
   }
 /**
@@ -4854,7 +5477,9 @@ 
  * @todo BYHOUR, BYMINUTE, BYSECOND, ev. BYSETPOS due to ambiguity, WEEKLY at year end/start
  */
   function _recur2date( & $result, $recur, $wdate, $startdate, $enddate=FALSE ) {
-    foreach( $wdate as $k => $v ) if( ctype_digit( $v )) $wdate[$k] = (int) $v;
+    foreach( $wdate as $k => $v ) {
+        if( ctype_digit( $v )) $wdate[$k] = (int) $v;
+    }
     $wdatets     = $this->_date2timestamp( $wdate );
     $startdatets = $this->_date2timestamp( $startdate );
     if( !$enddate ) {
@@ -4863,43 +5488,54 @@ 
 // echo "recur __in_ ".implode('-',$startdate)." period start ".implode('-',$wdate)." period end ".implode('-',$enddate)."<br />\n";print_r($recur);echo "<br />\n";//test###
     }
     $endDatets = $this->_date2timestamp( $enddate ); // fix break
-    if( !isset( $recur['COUNT'] ) && !isset( $recur['UNTIL'] ))
-      $recur['UNTIL'] = $enddate; // create break
+    if( !isset( $recur['COUNT'] ) && !isset( $recur['UNTIL'] )) {
+          $recur['UNTIL'] = $enddate;
+    }
+    // create break
     if( isset( $recur['UNTIL'] )) {
       $tdatets = $this->_date2timestamp( $recur['UNTIL'] );
       if( $endDatets > $tdatets ) {
         $endDatets = $tdatets; // emergency break
         $enddate   = $this->_timestamp2date( $endDatets, 6 );
+      } else {
+              $recur['UNTIL'] = $this->_timestamp2date( $endDatets, 6 );
       }
-      else
-        $recur['UNTIL'] = $this->_timestamp2date( $endDatets, 6 );
     }
     if( $wdatets > $endDatets ) {
      //echo "recur out of date ".implode('-',$this->_date_time_string(date('Y-m-d H:i:s',$wdatets),6))."<br />\n";//test
       return array(); // nothing to do.. .
     }
-    if( !isset( $recur['FREQ'] )) // "MUST be specified.. ."
-      $recur['FREQ'] = 'DAILY'; // ??
+    if( !isset( $recur['FREQ'] )) {
+        // "MUST be specified.. ."
+      $recur['FREQ'] = 'DAILY';
+    }
+    // ??
     $wkst = ( isset( $recur['WKST'] ) && ( 'SU' == $recur['WKST'] )) ? 24*60*60 : 0; // ??
-    if( !isset( $recur['INTERVAL'] ))
-      $recur['INTERVAL'] = 1;
+    if( !isset( $recur['INTERVAL'] )) {
+          $recur['INTERVAL'] = 1;
+    }
     $countcnt = ( !isset( $recur['BYSETPOS'] )) ? 1 : 0; // DTSTART counts as the first occurrence
             /* find out how to step up dates and set index for interval count */
     $step = array();
-    if( 'YEARLY' == $recur['FREQ'] )
-      $step['year']  = 1;
-    elseif( 'MONTHLY' == $recur['FREQ'] )
-      $step['month'] = 1;
-    elseif( 'WEEKLY' == $recur['FREQ'] )
-      $step['day']   = 7;
-    else
-      $step['day']   = 1;
-    if( isset( $step['year'] ) && isset( $recur['BYMONTH'] ))
-      $step = array( 'month' => 1 );
-    if( empty( $step ) && isset( $recur['BYWEEKNO'] )) // ??
+    if( 'YEARLY' == $recur['FREQ'] ) {
+          $step['year']  = 1;
+    } elseif( 'MONTHLY' == $recur['FREQ'] ) {
+          $step['month'] = 1;
+    } elseif( 'WEEKLY' == $recur['FREQ'] ) {
+          $step['day']   = 7;
+    } else {
+          $step['day']   = 1;
+    }
+    if( isset( $step['year'] ) && isset( $recur['BYMONTH'] )) {
+          $step = array( 'month' => 1 );
+    }
+    if( empty( $step ) && isset( $recur['BYWEEKNO'] )) {
+        // ??
       $step = array( 'day' => 7 );
-    if( isset( $recur['BYYEARDAY'] ) || isset( $recur['BYMONTHDAY'] ) || isset( $recur['BYDAY'] ))
-      $step = array( 'day' => 1 );
+    }
+    if( isset( $recur['BYYEARDAY'] ) || isset( $recur['BYMONTHDAY'] ) || isset( $recur['BYDAY'] )) {
+          $step = array( 'day' => 1 );
+    }
     $intervalarr = array();
     if( 1 < $recur['INTERVAL'] ) {
       $intervalix = $this->_recurIntervalIx( $recur['FREQ'], $wdate, $wkst );
@@ -4912,11 +5548,12 @@ 
       $bysetposMold = $wdate['month'];
       $bysetposDold = $wdate['day'];
       if( is_array( $recur['BYSETPOS'] )) {
-        foreach( $recur['BYSETPOS'] as $bix => $bval )
-          $recur['BYSETPOS'][$bix] = (int) $bval;
+        foreach( $recur['BYSETPOS'] as $bix => $bval ) {
+                  $recur['BYSETPOS'][$bix] = (int) $bval;
+        }
+      } else {
+              $recur['BYSETPOS'] = array( (int) $recur['BYSETPOS'] );
       }
-      else
-        $recur['BYSETPOS'] = array( (int) $recur['BYSETPOS'] );
       $this->_stepdate( $enddate, $endDatets, $step); // make sure to count whole last period
     }
     $this->_stepdate( $wdate, $wdatets, $step);
@@ -4925,10 +5562,12 @@ 
              /* MAIN LOOP */
      // echo "recur start ".implode('-',$wdate)." end ".implode('-',$enddate)."<br />\n";//test
     while( TRUE ) {
-      if( isset( $endDatets ) && ( $wdatets > $endDatets ))
-        break;
-      if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] ))
-        break;
+      if( isset( $endDatets ) && ( $wdatets > $endDatets )) {
+              break;
+      }
+      if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] )) {
+              break;
+      }
       if( $year_old != $wdate['year'] ) {
         $year_old   = $wdate['year'];
         $daycnts    = array();
@@ -4937,8 +5576,9 @@ 
         for( $m = 1; $m <= 12; $m++ ) { // count up and update up-counters
           $daycnts[$m] = array();
           $weekdaycnt = array();
-          foreach( $daynames as $dn )
-            $yeardaycnt[$dn] = $weekdaycnt[$dn] = 0;
+          foreach( $daynames as $dn ) {
+                      $yeardaycnt[$dn] = $weekdaycnt[$dn] = 0;
+          }
           $mcnt     = date( 't', mktime( 0, 0, 0, $m, 1, $wdate['year'] ));
           for( $d   = 1; $d <= $mcnt; $d++ ) {
             $daycnts[$m][$d] = array();
@@ -4955,8 +5595,9 @@ 
               $yeardaycnt[$day]++;
               $daycnts[$m][$d]['yeardayno_up'] = $yeardaycnt[$day];
             }
-            if(  isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' ))
-              $daycnts[$m][$d]['weekno_up'] =(int)date('W',mktime(0,0,$wkst,$m,$d,$wdate['year']));
+            if(  isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' )) {
+                          $daycnts[$m][$d]['weekno_up'] =(int)date('W',mktime(0,0,$wkst,$m,$d,$wdate['year']));
+            }
           }
         }
         $daycnt = 0;
@@ -4964,9 +5605,9 @@ 
         if(  isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' )) {
           $weekno = null;
           for( $d=31; $d > 25; $d-- ) { // get last weekno for year
-            if( !$weekno )
-              $weekno = $daycnts[12][$d]['weekno_up'];
-            elseif( $weekno < $daycnts[12][$d]['weekno_up'] ) {
+            if( !$weekno ) {
+                          $weekno = $daycnts[12][$d]['weekno_up'];
+            } elseif( $weekno < $daycnts[12][$d]['weekno_up'] ) {
               $weekno = $daycnts[12][$d]['weekno_up'];
               break;
             }
@@ -4974,8 +5615,9 @@ 
         }
         for( $m = 12; $m > 0; $m-- ) { // count down and update down-counters
           $weekdaycnt = array();
-          foreach( $daynames as $dn )
-            $yeardaycnt[$dn] = $weekdaycnt[$dn] = 0;
+          foreach( $daynames as $dn ) {
+                      $yeardaycnt[$dn] = $weekdaycnt[$dn] = 0;
+          }
           $monthcnt = 0;
           $mcnt     = date( 't', mktime( 0, 0, 0, $m, 1, $wdate['year'] ));
           for( $d   = $mcnt; $d > 0; $d-- ) {
@@ -4994,8 +5636,9 @@ 
               $yeardaycnt[$day] -= 1;
               $daycnts[$m][$d]['yeardayno_down'] = $yeardaycnt[$day];
             }
-            if(  isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' ))
-              $daycnts[$m][$d]['weekno_down'] = ($daycnts[$m][$d]['weekno_up'] - $weekno - 1);
+            if(  isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' )) {
+                          $daycnts[$m][$d]['weekno_down'] = ($daycnts[$m][$d]['weekno_up'] - $weekno - 1);
+            }
           }
         }
       }
@@ -5006,36 +5649,42 @@ 
             /* check interval */
         $currentKey = array_keys( $intervalarr );
         $currentKey = end( $currentKey ); // get last index
-        if( $currentKey != $intervalix )
-          $intervalarr = array( $intervalix => ( $intervalarr[$currentKey] + 1 ));
+        if( $currentKey != $intervalix ) {
+                  $intervalarr = array( $intervalix => ( $intervalarr[$currentKey] + 1 ));
+        }
         if(( $recur['INTERVAL'] != $intervalarr[$intervalix] ) &&
            ( 0 != $intervalarr[$intervalix] )) {
             /* step up date */
     //echo "skip: ".implode('-',$wdate)." ix=$intervalix old=$currentKey interval=".$intervalarr[$intervalix]."<br />\n";//test
           $this->_stepdate( $wdate, $wdatets, $step);
           continue;
-        }
-        else // continue within the selected interval
+        } else {
+            // continue within the selected interval
           $intervalarr[$intervalix] = 0;
+        }
    //echo "cont: ".implode('-',$wdate)." ix=$intervalix old=$currentKey interval=".$intervalarr[$intervalix]."<br />\n";//test
       }
       $updateOK = TRUE;
-      if( $updateOK && isset( $recur['BYMONTH'] ))
-        $updateOK = $this->_recurBYcntcheck( $recur['BYMONTH']
+      if( $updateOK && isset( $recur['BYMONTH'] )) {
+              $updateOK = $this->_recurBYcntcheck( $recur['BYMONTH']
                                            , $wdate['month']
                                            ,($wdate['month'] - 13));
-      if( $updateOK && isset( $recur['BYWEEKNO'] ))
-        $updateOK = $this->_recurBYcntcheck( $recur['BYWEEKNO']
+      }
+      if( $updateOK && isset( $recur['BYWEEKNO'] )) {
+              $updateOK = $this->_recurBYcntcheck( $recur['BYWEEKNO']
                                            , $daycnts[$wdate['month']][$wdate['day']]['weekno_up']
                                            , $daycnts[$wdate['month']][$wdate['day']]['weekno_down'] );
-      if( $updateOK && isset( $recur['BYYEARDAY'] ))
-        $updateOK = $this->_recurBYcntcheck( $recur['BYYEARDAY']
+      }
+      if( $updateOK && isset( $recur['BYYEARDAY'] )) {
+              $updateOK = $this->_recurBYcntcheck( $recur['BYYEARDAY']
                                            , $daycnts[$wdate['month']][$wdate['day']]['yearcnt_up']
                                            , $daycnts[$wdate['month']][$wdate['day']]['yearcnt_down'] );
-      if( $updateOK && isset( $recur['BYMONTHDAY'] ))
-        $updateOK = $this->_recurBYcntcheck( $recur['BYMONTHDAY']
+      }
+      if( $updateOK && isset( $recur['BYMONTHDAY'] )) {
+              $updateOK = $this->_recurBYcntcheck( $recur['BYMONTHDAY']
                                            , $wdate['day']
                                            , $daycnts[$wdate['month']][$wdate['day']]['monthcnt_down'] );
+      }
     //echo "efter BYMONTHDAY: ".implode('-',$wdate).' status: '; echo ($updateOK) ? 'TRUE' : 'FALSE'; echo "<br />\n";//test###
       if( $updateOK && isset( $recur['BYDAY'] )) {
         $updateOK = FALSE;
@@ -5043,42 +5692,45 @@ 
         $d = $wdate['day'];
         if( isset( $recur['BYDAY']['DAY'] )) { // single day, opt with year/month day order no
           $daynoexists = $daynosw = $daynamesw =  FALSE;
-          if( $recur['BYDAY']['DAY'] == $daycnts[$m][$d]['DAY'] )
-            $daynamesw = TRUE;
+          if( $recur['BYDAY']['DAY'] == $daycnts[$m][$d]['DAY'] ) {
+                      $daynamesw = TRUE;
+          }
           if( isset( $recur['BYDAY'][0] )) {
             $daynoexists = TRUE;
-            if(( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'MONTHLY' )) || isset( $recur['BYMONTH'] ))
-              $daynosw = $this->_recurBYcntcheck( $recur['BYDAY'][0]
+            if(( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'MONTHLY' )) || isset( $recur['BYMONTH'] )) {
+                          $daynosw = $this->_recurBYcntcheck( $recur['BYDAY'][0]
                                                 , $daycnts[$m][$d]['monthdayno_up']
                                                 , $daycnts[$m][$d]['monthdayno_down'] );
-            elseif( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'YEARLY' ))
-              $daynosw = $this->_recurBYcntcheck( $recur['BYDAY'][0]
+            } elseif( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'YEARLY' )) {
+                          $daynosw = $this->_recurBYcntcheck( $recur['BYDAY'][0]
                                                 , $daycnts[$m][$d]['yeardayno_up']
                                                 , $daycnts[$m][$d]['yeardayno_down'] );
+            }
           }
           if((  $daynoexists &&  $daynosw && $daynamesw ) ||
              ( !$daynoexists && !$daynosw && $daynamesw )) {
             $updateOK = TRUE;
           }
         //echo "daynoexists:$daynoexists daynosw:$daynosw daynamesw:$daynamesw<br />\n"; // test ###
-        }
-        else {
+        } else {
           foreach( $recur['BYDAY'] as $bydayvalue ) {
             $daynoexists = $daynosw = $daynamesw = FALSE;
             if( isset( $bydayvalue['DAY'] ) &&
-                     ( $bydayvalue['DAY'] == $daycnts[$m][$d]['DAY'] ))
-              $daynamesw = TRUE;
+                     ( $bydayvalue['DAY'] == $daycnts[$m][$d]['DAY'] )) {
+                          $daynamesw = TRUE;
+            }
             if( isset( $bydayvalue[0] )) {
               $daynoexists = TRUE;
               if(( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'MONTHLY' )) ||
-                   isset( $recur['BYMONTH'] ))
-                $daynosw = $this->_recurBYcntcheck( $bydayvalue['0']
+                   isset( $recur['BYMONTH'] )) {
+                              $daynosw = $this->_recurBYcntcheck( $bydayvalue['0']
                                                   , $daycnts[$m][$d]['monthdayno_up']
                                                   , $daycnts[$m][$d]['monthdayno_down'] );
-              elseif( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'YEARLY' ))
-                $daynosw = $this->_recurBYcntcheck( $bydayvalue['0']
+              } elseif( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'YEARLY' )) {
+                              $daynosw = $this->_recurBYcntcheck( $bydayvalue['0']
                                                   , $daycnts[$m][$d]['yeardayno_up']
                                                   , $daycnts[$m][$d]['yeardayno_down'] );
+              }
             }
         //echo "daynoexists:$daynoexists daynosw:$daynosw daynamesw:$daynamesw<br />\n"; // test ###
             if((  $daynoexists &&  $daynosw && $daynamesw ) ||
@@ -5095,12 +5747,12 @@ 
         if( isset( $recur['BYSETPOS'] ) &&
           ( in_array( $recur['FREQ'], array( 'YEARLY', 'MONTHLY', 'WEEKLY', 'DAILY' )))) {
           if( isset( $recur['WEEKLY'] )) {
-            if( $bysetposWold == $daycnts[$wdate['month']][$wdate['day']]['weekno_up'] )
-              $bysetposw1[] = $wdatets;
-            else
-              $bysetposw2[] = $wdatets;
-          }
-          else {
+            if( $bysetposWold == $daycnts[$wdate['month']][$wdate['day']]['weekno_up'] ) {
+                          $bysetposw1[] = $wdatets;
+            } else {
+                          $bysetposw2[] = $wdatets;
+            }
+          } else {
             if(( isset( $recur['FREQ'] ) && ( 'YEARLY'      == $recur['FREQ'] )  &&
                                             ( $bysetposYold == $wdate['year'] ))   ||
                ( isset( $recur['FREQ'] ) && ( 'MONTHLY'     == $recur['FREQ'] )  &&
@@ -5109,13 +5761,13 @@ 
                ( isset( $recur['FREQ'] ) && ( 'MONTHLY'     == $recur['FREQ'] )  &&
                                            (( $bysetposYold == $wdate['year'] )  &&
                                             ( $bysetposMold == $wdate['month'])  &&
-                                            ( $bysetposDold == $wdate['sday'] ))))
-              $bysetposymd1[] = $wdatets;
-            else
-              $bysetposymd2[] = $wdatets;
+                                            ( $bysetposDold == $wdate['sday'] )))) {
+                          $bysetposymd1[] = $wdatets;
+            } else {
+                          $bysetposymd2[] = $wdatets;
+            }
           }
-        }
-        else {
+        } else {
             /* update result array if BYSETPOS is set */
           $countcnt++;
           if( $startdatets <= $wdatets ) { // only output within period
@@ -5135,21 +5787,18 @@ 
           ( $bysetposYold != $wdate['year'] )) {
           $bysetpos     = TRUE;
           $bysetposYold = $wdate['year'];
-        }
-        elseif( isset( $recur['FREQ'] ) && ( 'MONTHLY' == $recur['FREQ'] &&
+        } elseif( isset( $recur['FREQ'] ) && ( 'MONTHLY' == $recur['FREQ'] &&
          (( $bysetposYold != $wdate['year'] ) || ( $bysetposMold != $wdate['month'] )))) {
           $bysetpos     = TRUE;
           $bysetposYold = $wdate['year'];
           $bysetposMold = $wdate['month'];
-        }
-        elseif( isset( $recur['FREQ'] ) && ( 'WEEKLY'  == $recur['FREQ'] )) {
+        } elseif( isset( $recur['FREQ'] ) && ( 'WEEKLY'  == $recur['FREQ'] )) {
           $weekno = (int) date( 'W', mktime( 0, 0, $wkst, $wdate['month'], $wdate['day'], $wdate['year']));
           if( $bysetposWold != $weekno ) {
             $bysetposWold = $weekno;
             $bysetpos     = TRUE;
           }
-        }
-        elseif( isset( $recur['FREQ'] ) && ( 'DAILY'   == $recur['FREQ'] ) &&
+        } elseif( isset( $recur['FREQ'] ) && ( 'DAILY'   == $recur['FREQ'] ) &&
          (( $bysetposYold != $wdate['year'] )  ||
           ( $bysetposMold != $wdate['month'] ) ||
           ( $bysetposDold != $wdate['sday'] ))) {
@@ -5162,14 +5811,15 @@ 
           if( isset( $recur['BYWEEKNO'] )) {
             $bysetposarr1 = & $bysetposw1;
             $bysetposarr2 = & $bysetposw2;
-          }
-          else {
+          } else {
             $bysetposarr1 = & $bysetposymd1;
             $bysetposarr2 = & $bysetposymd2;
           }
           foreach( $recur['BYSETPOS'] as $ix ) {
-            if( 0 > $ix ) // both positive and negative BYSETPOS allowed
+            if( 0 > $ix ) {
+                // both positive and negative BYSETPOS allowed
               $ix = ( count( $bysetposarr1 ) + $ix + 1);
+            }
             $ix--;
             if( isset( $bysetposarr1[$ix] )) {
               if( $startdatets <= $bysetposarr1[$ix] ) { // only output within period
@@ -5178,8 +5828,9 @@ 
               }
               $countcnt++;
             }
-            if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] ))
-              break;
+            if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] )) {
+                          break;
+            }
           }
           $bysetposarr1 = $bysetposarr2;
           $bysetposarr2 = array();
@@ -5189,12 +5840,13 @@ 
   }
   function _recurBYcntcheck( $BYvalue, $upValue, $downValue ) {
     if( is_array( $BYvalue ) &&
-      ( in_array( $upValue, $BYvalue ) || in_array( $downValue, $BYvalue )))
-      return TRUE;
-    elseif(( $BYvalue == $upValue ) || ( $BYvalue == $downValue ))
-      return TRUE;
-    else
-      return FALSE;
+      ( in_array( $upValue, $BYvalue ) || in_array( $downValue, $BYvalue ))) {
+          return TRUE;
+    } elseif(( $BYvalue == $upValue ) || ( $BYvalue == $downValue )) {
+          return TRUE;
+    } else {
+          return FALSE;
+    }
   }
   function _recurIntervalIx( $freq, $date, $wkst ) {
             /* create interval index */
@@ -5226,21 +5878,27 @@ 
  */
   function _setRexrule( $rexrule ) {
     $input          = array();
-    if( empty( $rexrule ))
-      return $input;
+    if( empty( $rexrule )) {
+          return $input;
+    }
     foreach( $rexrule as $rexrulelabel => $rexrulevalue ) {
       $rexrulelabel = strtoupper( $rexrulelabel );
-      if( 'UNTIL'  != $rexrulelabel )
-        $input[$rexrulelabel]   = $rexrulevalue;
-      else {
-        if( $this->_isArrayTimestampDate( $rexrulevalue )) // timestamp date
+      if( 'UNTIL'  != $rexrulelabel ) {
+              $input[$rexrulelabel]   = $rexrulevalue;
+      } else {
+        if( $this->_isArrayTimestampDate( $rexrulevalue )) {
+            // timestamp date
           $input[$rexrulelabel] = $this->_timestamp2date( $rexrulevalue, 6 );
-        elseif( $this->_isArrayDate( $rexrulevalue )) // date-time
+        } elseif( $this->_isArrayDate( $rexrulevalue )) {
+            // date-time
           $input[$rexrulelabel] = $this->_date_time_array( $rexrulevalue, 6 );
-        elseif( 8 <= strlen( trim( $rexrulevalue ))) // ex. 2006-08-03 10:12:18
+        } elseif( 8 <= strlen( trim( $rexrulevalue ))) {
+            // ex. 2006-08-03 10:12:18
           $input[$rexrulelabel] = $this->_date_time_string( $rexrulevalue );
-        if(( 3 < count( $input[$rexrulelabel] )) && !isset( $input[$rexrulelabel]['tz'] ))
-          $input[$rexrulelabel]['tz'] = 'Z';
+        }
+        if(( 3 < count( $input[$rexrulelabel] )) && !isset( $input[$rexrulelabel]['tz'] )) {
+                  $input[$rexrulelabel]['tz'] = 'Z';
+        }
       }
     }
     return $input;
@@ -5264,7 +5922,9 @@ 
     $input = $parno = null;
     $localtime = (( 'dtstart' == $caller ) && in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) ? TRUE : FALSE;
     if( $this->_isArrayDate( $year )) {
-      if( $localtime ) unset ( $month['VALUE'], $month['TZID'] );
+      if( $localtime ) {
+          unset ( $month['VALUE'], $month['TZID'] );
+      }
       $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
       if( isset( $input['params']['TZID'] )) {
         $input['params']['VALUE'] = 'DATE-TIME';
@@ -5274,9 +5934,10 @@ 
       $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval );
       $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE', 3, count( $year ), $parno );
       $input['value']  = $this->_date_time_array( $year, $parno );
-    }
-    elseif( $this->_isArrayTimestampDate( $year )) {
-      if( $localtime ) unset ( $month['VALUE'], $month['TZID'] );
+    } elseif( $this->_isArrayTimestampDate( $year )) {
+      if( $localtime ) {
+          unset ( $month['VALUE'], $month['TZID'] );
+      }
       $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
       if( isset( $input['params']['TZID'] )) {
         $input['params']['VALUE'] = 'DATE-TIME';
@@ -5286,9 +5947,10 @@ 
       $hitval          = ( isset( $year['tz'] )) ? 7 : 6;
       $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval, $parno );
       $input['value']  = $this->_timestamp2date( $year, $parno );
-    }
-    elseif( 8 <= strlen( trim( $year ))) { // ex. 2006-08-03 10:12:18
-      if( $localtime ) unset ( $month['VALUE'], $month['TZID'] );
+    } elseif( 8 <= strlen( trim( $year ))) { // ex. 2006-08-03 10:12:18
+      if( $localtime ) {
+          unset ( $month['VALUE'], $month['TZID'] );
+      }
       $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
       if( isset( $input['params']['TZID'] )) {
         $input['params']['VALUE'] = 'DATE-TIME';
@@ -5297,17 +5959,16 @@ 
       $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', 7, $parno );
       $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE', 3, $parno, $parno );
       $input['value']  = $this->_date_time_string( $year, $parno );
-    }
-    else {
+    } else {
       if( is_array( $params )) {
-        if( $localtime ) unset ( $params['VALUE'], $params['TZID'] );
+        if( $localtime ) {
+            unset ( $params['VALUE'], $params['TZID'] );
+        }
         $input['params'] = $this->_setParams( $params, array( 'VALUE' => 'DATE-TIME' ));
-      }
-      elseif( is_array( $tz )) {
+      } elseif( is_array( $tz )) {
         $input['params'] = $this->_setParams( $tz,     array( 'VALUE' => 'DATE-TIME' ));
         $tz = FALSE;
-      }
-      elseif( is_array( $hour )) {
+      } elseif( is_array( $hour )) {
         $input['params'] = $this->_setParams( $hour,   array( 'VALUE' => 'DATE-TIME' ));
         $hour = $min = $sec = $tz = FALSE;
       }
@@ -5323,23 +5984,28 @@ 
         $input['value']['hour'] = ( $hour ) ? $hour : '0';
         $input['value']['min']  = ( $min )  ? $min  : '0';
         $input['value']['sec']  = ( $sec )  ? $sec  : '0';
-        if( !empty( $tz ))
-          $input['value']['tz'] = $tz;
+        if( !empty( $tz )) {
+                  $input['value']['tz'] = $tz;
+        }
       }
     }
     if( 3 == $parno ) {
       $input['params']['VALUE'] = 'DATE';
       unset( $input['value']['tz'] );
       unset( $input['params']['TZID'] );
+    } elseif( isset( $input['params']['TZID'] )) {
+          unset( $input['value']['tz'] );
+    }
+    if( $localtime ) {
+        unset( $input['value']['tz'], $input['params']['TZID'] );
+    }
+    if( isset( $input['value']['tz'] )) {
+          $input['value']['tz'] = (string) $input['value']['tz'];
     }
-    elseif( isset( $input['params']['TZID'] ))
-      unset( $input['value']['tz'] );
-    if( $localtime ) unset( $input['value']['tz'], $input['params']['TZID'] );
-    if( isset( $input['value']['tz'] ))
-      $input['value']['tz'] = (string) $input['value']['tz'];
     if( !empty( $input['value']['tz'] ) && ( 'Z' != $input['value']['tz'] ) &&
-      ( !$this->_isOffset( $input['value']['tz'] )))
-      $input['params']['TZID'] = $input['value']['tz'];
+      ( !$this->_isOffset( $input['value']['tz'] ))) {
+          $input['params']['TZID'] = $input['value']['tz'];
+    }
     return $input;
   }
 /**
@@ -5361,16 +6027,13 @@ 
     if( $this->_isArrayDate( $year )) {
       $input['value']  = $this->_date_time_array( $year, 7 );
       $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ) );
-    }
-    elseif( $this->_isArrayTimestampDate( $year )) {
+    } elseif( $this->_isArrayTimestampDate( $year )) {
       $input['value']  = $this->_timestamp2date( $year, 7 );
       $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ) );
-    }
-    elseif( 8 <= strlen( trim( $year ))) { // ex. 2006-08-03 10:12:18
+    } elseif( 8 <= strlen( trim( $year ))) { // ex. 2006-08-03 10:12:18
       $input['value']  = $this->_date_time_string( $year, 7 );
       $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ) );
-    }
-    else {
+    } else {
       $input['value']  = array( 'year'  => $year
                               , 'month' => $month
                               , 'day'   => $day
@@ -5380,14 +6043,18 @@ 
       $input['params'] = $this->_setParams( $params, array( 'VALUE' => 'DATE-TIME' ));
     }
     $parno = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', 7 ); // remove default
-    if( !isset( $input['value']['hour'] ))
-      $input['value']['hour'] = 0;
-    if( !isset( $input['value']['min'] ))
-      $input['value']['min'] = 0;
-    if( !isset( $input['value']['sec'] ))
-      $input['value']['sec'] = 0;
-    if( !isset( $input['value']['tz'] ) || !$this->_isOffset( $input['value']['tz'] ))
-      $input['value']['tz'] = 'Z';
+    if( !isset( $input['value']['hour'] )) {
+          $input['value']['hour'] = 0;
+    }
+    if( !isset( $input['value']['min'] )) {
+          $input['value']['min'] = 0;
+    }
+    if( !isset( $input['value']['sec'] )) {
+          $input['value']['sec'] = 0;
+    }
+    if( !isset( $input['value']['tz'] ) || !$this->_isOffset( $input['value']['tz'] )) {
+          $input['value']['tz'] = 'Z';
+    }
     return $input;
   }
 /**
@@ -5403,15 +6070,17 @@ 
  * @return void
  */
   function _setMval( & $valArr, $value, $params=FALSE, $defaults=FALSE, $index=FALSE ) {
-    if( !is_array( $valArr )) $valArr = array();
-    if( $index )
-      $index = $index - 1;
-    elseif( 0 < count( $valArr )) {
+    if( !is_array( $valArr )) {
+        $valArr = array();
+    }
+    if( $index ) {
+          $index = $index - 1;
+    } elseif( 0 < count( $valArr )) {
       $index = end( array_keys( $valArr ));
       $index += 1;
+    } else {
+          $index = 0;
     }
-    else
-      $index = 0;
     $valArr[$index] = array( 'value' => $value, 'params' => $this->_setParams( $params, $defaults ));
     ksort( $valArr );
   }
@@ -5427,27 +6096,31 @@ 
  * @return array
  */
   function _setParams( $params, $defaults=FALSE ) {
-    if( !is_array( $params))
-      $params = array();
+    if( !is_array( $params)) {
+          $params = array();
+    }
     $input = array();
     foreach( $params as $paramKey => $paramValue ) {
       if( is_array( $paramValue )) {
         foreach( $paramValue as $pkey => $pValue ) {
-          if(( '"' == substr( $pValue, 0, 1 )) && ( '"' == substr( $pValue, -1 )))
-            $paramValue[$pkey] = substr( $pValue, 1, ( strlen( $pValue ) - 2 ));
+          if(( '"' == substr( $pValue, 0, 1 )) && ( '"' == substr( $pValue, -1 ))) {
+                      $paramValue[$pkey] = substr( $pValue, 1, ( strlen( $pValue ) - 2 ));
+          }
         }
+      } elseif(( '"' == substr( $paramValue, 0, 1 )) && ( '"' == substr( $paramValue, -1 ))) {
+              $paramValue = substr( $paramValue, 1, ( strlen( $paramValue ) - 2 ));
+      }
+      if( 'VALUE' == strtoupper( $paramKey )) {
+              $input['VALUE']                 = strtoupper( $paramValue );
+      } else {
+              $input[strtoupper( $paramKey )] = $paramValue;
       }
-      elseif(( '"' == substr( $paramValue, 0, 1 )) && ( '"' == substr( $paramValue, -1 )))
-        $paramValue = substr( $paramValue, 1, ( strlen( $paramValue ) - 2 ));
-      if( 'VALUE' == strtoupper( $paramKey ))
-        $input['VALUE']                 = strtoupper( $paramValue );
-      else
-        $input[strtoupper( $paramKey )] = $paramValue;
     }
     if( is_array( $defaults )) {
       foreach( $defaults as $paramKey => $paramValue ) {
-        if( !isset( $input[$paramKey] ))
-          $input[$paramKey] = $paramValue;
+        if( !isset( $input[$paramKey] )) {
+                  $input[$paramKey] = $paramValue;
+        }
       }
     }
     return (0 < count( $input )) ? $input : null;
@@ -5463,13 +6136,15 @@ 
  * @return void
  */
   function _stepdate( &$date, &$timestamp, $step=array( 'day' => 1 )) {
-    foreach( $step as $stepix => $stepvalue )
-      $date[$stepix] += $stepvalue;
+    foreach( $step as $stepix => $stepvalue ) {
+          $date[$stepix] += $stepvalue;
+    }
     $timestamp  = $this->_date2timestamp( $date );
     $date       = $this->_timestamp2date( $timestamp, 6 );
     foreach( $date as $k => $v ) {
-      if( ctype_digit( $v ))
-        $date[$k] = (int) $v;
+      if( ctype_digit( $v )) {
+              $date[$k] = (int) $v;
+      }
     }
   }
 /**
@@ -5483,8 +6158,9 @@ 
  */
   function _timestamp2date( $timestamp, $parno=6 ) {
     if( is_array( $timestamp )) {
-      if(( 7 == $parno ) && !empty( $timestamp['tz'] ))
-        $tz = $timestamp['tz'];
+      if(( 7 == $parno ) && !empty( $timestamp['tz'] )) {
+              $tz = $timestamp['tz'];
+      }
       $timestamp = $timestamp['timestamp'];
     }
     $output = array( 'year'  => date( 'Y', $timestamp )
@@ -5494,8 +6170,9 @@ 
              $output['hour'] =  date( 'H', $timestamp );
              $output['min']  =  date( 'i', $timestamp );
              $output['sec']  =  date( 's', $timestamp );
-      if( isset( $tz ))
-        $output['tz'] = $tz;
+      if( isset( $tz )) {
+              $output['tz'] = $tz;
+      }
     }
     return $output;
   }
@@ -5513,8 +6190,9 @@ 
     if(((     5  != strlen( $tz )) && ( 7  != strlen( $tz ))) ||
        ((    '+' != substr( $tz, 0, 1 )) && ( '-' != substr( $tz, 0, 1 ))) ||
        (( '0000' >= substr( $tz, 1, 4 )) && ( '9999' < substr( $tz, 1, 4 ))) ||
-           (( 7  == strlen( $tz )) && ( '00' > substr( $tz, 5, 2 )) && ( '99' < substr( $tz, 5, 2 ))))
-      return $offset;
+           (( 7  == strlen( $tz )) && ( '00' > substr( $tz, 5, 2 )) && ( '99' < substr( $tz, 5, 2 )))) {
+          return $offset;
+    }
     $hours2sec    = (int) substr( $tz, 1, 2 ) * 3600;
     $min2sec      = (int) substr( $tz, 3, 2 ) *   60;
     $sec          = ( 7  == strlen( $tz )) ? (int) substr( $tz, -2 ) : '00';
@@ -5542,7 +6220,9 @@ 
         $info = array();
         if( isset( $this->components )) {
           foreach( $this->components as $cix => $component ) {
-            if( empty( $component )) continue;
+            if( empty( $component )) {
+                continue;
+            }
             unset( $component->propix );
             $info[$cix]['ordno'] = $cix + 1;
             $info[$cix]['type']  = $component->objName;
@@ -5568,57 +6248,146 @@ 
       case 'PROPINFO':
         $output = array();
         if( !in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) {
-          if( empty( $this->uid['value'] )) $this->_makeuid();
+          if( empty( $this->uid['value'] )) {
+              $this->_makeuid();
+          }
                                               $output['UID']              = 1;
         }
-        if( !empty( $this->dtstamp ))         $output['DTSTAMP']          = 1;
-        if( !empty( $this->summary ))         $output['SUMMARY']          = 1;
-        if( !empty( $this->description ))     $output['DESCRIPTION']      = count( $this->description );
-        if( !empty( $this->dtstart ))         $output['DTSTART']          = 1;
-        if( !empty( $this->dtend ))           $output['DTEND']            = 1;
-        if( !empty( $this->due ))             $output['DUE']              = 1;
-        if( !empty( $this->duration ))        $output['DURATION']         = 1;
-        if( !empty( $this->rrule ))           $output['RRULE']            = count( $this->rrule );
-        if( !empty( $this->rdate ))           $output['RDATE']            = count( $this->rdate );
-        if( !empty( $this->exdate ))          $output['EXDATE']           = count( $this->exdate );
-        if( !empty( $this->exrule ))          $output['EXRULE']           = count( $this->exrule );
-        if( !empty( $this->action ))          $output['ACTION']           = 1;
-        if( !empty( $this->attach ))          $output['ATTACH']           = count( $this->attach );
-        if( !empty( $this->attendee ))        $output['ATTENDEE']         = count( $this->attendee );
-        if( !empty( $this->categories ))      $output['CATEGORIES']       = count( $this->categories );
-        if( !empty( $this->class ))           $output['CLASS']            = 1;
-        if( !empty( $this->comment ))         $output['COMMENT']          = count( $this->comment );
-        if( !empty( $this->completed ))       $output['COMPLETED']        = 1;
-        if( !empty( $this->contact ))         $output['CONTACT']          = count( $this->contact );
-        if( !empty( $this->created ))         $output['CREATED']          = 1;
-        if( !empty( $this->freebusy ))        $output['FREEBUSY']         = count( $this->freebusy );
-        if( !empty( $this->geo ))             $output['GEO']              = 1;
-        if( !empty( $this->lastmodified ))    $output['LAST-MODIFIED']    = 1;
-        if( !empty( $this->location ))        $output['LOCATION']         = 1;
-        if( !empty( $this->organizer ))       $output['ORGANIZER']        = 1;
-        if( !empty( $this->percentcomplete )) $output['PERCENT-COMPLETE'] = 1;
-        if( !empty( $this->priority ))        $output['PRIORITY']         = 1;
-        if( !empty( $this->recurrenceid ))    $output['RECURRENCE-ID']    = 1;
-        if( !empty( $this->relatedto ))       $output['RELATED-TO']       = count( $this->relatedto );
-        if( !empty( $this->repeat ))          $output['REPEAT']           = 1;
-        if( !empty( $this->requeststatus ))   $output['REQUEST-STATUS']   = count( $this->requeststatus );
-        if( !empty( $this->resources ))       $output['RESOURCES']        = count( $this->resources );
-        if( !empty( $this->sequence ))        $output['SEQUENCE']         = 1;
-        if( !empty( $this->status ))          $output['STATUS']           = 1;
-        if( !empty( $this->transp ))          $output['TRANSP']           = 1;
-        if( !empty( $this->trigger ))         $output['TRIGGER']          = 1;
-        if( !empty( $this->tzid ))            $output['TZID']             = 1;
-        if( !empty( $this->tzname ))          $output['TZNAME']           = count( $this->tzname );
-        if( !empty( $this->tzoffsetfrom ))    $output['TZOFFSETTFROM']    = 1;
-        if( !empty( $this->tzoffsetto ))      $output['TZOFFSETTO']       = 1;
-        if( !empty( $this->tzurl ))           $output['TZURL']            = 1;
-        if( !empty( $this->url ))             $output['URL']              = 1;
-        if( !empty( $this->xprop ))           $output['X-PROP']           = count( $this->xprop );
+        if( !empty( $this->dtstamp )) {
+            $output['DTSTAMP']          = 1;
+        }
+        if( !empty( $this->summary )) {
+            $output['SUMMARY']          = 1;
+        }
+        if( !empty( $this->description )) {
+            $output['DESCRIPTION']      = count( $this->description );
+        }
+        if( !empty( $this->dtstart )) {
+            $output['DTSTART']          = 1;
+        }
+        if( !empty( $this->dtend )) {
+            $output['DTEND']            = 1;
+        }
+        if( !empty( $this->due )) {
+            $output['DUE']              = 1;
+        }
+        if( !empty( $this->duration )) {
+            $output['DURATION']         = 1;
+        }
+        if( !empty( $this->rrule )) {
+            $output['RRULE']            = count( $this->rrule );
+        }
+        if( !empty( $this->rdate )) {
+            $output['RDATE']            = count( $this->rdate );
+        }
+        if( !empty( $this->exdate )) {
+            $output['EXDATE']           = count( $this->exdate );
+        }
+        if( !empty( $this->exrule )) {
+            $output['EXRULE']           = count( $this->exrule );
+        }
+        if( !empty( $this->action )) {
+            $output['ACTION']           = 1;
+        }
+        if( !empty( $this->attach )) {
+            $output['ATTACH']           = count( $this->attach );
+        }
+        if( !empty( $this->attendee )) {
+            $output['ATTENDEE']         = count( $this->attendee );
+        }
+        if( !empty( $this->categories )) {
+            $output['CATEGORIES']       = count( $this->categories );
+        }
+        if( !empty( $this->class )) {
+            $output['CLASS']            = 1;
+        }
+        if( !empty( $this->comment )) {
+            $output['COMMENT']          = count( $this->comment );
+        }
+        if( !empty( $this->completed )) {
+            $output['COMPLETED']        = 1;
+        }
+        if( !empty( $this->contact )) {
+            $output['CONTACT']          = count( $this->contact );
+        }
+        if( !empty( $this->created )) {
+            $output['CREATED']          = 1;
+        }
+        if( !empty( $this->freebusy )) {
+            $output['FREEBUSY']         = count( $this->freebusy );
+        }
+        if( !empty( $this->geo )) {
+            $output['GEO']              = 1;
+        }
+        if( !empty( $this->lastmodified )) {
+            $output['LAST-MODIFIED']    = 1;
+        }
+        if( !empty( $this->location )) {
+            $output['LOCATION']         = 1;
+        }
+        if( !empty( $this->organizer )) {
+            $output['ORGANIZER']        = 1;
+        }
+        if( !empty( $this->percentcomplete )) {
+            $output['PERCENT-COMPLETE'] = 1;
+        }
+        if( !empty( $this->priority )) {
+            $output['PRIORITY']         = 1;
+        }
+        if( !empty( $this->recurrenceid )) {
+            $output['RECURRENCE-ID']    = 1;
+        }
+        if( !empty( $this->relatedto )) {
+            $output['RELATED-TO']       = count( $this->relatedto );
+        }
+        if( !empty( $this->repeat )) {
+            $output['REPEAT']           = 1;
+        }
+        if( !empty( $this->requeststatus )) {
+            $output['REQUEST-STATUS']   = count( $this->requeststatus );
+        }
+        if( !empty( $this->resources )) {
+            $output['RESOURCES']        = count( $this->resources );
+        }
+        if( !empty( $this->sequence )) {
+            $output['SEQUENCE']         = 1;
+        }
+        if( !empty( $this->status )) {
+            $output['STATUS']           = 1;
+        }
+        if( !empty( $this->transp )) {
+            $output['TRANSP']           = 1;
+        }
+        if( !empty( $this->trigger )) {
+            $output['TRIGGER']          = 1;
+        }
+        if( !empty( $this->tzid )) {
+            $output['TZID']             = 1;
+        }
+        if( !empty( $this->tzname )) {
+            $output['TZNAME']           = count( $this->tzname );
+        }
+        if( !empty( $this->tzoffsetfrom )) {
+            $output['TZOFFSETTFROM']    = 1;
+        }
+        if( !empty( $this->tzoffsetto )) {
+            $output['TZOFFSETTO']       = 1;
+        }
+        if( !empty( $this->tzurl )) {
+            $output['TZURL']            = 1;
+        }
+        if( !empty( $this->url )) {
+            $output['URL']              = 1;
+        }
+        if( !empty( $this->xprop )) {
+            $output['X-PROP']           = count( $this->xprop );
+        }
         return $output;
         break;
       case 'UNIQUE_ID':
-        if( empty( $this->unique_id ))
-          $this->unique_id  = ( isset( $_SERVER['SERVER_NAME'] )) ? gethostbyname( $_SERVER['SERVER_NAME'] ) : 'localhost';
+        if( empty( $this->unique_id )) {
+                  $this->unique_id  = ( isset( $_SERVER['SERVER_NAME'] )) ? gethostbyname( $_SERVER['SERVER_NAME'] ) : 'localhost';
+        }
         return $this->unique_id;
         break;
     }
@@ -5667,13 +6436,16 @@ 
         $res    = TRUE;
         break;
     }
-    if( !$res ) return FALSE;
+    if( !$res ) {
+        return FALSE;
+    }
     if( isset( $subcfg ) && !empty( $this->components )) {
       foreach( $subcfg as $cfgkey => $cfgvalue ) {
         foreach( $this->components as $cix => $component ) {
           $res = $component->setConfig( $cfgkey, $cfgvalue );
-          if( !$res )
-            break 2;
+          if( !$res ) {
+                      break 2;
+          }
           $this->components[$cix] = $component; // PHP4 compliant
         }
       }
@@ -5691,12 +6463,15 @@ 
  * @return bool, if successfull delete TRUE
  */
   function deleteProperty( $propName, $propix=FALSE ) {
-    if( $this->_notExistProp( $propName )) return FALSE;
+    if( $this->_notExistProp( $propName )) {
+        return FALSE;
+    }
     $propName = strtoupper( $propName );
     if( in_array( $propName, array( 'ATTACH',   'ATTENDEE', 'CATEGORIES', 'COMMENT',   'CONTACT', 'DESCRIPTION',    'EXDATE', 'EXRULE',
                                     'FREEBUSY', 'RDATE',    'RELATED-TO', 'RESOURCES', 'RRULE',   'REQUEST-STATUS', 'TZNAME', 'X-PROP'  ))) {
-      if( !$propix )
-        $propix = ( isset( $this->propdelix[$propName] )) ? $this->propdelix[$propName] + 2 : 1;
+      if( !$propix ) {
+              $propix = ( isset( $this->propdelix[$propName] )) ? $this->propdelix[$propName] + 2 : 1;
+      }
       $this->propdelix[$propName] = --$propix;
     }
     $return = FALSE;
@@ -5750,8 +6525,9 @@ 
         }
         break;
       case 'DTSTAMP':
-        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
-          return FALSE;
+        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) {
+                  return FALSE;
+        }
         if( !empty( $this->dtstamp )) {
           $this->dtstamp = '';
           $return = TRUE;
@@ -5905,8 +6681,9 @@ 
         }
         break;
       case 'UID':
-        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
-          return FALSE;
+        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) {
+                  return FALSE;
+        }
         if( !empty( $this->uid )) {
           $this->uid = '';
           $return = TRUE;
@@ -5921,18 +6698,23 @@ 
       default:
         $reduced = '';
         if( $propName != 'X-PROP' ) {
-          if( !isset( $this->xprop[$propName] )) return FALSE;
+          if( !isset( $this->xprop[$propName] )) {
+              return FALSE;
+          }
           foreach( $this->xprop as $k => $a ) {
-            if(( $k != $propName ) && !empty( $a ))
-              $reduced[$k] = $a;
+            if(( $k != $propName ) && !empty( $a )) {
+                          $reduced[$k] = $a;
+            }
+          }
+        } else {
+          if( count( $this->xprop ) <= $propix ) {
+              return FALSE;
           }
-        }
-        else {
-          if( count( $this->xprop ) <= $propix )  return FALSE;
           $xpropno = 0;
           foreach( $this->xprop as $xpropkey => $xpropvalue ) {
-            if( $propix != $xpropno )
-              $reduced[$xpropkey] = $xpropvalue;
+            if( $propix != $xpropno ) {
+                          $reduced[$xpropkey] = $xpropvalue;
+            }
             $xpropno++;
           }
         }
@@ -5952,9 +6734,13 @@ 
  * @return bool TRUE
  */
   function deletePropertyM( & $multiprop, $propix=0 ) {
-    if( !isset( $multiprop[$propix])) return FALSE;
+    if( !isset( $multiprop[$propix])) {
+        return FALSE;
+    }
     unset( $multiprop[$propix] );
-    if( empty( $multiprop )) $multiprop = '';
+    if( empty( $multiprop )) {
+        $multiprop = '';
+    }
     return ( isset( $this->multiprop[$propix] )) ? FALSE : TRUE;
   }
 /**
@@ -5971,184 +6757,277 @@ 
  * @return mixed
  */
   function getProperty( $propName=FALSE, $propix=FALSE, $inclParam=FALSE, $specform=FALSE ) {
-    if( $this->_notExistProp( $propName )) return FALSE;
+    if( $this->_notExistProp( $propName )) {
+        return FALSE;
+    }
     $propName = ( $propName ) ? strtoupper( $propName ) : 'X-PROP';
     if( in_array( $propName, array( 'ATTACH',   'ATTENDEE', 'CATEGORIES', 'COMMENT',   'CONTACT', 'DESCRIPTION',    'EXDATE', 'EXRULE',
                                     'FREEBUSY', 'RDATE',    'RELATED-TO', 'RESOURCES', 'RRULE',   'REQUEST-STATUS', 'TZNAME', 'X-PROP'  ))) {
-      if( !$propix )
-        $propix = ( isset( $this->propix[$propName] )) ? $this->propix[$propName] + 2 : 1;
+      if( !$propix ) {
+              $propix = ( isset( $this->propix[$propName] )) ? $this->propix[$propName] + 2 : 1;
+      }
       $this->propix[$propName] = --$propix;
     }
     switch( $propName ) {
       case 'ACTION':
-        if( !empty( $this->action['value'] )) return ( $inclParam ) ? $this->action : $this->action['value'];
+        if( !empty( $this->action['value'] )) {
+            return ( $inclParam ) ? $this->action : $this->action['value'];
+        }
         break;
       case 'ATTACH':
-        if( !isset( $this->attach[$propix] )) return FALSE;
+        if( !isset( $this->attach[$propix] )) {
+            return FALSE;
+        }
         return ( $inclParam ) ? $this->attach[$propix] : $this->attach[$propix]['value'];
         break;
       case 'ATTENDEE':
-        if( !isset( $this->attendee[$propix] )) return FALSE;
+        if( !isset( $this->attendee[$propix] )) {
+            return FALSE;
+        }
         return ( $inclParam ) ? $this->attendee[$propix] : $this->attendee[$propix]['value'];
         break;
       case 'CATEGORIES':
-        if( !isset( $this->categories[$propix] )) return FALSE;
+        if( !isset( $this->categories[$propix] )) {
+            return FALSE;
+        }
         return ( $inclParam ) ? $this->categories[$propix] : $this->categories[$propix]['value'];
         break;
       case 'CLASS':
-        if( !empty( $this->class['value'] )) return ( $inclParam ) ? $this->class : $this->class['value'];
+        if( !empty( $this->class['value'] )) {
+            return ( $inclParam ) ? $this->class : $this->class['value'];
+        }
         break;
       case 'COMMENT':
-        if( !isset( $this->comment[$propix] )) return FALSE;
+        if( !isset( $this->comment[$propix] )) {
+            return FALSE;
+        }
         return ( $inclParam ) ? $this->comment[$propix] : $this->comment[$propix]['value'];
         break;
       case 'COMPLETED':
-        if( !empty( $this->completed['value'] )) return ( $inclParam ) ? $this->completed : $this->completed['value'];
+        if( !empty( $this->completed['value'] )) {
+            return ( $inclParam ) ? $this->completed : $this->completed['value'];
+        }
         break;
       case 'CONTACT':
-        if( !isset( $this->contact[$propix] )) return FALSE;
+        if( !isset( $this->contact[$propix] )) {
+            return FALSE;
+        }
         return ( $inclParam ) ? $this->contact[$propix] : $this->contact[$propix]['value'];
         break;
       case 'CREATED':
-        if( !empty( $this->created['value'] )) return ( $inclParam ) ? $this->created : $this->created['value'];
+        if( !empty( $this->created['value'] )) {
+            return ( $inclParam ) ? $this->created : $this->created['value'];
+        }
         break;
       case 'DESCRIPTION':
-        if( !isset( $this->description[$propix] )) return FALSE;
+        if( !isset( $this->description[$propix] )) {
+            return FALSE;
+        }
         return ( $inclParam ) ? $this->description[$propix] : $this->description[$propix]['value'];
         break;
       case 'DTEND':
-        if( !empty( $this->dtend['value'] )) return ( $inclParam ) ? $this->dtend : $this->dtend['value'];
+        if( !empty( $this->dtend['value'] )) {
+            return ( $inclParam ) ? $this->dtend : $this->dtend['value'];
+        }
         break;
       case 'DTSTAMP':
-        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
-          return;
-        if( !isset( $this->dtstamp['value'] ))
-          $this->_makeDtstamp();
+        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) {
+                  return;
+        }
+        if( !isset( $this->dtstamp['value'] )) {
+                  $this->_makeDtstamp();
+        }
         return ( $inclParam ) ? $this->dtstamp : $this->dtstamp['value'];
         break;
       case 'DTSTART':
-        if( !empty( $this->dtstart['value'] )) return ( $inclParam ) ? $this->dtstart : $this->dtstart['value'];
+        if( !empty( $this->dtstart['value'] )) {
+            return ( $inclParam ) ? $this->dtstart : $this->dtstart['value'];
+        }
         break;
       case 'DUE':
-        if( !empty( $this->due['value'] )) return ( $inclParam ) ? $this->due : $this->due['value'];
+        if( !empty( $this->due['value'] )) {
+            return ( $inclParam ) ? $this->due : $this->due['value'];
+        }
         break;
       case 'DURATION':
-        if( !isset( $this->duration['value'] )) return FALSE;
+        if( !isset( $this->duration['value'] )) {
+            return FALSE;
+        }
         $value = ( $specform ) ? $this->duration2date() : $this->duration['value'];
         return ( $inclParam ) ? array( 'value' => $value, 'params' =>  $this->duration['params'] ) : $value;
         break;
       case 'EXDATE':
-        if( !isset( $this->exdate[$propix] )) return FALSE;
+        if( !isset( $this->exdate[$propix] )) {
+            return FALSE;
+        }
         return ( $inclParam ) ? $this->exdate[$propix] : $this->exdate[$propix]['value'];
         break;
       case 'EXRULE':
-        if( !isset( $this->exrule[$propix] )) return FALSE;
+        if( !isset( $this->exrule[$propix] )) {
+            return FALSE;
+        }
         return ( $inclParam ) ? $this->exrule[$propix] : $this->exrule[$propix]['value'];
         break;
       case 'FREEBUSY':
-        if( !isset( $this->freebusy[$propix] )) return FALSE;
+        if( !isset( $this->freebusy[$propix] )) {
+            return FALSE;
+        }
         return ( $inclParam ) ? $this->freebusy[$propix] : $this->freebusy[$propix]['value'];
         break;
       case 'GEO':
-        if( !empty( $this->geo['value'] )) return ( $inclParam ) ? $this->geo : $this->geo['value'];
+        if( !empty( $this->geo['value'] )) {
+            return ( $inclParam ) ? $this->geo : $this->geo['value'];
+        }
         break;
       case 'LAST-MODIFIED':
-        if( !empty( $this->lastmodified['value'] )) return ( $inclParam ) ? $this->lastmodified : $this->lastmodified['value'];
+        if( !empty( $this->lastmodified['value'] )) {
+            return ( $inclParam ) ? $this->lastmodified : $this->lastmodified['value'];
+        }
         break;
       case 'LOCATION':
-        if( !empty( $this->location['value'] )) return ( $inclParam ) ? $this->location : $this->location['value'];
+        if( !empty( $this->location['value'] )) {
+            return ( $inclParam ) ? $this->location : $this->location['value'];
+        }
         break;
       case 'ORGANIZER':
-        if( !empty( $this->organizer['value'] )) return ( $inclParam ) ? $this->organizer : $this->organizer['value'];
+        if( !empty( $this->organizer['value'] )) {
+            return ( $inclParam ) ? $this->organizer : $this->organizer['value'];
+        }
         break;
       case 'PERCENT-COMPLETE':
-        if( !empty( $this->percentcomplete['value'] )) return ( $inclParam ) ? $this->percentcomplete : $this->percentcomplete['value'];
+        if( !empty( $this->percentcomplete['value'] )) {
+            return ( $inclParam ) ? $this->percentcomplete : $this->percentcomplete['value'];
+        }
         break;
       case 'PRIORITY':
-        if( !empty( $this->priority['value'] )) return ( $inclParam ) ? $this->priority : $this->priority['value'];
+        if( !empty( $this->priority['value'] )) {
+            return ( $inclParam ) ? $this->priority : $this->priority['value'];
+        }
         break;
       case 'RDATE':
-        if( !isset( $this->rdate[$propix] )) return FALSE;
+        if( !isset( $this->rdate[$propix] )) {
+            return FALSE;
+        }
         return ( $inclParam ) ? $this->rdate[$propix] : $this->rdate[$propix]['value'];
         break;
       case 'RECURRENCE-ID':
-        if( !empty( $this->recurrenceid['value'] )) return ( $inclParam ) ? $this->recurrenceid : $this->recurrenceid['value'];
+        if( !empty( $this->recurrenceid['value'] )) {
+            return ( $inclParam ) ? $this->recurrenceid : $this->recurrenceid['value'];
+        }
         break;
       case 'RELATED-TO':
-        if( !isset( $this->relatedto[$propix] )) return FALSE;
+        if( !isset( $this->relatedto[$propix] )) {
+            return FALSE;
+        }
         return ( $inclParam ) ? $this->relatedto[$propix] : $this->relatedto[$propix]['value'];
         break;
       case 'REPEAT':
-        if( !empty( $this->repeat['value'] )) return ( $inclParam ) ? $this->repeat : $this->repeat['value'];
+        if( !empty( $this->repeat['value'] )) {
+            return ( $inclParam ) ? $this->repeat : $this->repeat['value'];
+        }
         break;
       case 'REQUEST-STATUS':
-        if( !isset( $this->requeststatus[$propix] )) return FALSE;
+        if( !isset( $this->requeststatus[$propix] )) {
+            return FALSE;
+        }
         return ( $inclParam ) ? $this->requeststatus[$propix] : $this->requeststatus[$propix]['value'];
         break;
       case 'RESOURCES':
-        if( !isset( $this->resources[$propix] )) return FALSE;
+        if( !isset( $this->resources[$propix] )) {
+            return FALSE;
+        }
         return ( $inclParam ) ? $this->resources[$propix] : $this->resources[$propix]['value'];
         break;
       case 'RRULE':
-        if( !isset( $this->rrule[$propix] )) return FALSE;
+        if( !isset( $this->rrule[$propix] )) {
+            return FALSE;
+        }
         return ( $inclParam ) ? $this->rrule[$propix] : $this->rrule[$propix]['value'];
         break;
       case 'SEQUENCE':
-        if( !empty( $this->sequence['value'] )) return ( $inclParam ) ? $this->sequence : $this->sequence['value'];
+        if( !empty( $this->sequence['value'] )) {
+            return ( $inclParam ) ? $this->sequence : $this->sequence['value'];
+        }
         break;
       case 'STATUS':
-        if( !empty( $this->status['value'] )) return ( $inclParam ) ? $this->status : $this->status['value'];
+        if( !empty( $this->status['value'] )) {
+            return ( $inclParam ) ? $this->status : $this->status['value'];
+        }
         break;
       case 'SUMMARY':
-        if( !empty( $this->summary['value'] )) return ( $inclParam ) ? $this->summary : $this->summary['value'];
+        if( !empty( $this->summary['value'] )) {
+            return ( $inclParam ) ? $this->summary : $this->summary['value'];
+        }
         break;
       case 'TRANSP':
-        if( !empty( $this->transp['value'] )) return ( $inclParam ) ? $this->transp : $this->transp['value'];
+        if( !empty( $this->transp['value'] )) {
+            return ( $inclParam ) ? $this->transp : $this->transp['value'];
+        }
         break;
       case 'TRIGGER':
-        if( !empty( $this->trigger['value'] )) return ( $inclParam ) ? $this->trigger : $this->trigger['value'];
+        if( !empty( $this->trigger['value'] )) {
+            return ( $inclParam ) ? $this->trigger : $this->trigger['value'];
+        }
         break;
       case 'TZID':
-        if( !empty( $this->tzid['value'] )) return ( $inclParam ) ? $this->tzid : $this->tzid['value'];
+        if( !empty( $this->tzid['value'] )) {
+            return ( $inclParam ) ? $this->tzid : $this->tzid['value'];
+        }
         break;
       case 'TZNAME':
-        if( !isset( $this->tzname[$propix] )) return FALSE;
+        if( !isset( $this->tzname[$propix] )) {
+            return FALSE;
+        }
         return ( $inclParam ) ? $this->tzname[$propix] : $this->tzname[$propix]['value'];
         break;
       case 'TZOFFSETFROM':
-        if( !empty( $this->tzoffsetfrom['value'] )) return ( $inclParam ) ? $this->tzoffsetfrom : $this->tzoffsetfrom['value'];
+        if( !empty( $this->tzoffsetfrom['value'] )) {
+            return ( $inclParam ) ? $this->tzoffsetfrom : $this->tzoffsetfrom['value'];
+        }
         break;
       case 'TZOFFSETTO':
-        if( !empty( $this->tzoffsetto['value'] )) return ( $inclParam ) ? $this->tzoffsetto : $this->tzoffsetto['value'];
+        if( !empty( $this->tzoffsetto['value'] )) {
+            return ( $inclParam ) ? $this->tzoffsetto : $this->tzoffsetto['value'];
+        }
         break;
       case 'TZURL':
-        if( !empty( $this->tzurl['value'] )) return ( $inclParam ) ? $this->tzurl : $this->tzurl['value'];
+        if( !empty( $this->tzurl['value'] )) {
+            return ( $inclParam ) ? $this->tzurl : $this->tzurl['value'];
+        }
         break;
       case 'UID':
-        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
-          return FALSE;
-        if( empty( $this->uid['value'] ))
-          $this->_makeuid();
+        if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) {
+                  return FALSE;
+        }
+        if( empty( $this->uid['value'] )) {
+                  $this->_makeuid();
+        }
         return ( $inclParam ) ? $this->uid : $this->uid['value'];
         break;
       case 'URL':
-        if( !empty( $this->url['value'] )) return ( $inclParam ) ? $this->url : $this->url['value'];
+        if( !empty( $this->url['value'] )) {
+            return ( $inclParam ) ? $this->url : $this->url['value'];
+        }
         break;
       default:
         if( $propName != 'X-PROP' ) {
-          if( !isset( $this->xprop[$propName] )) return FALSE;
+          if( !isset( $this->xprop[$propName] )) {
+              return FALSE;
+          }
           return ( $inclParam ) ? array( $propName, $this->xprop[$propName] )
                                 : array( $propName, $this->xprop[$propName]['value'] );
-        }
-        else {
-          if( empty( $this->xprop )) return FALSE;
+        } else {
+          if( empty( $this->xprop )) {
+              return FALSE;
+          }
           $xpropno = 0;
           foreach( $this->xprop as $xpropkey => $xpropvalue ) {
-            if( $propix == $xpropno )
-              return ( $inclParam ) ? array( $xpropkey, $this->xprop[$xpropkey] )
+            if( $propix == $xpropno ) {
+                          return ( $inclParam ) ? array( $xpropkey, $this->xprop[$xpropkey] )
                                     : array( $xpropkey, $this->xprop[$xpropkey]['value'] );
-            else
-              $xpropno++;
+            } else {
+                          $xpropno++;
+            }
           }
           return FALSE; // not found ??
         }
@@ -6167,15 +7046,21 @@ 
  */
   function setProperty() {
     $numargs    = func_num_args();
-    if( 1 > $numargs ) return FALSE;
+    if( 1 > $numargs ) {
+        return FALSE;
+    }
     $arglist    = func_get_args();
-    if( $this->_notExistProp( $arglist[0] )) return FALSE;
-    if( !$this->getConfig( 'allowEmpty' ) && ( !isset( $arglist[1] ) || empty( $arglist[1] )))
-      return FALSE;
+    if( $this->_notExistProp( $arglist[0] )) {
+        return FALSE;
+    }
+    if( !$this->getConfig( 'allowEmpty' ) && ( !isset( $arglist[1] ) || empty( $arglist[1] ))) {
+          return FALSE;
+    }
     $arglist[0] = strtoupper( $arglist[0] );
     for( $argix=$numargs; $argix < 12; $argix++ ) {
-      if( !isset( $arglist[$argix] ))
-        $arglist[$argix] = null;
+      if( !isset( $arglist[$argix] )) {
+              $arglist[$argix] = null;
+      }
     }
     switch( $arglist[0] ) {
       case 'ACTION':
@@ -6289,20 +7174,19 @@ 
             $this->setComponent( $comp );
             $comp =  & $this;
             continue;
-          }
-          elseif( 'BEGIN:VALARM' == strtoupper( substr( $line, 0, 12 ))) {
+          } elseif( 'BEGIN:VALARM' == strtoupper( substr( $line, 0, 12 ))) {
             $comp = new valarm();
             continue;
+          } else {
+                      $comp->unparsed[] = $line;
           }
-          else
-            $comp->unparsed[] = $line;
         }
+      } else {
+              $this->unparsed = array( trim( $unparsedtext ));
       }
-      else
-        $this->unparsed = array( trim( $unparsedtext ));
+    } elseif( !isset( $this->unparsed )) {
+          $this->unparsed = array();
     }
-    elseif( !isset( $this->unparsed ))
-      $this->unparsed = array();
             /* concatenate property values spread over several lines */
     $lastix    = -1;
     $propnames = array( 'action', 'attach', 'attendee', 'categories', 'comment', 'completed'
@@ -6326,8 +7210,7 @@ 
         $newProp = FALSE;
         $lastix++;
         $proprows[$lastix]  = $line;
-      }
-      else {
+      } else {
             /* remove line breaks */
         if(( '\n' == substr( $proprows[$lastix], -2 )) &&
            (  ' ' == substr( $line, 0, 1 ))) {
@@ -6340,14 +7223,15 @@ 
             /* parse each property 'line' */
     foreach( $proprows as $line ) {
       $line = str_replace( "\n ", '', $line );
-      if( '\n' == substr( $line, -2 ))
-        $line = substr( $line, 0, strlen( $line ) - 2 );
+      if( '\n' == substr( $line, -2 )) {
+              $line = substr( $line, 0, strlen( $line ) - 2 );
+      }
             /* get propname, (problem with x-properties, otherwise in previous loop) */
       $cix = $propname = null;
       for( $cix=0; $cix < strlen( $line ); $cix++ ) {
-        if( in_array( $line{$cix}, array( ':', ';' )))
-          break;
-        else {
+        if( in_array( $line{$cix}, array( ':', ';' ))) {
+                  break;
+        } else {
           $propname .= $line{$cix};
         }
       }
@@ -6380,27 +7264,30 @@ 
             break;
           }
         }
-        if( ';' == $line{$cix} )
-          $attr[++$attrix] = null;
-        else
-          $attr[$attrix] .= $line{$cix};
+        if( ';' == $line{$cix} ) {
+                  $attr[++$attrix] = null;
+        } else {
+                  $attr[$attrix] .= $line{$cix};
+        }
       }
             /* make attributes in array format */
       $propattr = array();
       foreach( $attr as $attribute ) {
         $attrsplit = explode( '=', $attribute, 2 );
-        if( 1 < count( $attrsplit ))
-          $propattr[$attrsplit[0]] = $attrsplit[1];
-        else
-          $propattr[] = $attribute;
+        if( 1 < count( $attrsplit )) {
+                  $propattr[$attrsplit[0]] = $attrsplit[1];
+        } else {
+                  $propattr[] = $attribute;
+        }
       }
             /* call setProperty( $propname.. . */
       switch( $propname ) {
         case 'ATTENDEE':
           foreach( $propattr as $pix => $attr ) {
             $attr2 = explode( ',', $attr );
-              if( 1 < count( $attr2 ))
-                $propattr[$pix] = $attr2;
+              if( 1 < count( $attr2 )) {
+                              $propattr[$pix] = $attr2;
+              }
           }
           $this->setProperty( $propname, $line, $propattr );
           break;
@@ -6418,13 +7305,14 @@ 
             }
             if( 1 < count( $content )) {
               $content = array_values( $content );
-              foreach( $content as $cix => $contentPart )
-                $content[$cix] = $this->_strunrep( $contentPart );
+              foreach( $content as $cix => $contentPart ) {
+                              $content[$cix] = $this->_strunrep( $contentPart );
+              }
               $this->setProperty( $propname, $content, $propattr );
               break;
+            } else {
+                          $line = reset( $content );
             }
-            else
-              $line = reset( $content );
           }
         case 'X-':
           $propname = ( isset( $propname2 )) ? $propname2 : $propname;
@@ -6433,8 +7321,9 @@ 
         case 'DESCRIPTION':
         case 'LOCATION':
         case 'SUMMARY':
-          if( empty( $line ))
-            $propattr = null;
+          if( empty( $line )) {
+                      $propattr = null;
+          }
           $this->setProperty( $propname, $this->_strunrep( $line ), $propattr );
           unset( $propname2 );
           break;
@@ -6454,15 +7343,17 @@ 
           $values = explode( ',', $line );
           foreach( $values as $vix => $value ) {
             $value2 = explode( '/', $value );
-            if( 1 < count( $value2 ))
-              $values[$vix] = $value2;
+            if( 1 < count( $value2 )) {
+                          $values[$vix] = $value2;
+            }
           }
           $this->setProperty( $propname, $fbtype, $values, $propattr );
           break;
         case 'GEO':
           $value = explode( ';', $line, 2 );
-          if( 2 > count( $value ))
-            $value[1] = null;
+          if( 2 > count( $value )) {
+                      $value[1] = null;
+          }
           $this->setProperty( $propname, $value[0], $value[1], $propattr );
           break;
         case 'EXDATE':
@@ -6477,8 +7368,9 @@ 
           $values = explode( ',', $line );
           foreach( $values as $vix => $value ) {
             $value2 = explode( '/', $value );
-            if( 1 < count( $value2 ))
-              $values[$vix] = $value2;
+            if( 1 < count( $value2 )) {
+                          $values[$vix] = $value2;
+            }
           }
           $this->setProperty( $propname, $values, $propattr );
           break;
@@ -6487,8 +7379,10 @@ 
           $values = explode( ';', $line );
           $recur = array();
           foreach( $values as $value2 ) {
-            if( empty( $value2 ))
-              continue; // ;-char in ending position ???
+            if( empty( $value2 )) {
+                          continue;
+            }
+            // ;-char in ending position ???
             $value3 = explode( '=', $value2, 2 );
             $rulelabel = strtoupper( $value3[0] );
             switch( $rulelabel ) {
@@ -6502,38 +7396,44 @@ 
                     if(( ctype_alpha( substr( $value5, -1 ))) &&
                        ( ctype_alpha( substr( $value5, -2, 1 )))) {
                       $dayname = substr( $value5, -2, 2 );
-                      if( 2 < strlen( $value5 ))
-                        $dayno = substr( $value5, 0, ( strlen( $value5 ) - 2 ));
+                      if( 2 < strlen( $value5 )) {
+                                              $dayno = substr( $value5, 0, ( strlen( $value5 ) - 2 ));
+                      }
+                    }
+                    if( $dayno ) {
+                                          $value6[] = $dayno;
+                    }
+                    if( $dayname ) {
+                                          $value6['DAY'] = $dayname;
                     }
-                    if( $dayno )
-                      $value6[] = $dayno;
-                    if( $dayname )
-                      $value6['DAY'] = $dayname;
                     $value4[$v5ix] = $value6;
                   }
-                }
-                else {
+                } else {
                   $value4 = array();
                   $dayno  = $dayname = null;
                   $value5 = trim( (string) $value3[1] );
                   if(( ctype_alpha( substr( $value5, -1 ))) &&
                      ( ctype_alpha( substr( $value5, -2, 1 )))) {
                       $dayname = substr( $value5, -2, 2 );
-                    if( 2 < strlen( $value5 ))
-                      $dayno = substr( $value5, 0, ( strlen( $value5 ) - 2 ));
+                    if( 2 < strlen( $value5 )) {
+                                          $dayno = substr( $value5, 0, ( strlen( $value5 ) - 2 ));
+                    }
+                  }
+                  if( $dayno ) {
+                                      $value4[] = $dayno;
+                  }
+                  if( $dayname ) {
+                                      $value4['DAY'] = $dayname;
                   }
-                  if( $dayno )
-                    $value4[] = $dayno;
-                  if( $dayname )
-                    $value4['DAY'] = $dayname;
                 }
                 $recur[$rulelabel] = $value4;
                 break;
               }
               default: {
                 $value4 = explode( ',', $value3[1] );
-                if( 1 < count( $value4 ))
-                  $value3[1] = $value4;
+                if( 1 < count( $value4 )) {
+                                  $value3[1] = $value4;
+                }
                 $recur[$rulelabel] = $value3[1];
                 break;
               }
@@ -6549,8 +7449,9 @@ 
     unset( $this->unparsed, $proprows );
     if( isset( $this->components ) && is_array( $this->components ) && ( 0 < count( $this->components ))) {
       for( $six = 0; $six < count( $this->components ); $six++ ) {
-        if( !empty( $this->components[$six]->unparsed ))
-          $this->components[$six]->parse();
+        if( !empty( $this->components[$six]->unparsed )) {
+                  $this->components[$six]->parse();
+        }
       }
     }
   }
@@ -6581,32 +7482,33 @@ 
  * @return void
  */
   function deleteComponent( $arg1, $arg2=FALSE  ) {
-    if( !isset( $this->components )) return FALSE;
+    if( !isset( $this->components )) {
+        return FALSE;
+    }
     $argType = $index = null;
     if ( ctype_digit( (string) $arg1 )) {
       $argType = 'INDEX';
       $index   = (int) $arg1 - 1;
-    }
-    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
+    } elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
       $argType = strtolower( $arg1 );
       $index   = ( !empty( $arg2 ) && ctype_digit( (string) $arg2 )) ? (( int ) $arg2 - 1 ) : 0;
     }
     $cix2dC = 0;
     foreach ( $this->components as $cix => $component) {
-      if( empty( $component )) continue;
+      if( empty( $component )) {
+          continue;
+      }
       unset( $component->propix );
       if(( 'INDEX' == $argType ) && ( $index == $cix )) {
         unset( $this->components[$cix] );
         return TRUE;
-      }
-      elseif( $argType == $component->objName ) {
+      } elseif( $argType == $component->objName ) {
         if( $index == $cix2dC ) {
           unset( $this->components[$cix] );
           return TRUE;
         }
         $cix2dC++;
-      }
-      elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
+      } elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
         unset( $this->components[$cix] );
         return TRUE;
       }
@@ -6623,43 +7525,47 @@ 
  * @return object
  */
   function getComponent ( $arg1=FALSE, $arg2=FALSE ) {
-    if( !isset( $this->components )) return FALSE;
+    if( !isset( $this->components )) {
+        return FALSE;
+    }
     $index = $argType = null;
     if ( !$arg1 ) {
       $argType = 'INDEX';
       $index   = $this->compix['INDEX'] =
         ( isset( $this->compix['INDEX'] )) ? $this->compix['INDEX'] + 1 : 1;
-    }
-    elseif ( ctype_digit( (string) $arg1 )) {
+    } elseif ( ctype_digit( (string) $arg1 )) {
       $argType = 'INDEX';
       $index   = (int) $arg1;
       unset( $this->compix );
-    }
-    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
+    } elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
       unset( $this->compix['INDEX'] );
       $argType = strtolower( $arg1 );
-      if( !$arg2 )
-        $index = $this->compix[$argType] =
+      if( !$arg2 ) {
+              $index = $this->compix[$argType] =
         ( isset( $this->compix[$argType] )) ? $this->compix[$argType] + 1 : 1;
-      else
-        $index = (int) $arg2;
+      } else {
+              $index = (int) $arg2;
+      }
     }
     $index  -= 1;
     $ckeys = array_keys( $this->components );
-    if( !empty( $index) && ( $index > end( $ckeys )))
-      return FALSE;
+    if( !empty( $index) && ( $index > end( $ckeys ))) {
+          return FALSE;
+    }
     $cix2gC = 0;
     foreach( $this->components as $cix => $component ) {
-      if( empty( $component )) continue;
+      if( empty( $component )) {
+          continue;
+      }
       unset( $component->propix );
-      if(( 'INDEX' == $argType ) && ( $index == $cix ))
-        return $component->copy();
-      elseif( $argType == $component->objName ) {
-         if( $index == $cix2gC )
-           return $component->copy();
+      if(( 'INDEX' == $argType ) && ( $index == $cix )) {
+              return $component->copy();
+      } elseif( $argType == $component->objName ) {
+         if( $index == $cix2gC ) {
+                    return $component->copy();
+         }
          $cix2gC++;
-      }
-      elseif( !$argType && ( $arg1 == $component->getProperty( 'uid' ))) {
+      } elseif( !$argType && ( $arg1 == $component->getProperty( 'uid' ))) {
         unset( $component->propix );
         return $component->copy();
       }
@@ -6690,9 +7596,12 @@ 
  * @return bool
  */
   function setComponent( $component, $arg1=FALSE, $arg2=FALSE  ) {
-    if( !isset( $this->components )) return FALSE;
-    if( '' >= $component->getConfig( 'language'))
-      $component->setConfig( 'language',  $this->getConfig( 'language' ));
+    if( !isset( $this->components )) {
+        return FALSE;
+    }
+    if( '' >= $component->getConfig( 'language')) {
+          $component->setConfig( 'language',  $this->getConfig( 'language' ));
+    }
     $component->setConfig( 'allowEmpty',  $this->getConfig( 'allowEmpty' ));
     $component->setConfig( 'nl',          $this->getConfig( 'nl' ));
     $component->setConfig( 'unique_id',   $this->getConfig( 'unique_id' ));
@@ -6711,27 +7620,26 @@ 
     if ( ctype_digit( (string) $arg1 )) {
       $argType = 'INDEX';
       $index   = (int) $arg1 - 1;
-    }
-    elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
+    } elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
       $argType = strtolower( $arg1 );
       $index = ( ctype_digit( (string) $arg2 )) ? ((int) $arg2) - 1 : 0;
     }
     $cix2sC = 0;
     foreach ( $this->components as $cix => $component2 ) {
-      if( empty( $component2 )) continue;
+      if( empty( $component2 )) {
+          continue;
+      }
       unset( $component2->propix );
       if(( 'INDEX' == $argType ) && ( $index == $cix )) {
         $this->components[$cix] = $component->copy();
         return TRUE;
-      }
-      elseif( $argType == $component2->objName ) {
+      } elseif( $argType == $component2->objName ) {
         if( $index == $cix2sC ) {
           $this->components[$cix] = $component->copy();
           return TRUE;
         }
         $cix2sC++;
-      }
-      elseif( !$argType && ($arg1 == $component2->getProperty( 'uid' ))) {
+      } elseif( !$argType && ($arg1 == $component2->getProperty( 'uid' ))) {
         $this->components[$cix] = $component->copy();
         return TRUE;
       }
@@ -6750,9 +7658,12 @@ 
   function createSubComponent() {
     $output = null;
     foreach( $this->components as $component ) {
-      if( empty( $component )) continue;
-      if( '' >= $component->getConfig( 'language'))
-        $component->setConfig( 'language',  $this->getConfig( 'language' ));
+      if( empty( $component )) {
+          continue;
+      }
+      if( '' >= $component->getConfig( 'language')) {
+              $component->setConfig( 'language',  $this->getConfig( 'language' ));
+      }
       $component->setConfig( 'allowEmpty',  $this->getConfig( 'allowEmpty' ));
       $component->setConfig( 'nl',          $this->getConfig( 'nl' ));
       $component->setConfig( 'unique_id',   $this->getConfig( 'unique_id' ));
@@ -6790,16 +7701,18 @@ 
     $string = null;
     while( $strlen > 75 ) {
        $breakAtChar = 75;
-       if( substr( $tmp, ( $breakAtChar - 1 ), strlen( '\n' )) == '\n' )
-         $breakAtChar = $breakAtChar - 1;
+       if( substr( $tmp, ( $breakAtChar - 1 ), strlen( '\n' )) == '\n' ) {
+                $breakAtChar = $breakAtChar - 1;
+       }
        $string .= substr( $tmp, 0, $breakAtChar );
        $string .= $this->nl;
        $tmp     = ' '.substr( $tmp, $breakAtChar );
        $strlen  = strlen( $tmp );
     } // while
     $string .= rtrim( $tmp ); // the rest
-    if( $this->nl != substr( $string, ( 0 - strlen( $this->nl ))))
-      $string .= $this->nl;
+    if( $this->nl != substr( $string, ( 0 - strlen( $this->nl )))) {
+          $string .= $this->nl;
+    }
     return $string;
   }
 /**
@@ -6820,27 +7733,33 @@ 
         $pos = 0;
         while( $pos <= strlen( $string )) {
           $pos = strpos( $string, "\\", $pos );
-          if( FALSE === $pos )
-            break;
+          if( FALSE === $pos ) {
+                      break;
+          }
           if( !in_array( $string{($pos + 1)}, array( 'n', 'N', 'r', ',', ';' ))) {
             $string = substr( $string, 0, $pos )."\\".substr( $string, ( $pos + 1 ));
             $pos += 1;
           }
           $pos += 1;
         }
-        if( FALSE !== strpos( $string, '"' ))
-          $string = str_replace('"',   "'",       $string);
-        if( FALSE !== strpos( $string, ',' ))
-          $string = str_replace(',',   '\,',      $string);
-        if( FALSE !== strpos( $string, ';' ))
-          $string = str_replace(';',   '\;',      $string);
-        if( FALSE !== strpos( $string, "\r\n" ))
-          $string = str_replace( "\r\n", '\n',    $string);
-        elseif( FALSE !== strpos( $string, "\r" ))
-          $string = str_replace( "\r", '\n',      $string);
-        if( FALSE !== strpos( $string, '\N' ))
-          $string = str_replace( '\N', '\n',      $string);
-//        if( FALSE !== strpos( $string, $this->nl ))
+        if( FALSE !== strpos( $string, '"' )) {
+                  $string = str_replace('"',   "'",       $string);
+        }
+        if( FALSE !== strpos( $string, ',' )) {
+                  $string = str_replace(',',   '\,',      $string);
+        }
+        if( FALSE !== strpos( $string, ';' )) {
+                  $string = str_replace(';',   '\;',      $string);
+        }
+        if( FALSE !== strpos( $string, "\r\n" )) {
+                  $string = str_replace( "\r\n", '\n',    $string);
+        } elseif( FALSE !== strpos( $string, "\r" )) {
+                  $string = str_replace( "\r", '\n',      $string);
+        }
+        if( FALSE !== strpos( $string, '\N' )) {
+                  $string = str_replace( '\N', '\n',      $string);
+        }
+        //        if( FALSE !== strpos( $string, $this->nl ))
           $string = str_replace( $this->nl, '\n', $string);
         break;
     }
@@ -6993,8 +7912,9 @@ 
     $component    .= $this->createSubComponent();
     $component    .= $this->componentEnd1.$objectname.$this->componentEnd2;
     if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
-      foreach( $this->xcaldecl as $localxcaldecl )
-        $xcaldecl[] = $localxcaldecl;
+      foreach( $this->xcaldecl as $localxcaldecl ) {
+              $xcaldecl[] = $localxcaldecl;
+      }
     }
     return $component;
   }
@@ -7132,8 +8052,9 @@ 
     $component    .= $this->createSubComponent();
     $component    .= $this->componentEnd1.$objectname.$this->componentEnd2;
     if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
-      foreach( $this->xcaldecl as $localxcaldecl )
-        $xcaldecl[] = $localxcaldecl;
+      foreach( $this->xcaldecl as $localxcaldecl ) {
+              $xcaldecl[] = $localxcaldecl;
+      }
     }
     return $component;
   }
@@ -7242,8 +8163,9 @@ 
     $component .= $this->createXprop();
     $component .= $this->componentEnd1.$objectname.$this->componentEnd2;
     if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
-      foreach( $this->xcaldecl as $localxcaldecl )
-        $xcaldecl[] = $localxcaldecl;
+      foreach( $this->xcaldecl as $localxcaldecl ) {
+              $xcaldecl[] = $localxcaldecl;
+      }
     }
     return $component;
   }
@@ -7318,8 +8240,9 @@ 
     $component .= $this->createXprop();
     $component .= $this->componentEnd1.$objectname.$this->componentEnd2;
     if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
-      foreach( $this->xcaldecl as $localxcaldecl )
-        $xcaldecl[] = $localxcaldecl;
+      foreach( $this->xcaldecl as $localxcaldecl ) {
+              $xcaldecl[] = $localxcaldecl;
+      }
     }
     return $component;
   }
@@ -7419,10 +8342,11 @@ 
  * @return void
  */
   function vtimezone( $timezonetype=FALSE ) {
-    if( !$timezonetype )
-      $this->timezonetype = 'VTIMEZONE';
-    else
-      $this->timezonetype = strtoupper( $timezonetype );
+    if( !$timezonetype ) {
+          $this->timezonetype = 'VTIMEZONE';
+    } else {
+          $this->timezonetype = strtoupper( $timezonetype );
+    }
     $this->calendarComponent();
 
     $this->comment         = '';
@@ -7464,8 +8388,9 @@ 
     $component    .= $this->createSubComponent();
     $component    .= $this->componentEnd1.$objectname.$this->componentEnd2;
     if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
-      foreach( $this->xcaldecl as $localxcaldecl )
-        $xcaldecl[] = $localxcaldecl;
+      foreach( $this->xcaldecl as $localxcaldecl ) {
+              $xcaldecl[] = $localxcaldecl;
+      }
     }
     return $component;
   }

Indentation +3356 added lines, -3357 removed lines

@@ -45,7 +45,7 @@ 
 */
             /* only for phpversion 5.x, date management, default timezone setting */
 if( substr( phpversion(), 0, 1) >= '5' ) // && ( 'UTC' == date_default_timezone_get() )) {
-  date_default_timezone_set( 'Europe/Stockholm' );
+    date_default_timezone_set( 'Europe/Stockholm' );
             /* version string, do NOT remove!! */
 define( 'ICALCREATOR_VERSION', 'iCalcreator 2.6' );
 /*********************************************************************************/
@@ -58,28 +58,28 @@ 
  */
 class vcalendar {
             //  calendar property variables
-  var $calscale;
-  var $method;
-  var $prodid;
-  var $version;
-  var $xprop;
+    var $calscale;
+    var $method;
+    var $prodid;
+    var $version;
+    var $xprop;
             //  container for calendar components
-  var $components;
+    var $components;
             //  component config variables
-  var $allowEmpty;
-  var $unique_id;
-  var $language;
-  var $directory;
-  var $filename;
-  var $url;
-  var $delimiter;
-  var $nl;
-  var $format;
+    var $allowEmpty;
+    var $unique_id;
+    var $language;
+    var $directory;
+    var $filename;
+    var $url;
+    var $delimiter;
+    var $nl;
+    var $format;
             //  component internal variables
-  var $attributeDelimiter;
-  var $valueInit;
+    var $attributeDelimiter;
+    var $valueInit;
             //  component xCal declaration container
-  var $xcaldecl;
+    var $xcaldecl;
 /*
  * constructor for calendar object
  *
@@ -87,7 +87,7 @@ 
  * @since 2.2.13 - 2007-12-30
  * @return void
  */
-  function vcalendar () {
+    function vcalendar () {
     $this->_makeVersion();
     $this->calscale   = null;
     $this->method     = null;
@@ -95,10 +95,10 @@ 
     $this->prodid     = null;
     $this->xprop      = array();
 /**
- *   language = <Text identifying a language, as defined in [RFC 1766]>
- */
+     *   language = <Text identifying a language, as defined in [RFC 1766]>
+     */
     if( defined( 'ICAL_LANG' ))
-      $this->setConfig( 'language', ICAL_LANG );
+        $this->setConfig( 'language', ICAL_LANG );
     $this->setConfig( 'allowEmpty', TRUE );
     $this->setConfig( 'nl',         "\n" );
     $this->setConfig( 'format',     'iCal');
@@ -108,7 +108,7 @@ 
     $this->setConfig( 'delimiter',  DIRECTORY_SEPARATOR );
     $this->xcaldecl   = array();
     $this->components = array();
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: CALSCALE
@@ -120,29 +120,29 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createCalscale() {
+    function createCalscale() {
     if( empty( $this->calscale )) return FALSE;
     switch( $this->format ) {
-      case 'xcal':
+        case 'xcal':
         return ' calscale="'.$this->calscale.'"'.$this->nl;
         break;
-      default:
+        default:
         return 'CALSCALE:'.$this->calscale.$this->nl;
         break;
     }
-  }
+    }
 /**
- * set calendar property calscale
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-10-21
- * @param string $value
- * @return void
- */
-  function setCalscale( $value ) {
+     * set calendar property calscale
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-10-21
+     * @param string $value
+     * @return void
+     */
+    function setCalscale( $value ) {
     if( empty( $value )) return FALSE;
     $this->calscale = $value;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: METHOD
@@ -154,30 +154,30 @@ 
  * @since 0.9.7 - 2006-11-20
  * @return string
  */
-  function createMethod() {
+    function createMethod() {
     if( empty( $this->method )) return FALSE;
     switch( $this->format ) {
-      case 'xcal':
+        case 'xcal':
         return ' method="'.$this->method.'"'.$this->nl;
         break;
-      default:
+        default:
         return 'METHOD:'.$this->method.$this->nl;
         break;
     }
-  }
+    }
 /**
- * set calendar property method
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-20-23
- * @param string $value
- * @return bool
- */
-  function setMethod( $value ) {
+     * set calendar property method
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-20-23
+     * @param string $value
+     * @return bool
+     */
+    function setMethod( $value ) {
     if( empty( $value )) return FALSE;
     $this->method = $value;
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: PRODID
@@ -193,44 +193,44 @@ 
  * @since 0.9.7 - 2006-11-20
  * @return string
  */
-  function createProdid() {
+    function createProdid() {
     if( !isset( $this->prodid ))
-      $this->_makeProdid();
+        $this->_makeProdid();
     switch( $this->format ) {
-      case 'xcal':
+        case 'xcal':
         return ' prodid="'.$this->prodid.'"'.$this->nl;
         break;
-      default:
+        default:
         return 'PRODID:'.$this->prodid.$this->nl;
         break;
     }
-  }
+    }
 /**
- * make default value for calendar prodid
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 0.3.0 - 2006-08-10
- * @return void
- */
-  function _makeProdid() {
+     * make default value for calendar prodid
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 0.3.0 - 2006-08-10
+     * @return void
+     */
+    function _makeProdid() {
     $this->prodid  = '-//'.$this->unique_id.'//NONSGML '.ICALCREATOR_VERSION.'//'.strtoupper( $this->language );
-  }
+    }
 /**
- * Conformance: The property MUST be specified once in an iCalendar object.
- * Description: The vendor of the implementation SHOULD assure that this
- * is a globally unique identifier; using some technique such as an FPI
- * value, as defined in [ISO 9070].
- */
+     * Conformance: The property MUST be specified once in an iCalendar object.
+     * Description: The vendor of the implementation SHOULD assure that this
+     * is a globally unique identifier; using some technique such as an FPI
+     * value, as defined in [ISO 9070].
+     */
 /**
- * make default unique_id for calendar prodid
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 0.3.0 - 2006-08-10
- * @return void
- */
-  function _makeUnique_id() {
+     * make default unique_id for calendar prodid
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 0.3.0 - 2006-08-10
+     * @return void
+     */
+    function _makeUnique_id() {
     $this->unique_id  = ( isset( $_SERVER['SERVER_NAME'] )) ? gethostbyname( $_SERVER['SERVER_NAME'] ) : 'localhost';
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: VERSION
@@ -239,47 +239,46 @@ 
  */
 /**
  * creates formatted output for calendar property version
-
  *
  * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
  * @since 0.9.7 - 2006-11-20
  * @return string
  */
-  function createVersion() {
+    function createVersion() {
     if( empty( $this->version ))
-      $this->_makeVersion();
+        $this->_makeVersion();
     switch( $this->format ) {
-      case 'xcal':
+        case 'xcal':
         return ' version="'.$this->version.'"'.$this->nl;
         break;
-      default:
+        default:
         return 'VERSION:'.$this->version.$this->nl;
         break;
     }
-  }
+    }
 /**
- * set default calendar version
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 0.3.0 - 2006-08-10
- * @return void
- */
-  function _makeVersion() {
+     * set default calendar version
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 0.3.0 - 2006-08-10
+     * @return void
+     */
+    function _makeVersion() {
     $this->version = '2.0';
-  }
+    }
 /**
- * set calendar version
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-10-23
- * @param string $value
- * @return void
- */
-  function setVersion( $value ) {
+     * set calendar version
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-10-23
+     * @param string $value
+     * @return void
+     */
+    function setVersion( $value ) {
     if( empty( $value )) return FALSE;
     $this->version = $value;
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: x-prop
@@ -291,44 +290,44 @@ 
  * @since 2.4.11 - 2008-11-03
  * @return string
  */
-  function createXprop() {
+    function createXprop() {
     if( 'xcal' == $this->format )
-      return false;
+        return false;
     if( 0 >= count( $this->xprop ))
-      return;
+        return;
     $output = null;
     $toolbox = new calendarComponent();
     $toolbox->setConfig( 'language', $this->getConfig( 'language' ));
     $toolbox->setConfig( 'nl',       $this->getConfig( 'nl' ));
     $toolbox->_createFormat(         $this->getConfig( 'format' ));
     foreach( $this->xprop as $label => $xpropPart ) {
-      if( empty( $xpropPart['value'] )) {
+        if( empty( $xpropPart['value'] )) {
         $output  .= $toolbox->_createElement( $label );
         continue;
-      }
-      $attributes = $toolbox->_createParams( $xpropPart['params'], array( 'LANGUAGE' ));
-      if( is_array( $xpropPart['value'] )) {
+        }
+        $attributes = $toolbox->_createParams( $xpropPart['params'], array( 'LANGUAGE' ));
+        if( is_array( $xpropPart['value'] )) {
         foreach( $xpropPart['value'] as $pix => $theXpart )
-          $xpropPart['value'][$pix] = $toolbox->_strrep( $theXpart );
+            $xpropPart['value'][$pix] = $toolbox->_strrep( $theXpart );
         $xpropPart['value']  = implode( ',', $xpropPart['value'] );
-      }
-      else
+        }
+        else
         $xpropPart['value'] = $toolbox->_strrep( $xpropPart['value'] );
-      $output    .= $toolbox->_createElement( $label, $attributes, $xpropPart['value'] );
+        $output    .= $toolbox->_createElement( $label, $attributes, $xpropPart['value'] );
     }
     return $output;
-  }
+    }
 /**
- * set calendar property x-prop
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.11 - 2008-11-04
- * @param string $label
- * @param string $value
- * @param array $params optional
- * @return bool
- */
-  function setXprop( $label, $value, $params=FALSE ) {
+     * set calendar property x-prop
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.11 - 2008-11-04
+     * @param string $label
+     * @param string $value
+     * @param array $params optional
+     * @return bool
+     */
+    function setXprop( $label, $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     if( empty( $label )) return FALSE;
     $xprop           = array( 'value' => $value );
@@ -337,7 +336,7 @@ 
     if( !is_array( $this->xprop )) $this->xprop = array();
     $this->xprop[strtoupper( $label )] = $xprop;
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * delete calendar property value
@@ -348,131 +347,131 @@ 
  * @param int @propix, optional, if specific property is wanted in case of multiply occurences
  * @return bool, if successfull delete
  */
-  function deleteProperty( $propName, $propix=FALSE ) {
+    function deleteProperty( $propName, $propix=FALSE ) {
     $propName = ( $propName ) ? strtoupper( $propName ) : 'X-PROP';
     if( !$propix )
-      $propix = ( isset( $this->propdelix[$propName] )) ? $this->propdelix[$propName] + 2 : 1;
+        $propix = ( isset( $this->propdelix[$propName] )) ? $this->propdelix[$propName] + 2 : 1;
     $this->propdelix[$propName] = --$propix;
     $return = FALSE;
     switch( $propName ) {
-      case 'CALSCALE':
+        case 'CALSCALE':
         if( isset( $this->calscale )) {
-          $this->calscale = null;
-          $return = TRUE;
+            $this->calscale = null;
+            $return = TRUE;
         }
         break;
-      case 'METHOD':
+        case 'METHOD':
         if( isset( $this->method )) {
-          $this->method   = null;
-          $return = TRUE;
+            $this->method   = null;
+            $return = TRUE;
         }
         break;
-      default:
+        default:
         $reduced = array();
         if( $propName != 'X-PROP' ) {
-          if( !isset( $this->xprop[$propName] )) return FALSE;
-          foreach( $this->xprop as $k => $a ) {
+            if( !isset( $this->xprop[$propName] )) return FALSE;
+            foreach( $this->xprop as $k => $a ) {
             if(( $k != $propName ) && !empty( $a ))
-              $reduced[$k] = $a;
-          }
+                $reduced[$k] = $a;
+            }
         }
         else {
-          if( count( $this->xprop ) <= $propix )  return FALSE;
-          $xpropno = 0;
-          foreach( $this->xprop as $xpropkey => $xpropvalue ) {
+            if( count( $this->xprop ) <= $propix )  return FALSE;
+            $xpropno = 0;
+            foreach( $this->xprop as $xpropkey => $xpropvalue ) {
             if( $propix != $xpropno )
-              $reduced[$xpropkey] = $xpropvalue;
+                $reduced[$xpropkey] = $xpropvalue;
             $xpropno++;
-          }
+            }
         }
         $this->xprop = $reduced;
         return TRUE;
     }
     return $return;
-  }
+    }
 /**
- * get calendar property value/params
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-02
- * @param string $propName, optional
- * @param int @propix, optional, if specific property is wanted in case of multiply occurences
- * @param bool $inclParam=FALSE
- * @return mixed
- */
-  function getProperty( $propName=FALSE, $propix=FALSE, $inclParam=FALSE ) {
+     * get calendar property value/params
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-02
+     * @param string $propName, optional
+     * @param int @propix, optional, if specific property is wanted in case of multiply occurences
+     * @param bool $inclParam=FALSE
+     * @return mixed
+     */
+    function getProperty( $propName=FALSE, $propix=FALSE, $inclParam=FALSE ) {
     $propName = ( $propName ) ? strtoupper( $propName ) : 'X-PROP';
     if( 'X-PROP' == $propName ) {
-      if( !$propix )
+        if( !$propix )
         $propix = ( isset( $this->propix[$propName] )) ? $this->propix[$propName] + 2 : 1;
-      $this->propix[$propName] = --$propix;
+        $this->propix[$propName] = --$propix;
     }
     switch( $propName ) {
-      case 'CALSCALE':
+        case 'CALSCALE':
         return ( !empty( $this->calscale )) ? $this->calscale : null;
         break;
-      case 'METHOD':
+        case 'METHOD':
         return ( !empty( $this->method )) ? $this->method : null;
         break;
-      case 'PRODID':
+        case 'PRODID':
         if( empty( $this->prodid ))
-          $this->_makeProdid();
+            $this->_makeProdid();
         return $this->prodid;
         break;
-      case 'VERSION':
+        case 'VERSION':
         return ( !empty( $this->version )) ? $this->version : null;
         break;
-      default:
+        default:
         if( $propName != 'X-PROP' ) {
-          if( !isset( $this->xprop[$propName] )) return FALSE;
-          return ( $inclParam ) ? array( $propName, $this->xprop[$propName] )
+            if( !isset( $this->xprop[$propName] )) return FALSE;
+            return ( $inclParam ) ? array( $propName, $this->xprop[$propName] )
                                 : array( $propName, $this->xprop[$propName]['value'] );
         }
         else {
-          if( empty( $this->xprop )) return FALSE;
-          $xpropno = 0;
-          foreach( $this->xprop as $xpropkey => $xpropvalue ) {
+            if( empty( $this->xprop )) return FALSE;
+            $xpropno = 0;
+            foreach( $this->xprop as $xpropkey => $xpropvalue ) {
             if( $propix == $xpropno )
-              return ( $inclParam ) ? array( $xpropkey, $this->xprop[$xpropkey] )
+                return ( $inclParam ) ? array( $xpropkey, $this->xprop[$xpropkey] )
                                     : array( $xpropkey, $this->xprop[$xpropkey]['value'] );
             else
-              $xpropno++;
-          }
-          return FALSE; // not found ??
+                $xpropno++;
+            }
+            return FALSE; // not found ??
         }
     }
     return FALSE;
-  }
+    }
 /**
- * general vcalendar property setting
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.2.13 - 2007-11-04
- * @param mixed $args variable number of function arguments,
- *                    first argument is ALWAYS component name,
- *                    second ALWAYS component value!
- * @return bool
- */
-  function setProperty () {
+     * general vcalendar property setting
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.2.13 - 2007-11-04
+     * @param mixed $args variable number of function arguments,
+     *                    first argument is ALWAYS component name,
+     *                    second ALWAYS component value!
+     * @return bool
+     */
+    function setProperty () {
     $numargs    = func_num_args();
     if( 1 > $numargs )
-      return FALSE;
+        return FALSE;
     $arglist    = func_get_args();
     $arglist[0] = strtoupper( $arglist[0] );
     switch( $arglist[0] ) {
-      case 'CALSCALE':
+        case 'CALSCALE':
         return $this->setCalscale( $arglist[1] );
-      case 'METHOD':
+        case 'METHOD':
         return $this->setMethod( $arglist[1] );
-      case 'VERSION':
+        case 'VERSION':
         return $this->setVersion( $arglist[1] );
-      default:
+        default:
         if( !isset( $arglist[1] )) $arglist[1] = null;
         if( !isset( $arglist[2] )) $arglist[2] = null;
         return $this->setXprop( $arglist[0], $arglist[1], $arglist[2] );
     }
     return FALSE;
-  }
+    }
 /*********************************************************************************/
 /**
  * get vcalendar config values or * calendar components
@@ -482,180 +481,180 @@ 
  * @param string $config
  * @return value
  */
-  function getConfig( $config ) {
+    function getConfig( $config ) {
     switch( strtoupper( $config )) {
-      case 'ALLOWEMPTY':
+        case 'ALLOWEMPTY':
         return $this->allowEmpty;
         break;
-      case 'COMPSINFO':
+        case 'COMPSINFO':
         unset( $this->compix );
         $info = array();
         foreach( $this->components as $cix => $component ) {
-          if( empty( $component )) continue;
-          unset( $component->propix );
-          $info[$cix]['ordno'] = $cix + 1;
-          $info[$cix]['type']  = $component->objName;
-          $info[$cix]['uid']   = $component->getProperty( 'uid' );
-          $info[$cix]['props'] = $component->getConfig( 'propinfo' );
-          $info[$cix]['sub']   = $component->getConfig( 'compsinfo' );
-          unset( $component->propix );
+            if( empty( $component )) continue;
+            unset( $component->propix );
+            $info[$cix]['ordno'] = $cix + 1;
+            $info[$cix]['type']  = $component->objName;
+            $info[$cix]['uid']   = $component->getProperty( 'uid' );
+            $info[$cix]['props'] = $component->getConfig( 'propinfo' );
+            $info[$cix]['sub']   = $component->getConfig( 'compsinfo' );
+            unset( $component->propix );
         }
         return $info;
         break;
-      case 'DELIMITER':
+        case 'DELIMITER':
         return $this->delimiter;
         break;
-      case 'DIRECTORY':
+        case 'DIRECTORY':
         if( empty( $this->directory ))
-          $this->directory = '.';
+            $this->directory = '.';
         return $this->directory;
         break;
-      case 'DIRFILE':
+        case 'DIRFILE':
         return $this->getConfig( 'directory' ).$this->getConfig( 'delimiter' ).$this->getConfig( 'filename' );
         break;
-      case 'FILEINFO':
+        case 'FILEINFO':
         return array( $this->getConfig( 'directory' )
                     , $this->getConfig( 'filename' )
                     , $this->getConfig( 'filesize' ));
         break;
-      case 'FILENAME':
+        case 'FILENAME':
         if( empty( $this->filename )) {
-          if( 'xcal' == $this->format )
+            if( 'xcal' == $this->format )
             $this->filename = date( 'YmdHis' ).'.xml'; // recommended xcs.. .
-          else
+            else
             $this->filename = date( 'YmdHis' ).'.ics';
         }
         return $this->filename;
         break;
-      case 'FILESIZE':
+        case 'FILESIZE':
         $size    = 0;
         if( empty( $this->url )) {
-          $dirfile = $this->getConfig( 'dirfile' );
-          if( FALSE === ( $size = filesize( $dirfile )))
+            $dirfile = $this->getConfig( 'dirfile' );
+            if( FALSE === ( $size = filesize( $dirfile )))
             $size = 0;
-          clearstatcache();
+            clearstatcache();
         }
         return $size;
         break;
-      case 'FORMAT':
+        case 'FORMAT':
         return $this->format;
         break;
-      case 'LANGUAGE':
+        case 'LANGUAGE':
          /* get language for calendar component as defined in [RFC 1766] */
         return $this->language;
         break;
-      case 'NL':
+        case 'NL':
       case 'NEWLINECHAR':
         return $this->nl;
         break;
-      case 'UNIQUE_ID':
+        case 'UNIQUE_ID':
         return $this->unique_id;
         break;
-      case 'URL':
+        case 'URL':
         if( !empty( $this->url ))
-          return $this->url;
+            return $this->url;
         else
-          return FALSE;
+            return FALSE;
         break;
     }
-  }
+    }
 /**
- * general vcalendar config setting
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-10-24
- * @param string $config
- * @param string $value
- * @return void
- */
-  function setConfig( $config, $value ) {
+     * general vcalendar config setting
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-10-24
+     * @param string $config
+     * @param string $value
+     * @return void
+     */
+    function setConfig( $config, $value ) {
     $res = FALSE;
     switch( strtoupper( $config )) {
-      case 'ALLOWEMPTY':
+        case 'ALLOWEMPTY':
         $this->allowEmpty = $value;
         $subcfg  = array( 'ALLOWEMPTY' => $value );
         $res = TRUE;
         break;
-      case 'DELIMITER':
+        case 'DELIMITER':
         $this->delimiter = $value;
         return TRUE;
         break;
-      case 'DIRECTORY':
+        case 'DIRECTORY':
         $value   = trim( $value );
         $nl      = $this->getConfig('delimiter');
         if( $nl == substr( $value, ( 0 - strlen( $nl ))))
-          $value = substr( $value, 0, ( strlen( $value ) - strlen( $nl )));
+            $value = substr( $value, 0, ( strlen( $value ) - strlen( $nl )));
         if( is_dir( $value )) {
             /* local directory */
-          clearstatcache();
-          $this->directory = $value;
-          $this->url       = null;
-          return TRUE;
+            clearstatcache();
+            $this->directory = $value;
+            $this->url       = null;
+            return TRUE;
         }
         else
-          return FALSE;
+            return FALSE;
         break;
-      case 'FILENAME':
+        case 'FILENAME':
         $value   = trim( $value );
         if( !empty( $this->url )) {
             /* remote directory+file - URL */
-          $this->filename = $value;
-          return TRUE;
+            $this->filename = $value;
+            return TRUE;
         }
         $dirfile = $this->getConfig( 'directory' ).$this->getConfig( 'delimiter' ).$value;
         if( file_exists( $dirfile )) {
             /* local existing file */
-          if( is_readable( $dirfile ) || is_writable( $dirfile )) {
+            if( is_readable( $dirfile ) || is_writable( $dirfile )) {
             clearstatcache();
             $this->filename = $value;
             return TRUE;
-          }
-          else
+            }
+            else
             return FALSE;
         }
         elseif( FALSE !== touch( $dirfile )) {
             /* new local file created */
-          $this->filename = $value;
-          return TRUE;
+            $this->filename = $value;
+            return TRUE;
         }
         else
-          return FALSE;
+            return FALSE;
         break;
-      case 'FORMAT':
+        case 'FORMAT':
         $value   = trim( $value );
         if( 'xcal' == strtolower( $value )) {
-          $this->format             = 'xcal';
-          $this->attributeDelimiter = $this->nl;
-          $this->valueInit          = null;
+            $this->format             = 'xcal';
+            $this->attributeDelimiter = $this->nl;
+            $this->valueInit          = null;
         }
         else {
-          $this->format             = null;
-          $this->attributeDelimiter = ';';
-          $this->valueInit          = ':';
+            $this->format             = null;
+            $this->attributeDelimiter = ';';
+            $this->valueInit          = ':';
         }
         $subcfg  = array( 'FORMAT' => $value );
         $res = TRUE;
         break;
-      case 'LANGUAGE':
+        case 'LANGUAGE':
          // set language for calendar component as defined in [RFC 1766]
         $value   = trim( $value );
         $this->language = $value;
         $subcfg  = array( 'LANGUAGE' => $value );
         $res = TRUE;
         break;
-      case 'NL':
+        case 'NL':
       case 'NEWLINECHAR':
         $this->nl = $value;
         $subcfg  = array( 'NL' => $value );
         $res = TRUE;
         break;
-      case 'UNIQUE_ID':
+        case 'UNIQUE_ID':
         $value   = trim( $value );
         $this->unique_id = $value;
         $subcfg  = array( 'UNIQUE_ID' => $value );
         $res = TRUE;
         break;
-      case 'URL':
+        case 'URL':
             /* remote file - URL */
         $value     = trim( $value );
         $value     = str_replace( 'HTTP://',   'http://', $value );
@@ -669,17 +668,17 @@ 
     }
     if( !$res ) return FALSE;
     if( isset( $subcfg ) && !empty( $this->components )) {
-      foreach( $subcfg as $cfgkey => $cfgvalue ) {
+        foreach( $subcfg as $cfgkey => $cfgvalue ) {
         foreach( $this->components as $cix => $component ) {
-          $res = $component->setConfig( $cfgkey, $cfgvalue );
-          if( !$res )
+            $res = $component->setConfig( $cfgkey, $cfgvalue );
+            if( !$res )
             break 2;
-          $this->components[$cix] = $component->copy(); // PHP4 compliant
+            $this->components[$cix] = $component->copy(); // PHP4 compliant
+        }
         }
-      }
     }
     return $res;
-  }
+    }
 /*********************************************************************************/
 /**
  * add calendar component to container
@@ -691,129 +690,129 @@ 
  * @param object $component calendar component
  * @return void
  */
-  function addComponent( $component ) {
+    function addComponent( $component ) {
     $this->setComponent( $component );
-  }
+    }
 /**
- * delete calendar component from container
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.10 - 2008-08-05
- * @param mixed $arg1 ordno / component type / component uid
- * @param mixed $arg2 optional, ordno if arg1 = component type
- * @return void
- */
-  function deleteComponent( $arg1, $arg2=FALSE  ) {
+     * delete calendar component from container
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.10 - 2008-08-05
+     * @param mixed $arg1 ordno / component type / component uid
+     * @param mixed $arg2 optional, ordno if arg1 = component type
+     * @return void
+     */
+    function deleteComponent( $arg1, $arg2=FALSE  ) {
     $argType = $index = null;
     if ( ctype_digit( (string) $arg1 )) {
-      $argType = 'INDEX';
-      $index   = (int) $arg1 - 1;
+        $argType = 'INDEX';
+        $index   = (int) $arg1 - 1;
     }
     elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
-      $argType = strtolower( $arg1 );
-      $index   = ( !empty( $arg2 ) && ctype_digit( (string) $arg2 )) ? (( int ) $arg2 - 1 ) : 0;
+        $argType = strtolower( $arg1 );
+        $index   = ( !empty( $arg2 ) && ctype_digit( (string) $arg2 )) ? (( int ) $arg2 - 1 ) : 0;
     }
     $cix1dC = 0;
     foreach ( $this->components as $cix => $component) {
-      if( empty( $component )) continue;
-      unset( $component->propix );
-      if(( 'INDEX' == $argType ) && ( $index == $cix )) {
+        if( empty( $component )) continue;
+        unset( $component->propix );
+        if(( 'INDEX' == $argType ) && ( $index == $cix )) {
         unset( $this->components[$cix] );
         return TRUE;
-      }
-      elseif( $argType == $component->objName ) {
+        }
+        elseif( $argType == $component->objName ) {
         if( $index == $cix1dC ) {
-          unset( $this->components[$cix] );
-          return TRUE;
+            unset( $this->components[$cix] );
+            return TRUE;
         }
         $cix1dC++;
-      }
-      elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
+        }
+        elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
         unset( $this->components[$cix] );
         return TRUE;
-      }
+        }
     }
     return FALSE;
-  }
+    }
 /**
- * get calendar component from container
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.10 - 2008-08-06
- * @param mixed $arg1 optional, ordno/component type/ component uid
- * @param mixed $arg2 optional, ordno if arg1 = component type
- * @return object
- */
-  function getComponent( $arg1=FALSE, $arg2=FALSE ) {
+     * get calendar component from container
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.10 - 2008-08-06
+     * @param mixed $arg1 optional, ordno/component type/ component uid
+     * @param mixed $arg2 optional, ordno if arg1 = component type
+     * @return object
+     */
+    function getComponent( $arg1=FALSE, $arg2=FALSE ) {
     $index = $argType = null;
     if ( !$arg1 ) {
-      $argType = 'INDEX';
-      $index   = $this->compix['INDEX'] =
+        $argType = 'INDEX';
+        $index   = $this->compix['INDEX'] =
         ( isset( $this->compix['INDEX'] )) ? $this->compix['INDEX'] + 1 : 1;
     }
     elseif ( ctype_digit( (string) $arg1 )) {
-      $argType = 'INDEX';
-      $index   = (int) $arg1;
-      unset( $this->compix );
+        $argType = 'INDEX';
+        $index   = (int) $arg1;
+        unset( $this->compix );
     }
     elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
-      unset( $this->compix['INDEX'] );
-      $argType = strtolower( $arg1 );
-      if( !$arg2 )
+        unset( $this->compix['INDEX'] );
+        $argType = strtolower( $arg1 );
+        if( !$arg2 )
         $index = $this->compix[$argType] =
         ( isset( $this->compix[$argType] )) ? $this->compix[$argType] + 1 : 1;
-      else
+        else
         $index = (int) $arg2;
     }
     $index  -= 1;
     $ckeys =  array_keys( $this->components );
     if( !empty( $index) && ( $index > end(  $ckeys )))
-      return FALSE;
+        return FALSE;
     $cix1gC = 0;
     foreach ( $this->components as $cix => $component) {
-      if( empty( $component )) continue;
-      unset( $component->propix );
-      if(( 'INDEX' == $argType ) && ( $index == $cix ))
+        if( empty( $component )) continue;
+        unset( $component->propix );
+        if(( 'INDEX' == $argType ) && ( $index == $cix ))
         return $component->copy();
-      elseif( $argType == $component->objName ) {
-         if( $index == $cix1gC )
-           return $component->copy();
-         $cix1gC++;
-      }
-      elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
+        elseif( $argType == $component->objName ) {
+            if( $index == $cix1gC )
+            return $component->copy();
+            $cix1gC++;
+        }
+        elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
         unset( $component->propix );
         return $component->copy();
-      }
+        }
     }
             /* not found.. . */
     unset( $this->compix );
     return FALSE;
-  }
+    }
 /**
- * select components from calendar on date basis
- *
- * Ensure DTSTART is set for every component.
- * No date controls occurs.
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.16 - 2008-10-18
- * @param int $startY optional,  start Year, default current Year
- * @param int $startM optional,  start Month, default current Month
- * @param int $startD optional,  start Day, default current Day
- * @param int $endY optional,    end Year, default $startY
- * @param int $endY optional,    end Month, default $startM
- * @param int $endY optional,    end Day, default $startD
- * @param mixed $cType optional, calendar component type(-s), default FALSE=all else string/array type(-s)
- * @param bool $flat optional,   FALSE (default) => output : array[Year][Month][Day][]
- *                               TRUE => output : array[] (ignores split)
- * @param bool $any optional,    TRUE (default) - select component that take place within period
- *                               FALSE - only components that starts within period
- * @param bool $split optional,  TRUE (default) - one component copy every day it take place during the
- *                                       period (implies flat=FALSE)
- *                               FALSE - one occurance of component only in output array</tr>
- * @return array or FALSE
- */
-  function selectComponents( $startY=FALSE, $startM=FALSE, $startD=FALSE, $endY=FALSE, $endM=FALSE, $endD=FALSE, $cType=FALSE, $flat=FALSE, $any=TRUE, $split=TRUE ) {
+     * select components from calendar on date basis
+     *
+     * Ensure DTSTART is set for every component.
+     * No date controls occurs.
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.16 - 2008-10-18
+     * @param int $startY optional,  start Year, default current Year
+     * @param int $startM optional,  start Month, default current Month
+     * @param int $startD optional,  start Day, default current Day
+     * @param int $endY optional,    end Year, default $startY
+     * @param int $endY optional,    end Month, default $startM
+     * @param int $endY optional,    end Day, default $startD
+     * @param mixed $cType optional, calendar component type(-s), default FALSE=all else string/array type(-s)
+     * @param bool $flat optional,   FALSE (default) => output : array[Year][Month][Day][]
+     *                               TRUE => output : array[] (ignores split)
+     * @param bool $any optional,    TRUE (default) - select component that take place within period
+     *                               FALSE - only components that starts within period
+     * @param bool $split optional,  TRUE (default) - one component copy every day it take place during the
+     *                                       period (implies flat=FALSE)
+     *                               FALSE - one occurance of component only in output array</tr>
+     * @return array or FALSE
+     */
+    function selectComponents( $startY=FALSE, $startM=FALSE, $startD=FALSE, $endY=FALSE, $endM=FALSE, $endD=FALSE, $cType=FALSE, $flat=FALSE, $any=TRUE, $split=TRUE ) {
             /* check  if empty calendar */
     if( 0 >= count( $this->components )) return FALSE;
             /* check default dates */
@@ -828,54 +827,54 @@ 
             /* check component types */
     $validTypes = array('vevent', 'vtodo', 'vjournal', 'vfreebusy' );
     if( is_array( $cType )) {
-      foreach( $cType as $cix => $theType ) {
+        foreach( $cType as $cix => $theType ) {
         $cType[$cix] = $theType = strtolower( $theType );
         if( !in_array( $theType, $validTypes ))
-          $cType[$cix] = 'vevent';
-      }
-      $cType = array_unique( $cType );
+            $cType[$cix] = 'vevent';
+        }
+        $cType = array_unique( $cType );
     }
     elseif( !empty( $cType )) {
-      $cType = strtolower( $cType );
-      if( !in_array( $cType, $validTypes ))
+        $cType = strtolower( $cType );
+        if( !in_array( $cType, $validTypes ))
         $cType = array( 'vevent' );
-      else
+        else
         $cType = array( $cType );
     }
     else
-      $cType = $validTypes;
+        $cType = $validTypes;
     if( 0 >= count( $cType ))
-      $cType = $validTypes;
+        $cType = $validTypes;
             /* iterate components */
     $result = array();
     foreach ( $this->components as $cix => $component ) {
-      if( empty( $component )) continue;
-      unset( $component->propix, $start );
+        if( empty( $component )) continue;
+        unset( $component->propix, $start );
             /* deselect unvalid type components */
-      if( !in_array( $component->objName, $cType )) continue;
+        if( !in_array( $component->objName, $cType )) continue;
             /* deselect components without dtstart set */
-      if( FALSE === ( $start = $component->getProperty( 'dtstart' ))) continue;
-      $dtendExist = $dueExist = $durationExist = $endAllDayEvent = FALSE;
-      unset( $end, $startWdate, $endWdate, $rdurWsecs, $rdur, $exdatelist, $workstart, $workend ); // clean up
-      $startWdate = $component->_date2timestamp( $start );
-      $startDateFormat = ( isset( $start['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d';
+        if( FALSE === ( $start = $component->getProperty( 'dtstart' ))) continue;
+        $dtendExist = $dueExist = $durationExist = $endAllDayEvent = FALSE;
+        unset( $end, $startWdate, $endWdate, $rdurWsecs, $rdur, $exdatelist, $workstart, $workend ); // clean up
+        $startWdate = $component->_date2timestamp( $start );
+        $startDateFormat = ( isset( $start['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d';
             /* get end date from dtend/due/duration properties */
-      $end = $component->getProperty( 'dtend' );
-      if( !empty( $end )) {
+        $end = $component->getProperty( 'dtend' );
+        if( !empty( $end )) {
         $dtendExist = TRUE;
         $endDateFormat = ( isset( $end['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d';
-      }
-   // if( !empty($end))  echo 'selectComp 1 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
-      if( empty($end) && ( $component->objName == 'vtodo' )) {
+        }
+    // if( !empty($end))  echo 'selectComp 1 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
+        if( empty($end) && ( $component->objName == 'vtodo' )) {
         $end = $component->getProperty( 'due' );
         if( !empty( $end )) {
-          $dueExist = TRUE;
-          $endDateFormat = ( isset( $end['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d';
+            $dueExist = TRUE;
+            $endDateFormat = ( isset( $end['hour'] )) ? 'Y-m-d H:i:s' : 'Y-m-d';
+        }
+    // if( !empty($end))  echo 'selectComp 2 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
         }
-   // if( !empty($end))  echo 'selectComp 2 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
-      }
-      if( !empty( $end ) && !isset( $end['hour'] )) {
-          /* a DTEND without time part regards an event that ends the day before,
+        if( !empty( $end ) && !isset( $end['hour'] )) {
+            /* a DTEND without time part regards an event that ends the day before,
              for an all-day event DTSTART=20071201 DTEND=20071202 (taking place 20071201!!! */
         $endAllDayEvent = TRUE;
         $endWdate = mktime( 23, 59, 59, $end['month'], ($end['day'] - 1), $end['year'] );
@@ -884,575 +883,575 @@ 
         $end['day']   = date( 'd', $endWdate );
         $end['hour']  = 23;
         $end['min']   = $end['sec'] = 59;
-   // if( !empty($end))  echo 'selectComp 3 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
-      }
-      if( empty( $end )) {
+    // if( !empty($end))  echo 'selectComp 3 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
+        }
+        if( empty( $end )) {
         $end = $component->getProperty( 'duration', FALSE, FALSE, TRUE );// in dtend (array) format
         if( !empty( $end ))
-          $durationExist = TRUE;
-   // if( !empty($end))  echo 'selectComp 4 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
-      }
-      if( empty( $end )) { // assume one day duration if missing end date
+            $durationExist = TRUE;
+    // if( !empty($end))  echo 'selectComp 4 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
+        }
+        if( empty( $end )) { // assume one day duration if missing end date
         $end = array( 'year' => $start['year'], 'month' => $start['month'], 'day' => $start['day'], 'hour' => 23, 'min' => 59, 'sec' => 59 );
-   // if( isset($end))  echo 'selectComp 5 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
-      }
-      $endWdate = $component->_date2timestamp( $end );
-      if( $endWdate < $startWdate ) { // MUST be after start date!!
+    // if( isset($end))  echo 'selectComp 5 start='.implode('-',$start).' end='.implode('-',$end)."<br />\n"; // test ###
+        }
+        $endWdate = $component->_date2timestamp( $end );
+        if( $endWdate < $startWdate ) { // MUST be after start date!!
         $end = array( 'year' => $start['year'], 'month' => $start['month'], 'day' => $start['day'], 'hour' => 23, 'min' => 59, 'sec' => 59 );
         $endWdate = $component->_date2timestamp( $end );
-      }
-      $rdurWsecs  = $endWdate - $startWdate; // compute component duration in seconds
-      $rdur       = $component->_date2duration( $start, $end ); // compute component duration, array
+        }
+        $rdurWsecs  = $endWdate - $startWdate; // compute component duration in seconds
+        $rdur       = $component->_date2duration( $start, $end ); // compute component duration, array
             /* make a list of optional exclude dates for component occurence from exrule and exdate */
-      $exdatelist = array();
-      $workstart  = $component->_timestamp2date(( $startDate - $rdurWsecs ), 6);
-      $workend    = $component->_timestamp2date(( $endDate + $rdurWsecs ), 6);
-      while( FALSE !== ( $exrule = $component->getProperty( 'exrule' )))    // check exrule
+        $exdatelist = array();
+        $workstart  = $component->_timestamp2date(( $startDate - $rdurWsecs ), 6);
+        $workend    = $component->_timestamp2date(( $endDate + $rdurWsecs ), 6);
+        while( FALSE !== ( $exrule = $component->getProperty( 'exrule' )))    // check exrule
         $component->_recur2date( $exdatelist, $exrule, $start, $workstart, $workend );
-      while( FALSE !== ( $exdate = $component->getProperty( 'exdate' ))) {  // check exdate
+        while( FALSE !== ( $exdate = $component->getProperty( 'exdate' ))) {  // check exdate
         foreach( $exdate as $theExdate ) {
-          $exWdate = $component->_date2timestamp( $theExdate );
-          if((( $startDate - $rdurWsecs ) <= $exWdate ) && ( $endDate >= $exWdate ))
+            $exWdate = $component->_date2timestamp( $theExdate );
+            if((( $startDate - $rdurWsecs ) <= $exWdate ) && ( $endDate >= $exWdate ))
             $exdatelist[$exWdate] = TRUE;
         }
-      }
+        }
             /* if 'any' components, check repeating components, removing all excluding dates */
-      if( TRUE === $any ) {
+        if( TRUE === $any ) {
             /* make a list of optional repeating dates for component occurence, rrule, rdate */
         $recurlist = array();
         while( FALSE !== ( $rrule = $component->getProperty( 'rrule' )))    // check rrule
-          $component->_recur2date( $recurlist, $rrule, $start, $workstart, $workend );
+            $component->_recur2date( $recurlist, $rrule, $start, $workstart, $workend );
         foreach( $recurlist as $recurkey => $recurvalue ) // key=match date as timestamp
-          $recurlist[$recurkey] = $rdurWsecs; // add duration in seconds
+            $recurlist[$recurkey] = $rdurWsecs; // add duration in seconds
         while( FALSE !== ( $rdate = $component->getProperty( 'rdate' ))) {  // check rdate
-          foreach( $rdate as $theRdate ) {
+            foreach( $rdate as $theRdate ) {
             if( is_array( $theRdate ) && ( 2 == count( $theRdate )) &&  // all days within PERIOD
                    array_key_exists( '0', $theRdate ) &&  array_key_exists( '1', $theRdate )) {
-              $rstart = $component->_date2timestamp( $theRdate[0] );
-              if(( $rstart < ( $startDate - $rdurWsecs )) || ( $rstart > $endDate ))
+                $rstart = $component->_date2timestamp( $theRdate[0] );
+                if(( $rstart < ( $startDate - $rdurWsecs )) || ( $rstart > $endDate ))
                 continue;
-              if( isset( $theRdate[1]['year'] )) // date-date period
+                if( isset( $theRdate[1]['year'] )) // date-date period
                 $rend = $component->_date2timestamp( $theRdate[1] );
-              else {                             // date-duration period
+                else {                             // date-duration period
                 $rend = $component->duration2date( $theRdate[0], $theRdate[1] );
                 $rend = $component->_date2timestamp( $rend );
-              }
-              if((( $startDate - $rdurWsecs ) <= $rstart ) && ( $endDate >= $rstart ))
+                }
+                if((( $startDate - $rdurWsecs ) <= $rstart ) && ( $endDate >= $rstart ))
                 $recurlist[$rstart] = ( $rstart - $rend ); // set start date + rdate duration in seconds
             } // PERIOD end
             else { // single date
-              $theRdate = $component->_date2timestamp( $theRdate );
-              if((( $startDate - $rdurWsecs ) <= $theRdate ) && ( $endDate >= $theRdate ))
+                $theRdate = $component->_date2timestamp( $theRdate );
+                if((( $startDate - $rdurWsecs ) <= $theRdate ) && ( $endDate >= $theRdate ))
                 $recurlist[$theRdate] = $rdurWsecs; // set start date + event duration in seconds
             }
-          }
+            }
         }
         if( 0 < count( $recurlist )) {
-          ksort( $recurlist );
-          foreach( $recurlist as $recurkey => $durvalue ) {
+            ksort( $recurlist );
+            foreach( $recurlist as $recurkey => $durvalue ) {
             if((( $startDate - $rdurWsecs ) > $recurkey ) || ( $endDate < $recurkey )) // not within period
-              continue;
+                continue;
             if( isset( $exdatelist[$recurkey] )) // check excluded dates
-              continue;
+                continue;
             if( $startWdate >= $recurkey ) // exclude component start date
-              continue;
+                continue;
             $component2   = $component->copy();
             $rstart       = $component2->_timestamp2date( $recurkey, 6);
             $datevalue    = $rstart['month'].'/'.$rstart['day'].'/'.$rstart['year'];
             if( isset( $start['hour'] ) || isset( $start['min'] ) || isset( $start['sec'] )) {
-              $datevalue .= ( isset( $rstart['hour'] )) ? ' '.$rstart['hour'] : ' 00';
-              $datevalue .= ( isset( $rstart['min'] ))  ? ':'.$rstart['min']  : ':00';
-              $datevalue .= ( isset( $rstart['sec'] ))  ? ':'.$rstart['sec']  : ':00';
+                $datevalue .= ( isset( $rstart['hour'] )) ? ' '.$rstart['hour'] : ' 00';
+                $datevalue .= ( isset( $rstart['min'] ))  ? ':'.$rstart['min']  : ':00';
+                $datevalue .= ( isset( $rstart['sec'] ))  ? ':'.$rstart['sec']  : ':00';
             }
             $datestring = date( $startDateFormat, strtotime( $datevalue ));
             if( isset( $start['tz'] ))
-              $datestring .= ' '.$start['tz'];
+                $datestring .= ' '.$start['tz'];
             $component2->setProperty( 'X-CURRENT-DTSTART', $datestring );
             $rend   = $component2->_timestamp2date(( $recurkey + $durvalue ), 6);
             if( $dtendExist || $dueExist ) {
-              if( $endAllDayEvent ) {
+                if( $endAllDayEvent ) {
                 $rend2 = mktime( 0, 0, 0, $rend['month'], ($rend['day'] + 1), $rend['year'] );
                 $datevalue  = date( 'm', $rend2 ).'/'.date( 'd', $rend2 ).'/'.date( 'Y', $rend2 );
-              }
-              else {
+                }
+                else {
                 $datevalue  = $rend['month'].'/'.$rend['day'].'/'.$rend['year'];
                 if( isset( $end['hour'] ) || isset( $end['min'] ) || isset( $end['sec'] )) {
-                  $datevalue .= ( isset( $rend['hour'] )) ? ' '.$rend['hour'] : ' 00';
-                  $datevalue .= ( isset( $rend['min'] ))  ? ':'.$rend['min']  : ':00';
-                  $datevalue .= ( isset( $rend['sec'] ))  ? ':'.$rend['sec']  : ':00';
+                    $datevalue .= ( isset( $rend['hour'] )) ? ' '.$rend['hour'] : ' 00';
+                    $datevalue .= ( isset( $rend['min'] ))  ? ':'.$rend['min']  : ':00';
+                    $datevalue .= ( isset( $rend['sec'] ))  ? ':'.$rend['sec']  : ':00';
+                }
                 }
-              }
-              $datestring = date( $endDateFormat, strtotime( $datevalue ));
-              if( isset( $end['tz'] ))
+                $datestring = date( $endDateFormat, strtotime( $datevalue ));
+                if( isset( $end['tz'] ))
                 $datestring .= ' '.$end['tz'];
-              if( $dtendExist )
+                if( $dtendExist )
                 $component2->setProperty( 'X-CURRENT-DTEND', $datestring );
-              elseif( $dueExist )
+                elseif( $dueExist )
                 $component2->setProperty( 'X-CURRENT-DUE', $datestring );
             }
             $rend   = $component2->_date2timestamp( $rend );
             $rstart = $recurkey;
             /* add repeating components within valid dates to output array, only start date */
             if( $flat )
-              $result[] = $component2->copy(); // copy to output
+                $result[] = $component2->copy(); // copy to output
             elseif( $split ) {
-              if( $rend > $endDate )
+                if( $rend > $endDate )
                 $rend = $endDate;
-              while( $rstart <= $rend ) { // iterate
+                while( $rstart <= $rend ) { // iterate
                 $wd = getdate( $rstart );
                 if(( $rstart > $startDate ) &&      // date after dtstart
                     !isset( $exdatelist[$rstart] )) // check exclude date
-                  $result[$wd['year']][$wd['mon']][$wd['mday']][] = $component2->copy(); // copy to output
+                    $result[$wd['year']][$wd['mon']][$wd['mday']][] = $component2->copy(); // copy to output
                 $rstart += ( 24*60*60 ); // step one day
-              }
+                }
             }
             elseif(( $rstart >= $startDate ) &&     // date within period
                   !isset( $exdatelist[$rstart] )) { // check exclude date
-              $wd = getdate( $rstart );
-              $result[$wd['year']][$wd['mon']][$wd['mday']][] = $component2->copy(); // copy to output
+                $wd = getdate( $rstart );
+                $result[$wd['year']][$wd['mon']][$wd['mday']][] = $component2->copy(); // copy to output
+            }
             }
-          }
         }
             /* deselect components with startdate/enddate not within period */
         if(( $endWdate < $startDate ) || ( $startWdate > $endDate )) continue;
-      }
+        }
             /* deselect components with startdate not within period */
-      elseif(( $startWdate < $startDate ) || ( $startWdate > $endDate )) continue;
+        elseif(( $startWdate < $startDate ) || ( $startWdate > $endDate )) continue;
             /* add selected components within valid dates to output array */
-      if( $flat )
+        if( $flat )
         $result[] = $component->copy(); // copy to output;
-      elseif( $split ) {
+        elseif( $split ) {
         if( $endWdate > $endDate )
-          $endWdate = $endDate;     // use period end date
+            $endWdate = $endDate;     // use period end date
         if( !isset( $exdatelist[$startWdate] ))  { // check excluded dates
-          if( $startWdate < $startDate )
+            if( $startWdate < $startDate )
             $startWdate = $startDate; // use period start date
-          while( $startWdate <= $endWdate ) { // iterate
+            while( $startWdate <= $endWdate ) { // iterate
             $wd = getdate( $startWdate );
             $result[$wd['year']][$wd['mon']][$wd['mday']][] = $component->copy(); // copy to output
             $startWdate += ( 24*60*60 ); // step one day
-          }
+            }
         }
-      } // use component date
-      elseif( !isset( $exdatelist[$startWdate] ) &&   // check excluded dates
+        } // use component date
+        elseif( !isset( $exdatelist[$startWdate] ) &&   // check excluded dates
             ( $startWdate >= $startDate )) {          // within period
         $wd = getdate( $startWdate );
         $result[$wd['year']][$wd['mon']][$wd['mday']][] = $component->copy(); // copy to output
-      }
+        }
     }
     if( 0 >= count( $result )) return FALSE;
     elseif( !$flat ) {
-      foreach( $result as $y => $yeararr ) {
+        foreach( $result as $y => $yeararr ) {
         foreach( $yeararr as $m => $montharr ) {
-          ksort( $result[$y][$m] );
+            ksort( $result[$y][$m] );
         }
         ksort( $result[$y] );
-      }
-      ksort( $result );
+        }
+        ksort( $result );
     }
     return $result;
-  }
+    }
 /**
- * add calendar component to container
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.10 - 2008-08-06
- * @param object $component calendar component
- * @param mixed $arg1 optional, ordno/component type/ component uid
- * @param mixed $arg2 optional, ordno if arg1 = component type
- * @return void
- */
-  function setComponent( $component, $arg1=FALSE, $arg2=FALSE  ) {
+     * add calendar component to container
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.10 - 2008-08-06
+     * @param object $component calendar component
+     * @param mixed $arg1 optional, ordno/component type/ component uid
+     * @param mixed $arg2 optional, ordno if arg1 = component type
+     * @return void
+     */
+    function setComponent( $component, $arg1=FALSE, $arg2=FALSE  ) {
     if( '' >= $component->getConfig( 'language'))
-      $component->setConfig( 'language',  $this->getConfig( 'language' ));
+        $component->setConfig( 'language',  $this->getConfig( 'language' ));
     $component->setConfig( 'allowEmpty',  $this->getConfig( 'allowEmpty' ));
     $component->setConfig( 'nl',          $this->getConfig( 'nl' ));
     $component->setConfig( 'unique_id',   $this->getConfig( 'unique_id' ));
     $component->setConfig( 'format',      $this->getConfig( 'format' ));
     if( !in_array( $component->objName, array( 'valarm', 'vtimezone' ))) {
-      unset( $component->propix );
+        unset( $component->propix );
             /* make sure dtstamp and uid is set */
-      $dummy1 = $component->getProperty( 'dtstamp' );
-      $dummy2 = $component->getProperty( 'uid' );
+        $dummy1 = $component->getProperty( 'dtstamp' );
+        $dummy2 = $component->getProperty( 'uid' );
     }
     if( !$arg1 ) {
-      $this->components[] = $component->copy();
-      return TRUE;
+        $this->components[] = $component->copy();
+        return TRUE;
     }
     $argType = $index = null;
     if ( ctype_digit( (string) $arg1 )) {
-      $argType = 'INDEX';
-      $index   = (int) $arg1 - 1;
+        $argType = 'INDEX';
+        $index   = (int) $arg1 - 1;
     }
     elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
-      $argType = strtolower( $arg1 );
-      $index = ( ctype_digit( (string) $arg2 )) ? ((int) $arg2) - 1 : 0;
+        $argType = strtolower( $arg1 );
+        $index = ( ctype_digit( (string) $arg2 )) ? ((int) $arg2) - 1 : 0;
     }
     $cix1sC = 0;
     foreach ( $this->components as $cix => $component2) {
-      if( empty( $component2 )) continue;
-      unset( $component2->propix );
-      if(( 'INDEX' == $argType ) && ( $index == $cix )) {
+        if( empty( $component2 )) continue;
+        unset( $component2->propix );
+        if(( 'INDEX' == $argType ) && ( $index == $cix )) {
         $this->components[$cix] = $component->copy();
         return TRUE;
-      }
-      elseif( $argType == $component2->objName ) {
+        }
+        elseif( $argType == $component2->objName ) {
         if( $index == $cix1sC ) {
-          $this->components[$cix] = $component->copy();
-          return TRUE;
+            $this->components[$cix] = $component->copy();
+            return TRUE;
         }
         $cix1sC++;
-      }
-      elseif( !$argType && ( $arg1 == $component2->getProperty( 'uid' ))) {
+        }
+        elseif( !$argType && ( $arg1 == $component2->getProperty( 'uid' ))) {
         $this->components[$cix] = $component->copy();
         return TRUE;
-      }
+        }
     }
             /* not found.. . insert last in chain anyway .. .*/
     $this->components[] = $component->copy();
     return TRUE;
-  }
+    }
 /**
- * sort iCal compoments, only local date sort
- *
- * ascending sort on properties (if exist) x-current-dtstart, dtstart,
- * x-current-dtend, dtend, x-current-due, due, duration, created, dtstamp, uid
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.10 - 2008-09-24
- * @return sort param
- *
- */
-  function sort() {
+     * sort iCal compoments, only local date sort
+     *
+     * ascending sort on properties (if exist) x-current-dtstart, dtstart,
+     * x-current-dtend, dtend, x-current-due, due, duration, created, dtstamp, uid
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.10 - 2008-09-24
+     * @return sort param
+     *
+     */
+    function sort() {
     if( is_array( $this->components )) {
-      $this->_sortkeys = array( 'year', 'month', 'day', 'hour', 'min', 'sec' );
-      usort( $this->components, array( $this, '_cmpfcn' ));
+        $this->_sortkeys = array( 'year', 'month', 'day', 'hour', 'min', 'sec' );
+        usort( $this->components, array( $this, '_cmpfcn' ));
     }
-  }
-  function _cmpfcn( $a, $b ) {
+    }
+    function _cmpfcn( $a, $b ) {
     if( empty( $a ))                                   return -1;
     if( empty( $b ))                                   return  1;
     if(  'vtimezone' == $a->objName)                   return -1;
     if(  'vtimezone' == $b->objName)                   return  1;
     $astart = ( isset( $a->xprop['X-CURRENT-DTSTART']['value'] )) ? $a->_date_time_string( $a->xprop['X-CURRENT-DTSTART']['value'] ) : null;
     if( empty( $astart ) && isset( $a->dtstart['value'] ))
-      $astart = & $a->dtstart['value'];
+        $astart = & $a->dtstart['value'];
     $bstart = ( isset( $b->xprop['X-CURRENT-DTSTART']['value'] )) ? $b->_date_time_string( $b->xprop['X-CURRENT-DTSTART']['value'] ) : null;
     if( empty( $bstart ) && isset( $b->dtstart['value'] ))
-      $bstart = & $b->dtstart['value'];
+        $bstart = & $b->dtstart['value'];
     if(     empty( $astart ))                          return -1;
     elseif( empty( $bstart ))                          return  1;
     foreach( $this->_sortkeys as $key ) {
-      if    ( empty( $astart[$key] ))                  return -1;
-      elseif( empty( $bstart[$key] ))                  return  1;
-      if    (        $astart[$key] == $bstart[$key])   continue;
-      if    (( (int) $astart[$key] ) < ((int) $bstart[$key] ))
-                                                       return -1;
-      elseif(( (int) $astart[$key] ) > ((int) $bstart[$key] ))
-                                                       return  1;
+        if    ( empty( $astart[$key] ))                  return -1;
+        elseif( empty( $bstart[$key] ))                  return  1;
+        if    (        $astart[$key] == $bstart[$key])   continue;
+        if    (( (int) $astart[$key] ) < ((int) $bstart[$key] ))
+                                                        return -1;
+        elseif(( (int) $astart[$key] ) > ((int) $bstart[$key] ))
+                                                        return  1;
     }
     $c   = ( isset( $a->xprop['X-CURRENT-DTEND']['value'] )) ? $a->_date_time_string( $a->xprop['X-CURRENT-DTEND']['value'] ) : null;
     if(     empty( $c ) && !empty( $a->dtend['value'] ))
-      $c = & $a->dtend['value'];
+        $c = & $a->dtend['value'];
     if(     empty( $c ) && isset( $a->xprop['X-CURRENT-DUE']['value'] ))
-      $c = $a->_date_time_string( $a->xprop['X-CURRENT-DUE']['value'] );
+        $c = $a->_date_time_string( $a->xprop['X-CURRENT-DUE']['value'] );
     if(     empty( $c ) && !empty( $a->due['value'] ))
-      $c = & $a->due['value'];
+        $c = & $a->due['value'];
     if(     empty( $c ) && !empty( $a->duration['value'] ))
-      $c = $a->duration2date();
+        $c = $a->duration2date();
     $d   = ( isset( $b->xprop['X-CURRENT-DTEND']['value'] )) ? $b->_date_time_string( $b->xprop['X-CURRENT-DTEND']['value'] ) : null;
     if(     empty( $d ) && !empty( $b->dtend['value'] ))
-      $d = & $b->dtend['value'];
+        $d = & $b->dtend['value'];
     if(     empty( $d ) && isset( $b->xprop['X-CURRENT-DUE']['value'] ))
-      $d = $b->_date_time_string( $b->xprop['X-CURRENT-DUE']['value'] );
+        $d = $b->_date_time_string( $b->xprop['X-CURRENT-DUE']['value'] );
     if(     empty( $d ) && !empty( $b->due['value'] ))
-      $d = & $b->due['value'];
+        $d = & $b->due['value'];
     if(     empty( $d ) && !empty( $b->duration['value'] ))
-      $d = $b->duration2date();
+        $d = $b->duration2date();
     if(     empty( $c ))                               return -1;
     elseif( empty( $d ))                               return  1;
     foreach( $this->_sortkeys as $key ) {
-      if    ( !isset( $c[$key] ))                      return -1;
-      elseif( !isset( $d[$key] ))                      return  1;
-      if    (         $c[$key] == $d[$key] )           continue;
-      if    ((  (int) $c[$key] ) < ((int) $d[$key]))   return -1;
-      elseif((  (int) $c[$key] ) > ((int) $d[$key]))   return  1;
+        if    ( !isset( $c[$key] ))                      return -1;
+        elseif( !isset( $d[$key] ))                      return  1;
+        if    (         $c[$key] == $d[$key] )           continue;
+        if    ((  (int) $c[$key] ) < ((int) $d[$key]))   return -1;
+        elseif((  (int) $c[$key] ) > ((int) $d[$key]))   return  1;
     }
     if( isset( $a->created['value'] ))
-     $e = & $a->created['value'];
+        $e = & $a->created['value'];
     else
-     $e = & $a->dtstamp['value'];
+        $e = & $a->dtstamp['value'];
     if( isset( $b->created['value'] ))
-      $f = & $b->created['value'];
+        $f = & $b->created['value'];
     else
-      $f = & $b->dtstamp['value'];
+        $f = & $b->dtstamp['value'];
     foreach( $this->_sortkeys as $key ) {
-      if(       !isset( $e[$key] ))                    return -1;
-      elseif(   !isset( $f[$key] ))                    return  1;
-      if    (           $e[$key] == $f[$key] )         continue;
-      if    ((    (int) $e[$key] ) < ((int) $f[$key])) return -1;
-      elseif((    (int) $e[$key] ) > ((int) $f[$key])) return  1;
+        if(       !isset( $e[$key] ))                    return -1;
+        elseif(   !isset( $f[$key] ))                    return  1;
+        if    (           $e[$key] == $f[$key] )         continue;
+        if    ((    (int) $e[$key] ) < ((int) $f[$key])) return -1;
+        elseif((    (int) $e[$key] ) > ((int) $f[$key])) return  1;
     }
     if    ((            $a->uid['value'] ) <
-           (            $b->uid['value'] ))            return -1;
+            (            $b->uid['value'] ))            return -1;
     elseif((            $a->uid['value'] ) >
-           (            $b->uid['value'] ))            return  1;
+            (            $b->uid['value'] ))            return  1;
     return 0;
-  }
+    }
 /**
- * parse iCal file into vcalendar, components, properties and parameters
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.10 - 2008-08-06
- * @param string $filename optional filname (incl. opt. directory/path) or URL
- * @return bool FALSE if error occurs during parsing
- *
- */
-  function parse( $filename=FALSE ) {
+     * parse iCal file into vcalendar, components, properties and parameters
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.10 - 2008-08-06
+     * @param string $filename optional filname (incl. opt. directory/path) or URL
+     * @return bool FALSE if error occurs during parsing
+     *
+     */
+    function parse( $filename=FALSE ) {
     if( !$filename ) {
             /* directory/filename previous set via setConfig directory+filename / url */
-      if( FALSE === ( $filename = $this->getConfig( 'url' )))
+        if( FALSE === ( $filename = $this->getConfig( 'url' )))
         $filename = $this->getConfig( 'dirfile' );
     }
     elseif(( 'http://'   == strtolower( substr( $filename, 0, 7 ))) ||
            ( 'webcal://' == strtolower( substr( $filename, 0, 9 ))))  {
             /* remote file - URL */
-      $this->setConfig( 'URL', $filename );
-      if( !$filename = $this->getConfig( 'url' ))
+        $this->setConfig( 'URL', $filename );
+        if( !$filename = $this->getConfig( 'url' ))
         return FALSE;                 /* err 2 */
     }
     else {
             /* local directory/filename */
-      $parts = pathinfo( $filename );
-      if( !empty( $parts['dirname'] ) && ( '.' != $parts['dirname'] )) {
+        $parts = pathinfo( $filename );
+        if( !empty( $parts['dirname'] ) && ( '.' != $parts['dirname'] )) {
         if( !$this->setConfig( 'directory', $parts['dirname'] ))
-          return FALSE;               /* err 3 */
-      }
-      if( !$this->setConfig( 'filename', $parts['basename'] ))
+            return FALSE;               /* err 3 */
+        }
+        if( !$this->setConfig( 'filename', $parts['basename'] ))
         return FALSE;                 /* err 4 */
     }
     if( 'http://' != substr( $filename, 0, 7 )) {
             /* local file error tests */
-      if( !is_file( $filename ))      /* err 5 */
+        if( !is_file( $filename ))      /* err 5 */
         return FALSE;
-      if( !is_readable( $filename ))
+        if( !is_readable( $filename ))
         return FALSE;                 /* err 6 */
-      if( !filesize( $filename ))
+        if( !filesize( $filename ))
         return FALSE;                 /* err 7 */
-      clearstatcache();
+        clearstatcache();
     }
             /* READ FILE */
     if( FALSE === ( $rows = file( $filename )))
-      return FALSE;                   /* err 1 */
+        return FALSE;                   /* err 1 */
             /* identify BEGIN:VCALENDAR, MUST be first row */
     if( 'BEGIN:VCALENDAR' != strtoupper( trim( $rows[0] )))
-      return FALSE;                   /* err 8 */
+        return FALSE;                   /* err 8 */
             /* remove empty trailing lines */
     while( '' == trim( $rows[count( $rows ) - 1] )) {
-      unset( $rows[count( $rows ) - 1] );
-      $rows  = array_values( $rows );
+        unset( $rows[count( $rows ) - 1] );
+        $rows  = array_values( $rows );
     }
             /* identify ending END:VCALENDAR row */
     if( 'END:VCALENDAR'   != strtoupper( trim( $rows[count( $rows ) - 1] ))) {
-      return FALSE;                   /* err 9 */
+        return FALSE;                   /* err 9 */
     }
     if( 3 > count( $rows ))
-      return FALSE;                   /* err 10 */
+        return FALSE;                   /* err 10 */
     $comp    = $subcomp = null;
     $actcomp = & $this;
     $nl      = $this->getConfig( 'nl' );
     $calsync = 0;
             /* identify components and update unparsed data within component */
     foreach( $rows as $line ) {
-      if( '' == trim( $line ))
+        if( '' == trim( $line ))
         continue;
-      if( $nl == substr( $line, 0 - strlen( $nl )))
+        if( $nl == substr( $line, 0 - strlen( $nl )))
         $line = substr( $line, 0, ( strlen( $line ) - strlen( $nl ))).'\n';
-      if( 'BEGIN:VCALENDAR' == strtoupper( substr( $line, 0, 15 ))) {
+        if( 'BEGIN:VCALENDAR' == strtoupper( substr( $line, 0, 15 ))) {
         $calsync++;
         continue;
-      }
-      elseif( 'END:VCALENDAR' == strtoupper( substr( $line, 0, 13 ))) {
+        }
+        elseif( 'END:VCALENDAR' == strtoupper( substr( $line, 0, 13 ))) {
         $calsync--;
         continue;
-      }
-      elseif( 1 != $calsync )
+        }
+        elseif( 1 != $calsync )
         return FALSE;                 /* err 20 */
-      if( 'END:' == strtoupper( substr( $line, 0, 4 ))) {
+        if( 'END:' == strtoupper( substr( $line, 0, 4 ))) {
         if( null != $subcomp ) {
-          $comp->setComponent( $subcomp );
-          $subcomp = null;
+            $comp->setComponent( $subcomp );
+            $subcomp = null;
         }
         else {
-          $this->setComponent( $comp );
-          $comp = null;
+            $this->setComponent( $comp );
+            $comp = null;
         }
         $actcomp = null;
         continue;
-      } // end - if ( 'END:' ==.. .
-      elseif( 'BEGIN:' == strtoupper( substr( $line, 0, 6 ))) {
+        } // end - if ( 'END:' ==.. .
+        elseif( 'BEGIN:' == strtoupper( substr( $line, 0, 6 ))) {
         $line = str_replace( '\n', '', $line );
         $compname = trim (strtoupper( substr( $line, 6 )));
         if( null != $comp ) {
-          if( 'VALARM' == $compname )
+            if( 'VALARM' == $compname )
             $subcomp = new valarm();
-          elseif( 'STANDARD' == $compname )
+            elseif( 'STANDARD' == $compname )
             $subcomp = new vtimezone( 'STANDARD' );
-          elseif( 'DAYLIGHT' == $compname )
+            elseif( 'DAYLIGHT' == $compname )
             $subcomp = new vtimezone( 'DAYLIGHT' );
-          else
+            else
             return FALSE; /* err 6 */
-          $actcomp = & $subcomp;
+            $actcomp = & $subcomp;
         }
         else {
-          switch( $compname ) {
+            switch( $compname ) {
             case 'VALARM':
               $comp = new valarm();
-              break;
+                break;
             case 'VEVENT':
               $comp = new vevent();
-              break;
+                break;
             case 'VFREEBUSY';
-              $comp = new vfreebusy();
-              break;
+                $comp = new vfreebusy();
+                break;
             case 'VJOURNAL':
               $comp = new vjournal();
-              break;
+                break;
             case 'VTODO':
               $comp = new vtodo();
-              break;
+                break;
             case 'VTIMEZONE':
               $comp = new vtimezone();
-              break;
+                break;
             default:
               return FALSE; // err 7
-              break;
-          } // end - switch
-          $actcomp = & $comp;
+                break;
+            } // end - switch
+            $actcomp = & $comp;
         }
         continue;
-      } // end - elsif ( 'BEGIN:'.. .
+        } // end - elsif ( 'BEGIN:'.. .
             /* update selected component with unparsed data */
-      $actcomp->unparsed[] = $line;
+        $actcomp->unparsed[] = $line;
     } // end - foreach( rows.. .
             /* parse data for calendar (this) object */
     if( is_array( $this->unparsed ) && ( 0 < count( $this->unparsed ))) {
             /* concatenate property values spread over several lines */
-      $lastix    = -1;
-      $propnames = array( 'calscale','method','prodid','version','x-' );
-      $proprows  = array();
-      foreach( $this->unparsed as $line ) {
+        $lastix    = -1;
+        $propnames = array( 'calscale','method','prodid','version','x-' );
+        $proprows  = array();
+        foreach( $this->unparsed as $line ) {
         $newProp = FALSE;
         foreach ( $propnames as $propname ) {
-          if( $propname == strtolower( substr( $line, 0, strlen( $propname )))) {
+            if( $propname == strtolower( substr( $line, 0, strlen( $propname )))) {
             $newProp = TRUE;
             break;
-          }
+            }
         }
         if( $newProp ) {
-          $newProp = FALSE;
-          $lastix++;
-          $proprows[$lastix]  = $line;
+            $newProp = FALSE;
+            $lastix++;
+            $proprows[$lastix]  = $line;
         }
         else {
             /* remove line breaks */
-          if(( '\n' == substr( $proprows[$lastix], -2 )) &&
+            if(( '\n' == substr( $proprows[$lastix], -2 )) &&
              (  ' ' == substr( $line, 0, 1 ))) {
             $proprows[$lastix] = substr( $proprows[$lastix], 0, strlen( $proprows[$lastix] ) - 2 );
             $line = substr( $line, 1 );
-          }
-          $proprows[$lastix] .= $line;
+            }
+            $proprows[$lastix] .= $line;
+        }
         }
-      }
-      $toolbox = new calendarComponent();
-      foreach( $proprows as $line ) {
+        $toolbox = new calendarComponent();
+        foreach( $proprows as $line ) {
         if( '\n' == substr( $line, -2 ))
-          $line = substr( $line, 0, strlen( $line ) - 2 );
+            $line = substr( $line, 0, strlen( $line ) - 2 );
             /* get propname */
         $cix = $propname = null;
         for( $cix=0; $cix < strlen( $line ); $cix++ ) {
-          if( in_array( $line{$cix}, array( ':', ';' )))
+            if( in_array( $line{$cix}, array( ':', ';' )))
             break;
-          else
+            else
             $propname .= $line{$cix};
         }
             /* ignore version/prodid properties */
         if( in_array( strtoupper( $propname ), array( 'VERSION', 'PRODID' )))
-          continue;
+            continue;
         $line = substr( $line, $cix);
             /* separate attributes from value */
         $attr   = array();
         $attrix = -1;
         $strlen = strlen( $line );
         for( $cix=0; $cix < $strlen; $cix++ ) {
-          if((       ':'   == $line{$cix} )             &&
+            if((       ':'   == $line{$cix} )             &&
                    ( '://' != substr( $line, $cix, 3 )) &&
              ( 'mailto:'   != strtolower( substr( $line, $cix - 6, 7 )))) {
             $attrEnd = TRUE;
             if(( $cix < ( $strlen - 4 )) &&
                  ctype_digit( substr( $line, $cix+1, 4 ))) { // an URI with a (4pos) portnr??
-              for( $c2ix = $cix; 3 < $c2ix; $c2ix-- ) {
+                for( $c2ix = $cix; 3 < $c2ix; $c2ix-- ) {
                 if( '://' == substr( $line, $c2ix - 2, 3 )) {
-                  $attrEnd = FALSE;
-                  break; // an URI with a portnr!!
+                    $attrEnd = FALSE;
+                    break; // an URI with a portnr!!
+                }
                 }
-              }
             }
             if( $attrEnd) {
-              $line = substr( $line, $cix + 1 );
-              break;
+                $line = substr( $line, $cix + 1 );
+                break;
             }
-          }
-          if( ';' == $line{$cix} )
+            }
+            if( ';' == $line{$cix} )
             $attr[++$attrix] = null;
-          else
+            else
             $attr[$attrix] .= $line{$cix};
         }
 
             /* make attributes in array format */
         $propattr = array();
         foreach( $attr as $attribute ) {
-          $attrsplit = explode( '=', $attribute, 2 );
-          if( 1 < count( $attrsplit ))
+            $attrsplit = explode( '=', $attribute, 2 );
+            if( 1 < count( $attrsplit ))
             $propattr[$attrsplit[0]] = $attrsplit[1];
-          else
+            else
             $propattr[] = $attribute;
         }
             /* update Property */
         if( FALSE !== strpos( $line, ',' )) {
-          $content  = explode( ',', $line );
-          $clen     = count( $content );
-          for( $cix = 0; $cix < $clen; $cix++ ) {
+            $content  = explode( ',', $line );
+            $clen     = count( $content );
+            for( $cix = 0; $cix < $clen; $cix++ ) {
             if( "\\" == substr( $content[$cix], -1 )) {
-              $content[$cix] .= ','.$content[$cix + 1];
-              unset( $content[$cix + 1] );
-              $cix++;
+                $content[$cix] .= ','.$content[$cix + 1];
+                unset( $content[$cix + 1] );
+                $cix++;
             }
-          }
-          if( 1 < count( $content )) {
+            }
+            if( 1 < count( $content )) {
             foreach( $content as $cix => $contentPart )
-              $content[$cix] = $toolbox->_strunrep( $contentPart );
+                $content[$cix] = $toolbox->_strunrep( $contentPart );
             $this->setProperty( $propname, $content, $propattr );
             continue;
-          }
-          else
+            }
+            else
             $line = reset( $content );
-          $line = $toolbox->_strunrep( $line );
+            $line = $toolbox->_strunrep( $line );
         }
         $this->setProperty( $propname, trim( $line ), $propattr );
-      } // end - foreach( $this->unparsed.. .
+        } // end - foreach( $this->unparsed.. .
     } // end - if( is_array( $this->unparsed.. .
             /* parse Components */
     if( is_array( $this->components ) && ( 0 < count( $this->components ))) {
-      for( $six = 0; $six < count( $this->components ); $six++ ) {
+        for( $six = 0; $six < count( $this->components ); $six++ ) {
         if( !empty( $this->components[$six] ))
-          $this->components[$six]->parse();
-      }
+            $this->components[$six]->parse();
+        }
     }
     else
-      return FALSE;                   /* err 91 or something.. . */
+        return FALSE;                   /* err 91 or something.. . */
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * creates formatted output for calendar object instance
@@ -1461,17 +1460,17 @@ 
  * @since 2.4.10 - 2008-08-06
  * @return string
  */
-  function createCalendar() {
+    function createCalendar() {
     $calendarInit1 = $calendarInit2 = $calendarxCaldecl = $calendarStart = $calendar = null;
     switch( $this->format ) {
-      case 'xcal':
+        case 'xcal':
         $calendarInit1 = '<?xml version="1.0" encoding="UTF-8"?>'.$this->nl.
-                         '<!DOCTYPE iCalendar PUBLIC "-//IETF//DTD XCAL/iCalendar XML//EN"'.$this->nl.
-                         '"http://www.ietf.org/internet-drafts/draft-ietf-calsch-many-xcal-01.txt"';
+                            '<!DOCTYPE iCalendar PUBLIC "-//IETF//DTD XCAL/iCalendar XML//EN"'.$this->nl.
+                            '"http://www.ietf.org/internet-drafts/draft-ietf-calsch-many-xcal-01.txt"';
         $calendarInit2 = '>'.$this->nl;
         $calendarStart = '<vcalendar';
         break;
-      default:
+        default:
         $calendarStart = 'BEGIN:VCALENDAR'.$this->nl;
         break;
     }
@@ -1480,175 +1479,175 @@ 
     $calendarStart .= $this->createProdid();
     $calendarStart .= $this->createVersion();
     switch( $this->format ) {
-      case 'xcal':
+        case 'xcal':
         $nlstrlen = strlen( $this->nl );
         if( $this->nl == substr( $calendarStart, ( 0 - $nlstrlen )))
-          $calendarStart = substr( $calendarStart, 0, ( strlen( $calendarStart ) - $nlstrlen ));
+            $calendarStart = substr( $calendarStart, 0, ( strlen( $calendarStart ) - $nlstrlen ));
         $calendarStart .= '>'.$this->nl;
         break;
-      default:
+        default:
         break;
     }
     $calendar .= $this->createXprop();
     foreach( $this->components as $component ) {
-      if( empty( $component )) continue;
-      if( '' >= $component->getConfig( 'language'))
+        if( empty( $component )) continue;
+        if( '' >= $component->getConfig( 'language'))
         $component->setConfig( 'language',  $this->getConfig( 'language' ));
-      $component->setConfig( 'allowEmpty',  $this->getConfig( 'allowEmpty' ));
-      $component->setConfig( 'nl',          $this->getConfig( 'nl' ));
-      $component->setConfig( 'unique_id',   $this->getConfig( 'unique_id' ));
-      $component->setConfig( 'format',      $this->getConfig( 'format' ));
-      $calendar .= $component->createComponent( $this->xcaldecl );
+        $component->setConfig( 'allowEmpty',  $this->getConfig( 'allowEmpty' ));
+        $component->setConfig( 'nl',          $this->getConfig( 'nl' ));
+        $component->setConfig( 'unique_id',   $this->getConfig( 'unique_id' ));
+        $component->setConfig( 'format',      $this->getConfig( 'format' ));
+        $calendar .= $component->createComponent( $this->xcaldecl );
     }
     if(( 0 < count( $this->xcaldecl )) && ( 'xcal' == $this->format )) { // xCal only
-      $calendarInit1 .= $this->nl.'['.$this->nl;
-      $old_xcaldecl = array();
-      foreach( $this->xcaldecl as $declix => $declPart ) {
+        $calendarInit1 .= $this->nl.'['.$this->nl;
+        $old_xcaldecl = array();
+        foreach( $this->xcaldecl as $declix => $declPart ) {
         if(( 0 < count( $old_xcaldecl)) &&
            ( in_array( $declPart['uri'],      $old_xcaldecl['uri'] )) &&
            ( in_array( $declPart['external'], $old_xcaldecl['external'] )))
-          continue; // no duplicate uri and ext. references
+            continue; // no duplicate uri and ext. references
         $calendarxCaldecl .= '<!';
         foreach( $declPart as $declKey => $declValue ) {
-          switch( $declKey ) {                    // index
+            switch( $declKey ) {                    // index
             case 'xmldecl':                       // no 1
               $calendarxCaldecl .= $declValue.' ';
-              break;
+                break;
             case 'uri':                           // no 2
               $calendarxCaldecl .= $declValue.' ';
-              $old_xcaldecl['uri'][] = $declValue;
-              break;
+                $old_xcaldecl['uri'][] = $declValue;
+                break;
             case 'ref':                           // no 3
               $calendarxCaldecl .= $declValue.' ';
-              break;
+                break;
             case 'external':                      // no 4
               $calendarxCaldecl .= '"'.$declValue.'" ';
-              $old_xcaldecl['external'][] = $declValue;
-              break;
+                $old_xcaldecl['external'][] = $declValue;
+                break;
             case 'type':                          // no 5
               $calendarxCaldecl .= $declValue.' ';
-              break;
+                break;
             case 'type2':                         // no 6
               $calendarxCaldecl .= $declValue;
-              break;
-          }
+                break;
+            }
         }
         $calendarxCaldecl .= '>'.$this->nl;
-      }
-      $calendarInit2 = ']'.$calendarInit2;
+        }
+        $calendarInit2 = ']'.$calendarInit2;
     }
     switch( $this->format ) {
-      case 'xcal':
+        case 'xcal':
         $calendar .= '</vcalendar>'.$this->nl;
         break;
-      default:
+        default:
         $calendar .= 'END:VCALENDAR'.$this->nl;
         break;
     }
     return $calendarInit1.$calendarxCaldecl.$calendarInit2.$calendarStart.$calendar;
-  }
+    }
 /**
- * a HTTP redirect header is sent with created, updated and/or parsed calendar
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.2.12 - 2007-10-23
- * @return redirect
- */
-  function returnCalendar() {
+     * a HTTP redirect header is sent with created, updated and/or parsed calendar
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.2.12 - 2007-10-23
+     * @return redirect
+     */
+    function returnCalendar() {
     $filename = $this->getConfig( 'filename' );
     $output   = $this->createCalendar();
     $filesize = strlen( $output );
 //    if( headers_sent( $filename, $linenum ))
 //      die( "Headers already sent in $filename on line $linenum\n" );
     if( 'xcal' == $this->format )
-      header( 'Content-Type: application/calendar+xml; charset=utf-8' );
+        header( 'Content-Type: application/calendar+xml; charset=utf-8' );
     else
-      header( 'Content-Type: text/calendar; charset=utf-8' );
+        header( 'Content-Type: text/calendar; charset=utf-8' );
     header( 'Content-Length: '.$filesize );
     header( 'Content-Disposition: attachment; filename="'.$filename.'"' );
     header( 'Cache-Control: max-age=10' );
     echo $output;
     die();
-  }
+    }
 /**
- * save content in a file
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.2.12 - 2007-12-30
- * @param string $directory optional
- * @param string $filename optional
- * @param string $delimiter optional
- * @return bool
- */
-  function saveCalendar( $directory=FALSE, $filename=FALSE, $delimiter=FALSE ) {
+     * save content in a file
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.2.12 - 2007-12-30
+     * @param string $directory optional
+     * @param string $filename optional
+     * @param string $delimiter optional
+     * @return bool
+     */
+    function saveCalendar( $directory=FALSE, $filename=FALSE, $delimiter=FALSE ) {
     if( $directory )
-      $this->setConfig( 'directory', $directory );
+        $this->setConfig( 'directory', $directory );
     if( $filename )
-      $this->setConfig( 'filename',  $filename );
+        $this->setConfig( 'filename',  $filename );
     if( $delimiter && ($delimiter != DIRECTORY_SEPARATOR ))
-      $this->setConfig( 'delimiter', $delimiter );
+        $this->setConfig( 'delimiter', $delimiter );
     if( FALSE === ( $dirfile = $this->getConfig( 'url' )))
-      $dirfile = $this->getConfig( 'dirfile' );
+        $dirfile = $this->getConfig( 'dirfile' );
     $iCalFile = @fopen( $dirfile, 'w' );
     if( $iCalFile ) {
-      if( FALSE === fwrite( $iCalFile, $this->createCalendar() ))
+        if( FALSE === fwrite( $iCalFile, $this->createCalendar() ))
         return FALSE;
-      fclose( $iCalFile );
-      return TRUE;
+        fclose( $iCalFile );
+        return TRUE;
     }
     else
-      return FALSE;
-  }
+        return FALSE;
+    }
 /**
- * if recent version of calendar file exists (default one hour), an HTTP redirect header is sent
- * else FALSE is returned
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.2.12 - 2007-10-28
- * @param string $directory optional alt. int timeout
- * @param string $filename optional
- * @param string $delimiter optional
- * @param int timeout optional, default 3600 sec
- * @return redirect/FALSE
- */
-  function useCachedCalendar( $directory=FALSE, $filename=FALSE, $delimiter=FALSE, $timeout=3600) {
+     * if recent version of calendar file exists (default one hour), an HTTP redirect header is sent
+     * else FALSE is returned
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.2.12 - 2007-10-28
+     * @param string $directory optional alt. int timeout
+     * @param string $filename optional
+     * @param string $delimiter optional
+     * @param int timeout optional, default 3600 sec
+     * @return redirect/FALSE
+     */
+    function useCachedCalendar( $directory=FALSE, $filename=FALSE, $delimiter=FALSE, $timeout=3600) {
     if ( $directory && ctype_digit( (string) $directory ) && !$filename ) {
-      $timeout   = (int) $directory;
-      $directory = FALSE;
+        $timeout   = (int) $directory;
+        $directory = FALSE;
     }
     if( $directory )
-      $this->setConfig( 'directory', $directory );
+        $this->setConfig( 'directory', $directory );
     if( $filename )
-      $this->setConfig( 'filename',  $filename );
+        $this->setConfig( 'filename',  $filename );
     if( $delimiter && ( $delimiter != DIRECTORY_SEPARATOR ))
-      $this->setConfig( 'delimiter', $delimiter );
+        $this->setConfig( 'delimiter', $delimiter );
     $filesize    = $this->getConfig( 'filesize' );
     if( 0 >= $filesize )
-      return FALSE;
+        return FALSE;
     $dirfile     = $this->getConfig( 'dirfile' );
     if( time() - filemtime( $dirfile ) < $timeout) {
-      clearstatcache();
-      $dirfile   = $this->getConfig( 'dirfile' );
-      $filename  = $this->getConfig( 'filename' );
+        clearstatcache();
+        $dirfile   = $this->getConfig( 'dirfile' );
+        $filename  = $this->getConfig( 'filename' );
 //    if( headers_sent( $filename, $linenum ))
 //      die( "Headers already sent in $filename on line $linenum\n" );
-      if( 'xcal' == $this->format )
+        if( 'xcal' == $this->format )
         header( 'Content-Type: application/calendar+xml; charset=utf-8' );
-      else
+        else
         header( 'Content-Type: text/calendar; charset=utf-8' );
-      header( 'Content-Length: '.$filesize );
-      header( 'Content-Disposition: attachment; filename="'.$filename.'"' );
-      header( 'Cache-Control: max-age=10' );
-      $fp = @$fopen( $dirfile, 'r' );
-      if( $fp ) {
+        header( 'Content-Length: '.$filesize );
+        header( 'Content-Disposition: attachment; filename="'.$filename.'"' );
+        header( 'Cache-Control: max-age=10' );
+        $fp = @$fopen( $dirfile, 'r' );
+        if( $fp ) {
         fpassthru( $fp );
         fclose( $fp );
-      }
-      die();
+        }
+        die();
     }
     else
-      return FALSE;
-  }
+        return FALSE;
+    }
 }
 /*********************************************************************************/
 /*********************************************************************************/
@@ -1660,37 +1659,37 @@ 
  */
 class calendarComponent {
             //  component property variables
-  var $uid;
-  var $dtstamp;
+    var $uid;
+    var $dtstamp;
 
             //  component config variables
-  var $allowEmpty;
-  var $language;
-  var $nl;
-  var $unique_id;
-  var $format;
-  var $objName; // created automatically at instance creation
+    var $allowEmpty;
+    var $language;
+    var $nl;
+    var $unique_id;
+    var $format;
+    var $objName; // created automatically at instance creation
             //  component internal variables
-  var $componentStart1;
-  var $componentStart2;
-  var $componentEnd1;
-  var $componentEnd2;
-  var $elementStart1;
-  var $elementStart2;
-  var $elementEnd1;
-  var $elementEnd2;
-  var $intAttrDelimiter;
-  var $attributeDelimiter;
-  var $valueInit;
+    var $componentStart1;
+    var $componentStart2;
+    var $componentEnd1;
+    var $componentEnd2;
+    var $elementStart1;
+    var $elementStart2;
+    var $elementEnd1;
+    var $elementEnd2;
+    var $intAttrDelimiter;
+    var $attributeDelimiter;
+    var $valueInit;
             //  component xCal declaration container
-  var $xcaldecl;
-/**
- * constructor for calendar component object
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.19 - 2008-10-23
- */
-  function calendarComponent() {
+    var $xcaldecl;
+/**
+     * constructor for calendar component object
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.19 - 2008-10-23
+     */
+    function calendarComponent() {
     $this->objName         = ( isset( $this->timezonetype )) ?
                           strtolower( $this->timezonetype )  :  get_class ( $this );
     $this->uid             = array();
@@ -1705,7 +1704,7 @@ 
 
     $this->_createFormat();
     $this->_makeDtstamp();
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: ACTION
@@ -1717,27 +1716,27 @@ 
  * @since 2.4.8 - 2008-10-22
  * @return string
  */
-  function createAction() {
+    function createAction() {
     if( empty( $this->action )) return FALSE;
     if( empty( $this->action['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'ACTION' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'ACTION' ) : FALSE;
     $attributes = $this->_createParams( $this->action['params'] );
     return $this->_createElement( 'ACTION', $attributes, $this->action['value'] );
-  }
+    }
 /**
- * set calendar component property action
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param string $value  "AUDIO" / "DISPLAY" / "EMAIL" / "PROCEDURE"
- * @param mixed $params
- * @return bool
- */
-  function setAction( $value, $params=FALSE ) {
+     * set calendar component property action
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param string $value  "AUDIO" / "DISPLAY" / "EMAIL" / "PROCEDURE"
+     * @param mixed $params
+     * @return bool
+     */
+    function setAction( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->action = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: ATTACH
@@ -1749,33 +1748,33 @@ 
  * @since 0.9.7 - 2006-11-23
  * @return string
  */
-  function createAttach() {
+    function createAttach() {
     if( empty( $this->attach )) return FALSE;
     $output       = null;
     foreach( $this->attach as $attachPart ) {
-      if(! empty( $attachPart['value'] )) {
+        if(! empty( $attachPart['value'] )) {
         $attributes = $this->_createParams( $attachPart['params'] );
         $output    .= $this->_createElement( 'ATTACH', $attributes, $attachPart['value'] );
-      }
-      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'ATTACH' );
+        }
+        elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'ATTACH' );
     }
     return $output;
-  }
+    }
 /**
- * set calendar component property attach
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-06
- * @param string $value
- * @param array $params, optional
- * @param integer $index, optional
- * @return bool
- */
-  function setAttach( $value, $params=FALSE, $index=FALSE ) {
+     * set calendar component property attach
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-06
+     * @param string $value
+     * @param array $params, optional
+     * @param integer $index, optional
+     * @return bool
+     */
+    function setAttach( $value, $params=FALSE, $index=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->_setMval( $this->attach, $value, $params, FALSE, $index );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: ATTENDEE
@@ -1787,121 +1786,121 @@ 
  * @since 2.4.8 - 2008-09-23
  * @return string
  */
-  function createAttendee() {
+    function createAttendee() {
     if( empty( $this->attendee )) return FALSE;
     $output = null;
     foreach( $this->attendee as $attendeePart ) {                      // start foreach 1
-      if( empty( $attendeePart['value'] )) {
+        if( empty( $attendeePart['value'] )) {
         if( $this->getConfig( 'allowEmpty' ))
-          $output .= $this->_createElement( 'ATTENDEE' );
+            $output .= $this->_createElement( 'ATTENDEE' );
         continue;
-      }
-      $attendee1 = $attendee2 = $attendeeLANG = $attendeeCN = null;
-      foreach( $attendeePart as $paramlabel => $paramvalue ) {         // start foreach 2
+        }
+        $attendee1 = $attendee2 = $attendeeLANG = $attendeeCN = null;
+        foreach( $attendeePart as $paramlabel => $paramvalue ) {         // start foreach 2
         if( 'value' == $paramlabel )
-          $attendee2  .= 'MAILTO:'.$paramvalue;
+            $attendee2  .= 'MAILTO:'.$paramvalue;
         elseif(( 'params' == $paramlabel ) && ( is_array( $paramvalue ))) { // start elseif
-          foreach( $paramvalue as $optparamlabel => $optparamvalue ) { // start foreach 3
+            foreach( $paramvalue as $optparamlabel => $optparamvalue ) { // start foreach 3
             $attendee11 = $attendee12 = null;
             if( is_int( $optparamlabel )) {
-              $attendee1 .= $this->intAttrDelimiter.$optparamvalue;
-              continue;
+                $attendee1 .= $this->intAttrDelimiter.$optparamvalue;
+                continue;
             }
             switch( $optparamlabel ) {                                 // start switch
-              case 'CUTYPE':
+                case 'CUTYPE':
               case 'PARTSTAT':
               case 'ROLE':
               case 'RSVP':
                 $attendee1 .= $this->intAttrDelimiter.$optparamlabel.'="'.$optparamvalue.'"';
                 break;
-              case 'SENT-BY':
+                case 'SENT-BY':
                 $attendee1 .= $this->intAttrDelimiter.'SENT-BY="MAILTO:'.$optparamvalue.'"';
                 break;
-              case 'MEMBER':
+                case 'MEMBER':
                 $attendee11 = $this->intAttrDelimiter.'MEMBER=';
-              case 'DELEGATED-TO':
+                case 'DELEGATED-TO':
                 $attendee11 = ( !$attendee11 ) ? $this->intAttrDelimiter.'DELEGATED-TO='   : $attendee11;
-              case 'DELEGATED-FROM':
+                case 'DELEGATED-FROM':
                 $attendee11 = ( !$attendee11 ) ? $this->intAttrDelimiter.'DELEGATED-FROM=' : $attendee11;
                 foreach( $optparamvalue  as $cix => $calUserAddress ) {
-                  $attendee12 .= ( $cix ) ? ',' : null;
-                  $attendee12 .= '"MAILTO:'.$calUserAddress.'"';
+                    $attendee12 .= ( $cix ) ? ',' : null;
+                    $attendee12 .= '"MAILTO:'.$calUserAddress.'"';
                 }
                 $attendee1  .= $attendee11.$attendee12;
                 break;
-              case 'CN':
+                case 'CN':
                 $attendeeCN .= $this->intAttrDelimiter.'CN="'.$optparamvalue.'"';
                 break;
-              case 'DIR':
+                case 'DIR':
                 $attendee1 .= $this->intAttrDelimiter.'DIR="'.$optparamvalue.'"';
                 break;
-              case 'LANGUAGE':
+                case 'LANGUAGE':
                 $attendeeLANG .= $this->intAttrDelimiter.'LANGUAGE='.$optparamvalue;
                 break;
-              default:
+                default:
                 $attendee1 .= $this->intAttrDelimiter."$optparamlabel=$optparamvalue";
                 break;
             }    // end switch
-          }      // end foreach 3
+            }      // end foreach 3
         }        // end elseif
-      }          // end foreach 2
-      $output .= $this->_createElement( 'ATTENDEE', $attendee1.$attendeeLANG.$attendeeCN, $attendee2 );
+        }          // end foreach 2
+        $output .= $this->_createElement( 'ATTENDEE', $attendee1.$attendeeLANG.$attendeeCN, $attendee2 );
     }              // end foreach 1
     return $output;
-  }
+    }
 /**
- * set calendar component property attach
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-05
- * @param string $value
- * @param array $params, optional
- * @param integer $index, optional
- * @return bool
- */
-  function setAttendee( $value, $params=FALSE, $index=FALSE ) {
+     * set calendar component property attach
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-05
+     * @param string $value
+     * @param array $params, optional
+     * @param integer $index, optional
+     * @return bool
+     */
+    function setAttendee( $value, $params=FALSE, $index=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $value = str_replace ( 'MAILTO:', '', $value );
     $value = str_replace ( 'mailto:', '', $value );
     $params2 = array();
     if( is_array($params )) {
-      $optarrays = array();
-      foreach( $params as $optparamlabel => $optparamvalue ) {
+        $optarrays = array();
+        foreach( $params as $optparamlabel => $optparamvalue ) {
         $optparamlabel = strtoupper( $optparamlabel );
         switch( $optparamlabel ) {
-          case 'MEMBER':
+            case 'MEMBER':
           case 'DELEGATED-TO':
           case 'DELEGATED-FROM':
             if( is_array( $optparamvalue )) {
-              foreach( $optparamvalue as $part ) {
+                foreach( $optparamvalue as $part ) {
                 $part = str_replace( 'MAILTO:', '', $part );
                 $part = str_replace( 'mailto:', '', $part );
                 if(( '"' == $part{0} ) && ( '"' == $part{strlen($part)-1} ))
-                  $part = substr( $part, 1, ( strlen($part)-2 ));
+                    $part = substr( $part, 1, ( strlen($part)-2 ));
                 $optarrays[$optparamlabel][] = $part;
-              }
+                }
             }
             else {
-              $part = str_replace( 'MAILTO:', '', $optparamvalue );
-              $part = str_replace( 'mailto:', '', $part );
-              if(( '"' == $part{0} ) && ( '"' == $part{strlen($part)-1} ))
+                $part = str_replace( 'MAILTO:', '', $optparamvalue );
+                $part = str_replace( 'mailto:', '', $part );
+                if(( '"' == $part{0} ) && ( '"' == $part{strlen($part)-1} ))
                 $part = substr( $part, 1, ( strlen($part)-2 ));
-              $optarrays[$optparamlabel][] = $part;
+                $optarrays[$optparamlabel][] = $part;
             }
             break;
-          default:
+            default:
             if( 'SENT-BY' ==  $optparamlabel ) {
-              $optparamvalue = str_replace( 'MAILTO:', '', $optparamvalue );
-              $optparamvalue = str_replace( 'mailto:', '', $optparamvalue );
+                $optparamvalue = str_replace( 'MAILTO:', '', $optparamvalue );
+                $optparamvalue = str_replace( 'mailto:', '', $optparamvalue );
             }
             if(( '"' == substr( $optparamvalue, 0, 1 )) &&
                ( '"' == substr( $optparamvalue, -1 )))
-              $optparamvalue = substr( $optparamvalue, 1, ( strlen( $optparamvalue ) - 2 ));
+                $optparamvalue = substr( $optparamvalue, 1, ( strlen( $optparamvalue ) - 2 ));
             $params2[$optparamlabel] = $optparamvalue;
             break;
         } // end switch( $optparamlabel.. .
-      } // end foreach( $optparam.. .
-      foreach( $optarrays as $optparamlabel => $optparams )
+        } // end foreach( $optparam.. .
+        foreach( $optarrays as $optparamlabel => $optparams )
         $params2[$optparamlabel] = $optparams;
     }
         // remove defaults
@@ -1911,13 +1910,13 @@ 
     $this->_existRem( $params2, 'RSVP',     'FALSE' );
         // check language setting
     if( isset( $params2['CN' ] )) {
-      $lang = $this->getConfig( 'language' );
-      if( !isset( $params2['LANGUAGE' ] ) && !empty( $lang ))
+        $lang = $this->getConfig( 'language' );
+        if( !isset( $params2['LANGUAGE' ] ) && !empty( $lang ))
         $params2['LANGUAGE' ] = $lang;
     }
     $this->_setMval( $this->attendee, $value, $params2, FALSE, $index );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: CATEGORIES
@@ -1929,42 +1928,42 @@ 
  * @since 2.4.8 - 2008-10-22
  * @return string
  */
-  function createCategories() {
+    function createCategories() {
     if( empty( $this->categories )) return FALSE;
     $output = null;
     foreach( $this->categories as $category ) {
-      if( empty( $category['value'] )) {
+        if( empty( $category['value'] )) {
         if ( $this->getConfig( 'allowEmpty' ))
-          $output .= $this->_createElement( 'CATEGORIES' );
+            $output .= $this->_createElement( 'CATEGORIES' );
         continue;
-      }
-      $attributes = $this->_createParams( $category['params'], array( 'LANGUAGE' ));
-      if( is_array( $category['value'] )) {
+        }
+        $attributes = $this->_createParams( $category['params'], array( 'LANGUAGE' ));
+        if( is_array( $category['value'] )) {
         foreach( $category['value'] as $cix => $categoryPart )
-          $category['value'][$cix] = $this->_strrep( $categoryPart );
+            $category['value'][$cix] = $this->_strrep( $categoryPart );
         $content  = implode( ',', $category['value'] );
-      }
-      else
+        }
+        else
         $content  = $this->_strrep( $category['value'] );
-      $output    .= $this->_createElement( 'CATEGORIES', $attributes, $content );
+        $output    .= $this->_createElement( 'CATEGORIES', $attributes, $content );
     }
     return $output;
-  }
+    }
 /**
- * set calendar component property categories
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-06
- * @param mixed $value
- * @param array $params, optional
- * @param integer $index, optional
- * @return bool
- */
-  function setCategories( $value, $params=FALSE, $index=FALSE ) {
+     * set calendar component property categories
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-06
+     * @param mixed $value
+     * @param array $params, optional
+     * @param integer $index, optional
+     * @return bool
+     */
+    function setCategories( $value, $params=FALSE, $index=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->_setMval( $this->categories, $value, $params, FALSE, $index );
     return TRUE;
- }
+    }
 /*********************************************************************************/
 /**
  * Property Name: CLASS
@@ -1976,27 +1975,27 @@ 
  * @since 0.9.7 - 2006-11-20
  * @return string
  */
-  function createClass() {
+    function createClass() {
     if( empty( $this->class )) return FALSE;
     if( empty( $this->class['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'CLASS' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'CLASS' ) : FALSE;
     $attributes = $this->_createParams( $this->class['params'] );
     return $this->_createElement( 'CLASS', $attributes, $this->class['value'] );
-  }
+    }
 /**
- * set calendar component property class
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param string $value "PUBLIC" / "PRIVATE" / "CONFIDENTIAL" / iana-token / x-name
- * @param array $params optional
- * @return bool
- */
-  function setClass( $value, $params=FALSE ) {
+     * set calendar component property class
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param string $value "PUBLIC" / "PRIVATE" / "CONFIDENTIAL" / iana-token / x-name
+     * @param array $params optional
+     * @return bool
+     */
+    function setClass( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->class = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: COMMENT
@@ -2008,35 +2007,35 @@ 
  * @since 2.4.8 - 2008-10-22
  * @return string
  */
-  function createComment() {
+    function createComment() {
     if( empty( $this->comment )) return FALSE;
     $output = null;
     foreach( $this->comment as $commentPart ) {
-      if( empty( $commentPart['value'] )) {
+        if( empty( $commentPart['value'] )) {
         if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'COMMENT' );
         continue;
-      }
-      $attributes = $this->_createParams( $commentPart['params'], array( 'ALTREP', 'LANGUAGE' ));
-      $content    = $this->_strrep( $commentPart['value'] );
-      $output    .= $this->_createElement( 'COMMENT', $attributes, $content );
+        }
+        $attributes = $this->_createParams( $commentPart['params'], array( 'ALTREP', 'LANGUAGE' ));
+        $content    = $this->_strrep( $commentPart['value'] );
+        $output    .= $this->_createElement( 'COMMENT', $attributes, $content );
     }
     return $output;
-  }
+    }
 /**
- * set calendar component property comment
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-06
- * @param string $value
- * @param array $params, optional
- * @param integer $index, optional
- * @return bool
- */
-  function setComment( $value, $params=FALSE, $index=FALSE ) {
+     * set calendar component property comment
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-06
+     * @param string $value
+     * @param array $params, optional
+     * @param integer $index, optional
+     * @return bool
+     */
+    function setComment( $value, $params=FALSE, $index=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->_setMval( $this->comment, $value, $params, FALSE, $index );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: COMPLETED
@@ -2048,7 +2047,7 @@ 
  * @since 2.4.8 - 2008-10-22
  * @return string
  */
-  function createCompleted( ) {
+    function createCompleted( ) {
     if( empty( $this->completed )) return FALSE;
     if( !isset( $this->completed['value']['year'] )  &&
         !isset( $this->completed['value']['month'] ) &&
@@ -2056,39 +2055,39 @@ 
         !isset( $this->completed['value']['hour'] )  &&
         !isset( $this->completed['value']['min'] )   &&
         !isset( $this->completed['value']['sec'] ))
-      if( $this->getConfig( 'allowEmpty' ))
+        if( $this->getConfig( 'allowEmpty' ))
         return $this->_createElement( 'COMPLETED' );
-      else return FALSE;
+        else return FALSE;
     $formatted  = $this->_format_date_time( $this->completed['value'], 7 );
     $attributes = $this->_createParams( $this->completed['params'] );
     return $this->_createElement( 'COMPLETED', $attributes, $formatted );
-  }
+    }
 /**
- * set calendar component property completed
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-10-23
- * @param mixed $year
- * @param mixed $month optional
- * @param int $day optional
- * @param int $hour optional
- * @param int $min optional
- * @param int $sec optional
- * @param array $params optional
- * @return bool
- */
-  function setCompleted( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
+     * set calendar component property completed
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-10-23
+     * @param mixed $year
+     * @param mixed $month optional
+     * @param int $day optional
+     * @param int $hour optional
+     * @param int $min optional
+     * @param int $sec optional
+     * @param array $params optional
+     * @return bool
+     */
+    function setCompleted( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
     if( empty( $year )) {
-      if( $this->getConfig( 'allowEmpty' )) {
+        if( $this->getConfig( 'allowEmpty' )) {
         $this->completed = array( 'value' => null, 'params' => $this->_setParams( $params ));
         return TRUE;
-      }
-      else
+        }
+        else
         return FALSE;
     }
     $this->completed = $this->_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: CONTACT
@@ -2100,34 +2099,34 @@ 
  * @since 2.4.8 - 2008-10-23
  * @return string
  */
-  function createContact() {
+    function createContact() {
     if( empty( $this->contact )) return FALSE;
     $output = null;
     foreach( $this->contact as $contact ) {
-      if( !empty( $contact['value'] )) {
+        if( !empty( $contact['value'] )) {
         $attributes = $this->_createParams( $contact['params'], array( 'ALTREP', 'LANGUAGE' ));
         $content    = $this->_strrep( $contact['value'] );
         $output    .= $this->_createElement( 'CONTACT', $attributes, $content );
-      }
-      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'CONTACT' );
+        }
+        elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'CONTACT' );
     }
     return $output;
-  }
+    }
 /**
- * set calendar component property contact
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-05
- * @param string $value
- * @param array $params, optional
- * @param integer $index, optional
- * @return bool
- */
-  function setContact( $value, $params=FALSE, $index=FALSE ) {
+     * set calendar component property contact
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-05
+     * @param string $value
+     * @param array $params, optional
+     * @param integer $index, optional
+     * @return bool
+     */
+    function setContact( $value, $params=FALSE, $index=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->_setMval( $this->contact, $value, $params, FALSE, $index );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: CREATED
@@ -2139,33 +2138,33 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createCreated() {
+    function createCreated() {
     if( empty( $this->created )) return FALSE;
     $formatted  = $this->_format_date_time( $this->created['value'], 7 );
     $attributes = $this->_createParams( $this->created['params'] );
     return $this->_createElement( 'CREATED', $attributes, $formatted );
-  }
+    }
 /**
- * set calendar component property created
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-10-23
- * @param mixed $year optional
- * @param mixed $month optional
- * @param int $day optional
- * @param int $hour optional
- * @param int $min optional
- * @param int $sec optional
- * @param mixed $params optional
- * @return bool
- */
-  function setCreated( $year=FALSE, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
+     * set calendar component property created
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-10-23
+     * @param mixed $year optional
+     * @param mixed $month optional
+     * @param int $day optional
+     * @param int $hour optional
+     * @param int $min optional
+     * @param int $sec optional
+     * @param mixed $params optional
+     * @return bool
+     */
+    function setCreated( $year=FALSE, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
     if( !isset( $year )) {
-      $year = date('Ymd\THis', mktime( date( 'H' ), date( 'i' ), date( 's' ) - date( 'Z'), date( 'm' ), date( 'd' ), date( 'Y' )));
+        $year = date('Ymd\THis', mktime( date( 'H' ), date( 'i' ), date( 's' ) - date( 'Z'), date( 'm' ), date( 'd' ), date( 'Y' )));
     }
     $this->created = $this->_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: DESCRIPTION
@@ -2177,34 +2176,34 @@ 
  * @since 2.4.8 - 2008-10-22
  * @return string
  */
-  function createDescription() {
+    function createDescription() {
     if( empty( $this->description )) return FALSE;
     $output       = null;
     foreach( $this->description as $description ) {
-      if( !empty( $description['value'] )) {
+        if( !empty( $description['value'] )) {
         $attributes = $this->_createParams( $description['params'], array( 'ALTREP', 'LANGUAGE' ));
         $content    = $this->_strrep( $description['value'] );
         $output    .= $this->_createElement( 'DESCRIPTION', $attributes, $content );
-      }
-      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'DESCRIPTION' );
+        }
+        elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'DESCRIPTION' );
     }
     return $output;
-  }
+    }
 /**
- * set calendar component property description
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-05
- * @param string $value
- * @param array $params, optional
- * @param integer $index, optional
- * @return bool
- */
-  function setDescription( $value, $params=FALSE, $index=FALSE ) {
+     * set calendar component property description
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-05
+     * @param string $value
+     * @param array $params, optional
+     * @param integer $index, optional
+     * @return bool
+     */
+    function setDescription( $value, $params=FALSE, $index=FALSE ) {
     if( empty( $value )) { if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE; }
     $this->_setMval( $this->description, $value, $params, FALSE, $index );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: DTEND
@@ -2216,7 +2215,7 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createDtend() {
+    function createDtend() {
     if( empty( $this->dtend )) return FALSE;
     if( !isset( $this->dtend['value']['year'] )  &&
         !isset( $this->dtend['value']['month'] ) &&
@@ -2224,40 +2223,40 @@ 
         !isset( $this->dtend['value']['hour'] )  &&
         !isset( $this->dtend['value']['min'] )   &&
         !isset( $this->dtend['value']['sec'] ))
-      if( $this->getConfig( 'allowEmpty' ))
+        if( $this->getConfig( 'allowEmpty' ))
         return $this->_createElement( 'DTEND' );
-      else return FALSE;
+        else return FALSE;
     $formatted  = $this->_format_date_time( $this->dtend['value'] );
     $attributes = $this->_createParams( $this->dtend['params'] );
     return $this->_createElement( 'DTEND', $attributes, $formatted );
-  }
+    }
 /**
- * set calendar component property dtend
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-10-23
- * @param mixed $year
- * @param mixed $month optional
- * @param int $day optional
- * @param int $hour optional
- * @param int $min optional
- * @param int $sec optional
- * @param string $tz optional
- * @param array params optional
- * @return bool
- */
-  function setDtend( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
+     * set calendar component property dtend
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-10-23
+     * @param mixed $year
+     * @param mixed $month optional
+     * @param int $day optional
+     * @param int $hour optional
+     * @param int $min optional
+     * @param int $sec optional
+     * @param string $tz optional
+     * @param array params optional
+     * @return bool
+     */
+    function setDtend( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
     if( empty( $year )) {
-      if( $this->getConfig( 'allowEmpty' )) {
+        if( $this->getConfig( 'allowEmpty' )) {
         $this->dtend = array( 'value' => null, 'params' => $this->_setParams( $params ));
         return TRUE;
-      }
-      else
+        }
+        else
         return FALSE;
     }
     $this->dtend = $this->_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: DTSTAMP
@@ -2269,55 +2268,55 @@ 
  * @since 2.4.4 - 2008-03-07
  * @return string
  */
-  function createDtstamp() {
+    function createDtstamp() {
     if( !isset( $this->dtstamp['value']['year'] )  &&
         !isset( $this->dtstamp['value']['month'] ) &&
         !isset( $this->dtstamp['value']['day'] )   &&
         !isset( $this->dtstamp['value']['hour'] )  &&
         !isset( $this->dtstamp['value']['min'] )   &&
         !isset( $this->dtstamp['value']['sec'] ))
-      $this->_makeDtstamp();
+        $this->_makeDtstamp();
     $formatted  = $this->_format_date_time( $this->dtstamp['value'], 7 );
     $attributes = $this->_createParams( $this->dtstamp['params'] );
     return $this->_createElement( 'DTSTAMP', $attributes, $formatted );
-  }
+    }
 /**
- * computes datestamp for calendar component object instance dtstamp
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 1.x.x - 2007-05-13
- * @return void
- */
-  function _makeDtstamp() {
+     * computes datestamp for calendar component object instance dtstamp
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 1.x.x - 2007-05-13
+     * @return void
+     */
+    function _makeDtstamp() {
     $this->dtstamp['value'] = array( 'year'  => date( 'Y' )
-                                   , 'month' => date( 'm' )
-                                   , 'day'   => date( 'd' )
-                                   , 'hour'  => date( 'H' )
-                                   , 'min'   => date( 'i' )
-                                   , 'sec'   => date( 's' ) - date( 'Z' ));
+                                    , 'month' => date( 'm' )
+                                    , 'day'   => date( 'd' )
+                                    , 'hour'  => date( 'H' )
+                                    , 'min'   => date( 'i' )
+                                    , 'sec'   => date( 's' ) - date( 'Z' ));
     $this->dtstamp['params'] = null;
-  }
+    }
 /**
- * set calendar component property dtstamp
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-10-23
- * @param mixed $year
- * @param mixed $month optional
- * @param int $day optional
- * @param int $hour optional
- * @param int $min optional
- * @param int $sec optional
- * @param array $params optional
- * @return TRUE
- */
-  function setDtstamp( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
+     * set calendar component property dtstamp
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-10-23
+     * @param mixed $year
+     * @param mixed $month optional
+     * @param int $day optional
+     * @param int $hour optional
+     * @param int $min optional
+     * @param int $sec optional
+     * @param array $params optional
+     * @return TRUE
+     */
+    function setDtstamp( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
     if( empty( $year ))
-      $this->_makeDtstamp();
+        $this->_makeDtstamp();
     else
-      $this->dtstamp = $this->_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
+        $this->dtstamp = $this->_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: DTSTART
@@ -2329,7 +2328,7 @@ 
  * @since 2.4.16 - 2008-10-26
  * @return string
  */
-  function createDtstart() {
+    function createDtstart() {
     if( empty( $this->dtstart )) return FALSE;
     if( !isset( $this->dtstart['value']['year'] )  &&
         !isset( $this->dtstart['value']['month'] ) &&
@@ -2338,41 +2337,41 @@ 
         !isset( $this->dtstart['value']['min'] )   &&
         !isset( $this->dtstart['value']['sec'] ))
     if( $this->getConfig( 'allowEmpty' ))
-      return $this->_createElement( 'DTSTART' );
+        return $this->_createElement( 'DTSTART' );
     else return FALSE;
     if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' )))
-      unset( $this->dtstart['value']['tz'], $this->dtstart['params']['TZID'] );
+        unset( $this->dtstart['value']['tz'], $this->dtstart['params']['TZID'] );
     $formatted  = $this->_format_date_time( $this->dtstart['value'] );
     $attributes = $this->_createParams( $this->dtstart['params'] );
     return $this->_createElement( 'DTSTART', $attributes, $formatted );
-  }
+    }
 /**
- * set calendar component property dtstart
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.16 - 2008-11-04
- * @param mixed $year
- * @param mixed $month optional
- * @param int $day optional
- * @param int $hour optional
- * @param int $min optional
- * @param int $sec optional
- * @param string $tz optional
- * @param array $params optional
- * @return bool
- */
-  function setDtstart( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
+     * set calendar component property dtstart
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.16 - 2008-11-04
+     * @param mixed $year
+     * @param mixed $month optional
+     * @param int $day optional
+     * @param int $hour optional
+     * @param int $min optional
+     * @param int $sec optional
+     * @param string $tz optional
+     * @param array $params optional
+     * @return bool
+     */
+    function setDtstart( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
     if( empty( $year )) {
-      if( $this->getConfig( 'allowEmpty' )) {
+        if( $this->getConfig( 'allowEmpty' )) {
         $this->dtstart = array( 'value' => null, 'params' => $this->_setParams( $params ));
         return TRUE;
-      }
-      else
+        }
+        else
         return FALSE;
     }
     $this->dtstart = $this->_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params, 'dtstart' );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: DUE
@@ -2384,7 +2383,7 @@ 
  * @since 2.4.8 - 2008-10-22
  * @return string
  */
-  function createDue() {
+    function createDue() {
     if( empty( $this->due )) return FALSE;
     if( !isset( $this->due['value']['year'] )  &&
         !isset( $this->due['value']['month'] ) &&
@@ -2392,39 +2391,39 @@ 
         !isset( $this->due['value']['hour'] )  &&
         !isset( $this->due['value']['min'] )   &&
         !isset( $this->due['value']['sec'] ))
-      if( $this->getConfig( 'allowEmpty' ))
+        if( $this->getConfig( 'allowEmpty' ))
         return $this->_createElement( 'DUE' );
-      else return FALSE;
+        else return FALSE;
     $formatted  = $this->_format_date_time( $this->due['value'] );
     $attributes = $this->_createParams( $this->due['params'] );
     return $this->_createElement( 'DUE', $attributes, $formatted );
-  }
+    }
 /**
- * set calendar component property due
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param mixed $year
- * @param mixed $month optional
- * @param int $day optional
- * @param int $hour optional
- * @param int $min optional
- * @param int $sec optional
- * @param array $params optional
- * @return bool
- */
-  function setDue( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
+     * set calendar component property due
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param mixed $year
+     * @param mixed $month optional
+     * @param int $day optional
+     * @param int $hour optional
+     * @param int $min optional
+     * @param int $sec optional
+     * @param array $params optional
+     * @return bool
+     */
+    function setDue( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
     if( empty( $year )) {
-      if( $this->getConfig( 'allowEmpty' )) {
+        if( $this->getConfig( 'allowEmpty' )) {
         $this->due = array( 'value' => null, 'params' => $this->_setParams( $params ));
         return TRUE;
-      }
-      else
+        }
+        else
         return FALSE;
     }
     $this->due = $this->_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: DURATION
@@ -2436,48 +2435,48 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createDuration() {
+    function createDuration() {
     if( empty( $this->duration )) return FALSE;
     if( !isset( $this->duration['value']['week'] ) &&
         !isset( $this->duration['value']['day'] )  &&
         !isset( $this->duration['value']['hour'] ) &&
         !isset( $this->duration['value']['min'] )  &&
         !isset( $this->duration['value']['sec'] ))
-      if( $this->getConfig( 'allowEmpty' ))
+        if( $this->getConfig( 'allowEmpty' ))
         return $this->_createElement( 'DURATION', array(), null );
-      else return FALSE;
+        else return FALSE;
     $attributes = $this->_createParams( $this->duration['params'] );
     return $this->_createElement( 'DURATION', $attributes, $this->_format_duration( $this->duration['value'] ));
-  }
+    }
 /**
- * set calendar component property duration
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param mixed $week
- * @param mixed $day optional
- * @param int $hour optional
- * @param int $min optional
- * @param int $sec optional
- * @param array $params optional
- * @return bool
- */
-  function setDuration( $week, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
+     * set calendar component property duration
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param mixed $week
+     * @param mixed $day optional
+     * @param int $hour optional
+     * @param int $min optional
+     * @param int $sec optional
+     * @param array $params optional
+     * @return bool
+     */
+    function setDuration( $week, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
     if( empty( $week )) if( $this->getConfig( 'allowEmpty' )) $week = null; else return FALSE;
     if( is_array( $week ) && ( 1 <= count( $week )))
-      $this->duration = array( 'value' => $this->_duration_array( $week ), 'params' => $this->_setParams( $day ));
+        $this->duration = array( 'value' => $this->_duration_array( $week ), 'params' => $this->_setParams( $day ));
     elseif( is_string( $week ) && ( 3 <= strlen( trim( $week )))) {
-      $week = trim( $week );
-      if( in_array( substr( $week, 0, 1 ), array( '+', '-' )))
+        $week = trim( $week );
+        if( in_array( substr( $week, 0, 1 ), array( '+', '-' )))
         $week = substr( $week, 1 );
-      $this->duration = array( 'value' => $this->_duration_string( $week ), 'params' => $this->_setParams( $day ));
+        $this->duration = array( 'value' => $this->_duration_string( $week ), 'params' => $this->_setParams( $day ));
     }
     elseif( empty( $week ) && empty( $day ) && empty( $hour ) && empty( $min ) && empty( $sec ))
-      return FALSE;
+        return FALSE;
     else
-      $this->duration = array( 'value' => $this->_duration_array( array( $week, $day, $hour, $min, $sec )), 'params' => $this->_setParams( $params ));
+        $this->duration = array( 'value' => $this->_duration_array( array( $week, $day, $hour, $min, $sec )), 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: EXDATE
@@ -2489,57 +2488,57 @@ 
  * @since 2.4.8 - 2008-10-22
  * @return string
  */
-  function createExdate() {
+    function createExdate() {
     if( empty( $this->exdate )) return FALSE;
     $output = null;
     foreach( $this->exdate as $ex => $theExdate ) {
-      if( empty( $theExdate['value'] )) {
+        if( empty( $theExdate['value'] )) {
         if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'EXDATE' );
         continue;
-      }
-      $content = $attributes = null;
-      foreach( $theExdate['value'] as $eix => $exdatePart ) {
+        }
+        $content = $attributes = null;
+        foreach( $theExdate['value'] as $eix => $exdatePart ) {
         $parno = count( $exdatePart );
         $formatted = $this->_format_date_time( $exdatePart, $parno );
         if( isset( $theExdate['params']['TZID'] ))
-          $formatted = str_replace( 'Z', '', $formatted);
+            $formatted = str_replace( 'Z', '', $formatted);
         if( 0 < $eix ) {
-          if( isset( $theExdate['value'][0]['tz'] )) {
+            if( isset( $theExdate['value'][0]['tz'] )) {
             if( ctype_digit( substr( $theExdate['value'][0]['tz'], -4 )) ||
                ( 'Z' == $theExdate['value'][0]['tz'] )) {
-              if( 'Z' != substr( $formatted, -1 ))
+                if( 'Z' != substr( $formatted, -1 ))
                 $formatted .= 'Z';
             }
             else
-              $formatted = str_replace( 'Z', '', $formatted );
-          }
-          else
+                $formatted = str_replace( 'Z', '', $formatted );
+            }
+            else
             $formatted = str_replace( 'Z', '', $formatted );
         }
         $content .= ( 0 < $eix ) ? ','.$formatted : $formatted;
-      }
-      $attributes .= $this->_createParams( $theExdate['params'] );
-      $output .= $this->_createElement( 'EXDATE', $attributes, $content );
+        }
+        $attributes .= $this->_createParams( $theExdate['params'] );
+        $output .= $this->_createElement( 'EXDATE', $attributes, $content );
     }
     return $output;
-  }
+    }
 /**
- * set calendar component property exdate
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-05
- * @param array exdates
- * @param array $params, optional
- * @param integer $index, optional
- * @return bool
- */
-  function setExdate( $exdates, $params=FALSE, $index=FALSE ) {
+     * set calendar component property exdate
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-05
+     * @param array exdates
+     * @param array $params, optional
+     * @param integer $index, optional
+     * @return bool
+     */
+    function setExdate( $exdates, $params=FALSE, $index=FALSE ) {
     if( empty( $exdates )) {
-      if( $this->getConfig( 'allowEmpty' )) {
+        if( $this->getConfig( 'allowEmpty' )) {
         $this->_setMval( $this->exdate, null, $params, FALSE, $index );
         return TRUE;
-      }
-      else
+        }
+        else
         return FALSE;
     }
     $input  = array( 'params' => $this->_setParams( $params, array( 'VALUE' => 'DATE-TIME' )));
@@ -2547,32 +2546,32 @@ 
     $this->_chkdatecfg( reset( $exdates ), $parno, $input['params'] );
     $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME' ); // remove default parameter
     foreach( $exdates as $eix => $theExdate ) {
-      if( $this->_isArrayTimestampDate( $theExdate ))
+        if( $this->_isArrayTimestampDate( $theExdate ))
         $exdatea = $this->_timestamp2date( $theExdate, $parno );
-      elseif(  is_array( $theExdate ))
+        elseif(  is_array( $theExdate ))
         $exdatea = $this->_date_time_array( $theExdate, $parno );
-      elseif( 8 <= strlen( trim( $theExdate ))) // ex. 2006-08-03 10:12:18
+        elseif( 8 <= strlen( trim( $theExdate ))) // ex. 2006-08-03 10:12:18
         $exdatea = $this->_date_time_string( $theExdate, $parno );
-      if( 3 == $parno )
+        if( 3 == $parno )
         unset( $exdatea['hour'], $exdatea['min'], $exdatea['sec'], $exdatea['tz'] );
-      elseif( isset( $exdatea['tz'] ))
+        elseif( isset( $exdatea['tz'] ))
         $exdatea['tz'] = (string) $exdatea['tz'];
-      if(  isset( $input['params']['TZID'] ) ||
+        if(  isset( $input['params']['TZID'] ) ||
          ( isset( $exdatea['tz'] ) && !$this->_isOffset( $exdatea['tz'] )) ||
          ( isset( $input['value'][0] ) && ( !isset( $input['value'][0]['tz'] ))) ||
          ( isset( $input['value'][0]['tz'] ) && !$this->_isOffset( $input['value'][0]['tz'] )))
         unset( $exdatea['tz'] );
-      $input['value'][] = $exdatea;
+        $input['value'][] = $exdatea;
     }
     if( 0 >= count( $input['value'] ))
-      return FALSE;
+        return FALSE;
     if( 3 == $parno ) {
-      $input['params']['VALUE'] = 'DATE';
-      unset( $input['params']['TZID'] );
+        $input['params']['VALUE'] = 'DATE';
+        unset( $input['params']['TZID'] );
     }
     $this->_setMval( $this->exdate, $input['value'], $input['params'], FALSE, $index );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: EXRULE
@@ -2584,25 +2583,25 @@ 
  * @since 2.4.8 - 2008-10-22
  * @return string
  */
-  function createExrule() {
+    function createExrule() {
     if( empty( $this->exrule )) return FALSE;
     return $this->_format_recur( 'EXRULE', $this->exrule );
-  }
+    }
 /**
- * set calendar component property exdate
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-05
- * @param array $exruleset
- * @param array $params, optional
- * @param integer $index, optional
- * @return bool
- */
-  function setExrule( $exruleset, $params=FALSE, $index=FALSE ) {
+     * set calendar component property exdate
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-05
+     * @param array $exruleset
+     * @param array $params, optional
+     * @param integer $index, optional
+     * @return bool
+     */
+    function setExrule( $exruleset, $params=FALSE, $index=FALSE ) {
     if( empty( $exruleset )) if( $this->getConfig( 'allowEmpty' )) $exruleset = null; else return FALSE;
     $this->_setMval( $this->exrule, $this->_setRexrule( $exruleset ), $params, FALSE, $index );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: FREEBUSY
@@ -2614,110 +2613,110 @@ 
  * @since 2.4.8 - 2008-10-22
  * @return string
  */
-  function createFreebusy() {
+    function createFreebusy() {
     if( empty( $this->freebusy )) return FALSE;
     $output = null;
     foreach( $this->freebusy as $freebusyPart ) {
-      if( empty( $freebusyPart['value'] )) {
+        if( empty( $freebusyPart['value'] )) {
         if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'FREEBUSY' );
         continue;
-      }
-      $attributes = $content = null;
-      if( isset( $freebusyPart['value']['fbtype'] )) {
+        }
+        $attributes = $content = null;
+        if( isset( $freebusyPart['value']['fbtype'] )) {
         $attributes .= $this->intAttrDelimiter.'FBTYPE='.$freebusyPart['value']['fbtype'];
         unset( $freebusyPart['value']['fbtype'] );
         $freebusyPart['value'] = array_values( $freebusyPart['value'] );
-      }
-      else
+        }
+        else
         $attributes .= $this->intAttrDelimiter.'FBTYPE=BUSY';
-      $attributes .= $this->_createParams( $freebusyPart['params'] );
-      $fno = 1;
-      $cnt = count( $freebusyPart['value']);
-      foreach( $freebusyPart['value'] as $periodix => $freebusyPeriod ) {
+        $attributes .= $this->_createParams( $freebusyPart['params'] );
+        $fno = 1;
+        $cnt = count( $freebusyPart['value']);
+        foreach( $freebusyPart['value'] as $periodix => $freebusyPeriod ) {
         $formatted   = $this->_format_date_time( $freebusyPeriod[0] );
         $content .= $formatted;
         $content .= '/';
         $cnt2 = count( $freebusyPeriod[1]);
         if( array_key_exists( 'year', $freebusyPeriod[1] ))      // date-time
-          $cnt2 = 7;
+            $cnt2 = 7;
         elseif( array_key_exists( 'week', $freebusyPeriod[1] ))  // duration
-          $cnt2 = 5;
+            $cnt2 = 5;
         if(( 7 == $cnt2 )   &&    // period=  -> date-time
             isset( $freebusyPeriod[1]['year'] )  &&
             isset( $freebusyPeriod[1]['month'] ) &&
             isset( $freebusyPeriod[1]['day'] )) {
-          $content .= $this->_format_date_time( $freebusyPeriod[1] );
+            $content .= $this->_format_date_time( $freebusyPeriod[1] );
         }
         else {                                  // period=  -> dur-time
-          $content .= $this->_format_duration( $freebusyPeriod[1] );
+            $content .= $this->_format_duration( $freebusyPeriod[1] );
         }
         if( $fno < $cnt )
-          $content .= ',';
+            $content .= ',';
         $fno++;
-      }
-      $output .= $this->_createElement( 'FREEBUSY', $attributes, $content );
+        }
+        $output .= $this->_createElement( 'FREEBUSY', $attributes, $content );
     }
     return $output;
-  }
+    }
 /**
- * set calendar component property freebusy
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-05
- * @param string $fbType
- * @param array $fbValues
- * @param array $params, optional
- * @param integer $index, optional
- * @return bool
- */
-  function setFreebusy( $fbType, $fbValues, $params=FALSE, $index=FALSE ) {
+     * set calendar component property freebusy
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-05
+     * @param string $fbType
+     * @param array $fbValues
+     * @param array $params, optional
+     * @param integer $index, optional
+     * @return bool
+     */
+    function setFreebusy( $fbType, $fbValues, $params=FALSE, $index=FALSE ) {
     if( empty( $fbValues )) {
-      if( $this->getConfig( 'allowEmpty' )) {
+        if( $this->getConfig( 'allowEmpty' )) {
         $this->_setMval( $this->freebusy, null, $params, FALSE, $index );
         return TRUE;
-      }
-      else
+        }
+        else
         return FALSE;
     }
     $fbType = strtoupper( $fbType );
     if(( !in_array( $fbType, array( 'FREE', 'BUSY', 'BUSY-UNAVAILABLE', 'BUSY-TENTATIVE' ))) &&
        ( 'X-' != substr( $fbType, 0, 2 )))
-      $fbType = 'BUSY';
+        $fbType = 'BUSY';
     $input = array( 'fbtype' => $fbType );
     foreach( $fbValues as $fbPeriod ) {   // periods => period
-      $freebusyPeriod = array();
-      foreach( $fbPeriod as $fbMember ) { // pairs => singlepart
+        $freebusyPeriod = array();
+        foreach( $fbPeriod as $fbMember ) { // pairs => singlepart
         $freebusyPairMember = array();
         if( is_array( $fbMember )) {
-          if( $this->_isArrayDate( $fbMember )) { // date-time value
+            if( $this->_isArrayDate( $fbMember )) { // date-time value
             $freebusyPairMember       = $this->_date_time_array( $fbMember, 7 );
             $freebusyPairMember['tz'] = 'Z';
-          }
-          elseif( $this->_isArrayTimestampDate( $fbMember )) { // timestamp value
+            }
+            elseif( $this->_isArrayTimestampDate( $fbMember )) { // timestamp value
             $freebusyPairMember       = $this->_timestamp2date( $fbMember['timestamp'], 7 );
             $freebusyPairMember['tz'] = 'Z';
-          }
-          else {                                         // array format duration
+            }
+            else {                                         // array format duration
             $freebusyPairMember = $this->_duration_array( $fbMember );
-          }
+            }
         }
         elseif(( 3 <= strlen( trim( $fbMember ))) &&    // string format duration
                ( in_array( $fbMember{0}, array( 'P', '+', '-' )))) {
-          if( 'P' != $fbMember{0} )
+            if( 'P' != $fbMember{0} )
             $fbmember = substr( $fbMember, 1 );
-          $freebusyPairMember = $this->_duration_string( $fbMember );
+            $freebusyPairMember = $this->_duration_string( $fbMember );
         }
         elseif( 8 <= strlen( trim( $fbMember ))) { // text date ex. 2006-08-03 10:12:18
-          $freebusyPairMember       = $this->_date_time_string( $fbMember, 7 );
-          $freebusyPairMember['tz'] = 'Z';
+            $freebusyPairMember       = $this->_date_time_string( $fbMember, 7 );
+            $freebusyPairMember['tz'] = 'Z';
         }
         $freebusyPeriod[]   = $freebusyPairMember;
-      }
-      $input[]              = $freebusyPeriod;
+        }
+        $input[]              = $freebusyPeriod;
     }
     $this->_setMval( $this->freebusy, $input, $params, FALSE, $index );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: GEO
@@ -2729,40 +2728,40 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createGeo() {
+    function createGeo() {
     if( empty( $this->geo )) return FALSE;
     if( empty( $this->geo['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'GEO' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'GEO' ) : FALSE;
     $attributes = $this->_createParams( $this->geo['params'] );
     $content    = null;
     $content   .= number_format( (float) $this->geo['value']['latitude'], 6, '.', '');
     $content   .= ';';
     $content   .= number_format( (float) $this->geo['value']['longitude'], 6, '.', '');
     return $this->_createElement( 'GEO', $attributes, $content );
-  }
+    }
 /**
- * set calendar component property geo
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param float $latitude
- * @param float $longitude
- * @param array $params optional
- * @return bool
- */
-  function setGeo( $latitude, $longitude, $params=FALSE ) {
+     * set calendar component property geo
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param float $latitude
+     * @param float $longitude
+     * @param array $params optional
+     * @return bool
+     */
+    function setGeo( $latitude, $longitude, $params=FALSE ) {
     if( !empty( $latitude ) && !empty( $longitude )) {
-      if( !is_array( $this->geo )) $this->geo = array();
-      $this->geo['value']['latitude']  = $latitude;
-      $this->geo['value']['longitude'] = $longitude;
-      $this->geo['params'] = $this->_setParams( $params );
+        if( !is_array( $this->geo )) $this->geo = array();
+        $this->geo['value']['latitude']  = $latitude;
+        $this->geo['value']['longitude'] = $longitude;
+        $this->geo['params'] = $this->_setParams( $params );
     }
     elseif( $this->getConfig( 'allowEmpty' ))
-      $this->geo = array( 'value' => null, 'params' => $this->_setParams( $params ) );
+        $this->geo = array( 'value' => null, 'params' => $this->_setParams( $params ) );
     else
-      return FALSE;
+        return FALSE;
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: LAST-MODIFIED
@@ -2774,32 +2773,32 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createLastModified() {
+    function createLastModified() {
     if( empty( $this->lastmodified )) return FALSE;
     $attributes = $this->_createParams( $this->lastmodified['params'] );
     $formatted  = $this->_format_date_time( $this->lastmodified['value'], 7 );
     return $this->_createElement( 'LAST-MODIFIED', $attributes, $formatted );
-  }
+    }
 /**
- * set calendar component property completed
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-10-23
- * @param mixed $year optional
- * @param mixed $month optional
- * @param int $day optional
- * @param int $hour optional
- * @param int $min optional
- * @param int $sec optional
- * @param array $params optional
- * @return boll
- */
-  function setLastModified( $year=FALSE, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
+     * set calendar component property completed
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-10-23
+     * @param mixed $year optional
+     * @param mixed $month optional
+     * @param int $day optional
+     * @param int $hour optional
+     * @param int $min optional
+     * @param int $sec optional
+     * @param array $params optional
+     * @return boll
+     */
+    function setLastModified( $year=FALSE, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
     if( empty( $year ))
-      $year = date('Ymd\THis', mktime( date( 'H' ), date( 'i' ), date( 's' ) - date( 'Z'), date( 'm' ), date( 'd' ), date( 'Y' )));
+        $year = date('Ymd\THis', mktime( date( 'H' ), date( 'i' ), date( 's' ) - date( 'Z'), date( 'm' ), date( 'd' ), date( 'Y' )));
     $this->lastmodified = $this->_setDate2( $year, $month, $day, $hour, $min, $sec, $params );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: LOCATION
@@ -2811,28 +2810,28 @@ 
  * @since 2.4.8 - 2008-10-22
  * @return string
  */
-  function createLocation() {
+    function createLocation() {
     if( empty( $this->location )) return FALSE;
     if( empty( $this->location['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'LOCATION' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'LOCATION' ) : FALSE;
     $attributes = $this->_createParams( $this->location['params'], array( 'ALTREP', 'LANGUAGE' ));
     $content    = $this->_strrep( $this->location['value'] );
     return $this->_createElement( 'LOCATION', $attributes, $content );
-  }
+    }
 /**
- * set calendar component property location
+     * set calendar component property location
  '
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param string $value
- * @param array params optional
- * @return bool
- */
-  function setLocation( $value, $params=FALSE ) {
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param string $value
+     * @param array params optional
+     * @return bool
+     */
+    function setLocation( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->location = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: ORGANIZER
@@ -2844,35 +2843,35 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createOrganizer() {
+    function createOrganizer() {
     if( empty( $this->organizer )) return FALSE;
     if( empty( $this->organizer['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'ORGANIZER' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'ORGANIZER' ) : FALSE;
     $attributes = $this->_createParams( $this->organizer['params']
-                                      , array( 'CN', 'DIR', 'LANGUAGE', 'SENT-BY' ));
+                                        , array( 'CN', 'DIR', 'LANGUAGE', 'SENT-BY' ));
     $content    = 'MAILTO:'.$this->organizer['value'];
     return $this->_createElement( 'ORGANIZER', $attributes, $content );
-  }
+    }
 /**
- * set calendar component property organizer
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param string $value
- * @param array params optional
- * @return bool
- */
-  function setOrganizer( $value, $params=FALSE ) {
+     * set calendar component property organizer
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param string $value
+     * @param array params optional
+     * @return bool
+     */
+    function setOrganizer( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $value = str_replace ( 'MAILTO:', '', $value );
     $value = str_replace ( 'mailto:', '', $value );
     $this->organizer = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     if( isset( $this->organizer['params']['SENT-BY'] )) {
-      if( 'MAILTO' == strtoupper( substr( $this->organizer['params']['SENT-BY'], 0, 6 )))
+        if( 'MAILTO' == strtoupper( substr( $this->organizer['params']['SENT-BY'], 0, 6 )))
         $this->organizer['params']['SENT-BY'] = substr( $this->organizer['params']['SENT-BY'], 7 );
     }
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: PERCENT-COMPLETE
@@ -2884,27 +2883,27 @@ 
  * @since 2.4.8 - 2008-10-22
  * @return string
  */
-  function createPercentComplete() {
+    function createPercentComplete() {
     if( empty( $this->percentcomplete )) return FALSE;
     if( empty( $this->percentcomplete['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'PERCENT-COMPLETE' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'PERCENT-COMPLETE' ) : FALSE;
     $attributes = $this->_createParams( $this->percentcomplete['params'] );
     return $this->_createElement( 'PERCENT-COMPLETE', $attributes, $this->percentcomplete['value'] );
-  }
+    }
 /**
- * set calendar component property percent-complete
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param int $value
- * @param array $params optional
- * @return bool
- */
-  function setPercentComplete( $value, $params=FALSE ) {
+     * set calendar component property percent-complete
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param int $value
+     * @param array $params optional
+     * @return bool
+     */
+    function setPercentComplete( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->percentcomplete = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: PRIORITY
@@ -2916,27 +2915,27 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createPriority() {
+    function createPriority() {
     if( empty( $this->priority )) return FALSE;
     if( empty( $this->priority['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'PRIORITY' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'PRIORITY' ) : FALSE;
     $attributes = $this->_createParams( $this->priority['params'] );
     return $this->_createElement( 'PRIORITY', $attributes, $this->priority['value'] );
-  }
+    }
 /**
- * set calendar component property priority
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param int $value
- * @param array $params optional
- * @return bool
- */
-  function setPriority( $value, $params=FALSE  ) {
+     * set calendar component property priority
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param int $value
+     * @param array $params optional
+     * @return bool
+     */
+    function setPriority( $value, $params=FALSE  ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->priority = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: RDATE
@@ -2948,118 +2947,118 @@ 
  * @since 2.4.16 - 2008-10-26
  * @return string
  */
-  function createRdate() {
+    function createRdate() {
     if( empty( $this->rdate )) return FALSE;
     $utctime = ( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) ? TRUE : FALSE;
     $output = null;
     if( $utctime  )
-      unset( $this->rdate['params']['TZID'] );
+        unset( $this->rdate['params']['TZID'] );
     foreach( $this->rdate as $theRdate ) {
-      if( empty( $theRdate['value'] )) {
+        if( empty( $theRdate['value'] )) {
         if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'RDATE' );
         continue;
-      }
-      if( $utctime  )
+        }
+        if( $utctime  )
         unset( $theRdate['params']['TZID'] );
-      $attributes = $this->_createParams( $theRdate['params'] );
-      $cnt = count( $theRdate['value'] );
-      $content = null;
-      $rno = 1;
-      foreach( $theRdate['value'] as $rpix => $rdatePart ) {
+        $attributes = $this->_createParams( $theRdate['params'] );
+        $cnt = count( $theRdate['value'] );
+        $content = null;
+        $rno = 1;
+        foreach( $theRdate['value'] as $rpix => $rdatePart ) {
         $contentPart = null;
         if( is_array( $rdatePart ) &&
             isset( $theRdate['params']['VALUE'] ) && ( 'PERIOD' == $theRdate['params']['VALUE'] )) { // PERIOD
-          if( $utctime )
+            if( $utctime )
             unset( $rdatePart[0]['tz'] );
-          $formatted = $this->_format_date_time( $rdatePart[0]); // PERIOD part 1
-          if( $utctime || !empty( $theRdate['params']['TZID'] ))
+            $formatted = $this->_format_date_time( $rdatePart[0]); // PERIOD part 1
+            if( $utctime || !empty( $theRdate['params']['TZID'] ))
             $formatted = str_replace( 'Z', '', $formatted);
-          if( 0 < $rpix ) {
+            if( 0 < $rpix ) {
             if( !empty( $rdatePart[0]['tz'] ) && $this->_isOffset( $rdatePart[0]['tz'] )) {
-              if( 'Z' != substr( $formatted, -1 )) $formatted .= 'Z';
+                if( 'Z' != substr( $formatted, -1 )) $formatted .= 'Z';
             }
             else
-              $formatted = str_replace( 'Z', '', $formatted );
-          }
-          $contentPart .= $formatted;
-          $contentPart .= '/';
-          $cnt2 = count( $rdatePart[1]);
-          if( array_key_exists( 'year', $rdatePart[1] )) {
+                $formatted = str_replace( 'Z', '', $formatted );
+            }
+            $contentPart .= $formatted;
+            $contentPart .= '/';
+            $cnt2 = count( $rdatePart[1]);
+            if( array_key_exists( 'year', $rdatePart[1] )) {
             if( array_key_exists( 'hour', $rdatePart[1] ))
-              $cnt2 = 7;                                      // date-time
+                $cnt2 = 7;                                      // date-time
             else
-              $cnt2 = 3;                                      // date
-          }
-          elseif( array_key_exists( 'week', $rdatePart[1] ))  // duration
+                $cnt2 = 3;                                      // date
+            }
+            elseif( array_key_exists( 'week', $rdatePart[1] ))  // duration
             $cnt2 = 5;
-          if(( 7 == $cnt2 )   &&    // period=  -> date-time
+            if(( 7 == $cnt2 )   &&    // period=  -> date-time
               isset( $rdatePart[1]['year'] )  &&
               isset( $rdatePart[1]['month'] ) &&
               isset( $rdatePart[1]['day'] )) {
             if( $utctime )
-              unset( $rdatePart[1]['tz'] );
+                unset( $rdatePart[1]['tz'] );
             $formatted = $this->_format_date_time( $rdatePart[1] ); // PERIOD part 2
             if( $utctime || !empty( $theRdate['params']['TZID'] ))
-              $formatted = str_replace( 'Z', '', $formatted);
+                $formatted = str_replace( 'Z', '', $formatted);
             if( !empty( $rdatePart[0]['tz'] ) && $this->_isOffset( $rdatePart[0]['tz'] )) {
-              if( 'Z' != substr( $formatted, -1 )) $formatted .= 'Z';
+                if( 'Z' != substr( $formatted, -1 )) $formatted .= 'Z';
             }
             else
-              $formatted = str_replace( 'Z', '', $formatted );
-           $contentPart .= $formatted;
-          }
-          else {                                  // period=  -> dur-time
+                $formatted = str_replace( 'Z', '', $formatted );
+            $contentPart .= $formatted;
+            }
+            else {                                  // period=  -> dur-time
             $contentPart .= $this->_format_duration( $rdatePart[1] );
-          }
+            }
         } // PERIOD end
         else { // SINGLE date start
-          if( $utctime )
+            if( $utctime )
             unset( $rdatePart['tz'] );
-          $formatted = $this->_format_date_time( $rdatePart);
-          if( $utctime || !empty( $theRdate['params']['TZID'] ))
+            $formatted = $this->_format_date_time( $rdatePart);
+            if( $utctime || !empty( $theRdate['params']['TZID'] ))
             $formatted = str_replace( 'Z', '', $formatted);
-          if( !$utctime && ( 0 < $rpix )) {
+            if( !$utctime && ( 0 < $rpix )) {
             if( !empty( $theRdate['value'][0]['tz'] ) && $this->_isOffset( $theRdate['value'][0]['tz'] )) {
-              if( 'Z' != substr( $formatted, -1 ))
+                if( 'Z' != substr( $formatted, -1 ))
                 $formatted .= 'Z';
             }
             else
-              $formatted = str_replace( 'Z', '', $formatted );
-          }
-          $contentPart .= $formatted;
+                $formatted = str_replace( 'Z', '', $formatted );
+            }
+            $contentPart .= $formatted;
         }
         $content .= $contentPart;
         if( $rno < $cnt )
-          $content .= ',';
+            $content .= ',';
         $rno++;
-      }
-      $output    .= $this->_createElement( 'RDATE', $attributes, $content );
+        }
+        $output    .= $this->_createElement( 'RDATE', $attributes, $content );
     }
     return $output;
-  }
+    }
 /**
- * set calendar component property rdate
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-07
- * @param array $rdates
- * @param array $params, optional
- * @param integer $index, optional
- * @return bool
- */
-  function setRdate( $rdates, $params=FALSE, $index=FALSE ) {
+     * set calendar component property rdate
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-07
+     * @param array $rdates
+     * @param array $params, optional
+     * @param integer $index, optional
+     * @return bool
+     */
+    function setRdate( $rdates, $params=FALSE, $index=FALSE ) {
     if( empty( $rdates )) {
-      if( $this->getConfig( 'allowEmpty' )) {
+        if( $this->getConfig( 'allowEmpty' )) {
         $this->_setMval( $this->rdate, null, $params, FALSE, $index );
         return TRUE;
-      }
-      else
+        }
+        else
         return FALSE;
     }
     $input = array( 'params' => $this->_setParams( $params, array( 'VALUE' => 'DATE-TIME' )));
     if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) {
-      unset( $input['params']['TZID'] );
-      $input['params']['VALUE'] = 'DATE-TIME';
+        unset( $input['params']['TZID'] );
+        $input['params']['VALUE'] = 'DATE-TIME';
     }
             /*  check if PERIOD, if not set */
     if((!isset( $input['params']['VALUE'] ) || !in_array( $input['params']['VALUE'], array( 'DATE', 'PERIOD' ))) &&
@@ -3069,73 +3068,73 @@ 
                                       $this->_isArrayDate( $rdates[0][0] ))) ||
                                     ( is_string( $rdates[0][0] ) && ( 8 <= strlen( trim( $rdates[0][0] )))))  &&
      ( is_array( $rdates[0][1] ) || ( is_string( $rdates[0][1] ) && ( 3 <= strlen( trim( $rdates[0][1] ))))))
-      $input['params']['VALUE'] = 'PERIOD';
+        $input['params']['VALUE'] = 'PERIOD';
             /* check 1:st date, upd. $parno (opt) and save ev. timezone **/
     $date  = reset( $rdates );
     if( isset( $input['params']['VALUE'] ) && ( 'PERIOD' == $input['params']['VALUE'] )) // PERIOD
-      $date  = reset( $date );
+        $date  = reset( $date );
     $this->_chkdatecfg( $date, $parno, $input['params'] );
     if( in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' )))
-      unset( $input['params']['TZID'] );
+        unset( $input['params']['TZID'] );
     $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME' ); // remove default
     foreach( $rdates as $rpix => $theRdate ) {
-      $inputa = null;
-      if( is_array( $theRdate )) {
+        $inputa = null;
+        if( is_array( $theRdate )) {
         if( isset( $input['params']['VALUE'] ) && ( 'PERIOD' == $input['params']['VALUE'] )) { // PERIOD
-          foreach( $theRdate as $rix => $rPeriod ) {
+            foreach( $theRdate as $rix => $rPeriod ) {
             if( is_array( $rPeriod )) {
-              if( $this->_isArrayTimestampDate( $rPeriod ))      // timestamp
+                if( $this->_isArrayTimestampDate( $rPeriod ))      // timestamp
                 $inputab  = ( isset( $rPeriod['tz'] )) ? $this->_timestamp2date( $rPeriod, $parno ) : $this->_timestamp2date( $rPeriod, 6 );
-              elseif( $this->_isArrayDate( $rPeriod ))
+                elseif( $this->_isArrayDate( $rPeriod ))
                 $inputab  = ( 3 < count ( $rPeriod )) ? $this->_date_time_array( $rPeriod, $parno ) : $this->_date_time_array( $rPeriod, 6 );
-              elseif (( 1 == count( $rPeriod )) && ( 8 <= strlen( reset( $rPeriod ))))  // text-date
+                elseif (( 1 == count( $rPeriod )) && ( 8 <= strlen( reset( $rPeriod ))))  // text-date
                 $inputab  = $this->_date_time_string( reset( $rPeriod ), $parno );
-              else                                               // array format duration
+                else                                               // array format duration
                 $inputab  = $this->_duration_array( $rPeriod );
             }
             elseif(( 3 <= strlen( trim( $rPeriod ))) &&          // string format duration
                    ( in_array( $rPeriod{0}, array( 'P', '+', '-' )))) {
-              if( 'P' != $rPeriod{0} )
+                if( 'P' != $rPeriod{0} )
                 $rPeriod  = substr( $rPeriod, 1 );
-              $inputab    = $this->_duration_string( $rPeriod );
+                $inputab    = $this->_duration_string( $rPeriod );
             }
             elseif( 8 <= strlen( trim( $rPeriod )))              // text date ex. 2006-08-03 10:12:18
-              $inputab    = $this->_date_time_string( $rPeriod, $parno );
+                $inputab    = $this->_date_time_string( $rPeriod, $parno );
             if(  isset( $input['params']['TZID'] ) ||
                ( isset( $inputab['tz'] )   && !$this->_isOffset( $inputab['tz'] )) ||
                ( isset( $inputa[0] )       && ( !isset( $inputa[0]['tz'] )))       ||
                ( isset( $inputa[0]['tz'] ) && !$this->_isOffset( $inputa[0]['tz'] )))
-              unset( $inputab['tz'] );
+                unset( $inputab['tz'] );
             $inputa[]     = $inputab;
-          }
+            }
         } // PERIOD end
         elseif ( $this->_isArrayTimestampDate( $theRdate ))      // timestamp
-          $inputa = $this->_timestamp2date( $theRdate, $parno );
+            $inputa = $this->_timestamp2date( $theRdate, $parno );
         else                                                     // date[-time]
-          $inputa = $this->_date_time_array( $theRdate, $parno );
-      }
-      elseif( 8 <= strlen( trim( $theRdate )))                   // text date ex. 2006-08-03 10:12:18
+            $inputa = $this->_date_time_array( $theRdate, $parno );
+        }
+        elseif( 8 <= strlen( trim( $theRdate )))                   // text date ex. 2006-08-03 10:12:18
         $inputa       = $this->_date_time_string( $theRdate, $parno );
-      if( !isset( $input['params']['VALUE'] ) || ( 'PERIOD' != $input['params']['VALUE'] )) { // no PERIOD
+        if( !isset( $input['params']['VALUE'] ) || ( 'PERIOD' != $input['params']['VALUE'] )) { // no PERIOD
         if( 3 == $parno )
-          unset( $inputa['hour'], $inputa['min'], $inputa['sec'], $inputa['tz'] );
+            unset( $inputa['hour'], $inputa['min'], $inputa['sec'], $inputa['tz'] );
         elseif( isset( $inputa['tz'] ))
-          $inputa['tz'] = (string) $inputa['tz'];
+            $inputa['tz'] = (string) $inputa['tz'];
         if(  isset( $input['params']['TZID'] ) ||
            ( isset( $inputa['tz'] )            && !$this->_isOffset( $inputa['tz'] ))     ||
            ( isset( $input['value'][0] )       && ( !isset( $input['value'][0]['tz'] )))  ||
            ( isset( $input['value'][0]['tz'] ) && !$this->_isOffset( $input['value'][0]['tz'] )))
-          unset( $inputa['tz'] );
-      }
-      $input['value'][] = $inputa;
+            unset( $inputa['tz'] );
+        }
+        $input['value'][] = $inputa;
     }
     if( 3 == $parno ) {
-      $input['params']['VALUE'] = 'DATE';
-      unset( $input['params']['TZID'] );
+        $input['params']['VALUE'] = 'DATE';
+        unset( $input['params']['TZID'] );
     }
     $this->_setMval( $this->rdate, $input['value'], $input['params'], FALSE, $index );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: RECURRENCE-ID
@@ -3147,40 +3146,40 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createRecurrenceid() {
+    function createRecurrenceid() {
     if( empty( $this->recurrenceid )) return FALSE;
     if( empty( $this->recurrenceid['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'RECURRENCE-ID' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'RECURRENCE-ID' ) : FALSE;
     $formatted  = $this->_format_date_time( $this->recurrenceid['value'] );
     $attributes = $this->_createParams( $this->recurrenceid['params'] );
     return $this->_createElement( 'RECURRENCE-ID', $attributes, $formatted );
-  }
+    }
 /**
- * set calendar component property recurrence-id
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-10-23
- * @param mixed $year
- * @param mixed $month optional
- * @param int $day optional
- * @param int $hour optional
- * @param int $min optional
- * @param int $sec optional
- * @param array $params optional
- * @return bool
- */
-  function setRecurrenceid( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
+     * set calendar component property recurrence-id
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-10-23
+     * @param mixed $year
+     * @param mixed $month optional
+     * @param int $day optional
+     * @param int $hour optional
+     * @param int $min optional
+     * @param int $sec optional
+     * @param array $params optional
+     * @return bool
+     */
+    function setRecurrenceid( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE ) {
     if( empty( $year )) {
-      if( $this->getConfig( 'allowEmpty' )) {
+        if( $this->getConfig( 'allowEmpty' )) {
         $this->recurrenceid = array( 'value' => null, 'params' => null );
         return TRUE;
-      }
-      else
+        }
+        else
         return FALSE;
     }
     $this->recurrenceid = $this->_setDate( $year, $month, $day, $hour, $min, $sec, $tz, $params );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: RELATED-TO
@@ -3192,40 +3191,40 @@ 
  * @since 2.4.8 - 2008-10-23
  * @return string
  */
-  function createRelatedTo() {
+    function createRelatedTo() {
     if( empty( $this->relatedto )) return FALSE;
     $output = null;
     foreach( $this->relatedto as $relation ) {
-      if( empty( $relation['value'] )) {
+        if( empty( $relation['value'] )) {
         if( $this->getConfig( 'allowEmpty' )) $output.= $this->_createElement( 'RELATED-TO', $this->_createParams( $relation['params'] ));
         continue;
-      }
-      $attributes = $this->_createParams( $relation['params'] );
-      $content    = ( 'xcal' != $this->format ) ? '<' : '';
-      $content   .= $this->_strrep( $relation['value'] );
-      $content   .= ( 'xcal' != $this->format ) ? '>' : '';
-      $output    .= $this->_createElement( 'RELATED-TO', $attributes, $content );
+        }
+        $attributes = $this->_createParams( $relation['params'] );
+        $content    = ( 'xcal' != $this->format ) ? '<' : '';
+        $content   .= $this->_strrep( $relation['value'] );
+        $content   .= ( 'xcal' != $this->format ) ? '>' : '';
+        $output    .= $this->_createElement( 'RELATED-TO', $attributes, $content );
     }
     return $output;
-  }
+    }
 /**
- * set calendar component property related-to
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-07
- * @param float $relid
- * @param array $params, optional
- * @param index $index, optional
- * @return bool
- */
-  function setRelatedTo( $value, $params=FALSE, $index=FALSE ) {
+     * set calendar component property related-to
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-07
+     * @param float $relid
+     * @param array $params, optional
+     * @param index $index, optional
+     * @return bool
+     */
+    function setRelatedTo( $value, $params=FALSE, $index=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     if(( '<' == substr( $value, 0, 1 )) && ( '>' == substr( $value, -1 )))
-      $value = substr( $value, 1, ( strlen( $value ) - 2 ));
+        $value = substr( $value, 1, ( strlen( $value ) - 2 ));
     $this->_existRem( $params, 'RELTYPE', 'PARENT', TRUE ); // remove default
     $this->_setMval( $this->relatedto, $value, $params, FALSE, $index );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: REPEAT
@@ -3237,27 +3236,27 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createRepeat() {
+    function createRepeat() {
     if( empty( $this->repeat )) return FALSE;
     if( empty( $this->repeat['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'REPEAT' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'REPEAT' ) : FALSE;
     $attributes = $this->_createParams( $this->repeat['params'] );
     return $this->_createElement( 'REPEAT', $attributes, $this->repeat['value'] );
-  }
+    }
 /**
- * set calendar component property transp
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param string $value
- * @param array $params optional
- * @return void
- */
-  function setRepeat( $value, $params=FALSE ) {
+     * set calendar component property transp
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param string $value
+     * @param array $params optional
+     * @return void
+     */
+    function setRepeat( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->repeat = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: REQUEST-STATUS
@@ -3268,43 +3267,43 @@ 
  * @since 2.4.8 - 2008-10-23
  * @return string
  */
-  function createRequestStatus() {
+    function createRequestStatus() {
     if( empty( $this->requeststatus )) return FALSE;
     $output = null;
     foreach( $this->requeststatus as $rstat ) {
-      if( empty( $rstat['value']['statcode'] )) {
+        if( empty( $rstat['value']['statcode'] )) {
         if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'REQUEST-STATUS' );
         continue;
-      }
-      $attributes  = $this->_createParams( $rstat['params'], array( 'LANGUAGE' ));
-      $content     = number_format( (float) $rstat['value']['statcode'], 2, '.', '');
-      $content    .= ';'.$this->_strrep( $rstat['value']['text'] );
-      if( isset( $rstat['value']['extdata'] ))
+        }
+        $attributes  = $this->_createParams( $rstat['params'], array( 'LANGUAGE' ));
+        $content     = number_format( (float) $rstat['value']['statcode'], 2, '.', '');
+        $content    .= ';'.$this->_strrep( $rstat['value']['text'] );
+        if( isset( $rstat['value']['extdata'] ))
         $content  .= ';'.$this->_strrep( $rstat['value']['extdata'] );
-      $output     .= $this->_createElement( 'REQUEST-STATUS', $attributes, $content );
+        $output     .= $this->_createElement( 'REQUEST-STATUS', $attributes, $content );
     }
     return $output;
-  }
+    }
 /**
- * set calendar component property request-status
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-05
- * @param float $statcode
- * @param string $text
- * @param string $extdata, optional
- * @param array $params, optional
- * @param integer $index, optional
- * @return bool
- */
-  function setRequestStatus( $statcode, $text, $extdata=FALSE, $params=FALSE, $index=FALSE ) {
+     * set calendar component property request-status
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-05
+     * @param float $statcode
+     * @param string $text
+     * @param string $extdata, optional
+     * @param array $params, optional
+     * @param integer $index, optional
+     * @return bool
+     */
+    function setRequestStatus( $statcode, $text, $extdata=FALSE, $params=FALSE, $index=FALSE ) {
     if( empty( $statcode ) || empty( $text )) if( $this->getConfig( 'allowEmpty' )) $statcode = $text = null; else return FALSE;
     $input              = array( 'statcode' => $statcode, 'text' => $text );
     if( $extdata )
-      $input['extdata'] = $extdata;
+        $input['extdata'] = $extdata;
     $this->_setMval( $this->requeststatus, $input, $params, FALSE, $index );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: RESOURCES
@@ -3316,41 +3315,41 @@ 
  * @since 2.4.8 - 2008-10-23
  * @return string
  */
-  function createResources() {
+    function createResources() {
     if( empty( $this->resources )) return FALSE;
     $output = null;
     foreach( $this->resources as $resource ) {
-      if( empty( $resource['value'] )) {
+        if( empty( $resource['value'] )) {
         if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'RESOURCES' );
         continue;
-      }
-      $attributes  = $this->_createParams( $resource['params'], array( 'ALTREP', 'LANGUAGE' ));
-      if( is_array( $resource['value'] )) {
+        }
+        $attributes  = $this->_createParams( $resource['params'], array( 'ALTREP', 'LANGUAGE' ));
+        if( is_array( $resource['value'] )) {
         foreach( $resource['value'] as $rix => $resourcePart )
-          $resource['value'][$rix] = $this->_strrep( $resourcePart );
+            $resource['value'][$rix] = $this->_strrep( $resourcePart );
         $content   = implode( ',', $resource['value'] );
-      }
-      else
+        }
+        else
         $content   = $this->_strrep( $resource['value'] );
-      $output     .= $this->_createElement( 'RESOURCES', $attributes, $content );
+        $output     .= $this->_createElement( 'RESOURCES', $attributes, $content );
     }
     return $output;
-  }
+    }
 /**
- * set calendar component property recources
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-05
- * @param mixed $value
- * @param array $params, optional
- * @param integer $index, optional
- * @return bool
- */
-  function setResources( $value, $params=FALSE, $index=FALSE ) {
+     * set calendar component property recources
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-05
+     * @param mixed $value
+     * @param array $params, optional
+     * @param integer $index, optional
+     * @return bool
+     */
+    function setResources( $value, $params=FALSE, $index=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->_setMval( $this->resources, $value, $params, FALSE, $index );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: RRULE
@@ -3362,25 +3361,25 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createRrule() {
+    function createRrule() {
     if( empty( $this->rrule )) return FALSE;
     return $this->_format_recur( 'RRULE', $this->rrule );
-  }
+    }
 /**
- * set calendar component property rrule
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-05
- * @param array $rruleset
- * @param array $params, optional
- * @param integer $index, optional
- * @return void
- */
-  function setRrule( $rruleset, $params=FALSE, $index=FALSE ) {
+     * set calendar component property rrule
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-05
+     * @param array $rruleset
+     * @param array $params, optional
+     * @param integer $index, optional
+     * @return void
+     */
+    function setRrule( $rruleset, $params=FALSE, $index=FALSE ) {
     if( empty( $rruleset )) if( $this->getConfig( 'allowEmpty' )) $rruleset = null; else return FALSE;
     $this->_setMval( $this->rrule, $this->_setRexrule( $rruleset ), $params, FALSE, $index );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: SEQUENCE
@@ -3391,27 +3390,27 @@ 
  * @since 0.9.7 - 2006-11-20
  * @return string
  */
-  function createSequence() {
+    function createSequence() {
     if( empty( $this->sequence )) return FALSE;
     if( empty( $this->sequence['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'SEQUENCE' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'SEQUENCE' ) : FALSE;
     $attributes = $this->_createParams( $this->sequence['params'] );
     return $this->_createElement( 'SEQUENCE', $attributes, $this->sequence['value'] );
-  }
+    }
 /**
- * set calendar component property sequence
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param int $value optional
- * @param array $params optional
- * @return bool
- */
-  function setSequence( $value=FALSE, $params=FALSE ) {
+     * set calendar component property sequence
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param int $value optional
+     * @param array $params optional
+     * @return bool
+     */
+    function setSequence( $value=FALSE, $params=FALSE ) {
     if( empty( $value ))
-      $value = ( isset( $this->sequence['value'] ) && ( 0 < $this->sequence['value'] )) ? $this->sequence['value'] + 1 : 1;
+        $value = ( isset( $this->sequence['value'] ) && ( 0 < $this->sequence['value'] )) ? $this->sequence['value'] + 1 : 1;
     $this->sequence = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: STATUS
@@ -3423,27 +3422,27 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createStatus() {
+    function createStatus() {
     if( empty( $this->status )) return FALSE;
     if( empty( $this->status['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'STATUS' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'STATUS' ) : FALSE;
     $attributes = $this->_createParams( $this->status['params'] );
     return $this->_createElement( 'STATUS', $attributes, $this->status['value'] );
-  }
+    }
 /**
- * set calendar component property status
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param string $value
- * @param array $params optional
- * @return bool
- */
-  function setStatus( $value, $params=FALSE ) {
+     * set calendar component property status
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param string $value
+     * @param array $params optional
+     * @return bool
+     */
+    function setStatus( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->status = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: SUMMARY
@@ -3455,28 +3454,28 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createSummary() {
+    function createSummary() {
     if( empty( $this->summary )) return FALSE;
     if( empty( $this->summary['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'SUMMARY' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'SUMMARY' ) : FALSE;
     $attributes = $this->_createParams( $this->summary['params'], array( 'ALTREP', 'LANGUAGE' ));
     $content    = $this->_strrep( $this->summary['value'] );
     return $this->_createElement( 'SUMMARY', $attributes, $content );
-  }
+    }
 /**
- * set calendar component property summary
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param string $value
- * @param string $params optional
- * @return bool
- */
-  function setSummary( $value, $params=FALSE ) {
+     * set calendar component property summary
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param string $value
+     * @param string $params optional
+     * @return bool
+     */
+    function setSummary( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->summary = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: TRANSP
@@ -3488,27 +3487,27 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createTransp() {
+    function createTransp() {
     if( empty( $this->transp )) return FALSE;
     if( empty( $this->transp['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TRANSP' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TRANSP' ) : FALSE;
     $attributes = $this->_createParams( $this->transp['params'] );
     return $this->_createElement( 'TRANSP', $attributes, $this->transp['value'] );
-  }
+    }
 /**
- * set calendar component property transp
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param string $value
- * @param string $params optional
- * @return bool
- */
-  function setTransp( $value, $params=FALSE ) {
+     * set calendar component property transp
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param string $value
+     * @param string $params optional
+     * @return bool
+     */
+    function setTransp( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->transp = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: TRIGGER
@@ -3520,126 +3519,126 @@ 
  * @since 2.4.16 - 2008-10-21
  * @return string
  */
-  function createTrigger() {
+    function createTrigger() {
     if( empty( $this->trigger )) return FALSE;
     if( empty( $this->trigger['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TRIGGER' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TRIGGER' ) : FALSE;
     $content = $attributes = null;
     if( isset( $this->trigger['value']['year'] )   &&
         isset( $this->trigger['value']['month'] )  &&
         isset( $this->trigger['value']['day'] ))
-      $content      .= $this->_format_date_time( $this->trigger['value'] );
+        $content      .= $this->_format_date_time( $this->trigger['value'] );
     else {
-      if( TRUE !== $this->trigger['value']['relatedStart'] )
+        if( TRUE !== $this->trigger['value']['relatedStart'] )
         $attributes .= $this->intAttrDelimiter.'RELATED=END';
-      if( $this->trigger['value']['before'] )
+        if( $this->trigger['value']['before'] )
         $content    .= '-';
-      $content      .= $this->_format_duration( $this->trigger['value'] );
+        $content      .= $this->_format_duration( $this->trigger['value'] );
     }
     $attributes     .= $this->_createParams( $this->trigger['params'] );
     return $this->_createElement( 'TRIGGER', $attributes, $content );
-  }
+    }
 /**
- * set calendar component property trigger
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.16 - 2008-11-04
- * @param mixed $year
- * @param mixed $month optional
- * @param int $day optional
- * @param int $week optional
- * @param int $hour optional
- * @param int $min optional
- * @param int $sec optional
- * @param bool $relatedStart optional
- * @param bool $before optional
- * @param array $params optional
- * @return bool
- */
-  function setTrigger( $year, $month=null, $day=null, $week=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $relatedStart=TRUE, $before=TRUE, $params=FALSE ) {
+     * set calendar component property trigger
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.16 - 2008-11-04
+     * @param mixed $year
+     * @param mixed $month optional
+     * @param int $day optional
+     * @param int $week optional
+     * @param int $hour optional
+     * @param int $min optional
+     * @param int $sec optional
+     * @param bool $relatedStart optional
+     * @param bool $before optional
+     * @param array $params optional
+     * @return bool
+     */
+    function setTrigger( $year, $month=null, $day=null, $week=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $relatedStart=TRUE, $before=TRUE, $params=FALSE ) {
     if( empty( $year ) && empty( $month ) && empty( $day ) && empty( $week ) && empty( $hour ) && empty( $min ) && empty( $sec ))
-      if( $this->getConfig( 'allowEmpty' )) {
+        if( $this->getConfig( 'allowEmpty' )) {
         $this->trigger = array( 'value' => null, 'params' => $this->_setParams( $params ) );
         return TRUE;
-      }
-      else
+        }
+        else
         return FALSE;
     if( $this->_isArrayTimestampDate( $year )) { // timestamp
-      $params = $this->_setParams( $month );
-      $date   = $this->_timestamp2date( $year, 7 );
-      foreach( $date as $k => $v )
+        $params = $this->_setParams( $month );
+        $date   = $this->_timestamp2date( $year, 7 );
+        foreach( $date as $k => $v )
         $$k = $v;
     }
     elseif( is_array( $year ) && ( is_array( $month ) || empty( $month ))) {
-      $params = $this->_setParams( $month );
-      if(!(array_key_exists( 'year',  $year ) &&   // exclude date-time
+        $params = $this->_setParams( $month );
+        if(!(array_key_exists( 'year',  $year ) &&   // exclude date-time
            array_key_exists( 'month', $year ) &&
            array_key_exists( 'day',   $year ))) {  // so this must be a duration
         if( isset( $params['RELATED'] ) && ( 'END' == $params['RELATED'] ))
-          $relatedStart = FALSE;
+            $relatedStart = FALSE;
         else
-          $relatedStart = ( array_key_exists( 'relatedStart', $year ) && ( TRUE !== $year['relatedStart'] )) ? FALSE : TRUE;
+            $relatedStart = ( array_key_exists( 'relatedStart', $year ) && ( TRUE !== $year['relatedStart'] )) ? FALSE : TRUE;
         $before         = ( array_key_exists( 'before', $year )       && ( TRUE !== $year['before'] ))       ? FALSE : TRUE;
-      }
-      $SSYY  = ( array_key_exists( 'year',  $year )) ? $year['year']  : null;
-      $month = ( array_key_exists( 'month', $year )) ? $year['month'] : null;
-      $day   = ( array_key_exists( 'day',   $year )) ? $year['day']   : null;
-      $week  = ( array_key_exists( 'week',  $year )) ? $year['week']  : null;
-      $hour  = ( array_key_exists( 'hour',  $year )) ? $year['hour']  : 0; //null;
-      $min   = ( array_key_exists( 'min',   $year )) ? $year['min']   : 0; //null;
-      $sec   = ( array_key_exists( 'sec',   $year )) ? $year['sec']   : 0; //null;
-      $year  = $SSYY;
+        }
+        $SSYY  = ( array_key_exists( 'year',  $year )) ? $year['year']  : null;
+        $month = ( array_key_exists( 'month', $year )) ? $year['month'] : null;
+        $day   = ( array_key_exists( 'day',   $year )) ? $year['day']   : null;
+        $week  = ( array_key_exists( 'week',  $year )) ? $year['week']  : null;
+        $hour  = ( array_key_exists( 'hour',  $year )) ? $year['hour']  : 0; //null;
+        $min   = ( array_key_exists( 'min',   $year )) ? $year['min']   : 0; //null;
+        $sec   = ( array_key_exists( 'sec',   $year )) ? $year['sec']   : 0; //null;
+        $year  = $SSYY;
     }
     elseif(is_string( $year ) && ( is_array( $month ) || empty( $month ))) {  // duration or date in a string
-      $params = $this->_setParams( $month );
-      if( in_array( $year{0}, array( 'P', '+', '-' ))) { // duration
+        $params = $this->_setParams( $month );
+        if( in_array( $year{0}, array( 'P', '+', '-' ))) { // duration
         $relatedStart = ( isset( $params['RELATED'] ) && ( 'END' == $params['RELATED'] )) ? FALSE : TRUE;
         $before       = ( '-'  == $year{0} ) ? TRUE : FALSE;
         if(     'P'  != $year{0} )
-          $year       = substr( $year, 1 );
+            $year       = substr( $year, 1 );
         $date         = $this->_duration_string( $year);
-      }
-      else   // date
+        }
+        else   // date
         $date    = $this->_date_time_string( $year, 7 );
-      unset( $year, $month, $day );
-      foreach( $date as $k => $v )
+        unset( $year, $month, $day );
+        foreach( $date as $k => $v )
         $$k = $v;
     }
     else // single values in function input parameters
-      $params = $this->_setParams( $params );
+        $params = $this->_setParams( $params );
     if( !empty( $year ) && !empty( $month ) && !empty( $day )) { // date
-      $params['VALUE'] = 'DATE-TIME';
-      $hour = ( $hour ) ? $hour : 0;
-      $min  = ( $min  ) ? $min  : 0;
-      $sec  = ( $sec  ) ? $sec  : 0;
-      $this->trigger = array( 'params' => $params );
-      $this->trigger['value'] = array( 'year'  => $year
-                                     , 'month' => $month
-                                     , 'day'   => $day
-                                     , 'hour'  => $hour
-                                     , 'min'   => $min
-                                     , 'sec'   => $sec
-                                     , 'tz'    => 'Z' );
-      return TRUE;
+        $params['VALUE'] = 'DATE-TIME';
+        $hour = ( $hour ) ? $hour : 0;
+        $min  = ( $min  ) ? $min  : 0;
+        $sec  = ( $sec  ) ? $sec  : 0;
+        $this->trigger = array( 'params' => $params );
+        $this->trigger['value'] = array( 'year'  => $year
+                                        , 'month' => $month
+                                        , 'day'   => $day
+                                        , 'hour'  => $hour
+                                        , 'min'   => $min
+                                        , 'sec'   => $sec
+                                        , 'tz'    => 'Z' );
+        return TRUE;
     }
     elseif(( empty( $year ) && empty( $month )) &&    // duration
            (!empty( $week ) || !empty( $day ) || !empty( $hour ) || !empty( $min ) || !empty( $sec ))) {
-      unset( $params['RELATED'] ); // set at output creation (END only)
-      unset( $params['VALUE'] );   // 'DURATION' default
-      $this->trigger = array( 'params' => $params );
-      $relatedStart = ( FALSE !== $relatedStart ) ? TRUE : FALSE;
-      $before       = ( FALSE !== $before )       ? TRUE : FALSE;
-      $this->trigger['value']  = array( 'relatedStart' => $relatedStart
-                                      , 'before'       => $before );
-      if( !empty( $week )) $this->trigger['value']['week'] = $week;
-      if( !empty( $day  )) $this->trigger['value']['day']  = $day;
-      if( !empty( $hour )) $this->trigger['value']['hour'] = $hour;
-      if( !empty( $min  )) $this->trigger['value']['min']  = $min;
-      if( !empty( $sec  )) $this->trigger['value']['sec']  = $sec;
-      return TRUE;
+        unset( $params['RELATED'] ); // set at output creation (END only)
+        unset( $params['VALUE'] );   // 'DURATION' default
+        $this->trigger = array( 'params' => $params );
+        $relatedStart = ( FALSE !== $relatedStart ) ? TRUE : FALSE;
+        $before       = ( FALSE !== $before )       ? TRUE : FALSE;
+        $this->trigger['value']  = array( 'relatedStart' => $relatedStart
+                                        , 'before'       => $before );
+        if( !empty( $week )) $this->trigger['value']['week'] = $week;
+        if( !empty( $day  )) $this->trigger['value']['day']  = $day;
+        if( !empty( $hour )) $this->trigger['value']['hour'] = $hour;
+        if( !empty( $min  )) $this->trigger['value']['min']  = $min;
+        if( !empty( $sec  )) $this->trigger['value']['sec']  = $sec;
+        return TRUE;
     }
     return FALSE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: TZID
@@ -3651,27 +3650,27 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createTzid() {
+    function createTzid() {
     if( empty( $this->tzid )) return FALSE;
     if( empty( $this->tzid['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZID' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZID' ) : FALSE;
     $attributes = $this->_createParams( $this->tzid['params'] );
     return $this->_createElement( 'TZID', $attributes, $this->_strrep( $this->tzid['value'] ));
-  }
+    }
 /**
- * set calendar component property tzid
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param string $value
- * @param array $params optional
- * @return bool
- */
-  function setTzid( $value, $params=FALSE ) {
+     * set calendar component property tzid
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param string $value
+     * @param array $params optional
+     * @return bool
+     */
+    function setTzid( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->tzid = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * .. .
@@ -3684,33 +3683,33 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createTzname() {
+    function createTzname() {
     if( empty( $this->tzname )) return FALSE;
     $output = null;
     foreach( $this->tzname as $theName ) {
-      if( !empty( $theName['value'] )) {
+        if( !empty( $theName['value'] )) {
         $attributes = $this->_createParams( $theName['params'], array( 'LANGUAGE' ));
         $output    .= $this->_createElement( 'TZNAME', $attributes, $this->_strrep( $theName['value'] ));
-      }
-      elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'TZNAME' );
+        }
+        elseif( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( 'TZNAME' );
     }
     return $output;
-  }
+    }
 /**
- * set calendar component property tzname
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-05
- * @param string $value
- * @param string $params, optional
- * @param integer $index, optional
- * @return bool
- */
-  function setTzname( $value, $params=FALSE, $index=FALSE ) {
+     * set calendar component property tzname
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-05
+     * @param string $value
+     * @param string $params, optional
+     * @param integer $index, optional
+     * @return bool
+     */
+    function setTzname( $value, $params=FALSE, $index=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->_setMval( $this->tzname, $value, $params, FALSE, $index );
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: TZOFFSETFROM
@@ -3722,27 +3721,27 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createTzoffsetfrom() {
+    function createTzoffsetfrom() {
     if( empty( $this->tzoffsetfrom )) return FALSE;
     if( empty( $this->tzoffsetfrom['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZOFFSETFROM' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZOFFSETFROM' ) : FALSE;
     $attributes = $this->_createParams( $this->tzoffsetfrom['params'] );
     return $this->_createElement( 'TZOFFSETFROM', $attributes, $this->tzoffsetfrom['value'] );
-  }
+    }
 /**
- * set calendar component property tzoffsetfrom
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param string $value
- * @param string $params optional
- * @return bool
- */
-  function setTzoffsetfrom( $value, $params=FALSE ) {
+     * set calendar component property tzoffsetfrom
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param string $value
+     * @param string $params optional
+     * @return bool
+     */
+    function setTzoffsetfrom( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->tzoffsetfrom = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: TZOFFSETTO
@@ -3754,27 +3753,27 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createTzoffsetto() {
+    function createTzoffsetto() {
     if( empty( $this->tzoffsetto )) return FALSE;
     if( empty( $this->tzoffsetto['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZOFFSETTO' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZOFFSETTO' ) : FALSE;
     $attributes = $this->_createParams( $this->tzoffsetto['params'] );
     return $this->_createElement( 'TZOFFSETTO', $attributes, $this->tzoffsetto['value'] );
-  }
+    }
 /**
- * set calendar component property tzoffsetto
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param string $value
- * @param string $params optional
- * @return bool
- */
-  function setTzoffsetto( $value, $params=FALSE ) {
+     * set calendar component property tzoffsetto
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param string $value
+     * @param string $params optional
+     * @return bool
+     */
+    function setTzoffsetto( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->tzoffsetto = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: TZURL
@@ -3786,27 +3785,27 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createTzurl() {
+    function createTzurl() {
     if( empty( $this->tzurl )) return FALSE;
     if( empty( $this->tzurl['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZURL' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'TZURL' ) : FALSE;
     $attributes = $this->_createParams( $this->tzurl['params'] );
     return $this->_createElement( 'TZURL', $attributes, $this->tzurl['value'] );
-  }
+    }
 /**
- * set calendar component property tzurl
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param string $value
- * @param string $params optional
- * @return boll
- */
-  function setTzurl( $value, $params=FALSE ) {
+     * set calendar component property tzurl
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param string $value
+     * @param string $params optional
+     * @return boll
+     */
+    function setTzurl( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->tzurl = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: UID
@@ -3818,20 +3817,20 @@ 
  * @since 0.9.7 - 2006-11-20
  * @return string
  */
-  function createUid() {
+    function createUid() {
     if( 0 >= count( $this->uid ))
-      $this->_makeuid();
+        $this->_makeuid();
     $attributes = $this->_createParams( $this->uid['params'] );
     return $this->_createElement( 'UID', $attributes, $this->uid['value'] );
-  }
+    }
 /**
- * create an unique id for this calendar component object instance
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.2.7 - 2007-09-04
- * @return void
- */
-  function _makeUid() {
+     * create an unique id for this calendar component object instance
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.2.7 - 2007-09-04
+     * @return void
+     */
+    function _makeUid() {
     $date   = date('Ymd\THisT');
     $unique = substr(microtime(), 2, 4);
     $base   = 'aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPrRsStTuUvVxXuUvVwWzZ1234567890';
@@ -3840,24 +3839,24 @@ 
     $length = 6;
     $str    = null;
     for( $p = 0; $p < $length; $p++ )
-      $unique .= $base{mt_rand( $start, $end )};
+        $unique .= $base{mt_rand( $start, $end )};
     $this->uid = array( 'params' => null );
     $this->uid['value']  = $date.'-'.$unique.'@'.$this->getConfig( 'unique_id' );
-  }
+    }
 /**
- * set calendar component property uid
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param string $value
- * @param string $params optional
- * @return bool
- */
-  function setUid( $value, $params=FALSE ) {
+     * set calendar component property uid
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param string $value
+     * @param string $params optional
+     * @return bool
+     */
+    function setUid( $value, $params=FALSE ) {
     if( empty( $value )) return FALSE; // no allowEmpty check here !!!!
     $this->uid = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: URL
@@ -3869,27 +3868,27 @@ 
  * @since 2.4.8 - 2008-10-21
  * @return string
  */
-  function createUrl() {
+    function createUrl() {
     if( empty( $this->url )) return FALSE;
     if( empty( $this->url['value'] ))
-      return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'URL' ) : FALSE;
+        return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'URL' ) : FALSE;
     $attributes = $this->_createParams( $this->url['params'] );
     return $this->_createElement( 'URL', $attributes, $this->url['value'] );
-  }
+    }
 /**
- * set calendar component property url
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-11-04
- * @param string $value
- * @param string $params optional
- * @return bool
- */
-  function setUrl( $value, $params=FALSE ) {
+     * set calendar component property url
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-11-04
+     * @param string $value
+     * @param string $params optional
+     * @return bool
+     */
+    function setUrl( $value, $params=FALSE ) {
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $this->url = array( 'value' => $value, 'params' => $this->_setParams( $params ));
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /**
  * Property Name: x-prop
@@ -3901,37 +3900,37 @@ 
  * @since 2.4.11 - 2008-10-22
  * @return string
  */
-  function createXprop() {
+    function createXprop() {
     if( empty( $this->xprop )) return FALSE;
     $output = null;
     foreach( $this->xprop as $label => $xpropPart ) {
-      if( empty( $xpropPart['value'] )) {
+        if( empty( $xpropPart['value'] )) {
         if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( $label );
         continue;
-      }
-      $attributes = $this->_createParams( $xpropPart['params'], array( 'LANGUAGE' ));
-      if( is_array( $xpropPart['value'] )) {
+        }
+        $attributes = $this->_createParams( $xpropPart['params'], array( 'LANGUAGE' ));
+        if( is_array( $xpropPart['value'] )) {
         foreach( $xpropPart['value'] as $pix => $theXpart )
-          $xpropPart['value'][$pix] = $this->_strrep( $theXpart );
+            $xpropPart['value'][$pix] = $this->_strrep( $theXpart );
         $xpropPart['value']  = implode( ',', $xpropPart['value'] );
-      }
-      else
+        }
+        else
         $xpropPart['value'] = $this->_strrep( $xpropPart['value'] );
-      $output    .= $this->_createElement( $label, $attributes, $xpropPart['value'] );
+        $output    .= $this->_createElement( $label, $attributes, $xpropPart['value'] );
     }
     return $output;
-  }
+    }
 /**
- * set calendar component property x-prop
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
-	* @since 2.4.11 - 2008-11-04
- * @param string $label
- * @param mixed $value
- * @param array $params optional
- * @return bool
- */
-  function setXprop( $label, $value, $params=FALSE ) {
+     * set calendar component property x-prop
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.11 - 2008-11-04
+     * @param string $label
+     * @param mixed $value
+     * @param array $params optional
+     * @return bool
+     */
+    function setXprop( $label, $value, $params=FALSE ) {
     if( empty( $label )) return;
     if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
     $xprop           = array( 'value' => $value );
@@ -3940,7 +3939,7 @@ 
     if( !is_array( $this->xprop )) $this->xprop = array();
     $this->xprop[strtoupper( $label )] = $xprop;
     return TRUE;
-  }
+    }
 /*********************************************************************************/
 /*********************************************************************************/
 /**
@@ -3950,10 +3949,10 @@ 
  * @since 2.0.6 - 2006-06-20
  * @return string
  */
-  function _createFormat() {
+    function _createFormat() {
     $objectname                   = null;
     switch( $this->format ) {
-      case 'xcal':
+        case 'xcal':
         $objectname               = ( isset( $this->timezonetype )) ?
                                  strtolower( $this->timezonetype )  :  strtolower( $this->objName );
         $this->componentStart1    = $this->elementStart1 = '<';
@@ -3964,7 +3963,7 @@ 
         $this->attributeDelimiter = $this->nl;
         $this->valueInit          = null;
         break;
-      default:
+        default:
         $objectname               = ( isset( $this->timezonetype )) ?
                                  strtoupper( $this->timezonetype )  :  strtoupper( $this->objName );
         $this->componentStart1    = 'BEGIN:';
@@ -3981,232 +3980,232 @@ 
         break;
     }
     return $objectname;
-  }
+    }
 /**
- * creates formatted output for calendar component property
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-10-23
- * @param string $label property name
- * @param string $attributes property attributes
- * @param string $content property content (optional)
- * @return string
- */
-  function _createElement( $label, $attributes=null, $content=FALSE ) {
+     * creates formatted output for calendar component property
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-10-23
+     * @param string $label property name
+     * @param string $attributes property attributes
+     * @param string $content property content (optional)
+     * @return string
+     */
+    function _createElement( $label, $attributes=null, $content=FALSE ) {
     $label  = $this->_formatPropertyName( $label );
     $output = $this->elementStart1.$label;
     $categoriesAttrLang = null;
     $attachInlineBinary = FALSE;
     $attachfmttype      = null;
     if( !empty( $attributes ))  {
-      $attributes  = trim( $attributes );
-      if ( 'xcal' == $this->format) {
+        $attributes  = trim( $attributes );
+        if ( 'xcal' == $this->format) {
         $attributes2 = explode( $this->intAttrDelimiter, $attributes );
         $attributes  = null;
         foreach( $attributes2 as $attribute ) {
-          $attrKVarr = explode( '=', $attribute );
-          if( empty( $attrKVarr[0] ))
+            $attrKVarr = explode( '=', $attribute );
+            if( empty( $attrKVarr[0] ))
             continue;
-          if( !isset( $attrKVarr[1] )) {
+            if( !isset( $attrKVarr[1] )) {
             $attrValue = $attrKVarr[0];
             $attrKey   = null;
-          }
-          elseif( 2 == count( $attrKVarr)) {
+            }
+            elseif( 2 == count( $attrKVarr)) {
             $attrKey   = strtolower( $attrKVarr[0] );
             $attrValue = $attrKVarr[1];
-          }
-          else {
+            }
+            else {
             $attrKey   = strtolower( $attrKVarr[0] );
             unset( $attrKVarr[0] );
             $attrValue = implode( '=', $attrKVarr );
-          }
-          if(( 'attach' == $label ) && ( in_array( $attrKey, array( 'fmttype', 'encoding', 'value' )))) {
+            }
+            if(( 'attach' == $label ) && ( in_array( $attrKey, array( 'fmttype', 'encoding', 'value' )))) {
             $attachInlineBinary = TRUE;
             if( 'fmttype' == $attrKey )
-              $attachfmttype = $attrKey.'='.$attrValue;
+                $attachfmttype = $attrKey.'='.$attrValue;
             continue;
-          }
-          elseif(( 'categories' == $label ) && ( 'language' == $attrKey ))
+            }
+            elseif(( 'categories' == $label ) && ( 'language' == $attrKey ))
             $categoriesAttrLang = $attrKey.'='.$attrValue;
-          else {
+            else {
             $attributes .= ( empty( $attributes )) ? ' ' : $this->attributeDelimiter.' ';
             $attributes .= ( !empty( $attrKey )) ? $attrKey.'=' : null;
             if(( '"' == substr( $attrValue, 0, 1 )) && ( '"' == substr( $attrValue, -1 ))) {
-              $attrValue = substr( $attrValue, 1, ( strlen( $attrValue ) - 2 ));
-              $attrValue = str_replace( '"', '', $attrValue );
+                $attrValue = substr( $attrValue, 1, ( strlen( $attrValue ) - 2 ));
+                $attrValue = str_replace( '"', '', $attrValue );
             }
             $attributes .= '"'.htmlspecialchars( $attrValue ).'"';
-          }
+            }
         }
-      }
-      else {
+        }
+        else {
         $attributes = str_replace( $this->intAttrDelimiter, $this->attributeDelimiter, $attributes );
-      }
+        }
     }
     if(((( 'attach' == $label ) && !$attachInlineBinary ) ||
          ( in_array( $label, array( 'tzurl', 'url' ))))      && ( 'xcal' == $this->format)) {
-      $pos = strrpos($content, "/");
-      $docname = ( $pos !== false) ? substr( $content, (1 - strlen( $content ) + $pos )) : $content;
-      $this->xcaldecl[] = array( 'xmldecl'  => 'ENTITY'
-                               , 'uri'      => $docname
-                               , 'ref'      => 'SYSTEM'
-                               , 'external' => $content
-                               , 'type'     => 'NDATA'
-                               , 'type2'    => 'BINERY' );
-      $attributes .= ( empty( $attributes )) ? ' ' : $this->attributeDelimiter.' ';
-      $attributes .= 'uri="'.$docname.'"';
-      $content = null;
-      if( 'attach' == $label ) {
+        $pos = strrpos($content, "/");
+        $docname = ( $pos !== false) ? substr( $content, (1 - strlen( $content ) + $pos )) : $content;
+        $this->xcaldecl[] = array( 'xmldecl'  => 'ENTITY'
+                                , 'uri'      => $docname
+                                , 'ref'      => 'SYSTEM'
+                                , 'external' => $content
+                                , 'type'     => 'NDATA'
+                                , 'type2'    => 'BINERY' );
+        $attributes .= ( empty( $attributes )) ? ' ' : $this->attributeDelimiter.' ';
+        $attributes .= 'uri="'.$docname.'"';
+        $content = null;
+        if( 'attach' == $label ) {
         $attributes = str_replace( $this->attributeDelimiter, $this->intAttrDelimiter, $attributes );
         $content = $this->_createElement( 'extref', $attributes, null );
         $attributes = null;
-      }
+        }
     }
     elseif(( 'attach' == $label ) && $attachInlineBinary && ( 'xcal' == $this->format)) {
-      $content = $this->nl.$this->_createElement( 'b64bin', $attachfmttype, $content ); // max one attribute
+        $content = $this->nl.$this->_createElement( 'b64bin', $attachfmttype, $content ); // max one attribute
     }
     $output .= $attributes;
     if( !$content ) {
-      switch( $this->format ) {
+        switch( $this->format ) {
         case 'xcal':
           $output .= ' /';
-          $output .= $this->elementStart2;
-          return $output;
-          break;
+            $output .= $this->elementStart2;
+            return $output;
+            break;
         default:
           $output .= $this->elementStart2.$this->valueInit;
-          return $this->_size75( $output );
-          break;
-      }
+            return $this->_size75( $output );
+            break;
+        }
     }
     $output .= $this->elementStart2;
     $output .= $this->valueInit.$content;
     switch( $this->format ) {
-      case 'xcal':
+        case 'xcal':
         return $output.$this->elementEnd1.$label.$this->elementEnd2;
         break;
-      default:
+        default:
         return $this->_size75( $output );
         break;
     }
-  }
+    }
 /**
- * creates formatted output for calendar component property parameters
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 0.9.22 - 2007-04-10
- * @param array $params  optional
- * @param array $ctrKeys optional
- * @return string
- */
-  function _createParams( $params=array(), $ctrKeys=array() ) {
+     * creates formatted output for calendar component property parameters
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 0.9.22 - 2007-04-10
+     * @param array $params  optional
+     * @param array $ctrKeys optional
+     * @return string
+     */
+    function _createParams( $params=array(), $ctrKeys=array() ) {
     $attrLANG = $attr1 = $attr2 = null;
     $CNattrKey   = ( in_array( 'CN',       $ctrKeys )) ? TRUE : FALSE ;
     $LANGattrKey = ( in_array( 'LANGUAGE', $ctrKeys )) ? TRUE : FALSE ;
     $CNattrExist = $LANGattrExist = FALSE;
     if( is_array( $params )) {
-      foreach( $params as $paramKey => $paramValue ) {
+        foreach( $params as $paramKey => $paramValue ) {
         if( is_int( $paramKey ))
-          $attr2            .= $this->intAttrDelimiter.$paramValue;
+            $attr2            .= $this->intAttrDelimiter.$paramValue;
         elseif(( 'LANGUAGE' == $paramKey ) && $LANGattrKey ) {
-          $attrLANG         .= $this->intAttrDelimiter."LANGUAGE=$paramValue";
-          $LANGattrExist     = TRUE;
+            $attrLANG         .= $this->intAttrDelimiter."LANGUAGE=$paramValue";
+            $LANGattrExist     = TRUE;
         }
         elseif(( 'CN'       == $paramKey ) && $CNattrKey ) {
-          $attr1             = $this->intAttrDelimiter.'CN="'.$paramValue.'"';
-          $CNattrExist       = TRUE;
+            $attr1             = $this->intAttrDelimiter.'CN="'.$paramValue.'"';
+            $CNattrExist       = TRUE;
         }
         elseif(( 'ALTREP'   == $paramKey ) && in_array( $paramKey, $ctrKeys ))
-          $attr2            .= $this->intAttrDelimiter.'ALTREP="'.$paramValue.'"';
+            $attr2            .= $this->intAttrDelimiter.'ALTREP="'.$paramValue.'"';
         elseif(( 'DIR'      == $paramKey ) && in_array( $paramKey, $ctrKeys ))
-          $attr2            .= $this->intAttrDelimiter.'DIR="'.$paramValue.'"';
+            $attr2            .= $this->intAttrDelimiter.'DIR="'.$paramValue.'"';
         elseif(( 'SENT-BY'  == $paramKey ) && in_array( $paramKey, $ctrKeys ))
-          $attr2            .= $this->intAttrDelimiter.'SENT-BY="MAILTO:'.$paramValue.'"';
+            $attr2            .= $this->intAttrDelimiter.'SENT-BY="MAILTO:'.$paramValue.'"';
         else
-          $attr2            .= $this->intAttrDelimiter."$paramKey=$paramValue";
-      }
+            $attr2            .= $this->intAttrDelimiter."$paramKey=$paramValue";
+        }
     }
     if( !$LANGattrExist ) {
-      $lang = $this->getConfig( 'language' );
-      if(( $CNattrExist || $LANGattrKey ) && $lang )
+        $lang = $this->getConfig( 'language' );
+        if(( $CNattrExist || $LANGattrKey ) && $lang )
         $attrLANG .= $this->intAttrDelimiter.'LANGUAGE='.$lang;
     }
     return $attrLANG.$attr1.$attr2;
-  }
+    }
 /**
- * check a date(-time) for an opt. timezone and if it is a DATE-TIME or DATE
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.16 - 2008-10-25
- * @param array $date, date to check
- * @param int $parno, no of date parts (i.e. year, month.. .)
- * @return array $params, property parameters
- */
-  function _chkdatecfg( $theDate, & $parno, & $params ) {
+     * check a date(-time) for an opt. timezone and if it is a DATE-TIME or DATE
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.16 - 2008-10-25
+     * @param array $date, date to check
+     * @param int $parno, no of date parts (i.e. year, month.. .)
+     * @return array $params, property parameters
+     */
+    function _chkdatecfg( $theDate, & $parno, & $params ) {
     if( isset( $params['TZID'] ))
-      $parno = 6;
+        $parno = 6;
     elseif( isset( $params['VALUE'] ) && ( 'DATE' == $params['VALUE'] ))
-      $parno = 3;
+        $parno = 3;
     else {
-      if( isset( $params['VALUE'] ) && ( 'PERIOD' == $params['VALUE'] ))
+        if( isset( $params['VALUE'] ) && ( 'PERIOD' == $params['VALUE'] ))
         $parno = 7;
-      if( is_array( $theDate )) {
+        if( is_array( $theDate )) {
         if( isset( $theDate['timestamp'] ))
-          $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : null;
+            $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : null;
         else
-          $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : ( 7 == count( $theDate )) ? end( $theDate ) : null;
+            $tzid = ( isset( $theDate['tz'] )) ? $theDate['tz'] : ( 7 == count( $theDate )) ? end( $theDate ) : null;
         if( !empty( $tzid )) {
-          $parno = 7;
-          if( !$this->_isOffset( $tzid ))
+            $parno = 7;
+            if( !$this->_isOffset( $tzid ))
             $params['TZID'] = $tzid; // save only timezone
         }
         elseif( !$parno && ( 3 == count( $theDate )) && 
           ( isset( $params['VALUE'] ) && ( 'DATE' == $params['VALUE'] )))
-          $parno = 3;
+            $parno = 3;
         else
-          $parno = 6;
-      }
-      else { // string
+            $parno = 6;
+        }
+        else { // string
         $date = trim( $theDate );
         if( 'Z' == substr( $date, -1 ))
-          $parno = 7; // UTC DATE-TIME
+            $parno = 7; // UTC DATE-TIME
         elseif((( 8 == strlen( $date ) && ctype_digit( $date )) || ( 11 >= strlen( $date ))) && 
           ( !isset( $params['VALUE'] ) || !in_array( $params['VALUE'], array( 'DATE-TIME', 'PERIOD' ))))
-          $parno = 3; // DATE
+            $parno = 3; // DATE
         $date = $this->_date_time_string( $date, $parno );
         if( !empty( $date['tz'] )) {
-          $parno = 7;
-          if( !$this->_isOffset( $date['tz'] ))
+            $parno = 7;
+            if( !$this->_isOffset( $date['tz'] ))
             $params['TZID'] = $date['tz']; // save only timezone
         }
         elseif( empty( $parno ))
-          $parno = 6;
-      }
-      if( isset( $params['TZID'] ))
+            $parno = 6;
+        }
+        if( isset( $params['TZID'] ))
         $parno = 6;
     }
-  }
+    }
 /**
- * convert local startdate/enddate (Ymd[His]) to duration
- *
- * uses this component dates if missing input dates
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.2.11 - 2007-11-03
- * @param array $startdate, optional
- * @param array $duration, optional
- * @return array duration
- */
-  function _date2duration( $startdate=FALSE, $enddate=FALSE ) {
+     * convert local startdate/enddate (Ymd[His]) to duration
+     *
+     * uses this component dates if missing input dates
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.2.11 - 2007-11-03
+     * @param array $startdate, optional
+     * @param array $duration, optional
+     * @return array duration
+     */
+    function _date2duration( $startdate=FALSE, $enddate=FALSE ) {
     if( !$startdate || !$enddate ) {
-      if(   FALSE === ( $startdate = $this->getProperty( 'dtstart' )))
+        if(   FALSE === ( $startdate = $this->getProperty( 'dtstart' )))
         return null;
-      if(   FALSE === ( $enddate   = $this->getProperty( 'dtend' )))    // vevent/vfreebusy
+        if(   FALSE === ( $enddate   = $this->getProperty( 'dtend' )))    // vevent/vfreebusy
         if( FALSE === ( $enddate   = $this->getProperty( 'due' )))      // vtodo
-          return null;
+            return null;
     }
     if( !$startdate || !$enddate )
-      return null;
+        return null;
     $startWdate  = mktime( 0, 0, 0, $startdate['month'], $startdate['day'], $startdate['year'] );
     $endWdate    = mktime( 0, 0, 0, $enddate['month'],   $enddate['day'],   $enddate['year'] );
     $wduration   = $endWdate - $startWdate;
@@ -4220,137 +4219,137 @@ 
     $dur['min']  = (int) floor( $wduration / ( 60 ));
     $dur['sec']  = (int)        $wduration % ( 60 );
     return $dur;
-  }
+    }
 /**
- * convert date/datetime to timestamp
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-10-30
- * @param array  $datetime  datetime/(date)
- * @param string $tz        timezone
- * @return timestamp
- */
-  function _date2timestamp( $datetime, $tz=null ) {
+     * convert date/datetime to timestamp
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-10-30
+     * @param array  $datetime  datetime/(date)
+     * @param string $tz        timezone
+     * @return timestamp
+     */
+    function _date2timestamp( $datetime, $tz=null ) {
     $output = null;
     if( !isset( $datetime['hour'] )) $datetime['hour'] = '0';
     if( !isset( $datetime['min'] ))  $datetime['min']  = '0';
     if( !isset( $datetime['sec'] ))  $datetime['sec']  = '0';
     foreach( $datetime as $dkey => $dvalue ) {
-      if( 'tz' != $dkey )
+        if( 'tz' != $dkey )
         $datetime[$dkey] = (integer) $dvalue;
     }
     if( $tz )
-      $datetime['tz'] = $tz;
+        $datetime['tz'] = $tz;
     $offset = ( isset( $datetime['tz'] ) && ( '' < trim ( $datetime['tz'] ))) ? $this->_tz2offset( $datetime['tz'] ) : 0;
     $output = mktime( $datetime['hour'], $datetime['min'], ($datetime['sec'] + $offset), $datetime['month'], $datetime['day'], $datetime['year'] );
     return $output;
-  }
+    }
 /**
- * ensures internal date-time/date format for input date-time/date in array format
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 0.3.0 - 2006-08-15
- * @param array $datetime
- * @param int $parno optional, default FALSE
- * @return array
- */
-  function _date_time_array( $datetime, $parno=FALSE ) {
+     * ensures internal date-time/date format for input date-time/date in array format
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 0.3.0 - 2006-08-15
+     * @param array $datetime
+     * @param int $parno optional, default FALSE
+     * @return array
+     */
+    function _date_time_array( $datetime, $parno=FALSE ) {
     $output = array();
     foreach( $datetime as $dateKey => $datePart ) {
-      switch ( $dateKey ) {
+        switch ( $dateKey ) {
         case '0': case 'year':   $output['year']  = $datePart; break;
         case '1': case 'month':  $output['month'] = $datePart; break;
         case '2': case 'day':    $output['day']   = $datePart; break;
-      }
-      if( 3 != $parno ) {
+        }
+        if( 3 != $parno ) {
         switch ( $dateKey ) {
-          case '0':
+            case '0':
           case '1':
           case '2': break;
-          case '3': case 'hour': $output['hour']  = $datePart; break;
-          case '4': case 'min' : $output['min']   = $datePart; break;
-          case '5': case 'sec' : $output['sec']   = $datePart; break;
-          case '6': case 'tz'  : $output['tz']    = $datePart; break;
+            case '3': case 'hour': $output['hour']  = $datePart; break;
+            case '4': case 'min' : $output['min']   = $datePart; break;
+            case '5': case 'sec' : $output['sec']   = $datePart; break;
+            case '6': case 'tz'  : $output['tz']    = $datePart; break;
+        }
         }
-      }
     }
     if( 3 != $parno ) {
-      if( !isset( $output['hour'] ))
+        if( !isset( $output['hour'] ))
         $output['hour'] = 0;
-      if( !isset( $output['min']  ))
+        if( !isset( $output['min']  ))
         $output['min'] = 0;
-      if( !isset( $output['sec']  ))
+        if( !isset( $output['sec']  ))
         $output['sec'] = 0;
     }
     return $output;
-  }
+    }
 /**
- * ensures internal date-time/date format for input date-time/date in string fromat
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.2.10 - 2007-10-19
- * @param array $datetime
- * @param int $parno optional, default FALSE
- * @return array
- */
-  function _date_time_string( $datetime, $parno=FALSE ) {
+     * ensures internal date-time/date format for input date-time/date in string fromat
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.2.10 - 2007-10-19
+     * @param array $datetime
+     * @param int $parno optional, default FALSE
+     * @return array
+     */
+    function _date_time_string( $datetime, $parno=FALSE ) {
     $datetime = (string) trim( $datetime );
     $tz  = null;
     $len = strlen( $datetime ) - 1;
     if( 'Z' == substr( $datetime, -1 )) {
-      $tz = 'Z';
-      $datetime = trim( substr( $datetime, 0, $len ));
+        $tz = 'Z';
+        $datetime = trim( substr( $datetime, 0, $len ));
     }
     elseif( ( ctype_digit( substr( $datetime, -2, 2 ))) && // time or date
                   ( '-' == substr( $datetime, -3, 1 )) ||
                   ( ':' == substr( $datetime, -3, 1 )) ||
                   ( '.' == substr( $datetime, -3, 1 ))) {
-      $continue = TRUE;
+        $continue = TRUE;
     }
     elseif( ( ctype_digit( substr( $datetime, -4, 4 ))) && // 4 pos offset
             ( ' +' == substr( $datetime, -6, 2 )) ||
             ( ' -' == substr( $datetime, -6, 2 ))) {
-      $tz = substr( $datetime, -5, 5 );
-      $datetime = substr( $datetime, 0, ($len - 5));
+        $tz = substr( $datetime, -5, 5 );
+        $datetime = substr( $datetime, 0, ($len - 5));
     }
     elseif( ( ctype_digit( substr( $datetime, -6, 6 ))) && // 6 pos offset
             ( ' +' == substr( $datetime, -8, 2 )) ||
             ( ' -' == substr( $datetime, -8, 2 ))) {
-      $tz = substr( $datetime, -7, 7 );
-      $datetime = substr( $datetime, 0, ($len - 7));
+        $tz = substr( $datetime, -7, 7 );
+        $datetime = substr( $datetime, 0, ($len - 7));
     }
     elseif( ( 6 < $len ) && ( ctype_digit( substr( $datetime, -6, 6 )))) {
-      $continue = TRUE;
+        $continue = TRUE;
     }
     elseif( 'T' ==  substr( $datetime, -7, 1 )) {
-      $continue = TRUE;
+        $continue = TRUE;
     }
     else {
-      $cx  = $tx = 0;    //  19970415T133000 US-Eastern
-      for( $cx = -1; $cx > ( 9 - $len ); $cx-- ) {
+        $cx  = $tx = 0;    //  19970415T133000 US-Eastern
+        for( $cx = -1; $cx > ( 9 - $len ); $cx-- ) {
         if(( ' ' == substr( $datetime, $cx, 1 )) || ctype_digit( substr( $datetime, $cx, 1 )))
-          break; // if exists, tz ends here.. . ?
+            break; // if exists, tz ends here.. . ?
         elseif( ctype_alpha( substr( $datetime, $cx, 1 )) ||
              ( in_array( substr( $datetime, $cx, 1 ), array( '-', '/' ))))
-          $tx--; // tz length counter
-      }
-      if( 0 > $tx ) {
+            $tx--; // tz length counter
+        }
+        if( 0 > $tx ) {
         $tz = substr( $datetime, $tx );
         $datetime = trim( substr( $datetime, 0, $len + $tx + 1 ));
-      }
+        }
     }
     if( 0 < substr_count( $datetime, '-' )) {
-      $datetime = str_replace( '-', '/', $datetime );
+        $datetime = str_replace( '-', '/', $datetime );
     }
     elseif( ctype_digit( substr( $datetime, 0, 8 )) &&
            ( 'T' ==      substr( $datetime, 8, 1 )) &&
             ctype_digit( substr( $datetime, 9, 6 ))) {
-      $datetime = substr( $datetime,  4, 2 )
-             .'/'.substr( $datetime,  6, 2 )
-             .'/'.substr( $datetime,  0, 4 )
-             .' '.substr( $datetime,  9, 2 )
-             .':'.substr( $datetime, 11, 2 )
-             .':'.substr( $datetime, 13);
+        $datetime = substr( $datetime,  4, 2 )
+                .'/'.substr( $datetime,  6, 2 )
+                .'/'.substr( $datetime,  0, 4 )
+                .' '.substr( $datetime,  9, 2 )
+                .':'.substr( $datetime, 11, 2 )
+                .':'.substr( $datetime, 13);
     }
     $datestring = date( 'Y-m-d H:i:s', strtotime( $datetime ));
     $tz                = trim( $tz );
@@ -4359,112 +4358,112 @@ 
     $output['month']   = substr( $datestring, 5, 2 );
     $output['day']     = substr( $datestring, 8, 2 );
     if(( 6 == $parno ) || ( 7 == $parno )) {
-      $output['hour']  = substr( $datestring, 11, 2 );
-      $output['min']   = substr( $datestring, 14, 2 );
-      $output['sec']   = substr( $datestring, 17, 2 );
-      if( !empty( $tz ))
+        $output['hour']  = substr( $datestring, 11, 2 );
+        $output['min']   = substr( $datestring, 14, 2 );
+        $output['sec']   = substr( $datestring, 17, 2 );
+        if( !empty( $tz ))
         $output['tz']  = $tz;
     }
     elseif( 3 != $parno ) {
-      if(( '00' < substr( $datestring, 11, 2 )) ||
+        if(( '00' < substr( $datestring, 11, 2 )) ||
          ( '00' < substr( $datestring, 14, 2 )) ||
          ( '00' < substr( $datestring, 17, 2 ))) {
         $output['hour']  = substr( $datestring, 11, 2 );
         $output['min']   = substr( $datestring, 14, 2 );
         $output['sec']   = substr( $datestring, 17, 2 );
-      }
-      if( !empty( $tz ))
+        }
+        if( !empty( $tz ))
         $output['tz']  = $tz;
     }
     return $output;
-  }
+    }
 /**
- * ensures internal duration format for input in array format
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.1.1 - 2007-06-24
- * @param array $duration
- * @return array
- */
-  function _duration_array( $duration ) {
+     * ensures internal duration format for input in array format
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.1.1 - 2007-06-24
+     * @param array $duration
+     * @return array
+     */
+    function _duration_array( $duration ) {
     $output = array();
     if(    is_array( $duration )        &&
        ( 1 == count( $duration ))       &&
               isset( $duration['sec'] ) &&
               ( 60 < $duration['sec'] )) {
-      $durseconds  = $duration['sec'];
-      $output['week'] = floor( $durseconds / ( 60 * 60 * 24 * 7 ));
-      $durseconds  =           $durseconds % ( 60 * 60 * 24 * 7 );
-      $output['day']  = floor( $durseconds / ( 60 * 60 * 24 ));
-      $durseconds  =           $durseconds % ( 60 * 60 * 24 );
-      $output['hour'] = floor( $durseconds / ( 60 * 60 ));
-      $durseconds  =           $durseconds % ( 60 * 60 );
-      $output['min']  = floor( $durseconds / ( 60 ));
-      $output['sec']  =      ( $durseconds % ( 60 ));
+        $durseconds  = $duration['sec'];
+        $output['week'] = floor( $durseconds / ( 60 * 60 * 24 * 7 ));
+        $durseconds  =           $durseconds % ( 60 * 60 * 24 * 7 );
+        $output['day']  = floor( $durseconds / ( 60 * 60 * 24 ));
+        $durseconds  =           $durseconds % ( 60 * 60 * 24 );
+        $output['hour'] = floor( $durseconds / ( 60 * 60 ));
+        $durseconds  =           $durseconds % ( 60 * 60 );
+        $output['min']  = floor( $durseconds / ( 60 ));
+        $output['sec']  =      ( $durseconds % ( 60 ));
     }
     else {
-      foreach( $duration as $durKey => $durValue ) {
+        foreach( $duration as $durKey => $durValue ) {
         if( empty( $durValue )) continue;
         switch ( $durKey ) {
-          case '0': case 'week': $output['week']  = $durValue; break;
-          case '1': case 'day':  $output['day']   = $durValue; break;
-          case '2': case 'hour': $output['hour']  = $durValue; break;
-          case '3': case 'min':  $output['min']   = $durValue; break;
-          case '4': case 'sec':  $output['sec']   = $durValue; break;
+            case '0': case 'week': $output['week']  = $durValue; break;
+            case '1': case 'day':  $output['day']   = $durValue; break;
+            case '2': case 'hour': $output['hour']  = $durValue; break;
+            case '3': case 'min':  $output['min']   = $durValue; break;
+            case '4': case 'sec':  $output['sec']   = $durValue; break;
+        }
         }
-      }
     }
     if( isset( $output['week'] ) && ( 0 < $output['week'] )) {
-      unset( $output['day'], $output['hour'], $output['min'], $output['sec'] );
-      return $output;
+        unset( $output['day'], $output['hour'], $output['min'], $output['sec'] );
+        return $output;
     }
     unset( $output['week'] );
     if( empty( $output['day'] ))
-      unset( $output['day'] );
+        unset( $output['day'] );
     if ( isset( $output['hour'] ) || isset( $output['min'] ) || isset( $output['sec'] )) {
-      if( !isset( $output['hour'] )) $output['hour'] = 0;
-      if( !isset( $output['min']  )) $output['min']  = 0;
-      if( !isset( $output['sec']  )) $output['sec']  = 0;
-      if(( 0 == $output['hour'] ) && ( 0 == $output['min'] ) && ( 0 == $output['sec'] ))
+        if( !isset( $output['hour'] )) $output['hour'] = 0;
+        if( !isset( $output['min']  )) $output['min']  = 0;
+        if( !isset( $output['sec']  )) $output['sec']  = 0;
+        if(( 0 == $output['hour'] ) && ( 0 == $output['min'] ) && ( 0 == $output['sec'] ))
         unset( $output['hour'], $output['min'], $output['sec'] );
     }
     return $output;
-  }
+    }
 /**
- * convert duration to date in array format based on input or dtstart value
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-10-30
- * @param array $startdate, optional
- * @param array $duration, optional
- * @return array, date format
- */
-  function duration2date( $startdate=FALSE, $duration=FALSE ) {
+     * convert duration to date in array format based on input or dtstart value
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-10-30
+     * @param array $startdate, optional
+     * @param array $duration, optional
+     * @return array, date format
+     */
+    function duration2date( $startdate=FALSE, $duration=FALSE ) {
     if( $startdate && $duration ) {
-      $d1               = $startdate;
-      $dur              = $duration;
+        $d1               = $startdate;
+        $dur              = $duration;
     }
     elseif( isset( $this->dtstart['value'] ) && isset( $this->duration['value'] )) {
-      $d1               = $this->dtstart['value'];
-      $dur              = $this->duration['value'];
+        $d1               = $this->dtstart['value'];
+        $dur              = $this->duration['value'];
     }
     else
-      return null;
+        return null;
     $dateOnly         = ( isset( $d1['hour'] ) || isset( $d1['min'] ) || isset( $d1['sec'] )) ? FALSE : TRUE;
     $d1['hour']       = ( isset( $d1['hour'] )) ? $d1['hour'] : 0;
     $d1['min']        = ( isset( $d1['min'] ))  ? $d1['min']  : 0;
     $d1['sec']        = ( isset( $d1['sec'] ))  ? $d1['sec']  : 0;
     $dtend = mktime( $d1['hour'], $d1['min'], $d1['sec'], $d1['month'], $d1['day'], $d1['year'] );
     if( isset( $dur['week'] ))
-      $dtend += ( $dur['week'] * 7 * 24 * 60 * 60 );
+        $dtend += ( $dur['week'] * 7 * 24 * 60 * 60 );
     if( isset( $dur['day'] ))
-      $dtend += ( $dur['day'] * 24 * 60 * 60 );
+        $dtend += ( $dur['day'] * 24 * 60 * 60 );
     if( isset( $dur['hour'] ))
-      $dtend += ( $dur['hour'] * 60 *60 );
+        $dtend += ( $dur['hour'] * 60 *60 );
     if( isset( $dur['min'] ))
-      $dtend += ( $dur['min'] * 60 );
+        $dtend += ( $dur['min'] * 60 );
     if( isset( $dur['sec'] ))
-      $dtend +=   $dur['sec'];
+        $dtend +=   $dur['sec'];
     $dtend2 = array();
     $dtend2['year']   = date('Y', $dtend );
     $dtend2['month']  = date('m', $dtend );
@@ -4473,112 +4472,112 @@ 
     $dtend2['min']    = date('i', $dtend );
     $dtend2['sec']    = date('s', $dtend );
     if( isset( $d1['tz'] ))
-      $dtend2['tz']   = $d1['tz'];
+        $dtend2['tz']   = $d1['tz'];
     if( $dateOnly && (( 0 == $dtend2['hour'] ) && ( 0 == $dtend2['min'] ) && ( 0 == $dtend2['sec'] )))
-      unset( $dtend2['hour'], $dtend2['min'], $dtend2['sec'] );
+        unset( $dtend2['hour'], $dtend2['min'], $dtend2['sec'] );
     return $dtend2;
-  }
+    }
 /**
- * ensures internal duration format for input in string format
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.0.5 - 2007-03-14
- * @param string $duration
- * @return array
- */
-  function _duration_string( $duration ) {
-   $duration = (string) trim( $duration );
-   while( 'P' != strtoupper( substr( $duration, 0, 1 ))) {
-     if( 0 < strlen( $duration ))
-       $duration = substr( $duration, 1 );
-     else
-       return false; // no leading P !?!?
-   }
-   $duration = substr( $duration, 1 ); // skip P
-   $duration = str_replace ( 't', 'T', $duration );
-   $duration = str_replace ( 'T', '', $duration );
-   $output = array();
-   $val    = null;
-   for( $ix=0; $ix < strlen( $duration ); $ix++ ) {
-     switch( strtoupper( $duration{$ix} )) {
-      case 'W':
+     * ensures internal duration format for input in string format
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.0.5 - 2007-03-14
+     * @param string $duration
+     * @return array
+     */
+    function _duration_string( $duration ) {
+    $duration = (string) trim( $duration );
+    while( 'P' != strtoupper( substr( $duration, 0, 1 ))) {
+        if( 0 < strlen( $duration ))
+        $duration = substr( $duration, 1 );
+        else
+        return false; // no leading P !?!?
+    }
+    $duration = substr( $duration, 1 ); // skip P
+    $duration = str_replace ( 't', 'T', $duration );
+    $duration = str_replace ( 'T', '', $duration );
+    $output = array();
+    $val    = null;
+    for( $ix=0; $ix < strlen( $duration ); $ix++ ) {
+        switch( strtoupper( $duration{$ix} )) {
+        case 'W':
         $output['week'] = $val;
         $val            = null;
         break;
-      case 'D':
+        case 'D':
         $output['day']  = $val;
         $val            = null;
         break;
-      case 'H':
+        case 'H':
         $output['hour'] = $val;
         $val            = null;
         break;
-      case 'M':
+        case 'M':
         $output['min']  = $val;
         $val            = null;
         break;
-      case 'S':
+        case 'S':
         $output['sec']  = $val;
         $val            = null;
         break;
-      default:
+        default:
         if( !ctype_digit( $duration{$ix} ))
-          return false; // unknown duration controll character  !?!?
+            return false; // unknown duration controll character  !?!?
         else
-          $val .= $duration{$ix};
-     }
-   }
-   return $this->_duration_array( $output );
-  }
-/**
- * if not preSet, if exist, remove key with expected value from array and return hit value else return elseValue
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.16 - 2008-11-08
- * @param array $array
- * @param string $expkey, expected key
- * @param string $expval, expected value
- * @param int $hitVal optional, return value if found
- * @param int $elseVal optional, return value if not found
- * @param int $preSet optional, return value if already preset
- * @return int
- */
-  function _existRem( &$array, $expkey, $expval=FALSE, $hitVal=null, $elseVal=null, $preSet=null ) {
+            $val .= $duration{$ix};
+        }
+    }
+    return $this->_duration_array( $output );
+    }
+/**
+     * if not preSet, if exist, remove key with expected value from array and return hit value else return elseValue
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.16 - 2008-11-08
+     * @param array $array
+     * @param string $expkey, expected key
+     * @param string $expval, expected value
+     * @param int $hitVal optional, return value if found
+     * @param int $elseVal optional, return value if not found
+     * @param int $preSet optional, return value if already preset
+     * @return int
+     */
+    function _existRem( &$array, $expkey, $expval=FALSE, $hitVal=null, $elseVal=null, $preSet=null ) {
     if( $preSet )
-      return $preSet;
+        return $preSet;
     if( !is_array( $array ) || ( 0 == count( $array )))
-      return $elseVal;
+        return $elseVal;
     foreach( $array as $key => $value ) {
-      if( strtoupper( $expkey ) == strtoupper( $key )) {
+        if( strtoupper( $expkey ) == strtoupper( $key )) {
         if( !$expval || ( strtoupper( $expval ) == strtoupper( $array[$key] ))) {
-          unset( $array[$key] );
-          return $hitVal;
+            unset( $array[$key] );
+            return $hitVal;
+        }
         }
-      }
     }
     return $elseVal;
-  }
+    }
 /**
- * creates formatted output for calendar component property data value type date/date-time
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-10-30
- * @param array   $datetime
- * @param int     $parno, optional, default 6
- * @return string
- */
-  function _format_date_time( $datetime, $parno=6 ) {
+     * creates formatted output for calendar component property data value type date/date-time
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-10-30
+     * @param array   $datetime
+     * @param int     $parno, optional, default 6
+     * @return string
+     */
+    function _format_date_time( $datetime, $parno=6 ) {
     if( !isset( $datetime['year'] )  &&
         !isset( $datetime['month'] ) &&
         !isset( $datetime['day'] )   &&
         !isset( $datetime['hour'] )  &&
         !isset( $datetime['min'] )   &&
         !isset( $datetime['sec'] ))
-      return ;
+        return ;
     $output = null;
     // if( !isset( $datetime['day'] )) { $o=''; foreach($datetime as $k=>$v) {if(is_array($v)) $v=implode('-',$v);$o.=" $k=>$v";} echo " day SAKNAS : $o <br />\n"; }
     foreach( $datetime as $dkey => $dvalue ) {
-      if( 'tz' != $dkey )
+        if( 'tz' != $dkey )
         $datetime[$dkey] = (integer) $dvalue;
     }
     $output = date('Ymd', mktime( 0, 0, 0, $datetime['month'], $datetime['day'], $datetime['year']));
@@ -4586,101 +4585,101 @@ 
         isset( $datetime['min'] )   ||
         isset( $datetime['sec'] )   ||
         isset( $datetime['tz'] )) {
-      if( isset( $datetime['tz'] )  &&
+        if( isset( $datetime['tz'] )  &&
          !isset( $datetime['hour'] ))
         $datetime['hour'] = 0;
-      if( isset( $datetime['hour'] )  &&
+        if( isset( $datetime['hour'] )  &&
          !isset( $datetime['min'] ))
         $datetime['min'] = 0;
-      if( isset( $datetime['hour'] )  &&
+        if( isset( $datetime['hour'] )  &&
           isset( $datetime['min'] )   &&
          !isset( $datetime['sec'] ))
         $datetime['sec'] = 0;
-      $date = mktime( $datetime['hour'], $datetime['min'], $datetime['sec'], $datetime['month'], $datetime['day'], $datetime['year']);
-      $output .= date('\THis', $date );
-      if( isset( $datetime['tz'] ) && ( '' < trim ( $datetime['tz'] ))) {
+        $date = mktime( $datetime['hour'], $datetime['min'], $datetime['sec'], $datetime['month'], $datetime['day'], $datetime['year']);
+        $output .= date('\THis', $date );
+        if( isset( $datetime['tz'] ) && ( '' < trim ( $datetime['tz'] ))) {
         $datetime['tz'] = trim( $datetime['tz'] );
         if( 'Z' == $datetime['tz'] )
-          $output .= 'Z';
+            $output .= 'Z';
         $offset = $this->_tz2offset( $datetime['tz'] );
         if( 0 != $offset ) {
-          $date = mktime( $datetime['hour'], $datetime['min'], ($datetime['sec'] + $offset), $datetime['month'], $datetime['day'], $datetime['year']);
-          $output    = date( 'Ymd\THis\Z', $date );
+            $date = mktime( $datetime['hour'], $datetime['min'], ($datetime['sec'] + $offset), $datetime['month'], $datetime['day'], $datetime['year']);
+            $output    = date( 'Ymd\THis\Z', $date );
         }
-      }
-      elseif( 7 == $parno )
+        }
+        elseif( 7 == $parno )
         $output .= 'Z';
     }
     return $output;
-  }
+    }
 /**
- * creates formatted output for calendar component property data value type duration
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.16 - 2008-10-10
- * @param array $duration ( week, day, hour, min, sec )
- * @return string
- */
-  function _format_duration( $duration ) {
+     * creates formatted output for calendar component property data value type duration
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.16 - 2008-10-10
+     * @param array $duration ( week, day, hour, min, sec )
+     * @return string
+     */
+    function _format_duration( $duration ) {
     if( !isset( $duration['week'] ) &&
         !isset( $duration['day'] )  &&
         !isset( $duration['hour'] ) &&
         !isset( $duration['min'] )  &&
         !isset( $duration['sec'] ))
-      return;
+        return;
     $output = 'P';
     if( isset( $duration['week'] ) && ( 0 < $duration['week'] ))
-      $output   .= $duration['week'].'W';
+        $output   .= $duration['week'].'W';
     else {
-      if( isset($duration['day'] ) && ( 0 < $duration['day'] ))
+        if( isset($duration['day'] ) && ( 0 < $duration['day'] ))
         $output .= $duration['day'].'D';
-      if(( isset( $duration['hour']) && ( 0 < $duration['hour'] )) ||
+        if(( isset( $duration['hour']) && ( 0 < $duration['hour'] )) ||
          ( isset( $duration['min'])  && ( 0 < $duration['min'] ))  ||
          ( isset( $duration['sec'])  && ( 0 < $duration['sec'] ))) {
         $output .= 'T';
         $output .= ( isset( $duration['hour']) && ( 0 < $duration['hour'] )) ? $duration['hour'].'H' : '0H';
         $output .= ( isset( $duration['min'])  && ( 0 < $duration['min'] ))  ? $duration['min']. 'M' : '0M';
         $output .= ( isset( $duration['sec'])  && ( 0 < $duration['sec'] ))  ? $duration['sec']. 'S' : '0S';
-      }
+        }
     }
     return $output;
-  }
+    }
 /**
- * creates formatted output for calendar component property data value type recur
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-10-22
- * @param array $recurlabel
- * @param array $recurdata
- * @return string
- */
-  function _format_recur( $recurlabel, $recurdata ) {
+     * creates formatted output for calendar component property data value type recur
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-10-22
+     * @param array $recurlabel
+     * @param array $recurdata
+     * @return string
+     */
+    function _format_recur( $recurlabel, $recurdata ) {
     $output = null;
     foreach( $recurdata as $therule ) {
-      if( empty( $therule['value'] )) {
+        if( empty( $therule['value'] )) {
         if( $this->getConfig( 'allowEmpty' )) $output .= $this->_createElement( $recurlabel );
         continue;
-      }
-      $attributes = ( isset( $therule['params'] )) ? $this->_createParams( $therule['params'] ) : null;
-      $content1  = $content2  = null;
-      foreach( $therule['value'] as $rulelabel => $rulevalue ) {
+        }
+        $attributes = ( isset( $therule['params'] )) ? $this->_createParams( $therule['params'] ) : null;
+        $content1  = $content2  = null;
+        foreach( $therule['value'] as $rulelabel => $rulevalue ) {
         switch( $rulelabel ) {
-          case 'FREQ': {
+            case 'FREQ': {
             $content1 .= "FREQ=$rulevalue";
             break;
-          }
-          case 'UNTIL': {
+            }
+            case 'UNTIL': {
             $content2 .= ";UNTIL=";
             $content2 .= $this->_format_date_time( $rulevalue );
             break;
-          }
-          case 'COUNT':
+            }
+            case 'COUNT':
           case 'INTERVAL':
           case 'WKST': {
             $content2 .= ";$rulelabel=$rulevalue";
             break;
-          }
-          case 'BYSECOND':
+            }
+            case 'BYSECOND':
           case 'BYMINUTE':
           case 'BYHOUR':
           case 'BYMONTHDAY':
@@ -4690,144 +4689,144 @@ 
           case 'BYSETPOS': {
             $content2 .= ";$rulelabel=";
             if( is_array( $rulevalue )) {
-              foreach( $rulevalue as $vix => $valuePart ) {
+                foreach( $rulevalue as $vix => $valuePart ) {
                 $content2 .= ( $vix ) ? ',' : null;
                 $content2 .= $valuePart;
-              }
+                }
             }
             else
-             $content2 .= $rulevalue;
+                $content2 .= $rulevalue;
             break;
-          }
-          case 'BYDAY': {
+            }
+            case 'BYDAY': {
             $content2 .= ";$rulelabel=";
             $bydaycnt = 0;
             foreach( $rulevalue as $vix => $valuePart ) {
-              $content21 = $content22 = null;
-              if( is_array( $valuePart )) {
+                $content21 = $content22 = null;
+                if( is_array( $valuePart )) {
                 $content2 .= ( $bydaycnt ) ? ',' : null;
                 foreach( $valuePart as $vix2 => $valuePart2 ) {
-                  if( 'DAY' != strtoupper( $vix2 ))
-                      $content21 .= $valuePart2;
-                  else
+                    if( 'DAY' != strtoupper( $vix2 ))
+                        $content21 .= $valuePart2;
+                    else
                     $content22 .= $valuePart2;
                 }
                 $content2 .= $content21.$content22;
                 $bydaycnt++;
-              }
-              else {
+                }
+                else {
                 $content2 .= ( $bydaycnt ) ? ',' : null;
                 if( 'DAY' != strtoupper( $vix ))
                     $content21 .= $valuePart;
                 else {
-                  $content22 .= $valuePart;
-                  $bydaycnt++;
+                    $content22 .= $valuePart;
+                    $bydaycnt++;
                 }
                 $content2 .= $content21.$content22;
-              }
+                }
             }
             break;
-          }
-          default: {
+            }
+            default: {
             $content2 .= ";$rulelabel=$rulevalue";
             break;
-          }
+            }
         }
-      }
-      $output .= $this->_createElement( $recurlabel, $attributes, $content1.$content2 );
+        }
+        $output .= $this->_createElement( $recurlabel, $attributes, $content1.$content2 );
     }
     return $output;
-  }
+    }
 /**
- * create property name case - lower/upper
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 0.9.7 - 2006-11-20
- * @param string $propertyName
- * @return string
- */
-  function _formatPropertyName( $propertyName ) {
+     * create property name case - lower/upper
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 0.9.7 - 2006-11-20
+     * @param string $propertyName
+     * @return string
+     */
+    function _formatPropertyName( $propertyName ) {
     switch( $this->format ) {
-      case 'xcal':
+        case 'xcal':
         return strtolower( $propertyName );
         break;
-      default:
+        default:
         return strtoupper( $propertyName );
         break;
     }
-  }
+    }
 /**
- * checks if input array contains a date
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.16 - 2008-10-25
- * @param array $input
- * @return bool
- */
-  function _isArrayDate( $input ) {
+     * checks if input array contains a date
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.16 - 2008-10-25
+     * @param array $input
+     * @return bool
+     */
+    function _isArrayDate( $input ) {
     if( isset( $input['week'] ) || ( !in_array( count( $input ), array( 3, 6, 7 ))))
-      return FALSE;
+        return FALSE;
     if( 7 == count( $input ))
-      return TRUE;
+        return TRUE;
     if( isset( $input['year'] ) && isset( $input['month'] ) && isset( $input['day'] ))
-      return checkdate( (int) $input['month'], (int) $input['day'], (int) $input['year'] );
+        return checkdate( (int) $input['month'], (int) $input['day'], (int) $input['year'] );
     if( isset( $input['day'] ) || isset( $input['hour'] ) || isset( $input['min'] ) || isset( $input['sec'] ))
-      return FALSE;
+        return FALSE;
     if( in_array( 0, $input ))
-      return FALSE;
+        return FALSE;
     if(( 1970 > $input[0] ) || ( 12 < $input[1] ) || ( 31 < $input[2] ))
-      return FALSE;
+        return FALSE;
     if(( isset( $input[0] ) && isset( $input[1] ) && isset( $input[2] )) &&
          checkdate( (int) $input[1], (int) $input[2], (int) $input[0] ))
-      return TRUE;
+        return TRUE;
     $input = $this->_date_time_string( $input[1].'/'.$input[2].'/'.$input[0], 3 ); //  m - d - Y
     if( isset( $input['year'] ) && isset( $input['month'] ) && isset( $input['day'] ))
-      return checkdate( (int) $input['month'], (int) $input['day'], (int) $input['year'] );
+        return checkdate( (int) $input['month'], (int) $input['day'], (int) $input['year'] );
     return FALSE;
-  }
+    }
 /**
- * checks if input array contains a timestamp date
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.16 - 2008-10-18
- * @param array $input
- * @return bool
- */
-  function _isArrayTimestampDate( $input ) {
+     * checks if input array contains a timestamp date
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.16 - 2008-10-18
+     * @param array $input
+     * @return bool
+     */
+    function _isArrayTimestampDate( $input ) {
     return ( is_array( $input ) && isset( $input['timestamp'] )) ? TRUE : FALSE ;
-  }
+    }
 /**
- * controll if input string contains traling UTC offset
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.16 - 2008-10-19
- * @param string $input
- * @return bool
- */
-  function _isOffset( $input ) {
+     * controll if input string contains traling UTC offset
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.16 - 2008-10-19
+     * @param string $input
+     * @return bool
+     */
+    function _isOffset( $input ) {
     $input         = trim( (string) $input );
     if( 'Z' == substr( $input, -1 ))
-      return TRUE;
+        return TRUE;
     elseif((   5 <= strlen( $input )) &&
        ( in_array( substr( $input, -5, 1 ), array( '+', '-' ))) &&
        (   '0000'  < substr( $input, -4 )) && (   '9999' >= substr( $input, -4 )))
-      return TRUE;
+        return TRUE;
     elseif((    7 <= strlen( $input )) &&
        ( in_array( substr( $input, -7, 1 ), array( '+', '-' ))) &&
        ( '000000'  < substr( $input, -6 )) && ( '999999' >= substr( $input, -6 )))
-      return TRUE;
+        return TRUE;
     return FALSE;
 
-  }
+    }
 /**
- * check if property not exists within component
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-10-15
- * @param string $propName
- * @return bool
- */
-  function _notExistProp( $propName ) {
+     * check if property not exists within component
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-10-15
+     * @param string $propName
+     * @return bool
+     */
+    function _notExistProp( $propName ) {
     if( empty( $propName )) return FALSE; // when deleting x-prop, an empty propName may be used=allowed
     $propName = strtolower( $propName );
     if(     'last-modified'    == $propName )  { if( !isset( $this->lastmodified ))    return TRUE; }
@@ -4837,270 +4836,270 @@ 
     elseif( 'request-status'   == $propName )  { if( !isset( $this->requeststatus ))   return TRUE; }
     elseif((       'x-' != substr($propName,0,2)) && !isset( $this->$propName ))       return TRUE;
     return FALSE;
-  }
+    }
 /**
- * remakes a recur pattern to an array of dates
- *
- * if missing, UNTIL is set 1 year from startdate (emergency break)
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.16 - 2008-10-18
- * @param array $result, array to update, array([timestamp] => timestamp)
- * @param array $recur, pattern for recurrency (only value part, params ignored)
- * @param array $wdate, component start date
- * @param array $startdate, start date
- * @param array $enddate, optional
- * @return array of recurrence (start-)dates as index
- * @todo BYHOUR, BYMINUTE, BYSECOND, ev. BYSETPOS due to ambiguity, WEEKLY at year end/start
- */
-  function _recur2date( & $result, $recur, $wdate, $startdate, $enddate=FALSE ) {
+     * remakes a recur pattern to an array of dates
+     *
+     * if missing, UNTIL is set 1 year from startdate (emergency break)
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.16 - 2008-10-18
+     * @param array $result, array to update, array([timestamp] => timestamp)
+     * @param array $recur, pattern for recurrency (only value part, params ignored)
+     * @param array $wdate, component start date
+     * @param array $startdate, start date
+     * @param array $enddate, optional
+     * @return array of recurrence (start-)dates as index
+     * @todo BYHOUR, BYMINUTE, BYSECOND, ev. BYSETPOS due to ambiguity, WEEKLY at year end/start
+     */
+    function _recur2date( & $result, $recur, $wdate, $startdate, $enddate=FALSE ) {
     foreach( $wdate as $k => $v ) if( ctype_digit( $v )) $wdate[$k] = (int) $v;
     $wdatets     = $this->_date2timestamp( $wdate );
     $startdatets = $this->_date2timestamp( $startdate );
     if( !$enddate ) {
-      $enddate = $startdate;
-      $enddate['year'] += 1;
+        $enddate = $startdate;
+        $enddate['year'] += 1;
 // echo "recur __in_ ".implode('-',$startdate)." period start ".implode('-',$wdate)." period end ".implode('-',$enddate)."<br />\n";print_r($recur);echo "<br />\n";//test###
     }
     $endDatets = $this->_date2timestamp( $enddate ); // fix break
     if( !isset( $recur['COUNT'] ) && !isset( $recur['UNTIL'] ))
-      $recur['UNTIL'] = $enddate; // create break
+        $recur['UNTIL'] = $enddate; // create break
     if( isset( $recur['UNTIL'] )) {
-      $tdatets = $this->_date2timestamp( $recur['UNTIL'] );
-      if( $endDatets > $tdatets ) {
+        $tdatets = $this->_date2timestamp( $recur['UNTIL'] );
+        if( $endDatets > $tdatets ) {
         $endDatets = $tdatets; // emergency break
         $enddate   = $this->_timestamp2date( $endDatets, 6 );
-      }
-      else
+        }
+        else
         $recur['UNTIL'] = $this->_timestamp2date( $endDatets, 6 );
     }
     if( $wdatets > $endDatets ) {
-     //echo "recur out of date ".implode('-',$this->_date_time_string(date('Y-m-d H:i:s',$wdatets),6))."<br />\n";//test
-      return array(); // nothing to do.. .
+        //echo "recur out of date ".implode('-',$this->_date_time_string(date('Y-m-d H:i:s',$wdatets),6))."<br />\n";//test
+        return array(); // nothing to do.. .
     }
     if( !isset( $recur['FREQ'] )) // "MUST be specified.. ."
-      $recur['FREQ'] = 'DAILY'; // ??
+        $recur['FREQ'] = 'DAILY'; // ??
     $wkst = ( isset( $recur['WKST'] ) && ( 'SU' == $recur['WKST'] )) ? 24*60*60 : 0; // ??
     if( !isset( $recur['INTERVAL'] ))
-      $recur['INTERVAL'] = 1;
+        $recur['INTERVAL'] = 1;
     $countcnt = ( !isset( $recur['BYSETPOS'] )) ? 1 : 0; // DTSTART counts as the first occurrence
             /* find out how to step up dates and set index for interval count */
     $step = array();
     if( 'YEARLY' == $recur['FREQ'] )
-      $step['year']  = 1;
+        $step['year']  = 1;
     elseif( 'MONTHLY' == $recur['FREQ'] )
-      $step['month'] = 1;
+        $step['month'] = 1;
     elseif( 'WEEKLY' == $recur['FREQ'] )
-      $step['day']   = 7;
+        $step['day']   = 7;
     else
-      $step['day']   = 1;
+        $step['day']   = 1;
     if( isset( $step['year'] ) && isset( $recur['BYMONTH'] ))
-      $step = array( 'month' => 1 );
+        $step = array( 'month' => 1 );
     if( empty( $step ) && isset( $recur['BYWEEKNO'] )) // ??
-      $step = array( 'day' => 7 );
+        $step = array( 'day' => 7 );
     if( isset( $recur['BYYEARDAY'] ) || isset( $recur['BYMONTHDAY'] ) || isset( $recur['BYDAY'] ))
-      $step = array( 'day' => 1 );
+        $step = array( 'day' => 1 );
     $intervalarr = array();
     if( 1 < $recur['INTERVAL'] ) {
-      $intervalix = $this->_recurIntervalIx( $recur['FREQ'], $wdate, $wkst );
-      $intervalarr = array( $intervalix => 0 );
+        $intervalix = $this->_recurIntervalIx( $recur['FREQ'], $wdate, $wkst );
+        $intervalarr = array( $intervalix => 0 );
     }
     if( isset( $recur['BYSETPOS'] )) { // save start date + weekno
-      $bysetposymd1 = $bysetposymd2 = $bysetposw1 = $bysetposw2 = array();
-      $bysetposWold = (int) date( 'W', ( $wdatets + $wkst ));
-      $bysetposYold = $wdate['year'];
-      $bysetposMold = $wdate['month'];
-      $bysetposDold = $wdate['day'];
-      if( is_array( $recur['BYSETPOS'] )) {
+        $bysetposymd1 = $bysetposymd2 = $bysetposw1 = $bysetposw2 = array();
+        $bysetposWold = (int) date( 'W', ( $wdatets + $wkst ));
+        $bysetposYold = $wdate['year'];
+        $bysetposMold = $wdate['month'];
+        $bysetposDold = $wdate['day'];
+        if( is_array( $recur['BYSETPOS'] )) {
         foreach( $recur['BYSETPOS'] as $bix => $bval )
-          $recur['BYSETPOS'][$bix] = (int) $bval;
-      }
-      else
+            $recur['BYSETPOS'][$bix] = (int) $bval;
+        }
+        else
         $recur['BYSETPOS'] = array( (int) $recur['BYSETPOS'] );
-      $this->_stepdate( $enddate, $endDatets, $step); // make sure to count whole last period
+        $this->_stepdate( $enddate, $endDatets, $step); // make sure to count whole last period
     }
     $this->_stepdate( $wdate, $wdatets, $step);
     $year_old     = null;
     $daynames     = array( 'SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA' );
-             /* MAIN LOOP */
-     // echo "recur start ".implode('-',$wdate)." end ".implode('-',$enddate)."<br />\n";//test
+                /* MAIN LOOP */
+        // echo "recur start ".implode('-',$wdate)." end ".implode('-',$enddate)."<br />\n";//test
     while( TRUE ) {
-      if( isset( $endDatets ) && ( $wdatets > $endDatets ))
+        if( isset( $endDatets ) && ( $wdatets > $endDatets ))
         break;
-      if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] ))
+        if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] ))
         break;
-      if( $year_old != $wdate['year'] ) {
+        if( $year_old != $wdate['year'] ) {
         $year_old   = $wdate['year'];
         $daycnts    = array();
         $yeardays   = $weekno = 0;
         $yeardaycnt = array();
         for( $m = 1; $m <= 12; $m++ ) { // count up and update up-counters
-          $daycnts[$m] = array();
-          $weekdaycnt = array();
-          foreach( $daynames as $dn )
+            $daycnts[$m] = array();
+            $weekdaycnt = array();
+            foreach( $daynames as $dn )
             $yeardaycnt[$dn] = $weekdaycnt[$dn] = 0;
-          $mcnt     = date( 't', mktime( 0, 0, 0, $m, 1, $wdate['year'] ));
-          for( $d   = 1; $d <= $mcnt; $d++ ) {
+            $mcnt     = date( 't', mktime( 0, 0, 0, $m, 1, $wdate['year'] ));
+            for( $d   = 1; $d <= $mcnt; $d++ ) {
             $daycnts[$m][$d] = array();
             if( isset( $recur['BYYEARDAY'] )) {
-              $yeardays++;
-              $daycnts[$m][$d]['yearcnt_up'] = $yeardays;
+                $yeardays++;
+                $daycnts[$m][$d]['yearcnt_up'] = $yeardays;
             }
             if( isset( $recur['BYDAY'] )) {
-              $day    = date( 'w', mktime( 0, 0, 0, $m, $d, $wdate['year'] ));
-              $day    = $daynames[$day];
-              $daycnts[$m][$d]['DAY'] = $day;
-              $weekdaycnt[$day]++;
-              $daycnts[$m][$d]['monthdayno_up'] = $weekdaycnt[$day];
-              $yeardaycnt[$day]++;
-              $daycnts[$m][$d]['yeardayno_up'] = $yeardaycnt[$day];
+                $day    = date( 'w', mktime( 0, 0, 0, $m, $d, $wdate['year'] ));
+                $day    = $daynames[$day];
+                $daycnts[$m][$d]['DAY'] = $day;
+                $weekdaycnt[$day]++;
+                $daycnts[$m][$d]['monthdayno_up'] = $weekdaycnt[$day];
+                $yeardaycnt[$day]++;
+                $daycnts[$m][$d]['yeardayno_up'] = $yeardaycnt[$day];
             }
             if(  isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' ))
-              $daycnts[$m][$d]['weekno_up'] =(int)date('W',mktime(0,0,$wkst,$m,$d,$wdate['year']));
-          }
+                $daycnts[$m][$d]['weekno_up'] =(int)date('W',mktime(0,0,$wkst,$m,$d,$wdate['year']));
+            }
         }
         $daycnt = 0;
         $yeardaycnt = array();
         if(  isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' )) {
-          $weekno = null;
-          for( $d=31; $d > 25; $d-- ) { // get last weekno for year
+            $weekno = null;
+            for( $d=31; $d > 25; $d-- ) { // get last weekno for year
             if( !$weekno )
-              $weekno = $daycnts[12][$d]['weekno_up'];
+                $weekno = $daycnts[12][$d]['weekno_up'];
             elseif( $weekno < $daycnts[12][$d]['weekno_up'] ) {
-              $weekno = $daycnts[12][$d]['weekno_up'];
-              break;
+                $weekno = $daycnts[12][$d]['weekno_up'];
+                break;
+            }
             }
-          }
         }
         for( $m = 12; $m > 0; $m-- ) { // count down and update down-counters
-          $weekdaycnt = array();
-          foreach( $daynames as $dn )
+            $weekdaycnt = array();
+            foreach( $daynames as $dn )
             $yeardaycnt[$dn] = $weekdaycnt[$dn] = 0;
-          $monthcnt = 0;
-          $mcnt     = date( 't', mktime( 0, 0, 0, $m, 1, $wdate['year'] ));
-          for( $d   = $mcnt; $d > 0; $d-- ) {
+            $monthcnt = 0;
+            $mcnt     = date( 't', mktime( 0, 0, 0, $m, 1, $wdate['year'] ));
+            for( $d   = $mcnt; $d > 0; $d-- ) {
             if( isset( $recur['BYYEARDAY'] )) {
-              $daycnt -= 1;
-              $daycnts[$m][$d]['yearcnt_down'] = $daycnt;
+                $daycnt -= 1;
+                $daycnts[$m][$d]['yearcnt_down'] = $daycnt;
             }
             if( isset( $recur['BYMONTHDAY'] )) {
-              $monthcnt -= 1;
-              $daycnts[$m][$d]['monthcnt_down'] = $monthcnt;
+                $monthcnt -= 1;
+                $daycnts[$m][$d]['monthcnt_down'] = $monthcnt;
             }
             if( isset( $recur['BYDAY'] )) {
-              $day  = $daycnts[$m][$d]['DAY'];
-              $weekdaycnt[$day] -= 1;
-              $daycnts[$m][$d]['monthdayno_down'] = $weekdaycnt[$day];
-              $yeardaycnt[$day] -= 1;
-              $daycnts[$m][$d]['yeardayno_down'] = $yeardaycnt[$day];
+                $day  = $daycnts[$m][$d]['DAY'];
+                $weekdaycnt[$day] -= 1;
+                $daycnts[$m][$d]['monthdayno_down'] = $weekdaycnt[$day];
+                $yeardaycnt[$day] -= 1;
+                $daycnts[$m][$d]['yeardayno_down'] = $yeardaycnt[$day];
             }
             if(  isset( $recur['BYWEEKNO'] ) || ( $recur['FREQ'] == 'WEEKLY' ))
-              $daycnts[$m][$d]['weekno_down'] = ($daycnts[$m][$d]['weekno_up'] - $weekno - 1);
-          }
+                $daycnts[$m][$d]['weekno_down'] = ($daycnts[$m][$d]['weekno_up'] - $weekno - 1);
+            }
+        }
         }
-      }
             /* check interval */
-      if( 1 < $recur['INTERVAL'] ) {
+        if( 1 < $recur['INTERVAL'] ) {
             /* create interval index */
         $intervalix = $this->_recurIntervalIx( $recur['FREQ'], $wdate, $wkst );
             /* check interval */
         $currentKey = array_keys( $intervalarr );
         $currentKey = end( $currentKey ); // get last index
         if( $currentKey != $intervalix )
-          $intervalarr = array( $intervalix => ( $intervalarr[$currentKey] + 1 ));
+            $intervalarr = array( $intervalix => ( $intervalarr[$currentKey] + 1 ));
         if(( $recur['INTERVAL'] != $intervalarr[$intervalix] ) &&
            ( 0 != $intervalarr[$intervalix] )) {
             /* step up date */
     //echo "skip: ".implode('-',$wdate)." ix=$intervalix old=$currentKey interval=".$intervalarr[$intervalix]."<br />\n";//test
-          $this->_stepdate( $wdate, $wdatets, $step);
-          continue;
+            $this->_stepdate( $wdate, $wdatets, $step);
+            continue;
         }
         else // continue within the selected interval
-          $intervalarr[$intervalix] = 0;
-   //echo "cont: ".implode('-',$wdate)." ix=$intervalix old=$currentKey interval=".$intervalarr[$intervalix]."<br />\n";//test
-      }
-      $updateOK = TRUE;
-      if( $updateOK && isset( $recur['BYMONTH'] ))
+            $intervalarr[$intervalix] = 0;
+    //echo "cont: ".implode('-',$wdate)." ix=$intervalix old=$currentKey interval=".$intervalarr[$intervalix]."<br />\n";//test
+        }
+        $updateOK = TRUE;
+        if( $updateOK && isset( $recur['BYMONTH'] ))
         $updateOK = $this->_recurBYcntcheck( $recur['BYMONTH']
-                                           , $wdate['month']
-                                           ,($wdate['month'] - 13));
-      if( $updateOK && isset( $recur['BYWEEKNO'] ))
+                                            , $wdate['month']
+                                            ,($wdate['month'] - 13));
+        if( $updateOK && isset( $recur['BYWEEKNO'] ))
         $updateOK = $this->_recurBYcntcheck( $recur['BYWEEKNO']
-                                           , $daycnts[$wdate['month']][$wdate['day']]['weekno_up']
-                                           , $daycnts[$wdate['month']][$wdate['day']]['weekno_down'] );
-      if( $updateOK && isset( $recur['BYYEARDAY'] ))
+                                            , $daycnts[$wdate['month']][$wdate['day']]['weekno_up']
+                                            , $daycnts[$wdate['month']][$wdate['day']]['weekno_down'] );
+        if( $updateOK && isset( $recur['BYYEARDAY'] ))
         $updateOK = $this->_recurBYcntcheck( $recur['BYYEARDAY']
-                                           , $daycnts[$wdate['month']][$wdate['day']]['yearcnt_up']
-                                           , $daycnts[$wdate['month']][$wdate['day']]['yearcnt_down'] );
-      if( $updateOK && isset( $recur['BYMONTHDAY'] ))
+                                            , $daycnts[$wdate['month']][$wdate['day']]['yearcnt_up']
+                                            , $daycnts[$wdate['month']][$wdate['day']]['yearcnt_down'] );
+        if( $updateOK && isset( $recur['BYMONTHDAY'] ))
         $updateOK = $this->_recurBYcntcheck( $recur['BYMONTHDAY']
-                                           , $wdate['day']
-                                           , $daycnts[$wdate['month']][$wdate['day']]['monthcnt_down'] );
+                                            , $wdate['day']
+                                            , $daycnts[$wdate['month']][$wdate['day']]['monthcnt_down'] );
     //echo "efter BYMONTHDAY: ".implode('-',$wdate).' status: '; echo ($updateOK) ? 'TRUE' : 'FALSE'; echo "<br />\n";//test###
-      if( $updateOK && isset( $recur['BYDAY'] )) {
+        if( $updateOK && isset( $recur['BYDAY'] )) {
         $updateOK = FALSE;
         $m = $wdate['month'];
         $d = $wdate['day'];
         if( isset( $recur['BYDAY']['DAY'] )) { // single day, opt with year/month day order no
-          $daynoexists = $daynosw = $daynamesw =  FALSE;
-          if( $recur['BYDAY']['DAY'] == $daycnts[$m][$d]['DAY'] )
+            $daynoexists = $daynosw = $daynamesw =  FALSE;
+            if( $recur['BYDAY']['DAY'] == $daycnts[$m][$d]['DAY'] )
             $daynamesw = TRUE;
-          if( isset( $recur['BYDAY'][0] )) {
+            if( isset( $recur['BYDAY'][0] )) {
             $daynoexists = TRUE;
             if(( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'MONTHLY' )) || isset( $recur['BYMONTH'] ))
-              $daynosw = $this->_recurBYcntcheck( $recur['BYDAY'][0]
+                $daynosw = $this->_recurBYcntcheck( $recur['BYDAY'][0]
                                                 , $daycnts[$m][$d]['monthdayno_up']
                                                 , $daycnts[$m][$d]['monthdayno_down'] );
             elseif( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'YEARLY' ))
-              $daynosw = $this->_recurBYcntcheck( $recur['BYDAY'][0]
+                $daynosw = $this->_recurBYcntcheck( $recur['BYDAY'][0]
                                                 , $daycnts[$m][$d]['yeardayno_up']
                                                 , $daycnts[$m][$d]['yeardayno_down'] );
-          }
-          if((  $daynoexists &&  $daynosw && $daynamesw ) ||
+            }
+            if((  $daynoexists &&  $daynosw && $daynamesw ) ||
              ( !$daynoexists && !$daynosw && $daynamesw )) {
             $updateOK = TRUE;
-          }
+            }
         //echo "daynoexists:$daynoexists daynosw:$daynosw daynamesw:$daynamesw<br />\n"; // test ###
         }
         else {
-          foreach( $recur['BYDAY'] as $bydayvalue ) {
+            foreach( $recur['BYDAY'] as $bydayvalue ) {
             $daynoexists = $daynosw = $daynamesw = FALSE;
             if( isset( $bydayvalue['DAY'] ) &&
                      ( $bydayvalue['DAY'] == $daycnts[$m][$d]['DAY'] ))
-              $daynamesw = TRUE;
+                $daynamesw = TRUE;
             if( isset( $bydayvalue[0] )) {
-              $daynoexists = TRUE;
-              if(( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'MONTHLY' )) ||
+                $daynoexists = TRUE;
+                if(( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'MONTHLY' )) ||
                    isset( $recur['BYMONTH'] ))
                 $daynosw = $this->_recurBYcntcheck( $bydayvalue['0']
-                                                  , $daycnts[$m][$d]['monthdayno_up']
-                                                  , $daycnts[$m][$d]['monthdayno_down'] );
-              elseif( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'YEARLY' ))
+                                                    , $daycnts[$m][$d]['monthdayno_up']
+                                                    , $daycnts[$m][$d]['monthdayno_down'] );
+                elseif( isset( $recur['FREQ'] ) && ( $recur['FREQ'] == 'YEARLY' ))
                 $daynosw = $this->_recurBYcntcheck( $bydayvalue['0']
-                                                  , $daycnts[$m][$d]['yeardayno_up']
-                                                  , $daycnts[$m][$d]['yeardayno_down'] );
+                                                    , $daycnts[$m][$d]['yeardayno_up']
+                                                    , $daycnts[$m][$d]['yeardayno_down'] );
             }
         //echo "daynoexists:$daynoexists daynosw:$daynosw daynamesw:$daynamesw<br />\n"; // test ###
             if((  $daynoexists &&  $daynosw && $daynamesw ) ||
                ( !$daynoexists && !$daynosw && $daynamesw )) {
-              $updateOK = TRUE;
-              break;
+                $updateOK = TRUE;
+                break;
+            }
             }
-          }
         }
-      }
-      //echo "efter BYDAY: ".implode('-',$wdate).' status: '; echo ($updateOK) ? 'TRUE' : 'FALSE'; echo "<br />\n"; // test ###
+        }
+        //echo "efter BYDAY: ".implode('-',$wdate).' status: '; echo ($updateOK) ? 'TRUE' : 'FALSE'; echo "<br />\n"; // test ###
             /* check BYSETPOS */
-      if( $updateOK ) {
+        if( $updateOK ) {
         if( isset( $recur['BYSETPOS'] ) &&
           ( in_array( $recur['FREQ'], array( 'YEARLY', 'MONTHLY', 'WEEKLY', 'DAILY' )))) {
-          if( isset( $recur['WEEKLY'] )) {
+            if( isset( $recur['WEEKLY'] )) {
             if( $bysetposWold == $daycnts[$wdate['month']][$wdate['day']]['weekno_up'] )
-              $bysetposw1[] = $wdatets;
+                $bysetposw1[] = $wdatets;
             else
-              $bysetposw2[] = $wdatets;
-          }
-          else {
+                $bysetposw2[] = $wdatets;
+            }
+            else {
             if(( isset( $recur['FREQ'] ) && ( 'YEARLY'      == $recur['FREQ'] )  &&
                                             ( $bysetposYold == $wdate['year'] ))   ||
                ( isset( $recur['FREQ'] ) && ( 'MONTHLY'     == $recur['FREQ'] )  &&
@@ -5110,418 +5109,418 @@ 
                                            (( $bysetposYold == $wdate['year'] )  &&
                                             ( $bysetposMold == $wdate['month'])  &&
                                             ( $bysetposDold == $wdate['sday'] ))))
-              $bysetposymd1[] = $wdatets;
+                $bysetposymd1[] = $wdatets;
             else
-              $bysetposymd2[] = $wdatets;
-          }
+                $bysetposymd2[] = $wdatets;
+            }
         }
         else {
             /* update result array if BYSETPOS is set */
-          $countcnt++;
-          if( $startdatets <= $wdatets ) { // only output within period
+            $countcnt++;
+            if( $startdatets <= $wdatets ) { // only output within period
             $result[$wdatets] = TRUE;
-          //echo "recur ".implode('-',$this->_date_time_string(date('Y-m-d H:i:s',$wdatets),6))."<br />\n";//test
-          }
-         //else echo "recur undate ".implode('-',$this->_date_time_string(date('Y-m-d H:i:s',$wdatets),6))." okdatstart ".implode('-',$this->_date_time_string(date('Y-m-d H:i:s',$startdatets),6))."<br />\n";//test
-          $updateOK = FALSE;
+            //echo "recur ".implode('-',$this->_date_time_string(date('Y-m-d H:i:s',$wdatets),6))."<br />\n";//test
+            }
+            //else echo "recur undate ".implode('-',$this->_date_time_string(date('Y-m-d H:i:s',$wdatets),6))." okdatstart ".implode('-',$this->_date_time_string(date('Y-m-d H:i:s',$startdatets),6))."<br />\n";//test
+            $updateOK = FALSE;
+        }
         }
-      }
             /* step up date */
-      $this->_stepdate( $wdate, $wdatets, $step);
+        $this->_stepdate( $wdate, $wdatets, $step);
             /* check if BYSETPOS is set for updating result array */
-      if( $updateOK && isset( $recur['BYSETPOS'] )) {
+        if( $updateOK && isset( $recur['BYSETPOS'] )) {
         $bysetpos       = FALSE;
         if( isset( $recur['FREQ'] ) && ( 'YEARLY'  == $recur['FREQ'] ) &&
           ( $bysetposYold != $wdate['year'] )) {
-          $bysetpos     = TRUE;
-          $bysetposYold = $wdate['year'];
+            $bysetpos     = TRUE;
+            $bysetposYold = $wdate['year'];
         }
         elseif( isset( $recur['FREQ'] ) && ( 'MONTHLY' == $recur['FREQ'] &&
          (( $bysetposYold != $wdate['year'] ) || ( $bysetposMold != $wdate['month'] )))) {
-          $bysetpos     = TRUE;
-          $bysetposYold = $wdate['year'];
-          $bysetposMold = $wdate['month'];
+            $bysetpos     = TRUE;
+            $bysetposYold = $wdate['year'];
+            $bysetposMold = $wdate['month'];
         }
         elseif( isset( $recur['FREQ'] ) && ( 'WEEKLY'  == $recur['FREQ'] )) {
-          $weekno = (int) date( 'W', mktime( 0, 0, $wkst, $wdate['month'], $wdate['day'], $wdate['year']));
-          if( $bysetposWold != $weekno ) {
+            $weekno = (int) date( 'W', mktime( 0, 0, $wkst, $wdate['month'], $wdate['day'], $wdate['year']));
+            if( $bysetposWold != $weekno ) {
             $bysetposWold = $weekno;
             $bysetpos     = TRUE;
-          }
+            }
         }
         elseif( isset( $recur['FREQ'] ) && ( 'DAILY'   == $recur['FREQ'] ) &&
          (( $bysetposYold != $wdate['year'] )  ||
           ( $bysetposMold != $wdate['month'] ) ||
           ( $bysetposDold != $wdate['sday'] ))) {
-          $bysetpos     = TRUE;
-          $bysetposYold = $wdate['year'];
-          $bysetposMold = $wdate['month'];
-          $bysetposDold = $wdate['day'];
+            $bysetpos     = TRUE;
+            $bysetposYold = $wdate['year'];
+            $bysetposMold = $wdate['month'];
+            $bysetposDold = $wdate['day'];
         }
         if( $bysetpos ) {
-          if( isset( $recur['BYWEEKNO'] )) {
+            if( isset( $recur['BYWEEKNO'] )) {
             $bysetposarr1 = & $bysetposw1;
             $bysetposarr2 = & $bysetposw2;
-          }
-          else {
+            }
+            else {
             $bysetposarr1 = & $bysetposymd1;
             $bysetposarr2 = & $bysetposymd2;
-          }
-          foreach( $recur['BYSETPOS'] as $ix ) {
+            }
+            foreach( $recur['BYSETPOS'] as $ix ) {
             if( 0 > $ix ) // both positive and negative BYSETPOS allowed
-              $ix = ( count( $bysetposarr1 ) + $ix + 1);
+                $ix = ( count( $bysetposarr1 ) + $ix + 1);
             $ix--;
             if( isset( $bysetposarr1[$ix] )) {
-              if( $startdatets <= $bysetposarr1[$ix] ) { // only output within period
+                if( $startdatets <= $bysetposarr1[$ix] ) { // only output within period
                 $result[$bysetposarr1[$ix]] = TRUE;
-       //echo "recur ".implode('-',$this->_date_time_string(date('Y-m-d H:i:s',$bysetposarr1[$ix]),6))."<br />\n";//test
-              }
-              $countcnt++;
+        //echo "recur ".implode('-',$this->_date_time_string(date('Y-m-d H:i:s',$bysetposarr1[$ix]),6))."<br />\n";//test
+                }
+                $countcnt++;
             }
             if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] ))
-              break;
-          }
-          $bysetposarr1 = $bysetposarr2;
-          $bysetposarr2 = array();
+                break;
+            }
+            $bysetposarr1 = $bysetposarr2;
+            $bysetposarr2 = array();
+        }
         }
-      }
     }
-  }
-  function _recurBYcntcheck( $BYvalue, $upValue, $downValue ) {
+    }
+    function _recurBYcntcheck( $BYvalue, $upValue, $downValue ) {
     if( is_array( $BYvalue ) &&
       ( in_array( $upValue, $BYvalue ) || in_array( $downValue, $BYvalue )))
-      return TRUE;
+        return TRUE;
     elseif(( $BYvalue == $upValue ) || ( $BYvalue == $downValue ))
-      return TRUE;
+        return TRUE;
     else
-      return FALSE;
-  }
-  function _recurIntervalIx( $freq, $date, $wkst ) {
+        return FALSE;
+    }
+    function _recurIntervalIx( $freq, $date, $wkst ) {
             /* create interval index */
     switch( $freq ) {
-      case 'YEARLY':
+        case 'YEARLY':
         $intervalix = $date['year'];
         break;
-      case 'MONTHLY':
+        case 'MONTHLY':
         $intervalix = $date['year'].'-'.$date['month'];
         break;
-      case 'WEEKLY':
+        case 'WEEKLY':
         $wdatets    = $this->_date2timestamp( $date );
         $intervalix = (int) date( 'W', ( $wdatets + $wkst ));
-       break;
-      case 'DAILY':
+        break;
+        case 'DAILY':
            default:
         $intervalix = $date['year'].'-'.$date['month'].'-'.$date['day'];
         break;
     }
     return $intervalix;
-  }
+    }
 /**
- * convert input format for exrule and rrule to internal format
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.16 - 2008-10-19
- * @param array $rexrule
- * @return array
- */
-  function _setRexrule( $rexrule ) {
+     * convert input format for exrule and rrule to internal format
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.16 - 2008-10-19
+     * @param array $rexrule
+     * @return array
+     */
+    function _setRexrule( $rexrule ) {
     $input          = array();
     if( empty( $rexrule ))
-      return $input;
+        return $input;
     foreach( $rexrule as $rexrulelabel => $rexrulevalue ) {
-      $rexrulelabel = strtoupper( $rexrulelabel );
-      if( 'UNTIL'  != $rexrulelabel )
+        $rexrulelabel = strtoupper( $rexrulelabel );
+        if( 'UNTIL'  != $rexrulelabel )
         $input[$rexrulelabel]   = $rexrulevalue;
-      else {
+        else {
         if( $this->_isArrayTimestampDate( $rexrulevalue )) // timestamp date
-          $input[$rexrulelabel] = $this->_timestamp2date( $rexrulevalue, 6 );
+            $input[$rexrulelabel] = $this->_timestamp2date( $rexrulevalue, 6 );
         elseif( $this->_isArrayDate( $rexrulevalue )) // date-time
-          $input[$rexrulelabel] = $this->_date_time_array( $rexrulevalue, 6 );
+            $input[$rexrulelabel] = $this->_date_time_array( $rexrulevalue, 6 );
         elseif( 8 <= strlen( trim( $rexrulevalue ))) // ex. 2006-08-03 10:12:18
-          $input[$rexrulelabel] = $this->_date_time_string( $rexrulevalue );
+            $input[$rexrulelabel] = $this->_date_time_string( $rexrulevalue );
         if(( 3 < count( $input[$rexrulelabel] )) && !isset( $input[$rexrulelabel]['tz'] ))
-          $input[$rexrulelabel]['tz'] = 'Z';
-      }
+            $input[$rexrulelabel]['tz'] = 'Z';
+        }
     }
     return $input;
-  }
+    }
 /**
- * convert format for input date to internal date with parameters
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.17 - 2008-10-31
- * @param mixed $year
- * @param mixed $month optional
- * @param int $day optional
- * @param int $hour optional
- * @param int $min optional
- * @param int $sec optional
- * @param array $params optional
- * @param string $caller optional
- * @return array
- */
-  function _setDate( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE, $caller=null ) {
+     * convert format for input date to internal date with parameters
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.17 - 2008-10-31
+     * @param mixed $year
+     * @param mixed $month optional
+     * @param int $day optional
+     * @param int $hour optional
+     * @param int $min optional
+     * @param int $sec optional
+     * @param array $params optional
+     * @param string $caller optional
+     * @return array
+     */
+    function _setDate( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $tz=FALSE, $params=FALSE, $caller=null ) {
     $input = $parno = null;
     $localtime = (( 'dtstart' == $caller ) && in_array( $this->objName, array( 'vtimezone', 'standard', 'daylight' ))) ? TRUE : FALSE;
     if( $this->_isArrayDate( $year )) {
-      if( $localtime ) unset ( $month['VALUE'], $month['TZID'] );
-      $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
-      if( isset( $input['params']['TZID'] )) {
+        if( $localtime ) unset ( $month['VALUE'], $month['TZID'] );
+        $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
+        if( isset( $input['params']['TZID'] )) {
         $input['params']['VALUE'] = 'DATE-TIME';
         unset( $year['tz'] );
-      }
-      $hitval          = (( !empty( $year['tz'] ) || !empty( $year[6] ))) ? 7 : 6;
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval );
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE', 3, count( $year ), $parno );
-      $input['value']  = $this->_date_time_array( $year, $parno );
+        }
+        $hitval          = (( !empty( $year['tz'] ) || !empty( $year[6] ))) ? 7 : 6;
+        $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval );
+        $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE', 3, count( $year ), $parno );
+        $input['value']  = $this->_date_time_array( $year, $parno );
     }
     elseif( $this->_isArrayTimestampDate( $year )) {
-      if( $localtime ) unset ( $month['VALUE'], $month['TZID'] );
-      $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
-      if( isset( $input['params']['TZID'] )) {
+        if( $localtime ) unset ( $month['VALUE'], $month['TZID'] );
+        $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
+        if( isset( $input['params']['TZID'] )) {
         $input['params']['VALUE'] = 'DATE-TIME';
         unset( $year['tz'] );
-      }
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE', 3 );
-      $hitval          = ( isset( $year['tz'] )) ? 7 : 6;
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval, $parno );
-      $input['value']  = $this->_timestamp2date( $year, $parno );
+        }
+        $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE', 3 );
+        $hitval          = ( isset( $year['tz'] )) ? 7 : 6;
+        $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval, $parno );
+        $input['value']  = $this->_timestamp2date( $year, $parno );
     }
     elseif( 8 <= strlen( trim( $year ))) { // ex. 2006-08-03 10:12:18
-      if( $localtime ) unset ( $month['VALUE'], $month['TZID'] );
-      $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
-      if( isset( $input['params']['TZID'] )) {
+        if( $localtime ) unset ( $month['VALUE'], $month['TZID'] );
+        $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ));
+        if( isset( $input['params']['TZID'] )) {
         $input['params']['VALUE'] = 'DATE-TIME';
         $parno = 6;
-      }
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', 7, $parno );
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE', 3, $parno, $parno );
-      $input['value']  = $this->_date_time_string( $year, $parno );
+        }
+        $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', 7, $parno );
+        $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE', 3, $parno, $parno );
+        $input['value']  = $this->_date_time_string( $year, $parno );
     }
     else {
-      if( is_array( $params )) {
+        if( is_array( $params )) {
         if( $localtime ) unset ( $params['VALUE'], $params['TZID'] );
         $input['params'] = $this->_setParams( $params, array( 'VALUE' => 'DATE-TIME' ));
-      }
-      elseif( is_array( $tz )) {
+        }
+        elseif( is_array( $tz )) {
         $input['params'] = $this->_setParams( $tz,     array( 'VALUE' => 'DATE-TIME' ));
         $tz = FALSE;
-      }
-      elseif( is_array( $hour )) {
+        }
+        elseif( is_array( $hour )) {
         $input['params'] = $this->_setParams( $hour,   array( 'VALUE' => 'DATE-TIME' ));
         $hour = $min = $sec = $tz = FALSE;
-      }
-      if( isset( $input['params']['TZID'] )) {
+        }
+        if( isset( $input['params']['TZID'] )) {
         $tz            = null;
         $input['params']['VALUE'] = 'DATE-TIME';
-      }
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE', 3 );
-      $hitval          = ( !empty( $tz )) ? 7 : 6;
-      $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval, $parno, $parno );
-      $input['value']  = array( 'year'  => $year, 'month' => $month, 'day'   => $day );
-      if( 3 != $parno ) {
+        }
+        $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE', 3 );
+        $hitval          = ( !empty( $tz )) ? 7 : 6;
+        $parno           = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', $hitval, $parno, $parno );
+        $input['value']  = array( 'year'  => $year, 'month' => $month, 'day'   => $day );
+        if( 3 != $parno ) {
         $input['value']['hour'] = ( $hour ) ? $hour : '0';
         $input['value']['min']  = ( $min )  ? $min  : '0';
         $input['value']['sec']  = ( $sec )  ? $sec  : '0';
         if( !empty( $tz ))
-          $input['value']['tz'] = $tz;
-      }
+            $input['value']['tz'] = $tz;
+        }
     }
     if( 3 == $parno ) {
-      $input['params']['VALUE'] = 'DATE';
-      unset( $input['value']['tz'] );
-      unset( $input['params']['TZID'] );
+        $input['params']['VALUE'] = 'DATE';
+        unset( $input['value']['tz'] );
+        unset( $input['params']['TZID'] );
     }
     elseif( isset( $input['params']['TZID'] ))
-      unset( $input['value']['tz'] );
+        unset( $input['value']['tz'] );
     if( $localtime ) unset( $input['value']['tz'], $input['params']['TZID'] );
     if( isset( $input['value']['tz'] ))
-      $input['value']['tz'] = (string) $input['value']['tz'];
+        $input['value']['tz'] = (string) $input['value']['tz'];
     if( !empty( $input['value']['tz'] ) && ( 'Z' != $input['value']['tz'] ) &&
       ( !$this->_isOffset( $input['value']['tz'] )))
-      $input['params']['TZID'] = $input['value']['tz'];
+        $input['params']['TZID'] = $input['value']['tz'];
     return $input;
-  }
+    }
 /**
- * convert format for input date (UTC) to internal date with parameters
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.17 - 2008-10-31
- * @param mixed $year
- * @param mixed $month optional
- * @param int $day optional
- * @param int $hour optional
- * @param int $min optional
- * @param int $sec optional
- * @param array $params optional
- * @return array
- */
-  function _setDate2( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
+     * convert format for input date (UTC) to internal date with parameters
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.17 - 2008-10-31
+     * @param mixed $year
+     * @param mixed $month optional
+     * @param int $day optional
+     * @param int $hour optional
+     * @param int $min optional
+     * @param int $sec optional
+     * @param array $params optional
+     * @return array
+     */
+    function _setDate2( $year, $month=FALSE, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=FALSE ) {
     $input = null;
     if( $this->_isArrayDate( $year )) {
-      $input['value']  = $this->_date_time_array( $year, 7 );
-      $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ) );
+        $input['value']  = $this->_date_time_array( $year, 7 );
+        $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ) );
     }
     elseif( $this->_isArrayTimestampDate( $year )) {
-      $input['value']  = $this->_timestamp2date( $year, 7 );
-      $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ) );
+        $input['value']  = $this->_timestamp2date( $year, 7 );
+        $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ) );
     }
     elseif( 8 <= strlen( trim( $year ))) { // ex. 2006-08-03 10:12:18
-      $input['value']  = $this->_date_time_string( $year, 7 );
-      $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ) );
+        $input['value']  = $this->_date_time_string( $year, 7 );
+        $input['params'] = $this->_setParams( $month, array( 'VALUE' => 'DATE-TIME' ) );
     }
     else {
-      $input['value']  = array( 'year'  => $year
-                              , 'month' => $month
-                              , 'day'   => $day
-                              , 'hour'  => $hour
-                              , 'min'   => $min
-                              , 'sec'   => $sec );
-      $input['params'] = $this->_setParams( $params, array( 'VALUE' => 'DATE-TIME' ));
+        $input['value']  = array( 'year'  => $year
+                                , 'month' => $month
+                                , 'day'   => $day
+                                , 'hour'  => $hour
+                                , 'min'   => $min
+                                , 'sec'   => $sec );
+        $input['params'] = $this->_setParams( $params, array( 'VALUE' => 'DATE-TIME' ));
     }
     $parno = $this->_existRem( $input['params'], 'VALUE', 'DATE-TIME', 7 ); // remove default
     if( !isset( $input['value']['hour'] ))
-      $input['value']['hour'] = 0;
+        $input['value']['hour'] = 0;
     if( !isset( $input['value']['min'] ))
-      $input['value']['min'] = 0;
+        $input['value']['min'] = 0;
     if( !isset( $input['value']['sec'] ))
-      $input['value']['sec'] = 0;
+        $input['value']['sec'] = 0;
     if( !isset( $input['value']['tz'] ) || !$this->_isOffset( $input['value']['tz'] ))
-      $input['value']['tz'] = 'Z';
+        $input['value']['tz'] = 'Z';
     return $input;
-  }
+    }
 /**
- * check index and set (an indexed) content in multiple value array
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-06
- * @param array $valArr
- * @param mixed $value
- * @param array $params
- * @param array $defaults
- * @param int $index
- * @return void
- */
-  function _setMval( & $valArr, $value, $params=FALSE, $defaults=FALSE, $index=FALSE ) {
+     * check index and set (an indexed) content in multiple value array
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-06
+     * @param array $valArr
+     * @param mixed $value
+     * @param array $params
+     * @param array $defaults
+     * @param int $index
+     * @return void
+     */
+    function _setMval( & $valArr, $value, $params=FALSE, $defaults=FALSE, $index=FALSE ) {
     if( !is_array( $valArr )) $valArr = array();
     if( $index )
-      $index = $index - 1;
+        $index = $index - 1;
     elseif( 0 < count( $valArr )) {
-      $index = end( array_keys( $valArr ));
-      $index += 1;
+        $index = end( array_keys( $valArr ));
+        $index += 1;
     }
     else
-      $index = 0;
+        $index = 0;
     $valArr[$index] = array( 'value' => $value, 'params' => $this->_setParams( $params, $defaults ));
     ksort( $valArr );
-  }
+    }
 /**
- * set input (formatted) parameters- component property attributes
- *
- * default parameters can be set, if missing
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 1.x.x - 2007-05-01
- * @param array $params
- * @param array $defaults
- * @return array
- */
-  function _setParams( $params, $defaults=FALSE ) {
+     * set input (formatted) parameters- component property attributes
+     *
+     * default parameters can be set, if missing
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 1.x.x - 2007-05-01
+     * @param array $params
+     * @param array $defaults
+     * @return array
+     */
+    function _setParams( $params, $defaults=FALSE ) {
     if( !is_array( $params))
-      $params = array();
+        $params = array();
     $input = array();
     foreach( $params as $paramKey => $paramValue ) {
-      if( is_array( $paramValue )) {
+        if( is_array( $paramValue )) {
         foreach( $paramValue as $pkey => $pValue ) {
-          if(( '"' == substr( $pValue, 0, 1 )) && ( '"' == substr( $pValue, -1 )))
+            if(( '"' == substr( $pValue, 0, 1 )) && ( '"' == substr( $pValue, -1 )))
             $paramValue[$pkey] = substr( $pValue, 1, ( strlen( $pValue ) - 2 ));
         }
-      }
-      elseif(( '"' == substr( $paramValue, 0, 1 )) && ( '"' == substr( $paramValue, -1 )))
+        }
+        elseif(( '"' == substr( $paramValue, 0, 1 )) && ( '"' == substr( $paramValue, -1 )))
         $paramValue = substr( $paramValue, 1, ( strlen( $paramValue ) - 2 ));
-      if( 'VALUE' == strtoupper( $paramKey ))
+        if( 'VALUE' == strtoupper( $paramKey ))
         $input['VALUE']                 = strtoupper( $paramValue );
-      else
+        else
         $input[strtoupper( $paramKey )] = $paramValue;
     }
     if( is_array( $defaults )) {
-      foreach( $defaults as $paramKey => $paramValue ) {
+        foreach( $defaults as $paramKey => $paramValue ) {
         if( !isset( $input[$paramKey] ))
-          $input[$paramKey] = $paramValue;
-      }
+            $input[$paramKey] = $paramValue;
+        }
     }
     return (0 < count( $input )) ? $input : null;
-  }
+    }
 /**
- * step date, return updated date, array and timpstamp
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.16 - 2008-10-18
- * @param array $date, date to step
- * @param int $timestamp
- * @param array $step, default array( 'day' => 1 )
- * @return void
- */
-  function _stepdate( &$date, &$timestamp, $step=array( 'day' => 1 )) {
+     * step date, return updated date, array and timpstamp
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.16 - 2008-10-18
+     * @param array $date, date to step
+     * @param int $timestamp
+     * @param array $step, default array( 'day' => 1 )
+     * @return void
+     */
+    function _stepdate( &$date, &$timestamp, $step=array( 'day' => 1 )) {
     foreach( $step as $stepix => $stepvalue )
-      $date[$stepix] += $stepvalue;
+        $date[$stepix] += $stepvalue;
     $timestamp  = $this->_date2timestamp( $date );
     $date       = $this->_timestamp2date( $timestamp, 6 );
     foreach( $date as $k => $v ) {
-      if( ctype_digit( $v ))
+        if( ctype_digit( $v ))
         $date[$k] = (int) $v;
     }
-  }
+    }
 /**
- * convert timestamp to date array
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.16 - 2008-11-01
- * @param mixed $timestamp
- * @param int $parno
- * @return array
- */
-  function _timestamp2date( $timestamp, $parno=6 ) {
+     * convert timestamp to date array
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.16 - 2008-11-01
+     * @param mixed $timestamp
+     * @param int $parno
+     * @return array
+     */
+    function _timestamp2date( $timestamp, $parno=6 ) {
     if( is_array( $timestamp )) {
-      if(( 7 == $parno ) && !empty( $timestamp['tz'] ))
+        if(( 7 == $parno ) && !empty( $timestamp['tz'] ))
         $tz = $timestamp['tz'];
-      $timestamp = $timestamp['timestamp'];
+        $timestamp = $timestamp['timestamp'];
     }
     $output = array( 'year'  => date( 'Y', $timestamp )
-                   , 'month' => date( 'm', $timestamp )
-                   , 'day'   => date( 'd', $timestamp ));
+                    , 'month' => date( 'm', $timestamp )
+                    , 'day'   => date( 'd', $timestamp ));
     if( 3 != $parno ) {
-             $output['hour'] =  date( 'H', $timestamp );
-             $output['min']  =  date( 'i', $timestamp );
-             $output['sec']  =  date( 's', $timestamp );
-      if( isset( $tz ))
+                $output['hour'] =  date( 'H', $timestamp );
+                $output['min']  =  date( 'i', $timestamp );
+                $output['sec']  =  date( 's', $timestamp );
+        if( isset( $tz ))
         $output['tz'] = $tz;
     }
     return $output;
-  }
+    }
 /**
- * convert (numeric) local time offset to seconds correcting localtime to GMT
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.16 - 2008-10-19
- * @param string $offset
- * @return integer
- */
-  function _tz2offset( $tz ) {
+     * convert (numeric) local time offset to seconds correcting localtime to GMT
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.16 - 2008-10-19
+     * @param string $offset
+     * @return integer
+     */
+    function _tz2offset( $tz ) {
     $tz           = trim( (string) $tz );
     $offset       = 0;
     if(((     5  != strlen( $tz )) && ( 7  != strlen( $tz ))) ||
        ((    '+' != substr( $tz, 0, 1 )) && ( '-' != substr( $tz, 0, 1 ))) ||
        (( '0000' >= substr( $tz, 1, 4 )) && ( '9999' < substr( $tz, 1, 4 ))) ||
            (( 7  == strlen( $tz )) && ( '00' > substr( $tz, 5, 2 )) && ( '99' < substr( $tz, 5, 2 ))))
-      return $offset;
+        return $offset;
     $hours2sec    = (int) substr( $tz, 1, 2 ) * 3600;
     $min2sec      = (int) substr( $tz, 3, 2 ) *   60;
     $sec          = ( 7  == strlen( $tz )) ? (int) substr( $tz, -2 ) : '00';
     $offset       = $hours2sec + $min2sec + $sec;
     $offset       = ('-' == substr( $tz, 0, 1 )) ? $offset : -1 * $offset;
     return $offset;
-  }
+    }
 /*********************************************************************************/
 /*********************************************************************************/
 /**
@@ -5532,16 +5531,16 @@ 
  * @param string $config
  * @return value
  */
-  function getConfig( $config ) {
+    function getConfig( $config ) {
     switch( strtoupper( $config )) {
-      case 'ALLOWEMPTY':
+        case 'ALLOWEMPTY':
         return $this->allowEmpty;
         break;
-      case 'COMPSINFO':
+        case 'COMPSINFO':
         unset( $this->compix );
         $info = array();
         if( isset( $this->components )) {
-          foreach( $this->components as $cix => $component ) {
+            foreach( $this->components as $cix => $component ) {
             if( empty( $component )) continue;
             unset( $component->propix );
             $info[$cix]['ordno'] = $cix + 1;
@@ -5550,26 +5549,26 @@ 
             $info[$cix]['props'] = $component->getConfig( 'propinfo' );
             $info[$cix]['sub']   = $component->getConfig( 'compsinfo' );
             unset( $component->propix );
-          }
+            }
         }
         return $info;
         break;
-      case 'FORMAT':
+        case 'FORMAT':
         return $this->format;
         break;
-      case 'LANGUAGE':
+        case 'LANGUAGE':
          // get language for calendar component as defined in [RFC 1766]
         return $this->language;
         break;
-      case 'NL':
+        case 'NL':
       case 'NEWLINECHAR':
         return $this->nl;
         break;
-      case 'PROPINFO':
+        case 'PROPINFO':
         $output = array();
         if( !in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) {
-          if( empty( $this->uid['value'] )) $this->_makeuid();
-                                              $output['UID']              = 1;
+            if( empty( $this->uid['value'] )) $this->_makeuid();
+                                                $output['UID']              = 1;
         }
         if( !empty( $this->dtstamp ))         $output['DTSTAMP']          = 1;
         if( !empty( $this->summary ))         $output['SUMMARY']          = 1;
@@ -5616,51 +5615,51 @@ 
         if( !empty( $this->xprop ))           $output['X-PROP']           = count( $this->xprop );
         return $output;
         break;
-      case 'UNIQUE_ID':
+        case 'UNIQUE_ID':
         if( empty( $this->unique_id ))
-          $this->unique_id  = ( isset( $_SERVER['SERVER_NAME'] )) ? gethostbyname( $_SERVER['SERVER_NAME'] ) : 'localhost';
+            $this->unique_id  = ( isset( $_SERVER['SERVER_NAME'] )) ? gethostbyname( $_SERVER['SERVER_NAME'] ) : 'localhost';
         return $this->unique_id;
         break;
     }
-  }
+    }
 /**
- * general component config setting
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.8 - 2008-10-24
- * @param string $config
- * @param string $value
- * @return void
- */
-  function setConfig( $config, $value ) {
+     * general component config setting
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.8 - 2008-10-24
+     * @param string $config
+     * @param string $value
+     * @return void
+     */
+    function setConfig( $config, $value ) {
     $res = FALSE;
     switch( strtoupper( $config )) {
-      case 'ALLOWEMPTY':
+        case 'ALLOWEMPTY':
         $this->allowEmpty = $value;
         $subcfg = array( 'ALLOWEMPTY' => $value );
         $res    = TRUE;
         break;
-      case 'FORMAT':
+        case 'FORMAT':
         $value  = trim( $value );
         $this->format = $value;
         $this->_createFormat();
         $subcfg = array( 'FORMAT' => $value );
         $res    = TRUE;
         break;
-      case 'LANGUAGE':
+        case 'LANGUAGE':
          // set language for calendar component as defined in [RFC 1766]
         $value  = trim( $value );
         $this->language = $value;
         $subcfg = array( 'LANGUAGE' => $value );
         $res    = TRUE;
         break;
-      case 'NL':
+        case 'NL':
       case 'NEWLINECHAR':
         $this->nl = $value;
         $subcfg = array( 'NL' => $value );
         $res    = TRUE;
         break;
-      case 'UNIQUE_ID':
+        case 'UNIQUE_ID':
         $value  = trim( $value );
         $this->unique_id = $value;
         $subcfg = array( 'UNIQUE_ID' => $value );
@@ -5669,17 +5668,17 @@ 
     }
     if( !$res ) return FALSE;
     if( isset( $subcfg ) && !empty( $this->components )) {
-      foreach( $subcfg as $cfgkey => $cfgvalue ) {
+        foreach( $subcfg as $cfgkey => $cfgvalue ) {
         foreach( $this->components as $cix => $component ) {
-          $res = $component->setConfig( $cfgkey, $cfgvalue );
-          if( !$res )
+            $res = $component->setConfig( $cfgkey, $cfgvalue );
+            if( !$res )
             break 2;
-          $this->components[$cix] = $component; // PHP4 compliant
+            $this->components[$cix] = $component; // PHP4 compliant
+        }
         }
-      }
     }
     return $res;
-  }
+    }
 /*********************************************************************************/
 /**
  * delete component property value
@@ -5690,257 +5689,257 @@ 
  * @param int @propix, optional, if specific property is wanted in case of multiply occurences
  * @return bool, if successfull delete TRUE
  */
-  function deleteProperty( $propName, $propix=FALSE ) {
+    function deleteProperty( $propName, $propix=FALSE ) {
     if( $this->_notExistProp( $propName )) return FALSE;
     $propName = strtoupper( $propName );
     if( in_array( $propName, array( 'ATTACH',   'ATTENDEE', 'CATEGORIES', 'COMMENT',   'CONTACT', 'DESCRIPTION',    'EXDATE', 'EXRULE',
                                     'FREEBUSY', 'RDATE',    'RELATED-TO', 'RESOURCES', 'RRULE',   'REQUEST-STATUS', 'TZNAME', 'X-PROP'  ))) {
-      if( !$propix )
+        if( !$propix )
         $propix = ( isset( $this->propdelix[$propName] )) ? $this->propdelix[$propName] + 2 : 1;
-      $this->propdelix[$propName] = --$propix;
+        $this->propdelix[$propName] = --$propix;
     }
     $return = FALSE;
     switch( $propName ) {
-      case 'ACTION':
+        case 'ACTION':
         if( !empty( $this->action )) {
-          $this->action = '';
-          $return = TRUE;
+            $this->action = '';
+            $return = TRUE;
         }
         break;
-      case 'ATTACH':
+        case 'ATTACH':
         return $this->deletePropertyM( $this->attach, $propix );
         break;
-      case 'ATTENDEE':
+        case 'ATTENDEE':
         return $this->deletePropertyM( $this->attendee, $propix );
         break;
-      case 'CATEGORIES':
+        case 'CATEGORIES':
         return $this->deletePropertyM( $this->categories, $propix );
         break;
-      case 'CLASS':
+        case 'CLASS':
         if( !empty( $this->class )) {
-          $this->class = '';
-          $return = TRUE;
+            $this->class = '';
+            $return = TRUE;
         }
         break;
-      case 'COMMENT':
+        case 'COMMENT':
         return $this->deletePropertyM( $this->comment, $propix );
         break;
-      case 'COMPLETED':
+        case 'COMPLETED':
         if( !empty( $this->completed )) {
-          $this->completed = '';
-          $return = TRUE;
+            $this->completed = '';
+            $return = TRUE;
         }
         break;
-      case 'CONTACT':
+        case 'CONTACT':
         return $this->deletePropertyM( $this->contact, $propix );
         break;
-      case 'CREATED':
+        case 'CREATED':
         if( !empty( $this->created )) {
-          $this->created = '';
-          $return = TRUE;
+            $this->created = '';
+            $return = TRUE;
         }
         break;
-      case 'DESCRIPTION':
+        case 'DESCRIPTION':
         return $this->deletePropertyM( $this->description, $propix );
         break;
-      case 'DTEND':
+        case 'DTEND':
         if( !empty( $this->dtend )) {
-          $this->dtend = '';
-          $return = TRUE;
+            $this->dtend = '';
+            $return = TRUE;
         }
         break;
-      case 'DTSTAMP':
+        case 'DTSTAMP':
         if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
-          return FALSE;
+            return FALSE;
         if( !empty( $this->dtstamp )) {
-          $this->dtstamp = '';
-          $return = TRUE;
+            $this->dtstamp = '';
+            $return = TRUE;
         }
         break;
-      case 'DTSTART':
+        case 'DTSTART':
         if( !empty( $this->dtstart )) {
-          $this->dtstart = '';
-          $return = TRUE;
+            $this->dtstart = '';
+            $return = TRUE;
         }
         break;
-      case 'DUE':
+        case 'DUE':
         if( !empty( $this->due )) {
-          $this->due = '';
-          $return = TRUE;
+            $this->due = '';
+            $return = TRUE;
         }
         break;
-      case 'DURATION':
+        case 'DURATION':
         if( !empty( $this->duration )) {
-          $this->duration = '';
-          $return = TRUE;
+            $this->duration = '';
+            $return = TRUE;
         }
         break;
-      case 'EXDATE':
+        case 'EXDATE':
         return $this->deletePropertyM( $this->exdate, $propix );
         break;
-      case 'EXRULE':
+        case 'EXRULE':
         return $this->deletePropertyM( $this->exrule, $propix );
         break;
-      case 'FREEBUSY':
+        case 'FREEBUSY':
         return $this->deletePropertyM( $this->freebusy, $propix );
         break;
-      case 'GEO':
+        case 'GEO':
         if( !empty( $this->geo )) {
-          $this->geo = '';
-          $return = TRUE;
+            $this->geo = '';
+            $return = TRUE;
         }
         break;
-      case 'LAST-MODIFIED':
+        case 'LAST-MODIFIED':
         if( !empty( $this->lastmodified )) {
-          $this->lastmodified = '';
-          $return = TRUE;
+            $this->lastmodified = '';
+            $return = TRUE;
         }
         break;
-      case 'LOCATION':
+        case 'LOCATION':
         if( !empty( $this->location )) {
-          $this->location = '';
-          $return = TRUE;
+            $this->location = '';
+            $return = TRUE;
         }
         break;
-      case 'ORGANIZER':
+        case 'ORGANIZER':
         if( !empty( $this->organizer )) {
-          $this->organizer = '';
-          $return = TRUE;
+            $this->organizer = '';
+            $return = TRUE;
         }
         break;
-      case 'PERCENT-COMPLETE':
+        case 'PERCENT-COMPLETE':
         if( !empty( $this->percentcomplete )) {
-          $this->percentcomplete = '';
-          $return = TRUE;
+            $this->percentcomplete = '';
+            $return = TRUE;
         }
         break;
-      case 'PRIORITY':
+        case 'PRIORITY':
         if( !empty( $this->priority )) {
-          $this->priority = '';
-          $return = TRUE;
+            $this->priority = '';
+            $return = TRUE;
         }
         break;
-      case 'RDATE':
+        case 'RDATE':
         return $this->deletePropertyM( $this->rdate, $propix );
         break;
-      case 'RECURRENCE-ID':
+        case 'RECURRENCE-ID':
         if( !empty( $this->recurrenceid )) {
-          $this->recurrenceid = '';
-          $return = TRUE;
+            $this->recurrenceid = '';
+            $return = TRUE;
         }
         break;
-      case 'RELATED-TO':
+        case 'RELATED-TO':
         return $this->deletePropertyM( $this->relatedto, $propix );
         break;
-      case 'REPEAT':
+        case 'REPEAT':
         if( !empty( $this->repeat )) {
-          $this->repeat = '';
-          $return = TRUE;
+            $this->repeat = '';
+            $return = TRUE;
         }
         break;
-      case 'REQUEST-STATUS':
+        case 'REQUEST-STATUS':
         return $this->deletePropertyM( $this->requeststatus, $propix );
         break;
-      case 'RESOURCES':
+        case 'RESOURCES':
         return $this->deletePropertyM( $this->resources, $propix );
         break;
-      case 'RRULE':
+        case 'RRULE':
         return $this->deletePropertyM( $this->rrule, $propix );
         break;
-      case 'SEQUENCE':
+        case 'SEQUENCE':
         if( !empty( $this->sequence )) {
-          $this->sequence = '';
-          $return = TRUE;
+            $this->sequence = '';
+            $return = TRUE;
         }
         break;
-      case 'STATUS':
+        case 'STATUS':
         if( !empty( $this->status )) {
-          $this->status = '';
-          $return = TRUE;
+            $this->status = '';
+            $return = TRUE;
         }
         break;
-      case 'SUMMARY':
+        case 'SUMMARY':
         if( !empty( $this->summary )) {
-          $this->summary = '';
-          $return = TRUE;
+            $this->summary = '';
+            $return = TRUE;
         }
         break;
-      case 'TRANSP':
+        case 'TRANSP':
         if( !empty( $this->transp )) {
-          $this->transp = '';
-          $return = TRUE;
+            $this->transp = '';
+            $return = TRUE;
         }
         break;
-      case 'TRIGGER':
+        case 'TRIGGER':
         if( !empty( $this->trigger )) {
-          $this->trigger = '';
-          $return = TRUE;
+            $this->trigger = '';
+            $return = TRUE;
         }
         break;
-      case 'TZID':
+        case 'TZID':
         if( !empty( $this->tzid )) {
-          $this->tzid = '';
-          $return = TRUE;
+            $this->tzid = '';
+            $return = TRUE;
         }
         break;
-      case 'TZNAME':
+        case 'TZNAME':
         return $this->deletePropertyM( $this->tzname, $propix );
         break;
-      case 'TZOFFSETFROM':
+        case 'TZOFFSETFROM':
         if( !empty( $this->tzoffsetfrom )) {
-          $this->tzoffsetfrom = '';
-          $return = TRUE;
+            $this->tzoffsetfrom = '';
+            $return = TRUE;
         }
         break;
-      case 'TZOFFSETTO':
+        case 'TZOFFSETTO':
         if( !empty( $this->tzoffsetto )) {
-          $this->tzoffsetto = '';
-          $return = TRUE;
+            $this->tzoffsetto = '';
+            $return = TRUE;
         }
         break;
-      case 'TZURL':
+        case 'TZURL':
         if( !empty( $this->tzurl )) {
-          $this->tzurl = '';
-          $return = TRUE;
+            $this->tzurl = '';
+            $return = TRUE;
         }
         break;
-      case 'UID':
+        case 'UID':
         if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
-          return FALSE;
+            return FALSE;
         if( !empty( $this->uid )) {
-          $this->uid = '';
-          $return = TRUE;
+            $this->uid = '';
+            $return = TRUE;
         }
         break;
-      case 'URL':
+        case 'URL':
         if( !empty( $this->url )) {
-          $this->url = '';
-          $return = TRUE;
+            $this->url = '';
+            $return = TRUE;
         }
         break;
-      default:
+        default:
         $reduced = '';
         if( $propName != 'X-PROP' ) {
-          if( !isset( $this->xprop[$propName] )) return FALSE;
-          foreach( $this->xprop as $k => $a ) {
+            if( !isset( $this->xprop[$propName] )) return FALSE;
+            foreach( $this->xprop as $k => $a ) {
             if(( $k != $propName ) && !empty( $a ))
-              $reduced[$k] = $a;
-          }
+                $reduced[$k] = $a;
+            }
         }
         else {
-          if( count( $this->xprop ) <= $propix )  return FALSE;
-          $xpropno = 0;
-          foreach( $this->xprop as $xpropkey => $xpropvalue ) {
+            if( count( $this->xprop ) <= $propix )  return FALSE;
+            $xpropno = 0;
+            foreach( $this->xprop as $xpropkey => $xpropvalue ) {
             if( $propix != $xpropno )
-              $reduced[$xpropkey] = $xpropvalue;
+                $reduced[$xpropkey] = $xpropvalue;
             $xpropno++;
-          }
+            }
         }
         $this->xprop = $reduced;
         return TRUE;
     }
     return $return;
-  }
+    }
 /*********************************************************************************/
 /**
  * delete component property value, fixing components with multiple occurencies
@@ -5951,324 +5950,324 @@ 
  * @param int @propix, default 0
  * @return bool TRUE
  */
-  function deletePropertyM( & $multiprop, $propix=0 ) {
+    function deletePropertyM( & $multiprop, $propix=0 ) {
     if( !isset( $multiprop[$propix])) return FALSE;
     unset( $multiprop[$propix] );
     if( empty( $multiprop )) $multiprop = '';
     return ( isset( $this->multiprop[$propix] )) ? FALSE : TRUE;
-  }
+    }
 /**
- * get component property value/params
- *
- * if property has multiply values, consequtive function calls are needed
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-02
- * @param string $propName, optional
- * @param int @propix, optional, if specific property is wanted in case of multiply occurences
- * @param bool $inclParam=FALSE
- * @param bool $specform=FALSE
- * @return mixed
- */
-  function getProperty( $propName=FALSE, $propix=FALSE, $inclParam=FALSE, $specform=FALSE ) {
+     * get component property value/params
+     *
+     * if property has multiply values, consequtive function calls are needed
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-02
+     * @param string $propName, optional
+     * @param int @propix, optional, if specific property is wanted in case of multiply occurences
+     * @param bool $inclParam=FALSE
+     * @param bool $specform=FALSE
+     * @return mixed
+     */
+    function getProperty( $propName=FALSE, $propix=FALSE, $inclParam=FALSE, $specform=FALSE ) {
     if( $this->_notExistProp( $propName )) return FALSE;
     $propName = ( $propName ) ? strtoupper( $propName ) : 'X-PROP';
     if( in_array( $propName, array( 'ATTACH',   'ATTENDEE', 'CATEGORIES', 'COMMENT',   'CONTACT', 'DESCRIPTION',    'EXDATE', 'EXRULE',
                                     'FREEBUSY', 'RDATE',    'RELATED-TO', 'RESOURCES', 'RRULE',   'REQUEST-STATUS', 'TZNAME', 'X-PROP'  ))) {
-      if( !$propix )
+        if( !$propix )
         $propix = ( isset( $this->propix[$propName] )) ? $this->propix[$propName] + 2 : 1;
-      $this->propix[$propName] = --$propix;
+        $this->propix[$propName] = --$propix;
     }
     switch( $propName ) {
-      case 'ACTION':
+        case 'ACTION':
         if( !empty( $this->action['value'] )) return ( $inclParam ) ? $this->action : $this->action['value'];
         break;
-      case 'ATTACH':
+        case 'ATTACH':
         if( !isset( $this->attach[$propix] )) return FALSE;
         return ( $inclParam ) ? $this->attach[$propix] : $this->attach[$propix]['value'];
         break;
-      case 'ATTENDEE':
+        case 'ATTENDEE':
         if( !isset( $this->attendee[$propix] )) return FALSE;
         return ( $inclParam ) ? $this->attendee[$propix] : $this->attendee[$propix]['value'];
         break;
-      case 'CATEGORIES':
+        case 'CATEGORIES':
         if( !isset( $this->categories[$propix] )) return FALSE;
         return ( $inclParam ) ? $this->categories[$propix] : $this->categories[$propix]['value'];
         break;
-      case 'CLASS':
+        case 'CLASS':
         if( !empty( $this->class['value'] )) return ( $inclParam ) ? $this->class : $this->class['value'];
         break;
-      case 'COMMENT':
+        case 'COMMENT':
         if( !isset( $this->comment[$propix] )) return FALSE;
         return ( $inclParam ) ? $this->comment[$propix] : $this->comment[$propix]['value'];
         break;
-      case 'COMPLETED':
+        case 'COMPLETED':
         if( !empty( $this->completed['value'] )) return ( $inclParam ) ? $this->completed : $this->completed['value'];
         break;
-      case 'CONTACT':
+        case 'CONTACT':
         if( !isset( $this->contact[$propix] )) return FALSE;
         return ( $inclParam ) ? $this->contact[$propix] : $this->contact[$propix]['value'];
         break;
-      case 'CREATED':
+        case 'CREATED':
         if( !empty( $this->created['value'] )) return ( $inclParam ) ? $this->created : $this->created['value'];
         break;
-      case 'DESCRIPTION':
+        case 'DESCRIPTION':
         if( !isset( $this->description[$propix] )) return FALSE;
         return ( $inclParam ) ? $this->description[$propix] : $this->description[$propix]['value'];
         break;
-      case 'DTEND':
+        case 'DTEND':
         if( !empty( $this->dtend['value'] )) return ( $inclParam ) ? $this->dtend : $this->dtend['value'];
         break;
-      case 'DTSTAMP':
+        case 'DTSTAMP':
         if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
-          return;
+            return;
         if( !isset( $this->dtstamp['value'] ))
-          $this->_makeDtstamp();
+            $this->_makeDtstamp();
         return ( $inclParam ) ? $this->dtstamp : $this->dtstamp['value'];
         break;
-      case 'DTSTART':
+        case 'DTSTART':
         if( !empty( $this->dtstart['value'] )) return ( $inclParam ) ? $this->dtstart : $this->dtstart['value'];
         break;
-      case 'DUE':
+        case 'DUE':
         if( !empty( $this->due['value'] )) return ( $inclParam ) ? $this->due : $this->due['value'];
         break;
-      case 'DURATION':
+        case 'DURATION':
         if( !isset( $this->duration['value'] )) return FALSE;
         $value = ( $specform ) ? $this->duration2date() : $this->duration['value'];
         return ( $inclParam ) ? array( 'value' => $value, 'params' =>  $this->duration['params'] ) : $value;
         break;
-      case 'EXDATE':
+        case 'EXDATE':
         if( !isset( $this->exdate[$propix] )) return FALSE;
         return ( $inclParam ) ? $this->exdate[$propix] : $this->exdate[$propix]['value'];
         break;
-      case 'EXRULE':
+        case 'EXRULE':
         if( !isset( $this->exrule[$propix] )) return FALSE;
         return ( $inclParam ) ? $this->exrule[$propix] : $this->exrule[$propix]['value'];
         break;
-      case 'FREEBUSY':
+        case 'FREEBUSY':
         if( !isset( $this->freebusy[$propix] )) return FALSE;
         return ( $inclParam ) ? $this->freebusy[$propix] : $this->freebusy[$propix]['value'];
         break;
-      case 'GEO':
+        case 'GEO':
         if( !empty( $this->geo['value'] )) return ( $inclParam ) ? $this->geo : $this->geo['value'];
         break;
-      case 'LAST-MODIFIED':
+        case 'LAST-MODIFIED':
         if( !empty( $this->lastmodified['value'] )) return ( $inclParam ) ? $this->lastmodified : $this->lastmodified['value'];
         break;
-      case 'LOCATION':
+        case 'LOCATION':
         if( !empty( $this->location['value'] )) return ( $inclParam ) ? $this->location : $this->location['value'];
         break;
-      case 'ORGANIZER':
+        case 'ORGANIZER':
         if( !empty( $this->organizer['value'] )) return ( $inclParam ) ? $this->organizer : $this->organizer['value'];
         break;
-      case 'PERCENT-COMPLETE':
+        case 'PERCENT-COMPLETE':
         if( !empty( $this->percentcomplete['value'] )) return ( $inclParam ) ? $this->percentcomplete : $this->percentcomplete['value'];
         break;
-      case 'PRIORITY':
+        case 'PRIORITY':
         if( !empty( $this->priority['value'] )) return ( $inclParam ) ? $this->priority : $this->priority['value'];
         break;
-      case 'RDATE':
+        case 'RDATE':
         if( !isset( $this->rdate[$propix] )) return FALSE;
         return ( $inclParam ) ? $this->rdate[$propix] : $this->rdate[$propix]['value'];
         break;
-      case 'RECURRENCE-ID':
+        case 'RECURRENCE-ID':
         if( !empty( $this->recurrenceid['value'] )) return ( $inclParam ) ? $this->recurrenceid : $this->recurrenceid['value'];
         break;
-      case 'RELATED-TO':
+        case 'RELATED-TO':
         if( !isset( $this->relatedto[$propix] )) return FALSE;
         return ( $inclParam ) ? $this->relatedto[$propix] : $this->relatedto[$propix]['value'];
         break;
-      case 'REPEAT':
+        case 'REPEAT':
         if( !empty( $this->repeat['value'] )) return ( $inclParam ) ? $this->repeat : $this->repeat['value'];
         break;
-      case 'REQUEST-STATUS':
+        case 'REQUEST-STATUS':
         if( !isset( $this->requeststatus[$propix] )) return FALSE;
         return ( $inclParam ) ? $this->requeststatus[$propix] : $this->requeststatus[$propix]['value'];
         break;
-      case 'RESOURCES':
+        case 'RESOURCES':
         if( !isset( $this->resources[$propix] )) return FALSE;
         return ( $inclParam ) ? $this->resources[$propix] : $this->resources[$propix]['value'];
         break;
-      case 'RRULE':
+        case 'RRULE':
         if( !isset( $this->rrule[$propix] )) return FALSE;
         return ( $inclParam ) ? $this->rrule[$propix] : $this->rrule[$propix]['value'];
         break;
-      case 'SEQUENCE':
+        case 'SEQUENCE':
         if( !empty( $this->sequence['value'] )) return ( $inclParam ) ? $this->sequence : $this->sequence['value'];
         break;
-      case 'STATUS':
+        case 'STATUS':
         if( !empty( $this->status['value'] )) return ( $inclParam ) ? $this->status : $this->status['value'];
         break;
-      case 'SUMMARY':
+        case 'SUMMARY':
         if( !empty( $this->summary['value'] )) return ( $inclParam ) ? $this->summary : $this->summary['value'];
         break;
-      case 'TRANSP':
+        case 'TRANSP':
         if( !empty( $this->transp['value'] )) return ( $inclParam ) ? $this->transp : $this->transp['value'];
         break;
-      case 'TRIGGER':
+        case 'TRIGGER':
         if( !empty( $this->trigger['value'] )) return ( $inclParam ) ? $this->trigger : $this->trigger['value'];
         break;
-      case 'TZID':
+        case 'TZID':
         if( !empty( $this->tzid['value'] )) return ( $inclParam ) ? $this->tzid : $this->tzid['value'];
         break;
-      case 'TZNAME':
+        case 'TZNAME':
         if( !isset( $this->tzname[$propix] )) return FALSE;
         return ( $inclParam ) ? $this->tzname[$propix] : $this->tzname[$propix]['value'];
         break;
-      case 'TZOFFSETFROM':
+        case 'TZOFFSETFROM':
         if( !empty( $this->tzoffsetfrom['value'] )) return ( $inclParam ) ? $this->tzoffsetfrom : $this->tzoffsetfrom['value'];
         break;
-      case 'TZOFFSETTO':
+        case 'TZOFFSETTO':
         if( !empty( $this->tzoffsetto['value'] )) return ( $inclParam ) ? $this->tzoffsetto : $this->tzoffsetto['value'];
         break;
-      case 'TZURL':
+        case 'TZURL':
         if( !empty( $this->tzurl['value'] )) return ( $inclParam ) ? $this->tzurl : $this->tzurl['value'];
         break;
-      case 'UID':
+        case 'UID':
         if( in_array( $this->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' )))
-          return FALSE;
+            return FALSE;
         if( empty( $this->uid['value'] ))
-          $this->_makeuid();
+            $this->_makeuid();
         return ( $inclParam ) ? $this->uid : $this->uid['value'];
         break;
-      case 'URL':
+        case 'URL':
         if( !empty( $this->url['value'] )) return ( $inclParam ) ? $this->url : $this->url['value'];
         break;
-      default:
+        default:
         if( $propName != 'X-PROP' ) {
-          if( !isset( $this->xprop[$propName] )) return FALSE;
-          return ( $inclParam ) ? array( $propName, $this->xprop[$propName] )
+            if( !isset( $this->xprop[$propName] )) return FALSE;
+            return ( $inclParam ) ? array( $propName, $this->xprop[$propName] )
                                 : array( $propName, $this->xprop[$propName]['value'] );
         }
         else {
-          if( empty( $this->xprop )) return FALSE;
-          $xpropno = 0;
-          foreach( $this->xprop as $xpropkey => $xpropvalue ) {
+            if( empty( $this->xprop )) return FALSE;
+            $xpropno = 0;
+            foreach( $this->xprop as $xpropkey => $xpropvalue ) {
             if( $propix == $xpropno )
-              return ( $inclParam ) ? array( $xpropkey, $this->xprop[$xpropkey] )
+                return ( $inclParam ) ? array( $xpropkey, $this->xprop[$xpropkey] )
                                     : array( $xpropkey, $this->xprop[$xpropkey]['value'] );
             else
-              $xpropno++;
-          }
-          return FALSE; // not found ??
+                $xpropno++;
+            }
+            return FALSE; // not found ??
         }
     }
     return FALSE;
-  }
+    }
 /**
- * general component property setting
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-05
- * @param mixed $args variable number of function arguments,
- *                    first argument is ALWAYS component name,
- *                    second ALWAYS component value!
- * @return void
- */
-  function setProperty() {
+     * general component property setting
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-05
+     * @param mixed $args variable number of function arguments,
+     *                    first argument is ALWAYS component name,
+     *                    second ALWAYS component value!
+     * @return void
+     */
+    function setProperty() {
     $numargs    = func_num_args();
     if( 1 > $numargs ) return FALSE;
     $arglist    = func_get_args();
     if( $this->_notExistProp( $arglist[0] )) return FALSE;
     if( !$this->getConfig( 'allowEmpty' ) && ( !isset( $arglist[1] ) || empty( $arglist[1] )))
-      return FALSE;
+        return FALSE;
     $arglist[0] = strtoupper( $arglist[0] );
     for( $argix=$numargs; $argix < 12; $argix++ ) {
-      if( !isset( $arglist[$argix] ))
+        if( !isset( $arglist[$argix] ))
         $arglist[$argix] = null;
     }
     switch( $arglist[0] ) {
-      case 'ACTION':
+        case 'ACTION':
         return $this->setAction( $arglist[1], $arglist[2] );
-      case 'ATTACH':
+        case 'ATTACH':
         return $this->setAttach( $arglist[1], $arglist[2], $arglist[3] );
-      case 'ATTENDEE':
+        case 'ATTENDEE':
         return $this->setAttendee( $arglist[1], $arglist[2], $arglist[3] );
-      case 'CATEGORIES':
+        case 'CATEGORIES':
         return $this->setCategories( $arglist[1], $arglist[2], $arglist[3] );
-      case 'CLASS':
+        case 'CLASS':
         return $this->setClass( $arglist[1], $arglist[2] );
-      case 'COMMENT':
+        case 'COMMENT':
         return $this->setComment( $arglist[1], $arglist[2], $arglist[3] );
-      case 'COMPLETED':
+        case 'COMPLETED':
         return $this->setCompleted( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] );
-      case 'CONTACT':
+        case 'CONTACT':
         return $this->setContact( $arglist[1], $arglist[2], $arglist[3] );
-      case 'CREATED':
+        case 'CREATED':
         return $this->setCreated( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] );
-      case 'DESCRIPTION':
+        case 'DESCRIPTION':
         return $this->setDescription( $arglist[1], $arglist[2], $arglist[3] );
-      case 'DTEND':
+        case 'DTEND':
         return $this->setDtend( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] );
-      case 'DTSTAMP':
+        case 'DTSTAMP':
         return $this->setDtstamp( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] );
-      case 'DTSTART':
+        case 'DTSTART':
         return $this->setDtstart( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] );
-      case 'DUE':
+        case 'DUE':
         return $this->setDue( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] );
-      case 'DURATION':
+        case 'DURATION':
         return $this->setDuration( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6] );
-      case 'EXDATE':
+        case 'EXDATE':
         return $this->setExdate( $arglist[1], $arglist[2], $arglist[3] );
-      case 'EXRULE':
+        case 'EXRULE':
         return $this->setExrule( $arglist[1], $arglist[2], $arglist[3] );
-      case 'FREEBUSY':
+        case 'FREEBUSY':
         return $this->setFreebusy( $arglist[1], $arglist[2], $arglist[3], $arglist[4] );
-      case 'GEO':
+        case 'GEO':
         return $this->setGeo( $arglist[1], $arglist[2], $arglist[3] );
-      case 'LAST-MODIFIED':
+        case 'LAST-MODIFIED':
         return $this->setLastModified( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7] );
-      case 'LOCATION':
+        case 'LOCATION':
         return $this->setLocation( $arglist[1], $arglist[2] );
-      case 'ORGANIZER':
+        case 'ORGANIZER':
         return $this->setOrganizer( $arglist[1], $arglist[2] );
-      case 'PERCENT-COMPLETE':
+        case 'PERCENT-COMPLETE':
         return $this->setPercentComplete( $arglist[1], $arglist[2] );
-      case 'PRIORITY':
+        case 'PRIORITY':
         return $this->setPriority( $arglist[1], $arglist[2] );
-      case 'RDATE':
+        case 'RDATE':
         return $this->setRdate( $arglist[1], $arglist[2], $arglist[3] );
-      case 'RECURRENCE-ID':
+        case 'RECURRENCE-ID':
        return $this->setRecurrenceid( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8] );
-      case 'RELATED-TO':
+        case 'RELATED-TO':
         return $this->setRelatedTo( $arglist[1], $arglist[2], $arglist[3] );
-      case 'REPEAT':
+        case 'REPEAT':
         return $this->setRepeat( $arglist[1], $arglist[2] );
-      case 'REQUEST-STATUS':
+        case 'REQUEST-STATUS':
         return $this->setRequestStatus( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5] );
-      case 'RESOURCES':
+        case 'RESOURCES':
         return $this->setResources( $arglist[1], $arglist[2], $arglist[3] );
-      case 'RRULE':
+        case 'RRULE':
         return $this->setRrule( $arglist[1], $arglist[2], $arglist[3] );
-      case 'SEQUENCE':
+        case 'SEQUENCE':
         return $this->setSequence( $arglist[1], $arglist[2] );
-      case 'STATUS':
+        case 'STATUS':
         return $this->setStatus( $arglist[1], $arglist[2] );
-      case 'SUMMARY':
+        case 'SUMMARY':
         return $this->setSummary( $arglist[1], $arglist[2] );
-      case 'TRANSP':
+        case 'TRANSP':
         return $this->setTransp( $arglist[1], $arglist[2] );
-      case 'TRIGGER':
+        case 'TRIGGER':
         return $this->setTrigger( $arglist[1], $arglist[2], $arglist[3], $arglist[4], $arglist[5], $arglist[6], $arglist[7], $arglist[8], $arglist[9], $arglist[10], $arglist[11] );
-      case 'TZID':
+        case 'TZID':
         return $this->setTzid( $arglist[1], $arglist[2] );
-      case 'TZNAME':
+        case 'TZNAME':
         return $this->setTzname( $arglist[1], $arglist[2], $arglist[3] );
-      case 'TZOFFSETFROM':
+        case 'TZOFFSETFROM':
         return $this->setTzoffsetfrom( $arglist[1], $arglist[2] );
-      case 'TZOFFSETTO':
+        case 'TZOFFSETTO':
         return $this->setTzoffsetto( $arglist[1], $arglist[2] );
-      case 'TZURL':
+        case 'TZURL':
         return $this->setTzurl( $arglist[1], $arglist[2] );
-      case 'UID':
+        case 'UID':
         return $this->setUid( $arglist[1], $arglist[2] );
-      case 'URL':
+        case 'URL':
         return $this->setUrl( $arglist[1], $arglist[2] );
-      default:
+        default:
         return $this->setXprop( $arglist[0], $arglist[1], $arglist[2] );
     }
     return FALSE;
-  }
+    }
 /*********************************************************************************/
 /**
  * parse component unparsed data into properties
@@ -6279,153 +6278,153 @@ 
  * @return bool FALSE if error occurs during parsing
  *
  */
-  function parse( $unparsedtext=null ) {
+    function parse( $unparsedtext=null ) {
     if( $unparsedtext ) {
-      $this->unparsed = array();
-      if( is_array( $unparsedtext )) {
+        $this->unparsed = array();
+        if( is_array( $unparsedtext )) {
         $comp = & $this;
         foreach ( $unparsedtext as $line ) {
-          if( 'END:VALARM' == strtoupper( substr( $line, 0, 10 ))) {
+            if( 'END:VALARM' == strtoupper( substr( $line, 0, 10 ))) {
             $this->setComponent( $comp );
             $comp =  & $this;
             continue;
-          }
-          elseif( 'BEGIN:VALARM' == strtoupper( substr( $line, 0, 12 ))) {
+            }
+            elseif( 'BEGIN:VALARM' == strtoupper( substr( $line, 0, 12 ))) {
             $comp = new valarm();
             continue;
-          }
-          else
+            }
+            else
             $comp->unparsed[] = $line;
         }
-      }
-      else
+        }
+        else
         $this->unparsed = array( trim( $unparsedtext ));
     }
     elseif( !isset( $this->unparsed ))
-      $this->unparsed = array();
+        $this->unparsed = array();
             /* concatenate property values spread over several lines */
     $lastix    = -1;
     $propnames = array( 'action', 'attach', 'attendee', 'categories', 'comment', 'completed'
-                      , 'contact', 'class', 'created', 'description', 'dtend', 'dtstart'
-                      , 'dtstamp', 'due', 'duration', 'exdate', 'exrule', 'freebusy', 'geo'
-                      , 'last-modified', 'location', 'organizer', 'percent-complete'
-                      , 'priority', 'rdate', 'recurrence-id', 'related-to', 'repeat'
-                      , 'request-status', 'resources', 'rrule', 'sequence', 'status'
-                      , 'summary', 'transp', 'trigger', 'tzid', 'tzname', 'tzoffsetfrom'
-                      , 'tzoffsetto', 'tzurl', 'uid', 'url', 'x-' );
+                        , 'contact', 'class', 'created', 'description', 'dtend', 'dtstart'
+                        , 'dtstamp', 'due', 'duration', 'exdate', 'exrule', 'freebusy', 'geo'
+                        , 'last-modified', 'location', 'organizer', 'percent-complete'
+                        , 'priority', 'rdate', 'recurrence-id', 'related-to', 'repeat'
+                        , 'request-status', 'resources', 'rrule', 'sequence', 'status'
+                        , 'summary', 'transp', 'trigger', 'tzid', 'tzname', 'tzoffsetfrom'
+                        , 'tzoffsetto', 'tzurl', 'uid', 'url', 'x-' );
     $proprows  = array();
     foreach( $this->unparsed as $line ) {
-      $newProp = FALSE;
-      foreach ( $propnames as $propname ) {
+        $newProp = FALSE;
+        foreach ( $propnames as $propname ) {
         if( $propname == strtolower( substr( $line, 0, strlen( $propname )))) {
-          $newProp = TRUE;
-          break;
+            $newProp = TRUE;
+            break;
         }
-      }
-      if( $newProp ) {
+        }
+        if( $newProp ) {
         $newProp = FALSE;
         $lastix++;
         $proprows[$lastix]  = $line;
-      }
-      else {
+        }
+        else {
             /* remove line breaks */
         if(( '\n' == substr( $proprows[$lastix], -2 )) &&
            (  ' ' == substr( $line, 0, 1 ))) {
-          $proprows[$lastix] = substr( $proprows[$lastix], 0, strlen( $proprows[$lastix] ) - 2 );
-          $line = substr( $line, 1 );
+            $proprows[$lastix] = substr( $proprows[$lastix], 0, strlen( $proprows[$lastix] ) - 2 );
+            $line = substr( $line, 1 );
         }
         $proprows[$lastix] .= $line;
-      }
+        }
     }
             /* parse each property 'line' */
     foreach( $proprows as $line ) {
-      $line = str_replace( "\n ", '', $line );
-      if( '\n' == substr( $line, -2 ))
+        $line = str_replace( "\n ", '', $line );
+        if( '\n' == substr( $line, -2 ))
         $line = substr( $line, 0, strlen( $line ) - 2 );
             /* get propname, (problem with x-properties, otherwise in previous loop) */
-      $cix = $propname = null;
-      for( $cix=0; $cix < strlen( $line ); $cix++ ) {
+        $cix = $propname = null;
+        for( $cix=0; $cix < strlen( $line ); $cix++ ) {
         if( in_array( $line{$cix}, array( ':', ';' )))
-          break;
+            break;
         else {
-          $propname .= $line{$cix};
+            $propname .= $line{$cix};
         }
-      }
-      if(( 'x-' == substr( $propname, 0, 2 )) || ( 'X-' == substr( $propname, 0, 2 ))) {
+        }
+        if(( 'x-' == substr( $propname, 0, 2 )) || ( 'X-' == substr( $propname, 0, 2 ))) {
         $propname2 = $propname;
         $propname  = 'X-';
-      }
+        }
             /* rest of the line is opt.params and value */
-      $line = substr( $line, $cix );
+        $line = substr( $line, $cix );
             /* separate attributes from value */
-      $attr   = array();
-      $attrix = -1;
-      $strlen = strlen( $line );
-      for( $cix=0; $cix < $strlen; $cix++ ) {
+        $attr   = array();
+        $attrix = -1;
+        $strlen = strlen( $line );
+        for( $cix=0; $cix < $strlen; $cix++ ) {
         if((       ':'   == $line{$cix} )             &&
                  ( '://' != substr( $line, $cix, 3 )) &&
            ( 'mailto:'   != strtolower( substr( $line, $cix - 6, 7 )))) {
-          $attrEnd = TRUE;
-          if(( $cix < ( $strlen - 4 )) &&
+            $attrEnd = TRUE;
+            if(( $cix < ( $strlen - 4 )) &&
                ctype_digit( substr( $line, $cix+1, 4 ))) { // an URI with a (4pos) portnr??
             for( $c2ix = $cix; 3 < $c2ix; $c2ix-- ) {
-              if( '://' == substr( $line, $c2ix - 2, 3 )) {
+                if( '://' == substr( $line, $c2ix - 2, 3 )) {
                 $attrEnd = FALSE;
                 break; // an URI with a portnr!!
-              }
+                }
             }
-          }
-          if( $attrEnd) {
+            }
+            if( $attrEnd) {
             $line = substr( $line, $cix + 1 );
             break;
-          }
+            }
         }
         if( ';' == $line{$cix} )
-          $attr[++$attrix] = null;
+            $attr[++$attrix] = null;
         else
-          $attr[$attrix] .= $line{$cix};
-      }
+            $attr[$attrix] .= $line{$cix};
+        }
             /* make attributes in array format */
-      $propattr = array();
-      foreach( $attr as $attribute ) {
+        $propattr = array();
+        foreach( $attr as $attribute ) {
         $attrsplit = explode( '=', $attribute, 2 );
         if( 1 < count( $attrsplit ))
-          $propattr[$attrsplit[0]] = $attrsplit[1];
+            $propattr[$attrsplit[0]] = $attrsplit[1];
         else
-          $propattr[] = $attribute;
-      }
+            $propattr[] = $attribute;
+        }
             /* call setProperty( $propname.. . */
-      switch( $propname ) {
+        switch( $propname ) {
         case 'ATTENDEE':
           foreach( $propattr as $pix => $attr ) {
             $attr2 = explode( ',', $attr );
-              if( 1 < count( $attr2 ))
+                if( 1 < count( $attr2 ))
                 $propattr[$pix] = $attr2;
-          }
-          $this->setProperty( $propname, $line, $propattr );
-          break;
+            }
+            $this->setProperty( $propname, $line, $propattr );
+            break;
         case 'CATEGORIES':
         case 'RESOURCES':
           if( FALSE !== strpos( $line, ',' )) {
             $content  = explode( ',', $line );
             $clen     = count( $content );
             for( $cix = 0; $cix < $clen; $cix++ ) {
-              if( "\\" == substr($content[$cix], -1)) {
+                if( "\\" == substr($content[$cix], -1)) {
                 $content[$cix] .= ','.$content[$cix + 1];
                 unset($content[$cix + 1]);
                 $cix++;
-              }
+                }
             }
             if( 1 < count( $content )) {
-              $content = array_values( $content );
-              foreach( $content as $cix => $contentPart )
+                $content = array_values( $content );
+                foreach( $content as $cix => $contentPart )
                 $content[$cix] = $this->_strunrep( $contentPart );
-              $this->setProperty( $propname, $content, $propattr );
-              break;
+                $this->setProperty( $propname, $content, $propattr );
+                break;
             }
             else
-              $line = reset( $content );
-          }
+                $line = reset( $content );
+            }
         case 'X-':
           $propname = ( isset( $propname2 )) ? $propname2 : $propname;
         case 'COMMENT':
@@ -6435,125 +6434,125 @@ 
         case 'SUMMARY':
           if( empty( $line ))
             $propattr = null;
-          $this->setProperty( $propname, $this->_strunrep( $line ), $propattr );
-          unset( $propname2 );
-          break;
+            $this->setProperty( $propname, $this->_strunrep( $line ), $propattr );
+            unset( $propname2 );
+            break;
         case 'REQUEST-STATUS':
           $values    = explode( ';', $line, 3 );
-          $values[1] = ( !isset( $values[1] )) ? null : $this->_strunrep( $values[1] );
-          $values[2] = ( !isset( $values[2] )) ? null : $this->_strunrep( $values[2] );
-          $this->setProperty( $propname
+            $values[1] = ( !isset( $values[1] )) ? null : $this->_strunrep( $values[1] );
+            $values[2] = ( !isset( $values[2] )) ? null : $this->_strunrep( $values[2] );
+            $this->setProperty( $propname
                             , $values[0]  // statcode
                             , $values[1]  // statdesc
                             , $values[2]  // extdata
                             , $propattr );
-          break;
+            break;
         case 'FREEBUSY':
           $fbtype = ( isset( $propattr['FBTYPE'] )) ? $propattr['FBTYPE'] : ''; // force setting default, if missing
-          unset( $propattr['FBTYPE'] );
-          $values = explode( ',', $line );
-          foreach( $values as $vix => $value ) {
+            unset( $propattr['FBTYPE'] );
+            $values = explode( ',', $line );
+            foreach( $values as $vix => $value ) {
             $value2 = explode( '/', $value );
             if( 1 < count( $value2 ))
-              $values[$vix] = $value2;
-          }
-          $this->setProperty( $propname, $fbtype, $values, $propattr );
-          break;
+                $values[$vix] = $value2;
+            }
+            $this->setProperty( $propname, $fbtype, $values, $propattr );
+            break;
         case 'GEO':
           $value = explode( ';', $line, 2 );
-          if( 2 > count( $value ))
+            if( 2 > count( $value ))
             $value[1] = null;
-          $this->setProperty( $propname, $value[0], $value[1], $propattr );
-          break;
+            $this->setProperty( $propname, $value[0], $value[1], $propattr );
+            break;
         case 'EXDATE':
           $values = ( !empty( $line )) ? explode( ',', $line ) : null;
-          $this->setProperty( $propname, $values, $propattr );
-          break;
+            $this->setProperty( $propname, $values, $propattr );
+            break;
         case 'RDATE':
           if( empty( $line )) {
             $this->setProperty( $propname, $line, $propattr );
             break;
-          }
-          $values = explode( ',', $line );
-          foreach( $values as $vix => $value ) {
+            }
+            $values = explode( ',', $line );
+            foreach( $values as $vix => $value ) {
             $value2 = explode( '/', $value );
             if( 1 < count( $value2 ))
-              $values[$vix] = $value2;
-          }
-          $this->setProperty( $propname, $values, $propattr );
-          break;
+                $values[$vix] = $value2;
+            }
+            $this->setProperty( $propname, $values, $propattr );
+            break;
         case 'EXRULE':
         case 'RRULE':
           $values = explode( ';', $line );
-          $recur = array();
-          foreach( $values as $value2 ) {
+            $recur = array();
+            foreach( $values as $value2 ) {
             if( empty( $value2 ))
-              continue; // ;-char in ending position ???
+                continue; // ;-char in ending position ???
             $value3 = explode( '=', $value2, 2 );
             $rulelabel = strtoupper( $value3[0] );
             switch( $rulelabel ) {
-              case 'BYDAY': {
+                case 'BYDAY': {
                 $value4 = explode( ',', $value3[1] );
                 if( 1 < count( $value4 )) {
-                  foreach( $value4 as $v5ix => $value5 ) {
+                    foreach( $value4 as $v5ix => $value5 ) {
                     $value6 = array();
                     $dayno = $dayname = null;
                     $value5 = trim( (string) $value5 );
                     if(( ctype_alpha( substr( $value5, -1 ))) &&
                        ( ctype_alpha( substr( $value5, -2, 1 )))) {
-                      $dayname = substr( $value5, -2, 2 );
-                      if( 2 < strlen( $value5 ))
+                        $dayname = substr( $value5, -2, 2 );
+                        if( 2 < strlen( $value5 ))
                         $dayno = substr( $value5, 0, ( strlen( $value5 ) - 2 ));
                     }
                     if( $dayno )
-                      $value6[] = $dayno;
+                        $value6[] = $dayno;
                     if( $dayname )
-                      $value6['DAY'] = $dayname;
+                        $value6['DAY'] = $dayname;
                     $value4[$v5ix] = $value6;
-                  }
+                    }
                 }
                 else {
-                  $value4 = array();
-                  $dayno  = $dayname = null;
-                  $value5 = trim( (string) $value3[1] );
-                  if(( ctype_alpha( substr( $value5, -1 ))) &&
+                    $value4 = array();
+                    $dayno  = $dayname = null;
+                    $value5 = trim( (string) $value3[1] );
+                    if(( ctype_alpha( substr( $value5, -1 ))) &&
                      ( ctype_alpha( substr( $value5, -2, 1 )))) {
-                      $dayname = substr( $value5, -2, 2 );
+                        $dayname = substr( $value5, -2, 2 );
                     if( 2 < strlen( $value5 ))
-                      $dayno = substr( $value5, 0, ( strlen( $value5 ) - 2 ));
-                  }
-                  if( $dayno )
+                        $dayno = substr( $value5, 0, ( strlen( $value5 ) - 2 ));
+                    }
+                    if( $dayno )
                     $value4[] = $dayno;
-                  if( $dayname )
+                    if( $dayname )
                     $value4['DAY'] = $dayname;
                 }
                 $recur[$rulelabel] = $value4;
                 break;
-              }
-              default: {
+                }
+                default: {
                 $value4 = explode( ',', $value3[1] );
                 if( 1 < count( $value4 ))
-                  $value3[1] = $value4;
+                    $value3[1] = $value4;
                 $recur[$rulelabel] = $value3[1];
                 break;
-              }
+                }
             } // end - switch $rulelabel
-          } // end - foreach( $values.. .
-          $this->setProperty( $propname, $recur, $propattr );
-          break;
+            } // end - foreach( $values.. .
+            $this->setProperty( $propname, $recur, $propattr );
+            break;
         default:
           $this->setProperty( $propname, $line, $propattr );
-          break;
-      } // end  switch( $propname.. .
+            break;
+        } // end  switch( $propname.. .
     } // end - foreach( $proprows.. .
     unset( $this->unparsed, $proprows );
     if( isset( $this->components ) && is_array( $this->components ) && ( 0 < count( $this->components ))) {
-      for( $six = 0; $six < count( $this->components ); $six++ ) {
+        for( $six = 0; $six < count( $this->components ); $six++ ) {
         if( !empty( $this->components[$six]->unparsed ))
-          $this->components[$six]->parse();
-      }
+            $this->components[$six]->parse();
+        }
+    }
     }
-  }
 /*********************************************************************************/
 /*********************************************************************************/
 /**
@@ -6563,12 +6562,12 @@ 
  * @since 2.2.16 - 2007-11-07
  * @return object
  */
-  function copy() {
+    function copy() {
     $serialized_contents = serialize($this);
     $copy = unserialize($serialized_contents);
     unset( $copy->propix );
     return $copy;
- }
+    }
 /*********************************************************************************/
 /*********************************************************************************/
 /**
@@ -6580,187 +6579,187 @@ 
  * @param mixed $arg2 optional, ordno if arg1 = component type
  * @return void
  */
-  function deleteComponent( $arg1, $arg2=FALSE  ) {
+    function deleteComponent( $arg1, $arg2=FALSE  ) {
     if( !isset( $this->components )) return FALSE;
     $argType = $index = null;
     if ( ctype_digit( (string) $arg1 )) {
-      $argType = 'INDEX';
-      $index   = (int) $arg1 - 1;
+        $argType = 'INDEX';
+        $index   = (int) $arg1 - 1;
     }
     elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
-      $argType = strtolower( $arg1 );
-      $index   = ( !empty( $arg2 ) && ctype_digit( (string) $arg2 )) ? (( int ) $arg2 - 1 ) : 0;
+        $argType = strtolower( $arg1 );
+        $index   = ( !empty( $arg2 ) && ctype_digit( (string) $arg2 )) ? (( int ) $arg2 - 1 ) : 0;
     }
     $cix2dC = 0;
     foreach ( $this->components as $cix => $component) {
-      if( empty( $component )) continue;
-      unset( $component->propix );
-      if(( 'INDEX' == $argType ) && ( $index == $cix )) {
+        if( empty( $component )) continue;
+        unset( $component->propix );
+        if(( 'INDEX' == $argType ) && ( $index == $cix )) {
         unset( $this->components[$cix] );
         return TRUE;
-      }
-      elseif( $argType == $component->objName ) {
+        }
+        elseif( $argType == $component->objName ) {
         if( $index == $cix2dC ) {
-          unset( $this->components[$cix] );
-          return TRUE;
+            unset( $this->components[$cix] );
+            return TRUE;
         }
         $cix2dC++;
-      }
-      elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
+        }
+        elseif( !$argType && ($arg1 == $component->getProperty( 'uid' ))) {
         unset( $this->components[$cix] );
         return TRUE;
-      }
+        }
     }
     return FALSE;
-  }
+    }
 /**
- * get calendar component subcomponent from component container
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-10-15
- * @param mixed $arg1 optional, ordno/component type/ component uid
- * @param mixed $arg2 optional, ordno if arg1 = component type
- * @return object
- */
-  function getComponent ( $arg1=FALSE, $arg2=FALSE ) {
+     * get calendar component subcomponent from component container
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-10-15
+     * @param mixed $arg1 optional, ordno/component type/ component uid
+     * @param mixed $arg2 optional, ordno if arg1 = component type
+     * @return object
+     */
+    function getComponent ( $arg1=FALSE, $arg2=FALSE ) {
     if( !isset( $this->components )) return FALSE;
     $index = $argType = null;
     if ( !$arg1 ) {
-      $argType = 'INDEX';
-      $index   = $this->compix['INDEX'] =
+        $argType = 'INDEX';
+        $index   = $this->compix['INDEX'] =
         ( isset( $this->compix['INDEX'] )) ? $this->compix['INDEX'] + 1 : 1;
     }
     elseif ( ctype_digit( (string) $arg1 )) {
-      $argType = 'INDEX';
-      $index   = (int) $arg1;
-      unset( $this->compix );
+        $argType = 'INDEX';
+        $index   = (int) $arg1;
+        unset( $this->compix );
     }
     elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
-      unset( $this->compix['INDEX'] );
-      $argType = strtolower( $arg1 );
-      if( !$arg2 )
+        unset( $this->compix['INDEX'] );
+        $argType = strtolower( $arg1 );
+        if( !$arg2 )
         $index = $this->compix[$argType] =
         ( isset( $this->compix[$argType] )) ? $this->compix[$argType] + 1 : 1;
-      else
+        else
         $index = (int) $arg2;
     }
     $index  -= 1;
     $ckeys = array_keys( $this->components );
     if( !empty( $index) && ( $index > end( $ckeys )))
-      return FALSE;
+        return FALSE;
     $cix2gC = 0;
     foreach( $this->components as $cix => $component ) {
-      if( empty( $component )) continue;
-      unset( $component->propix );
-      if(( 'INDEX' == $argType ) && ( $index == $cix ))
+        if( empty( $component )) continue;
+        unset( $component->propix );
+        if(( 'INDEX' == $argType ) && ( $index == $cix ))
         return $component->copy();
-      elseif( $argType == $component->objName ) {
-         if( $index == $cix2gC )
-           return $component->copy();
-         $cix2gC++;
-      }
-      elseif( !$argType && ( $arg1 == $component->getProperty( 'uid' ))) {
+        elseif( $argType == $component->objName ) {
+            if( $index == $cix2gC )
+            return $component->copy();
+            $cix2gC++;
+        }
+        elseif( !$argType && ( $arg1 == $component->getProperty( 'uid' ))) {
         unset( $component->propix );
         return $component->copy();
-      }
+        }
     }
             /* not found.. . */
     unset( $this->compix );
     return false;
-  }
+    }
 /**
- * add calendar component as subcomponent to container for subcomponents
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 1.x.x - 2007-04-24
- * @param object $component calendar component
- * @return void
- */
-  function addSubComponent ( $component ) {
+     * add calendar component as subcomponent to container for subcomponents
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 1.x.x - 2007-04-24
+     * @param object $component calendar component
+     * @return void
+     */
+    function addSubComponent ( $component ) {
     $this->setComponent( $component );
-  }
+    }
 /**
- * add calendar component as subcomponent to container for subcomponents
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.13 - 2008-09-24
- * @param object $component calendar component
- * @param mixed $arg1 optional, ordno/component type/ component uid
- * @param mixed $arg2 optional, ordno if arg1 = component type
- * @return bool
- */
-  function setComponent( $component, $arg1=FALSE, $arg2=FALSE  ) {
+     * add calendar component as subcomponent to container for subcomponents
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.13 - 2008-09-24
+     * @param object $component calendar component
+     * @param mixed $arg1 optional, ordno/component type/ component uid
+     * @param mixed $arg2 optional, ordno if arg1 = component type
+     * @return bool
+     */
+    function setComponent( $component, $arg1=FALSE, $arg2=FALSE  ) {
     if( !isset( $this->components )) return FALSE;
     if( '' >= $component->getConfig( 'language'))
-      $component->setConfig( 'language',  $this->getConfig( 'language' ));
+        $component->setConfig( 'language',  $this->getConfig( 'language' ));
     $component->setConfig( 'allowEmpty',  $this->getConfig( 'allowEmpty' ));
     $component->setConfig( 'nl',          $this->getConfig( 'nl' ));
     $component->setConfig( 'unique_id',   $this->getConfig( 'unique_id' ));
     $component->setConfig( 'format',      $this->getConfig( 'format' ));
     if( !in_array( $component->objName, array( 'valarm', 'vtimezone', 'standard', 'daylight' ))) {
-      unset( $component->propix );
+        unset( $component->propix );
             /* make sure dtstamp and uid is set */
-      $dummy = $component->getProperty( 'dtstamp' );
-      $dummy = $component->getProperty( 'uid' );
+        $dummy = $component->getProperty( 'dtstamp' );
+        $dummy = $component->getProperty( 'uid' );
     }
     if( !$arg1 ) {
-      $this->components[] = $component->copy();
-      return TRUE;
+        $this->components[] = $component->copy();
+        return TRUE;
     }
     $argType = $index = null;
     if ( ctype_digit( (string) $arg1 )) {
-      $argType = 'INDEX';
-      $index   = (int) $arg1 - 1;
+        $argType = 'INDEX';
+        $index   = (int) $arg1 - 1;
     }
     elseif(( strlen( $arg1 ) <= strlen( 'vfreebusy' )) && ( FALSE === strpos( $arg1, '@' ))) {
-      $argType = strtolower( $arg1 );
-      $index = ( ctype_digit( (string) $arg2 )) ? ((int) $arg2) - 1 : 0;
+        $argType = strtolower( $arg1 );
+        $index = ( ctype_digit( (string) $arg2 )) ? ((int) $arg2) - 1 : 0;
     }
     $cix2sC = 0;
     foreach ( $this->components as $cix => $component2 ) {
-      if( empty( $component2 )) continue;
-      unset( $component2->propix );
-      if(( 'INDEX' == $argType ) && ( $index == $cix )) {
+        if( empty( $component2 )) continue;
+        unset( $component2->propix );
+        if(( 'INDEX' == $argType ) && ( $index == $cix )) {
         $this->components[$cix] = $component->copy();
         return TRUE;
-      }
-      elseif( $argType == $component2->objName ) {
+        }
+        elseif( $argType == $component2->objName ) {
         if( $index == $cix2sC ) {
-          $this->components[$cix] = $component->copy();
-          return TRUE;
+            $this->components[$cix] = $component->copy();
+            return TRUE;
         }
         $cix2sC++;
-      }
-      elseif( !$argType && ($arg1 == $component2->getProperty( 'uid' ))) {
+        }
+        elseif( !$argType && ($arg1 == $component2->getProperty( 'uid' ))) {
         $this->components[$cix] = $component->copy();
         return TRUE;
-      }
+        }
     }
             /* not found.. . insert anyway.. .*/
     $this->components[] = $component->copy();
     return TRUE;
-  }
+    }
 /**
- * creates formatted output for subcomponents
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.4.10 - 2008-08-06
- * @return string
- */
-  function createSubComponent() {
+     * creates formatted output for subcomponents
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.4.10 - 2008-08-06
+     * @return string
+     */
+    function createSubComponent() {
     $output = null;
     foreach( $this->components as $component ) {
-      if( empty( $component )) continue;
-      if( '' >= $component->getConfig( 'language'))
+        if( empty( $component )) continue;
+        if( '' >= $component->getConfig( 'language'))
         $component->setConfig( 'language',  $this->getConfig( 'language' ));
-      $component->setConfig( 'allowEmpty',  $this->getConfig( 'allowEmpty' ));
-      $component->setConfig( 'nl',          $this->getConfig( 'nl' ));
-      $component->setConfig( 'unique_id',   $this->getConfig( 'unique_id' ));
-      $component->setConfig( 'format',      $this->getConfig( 'format' ));
-      $output .= $component->createComponent( $this->xcaldecl );
+        $component->setConfig( 'allowEmpty',  $this->getConfig( 'allowEmpty' ));
+        $component->setConfig( 'nl',          $this->getConfig( 'nl' ));
+        $component->setConfig( 'unique_id',   $this->getConfig( 'unique_id' ));
+        $component->setConfig( 'format',      $this->getConfig( 'format' ));
+        $output .= $component->createComponent( $this->xcaldecl );
     }
     return $output;
-  }
+    }
 /********************************************************************************/
 /**
  * break lines at pos 75
@@ -6784,83 +6783,83 @@ 
  * @param string $value
  * @return string
  */
-  function _size75( $string ) {
+    function _size75( $string ) {
     $strlen = strlen( $string );
     $tmp    = $string;
     $string = null;
     while( $strlen > 75 ) {
-       $breakAtChar = 75;
-       if( substr( $tmp, ( $breakAtChar - 1 ), strlen( '\n' )) == '\n' )
-         $breakAtChar = $breakAtChar - 1;
-       $string .= substr( $tmp, 0, $breakAtChar );
-       $string .= $this->nl;
-       $tmp     = ' '.substr( $tmp, $breakAtChar );
-       $strlen  = strlen( $tmp );
+        $breakAtChar = 75;
+        if( substr( $tmp, ( $breakAtChar - 1 ), strlen( '\n' )) == '\n' )
+            $breakAtChar = $breakAtChar - 1;
+        $string .= substr( $tmp, 0, $breakAtChar );
+        $string .= $this->nl;
+        $tmp     = ' '.substr( $tmp, $breakAtChar );
+        $strlen  = strlen( $tmp );
     } // while
     $string .= rtrim( $tmp ); // the rest
     if( $this->nl != substr( $string, ( 0 - strlen( $this->nl ))))
-      $string .= $this->nl;
+        $string .= $this->nl;
     return $string;
-  }
+    }
 /**
- * special characters management output
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.3.3 - 2007-12-20
- * @param string $string
- * @return string
- */
-  function _strrep( $string ) {
+     * special characters management output
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.3.3 - 2007-12-20
+     * @param string $string
+     * @return string
+     */
+    function _strrep( $string ) {
     switch( $this->format ) {
-      case 'xcal':
+        case 'xcal':
         $string = str_replace( '\n',  $this->nl, $string);
         $string = htmlspecialchars( strip_tags( stripslashes( urldecode ( $string ))));
         break;
-      default:
+        default:
         $pos = 0;
         while( $pos <= strlen( $string )) {
-          $pos = strpos( $string, "\\", $pos );
-          if( FALSE === $pos )
+            $pos = strpos( $string, "\\", $pos );
+            if( FALSE === $pos )
             break;
-          if( !in_array( $string{($pos + 1)}, array( 'n', 'N', 'r', ',', ';' ))) {
+            if( !in_array( $string{($pos + 1)}, array( 'n', 'N', 'r', ',', ';' ))) {
             $string = substr( $string, 0, $pos )."\\".substr( $string, ( $pos + 1 ));
             $pos += 1;
-          }
-          $pos += 1;
+            }
+            $pos += 1;
         }
         if( FALSE !== strpos( $string, '"' ))
-          $string = str_replace('"',   "'",       $string);
+            $string = str_replace('"',   "'",       $string);
         if( FALSE !== strpos( $string, ',' ))
-          $string = str_replace(',',   '\,',      $string);
+            $string = str_replace(',',   '\,',      $string);
         if( FALSE !== strpos( $string, ';' ))
-          $string = str_replace(';',   '\;',      $string);
+            $string = str_replace(';',   '\;',      $string);
         if( FALSE !== strpos( $string, "\r\n" ))
-          $string = str_replace( "\r\n", '\n',    $string);
+            $string = str_replace( "\r\n", '\n',    $string);
         elseif( FALSE !== strpos( $string, "\r" ))
-          $string = str_replace( "\r", '\n',      $string);
+            $string = str_replace( "\r", '\n',      $string);
         if( FALSE !== strpos( $string, '\N' ))
-          $string = str_replace( '\N', '\n',      $string);
+            $string = str_replace( '\N', '\n',      $string);
 //        if( FALSE !== strpos( $string, $this->nl ))
-          $string = str_replace( $this->nl, '\n', $string);
+            $string = str_replace( $this->nl, '\n', $string);
         break;
     }
     return $string;
-  }
+    }
 /**
- * special characters management input (from iCal file)
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.3.3 - 2007-11-23
- * @param string $string
- * @return string
- */
-  function _strunrep( $string ) {
+     * special characters management input (from iCal file)
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.3.3 - 2007-11-23
+     * @param string $string
+     * @return string
+     */
+    function _strunrep( $string ) {
     $string = str_replace( '\\\\', '\\',     $string);
     $string = str_replace( '\,',   ',',      $string);
     $string = str_replace( '\;',   ';',      $string);
 //    $string = str_replace( '\n',  $this->nl, $string); // ??
     return $string;
-  }
+    }
 }
 /*********************************************************************************/
 /*********************************************************************************/
@@ -6871,46 +6870,46 @@ 
  * @since 2.5.1 - 2008-10-12
  */
 class vevent extends calendarComponent {
-  var $attach;
-  var $attendee;
-  var $categories;
-  var $comment;
-  var $contact;
-  var $class;
-  var $created;
-  var $description;
-  var $dtend;
-  var $dtstart;
-  var $duration;
-  var $exdate;
-  var $exrule;
-  var $geo;
-  var $lastmodified;
-  var $location;
-  var $organizer;
-  var $priority;
-  var $rdate;
-  var $recurrenceid;
-  var $relatedto;
-  var $requeststatus;
-  var $resources;
-  var $rrule;
-  var $sequence;
-  var $status;
-  var $summary;
-  var $transp;
-  var $url;
-  var $xprop;
+    var $attach;
+    var $attendee;
+    var $categories;
+    var $comment;
+    var $contact;
+    var $class;
+    var $created;
+    var $description;
+    var $dtend;
+    var $dtstart;
+    var $duration;
+    var $exdate;
+    var $exrule;
+    var $geo;
+    var $lastmodified;
+    var $location;
+    var $organizer;
+    var $priority;
+    var $rdate;
+    var $recurrenceid;
+    var $relatedto;
+    var $requeststatus;
+    var $resources;
+    var $rrule;
+    var $sequence;
+    var $status;
+    var $summary;
+    var $transp;
+    var $url;
+    var $xprop;
             //  component subcomponents container
-  var $components;
-/**
- * constructor for calendar component VEVENT object
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-10-31
- * @return void
- */
-  function vevent() {
+    var $components;
+/**
+     * constructor for calendar component VEVENT object
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-10-31
+     * @return void
+     */
+    function vevent() {
     $this->calendarComponent();
 
     $this->attach          = '';
@@ -6946,16 +6945,16 @@ 
 
     $this->components      = array();
 
-  }
+    }
 /**
- * create formatted output for calendar component VEVENT object instance
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-07
- * @param array $xcaldecl
- * @return string
- */
-  function createComponent( &$xcaldecl ) {
+     * create formatted output for calendar component VEVENT object instance
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-07
+     * @param array $xcaldecl
+     * @return string
+     */
+    function createComponent( &$xcaldecl ) {
     $objectname    = $this->_createFormat();
     $component     = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
     $component    .= $this->createUid();
@@ -6993,11 +6992,11 @@ 
     $component    .= $this->createSubComponent();
     $component    .= $this->componentEnd1.$objectname.$this->componentEnd2;
     if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
-      foreach( $this->xcaldecl as $localxcaldecl )
+        foreach( $this->xcaldecl as $localxcaldecl )
         $xcaldecl[] = $localxcaldecl;
     }
     return $component;
-  }
+    }
 }
 /*********************************************************************************/
 /*********************************************************************************/
@@ -7008,47 +7007,47 @@ 
  * @since 2.5.1 - 2008-10-12
  */
 class vtodo extends calendarComponent {
-  var $attach;
-  var $attendee;
-  var $categories;
-  var $comment;
-  var $completed;
-  var $contact;
-  var $class;
-  var $created;
-  var $description;
-  var $dtstart;
-  var $due;
-  var $duration;
-  var $exdate;
-  var $exrule;
-  var $geo;
-  var $lastmodified;
-  var $location;
-  var $organizer;
-  var $percentcomplete;
-  var $priority;
-  var $rdate;
-  var $recurrenceid;
-  var $relatedto;
-  var $requeststatus;
-  var $resources;
-  var $rrule;
-  var $sequence;
-  var $status;
-  var $summary;
-  var $url;
-  var $xprop;
+    var $attach;
+    var $attendee;
+    var $categories;
+    var $comment;
+    var $completed;
+    var $contact;
+    var $class;
+    var $created;
+    var $description;
+    var $dtstart;
+    var $due;
+    var $duration;
+    var $exdate;
+    var $exrule;
+    var $geo;
+    var $lastmodified;
+    var $location;
+    var $organizer;
+    var $percentcomplete;
+    var $priority;
+    var $rdate;
+    var $recurrenceid;
+    var $relatedto;
+    var $requeststatus;
+    var $resources;
+    var $rrule;
+    var $sequence;
+    var $status;
+    var $summary;
+    var $url;
+    var $xprop;
             //  component subcomponents container
-  var $components;
-/**
- * constructor for calendar component VTODO object
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-10-31
- * @return void
- */
-  function vtodo() {
+    var $components;
+/**
+     * constructor for calendar component VTODO object
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-10-31
+     * @return void
+     */
+    function vtodo() {
     $this->calendarComponent();
 
     $this->attach          = '';
@@ -7084,16 +7083,16 @@ 
     $this->xprop           = '';
 
     $this->components      = array();
-  }
+    }
 /**
- * create formatted output for calendar component VTODO object instance
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-11-07
- * @param array $xcaldecl
- * @return string
- */
-  function createComponent( &$xcaldecl ) {
+     * create formatted output for calendar component VTODO object instance
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-11-07
+     * @param array $xcaldecl
+     * @return string
+     */
+    function createComponent( &$xcaldecl ) {
     $objectname    = $this->_createFormat();
     $component     = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
     $component    .= $this->createUid();
@@ -7132,11 +7131,11 @@ 
     $component    .= $this->createSubComponent();
     $component    .= $this->componentEnd1.$objectname.$this->componentEnd2;
     if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
-      foreach( $this->xcaldecl as $localxcaldecl )
+        foreach( $this->xcaldecl as $localxcaldecl )
         $xcaldecl[] = $localxcaldecl;
     }
     return $component;
-  }
+    }
 }
 /*********************************************************************************/
 /*********************************************************************************/
@@ -7147,37 +7146,37 @@ 
  * @since 2.5.1 - 2008-10-12
  */
 class vjournal extends calendarComponent {
-  var $attach;
-  var $attendee;
-  var $categories;
-  var $comment;
-  var $contact;
-  var $class;
-  var $created;
-  var $description;
-  var $dtstart;
-  var $exdate;
-  var $exrule;
-  var $lastmodified;
-  var $organizer;
-  var $rdate;
-  var $recurrenceid;
-  var $relatedto;
-  var $requeststatus;
-  var $rrule;
-  var $sequence;
-  var $status;
-  var $summary;
-  var $url;
-  var $xprop;
-/**
- * constructor for calendar component VJOURNAL object
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-10-31
- * @return void
- */
-  function vjournal() {
+    var $attach;
+    var $attendee;
+    var $categories;
+    var $comment;
+    var $contact;
+    var $class;
+    var $created;
+    var $description;
+    var $dtstart;
+    var $exdate;
+    var $exrule;
+    var $lastmodified;
+    var $organizer;
+    var $rdate;
+    var $recurrenceid;
+    var $relatedto;
+    var $requeststatus;
+    var $rrule;
+    var $sequence;
+    var $status;
+    var $summary;
+    var $url;
+    var $xprop;
+/**
+     * constructor for calendar component VJOURNAL object
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-10-31
+     * @return void
+     */
+    function vjournal() {
     $this->calendarComponent();
 
     $this->attach          = '';
@@ -7203,16 +7202,16 @@ 
     $this->summary         = '';
     $this->url             = '';
     $this->xprop           = '';
-  }
+    }
 /**
- * create formatted output for calendar component VJOURNAL object instance
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-10-12
- * @param array $xcaldecl
- * @return string
- */
-  function createComponent( &$xcaldecl ) {
+     * create formatted output for calendar component VJOURNAL object instance
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-10-12
+     * @param array $xcaldecl
+     * @return string
+     */
+    function createComponent( &$xcaldecl ) {
     $objectname = $this->_createFormat();
     $component  = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
     $component .= $this->createUid();
@@ -7242,11 +7241,11 @@ 
     $component .= $this->createXprop();
     $component .= $this->componentEnd1.$objectname.$this->componentEnd2;
     if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
-      foreach( $this->xcaldecl as $localxcaldecl )
+        foreach( $this->xcaldecl as $localxcaldecl )
         $xcaldecl[] = $localxcaldecl;
     }
     return $component;
-  }
+    }
 }
 /*********************************************************************************/
 /*********************************************************************************/
@@ -7257,27 +7256,27 @@ 
  * @since 2.5.1 - 2008-10-12
  */
 class vfreebusy extends calendarComponent {
-  var $attendee;
-  var $comment;
-  var $contact;
-  var $dtend;
-  var $dtstart;
-  var $duration;
-  var $freebusy;
-  var $organizer;
-  var $requeststatus;
-  var $url;
-  var $xprop;
+    var $attendee;
+    var $comment;
+    var $contact;
+    var $dtend;
+    var $dtstart;
+    var $duration;
+    var $freebusy;
+    var $organizer;
+    var $requeststatus;
+    var $url;
+    var $xprop;
             //  component subcomponents container
-  var $components;
-/**
- * constructor for calendar component VFREEBUSY object
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-10-31
- * @return void
- */
-  function vfreebusy() {
+    var $components;
+/**
+     * constructor for calendar component VFREEBUSY object
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-10-31
+     * @return void
+     */
+    function vfreebusy() {
     $this->calendarComponent();
 
     $this->attendee        = '';
@@ -7291,16 +7290,16 @@ 
     $this->requeststatus   = '';
     $this->url             = '';
     $this->xprop           = '';
-  }
+    }
 /**
- * create formatted output for calendar component VFREEBUSY object instance
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.3.1 - 2007-11-19
- * @param array $xcaldecl
- * @return string
- */
-  function createComponent( &$xcaldecl ) {
+     * create formatted output for calendar component VFREEBUSY object instance
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.3.1 - 2007-11-19
+     * @param array $xcaldecl
+     * @return string
+     */
+    function createComponent( &$xcaldecl ) {
     $objectname = $this->_createFormat();
     $component  = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
     $component .= $this->createUid();
@@ -7318,11 +7317,11 @@ 
     $component .= $this->createXprop();
     $component .= $this->componentEnd1.$objectname.$this->componentEnd2;
     if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
-      foreach( $this->xcaldecl as $localxcaldecl )
+        foreach( $this->xcaldecl as $localxcaldecl )
         $xcaldecl[] = $localxcaldecl;
     }
     return $component;
-  }
+    }
 }
 /*********************************************************************************/
 /*********************************************************************************/
@@ -7333,23 +7332,23 @@ 
  * @since 2.5.1 - 2008-10-12
  */
 class valarm extends calendarComponent {
-  var $action;
-  var $attach;
-  var $attendee;
-  var $description;
-  var $duration;
-  var $repeat;
-  var $summary;
-  var $trigger;
-  var $xprop;
-/**
- * constructor for calendar component VALARM object
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-10-31
- * @return void
- */
-  function valarm() {
+    var $action;
+    var $attach;
+    var $attendee;
+    var $description;
+    var $duration;
+    var $repeat;
+    var $summary;
+    var $trigger;
+    var $xprop;
+/**
+     * constructor for calendar component VALARM object
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-10-31
+     * @return void
+     */
+    function valarm() {
     $this->calendarComponent();
 
     $this->action          = '';
@@ -7361,16 +7360,16 @@ 
     $this->summary         = '';
     $this->trigger         = '';
     $this->xprop           = '';
-  }
+    }
 /**
- * create formatted output for calendar component VALARM object instance
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-10-22
- * @param array $xcaldecl
- * @return string
- */
-  function createComponent( &$xcaldecl ) {
+     * create formatted output for calendar component VALARM object instance
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-10-22
+     * @param array $xcaldecl
+     * @return string
+     */
+    function createComponent( &$xcaldecl ) {
     $objectname    = $this->_createFormat();
     $component     = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
     $component    .= $this->createAction();
@@ -7384,7 +7383,7 @@ 
     $component    .= $this->createXprop();
     $component    .= $this->componentEnd1.$objectname.$this->componentEnd2;
     return $component;
-  }
+    }
 }
 /**********************************************************************************
 /*********************************************************************************/
@@ -7395,34 +7394,34 @@ 
  * @since 2.5.1 - 2008-10-12
  */
 class vtimezone extends calendarComponent {
-  var $timezonetype;
+    var $timezonetype;
 
-  var $comment;
-  var $dtstart;
-  var $lastmodified;
-  var $rdate;
-  var $rrule;
-  var $tzid;
-  var $tzname;
-  var $tzoffsetfrom;
-  var $tzoffsetto;
-  var $tzurl;
-  var $xprop;
+    var $comment;
+    var $dtstart;
+    var $lastmodified;
+    var $rdate;
+    var $rrule;
+    var $tzid;
+    var $tzname;
+    var $tzoffsetfrom;
+    var $tzoffsetto;
+    var $tzurl;
+    var $xprop;
             //  component subcomponents container
-  var $components;
-/**
- * constructor for calendar component VTIMEZONE object
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-10-31
- * @param string $timezonetype optional, default FALSE ( STANDARD / DAYLIGHT )
- * @return void
- */
-  function vtimezone( $timezonetype=FALSE ) {
+    var $components;
+/**
+     * constructor for calendar component VTIMEZONE object
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-10-31
+     * @param string $timezonetype optional, default FALSE ( STANDARD / DAYLIGHT )
+     * @return void
+     */
+    function vtimezone( $timezonetype=FALSE ) {
     if( !$timezonetype )
-      $this->timezonetype = 'VTIMEZONE';
+        $this->timezonetype = 'VTIMEZONE';
     else
-      $this->timezonetype = strtoupper( $timezonetype );
+        $this->timezonetype = strtoupper( $timezonetype );
     $this->calendarComponent();
 
     $this->comment         = '';
@@ -7438,16 +7437,16 @@ 
     $this->xprop           = '';
 
     $this->components      = array();
-  }
+    }
 /**
- * create formatted output for calendar component VTIMEZONE object instance
- *
- * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
- * @since 2.5.1 - 2008-10-25
- * @param array $xcaldecl
- * @return string
- */
-  function createComponent( &$xcaldecl ) {
+     * create formatted output for calendar component VTIMEZONE object instance
+     *
+     * @author Kjell-Inge Gustafsson <ical@kigkonsult.se>
+     * @since 2.5.1 - 2008-10-25
+     * @param array $xcaldecl
+     * @return string
+     */
+    function createComponent( &$xcaldecl ) {
     $objectname    = $this->_createFormat();
     $component     = $this->componentStart1.$objectname.$this->componentStart2.$this->nl;
     $component    .= $this->createTzid();
@@ -7464,10 +7463,10 @@ 
     $component    .= $this->createSubComponent();
     $component    .= $this->componentEnd1.$objectname.$this->componentEnd2;
     if( is_array( $this->xcaldecl ) && ( 0 < count( $this->xcaldecl ))) {
-      foreach( $this->xcaldecl as $localxcaldecl )
+        foreach( $this->xcaldecl as $localxcaldecl )
         $xcaldecl[] = $localxcaldecl;
     }
     return $component;
-  }
+    }
 }
 ?>
\ No newline at end of file

main/inc/lib/image.lib.php

Doc Comments +19 added lines

@@ -52,6 +52,9 @@ 
         }
     }
     
+    /**
+     * @param string|null $cropParameters
+     */
     public function crop($cropParameters) {
         $image_size = $this->get_image_size($this->image_wrapper->path);
         $src_width = $image_size['width'];
@@ -66,6 +69,9 @@ 
         return $image;
     }
 
+    /**
+     * @param string $convert_file_to
+     */
     public function send_image(
         $file = '',
         $compress = -1,
@@ -147,6 +153,9 @@ 
     public $image;
     public $filter = Imagick::FILTER_LANCZOS;
 
+    /**
+     * @param string $path
+     */
     public function __construct($path)
     {
           parent::__construct($path);
@@ -194,6 +203,10 @@ 
 	}
 
 	//@todo implement border logic case for Imagick
+
+	/**
+	 * @param integer $border
+	 */
 	public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
 	    if (!$this->image_validated) return false;
@@ -275,6 +288,9 @@ 
 {
     public $bg;
 
+    /**
+     * @param string $path
+     */
     function __construct($path) {
         parent::__construct($path);
     }
@@ -332,6 +348,9 @@ 
     	}
     }
 
+    /**
+     * @param integer $border
+     */
     public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
         if (!$this->image_validated) return false;

Indentation +120 added lines, -120 removed lines

@@ -47,7 +47,7 @@ 
             if ($height >= $max_size_for_picture) {
                 // scale width
                 $new_width = round($width * ($max_size_for_picture / $height));
-                 $this->image_wrapper->resize($new_width, $max_size_for_picture, 0);
+                    $this->image_wrapper->resize($new_width, $max_size_for_picture, 0);
             }
         }
     }
@@ -149,7 +149,7 @@ 
 
     public function __construct($path)
     {
-          parent::__construct($path);
+            parent::__construct($path);
     }
 
     public function set_image_wrapper()
@@ -184,19 +184,19 @@ 
         }
     }
 
-	public function get_image_size()
+    public function get_image_size()
     {
-		$imagesize = array('width'=>0,'height'=>0);
-	    if ($this->image_validated) {
+        $imagesize = array('width'=>0,'height'=>0);
+        if ($this->image_validated) {
             $imagesize = $this->image->getImageGeometry();
-	    }
-	    return $imagesize;
-	}
+        }
+        return $imagesize;
+    }
 
-	//@todo implement border logic case for Imagick
-	public function resize($thumbw, $thumbh, $border, $specific_size = false)
+    //@todo implement border logic case for Imagick
+    public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
-	    if (!$this->image_validated) return false;
+        if (!$this->image_validated) return false;
 
         if ($specific_size) {
             $width = $thumbw;
@@ -206,10 +206,10 @@ 
             $width  = (int)($this->width * $scale);
             $height = (int)($this->height * $scale);
         }
-		$result = $this->image->resizeImage($width, $height, $this->filter, 1);
-		$this->width  = $thumbw;
-		$this->height = $thumbh;
-	}
+        $result = $this->image->resizeImage($width, $height, $this->filter, 1);
+        $this->width  = $thumbw;
+        $this->height = $thumbh;
+    }
     
     /**
      * @author José Loguercio <jose.loguercio@beeznest.com>
@@ -224,8 +224,8 @@ 
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
         if (!$this->image_validated) return false;
         $this->image->cropimage($width, $height, $x, $y);
-		$this->width  = $width;
-		$this->height = $height;
+        $this->width  = $width;
+        $this->height = $height;
     }
 
     public function send_image($file = '', $compress = -1, $convert_file_to = null)
@@ -235,35 +235,35 @@ 
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
         }
-		switch ($type) {
-		    case 'jpeg':
-			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
-				break;
-			case 'png':
-				if (!$file) header("Content-type: image/png");
-				break;
-			case 'gif':
-				if (!$file) header("Content-type: image/gif");
-				break;
-		}
-		$result = false;
-		try {
-		    $result = $this->image->writeImage($file);
-		} catch(ImagickException $e) {
+        switch ($type) {
+            case 'jpeg':
+            case 'jpg':
+                if (!$file) header("Content-type: image/jpeg");
+                break;
+            case 'png':
+                if (!$file) header("Content-type: image/png");
+                break;
+            case 'gif':
+                if (!$file) header("Content-type: image/gif");
+                break;
+        }
+        $result = false;
+        try {
+            $result = $this->image->writeImage($file);
+        } catch(ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
 
-		if (!$file) {
-		    echo $this->image;
-		    $this->image->clear();
+        if (!$file) {
+            echo $this->image;
+            $this->image->clear();
             $this->image->destroy();
-		} else {
-		    $this->image->clear();
+        } else {
+            $this->image->clear();
             $this->image->destroy();
-		    return $result;
-		}
-	}
+            return $result;
+        }
+    }
 
 }
 
@@ -285,21 +285,21 @@ 
         $this->fill_image_info();
 
         switch ($this->type) {
-        	case 0:
-        		$handler = false;
-        		break;
-		    case 1 :
+            case 0:
+                $handler = false;
+                break;
+            case 1 :
                 $handler = @imagecreatefromgif($this->path);
                 $this->type = 'gif';
                 break;
-		    case 2 :
+            case 2 :
                 $handler = @imagecreatefromjpeg($this->path);
                 $this->type = 'jpg';
                 break;
-		    case 3 :
-		        $handler = @imagecreatefrompng($this->path);
-		        $this->type = 'png';
-		        break;
+            case 3 :
+                $handler = @imagecreatefrompng($this->path);
+                $this->type = 'png';
+                break;
         }
         if ($handler) {
             $this->image_validated = true;
@@ -313,29 +313,29 @@ 
     {
         $return_array = array('width'=>0,'height'=>0);
         if ($this->image_validated) {
-	        $return_array = array('width'=>$this->width,'height'=>$this->height);
+            $return_array = array('width'=>$this->width,'height'=>$this->height);
         }
         return $return_array;
-	}
+    }
 
     public function fill_image_info()
     {
-    	if (file_exists($this->path)) {
-	        $image_info     = getimagesize($this->path);
-			$this->width    = $image_info[0];
-			$this->height   = $image_info[1];
-			$this->type     = $image_info[2];
-    	} else {
-    		$this->width    = 0;
-    		$this->height   = 0;
-    		$this->type     = 0;
-    	}
+        if (file_exists($this->path)) {
+            $image_info     = getimagesize($this->path);
+            $this->width    = $image_info[0];
+            $this->height   = $image_info[1];
+            $this->type     = $image_info[2];
+        } else {
+            $this->width    = 0;
+            $this->height   = 0;
+            $this->type     = 0;
+        }
     }
 
     public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
         if (!$this->image_validated) return false;
-		if ($border == 1) {
+        if ($border == 1) {
             if ($specific_size) {
                 $width = $thumbw;
                 $height = $thumbh;
@@ -344,17 +344,17 @@ 
                 $width = (int)($this->width * $scale);
                 $height = (int)($this->height * $scale);
             }
-			$deltaw = (int)(($thumbw - $width) / 2);
-			$deltah = (int)(($thumbh - $height) / 2);
-			$dst_img = @ImageCreateTrueColor($thumbw, $thumbh);
-            		@imagealphablending($dst_img, false);
-		        @imagesavealpha($dst_img, true);
-			if (!empty($this->color)) {
-				@imagefill($dst_img, 0, 0, $this->color);
-			}
-			$this->width = $thumbw;
-			$this->height = $thumbh;
-		} elseif ($border == 0) {
+            $deltaw = (int)(($thumbw - $width) / 2);
+            $deltah = (int)(($thumbh - $height) / 2);
+            $dst_img = @ImageCreateTrueColor($thumbw, $thumbh);
+                    @imagealphablending($dst_img, false);
+                @imagesavealpha($dst_img, true);
+            if (!empty($this->color)) {
+                @imagefill($dst_img, 0, 0, $this->color);
+            }
+            $this->width = $thumbw;
+            $this->height = $thumbh;
+        } elseif ($border == 0) {
             if ($specific_size) {
                 $width = $thumbw;
                 $height = $thumbh;
@@ -363,19 +363,19 @@ 
                 $width  = (int)($this->width * $scale);
                 $height = (int)($this->height * $scale);
             }
-			$deltaw = 0;
-			$deltah = 0;
-			$dst_img = @ImageCreateTrueColor($width, $height);
-            		@imagealphablending($dst_img, false);
-		        @imagesavealpha($dst_img, true);
-			$this->width = $width;
-			$this->height = $height;
-		}
-		$src_img = $this->bg;
-		@ImageCopyResampled($dst_img, $src_img, $deltaw, $deltah, 0, 0, $width, $height, ImageSX($src_img), ImageSY($src_img));
-		$this->bg = $dst_img;
-		@imagedestroy($src_img);
-	}
+            $deltaw = 0;
+            $deltah = 0;
+            $dst_img = @ImageCreateTrueColor($width, $height);
+                    @imagealphablending($dst_img, false);
+                @imagesavealpha($dst_img, true);
+            $this->width = $width;
+            $this->height = $height;
+        }
+        $src_img = $this->bg;
+        @ImageCopyResampled($dst_img, $src_img, $deltaw, $deltah, 0, 0, $width, $height, ImageSX($src_img), ImageSY($src_img));
+        $this->bg = $dst_img;
+        @imagedestroy($src_img);
+    }
     
     /**
      * @author José Loguercio <jose.loguercio@beeznest.com>
@@ -389,7 +389,7 @@ 
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
         if (!$this->image_validated) return false;
         $this->width = $width;
-		$this->height = $height;
+        $this->height = $height;
         $src = null;
         $dest = @imagecreatetruecolor($width, $height);
         $type = $this->type;
@@ -400,56 +400,56 @@ 
                 @imagecopy($dest, $src, 0, 0, $x, $y, $src_width, $src_height);
                 @imagejpeg($dest, $this->path);
                 break;
-		    case 'png' :
+            case 'png' :
                 $src = @imagecreatefrompng($this->path);
                 @imagecopy($dest, $src, 0, 0, $x, $y, $src_width, $src_height);
                 @imagepng($dest, $this->path);
                 break;
-		    case 'gif' :
-		        $src = @imagecreatefromgif($this->path);
+            case 'gif' :
+                $src = @imagecreatefromgif($this->path);
                 @imagecopy($dest, $src, 0, 0, $x, $y, $src_width, $src_height);
                 @imagegif($dest, $this->path);
-		        break;
+                break;
             default: return 0;
         }
         @imagedestroy($dest);
         @imagedestroy($src);
     }
 
-	public function send_image($file = '', $compress = -1, $convert_file_to = null)
+    public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
-	    if (!$this->image_validated) return false;
+        if (!$this->image_validated) return false;
         $compress = (int)$compress;
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
         }
-		switch ($type) {
-		    case 'jpeg':
-			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
-				if ($compress == -1) $compress = 100;
-				return imagejpeg($this->bg, $file, $compress);
-				break;
-			case 'png':
-				if (!$file) header("Content-type: image/png");
-				if ($compress != -1) {
-					@imagetruecolortopalette($this->bg, true, $compress);
-				}
-				return imagepng($this->bg, $file, $compress);
-				break;
-			case 'gif':
-				if (!$file) header("Content-type: image/gif");
-				if ($compress != -1) {
-					@imagetruecolortopalette($this->bg, true, $compress);
-				}
-				return imagegif($this->bg, $file, $compress);
-				break;
-			default: return 0;
-		}
-		// TODO: Occupied memory is not released, because the following fragment of code is actually dead.
-		@imagedestroy($this->bg);
-	}
+        switch ($type) {
+            case 'jpeg':
+            case 'jpg':
+                if (!$file) header("Content-type: image/jpeg");
+                if ($compress == -1) $compress = 100;
+                return imagejpeg($this->bg, $file, $compress);
+                break;
+            case 'png':
+                if (!$file) header("Content-type: image/png");
+                if ($compress != -1) {
+                    @imagetruecolortopalette($this->bg, true, $compress);
+                }
+                return imagepng($this->bg, $file, $compress);
+                break;
+            case 'gif':
+                if (!$file) header("Content-type: image/gif");
+                if ($compress != -1) {
+                    @imagetruecolortopalette($this->bg, true, $compress);
+                }
+                return imagegif($this->bg, $file, $compress);
+                break;
+            default: return 0;
+        }
+        // TODO: Occupied memory is not released, because the following fragment of code is actually dead.
+        @imagedestroy($this->bg);
+    }
 
     /**
      * Convert image to black & white

Spacing +19 added lines, -19 removed lines

@@ -115,7 +115,7 @@ 
             return false;
         }
         $this->path = preg_match(VALID_WEB_PATH, $path) ? (api_is_internal_path($path) ? api_get_path(TO_SYS, $path) : $path) : $path;
-        $this->set_image_wrapper();  //Creates image obj
+        $this->set_image_wrapper(); //Creates image obj
     }
 
     abstract function set_image_wrapper();
@@ -157,7 +157,7 @@ 
         if ($this->debug) error_log('Image::set_image_wrapper loaded');
         try {
             if (file_exists($this->path)) {
-                $this->image     = new Imagick($this->path);
+                $this->image = new Imagick($this->path);
 
                 if ($this->image) {
                     $this->fill_image_info(); //Fills height, width and type
@@ -165,7 +165,7 @@ 
             } else {
                 if ($this->debug) error_log('Image::image does not exist');
             }
-        } catch(ImagickException $e) {
+        } catch (ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
     }
@@ -186,7 +186,7 @@ 
 
 	public function get_image_size()
     {
-		$imagesize = array('width'=>0,'height'=>0);
+		$imagesize = array('width'=>0, 'height'=>0);
 	    if ($this->image_validated) {
             $imagesize = $this->image->getImageGeometry();
 	    }
@@ -203,8 +203,8 @@ 
             $height = $thumbh;
         } else {
             $scale  = ($this->width > 0 && $this->height > 0) ? min($thumbw / $this->width, $thumbh / $this->height) : 0;
-            $width  = (int)($this->width * $scale);
-            $height = (int)($this->height * $scale);
+            $width  = (int) ($this->width * $scale);
+            $height = (int) ($this->height * $scale);
         }
 		$result = $this->image->resizeImage($width, $height, $this->filter, 1);
 		$this->width  = $thumbw;
@@ -250,7 +250,7 @@ 
 		$result = false;
 		try {
 		    $result = $this->image->writeImage($file);
-		} catch(ImagickException $e) {
+		} catch (ImagickException $e) {
             if ($this->debug) error_log($e->getMessage());
         }
 
@@ -311,9 +311,9 @@ 
 
     public function get_image_size()
     {
-        $return_array = array('width'=>0,'height'=>0);
+        $return_array = array('width'=>0, 'height'=>0);
         if ($this->image_validated) {
-	        $return_array = array('width'=>$this->width,'height'=>$this->height);
+	        $return_array = array('width'=>$this->width, 'height'=>$this->height);
         }
         return $return_array;
 	}
@@ -321,7 +321,7 @@ 
     public function fill_image_info()
     {
     	if (file_exists($this->path)) {
-	        $image_info     = getimagesize($this->path);
+	        $image_info = getimagesize($this->path);
 			$this->width    = $image_info[0];
 			$this->height   = $image_info[1];
 			$this->type     = $image_info[2];
@@ -341,11 +341,11 @@ 
                 $height = $thumbh;
             } else {
                 $scale = min($thumbw / $this->width, $thumbh / $this->height);
-                $width = (int)($this->width * $scale);
-                $height = (int)($this->height * $scale);
+                $width = (int) ($this->width * $scale);
+                $height = (int) ($this->height * $scale);
             }
-			$deltaw = (int)(($thumbw - $width) / 2);
-			$deltah = (int)(($thumbh - $height) / 2);
+			$deltaw = (int) (($thumbw - $width) / 2);
+			$deltah = (int) (($thumbh - $height) / 2);
 			$dst_img = @ImageCreateTrueColor($thumbw, $thumbh);
             		@imagealphablending($dst_img, false);
 		        @imagesavealpha($dst_img, true);
@@ -360,8 +360,8 @@ 
                 $height = $thumbh;
             } else {
                 $scale = ($this->width > 0 && $this->height > 0) ? min($thumbw / $this->width, $thumbh / $this->height) : 0;
-                $width  = (int)($this->width * $scale);
-                $height = (int)($this->height * $scale);
+                $width  = (int) ($this->width * $scale);
+                $height = (int) ($this->height * $scale);
             }
 			$deltaw = 0;
 			$deltah = 0;
@@ -419,7 +419,7 @@ 
 	public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
 	    if (!$this->image_validated) return false;
-        $compress = (int)$compress;
+        $compress = (int) $compress;
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
@@ -463,11 +463,11 @@ 
          * so that we can use black (0,0,0) as transparent, which is what
          * the image is filled with when created.
          */
-        $transparent = imagecolorallocate($dest_img, 0,0,0);
+        $transparent = imagecolorallocate($dest_img, 0, 0, 0);
         imagealphablending($dest_img, false);
         imagesavealpha($dest_img, true);
         imagecolortransparent($dest_img, $transparent);
-        imagecopy($dest_img, $this->bg, 0,0, 0, 0,imagesx($this->bg), imagesx($this->bg));
+        imagecopy($dest_img, $this->bg, 0, 0, 0, 0, imagesx($this->bg), imagesx($this->bg));
         imagefilter($dest_img, IMG_FILTER_GRAYSCALE);
         $this->bg = $dest_img;
 

Braces +57 added lines, -19 removed lines

@@ -154,7 +154,9 @@ 
 
     public function set_image_wrapper()
     {
-        if ($this->debug) error_log('Image::set_image_wrapper loaded');
+        if ($this->debug) {
+            error_log('Image::set_image_wrapper loaded');
+        }
         try {
             if (file_exists($this->path)) {
                 $this->image     = new Imagick($this->path);
@@ -163,10 +165,14 @@ 
                     $this->fill_image_info(); //Fills height, width and type
                 }
             } else {
-                if ($this->debug) error_log('Image::image does not exist');
+                if ($this->debug) {
+                    error_log('Image::image does not exist');
+                }
             }
         } catch(ImagickException $e) {
-            if ($this->debug) error_log($e->getMessage());
+            if ($this->debug) {
+                error_log($e->getMessage());
+            }
         }
     }
 
@@ -180,7 +186,9 @@ 
 
         if (in_array($this->type, $this->allowed_extensions)) {
             $this->image_validated = true;
-            if ($this->debug) error_log('image_validated true');
+            if ($this->debug) {
+                error_log('image_validated true');
+            }
         }
     }
 
@@ -196,7 +204,9 @@ 
 	//@todo implement border logic case for Imagick
 	public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
-	    if (!$this->image_validated) return false;
+	    if (!$this->image_validated) {
+	        return false;
+	    }
 
         if ($specific_size) {
             $width = $thumbw;
@@ -222,7 +232,9 @@ 
      */
     
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
         $this->image->cropimage($width, $height, $x, $y);
 		$this->width  = $width;
 		$this->height = $height;
@@ -230,7 +242,9 @@ 
 
     public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
             $type = $convert_file_to;
@@ -238,20 +252,28 @@ 
 		switch ($type) {
 		    case 'jpeg':
 			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
+				if (!$file) {
+				    header("Content-type: image/jpeg");
+				}
 				break;
 			case 'png':
-				if (!$file) header("Content-type: image/png");
+				if (!$file) {
+				    header("Content-type: image/png");
+				}
 				break;
 			case 'gif':
-				if (!$file) header("Content-type: image/gif");
+				if (!$file) {
+				    header("Content-type: image/gif");
+				}
 				break;
 		}
 		$result = false;
 		try {
 		    $result = $this->image->writeImage($file);
 		} catch(ImagickException $e) {
-            if ($this->debug) error_log($e->getMessage());
+            if ($this->debug) {
+                error_log($e->getMessage());
+            }
         }
 
 		if (!$file) {
@@ -334,7 +356,9 @@ 
 
     public function resize($thumbw, $thumbh, $border, $specific_size = false)
     {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
 		if ($border == 1) {
             if ($specific_size) {
                 $width = $thumbw;
@@ -387,7 +411,9 @@ 
      * @param int $src_height the source height of the original image
      */
     public function crop($x, $y, $width, $height, $src_width, $src_height) {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
         $this->width = $width;
 		$this->height = $height;
         $src = null;
@@ -418,7 +444,9 @@ 
 
 	public function send_image($file = '', $compress = -1, $convert_file_to = null)
     {
-	    if (!$this->image_validated) return false;
+	    if (!$this->image_validated) {
+	        return false;
+	    }
         $compress = (int)$compress;
         $type = $this->type;
         if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) {
@@ -427,19 +455,27 @@ 
 		switch ($type) {
 		    case 'jpeg':
 			case 'jpg':
-				if (!$file) header("Content-type: image/jpeg");
-				if ($compress == -1) $compress = 100;
+				if (!$file) {
+				    header("Content-type: image/jpeg");
+				}
+				if ($compress == -1) {
+				    $compress = 100;
+				}
 				return imagejpeg($this->bg, $file, $compress);
 				break;
 			case 'png':
-				if (!$file) header("Content-type: image/png");
+				if (!$file) {
+				    header("Content-type: image/png");
+				}
 				if ($compress != -1) {
 					@imagetruecolortopalette($this->bg, true, $compress);
 				}
 				return imagepng($this->bg, $file, $compress);
 				break;
 			case 'gif':
-				if (!$file) header("Content-type: image/gif");
+				if (!$file) {
+				    header("Content-type: image/gif");
+				}
 				if ($compress != -1) {
 					@imagetruecolortopalette($this->bg, true, $compress);
 				}
@@ -456,7 +492,9 @@ 
      */
     function convert2bw()
     {
-        if (!$this->image_validated) return false;
+        if (!$this->image_validated) {
+            return false;
+        }
 
         $dest_img = imagecreatetruecolor(imagesx($this->bg), imagesy($this->bg));
         /* copy ignore the transparent color

main/inc/lib/kses-0.2.2/kses_original.php

Doc Comments +9 added lines

@@ -408,6 +408,9 @@ 
 } # function kses_no_null
 
 
+/**
+ * @return string
+ */
 function kses_stripslashes($string)
 ###############################################################################
 # This function changes the character sequence  \"  to just  "
@@ -442,6 +445,9 @@ 
 } # function kses_array_lc
 
 
+/**
+ * @return string
+ */
 function kses_js_entities($string)
 ###############################################################################
 # This function removes the HTML JavaScript entities found in early versions of
@@ -506,6 +512,9 @@ 
 } # function kses_bad_protocol_once2
 
 
+/**
+ * @return string
+ */
 function kses_normalize_entities($string)
 ###############################################################################
 # This function normalizes HTML entities. It will convert "AT&T" to the correct

Indentation +166 added lines, -166 removed lines

@@ -31,8 +31,8 @@ 
 
 
 function kses($string, $allowed_html, $allowed_protocols =
-               array('http', 'https', 'ftp', 'news', 'nntp', 'telnet',
-                     'gopher', 'mailto'))
+                array('http', 'https', 'ftp', 'news', 'nntp', 'telnet',
+                        'gopher', 'mailto'))
 ###############################################################################
 # This function makes sure that only the allowed HTML element names, attribute
 # names and attribute values plus only sane HTML entities will occur in
@@ -40,12 +40,12 @@ 
 # call this function.
 ###############################################################################
 {
-  $string = kses_no_null($string);
-  $string = kses_js_entities($string);
-  $string = kses_normalize_entities($string);
-  $string = kses_hook($string);
-  $allowed_html_fixed = kses_array_lc($allowed_html);
-  return kses_split($string, $allowed_html_fixed, $allowed_protocols);
+    $string = kses_no_null($string);
+    $string = kses_js_entities($string);
+    $string = kses_normalize_entities($string);
+    $string = kses_hook($string);
+    $allowed_html_fixed = kses_array_lc($allowed_html);
+    return kses_split($string, $allowed_html_fixed, $allowed_protocols);
 } # function kses
 
 
@@ -54,7 +54,7 @@ 
 # You add any kses hooks here.
 ###############################################################################
 {
-  return $string;
+    return $string;
 } # function kses_hook
 
 
@@ -63,7 +63,7 @@ 
 # This function returns kses' version number.
 ###############################################################################
 {
-  return '0.2.2';
+    return '0.2.2';
 } # function kses_version
 
 
@@ -73,13 +73,13 @@ 
 # matches stray ">" characters.
 ###############################################################################
 {
-  return preg_replace('%(<'.   # EITHER: <
-                      '[^>]*'. # things that aren't >
-                      '(>|$)'. # > or end of string
-                      '|>)%e', # OR: just a >
-                      "kses_split2('\\1', \$allowed_html, ".
-                      '$allowed_protocols)',
-                      $string);
+    return preg_replace('%(<'.   # EITHER: <
+                        '[^>]*'. # things that aren't >
+                        '(>|$)'. # > or end of string
+                        '|>)%e', # OR: just a >
+                        "kses_split2('\\1', \$allowed_html, ".
+                        '$allowed_protocols)',
+                        $string);
 } # function kses_split
 
 
@@ -91,30 +91,30 @@ 
 # attribute list.
 ###############################################################################
 {
-  $string = kses_stripslashes($string);
+    $string = kses_stripslashes($string);
 
-  if (substr($string, 0, 1) != '<')
+    if (substr($string, 0, 1) != '<')
     return '&gt;';
     # It matched a ">" character
 
-  if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
+    if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
     return '';
     # It's seriously malformed
 
-  $slash = trim($matches[1]);
-  $elem = $matches[2];
-  $attrlist = $matches[3];
+    $slash = trim($matches[1]);
+    $elem = $matches[2];
+    $attrlist = $matches[3];
 
-  if (!@isset($allowed_html[strtolower($elem)]))
+    if (!@isset($allowed_html[strtolower($elem)]))
     return '';
     # They are using a not allowed HTML element
 
-  if ($slash != '')
+    if ($slash != '')
     return "<$slash$elem>";
-  # No attributes are allowed for closing elements
+    # No attributes are allowed for closing elements
 
-  return kses_attr("$slash$elem", $attrlist, $allowed_html,
-                   $allowed_protocols);
+    return kses_attr("$slash$elem", $attrlist, $allowed_html,
+                    $allowed_protocols);
 } # function kses_split2
 
 
@@ -130,56 +130,56 @@ 
 {
 # Is there a closing XHTML slash at the end of the attributes?
 
-  $xhtml_slash = '';
-  if (preg_match('%\s/\s*$%', $attr))
+    $xhtml_slash = '';
+    if (preg_match('%\s/\s*$%', $attr))
     $xhtml_slash = ' /';
 
 # Are any attributes allowed at all for this element?
 
-  if (@count($allowed_html[strtolower($element)]) == 0)
+    if (@count($allowed_html[strtolower($element)]) == 0)
     return "<$element$xhtml_slash>";
 
 # Split it
 
-  $attrarr = kses_hair($attr, $allowed_protocols);
+    $attrarr = kses_hair($attr, $allowed_protocols);
 
 # Go through $attrarr, and save the allowed attributes for this element
 # in $attr2
 
-  $attr2 = '';
+    $attr2 = '';
 
-  foreach ($attrarr as $arreach)
-  {
+    foreach ($attrarr as $arreach)
+    {
     if (!@isset($allowed_html[strtolower($element)]
                             [strtolower($arreach['name'])]))
-      continue; # the attribute is not allowed
+        continue; # the attribute is not allowed
 
     $current = $allowed_html[strtolower($element)]
                             [strtolower($arreach['name'])];
 
     if (!is_array($current))
-      $attr2 .= ' '.$arreach['whole'];
+        $attr2 .= ' '.$arreach['whole'];
     # there are no checks
 
     else
     {
     # there are some checks
-      $ok = true;
-      foreach ($current as $currkey => $currval)
+        $ok = true;
+        foreach ($current as $currkey => $currval)
         if (!kses_check_attr_val($arreach['value'], $arreach['vless'],
-                                 $currkey, $currval))
+                                    $currkey, $currval))
         { $ok = false; break; }
 
-      if ($ok)
+        if ($ok)
         $attr2 .= ' '.$arreach['whole']; # it passed them
     } # if !is_array($current)
-  } # foreach
+    } # foreach
 
 # Remove any "<" or ">" characters
 
-  $attr2 = preg_replace('/[<>]/', '', $attr2);
+    $attr2 = preg_replace('/[<>]/', '', $attr2);
 
-  return "<$element$attr2$xhtml_slash>";
+    return "<$element$attr2$xhtml_slash>";
 } # function kses_attr
 
 
@@ -193,96 +193,96 @@ 
 # from attribute values.
 ###############################################################################
 {
-  $attrarr = array();
-  $mode = 0;
-  $attrname = '';
+    $attrarr = array();
+    $mode = 0;
+    $attrname = '';
 
 # Loop through the whole attribute list
 
-  while (strlen($attr) != 0)
-  {
+    while (strlen($attr) != 0)
+    {
     $working = 0; # Was the last operation successful?
 
     switch ($mode)
     {
-      case 0: # attribute name, href for instance
+        case 0: # attribute name, href for instance
 
         if (preg_match('/^([-a-zA-Z]+)/', $attr, $match))
         {
-          $attrname = $match[1];
-          $working = $mode = 1;
-          $attr = preg_replace('/^[-a-zA-Z]+/', '', $attr);
+            $attrname = $match[1];
+            $working = $mode = 1;
+            $attr = preg_replace('/^[-a-zA-Z]+/', '', $attr);
         }
 
         break;
 
-      case 1: # equals sign or valueless ("selected")
+        case 1: # equals sign or valueless ("selected")
 
         if (preg_match('/^\s*=\s*/', $attr)) # equals sign
         {
-          $working = 1; $mode = 2;
-          $attr = preg_replace('/^\s*=\s*/', '', $attr);
-          break;
+            $working = 1; $mode = 2;
+            $attr = preg_replace('/^\s*=\s*/', '', $attr);
+            break;
         }
 
         if (preg_match('/^\s+/', $attr)) # valueless
         {
-          $working = 1; $mode = 0;
-          $attrarr[] = array
+            $working = 1; $mode = 0;
+            $attrarr[] = array
                         ('name'  => $attrname,
-                         'value' => '',
-                         'whole' => $attrname,
-                         'vless' => 'y');
-          $attr = preg_replace('/^\s+/', '', $attr);
+                            'value' => '',
+                            'whole' => $attrname,
+                            'vless' => 'y');
+            $attr = preg_replace('/^\s+/', '', $attr);
         }
 
         break;
 
-      case 2: # attribute value, a URL after href= for instance
+        case 2: # attribute value, a URL after href= for instance
 
         if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match))
-         # "value"
+            # "value"
         {
-          $thisval = kses_bad_protocol($match[1], $allowed_protocols);
+            $thisval = kses_bad_protocol($match[1], $allowed_protocols);
 
-          $attrarr[] = array
+            $attrarr[] = array
                         ('name'  => $attrname,
-                         'value' => $thisval,
-                         'whole' => "$attrname=\"$thisval\"",
-                         'vless' => 'n');
-          $working = 1; $mode = 0;
-          $attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
-          break;
+                            'value' => $thisval,
+                            'whole' => "$attrname=\"$thisval\"",
+                            'vless' => 'n');
+            $working = 1; $mode = 0;
+            $attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
+            break;
         }
 
         if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match))
-         # 'value'
+            # 'value'
         {
-          $thisval = kses_bad_protocol($match[1], $allowed_protocols);
+            $thisval = kses_bad_protocol($match[1], $allowed_protocols);
 
-          $attrarr[] = array
+            $attrarr[] = array
                         ('name'  => $attrname,
-                         'value' => $thisval,
-                         'whole' => "$attrname='$thisval'",
-                         'vless' => 'n');
-          $working = 1; $mode = 0;
-          $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
-          break;
+                            'value' => $thisval,
+                            'whole' => "$attrname='$thisval'",
+                            'vless' => 'n');
+            $working = 1; $mode = 0;
+            $attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
+            break;
         }
 
         if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match))
-         # value
+            # value
         {
-          $thisval = kses_bad_protocol($match[1], $allowed_protocols);
+            $thisval = kses_bad_protocol($match[1], $allowed_protocols);
 
-          $attrarr[] = array
+            $attrarr[] = array
                         ('name'  => $attrname,
-                         'value' => $thisval,
-                         'whole' => "$attrname=\"$thisval\"",
-                         'vless' => 'n');
-                         # We add quotes to conform to W3C's HTML spec.
-          $working = 1; $mode = 0;
-          $attr = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr);
+                            'value' => $thisval,
+                            'whole' => "$attrname=\"$thisval\"",
+                            'vless' => 'n');
+                            # We add quotes to conform to W3C's HTML spec.
+            $working = 1; $mode = 0;
+            $attr = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr);
         }
 
         break;
@@ -290,21 +290,21 @@ 
 
     if ($working == 0) # not well formed, remove and try again
     {
-      $attr = kses_html_error($attr);
-      $mode = 0;
+        $attr = kses_html_error($attr);
+        $mode = 0;
     }
-  } # while
+    } # while
 
-  if ($mode == 1)
-  # special case, for when the attribute list ends with a valueless
-  # attribute like "selected"
+    if ($mode == 1)
+    # special case, for when the attribute list ends with a valueless
+    # attribute like "selected"
     $attrarr[] = array
-                  ('name'  => $attrname,
-                   'value' => '',
-                   'whole' => $attrname,
-                   'vless' => 'y');
+                    ('name'  => $attrname,
+                    'value' => '',
+                    'whole' => $attrname,
+                    'vless' => 'y');
 
-  return $attrarr;
+    return $attrarr;
 } # function kses_hair
 
 
@@ -315,10 +315,10 @@ 
 # with even more checks to come soon.
 ###############################################################################
 {
-  $ok = true;
+    $ok = true;
 
-  switch (strtolower($checkname))
-  {
+    switch (strtolower($checkname))
+    {
     case 'maxlen':
     # The maxlen check makes sure that the attribute value has a length not
     # greater than the given value. This can be used to avoid Buffer Overflows
@@ -326,7 +326,7 @@ 
 
       if (strlen($value) > $checkvalue)
         $ok = false;
-      break;
+        break;
 
     case 'minlen':
     # The minlen check makes sure that the attribute value has a length not
@@ -334,7 +334,7 @@ 
 
       if (strlen($value) < $checkvalue)
         $ok = false;
-      break;
+        break;
 
     case 'maxval':
     # The maxval check does two things: it checks that the attribute value is
@@ -345,9 +345,9 @@ 
 
       if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
         $ok = false;
-      if ($value > $checkvalue)
+        if ($value > $checkvalue)
         $ok = false;
-      break;
+        break;
 
     case 'minval':
     # The minval check checks that the attribute value is a positive integer,
@@ -355,9 +355,9 @@ 
 
       if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
         $ok = false;
-      if ($value < $checkvalue)
+        if ($value < $checkvalue)
         $ok = false;
-      break;
+        break;
 
     case 'valueless':
     # The valueless check checks if the attribute has a value
@@ -367,10 +367,10 @@ 
 
       if (strtolower($checkvalue) != $vless)
         $ok = false;
-      break;
-  } # switch
+        break;
+    } # switch
 
-  return $ok;
+    return $ok;
 } # function kses_check_attr_val
 
 
@@ -382,17 +382,17 @@ 
 # fooled by a string like "javascript:javascript:alert(57)".
 ###############################################################################
 {
-  $string = kses_no_null($string);
-  $string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature"
-  $string2 = $string.'a';
+    $string = kses_no_null($string);
+    $string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature"
+    $string2 = $string.'a';
 
-  while ($string != $string2)
-  {
+    while ($string != $string2)
+    {
     $string2 = $string;
     $string = kses_bad_protocol_once($string, $allowed_protocols);
-  } # while
+    } # while
 
-  return $string;
+    return $string;
 } # function kses_bad_protocol
 
 
@@ -401,10 +401,10 @@ 
 # This function removes any NULL characters in $string.
 ###############################################################################
 {
-  $string = preg_replace('/\0+/', '', $string);
-  $string = preg_replace('/(\\\\0)+/', '', $string);
+    $string = preg_replace('/\0+/', '', $string);
+    $string = preg_replace('/(\\\\0)+/', '', $string);
 
-  return $string;
+    return $string;
 } # function kses_no_null
 
 
@@ -415,7 +415,7 @@ 
 # preg_replace(//e) seems to require this.
 ###############################################################################
 {
-  return preg_replace('%\\\\"%', '"', $string);
+    return preg_replace('%\\\\"%', '"', $string);
 } # function kses_stripslashes
 
 
@@ -424,21 +424,21 @@ 
 # This function goes through an array, and changes the keys to all lower case.
 ###############################################################################
 {
-  $outarray = array();
+    $outarray = array();
 
-  foreach ($inarray as $inkey => $inval)
-  {
+    foreach ($inarray as $inkey => $inval)
+    {
     $outkey = strtolower($inkey);
     $outarray[$outkey] = array();
 
     foreach ($inval as $inkey2 => $inval2)
     {
-      $outkey2 = strtolower($inkey2);
-      $outarray[$outkey][$outkey2] = $inval2;
+        $outkey2 = strtolower($inkey2);
+        $outarray[$outkey][$outkey2] = $inval2;
     } # foreach $inval
-  } # foreach $inarray
+    } # foreach $inarray
 
-  return $outarray;
+    return $outarray;
 } # function kses_array_lc
 
 
@@ -448,7 +448,7 @@ 
 # Netscape 4.
 ###############################################################################
 {
-  return preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
+    return preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
 } # function kses_js_entities
 
 
@@ -459,7 +459,7 @@ 
 # quotes and apostrophes as well.
 ###############################################################################
 {
-  return preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $string);
+    return preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $string);
 } # function kses_html_error
 
 
@@ -469,12 +469,12 @@ 
 # handling whitespace and HTML entities.
 ###############################################################################
 {
-	$string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
-	if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
-	{
-		$string = kses_bad_protocol_once2($string2[0],$allowed_protocols).trim($string2[1]);
-	}
-	return $string;
+    $string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
+    if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
+    {
+        $string = kses_bad_protocol_once2($string2[0],$allowed_protocols).trim($string2[1]);
+    }
+    return $string;
 } # function kses_bad_protocol_once
 
 
@@ -484,24 +484,24 @@ 
 # list or not, and returns different data depending on the answer.
 ###############################################################################
 {
-  $string2 = kses_decode_entities($string);
-  $string2 = preg_replace('/\s/', '', $string2);
-  $string2 = kses_no_null($string2);
-  $string2 = preg_replace('/\xad+/', '', $string2);
-   # deals with Opera "feature"
-  $string2 = strtolower($string2);
-
-  $allowed = false;
-  foreach ($allowed_protocols as $one_protocol)
+    $string2 = kses_decode_entities($string);
+    $string2 = preg_replace('/\s/', '', $string2);
+    $string2 = kses_no_null($string2);
+    $string2 = preg_replace('/\xad+/', '', $string2);
+    # deals with Opera "feature"
+    $string2 = strtolower($string2);
+
+    $allowed = false;
+    foreach ($allowed_protocols as $one_protocol)
     if (strtolower($one_protocol) == $string2)
     {
-      $allowed = true;
-      break;
+        $allowed = true;
+        break;
     }
 
-  if ($allowed)
+    if ($allowed)
     return "$string2:";
-  else
+    else
     return '';
 } # function kses_bad_protocol_once2
 
@@ -514,18 +514,18 @@ 
 {
 # Disarm all entities by converting & to &amp;
 
-  $string = str_replace('&', '&amp;', $string);
+    $string = str_replace('&', '&amp;', $string);
 
 # Change back the allowed entities in our entity whitelist
 
-  $string = preg_replace('/&amp;([A-Za-z][A-Za-z0-9]{0,19});/',
-                         '&\\1;', $string);
-  $string = preg_replace('/&amp;#0*([0-9]{1,5});/e',
-                         'kses_normalize_entities2("\\1")', $string);
-  $string = preg_replace('/&amp;#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/',
-                         '&#\\1\\2;', $string);
+    $string = preg_replace('/&amp;([A-Za-z][A-Za-z0-9]{0,19});/',
+                            '&\\1;', $string);
+    $string = preg_replace('/&amp;#0*([0-9]{1,5});/e',
+                            'kses_normalize_entities2("\\1")', $string);
+    $string = preg_replace('/&amp;#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/',
+                            '&#\\1\\2;', $string);
 
-  return $string;
+    return $string;
 } # function kses_normalize_entities
 
 
@@ -535,7 +535,7 @@ 
 # and nothing more for &#number; entities.
 ###############################################################################
 {
-  return (($i > 65535) ? "&amp;#$i;" : "&#$i;");
+    return (($i > 65535) ? "&amp;#$i;" : "&#$i;");
 } # function kses_normalize_entities2
 
 
@@ -546,11 +546,11 @@ 
 # URL protocol whitelisting system anyway.
 ###############################################################################
 {
-  $string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string);
-  $string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))',
-                         $string);
+    $string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string);
+    $string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))',
+                            $string);
 
-  return $string;
+    return $string;
 } # function kses_decode_entities
 
 ?>

Spacing +10 added lines, -15 removed lines

@@ -73,9 +73,9 @@ 
 # matches stray ">" characters.
 ###############################################################################
 {
-  return preg_replace('%(<'.   # EITHER: <
-                      '[^>]*'. # things that aren't >
-                      '(>|$)'. # > or end of string
+  return preg_replace('%(<'.# EITHER: <
+                      '[^>]*'.# things that aren't >
+                      '(>|$)'.# > or end of string
                       '|>)%e', # OR: just a >
                       "kses_split2('\\1', \$allowed_html, ".
                       '$allowed_protocols)',
@@ -228,8 +228,7 @@ 
         if (preg_match('/^\s+/', $attr)) # valueless
         {
           $working = 1; $mode = 0;
-          $attrarr[] = array
-                        ('name'  => $attrname,
+          $attrarr[] = array('name'  => $attrname,
                          'value' => '',
                          'whole' => $attrname,
                          'vless' => 'y');
@@ -245,8 +244,7 @@ 
         {
           $thisval = kses_bad_protocol($match[1], $allowed_protocols);
 
-          $attrarr[] = array
-                        ('name'  => $attrname,
+          $attrarr[] = array('name'  => $attrname,
                          'value' => $thisval,
                          'whole' => "$attrname=\"$thisval\"",
                          'vless' => 'n');
@@ -260,8 +258,7 @@ 
         {
           $thisval = kses_bad_protocol($match[1], $allowed_protocols);
 
-          $attrarr[] = array
-                        ('name'  => $attrname,
+          $attrarr[] = array('name'  => $attrname,
                          'value' => $thisval,
                          'whole' => "$attrname='$thisval'",
                          'vless' => 'n');
@@ -275,8 +272,7 @@ 
         {
           $thisval = kses_bad_protocol($match[1], $allowed_protocols);
 
-          $attrarr[] = array
-                        ('name'  => $attrname,
+          $attrarr[] = array('name'  => $attrname,
                          'value' => $thisval,
                          'whole' => "$attrname=\"$thisval\"",
                          'vless' => 'n');
@@ -298,8 +294,7 @@ 
   if ($mode == 1)
   # special case, for when the attribute list ends with a valueless
   # attribute like "selected"
-    $attrarr[] = array
-                  ('name'  => $attrname,
+    $attrarr[] = array('name'  => $attrname,
                    'value' => '',
                    'whole' => $attrname,
                    'vless' => 'y');
@@ -470,9 +465,9 @@ 
 ###############################################################################
 {
 	$string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
-	if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
+	if (isset($string2[1]) && !preg_match('%/\?%', $string2[0]))
 	{
-		$string = kses_bad_protocol_once2($string2[0],$allowed_protocols).trim($string2[1]);
+		$string = kses_bad_protocol_once2($string2[0], $allowed_protocols).trim($string2[1]);
 	}
 	return $string;
 } # function kses_bad_protocol_once

Braces +90 added lines, -56 removed lines

@@ -93,24 +93,28 @@ 
 {
   $string = kses_stripslashes($string);
 
-  if (substr($string, 0, 1) != '<')
-    return '&gt;';
+  if (substr($string, 0, 1) != '<') {
+      return '&gt;';
+  }
     # It matched a ">" character
 
-  if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
-    return '';
+  if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches)) {
+      return '';
+  }
     # It's seriously malformed
 
   $slash = trim($matches[1]);
   $elem = $matches[2];
   $attrlist = $matches[3];
 
-  if (!@isset($allowed_html[strtolower($elem)]))
-    return '';
+  if (!@isset($allowed_html[strtolower($elem)])) {
+      return '';
+  }
     # They are using a not allowed HTML element
 
-  if ($slash != '')
-    return "<$slash$elem>";
+  if ($slash != '') {
+      return "<$slash$elem>";
+  }
   # No attributes are allowed for closing elements
 
   return kses_attr("$slash$elem", $attrlist, $allowed_html,
@@ -131,13 +135,15 @@ 
 # Is there a closing XHTML slash at the end of the attributes?
 
   $xhtml_slash = '';
-  if (preg_match('%\s/\s*$%', $attr))
-    $xhtml_slash = ' /';
+  if (preg_match('%\s/\s*$%', $attr)) {
+      $xhtml_slash = ' /';
+  }
 
 # Are any attributes allowed at all for this element?
 
-  if (@count($allowed_html[strtolower($element)]) == 0)
-    return "<$element$xhtml_slash>";
+  if (@count($allowed_html[strtolower($element)]) == 0) {
+      return "<$element$xhtml_slash>";
+  }
 
 # Split it
 
@@ -151,27 +157,34 @@ 
   foreach ($attrarr as $arreach)
   {
     if (!@isset($allowed_html[strtolower($element)]
-                            [strtolower($arreach['name'])]))
-      continue; # the attribute is not allowed
+                            [strtolower($arreach['name'])])) {
+          continue;
+    }
+    # the attribute is not allowed
 
     $current = $allowed_html[strtolower($element)]
                             [strtolower($arreach['name'])];
 
-    if (!is_array($current))
-      $attr2 .= ' '.$arreach['whole'];
+    if (!is_array($current)) {
+          $attr2 .= ' '.$arreach['whole'];
+    }
     # there are no checks
 
     else
     {
     # there are some checks
       $ok = true;
-      foreach ($current as $currkey => $currval)
-        if (!kses_check_attr_val($arreach['value'], $arreach['vless'],
+      foreach ($current as $currkey => $currval) {
+              if (!kses_check_attr_val($arreach['value'], $arreach['vless'],
                                  $currkey, $currval))
-        { $ok = false; break; }
-
-      if ($ok)
-        $attr2 .= ' '.$arreach['whole']; # it passed them
+        { $ok = false;
+      }
+      break; }
+
+      if ($ok) {
+              $attr2 .= ' '.$arreach['whole'];
+      }
+      # it passed them
     } # if !is_array($current)
   } # foreach
 
@@ -218,16 +231,22 @@ 
 
       case 1: # equals sign or valueless ("selected")
 
-        if (preg_match('/^\s*=\s*/', $attr)) # equals sign
+        if (preg_match('/^\s*=\s*/', $attr)) {
+            # equals sign
         {
-          $working = 1; $mode = 2;
+          $working = 1;
+        }
+        $mode = 2;
           $attr = preg_replace('/^\s*=\s*/', '', $attr);
           break;
         }
 
-        if (preg_match('/^\s+/', $attr)) # valueless
+        if (preg_match('/^\s+/', $attr)) {
+            # valueless
         {
-          $working = 1; $mode = 0;
+          $working = 1;
+        }
+        $mode = 0;
           $attrarr[] = array
                         ('name'  => $attrname,
                          'value' => '',
@@ -240,10 +259,11 @@ 
 
       case 2: # attribute value, a URL after href= for instance
 
-        if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match))
-         # "value"
+        if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) {
+                 # "value"
         {
           $thisval = kses_bad_protocol($match[1], $allowed_protocols);
+        }
 
           $attrarr[] = array
                         ('name'  => $attrname,
@@ -255,10 +275,11 @@ 
           break;
         }
 
-        if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match))
-         # 'value'
+        if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) {
+                 # 'value'
         {
           $thisval = kses_bad_protocol($match[1], $allowed_protocols);
+        }
 
           $attrarr[] = array
                         ('name'  => $attrname,
@@ -270,10 +291,11 @@ 
           break;
         }
 
-        if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match))
-         # value
+        if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) {
+                 # value
         {
           $thisval = kses_bad_protocol($match[1], $allowed_protocols);
+        }
 
           $attrarr[] = array
                         ('name'  => $attrname,
@@ -288,21 +310,24 @@ 
         break;
     } # switch
 
-    if ($working == 0) # not well formed, remove and try again
+    if ($working == 0) {
+        # not well formed, remove and try again
     {
       $attr = kses_html_error($attr);
+    }
       $mode = 0;
     }
   } # while
 
-  if ($mode == 1)
-  # special case, for when the attribute list ends with a valueless
+  if ($mode == 1) {
+    # special case, for when the attribute list ends with a valueless
   # attribute like "selected"
     $attrarr[] = array
                   ('name'  => $attrname,
                    'value' => '',
                    'whole' => $attrname,
                    'vless' => 'y');
+  }
 
   return $attrarr;
 } # function kses_hair
@@ -324,16 +349,18 @@ 
     # greater than the given value. This can be used to avoid Buffer Overflows
     # in WWW clients and various Internet servers.
 
-      if (strlen($value) > $checkvalue)
-        $ok = false;
+      if (strlen($value) > $checkvalue) {
+              $ok = false;
+      }
       break;
 
     case 'minlen':
     # The minlen check makes sure that the attribute value has a length not
     # smaller than the given value.
 
-      if (strlen($value) < $checkvalue)
-        $ok = false;
+      if (strlen($value) < $checkvalue) {
+              $ok = false;
+      }
       break;
 
     case 'maxval':
@@ -343,20 +370,24 @@ 
     # value is not greater than the given value.
     # This check can be used to avoid Denial of Service attacks.
 
-      if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-        $ok = false;
-      if ($value > $checkvalue)
-        $ok = false;
+      if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) {
+              $ok = false;
+      }
+      if ($value > $checkvalue) {
+              $ok = false;
+      }
       break;
 
     case 'minval':
     # The minval check checks that the attribute value is a positive integer,
     # and that it is not smaller than the given value.
 
-      if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-        $ok = false;
-      if ($value < $checkvalue)
-        $ok = false;
+      if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value)) {
+              $ok = false;
+      }
+      if ($value < $checkvalue) {
+              $ok = false;
+      }
       break;
 
     case 'valueless':
@@ -365,8 +396,9 @@ 
     # is a "y" or a "Y", the attribute must not have a value.
     # If the given value is an "n" or an "N", the attribute must have one.
 
-      if (strtolower($checkvalue) != $vless)
-        $ok = false;
+      if (strtolower($checkvalue) != $vless) {
+              $ok = false;
+      }
       break;
   } # switch
 
@@ -492,18 +524,20 @@ 
   $string2 = strtolower($string2);
 
   $allowed = false;
-  foreach ($allowed_protocols as $one_protocol)
-    if (strtolower($one_protocol) == $string2)
+  foreach ($allowed_protocols as $one_protocol) {
+      if (strtolower($one_protocol) == $string2)
     {
       $allowed = true;
+  }
       break;
     }
 
-  if ($allowed)
-    return "$string2:";
-  else
-    return '';
-} # function kses_bad_protocol_once2
+  if ($allowed) {
+      return "$string2:";
+  } else {
+      return '';
+  }
+  } # function kses_bad_protocol_once2
 
 
 function kses_normalize_entities($string)

main/inc/lib/kses-0.2.2/oop/php4.class.kses.php

Doc Comments +3 added lines, -5 removed lines

@@ -431,7 +431,7 @@ 
 			 *
 			 *	@access public
 			 *	@param mixed , A string or array of protocols that will be removed from the internal list of allowed protocols.
-			 *	@return bool Status of removing valid protocols.
+			 *	@return null|boolean Status of removing valid protocols.
 			 *	@see RemoveProtocol()
 			 *	@since PHP5 OOP 0.2.1
 			 */
@@ -579,7 +579,7 @@ 
 			 *	This method goes through an array, and changes the keys to all lower case.
 			 *
 			 *	@access private
-			 *	@param array $in_array Associative array
+			 *	@param array $inarray Associative array
 			 *	@return array Modified array
 			 *	@since PHP4 OOP 0.0.1
 			 */
@@ -1129,9 +1129,7 @@ 
 			 *	URL protocol white listing system anyway.
 			 *
 			 *	@access private
-			 *	@param string $value The entitiy to be decoded.
-			 *	@return string Decoded entity
-			 *	@since PHP4 OOP 0.0.1
+			 * @param string $string
 			 */
 			function _decode_entities($string)
 			{

Indentation +1137 added lines, -1137 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	/*
+    /*
 	 * ==========================================================================================
 	 *
 	 * This program is free software and open source software; you can redistribute
@@ -20,1143 +20,1143 @@ 
 	 * ==========================================================================================
 	 */
 
-	/**
-	*	Class file for PHP4 OOP version of kses
-	*
-	*	This is an updated version of kses to work with PHP4 that works under E_STRICT.
-	*
-	*	This upgrade provides the following:
-	*	+ Version number synced to procedural version number
-	*	+ PHPdoc style documentation has been added to the class.  See http://www.phpdoc.org/ for more info.
-	*	+ Some methods are now deprecated due to nomenclature style change.  See method documentation for specifics.
-	*	+ Kses4 now works in E_STRICT
-	*	+ Addition of methods AddProtocols(), filterKsestextHook(), RemoveProtocol() and RemoveProtocols()
-	*	+ Deprecated _hook(), Protocols()
-	*	+ Integrated code from kses 0.2.2 into class.
-	*	+ Added methods DumpProtocols(), DumpMethods()
-	*
-	*	@package    kses
-	*	@subpackage kses4
-	*/
-
-	if(substr(phpversion(), 0, 1) < 4)
-	{
-		die("Class kses requires PHP 4 or higher.");
-	}
-
-	/**
-	*	Only install KSES4 once
-	*/
-	if(!defined('KSES_CLASS_PHP4'))
-	{
-		define('KSES_CLASS_PHP4', true);
-
-	/**
-	*	Kses strips evil scripts!
-	*
-	*	This class provides the capability for removing unwanted HTML/XHTML, attributes from
-	*	tags, and protocols contained in links.  The net result is a much more powerful tool
-	*	than the PHP internal strip_tags()
-	*
-	*	This is a fork of a slick piece of procedural code called 'kses' written by Ulf Harnhammar
-	*	The entire set of functions was wrapped in a PHP object with some internal modifications
-	*	by Richard Vasquez (http://www.chaos.org/) 7/25/2003
-	*
-	*	This upgrade provides the following:
-	*	+ Version number synced to procedural version number
-	*	+ PHPdoc style documentation has been added to the class.  See http://www.phpdoc.org/ for more info.
-	*	+ Some methods are now deprecated due to nomenclature style change.  See method documentation for specifics.
-	*	+ Kses4 now works in E_STRICT
-	*	+ Addition of methods AddProtocols(), filterKsestextHook(), RemoveProtocol(), RemoveProtocols() and SetProtocols()
-	*	+ Deprecated _hook(), Protocols()
-	*	+ Integrated code from kses 0.2.2 into class.
-	*
-	*	@author     Richard R. V�squez, Jr. (Original procedural code by Ulf H�rnhammar)
-	*	@link       http://sourceforge.net/projects/kses/ Home Page for Kses
-	*	@link       http://chaos.org/contact/ Contact page with current email address for Richard Vasquez
-	*	@copyright  Richard R. V�squez, Jr. 2003-2005
-	*	@version    PHP4 OOP 0.2.2
-	*	@license    http://www.gnu.org/licenses/gpl.html GNU Public License
-	*	@package    kses
-	*/
-		class kses4
-		{
-			/**#@+
+    /**
+     *	Class file for PHP4 OOP version of kses
+     *
+     *	This is an updated version of kses to work with PHP4 that works under E_STRICT.
+     *
+     *	This upgrade provides the following:
+     *	+ Version number synced to procedural version number
+     *	+ PHPdoc style documentation has been added to the class.  See http://www.phpdoc.org/ for more info.
+     *	+ Some methods are now deprecated due to nomenclature style change.  See method documentation for specifics.
+     *	+ Kses4 now works in E_STRICT
+     *	+ Addition of methods AddProtocols(), filterKsestextHook(), RemoveProtocol() and RemoveProtocols()
+     *	+ Deprecated _hook(), Protocols()
+     *	+ Integrated code from kses 0.2.2 into class.
+     *	+ Added methods DumpProtocols(), DumpMethods()
+     *
+     *	@package    kses
+     *	@subpackage kses4
+     */
+
+    if(substr(phpversion(), 0, 1) < 4)
+    {
+        die("Class kses requires PHP 4 or higher.");
+    }
+
+    /**
+     *	Only install KSES4 once
+     */
+    if(!defined('KSES_CLASS_PHP4'))
+    {
+        define('KSES_CLASS_PHP4', true);
+
+    /**
+     *	Kses strips evil scripts!
+     *
+     *	This class provides the capability for removing unwanted HTML/XHTML, attributes from
+     *	tags, and protocols contained in links.  The net result is a much more powerful tool
+     *	than the PHP internal strip_tags()
+     *
+     *	This is a fork of a slick piece of procedural code called 'kses' written by Ulf Harnhammar
+     *	The entire set of functions was wrapped in a PHP object with some internal modifications
+     *	by Richard Vasquez (http://www.chaos.org/) 7/25/2003
+     *
+     *	This upgrade provides the following:
+     *	+ Version number synced to procedural version number
+     *	+ PHPdoc style documentation has been added to the class.  See http://www.phpdoc.org/ for more info.
+     *	+ Some methods are now deprecated due to nomenclature style change.  See method documentation for specifics.
+     *	+ Kses4 now works in E_STRICT
+     *	+ Addition of methods AddProtocols(), filterKsestextHook(), RemoveProtocol(), RemoveProtocols() and SetProtocols()
+     *	+ Deprecated _hook(), Protocols()
+     *	+ Integrated code from kses 0.2.2 into class.
+     *
+     *	@author     Richard R. V�squez, Jr. (Original procedural code by Ulf H�rnhammar)
+     *	@link       http://sourceforge.net/projects/kses/ Home Page for Kses
+     *	@link       http://chaos.org/contact/ Contact page with current email address for Richard Vasquez
+     *	@copyright  Richard R. V�squez, Jr. 2003-2005
+     *	@version    PHP4 OOP 0.2.2
+     *	@license    http://www.gnu.org/licenses/gpl.html GNU Public License
+     *	@package    kses
+     */
+        class kses4
+        {
+            /**#@+
 			 *	@access private
 			 *	@var array
 			 */
-			var $allowed_protocols = array();
-			var $allowed_html      = array();
-			/**#@-*/
-
-			/**
-			 *	Constructor for kses.
-			 *
-			 *	This sets a default collection of protocols allowed in links, and creates an
-			 *	empty set of allowed HTML tags.
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function kses4()
-			{
-				/**
-				 *	You could add protocols such as ftp, new, gopher, mailto, irc, etc.
-				 *
-				 *	The base values the original kses provided were:
-				 *		'http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto'
-				 */
-				$this->allowed_protocols = array('http', 'ftp', 'mailto');
-				$this->allowed_html      = array();
-			}
-
-			/**
-			 *	Basic task of kses - parses $string and strips it as required.
-			 *
-			 *	This method strips all the disallowed (X)HTML tags, attributes
-			 *	and protocols from the input $string.
-			 *
-			 *	@access public
-			 *	@param string $string String to be stripped of 'evil scripts'
-			 *	@return string The stripped string
-			 *	@since PHP4 OOP 0.2.1
-			 */
-			function Parse($string = "")
-			{
-				if (get_magic_quotes_gpc())
-				{
-					$string = stripslashes($string);
-				}
-				$string = $this->_no_null($string);
-				$string = $this->_js_entities($string);
-				$string = $this->_normalize_entities($string);
-				$string = $this->filterKsesTextHook($string);
-				return    $this->_split($string);
-			}
-
-			/**
-			 *	Allows for single/batch addition of protocols
-			 *
-			 *	This method accepts one argument that can be either a string
-			 *	or an array of strings.  Invalid data will be ignored.
-			 *
-			 *	The argument will be processed, and each string will be added
-			 *	via AddProtocol().
-			 *
-			 *	@access public
-			 *	@param mixed , A string or array of protocols that will be added to the internal list of allowed protocols.
-			 *	@return bool Status of adding valid protocols.
-			 *	@see AddProtocol()
-			 *	@since PHP4 OOP 0.2.1
-			 */
-			function AddProtocols()
-			{
-				$c_args = func_num_args();
-				if($c_args != 1)
-				{
-					trigger_error("kses4::AddProtocols() did not receive an argument.", E_USER_WARNING);
-					return false;
-				}
-
-				$protocol_data = func_get_arg(0);
-
-				if(is_array($protocol_data) && count($protocol_data) > 0)
-				{
-					foreach($protocol_data as $protocol)
-					{
-						$this->AddProtocol($protocol);
-					}
-					return true;
-				}
-				elseif(is_string($protocol_data))
-				{
-					$this->AddProtocol($protocol_data);
-					return true;
-				}
-				else
-				{
-					trigger_error("kses4::AddProtocols() did not receive a string or an array.", E_USER_WARNING);
-					return false;
-				}
-			}
-
-			/**
-			 *	Allows for single/batch addition of protocols
-			 *
-			 *	@deprecated Use AddProtocols()
-			 *	@see AddProtocols()
-			 *	@return bool
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function Protocols()
-			{
-				$c_args = func_num_args();
-				if($c_args != 1)
-				{
-					trigger_error("kses4::Protocols() did not receive an argument.", E_USER_WARNING);
-					return false;
-				}
-
-				return $this->AddProtocols(func_get_arg(0));
-			}
-
-			/**
-			 *	Adds a single protocol to $this->allowed_protocols.
-			 *
-			 *	This method accepts a string argument and adds it to
-			 *	the list of allowed protocols to keep when performing
-			 *	Parse().
-			 *
-			 *	@access public
-			 *	@param string $protocol The name of the protocol to be added.
-			 *	@return bool Status of adding valid protocol.
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function AddProtocol($protocol = "")
-			{
-				if(!is_string($protocol))
-				{
-					trigger_error("kses4::AddProtocol() requires a string.", E_USER_WARNING);
-					return false;
-				}
-
-				$protocol = strtolower(trim($protocol));
-				if($protocol == "")
-				{
-					trigger_error("kses4::AddProtocol() tried to add an empty/NULL protocol.", E_USER_WARNING);
-					return false;
-				}
-
-				// Remove any inadvertent ':' at the end of the protocol.
-				if(substr($protocol, strlen($protocol) - 1, 1) == ":")
-				{
-					$protocol = substr($protocol, 0, strlen($protocol) - 1);
-				}
-
-				if(!in_array($protocol, $this->allowed_protocols))
-				{
-					array_push($this->allowed_protocols, $protocol);
-					sort($this->allowed_protocols);
-				}
-				return true;
-			}
-
-			/**
-			 *	Allows for single/batch replacement of protocols
-			 *
-			 *	This method accepts one argument that can be either a string
-			 *	or an array of strings.  Invalid data will be ignored.
-			 *
-			 *	Existing protocols will be removed, then the argument will be
-			 *	processed, and each string will be added via AddProtocol().
-			 *
-			 *	@access public
-			 *	@param mixed , A string or array of protocols that will be the new internal list of allowed protocols.
-			 *	@return bool Status of replacing valid protocols.
-			 *	@since PHP4 OOP 0.2.2
-			 *	@see AddProtocol()
-			 */
-			function SetProtocols()
-			{
-				$c_args = func_num_args();
-				if($c_args != 1)
-				{
-					trigger_error("kses4::SetProtocols() did not receive an argument.", E_USER_WARNING);
-					return false;
-				}
-
-				$protocol_data = func_get_arg(0);
-
-				if(is_array($protocol_data) && count($protocol_data) > 0)
-				{
-					$this->allowed_protocols = array();
-					foreach($protocol_data as $protocol)
-					{
-						$this->AddProtocol($protocol);
-					}
-					return true;
-				}
-				elseif(is_string($protocol_data))
-				{
-					$this->allowed_protocols = array();
-					$this->AddProtocol($protocol_data);
-					return true;
-				}
-				else
-				{
-					trigger_error("kses4::SetProtocols() did not receive a string or an array.", E_USER_WARNING);
-					return false;
-				}
-			}
-
-			/**
-			 *	Raw dump of allowed protocols
-			 *
-			 *	This returns an indexed array of allowed protocols for a particular KSES
-			 *	instantiation.
-			 *
-			 *	@access public
-			 *	@return array The list of allowed protocols.
-			 *	@since PHP4 OOP 0.2.2
-			 */
-			function DumpProtocols()
-			{
-				return $this->allowed_protocols;
-			}
-
-			/**
-			 *	Raw dump of allowed (X)HTML elements
-			 *
-			 *	This returns an indexed array of allowed (X)HTML elements and attributes
-			 *	for a particular KSES instantiation.
-			 *
-			 *	@access public
-			 *	@return array The list of allowed elements.
-			 *	@since PHP4 OOP 0.2.2
-			 */
-			function DumpElements()
-			{
-				return $this->allowed_html;
-			}
-
-			/**
-			 *	Adds valid (X)HTML with corresponding attributes that will be kept when stripping 'evil scripts'.
-			 *
-			 *	This method accepts one argument that can be either a string
-			 *	or an array of strings.  Invalid data will be ignored.
-			 *
-			 *	@access public
-			 *	@param string $tag (X)HTML tag that will be allowed after stripping text.
-			 *	@param array $attribs Associative array of allowed attributes - key => attribute name - value => attribute parameter
-			 *	@return bool Status of Adding (X)HTML and attributes.
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function AddHTML($tag = "", $attribs = array())
-			{
-				if(!is_string($tag))
-				{
-					trigger_error("kses4::AddHTML() requires the tag to be a string", E_USER_WARNING);
-					return false;
-				}
-
-				$tag = strtolower(trim($tag));
-				if($tag == "")
-				{
-					trigger_error("kses4::AddHTML() tried to add an empty/NULL tag", E_USER_WARNING);
-					return false;
-				}
-
-				if(!is_array($attribs))
-				{
-					trigger_error("kses4::AddHTML() requires an array (even an empty one) of attributes for '$tag'", E_USER_WARNING);
-					return false;
-				}
-
-				$new_attribs = array();
-				if(is_array($attribs) && count($attribs) > 0)
-				{
-					foreach($attribs as $idx1 => $val1)
-					{
-						$new_idx1 = strtolower($idx1);
-						$new_val1 = $attribs[$idx1];
-
-						if(is_array($new_val1) && count($new_val1) > 0)
-						{
-							$tmp_val = array();
-							foreach($new_val1 as $idx2 => $val2)
-							{
-								$new_idx2 = strtolower($idx2);
-								$tmp_val[$new_idx2] = $val2;
-							}
-							$new_val1 = $tmp_val;
-						}
-
-						$new_attribs[$new_idx1] = $new_val1;
-					}
-				}
-
-				$this->allowed_html[$tag] = $new_attribs;
-				return true;
-			}
-
-			/**
-			 *	Removes a single protocol from $this->allowed_protocols.
-			 *
-			 *	This method accepts a string argument and removes it from
-			 *	the list of allowed protocols to keep when performing
-			 *	Parse().
-			 *
-			 *	@access public
-			 *	@param string $protocol The name of the protocol to be removed.
-			 *	@return bool Status of removing valid protocol.
-			 *	@since PHP4 OOP 0.2.1
-			 */
-			function RemoveProtocol($protocol = "")
-			{
-				if(!is_string($protocol))
-				{
-					trigger_error("kses4::RemoveProtocol() requires a string.", E_USER_WARNING);
-					return false;
-				}
-
-				// Remove any inadvertent ':' at the end of the protocol.
-				if(substr($protocol, strlen($protocol) - 1, 1) == ":")
-				{
-					$protocol = substr($protocol, 0, strlen($protocol) - 1);
-				}
-
-				$protocol = strtolower(trim($protocol));
-				if($protocol == "")
-				{
-					trigger_error("kses4::RemoveProtocol() tried to remove an empty/NULL protocol.", E_USER_WARNING);
-					return false;
-				}
-
-				//	Ensures that the protocol exists before removing it.
-				if(in_array($protocol, $this->allowed_protocols))
-				{
-					$this->allowed_protocols = array_diff($this->allowed_protocols, array($protocol));
-					sort($this->allowed_protocols);
-				}
-
-				return true;
-			}
-
-			/**
-			 *	Allows for single/batch removal of protocols
-			 *
-			 *	This method accepts one argument that can be either a string
-			 *	or an array of strings.  Invalid data will be ignored.
-			 *
-			 *	The argument will be processed, and each string will be removed
-			 *	via RemoveProtocol().
-			 *
-			 *	@access public
-			 *	@param mixed , A string or array of protocols that will be removed from the internal list of allowed protocols.
-			 *	@return bool Status of removing valid protocols.
-			 *	@see RemoveProtocol()
-			 *	@since PHP5 OOP 0.2.1
-			 */
-			function RemoveProtocols()
-			{
-				$c_args = func_num_args();
-				if($c_args != 1)
-				{
-					return false;
-				}
-
-				$protocol_data = func_get_arg(0);
-
-				if(is_array($protocol_data) && count($protocol_data) > 0)
-				{
-					foreach($protocol_data as $protocol)
-					{
-						$this->RemoveProtocol($protocol);
-					}
-				}
-				elseif(is_string($protocol_data))
-				{
-					$this->RemoveProtocol($protocol_data);
-					return true;
-				}
-				else
-				{
-					trigger_error("kses4::RemoveProtocols() did not receive a string or an array.", E_USER_WARNING);
-					return false;
-				}
-			}
-
-			/**
-			 *	This method removes any NULL or characters in $string.
-			 *
-			 *	@access private
-			 *	@param string $string
-			 *	@return string String without any NULL/chr(173)
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _no_null($string)
-			{
-				$string = preg_replace('/\0+/', '', $string);
-				$string = preg_replace('/(\\\\0)+/', '', $string);
-				return $string;
-			}
-
-			/**
-			 *	This function removes the HTML JavaScript entities found in early versions of
-			 *	Netscape 4.
-			 *
-			 *	@access private
-			 *	@param string $string
-			 *	@return string String without any NULL/chr(173)
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _js_entities($string)
-			{
-			  return preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
-			}
-
-			/**
-			 *	Normalizes HTML entities
-			 *
-			 *	This function normalizes HTML entities. It will convert "AT&T" to the correct
-			 *	"AT&amp;T", "&#00058;" to "&#58;", "&#XYZZY;" to "&amp;#XYZZY;" and so on.
-			 *
-			 *	@access private
-			 *	@param string $string
-			 *	@return string String with normalized entities
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _normalize_entities($string)
-			{
-				# Disarm all entities by converting & to &amp;
-			  $string = str_replace('&', '&amp;', $string);
-
-				# Change back the allowed entities in our entity white list
-
-			  $string = preg_replace('/&amp;([A-Za-z][A-Za-z0-9]{0,19});/', '&\\1;', $string);
-			  $string = preg_replace('/&amp;#0*([0-9]{1,5});/e', '\$this->_normalize_entities2("\\1")', $string);
-			  $string = preg_replace('/&amp;#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/', '&#\\1\\2;', $string);
-
-			  return $string;
-			}
-
-			/**
-			 *	Helper method used by normalizeEntites()
-			 *
-			 *	This method helps normalizeEntities() to only accept 16 bit values
-			 *	and nothing more for &#number; entities.
-			 *
-			 *	This method helps normalize_entities() during a preg_replace()
-			 *	where a &#(0)*XXXXX; occurs.  The '(0)*XXXXXX' value is converted to
-			 *	a number and the result is returned as a numeric entity if the number
-			 *	is less than 65536.  Otherwise, the value is returned 'as is'.
-			 *
-			 *	@access private
-			 *	@param string $i
-			 *	@return string Normalized numeric entity
-			 *	@see _normalize_entities()
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _normalize_entities2($i)
-			{
-			  return (($i > 65535) ? "&amp;#$i;" : "&#$i;");
-			}
-
-			/**
-			 *	Allows for additional user defined modifications to text.
-			 *
-			 *	@deprecated use filterKsesTextHook()
-			 *	@param string $string
-			 *	@see filterKsesTextHook()
-			 *	@return string
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _hook($string)
-			{
-			  return $this->filterKsesTextHook($string);
-			}
-
-			/**
-			 *	Allows for additional user defined modifications to text.
-			 *
-			 *	This method allows for additional modifications to be performed on
-			 *	a string that's being run through Parse().  Currently, it returns the
-			 *	input string 'as is'.
-			 *
-			 *	This method is provided for users to extend the kses class for their own
-			 *	requirements.
-			 *
-			 *	@access public
-			 *	@param string $string String to perfrom additional modifications on.
-			 *	@return string User modified string.
-			 *	@see Parse()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			function filterKsesTextHook($string)
-			{
-			  return $string;
-			}
-
-			/**
-			 *	This method goes through an array, and changes the keys to all lower case.
-			 *
-			 *	@access private
-			 *	@param array $in_array Associative array
-			 *	@return array Modified array
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _array_lc($inarray)
-			{
-			  $outarray = array();
-
-				if(is_array($inarray) && count($inarray) > 0)
-				{
-					foreach ($inarray as $inkey => $inval)
-					{
-						$outkey = strtolower($inkey);
-						$outarray[$outkey] = array();
-
-						if(is_array($inval) && count($inval) > 0)
-						{
-							foreach ($inval as $inkey2 => $inval2)
-							{
-								$outkey2 = strtolower($inkey2);
-								$outarray[$outkey][$outkey2] = $inval2;
-							}
-						}
-					}
-				}
-
-			  return $outarray;
-			}
-
-			/**
-			 *	This method searched for HTML tags, no matter how malformed.  It also
-			 *	matches stray ">" characters.
-			 *
-			 *	@access private
-			 *	@param string $string
-			 *	@return string HTML tags
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _split($string)
-			{
-				return preg_replace(
-					'%(<'.   # EITHER: <
-					'[^>]*'. # things that aren't >
-					'(>|$)'. # > or end of string
-					'|>)%e', # OR: just a >
-					"\$this->_split2('\\1')",
-					$string);
-			}
-
-			/**
-			 *	This method strips out disallowed and/or mangled (X)HTML tags along with assigned attributes.
-			 *
-			 *	This method does a lot of work. It rejects some very malformed things
-			 *	like <:::>. It returns an empty string if the element isn't allowed (look
-			 *	ma, no strip_tags()!). Otherwise it splits the tag into an element and an
-			 *	allowed attribute list.
-			 *
-			 *	@access private
-			 *	@param string $string
-			 *	@return string Modified string minus disallowed/mangled (X)HTML and attributes
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _split2($string)
-			{
-				$string = $this->_stripslashes($string);
-
-				if (substr($string, 0, 1) != '<')
-				{
-					# It matched a ">" character
-					return '&gt;';
-				}
-
-				if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
-				{
-					# It's seriously malformed
-					return '';
-				}
-
-				$slash    = trim($matches[1]);
-				$elem     = $matches[2];
-				$attrlist = $matches[3];
-
-				if (
-					!isset($this->allowed_html[strtolower($elem)]) ||
-					!is_array($this->allowed_html[strtolower($elem)])
-				)
-				{
-					# They are using a not allowed HTML element
-					return '';
-				}
-
-				if ($slash != '')
-				{
-					return "<$slash$elem>";
-				}
-				# No attributes are allowed for closing elements
-
-				return $this->_attr("$slash$elem", $attrlist);
-			}
-
-			/**
-			 *	This method strips out disallowed attributes for (X)HTML tags.
-			 *
-			 *	This method removes all attributes if none are allowed for this element.
-			 *	If some are allowed it calls $this->_hair() to split them further, and then it
-			 *	builds up new HTML code from the data that $this->_hair() returns. It also
-			 *	removes "<" and ">" characters, if there are any left. One more thing it
-			 *	does is to check if the tag has a closing XHTML slash, and if it does,
-			 *	it puts one in the returned code as well.
-			 *
-			 *	@access private
-			 *	@param string $element (X)HTML tag to check
-			 *	@param string $attr Text containing attributes to check for validity.
-			 *	@return string Resulting valid (X)HTML or ''
-			 *	@see _hair()
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _attr($element, $attr)
-			{
-				# Is there a closing XHTML slash at the end of the attributes?
-				$xhtml_slash = '';
-				if (preg_match('%\s/\s*$%', $attr))
-				{
-					$xhtml_slash = ' /';
-				}
-
-				# Are any attributes allowed at all for this element?
-				if (
-					!isset($this->allowed_html[strtolower($element)]) ||
-					count($this->allowed_html[strtolower($element)]) == 0
-				)
-				{
-					return "<$element$xhtml_slash>";
-				}
-
-				# Split it
-				$attrarr = $this->_hair($attr);
-
-				# Go through $attrarr, and save the allowed attributes for this element
-				# in $attr2
-				$attr2 = '';
-				if(is_array($attrarr) && count($attrarr) > 0)
-				{
-					foreach ($attrarr as $arreach)
-					{
-						if(!isset($this->allowed_html[strtolower($element)][strtolower($arreach['name'])]))
-						{
-							continue;
-						}
-
-						$current = $this->allowed_html[strtolower($element)][strtolower($arreach['name'])];
-						if ($current == '')
-						{
-							# the attribute is not allowed
-							continue;
-						}
-
-						if (!is_array($current))
-						{
-							# there are no checks
-							$attr2 .= ' '.$arreach['whole'];
-						}
-						else
-						{
-							# there are some checks
-							$ok = true;
-							if(is_array($current) && count($current) > 0)
-							{
-								foreach ($current as $currkey => $currval)
-								{
-									if (!$this->_check_attr_val($arreach['value'], $arreach['vless'], $currkey, $currval))
-									{
-										$ok = false;
-										break;
-									}
-								}
-
-								if ($ok)
-								{
-									# it passed them
-									$attr2 .= ' '.$arreach['whole'];
-								}
-							}
-						}
-					}
-				}
-
-				# Remove any "<" or ">" characters
-				$attr2 = preg_replace('/[<>]/', '', $attr2);
-				return "<$element$attr2$xhtml_slash>";
-			}
-
-			/**
-			 *	This method combs through an attribute list string and returns an associative array of attributes and values.
-			 *
-			 *	This method does a lot of work. It parses an attribute list into an array
-			 *	with attribute data, and tries to do the right thing even if it gets weird
-			 *	input. It will add quotes around attribute values that don't have any quotes
-			 *	or apostrophes around them, to make it easier to produce HTML code that will
-			 *	conform to W3C's HTML specification. It will also remove bad URL protocols
-			 *	from attribute values.
-			 *
-			 *	@access private
-			 *	@param string $attr Text containing tag attributes for parsing
-			 *	@return array Associative array containing data on attribute and value
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _hair($attr)
-			{
-				$attrarr  = array();
-				$mode     = 0;
-				$attrname = '';
-
-				# Loop through the whole attribute list
-
-				while (strlen($attr) != 0)
-				{
-					# Was the last operation successful?
-					$working = 0;
-
-					switch ($mode)
-					{
-						case 0:	# attribute name, href for instance
-							if (preg_match('/^([-a-zA-Z]+)/', $attr, $match))
-							{
-								$attrname = $match[1];
-								$working = $mode = 1;
-								$attr = preg_replace('/^[-a-zA-Z]+/', '', $attr);
-							}
-							break;
-						case 1:	# equals sign or valueless ("selected")
-							if (preg_match('/^\s*=\s*/', $attr)) # equals sign
-							{
-								$working = 1;
-								$mode    = 2;
-								$attr    = preg_replace('/^\s*=\s*/', '', $attr);
-								break;
-							}
-							if (preg_match('/^\s+/', $attr)) # valueless
-							{
-								$working   = 1;
-								$mode      = 0;
-								$attrarr[] = array(
-									'name'  => $attrname,
-									'value' => '',
-									'whole' => $attrname,
-									'vless' => 'y'
-								);
-								$attr      = preg_replace('/^\s+/', '', $attr);
-							}
-							break;
-						case 2: # attribute value, a URL after href= for instance
-							if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) # "value"
-							{
-								$thisval   = $this->_bad_protocol($match[1]);
-								$attrarr[] = array(
-									'name'  => $attrname,
-									'value' => $thisval,
-									'whole' => "$attrname=\"$thisval\"",
-									'vless' => 'n'
-								);
-								$working   = 1;
-								$mode      = 0;
-								$attr      = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
-								break;
-							}
-							if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) # 'value'
-							{
-								$thisval   = $this->_bad_protocol($match[1]);
-								$attrarr[] = array(
-									'name'  => $attrname,
-									'value' => $thisval,
-									'whole' => "$attrname='$thisval'",
-									'vless' => 'n'
-								);
-								$working   = 1;
-								$mode      = 0;
-								$attr      = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
-								break;
-							}
-							if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) # value
-							{
-								$thisval   = $this->_bad_protocol($match[1]);
-								$attrarr[] = array(
-									'name'  => $attrname,
-									'value' => $thisval,
-									'whole' => "$attrname=\"$thisval\"",
-									'vless' => 'n'
-								);
-								# We add quotes to conform to W3C's HTML spec.
-								$working   = 1;
-								$mode      = 0;
-								$attr      = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr);
-							}
-							break;
-					}
-
-					if ($working == 0) # not well formed, remove and try again
-					{
-						$attr = $this->_html_error($attr);
-						$mode = 0;
-					}
-				}
-
-				# special case, for when the attribute list ends with a valueless
-				# attribute like "selected"
-				if ($mode == 1)
-				{
-					$attrarr[] = array(
-						'name'  => $attrname,
-						'value' => '',
-						'whole' => $attrname,
-						'vless' => 'y'
-					);
-				}
-
-				return $attrarr;
-			}
-
-			/**
-			 *	This method removes disallowed protocols.
-			 *
-			 *	This method removes all non-allowed protocols from the beginning of
-			 *	$string. It ignores whitespace and the case of the letters, and it does
-			 *	understand HTML entities. It does its work in a while loop, so it won't be
-			 *	fooled by a string like "javascript:javascript:alert(57)".
-			 *
-			 *	@access private
-			 *	@param string $string String to check for protocols
-			 *	@return string String with removed protocols
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _bad_protocol($string)
-			{
-				$string  = $this->_no_null($string);
-				$string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature"
-				$string2 = $string.'a';
-
-				while ($string != $string2)
-				{
-					$string2 = $string;
-					$string  = $this->_bad_protocol_once($string);
-				} # while
-
-				return $string;
-			}
-
-			/**
-			 *	Helper method used by _bad_protocol()
-			 *
-			 *	This function searches for URL protocols at the beginning of $string, while
-			 *	handling whitespace and HTML entities.
-			 *  Function updated to fix security vulnerability (see http://projects.dokeos.com/index.php?do=details&task_id=2312)
-			 *
-			 *	@access private
-			 *	@param string $string String to check for protocols
-			 *	@return string String with removed protocols
-			 *	@see _bad_protocol()
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _bad_protocol_once($string)
-			{
-				$string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
-				if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
-				{
-					$string = $this->_bad_protocol_once2($string2[0]).trim($string2[1]);
-				}
-				return $string;
-			}
-			/**
-			 *	Helper method used by _bad_protocol_once() regex
-			 *
-			 *	This function processes URL protocols, checks to see if they're in the white-
-			 *	list or not, and returns different data depending on the answer.
-			 *
-			 *	@access private
-			 *	@param string $string String to check for protocols
-			 *	@return string String with removed protocols
-			 *	@see _bad_protocol()
-			 *	@see _bad_protocol_once()
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _bad_protocol_once2($string)
-			{
-				$string = $this->_decode_entities($string);
-				$string = preg_replace('/\s/', '', $string);
-				$string = $this->_no_null($string);
-				$string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature"
-				$string = strtolower($string);
-
-				$allowed = false;
-				if(is_array($this->allowed_protocols) && count($this->allowed_protocols) > 0)
-				{
-					foreach ($this->allowed_protocols as $one_protocol)
-					{
-						if (strtolower($one_protocol) == $string)
-						{
-							$allowed = true;
-							break;
-						}
-					}
-				}
-
-				if ($allowed)
-				{
-					return "$string:";
-				}
-				else
-				{
-					return '';
-				}
-			}
-
-			/**
-			 *	This function performs different checks for attribute values.
-			 *
-			 *	The currently implemented checks are "maxlen", "minlen", "maxval",
-			 *	"minval" and "valueless" with even more checks to come soon.
-			 *
-			 *	@access private
-			 *	@param string $value The value of the attribute to be checked.
-			 *	@param string $vless Indicates whether the the value is supposed to be valueless
-			 *	@param string $checkname The check to be performed
-			 *	@param string $checkvalue The value that is to be checked against
-			 *	@return bool Indicates whether the check passed or not
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _check_attr_val($value, $vless, $checkname, $checkvalue)
-			{
-				$ok = true;
-
-				switch (strtolower($checkname))
-				{
-					/**
-					*	The maxlen check makes sure that the attribute value has a length not
-					*	greater than the given value. This can be used to avoid Buffer Overflows
-					*	in WWW clients and various Internet servers.
-					*/
-					case 'maxlen':
-						if (strlen($value) > $checkvalue)
-						{
-							$ok = false;
-						}
-						break;
-
-					/**
-					*	The minlen check makes sure that the attribute value has a length not
-					*	smaller than the given value.
-					*/
-					case 'minlen':
-						if (strlen($value) < $checkvalue)
-						{
-							$ok = false;
-						}
-						break;
-
-					/**
-					*	The maxval check does two things: it checks that the attribute value is
-					*	an integer from 0 and up, without an excessive amount of zeroes or
-					*	whitespace (to avoid Buffer Overflows). It also checks that the attribute
-					*	value is not greater than the given value.
-					*	This check can be used to avoid Denial of Service attacks.
-					*/
-					case 'maxval':
-						if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-						{
-							$ok = false;
-						}
-						if ($value > $checkvalue)
-						{
-							$ok = false;
-						}
-						break;
-
-					/**
-					*	The minval check checks that the attribute value is a positive integer,
-					*	and that it is not smaller than the given value.
-					*/
-					case 'minval':
-						if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-						{
-							$ok = false;
-						}
-						if ($value < $checkvalue)
-						{
-							$ok = false;
-						}
-						break;
-
-					/**
-					*	The valueless check checks if the attribute has a value
-					*	(like <a href="blah">) or not (<option selected>). If the given value
-					*	is a "y" or a "Y", the attribute must not have a value.
-					*	If the given value is an "n" or an "N", the attribute must have one.
-					*/
-					case 'valueless':
-					if (strtolower($checkvalue) != $vless)
-					{
-						$ok = false;
-					}
-					break;
-
-				}
-
-				return $ok;
-			}
-
-			/**
-			 *	Changes \" to "
-			 *
-			 *	This function changes the character sequence  \"  to just  "
-			 *	It leaves all other slashes alone. It's really weird, but the quoting from
-			 *	preg_replace(//e) seems to require this.
-			 *
-			 *	@access private
-			 *	@param string $string The string to be stripped.
-			 *	@return string string stripped of \"
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _stripslashes($string)
-			{
-				return preg_replace('%\\\\"%', '"', $string);
-			}
-
-			/**
-			 *	helper method for _hair()
-			 *
-			 *	This function deals with parsing errors in _hair(). The general plan is
-			 *	to remove everything to and including some whitespace, but it deals with
-			 *	quotes and apostrophes as well.
-			 *
-			 *	@access private
-			 *	@param string $string The string to be stripped.
-			 *	@return string string stripped of whitespace
-			 *	@see _hair()
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _html_error($string)
-			{
-				return preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $string);
-			}
-
-			/**
-			 *	Decodes numeric HTML entities
-			 *
-			 *	This method decodes numeric HTML entities (&#65; and &#x41;). It doesn't
-			 *	do anything with other entities like &auml;, but we don't need them in the
-			 *	URL protocol white listing system anyway.
-			 *
-			 *	@access private
-			 *	@param string $value The entitiy to be decoded.
-			 *	@return string Decoded entity
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _decode_entities($string)
-			{
-				$string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string);
-				$string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))', $string);
-				return $string;
-			}
-
-			/**
-			 *	Returns PHP4 OOP version # of kses.
-			 *
-			 *	Since this class has been refactored and documented and proven to work,
-			 *	I'm syncing the version number to procedural kses.
-			 *
-			 *	@access public
-			 *	@return string Version number
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			function _version()
-			{
-				return 'PHP4 0.2.2 (OOP fork of procedural kses 0.2.2)';
-			}
-		}
-
-
-
-	}
+            var $allowed_protocols = array();
+            var $allowed_html      = array();
+            /**#@-*/
+
+            /**
+             *	Constructor for kses.
+             *
+             *	This sets a default collection of protocols allowed in links, and creates an
+             *	empty set of allowed HTML tags.
+             *	@since PHP4 OOP 0.0.1
+             */
+            function kses4()
+            {
+                /**
+                 *	You could add protocols such as ftp, new, gopher, mailto, irc, etc.
+                 *
+                 *	The base values the original kses provided were:
+                 *		'http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto'
+                 */
+                $this->allowed_protocols = array('http', 'ftp', 'mailto');
+                $this->allowed_html      = array();
+            }
+
+            /**
+             *	Basic task of kses - parses $string and strips it as required.
+             *
+             *	This method strips all the disallowed (X)HTML tags, attributes
+             *	and protocols from the input $string.
+             *
+             *	@access public
+             *	@param string $string String to be stripped of 'evil scripts'
+             *	@return string The stripped string
+             *	@since PHP4 OOP 0.2.1
+             */
+            function Parse($string = "")
+            {
+                if (get_magic_quotes_gpc())
+                {
+                    $string = stripslashes($string);
+                }
+                $string = $this->_no_null($string);
+                $string = $this->_js_entities($string);
+                $string = $this->_normalize_entities($string);
+                $string = $this->filterKsesTextHook($string);
+                return    $this->_split($string);
+            }
+
+            /**
+             *	Allows for single/batch addition of protocols
+             *
+             *	This method accepts one argument that can be either a string
+             *	or an array of strings.  Invalid data will be ignored.
+             *
+             *	The argument will be processed, and each string will be added
+             *	via AddProtocol().
+             *
+             *	@access public
+             *	@param mixed , A string or array of protocols that will be added to the internal list of allowed protocols.
+             *	@return bool Status of adding valid protocols.
+             *	@see AddProtocol()
+             *	@since PHP4 OOP 0.2.1
+             */
+            function AddProtocols()
+            {
+                $c_args = func_num_args();
+                if($c_args != 1)
+                {
+                    trigger_error("kses4::AddProtocols() did not receive an argument.", E_USER_WARNING);
+                    return false;
+                }
+
+                $protocol_data = func_get_arg(0);
+
+                if(is_array($protocol_data) && count($protocol_data) > 0)
+                {
+                    foreach($protocol_data as $protocol)
+                    {
+                        $this->AddProtocol($protocol);
+                    }
+                    return true;
+                }
+                elseif(is_string($protocol_data))
+                {
+                    $this->AddProtocol($protocol_data);
+                    return true;
+                }
+                else
+                {
+                    trigger_error("kses4::AddProtocols() did not receive a string or an array.", E_USER_WARNING);
+                    return false;
+                }
+            }
+
+            /**
+             *	Allows for single/batch addition of protocols
+             *
+             *	@deprecated Use AddProtocols()
+             *	@see AddProtocols()
+             *	@return bool
+             *	@since PHP4 OOP 0.0.1
+             */
+            function Protocols()
+            {
+                $c_args = func_num_args();
+                if($c_args != 1)
+                {
+                    trigger_error("kses4::Protocols() did not receive an argument.", E_USER_WARNING);
+                    return false;
+                }
+
+                return $this->AddProtocols(func_get_arg(0));
+            }
+
+            /**
+             *	Adds a single protocol to $this->allowed_protocols.
+             *
+             *	This method accepts a string argument and adds it to
+             *	the list of allowed protocols to keep when performing
+             *	Parse().
+             *
+             *	@access public
+             *	@param string $protocol The name of the protocol to be added.
+             *	@return bool Status of adding valid protocol.
+             *	@since PHP4 OOP 0.0.1
+             */
+            function AddProtocol($protocol = "")
+            {
+                if(!is_string($protocol))
+                {
+                    trigger_error("kses4::AddProtocol() requires a string.", E_USER_WARNING);
+                    return false;
+                }
+
+                $protocol = strtolower(trim($protocol));
+                if($protocol == "")
+                {
+                    trigger_error("kses4::AddProtocol() tried to add an empty/NULL protocol.", E_USER_WARNING);
+                    return false;
+                }
+
+                // Remove any inadvertent ':' at the end of the protocol.
+                if(substr($protocol, strlen($protocol) - 1, 1) == ":")
+                {
+                    $protocol = substr($protocol, 0, strlen($protocol) - 1);
+                }
+
+                if(!in_array($protocol, $this->allowed_protocols))
+                {
+                    array_push($this->allowed_protocols, $protocol);
+                    sort($this->allowed_protocols);
+                }
+                return true;
+            }
+
+            /**
+             *	Allows for single/batch replacement of protocols
+             *
+             *	This method accepts one argument that can be either a string
+             *	or an array of strings.  Invalid data will be ignored.
+             *
+             *	Existing protocols will be removed, then the argument will be
+             *	processed, and each string will be added via AddProtocol().
+             *
+             *	@access public
+             *	@param mixed , A string or array of protocols that will be the new internal list of allowed protocols.
+             *	@return bool Status of replacing valid protocols.
+             *	@since PHP4 OOP 0.2.2
+             *	@see AddProtocol()
+             */
+            function SetProtocols()
+            {
+                $c_args = func_num_args();
+                if($c_args != 1)
+                {
+                    trigger_error("kses4::SetProtocols() did not receive an argument.", E_USER_WARNING);
+                    return false;
+                }
+
+                $protocol_data = func_get_arg(0);
+
+                if(is_array($protocol_data) && count($protocol_data) > 0)
+                {
+                    $this->allowed_protocols = array();
+                    foreach($protocol_data as $protocol)
+                    {
+                        $this->AddProtocol($protocol);
+                    }
+                    return true;
+                }
+                elseif(is_string($protocol_data))
+                {
+                    $this->allowed_protocols = array();
+                    $this->AddProtocol($protocol_data);
+                    return true;
+                }
+                else
+                {
+                    trigger_error("kses4::SetProtocols() did not receive a string or an array.", E_USER_WARNING);
+                    return false;
+                }
+            }
+
+            /**
+             *	Raw dump of allowed protocols
+             *
+             *	This returns an indexed array of allowed protocols for a particular KSES
+             *	instantiation.
+             *
+             *	@access public
+             *	@return array The list of allowed protocols.
+             *	@since PHP4 OOP 0.2.2
+             */
+            function DumpProtocols()
+            {
+                return $this->allowed_protocols;
+            }
+
+            /**
+             *	Raw dump of allowed (X)HTML elements
+             *
+             *	This returns an indexed array of allowed (X)HTML elements and attributes
+             *	for a particular KSES instantiation.
+             *
+             *	@access public
+             *	@return array The list of allowed elements.
+             *	@since PHP4 OOP 0.2.2
+             */
+            function DumpElements()
+            {
+                return $this->allowed_html;
+            }
+
+            /**
+             *	Adds valid (X)HTML with corresponding attributes that will be kept when stripping 'evil scripts'.
+             *
+             *	This method accepts one argument that can be either a string
+             *	or an array of strings.  Invalid data will be ignored.
+             *
+             *	@access public
+             *	@param string $tag (X)HTML tag that will be allowed after stripping text.
+             *	@param array $attribs Associative array of allowed attributes - key => attribute name - value => attribute parameter
+             *	@return bool Status of Adding (X)HTML and attributes.
+             *	@since PHP4 OOP 0.0.1
+             */
+            function AddHTML($tag = "", $attribs = array())
+            {
+                if(!is_string($tag))
+                {
+                    trigger_error("kses4::AddHTML() requires the tag to be a string", E_USER_WARNING);
+                    return false;
+                }
+
+                $tag = strtolower(trim($tag));
+                if($tag == "")
+                {
+                    trigger_error("kses4::AddHTML() tried to add an empty/NULL tag", E_USER_WARNING);
+                    return false;
+                }
+
+                if(!is_array($attribs))
+                {
+                    trigger_error("kses4::AddHTML() requires an array (even an empty one) of attributes for '$tag'", E_USER_WARNING);
+                    return false;
+                }
+
+                $new_attribs = array();
+                if(is_array($attribs) && count($attribs) > 0)
+                {
+                    foreach($attribs as $idx1 => $val1)
+                    {
+                        $new_idx1 = strtolower($idx1);
+                        $new_val1 = $attribs[$idx1];
+
+                        if(is_array($new_val1) && count($new_val1) > 0)
+                        {
+                            $tmp_val = array();
+                            foreach($new_val1 as $idx2 => $val2)
+                            {
+                                $new_idx2 = strtolower($idx2);
+                                $tmp_val[$new_idx2] = $val2;
+                            }
+                            $new_val1 = $tmp_val;
+                        }
+
+                        $new_attribs[$new_idx1] = $new_val1;
+                    }
+                }
+
+                $this->allowed_html[$tag] = $new_attribs;
+                return true;
+            }
+
+            /**
+             *	Removes a single protocol from $this->allowed_protocols.
+             *
+             *	This method accepts a string argument and removes it from
+             *	the list of allowed protocols to keep when performing
+             *	Parse().
+             *
+             *	@access public
+             *	@param string $protocol The name of the protocol to be removed.
+             *	@return bool Status of removing valid protocol.
+             *	@since PHP4 OOP 0.2.1
+             */
+            function RemoveProtocol($protocol = "")
+            {
+                if(!is_string($protocol))
+                {
+                    trigger_error("kses4::RemoveProtocol() requires a string.", E_USER_WARNING);
+                    return false;
+                }
+
+                // Remove any inadvertent ':' at the end of the protocol.
+                if(substr($protocol, strlen($protocol) - 1, 1) == ":")
+                {
+                    $protocol = substr($protocol, 0, strlen($protocol) - 1);
+                }
+
+                $protocol = strtolower(trim($protocol));
+                if($protocol == "")
+                {
+                    trigger_error("kses4::RemoveProtocol() tried to remove an empty/NULL protocol.", E_USER_WARNING);
+                    return false;
+                }
+
+                //	Ensures that the protocol exists before removing it.
+                if(in_array($protocol, $this->allowed_protocols))
+                {
+                    $this->allowed_protocols = array_diff($this->allowed_protocols, array($protocol));
+                    sort($this->allowed_protocols);
+                }
+
+                return true;
+            }
+
+            /**
+             *	Allows for single/batch removal of protocols
+             *
+             *	This method accepts one argument that can be either a string
+             *	or an array of strings.  Invalid data will be ignored.
+             *
+             *	The argument will be processed, and each string will be removed
+             *	via RemoveProtocol().
+             *
+             *	@access public
+             *	@param mixed , A string or array of protocols that will be removed from the internal list of allowed protocols.
+             *	@return bool Status of removing valid protocols.
+             *	@see RemoveProtocol()
+             *	@since PHP5 OOP 0.2.1
+             */
+            function RemoveProtocols()
+            {
+                $c_args = func_num_args();
+                if($c_args != 1)
+                {
+                    return false;
+                }
+
+                $protocol_data = func_get_arg(0);
+
+                if(is_array($protocol_data) && count($protocol_data) > 0)
+                {
+                    foreach($protocol_data as $protocol)
+                    {
+                        $this->RemoveProtocol($protocol);
+                    }
+                }
+                elseif(is_string($protocol_data))
+                {
+                    $this->RemoveProtocol($protocol_data);
+                    return true;
+                }
+                else
+                {
+                    trigger_error("kses4::RemoveProtocols() did not receive a string or an array.", E_USER_WARNING);
+                    return false;
+                }
+            }
+
+            /**
+             *	This method removes any NULL or characters in $string.
+             *
+             *	@access private
+             *	@param string $string
+             *	@return string String without any NULL/chr(173)
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _no_null($string)
+            {
+                $string = preg_replace('/\0+/', '', $string);
+                $string = preg_replace('/(\\\\0)+/', '', $string);
+                return $string;
+            }
+
+            /**
+             *	This function removes the HTML JavaScript entities found in early versions of
+             *	Netscape 4.
+             *
+             *	@access private
+             *	@param string $string
+             *	@return string String without any NULL/chr(173)
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _js_entities($string)
+            {
+                return preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
+            }
+
+            /**
+             *	Normalizes HTML entities
+             *
+             *	This function normalizes HTML entities. It will convert "AT&T" to the correct
+             *	"AT&amp;T", "&#00058;" to "&#58;", "&#XYZZY;" to "&amp;#XYZZY;" and so on.
+             *
+             *	@access private
+             *	@param string $string
+             *	@return string String with normalized entities
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _normalize_entities($string)
+            {
+                # Disarm all entities by converting & to &amp;
+                $string = str_replace('&', '&amp;', $string);
+
+                # Change back the allowed entities in our entity white list
+
+                $string = preg_replace('/&amp;([A-Za-z][A-Za-z0-9]{0,19});/', '&\\1;', $string);
+                $string = preg_replace('/&amp;#0*([0-9]{1,5});/e', '\$this->_normalize_entities2("\\1")', $string);
+                $string = preg_replace('/&amp;#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/', '&#\\1\\2;', $string);
+
+                return $string;
+            }
+
+            /**
+             *	Helper method used by normalizeEntites()
+             *
+             *	This method helps normalizeEntities() to only accept 16 bit values
+             *	and nothing more for &#number; entities.
+             *
+             *	This method helps normalize_entities() during a preg_replace()
+             *	where a &#(0)*XXXXX; occurs.  The '(0)*XXXXXX' value is converted to
+             *	a number and the result is returned as a numeric entity if the number
+             *	is less than 65536.  Otherwise, the value is returned 'as is'.
+             *
+             *	@access private
+             *	@param string $i
+             *	@return string Normalized numeric entity
+             *	@see _normalize_entities()
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _normalize_entities2($i)
+            {
+                return (($i > 65535) ? "&amp;#$i;" : "&#$i;");
+            }
+
+            /**
+             *	Allows for additional user defined modifications to text.
+             *
+             *	@deprecated use filterKsesTextHook()
+             *	@param string $string
+             *	@see filterKsesTextHook()
+             *	@return string
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _hook($string)
+            {
+                return $this->filterKsesTextHook($string);
+            }
+
+            /**
+             *	Allows for additional user defined modifications to text.
+             *
+             *	This method allows for additional modifications to be performed on
+             *	a string that's being run through Parse().  Currently, it returns the
+             *	input string 'as is'.
+             *
+             *	This method is provided for users to extend the kses class for their own
+             *	requirements.
+             *
+             *	@access public
+             *	@param string $string String to perfrom additional modifications on.
+             *	@return string User modified string.
+             *	@see Parse()
+             *	@since PHP5 OOP 1.0.0
+             */
+            function filterKsesTextHook($string)
+            {
+                return $string;
+            }
+
+            /**
+             *	This method goes through an array, and changes the keys to all lower case.
+             *
+             *	@access private
+             *	@param array $in_array Associative array
+             *	@return array Modified array
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _array_lc($inarray)
+            {
+                $outarray = array();
+
+                if(is_array($inarray) && count($inarray) > 0)
+                {
+                    foreach ($inarray as $inkey => $inval)
+                    {
+                        $outkey = strtolower($inkey);
+                        $outarray[$outkey] = array();
+
+                        if(is_array($inval) && count($inval) > 0)
+                        {
+                            foreach ($inval as $inkey2 => $inval2)
+                            {
+                                $outkey2 = strtolower($inkey2);
+                                $outarray[$outkey][$outkey2] = $inval2;
+                            }
+                        }
+                    }
+                }
+
+                return $outarray;
+            }
+
+            /**
+             *	This method searched for HTML tags, no matter how malformed.  It also
+             *	matches stray ">" characters.
+             *
+             *	@access private
+             *	@param string $string
+             *	@return string HTML tags
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _split($string)
+            {
+                return preg_replace(
+                    '%(<'.   # EITHER: <
+                    '[^>]*'. # things that aren't >
+                    '(>|$)'. # > or end of string
+                    '|>)%e', # OR: just a >
+                    "\$this->_split2('\\1')",
+                    $string);
+            }
+
+            /**
+             *	This method strips out disallowed and/or mangled (X)HTML tags along with assigned attributes.
+             *
+             *	This method does a lot of work. It rejects some very malformed things
+             *	like <:::>. It returns an empty string if the element isn't allowed (look
+             *	ma, no strip_tags()!). Otherwise it splits the tag into an element and an
+             *	allowed attribute list.
+             *
+             *	@access private
+             *	@param string $string
+             *	@return string Modified string minus disallowed/mangled (X)HTML and attributes
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _split2($string)
+            {
+                $string = $this->_stripslashes($string);
+
+                if (substr($string, 0, 1) != '<')
+                {
+                    # It matched a ">" character
+                    return '&gt;';
+                }
+
+                if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
+                {
+                    # It's seriously malformed
+                    return '';
+                }
+
+                $slash    = trim($matches[1]);
+                $elem     = $matches[2];
+                $attrlist = $matches[3];
+
+                if (
+                    !isset($this->allowed_html[strtolower($elem)]) ||
+                    !is_array($this->allowed_html[strtolower($elem)])
+                )
+                {
+                    # They are using a not allowed HTML element
+                    return '';
+                }
+
+                if ($slash != '')
+                {
+                    return "<$slash$elem>";
+                }
+                # No attributes are allowed for closing elements
+
+                return $this->_attr("$slash$elem", $attrlist);
+            }
+
+            /**
+             *	This method strips out disallowed attributes for (X)HTML tags.
+             *
+             *	This method removes all attributes if none are allowed for this element.
+             *	If some are allowed it calls $this->_hair() to split them further, and then it
+             *	builds up new HTML code from the data that $this->_hair() returns. It also
+             *	removes "<" and ">" characters, if there are any left. One more thing it
+             *	does is to check if the tag has a closing XHTML slash, and if it does,
+             *	it puts one in the returned code as well.
+             *
+             *	@access private
+             *	@param string $element (X)HTML tag to check
+             *	@param string $attr Text containing attributes to check for validity.
+             *	@return string Resulting valid (X)HTML or ''
+             *	@see _hair()
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _attr($element, $attr)
+            {
+                # Is there a closing XHTML slash at the end of the attributes?
+                $xhtml_slash = '';
+                if (preg_match('%\s/\s*$%', $attr))
+                {
+                    $xhtml_slash = ' /';
+                }
+
+                # Are any attributes allowed at all for this element?
+                if (
+                    !isset($this->allowed_html[strtolower($element)]) ||
+                    count($this->allowed_html[strtolower($element)]) == 0
+                )
+                {
+                    return "<$element$xhtml_slash>";
+                }
+
+                # Split it
+                $attrarr = $this->_hair($attr);
+
+                # Go through $attrarr, and save the allowed attributes for this element
+                # in $attr2
+                $attr2 = '';
+                if(is_array($attrarr) && count($attrarr) > 0)
+                {
+                    foreach ($attrarr as $arreach)
+                    {
+                        if(!isset($this->allowed_html[strtolower($element)][strtolower($arreach['name'])]))
+                        {
+                            continue;
+                        }
+
+                        $current = $this->allowed_html[strtolower($element)][strtolower($arreach['name'])];
+                        if ($current == '')
+                        {
+                            # the attribute is not allowed
+                            continue;
+                        }
+
+                        if (!is_array($current))
+                        {
+                            # there are no checks
+                            $attr2 .= ' '.$arreach['whole'];
+                        }
+                        else
+                        {
+                            # there are some checks
+                            $ok = true;
+                            if(is_array($current) && count($current) > 0)
+                            {
+                                foreach ($current as $currkey => $currval)
+                                {
+                                    if (!$this->_check_attr_val($arreach['value'], $arreach['vless'], $currkey, $currval))
+                                    {
+                                        $ok = false;
+                                        break;
+                                    }
+                                }
+
+                                if ($ok)
+                                {
+                                    # it passed them
+                                    $attr2 .= ' '.$arreach['whole'];
+                                }
+                            }
+                        }
+                    }
+                }
+
+                # Remove any "<" or ">" characters
+                $attr2 = preg_replace('/[<>]/', '', $attr2);
+                return "<$element$attr2$xhtml_slash>";
+            }
+
+            /**
+             *	This method combs through an attribute list string and returns an associative array of attributes and values.
+             *
+             *	This method does a lot of work. It parses an attribute list into an array
+             *	with attribute data, and tries to do the right thing even if it gets weird
+             *	input. It will add quotes around attribute values that don't have any quotes
+             *	or apostrophes around them, to make it easier to produce HTML code that will
+             *	conform to W3C's HTML specification. It will also remove bad URL protocols
+             *	from attribute values.
+             *
+             *	@access private
+             *	@param string $attr Text containing tag attributes for parsing
+             *	@return array Associative array containing data on attribute and value
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _hair($attr)
+            {
+                $attrarr  = array();
+                $mode     = 0;
+                $attrname = '';
+
+                # Loop through the whole attribute list
+
+                while (strlen($attr) != 0)
+                {
+                    # Was the last operation successful?
+                    $working = 0;
+
+                    switch ($mode)
+                    {
+                        case 0:	# attribute name, href for instance
+                            if (preg_match('/^([-a-zA-Z]+)/', $attr, $match))
+                            {
+                                $attrname = $match[1];
+                                $working = $mode = 1;
+                                $attr = preg_replace('/^[-a-zA-Z]+/', '', $attr);
+                            }
+                            break;
+                        case 1:	# equals sign or valueless ("selected")
+                            if (preg_match('/^\s*=\s*/', $attr)) # equals sign
+                            {
+                                $working = 1;
+                                $mode    = 2;
+                                $attr    = preg_replace('/^\s*=\s*/', '', $attr);
+                                break;
+                            }
+                            if (preg_match('/^\s+/', $attr)) # valueless
+                            {
+                                $working   = 1;
+                                $mode      = 0;
+                                $attrarr[] = array(
+                                    'name'  => $attrname,
+                                    'value' => '',
+                                    'whole' => $attrname,
+                                    'vless' => 'y'
+                                );
+                                $attr      = preg_replace('/^\s+/', '', $attr);
+                            }
+                            break;
+                        case 2: # attribute value, a URL after href= for instance
+                            if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) # "value"
+                            {
+                                $thisval   = $this->_bad_protocol($match[1]);
+                                $attrarr[] = array(
+                                    'name'  => $attrname,
+                                    'value' => $thisval,
+                                    'whole' => "$attrname=\"$thisval\"",
+                                    'vless' => 'n'
+                                );
+                                $working   = 1;
+                                $mode      = 0;
+                                $attr      = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
+                                break;
+                            }
+                            if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) # 'value'
+                            {
+                                $thisval   = $this->_bad_protocol($match[1]);
+                                $attrarr[] = array(
+                                    'name'  => $attrname,
+                                    'value' => $thisval,
+                                    'whole' => "$attrname='$thisval'",
+                                    'vless' => 'n'
+                                );
+                                $working   = 1;
+                                $mode      = 0;
+                                $attr      = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
+                                break;
+                            }
+                            if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) # value
+                            {
+                                $thisval   = $this->_bad_protocol($match[1]);
+                                $attrarr[] = array(
+                                    'name'  => $attrname,
+                                    'value' => $thisval,
+                                    'whole' => "$attrname=\"$thisval\"",
+                                    'vless' => 'n'
+                                );
+                                # We add quotes to conform to W3C's HTML spec.
+                                $working   = 1;
+                                $mode      = 0;
+                                $attr      = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr);
+                            }
+                            break;
+                    }
+
+                    if ($working == 0) # not well formed, remove and try again
+                    {
+                        $attr = $this->_html_error($attr);
+                        $mode = 0;
+                    }
+                }
+
+                # special case, for when the attribute list ends with a valueless
+                # attribute like "selected"
+                if ($mode == 1)
+                {
+                    $attrarr[] = array(
+                        'name'  => $attrname,
+                        'value' => '',
+                        'whole' => $attrname,
+                        'vless' => 'y'
+                    );
+                }
+
+                return $attrarr;
+            }
+
+            /**
+             *	This method removes disallowed protocols.
+             *
+             *	This method removes all non-allowed protocols from the beginning of
+             *	$string. It ignores whitespace and the case of the letters, and it does
+             *	understand HTML entities. It does its work in a while loop, so it won't be
+             *	fooled by a string like "javascript:javascript:alert(57)".
+             *
+             *	@access private
+             *	@param string $string String to check for protocols
+             *	@return string String with removed protocols
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _bad_protocol($string)
+            {
+                $string  = $this->_no_null($string);
+                $string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature"
+                $string2 = $string.'a';
+
+                while ($string != $string2)
+                {
+                    $string2 = $string;
+                    $string  = $this->_bad_protocol_once($string);
+                } # while
+
+                return $string;
+            }
+
+            /**
+             *	Helper method used by _bad_protocol()
+             *
+             *	This function searches for URL protocols at the beginning of $string, while
+             *	handling whitespace and HTML entities.
+             *  Function updated to fix security vulnerability (see http://projects.dokeos.com/index.php?do=details&task_id=2312)
+             *
+             *	@access private
+             *	@param string $string String to check for protocols
+             *	@return string String with removed protocols
+             *	@see _bad_protocol()
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _bad_protocol_once($string)
+            {
+                $string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
+                if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
+                {
+                    $string = $this->_bad_protocol_once2($string2[0]).trim($string2[1]);
+                }
+                return $string;
+            }
+            /**
+             *	Helper method used by _bad_protocol_once() regex
+             *
+             *	This function processes URL protocols, checks to see if they're in the white-
+             *	list or not, and returns different data depending on the answer.
+             *
+             *	@access private
+             *	@param string $string String to check for protocols
+             *	@return string String with removed protocols
+             *	@see _bad_protocol()
+             *	@see _bad_protocol_once()
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _bad_protocol_once2($string)
+            {
+                $string = $this->_decode_entities($string);
+                $string = preg_replace('/\s/', '', $string);
+                $string = $this->_no_null($string);
+                $string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature"
+                $string = strtolower($string);
+
+                $allowed = false;
+                if(is_array($this->allowed_protocols) && count($this->allowed_protocols) > 0)
+                {
+                    foreach ($this->allowed_protocols as $one_protocol)
+                    {
+                        if (strtolower($one_protocol) == $string)
+                        {
+                            $allowed = true;
+                            break;
+                        }
+                    }
+                }
+
+                if ($allowed)
+                {
+                    return "$string:";
+                }
+                else
+                {
+                    return '';
+                }
+            }
+
+            /**
+             *	This function performs different checks for attribute values.
+             *
+             *	The currently implemented checks are "maxlen", "minlen", "maxval",
+             *	"minval" and "valueless" with even more checks to come soon.
+             *
+             *	@access private
+             *	@param string $value The value of the attribute to be checked.
+             *	@param string $vless Indicates whether the the value is supposed to be valueless
+             *	@param string $checkname The check to be performed
+             *	@param string $checkvalue The value that is to be checked against
+             *	@return bool Indicates whether the check passed or not
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _check_attr_val($value, $vless, $checkname, $checkvalue)
+            {
+                $ok = true;
+
+                switch (strtolower($checkname))
+                {
+                    /**
+                     *	The maxlen check makes sure that the attribute value has a length not
+                     *	greater than the given value. This can be used to avoid Buffer Overflows
+                     *	in WWW clients and various Internet servers.
+                     */
+                    case 'maxlen':
+                        if (strlen($value) > $checkvalue)
+                        {
+                            $ok = false;
+                        }
+                        break;
+
+                    /**
+                     *	The minlen check makes sure that the attribute value has a length not
+                     *	smaller than the given value.
+                     */
+                    case 'minlen':
+                        if (strlen($value) < $checkvalue)
+                        {
+                            $ok = false;
+                        }
+                        break;
+
+                    /**
+                     *	The maxval check does two things: it checks that the attribute value is
+                     *	an integer from 0 and up, without an excessive amount of zeroes or
+                     *	whitespace (to avoid Buffer Overflows). It also checks that the attribute
+                     *	value is not greater than the given value.
+                     *	This check can be used to avoid Denial of Service attacks.
+                     */
+                    case 'maxval':
+                        if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
+                        {
+                            $ok = false;
+                        }
+                        if ($value > $checkvalue)
+                        {
+                            $ok = false;
+                        }
+                        break;
+
+                    /**
+                     *	The minval check checks that the attribute value is a positive integer,
+                     *	and that it is not smaller than the given value.
+                     */
+                    case 'minval':
+                        if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
+                        {
+                            $ok = false;
+                        }
+                        if ($value < $checkvalue)
+                        {
+                            $ok = false;
+                        }
+                        break;
+
+                    /**
+                     *	The valueless check checks if the attribute has a value
+                     *	(like <a href="blah">) or not (<option selected>). If the given value
+                     *	is a "y" or a "Y", the attribute must not have a value.
+                     *	If the given value is an "n" or an "N", the attribute must have one.
+                     */
+                    case 'valueless':
+                    if (strtolower($checkvalue) != $vless)
+                    {
+                        $ok = false;
+                    }
+                    break;
+
+                }
+
+                return $ok;
+            }
+
+            /**
+             *	Changes \" to "
+             *
+             *	This function changes the character sequence  \"  to just  "
+             *	It leaves all other slashes alone. It's really weird, but the quoting from
+             *	preg_replace(//e) seems to require this.
+             *
+             *	@access private
+             *	@param string $string The string to be stripped.
+             *	@return string string stripped of \"
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _stripslashes($string)
+            {
+                return preg_replace('%\\\\"%', '"', $string);
+            }
+
+            /**
+             *	helper method for _hair()
+             *
+             *	This function deals with parsing errors in _hair(). The general plan is
+             *	to remove everything to and including some whitespace, but it deals with
+             *	quotes and apostrophes as well.
+             *
+             *	@access private
+             *	@param string $string The string to be stripped.
+             *	@return string string stripped of whitespace
+             *	@see _hair()
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _html_error($string)
+            {
+                return preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $string);
+            }
+
+            /**
+             *	Decodes numeric HTML entities
+             *
+             *	This method decodes numeric HTML entities (&#65; and &#x41;). It doesn't
+             *	do anything with other entities like &auml;, but we don't need them in the
+             *	URL protocol white listing system anyway.
+             *
+             *	@access private
+             *	@param string $value The entitiy to be decoded.
+             *	@return string Decoded entity
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _decode_entities($string)
+            {
+                $string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string);
+                $string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))', $string);
+                return $string;
+            }
+
+            /**
+             *	Returns PHP4 OOP version # of kses.
+             *
+             *	Since this class has been refactored and documented and proven to work,
+             *	I'm syncing the version number to procedural kses.
+             *
+             *	@access public
+             *	@return string Version number
+             *	@since PHP4 OOP 0.0.1
+             */
+            function _version()
+            {
+                return 'PHP4 0.2.2 (OOP fork of procedural kses 0.2.2)';
+            }
+        }
+
+
+
+    }
 ?>
\ No newline at end of file

Spacing +41 added lines, -41 removed lines

@@ -39,7 +39,7 @@ 
 	*	@subpackage kses4
 	*/
 
-	if(substr(phpversion(), 0, 1) < 4)
+	if (substr(phpversion(), 0, 1) < 4)
 	{
 		die("Class kses requires PHP 4 or higher.");
 	}
@@ -47,7 +47,7 @@ 
 	/**
 	*	Only install KSES4 once
 	*/
-	if(!defined('KSES_CLASS_PHP4'))
+	if (!defined('KSES_CLASS_PHP4'))
 	{
 		define('KSES_CLASS_PHP4', true);
 
@@ -150,7 +150,7 @@ 
 			function AddProtocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					trigger_error("kses4::AddProtocols() did not receive an argument.", E_USER_WARNING);
 					return false;
@@ -158,15 +158,15 @@ 
 
 				$protocol_data = func_get_arg(0);
 
-				if(is_array($protocol_data) && count($protocol_data) > 0)
+				if (is_array($protocol_data) && count($protocol_data) > 0)
 				{
-					foreach($protocol_data as $protocol)
+					foreach ($protocol_data as $protocol)
 					{
 						$this->AddProtocol($protocol);
 					}
 					return true;
 				}
-				elseif(is_string($protocol_data))
+				elseif (is_string($protocol_data))
 				{
 					$this->AddProtocol($protocol_data);
 					return true;
@@ -189,7 +189,7 @@ 
 			function Protocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					trigger_error("kses4::Protocols() did not receive an argument.", E_USER_WARNING);
 					return false;
@@ -212,26 +212,26 @@ 
 			 */
 			function AddProtocol($protocol = "")
 			{
-				if(!is_string($protocol))
+				if (!is_string($protocol))
 				{
 					trigger_error("kses4::AddProtocol() requires a string.", E_USER_WARNING);
 					return false;
 				}
 
 				$protocol = strtolower(trim($protocol));
-				if($protocol == "")
+				if ($protocol == "")
 				{
 					trigger_error("kses4::AddProtocol() tried to add an empty/NULL protocol.", E_USER_WARNING);
 					return false;
 				}
 
 				// Remove any inadvertent ':' at the end of the protocol.
-				if(substr($protocol, strlen($protocol) - 1, 1) == ":")
+				if (substr($protocol, strlen($protocol) - 1, 1) == ":")
 				{
 					$protocol = substr($protocol, 0, strlen($protocol) - 1);
 				}
 
-				if(!in_array($protocol, $this->allowed_protocols))
+				if (!in_array($protocol, $this->allowed_protocols))
 				{
 					array_push($this->allowed_protocols, $protocol);
 					sort($this->allowed_protocols);
@@ -257,7 +257,7 @@ 
 			function SetProtocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					trigger_error("kses4::SetProtocols() did not receive an argument.", E_USER_WARNING);
 					return false;
@@ -265,16 +265,16 @@ 
 
 				$protocol_data = func_get_arg(0);
 
-				if(is_array($protocol_data) && count($protocol_data) > 0)
+				if (is_array($protocol_data) && count($protocol_data) > 0)
 				{
 					$this->allowed_protocols = array();
-					foreach($protocol_data as $protocol)
+					foreach ($protocol_data as $protocol)
 					{
 						$this->AddProtocol($protocol);
 					}
 					return true;
 				}
-				elseif(is_string($protocol_data))
+				elseif (is_string($protocol_data))
 				{
 					$this->allowed_protocols = array();
 					$this->AddProtocol($protocol_data);
@@ -331,37 +331,37 @@ 
 			 */
 			function AddHTML($tag = "", $attribs = array())
 			{
-				if(!is_string($tag))
+				if (!is_string($tag))
 				{
 					trigger_error("kses4::AddHTML() requires the tag to be a string", E_USER_WARNING);
 					return false;
 				}
 
 				$tag = strtolower(trim($tag));
-				if($tag == "")
+				if ($tag == "")
 				{
 					trigger_error("kses4::AddHTML() tried to add an empty/NULL tag", E_USER_WARNING);
 					return false;
 				}
 
-				if(!is_array($attribs))
+				if (!is_array($attribs))
 				{
 					trigger_error("kses4::AddHTML() requires an array (even an empty one) of attributes for '$tag'", E_USER_WARNING);
 					return false;
 				}
 
 				$new_attribs = array();
-				if(is_array($attribs) && count($attribs) > 0)
+				if (is_array($attribs) && count($attribs) > 0)
 				{
-					foreach($attribs as $idx1 => $val1)
+					foreach ($attribs as $idx1 => $val1)
 					{
 						$new_idx1 = strtolower($idx1);
 						$new_val1 = $attribs[$idx1];
 
-						if(is_array($new_val1) && count($new_val1) > 0)
+						if (is_array($new_val1) && count($new_val1) > 0)
 						{
 							$tmp_val = array();
-							foreach($new_val1 as $idx2 => $val2)
+							foreach ($new_val1 as $idx2 => $val2)
 							{
 								$new_idx2 = strtolower($idx2);
 								$tmp_val[$new_idx2] = $val2;
@@ -391,27 +391,27 @@ 
 			 */
 			function RemoveProtocol($protocol = "")
 			{
-				if(!is_string($protocol))
+				if (!is_string($protocol))
 				{
 					trigger_error("kses4::RemoveProtocol() requires a string.", E_USER_WARNING);
 					return false;
 				}
 
 				// Remove any inadvertent ':' at the end of the protocol.
-				if(substr($protocol, strlen($protocol) - 1, 1) == ":")
+				if (substr($protocol, strlen($protocol) - 1, 1) == ":")
 				{
 					$protocol = substr($protocol, 0, strlen($protocol) - 1);
 				}
 
 				$protocol = strtolower(trim($protocol));
-				if($protocol == "")
+				if ($protocol == "")
 				{
 					trigger_error("kses4::RemoveProtocol() tried to remove an empty/NULL protocol.", E_USER_WARNING);
 					return false;
 				}
 
 				//	Ensures that the protocol exists before removing it.
-				if(in_array($protocol, $this->allowed_protocols))
+				if (in_array($protocol, $this->allowed_protocols))
 				{
 					$this->allowed_protocols = array_diff($this->allowed_protocols, array($protocol));
 					sort($this->allowed_protocols);
@@ -438,21 +438,21 @@ 
 			function RemoveProtocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					return false;
 				}
 
 				$protocol_data = func_get_arg(0);
 
-				if(is_array($protocol_data) && count($protocol_data) > 0)
+				if (is_array($protocol_data) && count($protocol_data) > 0)
 				{
-					foreach($protocol_data as $protocol)
+					foreach ($protocol_data as $protocol)
 					{
 						$this->RemoveProtocol($protocol);
 					}
 				}
-				elseif(is_string($protocol_data))
+				elseif (is_string($protocol_data))
 				{
 					$this->RemoveProtocol($protocol_data);
 					return true;
@@ -587,14 +587,14 @@ 
 			{
 			  $outarray = array();
 
-				if(is_array($inarray) && count($inarray) > 0)
+				if (is_array($inarray) && count($inarray) > 0)
 				{
 					foreach ($inarray as $inkey => $inval)
 					{
 						$outkey = strtolower($inkey);
 						$outarray[$outkey] = array();
 
-						if(is_array($inval) && count($inval) > 0)
+						if (is_array($inval) && count($inval) > 0)
 						{
 							foreach ($inval as $inkey2 => $inval2)
 							{
@@ -620,9 +620,9 @@ 
 			function _split($string)
 			{
 				return preg_replace(
-					'%(<'.   # EITHER: <
-					'[^>]*'. # things that aren't >
-					'(>|$)'. # > or end of string
+					'%(<'.# EITHER: <
+					'[^>]*'.# things that aren't >
+					'(>|$)'.# > or end of string
 					'|>)%e', # OR: just a >
 					"\$this->_split2('\\1')",
 					$string);
@@ -720,11 +720,11 @@ 
 				# Go through $attrarr, and save the allowed attributes for this element
 				# in $attr2
 				$attr2 = '';
-				if(is_array($attrarr) && count($attrarr) > 0)
+				if (is_array($attrarr) && count($attrarr) > 0)
 				{
 					foreach ($attrarr as $arreach)
 					{
-						if(!isset($this->allowed_html[strtolower($element)][strtolower($arreach['name'])]))
+						if (!isset($this->allowed_html[strtolower($element)][strtolower($arreach['name'])]))
 						{
 							continue;
 						}
@@ -745,7 +745,7 @@ 
 						{
 							# there are some checks
 							$ok = true;
-							if(is_array($current) && count($current) > 0)
+							if (is_array($current) && count($current) > 0)
 							{
 								foreach ($current as $currkey => $currval)
 								{
@@ -827,7 +827,7 @@ 
 									'whole' => $attrname,
 									'vless' => 'y'
 								);
-								$attr      = preg_replace('/^\s+/', '', $attr);
+								$attr = preg_replace('/^\s+/', '', $attr);
 							}
 							break;
 						case 2: # attribute value, a URL after href= for instance
@@ -942,7 +942,7 @@ 
 			function _bad_protocol_once($string)
 			{
 				$string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
-				if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
+				if (isset($string2[1]) && !preg_match('%/\?%', $string2[0]))
 				{
 					$string = $this->_bad_protocol_once2($string2[0]).trim($string2[1]);
 				}
@@ -970,7 +970,7 @@ 
 				$string = strtolower($string);
 
 				$allowed = false;
-				if(is_array($this->allowed_protocols) && count($this->allowed_protocols) > 0)
+				if (is_array($this->allowed_protocols) && count($this->allowed_protocols) > 0)
 				{
 					foreach ($this->allowed_protocols as $one_protocol)
 					{

Braces +26 added lines, -22 removed lines

@@ -165,13 +165,11 @@ 
 						$this->AddProtocol($protocol);
 					}
 					return true;
-				}
-				elseif(is_string($protocol_data))
+				} elseif(is_string($protocol_data))
 				{
 					$this->AddProtocol($protocol_data);
 					return true;
-				}
-				else
+				} else
 				{
 					trigger_error("kses4::AddProtocols() did not receive a string or an array.", E_USER_WARNING);
 					return false;
@@ -273,14 +271,12 @@ 
 						$this->AddProtocol($protocol);
 					}
 					return true;
-				}
-				elseif(is_string($protocol_data))
+				} elseif(is_string($protocol_data))
 				{
 					$this->allowed_protocols = array();
 					$this->AddProtocol($protocol_data);
 					return true;
-				}
-				else
+				} else
 				{
 					trigger_error("kses4::SetProtocols() did not receive a string or an array.", E_USER_WARNING);
 					return false;
@@ -451,13 +447,11 @@ 
 					{
 						$this->RemoveProtocol($protocol);
 					}
-				}
-				elseif(is_string($protocol_data))
+				} elseif(is_string($protocol_data))
 				{
 					$this->RemoveProtocol($protocol_data);
 					return true;
-				}
-				else
+				} else
 				{
 					trigger_error("kses4::RemoveProtocols() did not receive a string or an array.", E_USER_WARNING);
 					return false;
@@ -740,8 +734,7 @@ 
 						{
 							# there are no checks
 							$attr2 .= ' '.$arreach['whole'];
-						}
-						else
+						} else
 						{
 							# there are some checks
 							$ok = true;
@@ -810,16 +803,20 @@ 
 							}
 							break;
 						case 1:	# equals sign or valueless ("selected")
-							if (preg_match('/^\s*=\s*/', $attr)) # equals sign
+							if (preg_match('/^\s*=\s*/', $attr)) {
+							    # equals sign
 							{
 								$working = 1;
+							}
 								$mode    = 2;
 								$attr    = preg_replace('/^\s*=\s*/', '', $attr);
 								break;
 							}
-							if (preg_match('/^\s+/', $attr)) # valueless
+							if (preg_match('/^\s+/', $attr)) {
+							    # valueless
 							{
 								$working   = 1;
+							}
 								$mode      = 0;
 								$attrarr[] = array(
 									'name'  => $attrname,
@@ -831,9 +828,11 @@ 
 							}
 							break;
 						case 2: # attribute value, a URL after href= for instance
-							if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) # "value"
+							if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) {
+							    # "value"
 							{
 								$thisval   = $this->_bad_protocol($match[1]);
+							}
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
@@ -845,9 +844,11 @@ 
 								$attr      = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
 								break;
 							}
-							if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) # 'value'
+							if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) {
+							    # 'value'
 							{
 								$thisval   = $this->_bad_protocol($match[1]);
+							}
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
@@ -859,9 +860,11 @@ 
 								$attr      = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
 								break;
 							}
-							if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) # value
+							if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) {
+							    # value
 							{
 								$thisval   = $this->_bad_protocol($match[1]);
+							}
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
@@ -876,9 +879,11 @@ 
 							break;
 					}
 
-					if ($working == 0) # not well formed, remove and try again
+					if ($working == 0) {
+					    # not well formed, remove and try again
 					{
 						$attr = $this->_html_error($attr);
+					}
 						$mode = 0;
 					}
 				}
@@ -985,8 +990,7 @@ 
 				if ($allowed)
 				{
 					return "$string:";
-				}
-				else
+				} else
 				{
 					return '';
 				}

main/inc/lib/kses-0.2.2/oop/php5.class.kses.php

Doc Comments +2 added lines, -4 removed lines

@@ -321,7 +321,7 @@ 
 			 *
 			 *	@access public
 			 *	@param mixed , A string or array of protocols that will be removed from the internal list of allowed protocols.
-			 *	@return bool Status of removing valid protocols.
+			 *	@return null|boolean Status of removing valid protocols.
 			 *	@see RemoveProtocol()
 			 *	@since PHP5 OOP 1.0.0
 			 */
@@ -1133,9 +1133,7 @@ 
 			 *	URL protocol white listing system anyway.
 			 *
 			 *	@access private
-			 *	@param string $value The entitiy to be decoded.
-			 *	@return string Decoded entity
-			 *	@since PHP4 OOP 0.0.1
+			 * @param string $string
 			 */
 			private function decodeEntities($string)
 			{

Indentation +1140 added lines, -1140 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-	/*
+    /*
 	 * ==========================================================================================
 	 *
 	 * This program is free software and open source software; you can redistribute
@@ -21,1146 +21,1146 @@ 
 	 * ==========================================================================================
 	 */
 
-	/**
-	*	Class file for PHP5 OOP version of kses
-	*
-	*	This is an updated version of kses to work with PHP5 that works under E_STRICT.
-	*
-	*	This version is a bit of a rewrite to match my own coding style and use some of the
-	*	capabilities allowed in PHP5.  Since this was a significant rewrite, but it still
-	*	maintains backward compatibility syntax-wise, the version number is now 1.0.0.  Any
-	*	minor changes that do not break compatibility will be indicated in the second or third
-	*	digits.  Anything that breaks compatibility will change the major version number.
-	*
-	*	PHP5 specific changes:
-	*	+ Private methods are now in place
-	*	+ __construct() is now used rather then the standard class name 'kses()'
-	*	+ Kses will not load in any version less that PHP5
-	*	Other modifications:
-	*	+ PHPdoc style documentation has been added to the class.  See http://www.phpdoc.org/ for more info.
-	*	+ Method names have been changed to reflect status as verbs
-	*	+ One line methods have been folded into the code
-	*	+ Some methods are now deprecated due to nomenclature style change.  See method documentation for specifics.
-	*	+ Kses5 now works in E_STRICT
-	*	+ Version number is 1.0.0 to reflect serious code changes
-	*	+ Addition of methods AddProtocols(), filterKsestextHook(), RemoveProtocol(), RemoveProtocols() and SetProtocols()
-	*	+ Deprecated _hook(), Protocols()
-	*
-	*	@package    kses
-	*	@subpackage kses5
-	*/
-
-	if(substr(phpversion(), 0, 1) < 5)
-	{
-		die("Class kses requires PHP 5 or higher.");
-	}
-
-	/**
-	*	Only install KSES5 once
-	*/
-	if(!defined('KSES_CLASS_PHP5'))
-	{
-		define('KSES_CLASS_PHP5', true);
-
-	/**
-	*	Kses strips evil scripts!
-	*
-	*	This class provides the capability for removing unwanted HTML/XHTML, attributes from
-	*	tags, and protocols contained in links.  The net result is a much more powerful tool
-	*	than the PHP internal strip_tags()
-	*
-	*	This is a fork of a slick piece of procedural code called 'kses' written by Ulf Harnhammar.
-	*
-	*	The original class for PHP4 was basically a wrapper around all of the functions in
-	*	the procedural code written by Ulf, and was released 7/25/2003.
-	*
-	*	This version is a bit of a rewrite to match my own coding style and use some of the
-	*	capabilities allowed in PHP5.  Since this was a significant rewrite, but it still
-	*	maintains backward compatibility syntax-wise, the version number is now 1.0.0.  Any
-	*	minor changes that do not break compatibility will be indicated in the second or third
-	*	digits.  Anything that breaks compatibility will change the major version number.
-	*
-	*	PHP5 specific changes:
-	*	+ Private methods are now in place
-	*	+ __construct() is now used rather then the standard class name 'kses()'
-	*	+ Kses5 will not load in any version less that PHP5
-	*	Other modifications:
-	*	+ PHPdoc style documentation has been added to the class.  See http://www.phpdoc.org/ for more info.
-	*	+ Method names have been changed to reflect status as verbs
-	*	+ One line methods have been folded into the code
-	*	+ Some methods are now deprecated due to nomenclature style change.  See method documentation for specifics.
-	*	+ Kses now works in E_STRICT
-	*	+ Initial Version number set to 1.0.0 to reflect serious code changes
-	*	+ Addition of methods AddProtocols(), filterKsestextHook(), RemoveProtocol(), RemoveProtocols() and SetProtocols()
-	*	+ Deprecated _hook(), Protocols()
-	*	+ Integrated code from kses 0.2.2 into class.
-	*	+ Added methods DumpProtocols(), DumpMethods()
-	*
-	*	@author     Richard R. V�squez, Jr. (Original procedural code by Ulf H�rnhammar)
-	*	@link       http://sourceforge.net/projects/kses/ Home Page for Kses
-	*	@link       http://chaos.org/contact/ Contact page with current email address for Richard Vasquez
-	*	@copyright  Richard R. V�squez, Jr. 2005
-	*	@version    PHP5 OOP 1.0.2
-	*	@license    http://www.gnu.org/licenses/gpl.html GNU Public License
-	*	@package    kses
-	*/
-		class kses5
-		{
-			/**#@+
+    /**
+     *	Class file for PHP5 OOP version of kses
+     *
+     *	This is an updated version of kses to work with PHP5 that works under E_STRICT.
+     *
+     *	This version is a bit of a rewrite to match my own coding style and use some of the
+     *	capabilities allowed in PHP5.  Since this was a significant rewrite, but it still
+     *	maintains backward compatibility syntax-wise, the version number is now 1.0.0.  Any
+     *	minor changes that do not break compatibility will be indicated in the second or third
+     *	digits.  Anything that breaks compatibility will change the major version number.
+     *
+     *	PHP5 specific changes:
+     *	+ Private methods are now in place
+     *	+ __construct() is now used rather then the standard class name 'kses()'
+     *	+ Kses will not load in any version less that PHP5
+     *	Other modifications:
+     *	+ PHPdoc style documentation has been added to the class.  See http://www.phpdoc.org/ for more info.
+     *	+ Method names have been changed to reflect status as verbs
+     *	+ One line methods have been folded into the code
+     *	+ Some methods are now deprecated due to nomenclature style change.  See method documentation for specifics.
+     *	+ Kses5 now works in E_STRICT
+     *	+ Version number is 1.0.0 to reflect serious code changes
+     *	+ Addition of methods AddProtocols(), filterKsestextHook(), RemoveProtocol(), RemoveProtocols() and SetProtocols()
+     *	+ Deprecated _hook(), Protocols()
+     *
+     *	@package    kses
+     *	@subpackage kses5
+     */
+
+    if(substr(phpversion(), 0, 1) < 5)
+    {
+        die("Class kses requires PHP 5 or higher.");
+    }
+
+    /**
+     *	Only install KSES5 once
+     */
+    if(!defined('KSES_CLASS_PHP5'))
+    {
+        define('KSES_CLASS_PHP5', true);
+
+    /**
+     *	Kses strips evil scripts!
+     *
+     *	This class provides the capability for removing unwanted HTML/XHTML, attributes from
+     *	tags, and protocols contained in links.  The net result is a much more powerful tool
+     *	than the PHP internal strip_tags()
+     *
+     *	This is a fork of a slick piece of procedural code called 'kses' written by Ulf Harnhammar.
+     *
+     *	The original class for PHP4 was basically a wrapper around all of the functions in
+     *	the procedural code written by Ulf, and was released 7/25/2003.
+     *
+     *	This version is a bit of a rewrite to match my own coding style and use some of the
+     *	capabilities allowed in PHP5.  Since this was a significant rewrite, but it still
+     *	maintains backward compatibility syntax-wise, the version number is now 1.0.0.  Any
+     *	minor changes that do not break compatibility will be indicated in the second or third
+     *	digits.  Anything that breaks compatibility will change the major version number.
+     *
+     *	PHP5 specific changes:
+     *	+ Private methods are now in place
+     *	+ __construct() is now used rather then the standard class name 'kses()'
+     *	+ Kses5 will not load in any version less that PHP5
+     *	Other modifications:
+     *	+ PHPdoc style documentation has been added to the class.  See http://www.phpdoc.org/ for more info.
+     *	+ Method names have been changed to reflect status as verbs
+     *	+ One line methods have been folded into the code
+     *	+ Some methods are now deprecated due to nomenclature style change.  See method documentation for specifics.
+     *	+ Kses now works in E_STRICT
+     *	+ Initial Version number set to 1.0.0 to reflect serious code changes
+     *	+ Addition of methods AddProtocols(), filterKsestextHook(), RemoveProtocol(), RemoveProtocols() and SetProtocols()
+     *	+ Deprecated _hook(), Protocols()
+     *	+ Integrated code from kses 0.2.2 into class.
+     *	+ Added methods DumpProtocols(), DumpMethods()
+     *
+     *	@author     Richard R. V�squez, Jr. (Original procedural code by Ulf H�rnhammar)
+     *	@link       http://sourceforge.net/projects/kses/ Home Page for Kses
+     *	@link       http://chaos.org/contact/ Contact page with current email address for Richard Vasquez
+     *	@copyright  Richard R. V�squez, Jr. 2005
+     *	@version    PHP5 OOP 1.0.2
+     *	@license    http://www.gnu.org/licenses/gpl.html GNU Public License
+     *	@package    kses
+     */
+        class kses5
+        {
+            /**#@+
 			 *	@access private
 			 *	@var array
 			 */
-			private $allowed_protocols;
-			private $allowed_html;
-			/**#@-*/
-
-			/**
-			 *	Constructor for kses.
-			 *
-			 *	This sets a default collection of protocols allowed in links, and creates an
-			 *	empty set of allowed HTML tags.
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			public function __construct()
-			{
-				/**
-				 *	You could add protocols such as ftp, new, gopher, mailto, irc, etc.
-				 *
-				 *	The base values the original kses provided were:
-				 *		'http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto'
-				 */
-				$this->allowed_protocols = array('http', 'ftp', 'mailto');
-				$this->allowed_html      = array();
-			}
-
-			/**
-			 *	Basic task of kses - parses $string and strips it as required.
-			 *
-			 *	This method strips all the disallowed (X)HTML tags, attributes
-			 *	and protocols from the input $string.
-			 *
-			 *	@access public
-			 *	@param string $string String to be stripped of 'evil scripts'
-			 *	@return string The stripped string
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			public function Parse($string = "")
-			{
-				if (get_magic_quotes_gpc())
-				{
-					$string = stripslashes($string);
-				}
-				$string = $this->removeNulls($string);
-				//	Remove JavaScript entities from early Netscape 4 versions
-				$string = preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
-				$string = $this->normalizeEntities($string);
-				$string = $this->filterKsesTextHook($string);
-				$string = preg_replace('%(<' . '[^>]*' . '(>|$)' . '|>)%e', "\$this->stripTags('\\1')", $string);
-				return $string;
-			}
-
-			/**
-			 *	Allows for single/batch addition of protocols
-			 *
-			 *	This method accepts one argument that can be either a string
-			 *	or an array of strings.  Invalid data will be ignored.
-			 *
-			 *	The argument will be processed, and each string will be added
-			 *	via AddProtocol().
-			 *
-			 *	@access public
-			 *	@param mixed , A string or array of protocols that will be added to the internal list of allowed protocols.
-			 *	@return bool Status of adding valid protocols.
-			 *	@see AddProtocol()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			public function AddProtocols()
-			{
-				$c_args = func_num_args();
-				if($c_args != 1)
-				{
-					trigger_error("kses5::AddProtocols() did not receive an argument.", E_USER_WARNING);
-					return false;
-				}
-
-				$protocol_data = func_get_arg(0);
-
-				if(is_array($protocol_data) && count($protocol_data) > 0)
-				{
-					foreach($protocol_data as $protocol)
-					{
-						$this->AddProtocol($protocol);
-					}
-					return true;
-				}
-				elseif(is_string($protocol_data))
-				{
-					$this->AddProtocol($protocol_data);
-					return true;
-				}
-				else
-				{
-					trigger_error("kses5::AddProtocols() did not receive a string or an array.", E_USER_WARNING);
-					return false;
-				}
-			}
-
-			/**
-			 *	Allows for single/batch addition of protocols
-			 *
-			 *	@deprecated Use AddProtocols()
-			 *	@see AddProtocols()
-			 *	@return bool
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			public function Protocols()
-			{
-				$c_args = func_num_args();
-				if($c_args != 1)
-				{
-					trigger_error("kses5::Protocols() did not receive an argument.", E_USER_WARNING);
-					return false;
-				}
-
-				return $this->AddProtocols(func_get_arg(0));
-			}
-
-			/**
-			 *	Adds a single protocol to $this->allowed_protocols.
-			 *
-			 *	This method accepts a string argument and adds it to
-			 *	the list of allowed protocols to keep when performing
-			 *	Parse().
-			 *
-			 *	@access public
-			 *	@param string $protocol The name of the protocol to be added.
-			 *	@return bool Status of adding valid protocol.
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			public function AddProtocol($protocol = "")
-			{
-				if(!is_string($protocol))
-				{
-					trigger_error("kses5::AddProtocol() requires a string.", E_USER_WARNING);
-					return false;
-				}
-
-				// Remove any inadvertent ':' at the end of the protocol.
-				if(substr($protocol, strlen($protocol) - 1, 1) == ":")
-				{
-					$protocol = substr($protocol, 0, strlen($protocol) - 1);
-				}
-
-				$protocol = strtolower(trim($protocol));
-				if($protocol == "")
-				{
-					trigger_error("kses5::AddProtocol() tried to add an empty/NULL protocol.", E_USER_WARNING);
-					return false;
-				}
-
-				//	prevent duplicate protocols from being added.
-				if(!in_array($protocol, $this->allowed_protocols))
-				{
-					array_push($this->allowed_protocols, $protocol);
-					sort($this->allowed_protocols);
-				}
-				return true;
-			}
-
-			/**
-			 *	Removes a single protocol from $this->allowed_protocols.
-			 *
-			 *	This method accepts a string argument and removes it from
-			 *	the list of allowed protocols to keep when performing
-			 *	Parse().
-			 *
-			 *	@access public
-			 *	@param string $protocol The name of the protocol to be removed.
-			 *	@return bool Status of removing valid protocol.
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			public function RemoveProtocol($protocol = "")
-			{
-				if(!is_string($protocol))
-				{
-					trigger_error("kses5::RemoveProtocol() requires a string.", E_USER_WARNING);
-					return false;
-				}
-
-				// Remove any inadvertent ':' at the end of the protocol.
-				if(substr($protocol, strlen($protocol) - 1, 1) == ":")
-				{
-					$protocol = substr($protocol, 0, strlen($protocol) - 1);
-				}
-
-				$protocol = strtolower(trim($protocol));
-				if($protocol == "")
-				{
-					trigger_error("kses5::RemoveProtocol() tried to remove an empty/NULL protocol.", E_USER_WARNING);
-					return false;
-				}
-
-				//	Ensures that the protocol exists before removing it.
-				if(in_array($protocol, $this->allowed_protocols))
-				{
-					$this->allowed_protocols = array_diff($this->allowed_protocols, array($protocol));
-					sort($this->allowed_protocols);
-				}
-
-				return true;
-			}
-
-			/**
-			 *	Allows for single/batch removal of protocols
-			 *
-			 *	This method accepts one argument that can be either a string
-			 *	or an array of strings.  Invalid data will be ignored.
-			 *
-			 *	The argument will be processed, and each string will be removed
-			 *	via RemoveProtocol().
-			 *
-			 *	@access public
-			 *	@param mixed , A string or array of protocols that will be removed from the internal list of allowed protocols.
-			 *	@return bool Status of removing valid protocols.
-			 *	@see RemoveProtocol()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			public function RemoveProtocols()
-			{
-				$c_args = func_num_args();
-				if($c_args != 1)
-				{
-					return false;
-				}
-
-				$protocol_data = func_get_arg(0);
-
-				if(is_array($protocol_data) && count($protocol_data) > 0)
-				{
-					foreach($protocol_data as $protocol)
-					{
-						$this->RemoveProtocol($protocol);
-					}
-				}
-				elseif(is_string($protocol_data))
-				{
-					$this->RemoveProtocol($protocol_data);
-					return true;
-				}
-				else
-				{
-					trigger_error("kses5::RemoveProtocols() did not receive a string or an array.", E_USER_WARNING);
-					return false;
-				}
-			}
-
-			/**
-			 *	Allows for single/batch replacement of protocols
-			 *
-			 *	This method accepts one argument that can be either a string
-			 *	or an array of strings.  Invalid data will be ignored.
-			 *
-			 *	Existing protocols will be removed, then the argument will be
-			 *	processed, and each string will be added via AddProtocol().
-			 *
-			 *	@access public
-			 *	@param mixed , A string or array of protocols that will be the new internal list of allowed protocols.
-			 *	@return bool Status of replacing valid protocols.
-			 *	@since PHP5 OOP 1.0.1
-			 *	@see AddProtocol()
-			 */
-			public function SetProtocols()
-			{
-				$c_args = func_num_args();
-				if($c_args != 1)
-				{
-					trigger_error("kses5::SetProtocols() did not receive an argument.", E_USER_WARNING);
-					return false;
-				}
-
-				$protocol_data = func_get_arg(0);
-
-				if(is_array($protocol_data) && count($protocol_data) > 0)
-				{
-					$this->allowed_protocols = array();
-					foreach($protocol_data as $protocol)
-					{
-						$this->AddProtocol($protocol);
-					}
-					return true;
-				}
-				elseif(is_string($protocol_data))
-				{
-					$this->allowed_protocols = array();
-					$this->AddProtocol($protocol_data);
-					return true;
-				}
-				else
-				{
-					trigger_error("kses5::SetProtocols() did not receive a string or an array.", E_USER_WARNING);
-					return false;
-				}
-			}
-
-			/**
-			 *	Raw dump of allowed protocols
-			 *
-			 *	This returns an indexed array of allowed protocols for a particular KSES
-			 *	instantiation.
-			 *
-			 *	@access public
-			 *	@return array The list of allowed protocols.
-			 *	@since PHP5 OOP 1.0.2
-			 */
-			public function DumpProtocols()
-			{
-				return $this->allowed_protocols;
-			}
-
-			/**
-			 *	Raw dump of allowed (X)HTML elements
-			 *
-			 *	This returns an indexed array of allowed (X)HTML elements and attributes
-			 *	for a particular KSES instantiation.
-			 *
-			 *	@access public
-			 *	@return array The list of allowed elements.
-			 *	@since PHP5 OOP 1.0.2
-			 */
-			public function DumpElements()
-			{
-				return $this->allowed_html;
-			}
-
-
-			/**
-			 *	Adds valid (X)HTML with corresponding attributes that will be kept when stripping 'evil scripts'.
-			 *
-			 *	This method accepts one argument that can be either a string
-			 *	or an array of strings.  Invalid data will be ignored.
-			 *
-			 *	@access public
-			 *	@param string $tag (X)HTML tag that will be allowed after stripping text.
-			 *	@param array $attribs Associative array of allowed attributes - key => attribute name - value => attribute parameter
-			 *	@return bool Status of Adding (X)HTML and attributes.
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			public function AddHTML($tag = "", $attribs = array())
-			{
-				if(!is_string($tag))
-				{
-					trigger_error("kses5::AddHTML() requires the tag to be a string", E_USER_WARNING);
-					return false;
-				}
-
-				$tag = strtolower(trim($tag));
-				if($tag == "")
-				{
-					trigger_error("kses5::AddHTML() tried to add an empty/NULL tag", E_USER_WARNING);
-					return false;
-				}
-
-				if(!is_array($attribs))
-				{
-					trigger_error("kses5::AddHTML() requires an array (even an empty one) of attributes for '$tag'", E_USER_WARNING);
-					return false;
-				}
-
-				$new_attribs = array();
-				if(is_array($attribs) && count($attribs) > 0)
-				{
-					foreach($attribs as $idx1 => $val1)
-					{
-						$new_idx1 = strtolower($idx1);
-						$new_val1 = $attribs[$idx1];
-
-						if(is_array($new_val1) && count($attribs) > 0)
-						{
-							$tmp_val = array();
-							foreach($new_val1 as $idx2 => $val2)
-							{
-								$new_idx2 = strtolower($idx2);
-								$tmp_val[$new_idx2] = $val2;
-							}
-							$new_val1 = $tmp_val;
-						}
-
-						$new_attribs[$new_idx1] = $new_val1;
-					}
-				}
-
-				$this->allowed_html[$tag] = $new_attribs;
-				return true;
-			}
-
-			/**
-			 *	This method removes any NULL characters in $string.
-			 *
-			 *	@access private
-			 *	@param string $string
-			 *	@return string String without any NULL/chr(173)
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function removeNulls($string)
-			{
-				$string = preg_replace('/\0+/', '', $string);
-				$string = preg_replace('/(\\\\0)+/', '', $string);
-				return $string;
-			}
-
-			/**
-			 *	Normalizes HTML entities
-			 *
-			 *	This function normalizes HTML entities. It will convert "AT&T" to the correct
-			 *	"AT&amp;T", "&#00058;" to "&#58;", "&#XYZZY;" to "&amp;#XYZZY;" and so on.
-			 *
-			 *	@access private
-			 *	@param string $string
-			 *	@return string String with normalized entities
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function normalizeEntities($string)
-			{
-				# Disarm all entities by converting & to &amp;
-				$string = str_replace('&', '&amp;', $string);
-
-				#	TODO: Change back (Keep?) the allowed entities in our entity white list
-
-				#	Keeps entities that start with [A-Za-z]
-				$string = preg_replace(
-					'/&amp;([A-Za-z][A-Za-z0-9]{0,19});/',
-					'&\\1;',
-					$string
-				);
-
-				#	Change numeric entities to valid 16 bit values
-
-				$string = preg_replace(
-					'/&amp;#0*([0-9]{1,5});/e',
-					'\$this->normalizeEntities16bit("\\1")',
-					$string
-				);
-
-				#	Change &XHHHHHHH (Hex digits) to 16 bit hex values
-				$string = preg_replace(
-					'/&amp;#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/',
-					'&#\\1\\2;',
-					$string
-				);
-
-				return $string;
-			}
-
-			/**
-			 *	Helper method used by normalizeEntites()
-			 *
-			 *	This method helps normalizeEntities() to only accept 16 bit values
-			 *	and nothing more for &#number; entities.
-			 *
-			 *	This method helps normalize_entities() during a preg_replace()
-			 *	where a &#(0)*XXXXX; occurs.  The '(0)*XXXXXX' value is converted to
-			 *	a number and the result is returned as a numeric entity if the number
-			 *	is less than 65536.  Otherwise, the value is returned 'as is'.
-			 *
-			 *	@access private
-			 *	@param string $i
-			 *	@return string Normalized numeric entity
-			 *	@see normalizeEntities()
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function normalizeEntities16bit($i)
-			{
-			  return (($i > 65535) ? "&amp;#$i;" : "&#$i;");
-			}
-
-			/**
-			 *	Allows for additional user defined modifications to text.
-			 *
-			 *	This method allows for additional modifications to be performed on
-			 *	a string that's being run through Parse().  Currently, it returns the
-			 *	input string 'as is'.
-			 *
-			 *	This method is provided for users to extend the kses class for their own
-			 *	requirements.
-			 *
-			 *	@access public
-			 *	@param string $string String to perfrom additional modifications on.
-			 *	@return string User modified string.
-			 *	@see Parse()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			private function filterKsesTextHook($string)
-			{
-			  return $string;
-			}
-
-			/**
-			 *	Allows for additional user defined modifications to text.
-			 *
-			 *	@deprecated use filterKsesTextHook()
-			 *	@param string $string
-			 *	@return string
-			 *	@see filterKsesTextHook()
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function _hook($string)
-			{
-				return $this->filterKsesTextHook($string);
-			}
-
-			/**
-			 *	This method goes through an array, and changes the keys to all lower case.
-			 *
-			 *	@access private
-			 *	@param array $in_array Associative array
-			 *	@return array Modified array
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function makeArrayKeysLowerCase($in_array)
-			{
-				$out_array = array();
-
-				if(is_array($in_array) && count($in_array) > 0)
-				{
-					foreach ($in_array as $in_key => $in_val)
-					{
-						$out_key = strtolower($in_key);
-						$out_array[$out_key] = array();
-
-						if(is_array($in_val) && count($in_val) > 0)
-						{
-							foreach ($in_val as $in_key2 => $in_val2)
-							{
-								$out_key2 = strtolower($in_key2);
-								$out_array[$out_key][$out_key2] = $in_val2;
-							}
-						}
-					}
-				}
-
-				return $out_array;
-			}
-
-			/**
-			 *	This method strips out disallowed and/or mangled (X)HTML tags along with assigned attributes.
-			 *
-			 *	This method does a lot of work. It rejects some very malformed things
-			 *	like <:::>. It returns an empty string if the element isn't allowed (look
-			 *	ma, no strip_tags()!). Otherwise it splits the tag into an element and an
-			 *	allowed attribute list.
-			 *
-			 *	@access private
-			 *	@param string $string
-			 *	@return string Modified string minus disallowed/mangled (X)HTML and attributes
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function stripTags($string)
-			{
-				$string = preg_replace('%\\\\"%', '"', $string);
-
-				if (substr($string, 0, 1) != '<')
-				{
-					# It matched a ">" character
-					return '&gt;';
-				}
-
-				if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
-				{
-					# It's seriously malformed
-					return '';
-				}
-
-				$slash    = trim($matches[1]);
-				$elem     = $matches[2];
-				$attrlist = $matches[3];
-
-				if (
-					!isset($this->allowed_html[strtolower($elem)]) ||
-					!is_array($this->allowed_html[strtolower($elem)]))
-				{
-					#	Found an HTML element not in the white list
-					return '';
-				}
-
-				if ($slash != '')
-				{
-					return "<$slash$elem>";
-				}
-				# No attributes are allowed for closing elements
-
-				return $this->stripAttributes("$slash$elem", $attrlist);
-			}
-
-			/**
-			 *	This method strips out disallowed attributes for (X)HTML tags.
-			 *
-			 *	This method removes all attributes if none are allowed for this element.
-			 *	If some are allowed it calls combAttributes() to split them further, and then it
-			 *	builds up new HTML code from the data that combAttributes() returns. It also
-			 *	removes "<" and ">" characters, if there are any left. One more thing it
-			 *	does is to check if the tag has a closing XHTML slash, and if it does,
-			 *	it puts one in the returned code as well.
-			 *
-			 *	@access private
-			 *	@param string $element (X)HTML tag to check
-			 *	@param string $attr Text containing attributes to check for validity.
-			 *	@return string Resulting valid (X)HTML or ''
-			 *	@see combAttributes()
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function stripAttributes($element, $attr)
-			{
-				# Is there a closing XHTML slash at the end of the attributes?
-				$xhtml_slash = '';
-				if (preg_match('%\s/\s*$%', $attr))
-				{
-					$xhtml_slash = ' /';
-				}
-
-				# Are any attributes allowed at all for this element?
-				if (
-					!isset($this->allowed_html[strtolower($element)]) ||
-					count($this->allowed_html[strtolower($element)]) == 0
-				)
-				{
-					return "<$element$xhtml_slash>";
-				}
-
-				# Split it
-				$attrarr = $this->combAttributes($attr);
-
-				# Go through $attrarr, and save the allowed attributes for this element
-				# in $attr2
-				$attr2 = '';
-				if(is_array($attrarr) && count($attrarr) > 0)
-				{
-					foreach ($attrarr as $arreach)
-					{
-						if(!isset($this->allowed_html[strtolower($element)][strtolower($arreach['name'])]))
-						{
-							continue;
-						}
-
-						$current = $this->allowed_html[strtolower($element)][strtolower($arreach['name'])];
-
-						if (!is_array($current))
-						{
-							# there are no checks
-							$attr2 .= ' '.$arreach['whole'];
-						}
-						else
-						{
-							# there are some checks
-							$ok = true;
-							if(is_array($current) && count($current) > 0)
-							{
-								foreach ($current as $currkey => $currval)
-								{
-									if (!$this->checkAttributeValue($arreach['value'], $arreach['vless'], $currkey, $currval))
-									{
-										$ok = false;
-										break;
-									}
-								}
-							}
-
-							if ($ok)
-							{
-								# it passed them
-								$attr2 .= ' '.$arreach['whole'];
-							}
-						}
-					}
-				}
-
-				# Remove any "<" or ">" characters
-				$attr2 = preg_replace('/[<>]/', '', $attr2);
-				return "<$element$attr2$xhtml_slash>";
-			}
-
-			/**
-			 *	This method combs through an attribute list string and returns an associative array of attributes and values.
-			 *
-			 *	This method does a lot of work. It parses an attribute list into an array
-			 *	with attribute data, and tries to do the right thing even if it gets weird
-			 *	input. It will add quotes around attribute values that don't have any quotes
-			 *	or apostrophes around them, to make it easier to produce HTML code that will
-			 *	conform to W3C's HTML specification. It will also remove bad URL protocols
-			 *	from attribute values.
-			 *
-			 *	@access private
-			 *	@param string $attr Text containing tag attributes for parsing
-			 *	@return array Associative array containing data on attribute and value
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function combAttributes($attr)
-			{
-				$attrarr  = array();
-				$mode     = 0;
-				$attrname = '';
-
-				# Loop through the whole attribute list
-
-				while (strlen($attr) != 0)
-				{
-					# Was the last operation successful?
-					$working = 0;
-
-					switch ($mode)
-					{
-						case 0:	# attribute name, href for instance
-							if (preg_match('/^([-a-zA-Z]+)/', $attr, $match))
-							{
-								$attrname = $match[1];
-								$working = $mode = 1;
-								$attr = preg_replace('/^[-a-zA-Z]+/', '', $attr);
-							}
-							break;
-						case 1:	# equals sign or valueless ("selected")
-							if (preg_match('/^\s*=\s*/', $attr)) # equals sign
-							{
-								$working = 1;
-								$mode    = 2;
-								$attr    = preg_replace('/^\s*=\s*/', '', $attr);
-								break;
-							}
-							if (preg_match('/^\s+/', $attr)) # valueless
-							{
-								$working   = 1;
-								$mode      = 0;
-								$attrarr[] = array(
-									'name'  => $attrname,
-									'value' => '',
-									'whole' => $attrname,
-									'vless' => 'y'
-								);
-								$attr      = preg_replace('/^\s+/', '', $attr);
-							}
-							break;
-						case 2: # attribute value, a URL after href= for instance
-							if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) # "value"
-							{
-								$thisval   = $this->removeBadProtocols($match[1]);
-								$attrarr[] = array(
-									'name'  => $attrname,
-									'value' => $thisval,
-									'whole' => $attrname . '="' . $thisval . '"',
-									'vless' => 'n'
-								);
-								$working   = 1;
-								$mode      = 0;
-								$attr      = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
-								break;
-							}
-							if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) # 'value'
-							{
-								$thisval   = $this->removeBadProtocols($match[1]);
-								$attrarr[] = array(
-									'name'  => $attrname,
-									'value' => $thisval,
-									'whole' => "$attrname='$thisval'",
-									'vless' => 'n'
-								);
-								$working   = 1;
-								$mode      = 0;
-								$attr      = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
-								break;
-							}
-							if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) # value
-							{
-								$thisval   = $this->removeBadProtocols($match[1]);
-								$attrarr[] = array(
-									'name'  => $attrname,
-									'value' => $thisval,
-									'whole' => $attrname . '="' . $thisval . '"',
-									'vless' => 'n'
-								);
-								# We add quotes to conform to W3C's HTML spec.
-								$working   = 1;
-								$mode      = 0;
-								$attr      = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr);
-							}
-							break;
-					}
-
-					if ($working == 0) # not well formed, remove and try again
-					{
-						$attr = preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $attr);
-						$mode = 0;
-					}
-				}
-
-				# special case, for when the attribute list ends with a valueless
-				# attribute like "selected"
-				if ($mode == 1)
-				{
-					$attrarr[] = array(
-						'name'  => $attrname,
-						'value' => '',
-						'whole' => $attrname,
-						'vless' => 'y'
-					);
-				}
-
-				return $attrarr;
-			}
-
-			/**
-			 *	This method removes disallowed protocols.
-			 *
-			 *	This method removes all non-allowed protocols from the beginning of
-			 *	$string. It ignores whitespace and the case of the letters, and it does
-			 *	understand HTML entities. It does its work in a while loop, so it won't be
-			 *	fooled by a string like "javascript:javascript:alert(57)".
-			 *
-			 *	@access private
-			 *	@param string $string String to check for protocols
-			 *	@return string String with removed protocols
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function removeBadProtocols($string)
-			{
-				$string  = $this->RemoveNulls($string);
-				$string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature"
-				$string2 = $string . 'a';
-
-				$string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
-				if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
-				{
-					$string = $this->filterProtocols($string2[0]).trim($string2[1]);
-				}
-				return $string;
-			}
-
-			/**
-			 *	Helper method used by removeBadProtocols()
-			 *
-			 *	This function processes URL protocols, checks to see if they're in the white-
-			 *	list or not, and returns different data depending on the answer.
-			 *
-			 *	@access private
-			 *	@param string $string String to check for protocols
-			 *	@return string String with removed protocols
-			 *	@see removeBadProtocols()
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function filterProtocols($string)
-			{
-				$string = $this->decodeEntities($string);
-				$string = preg_replace('/\s/', '', $string);
-				$string = $this->removeNulls($string);
-				$string = preg_replace('/\xad+/', '', $string2); # deals with Opera "feature"
-				$string = strtolower($string);
-
-				if(is_array($this->allowed_protocols) && count($this->allowed_protocols) > 0)
-				{
-					foreach ($this->allowed_protocols as $one_protocol)
-					{
-						if (strtolower($one_protocol) == $string)
-						{
-							return "$string:";
-						}
-					}
-				}
-
-				return '';
-			}
-
-			/**
-			 *	Controller method for performing checks on attribute values.
-			 *
-			 *	This method calls the appropriate method as specified by $checkname with
-			 *	the parameters $value, $vless, and $checkvalue, and returns the result
-			 *	of the call.
-			 *
-			 *	This method's functionality can be expanded by creating new methods
-			 *	that would match checkAttributeValue[$checkname].
-			 *
-			 *	Current checks implemented are: "maxlen", "minlen", "maxval", "minval" and "valueless"
-			 *
-			 *	@access private
-			 *	@param string $value The value of the attribute to be checked.
-			 *	@param string $vless Indicates whether the the value is supposed to be valueless
-			 *	@param string $checkname The check to be performed
-			 *	@param string $checkvalue The value that is to be checked against
-			 *	@return bool Indicates whether the check passed or not
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			private function checkAttributeValue($value, $vless, $checkname, $checkvalue)
-			{
-				$ok = true;
-				$check_attribute_method_name  = 'checkAttributeValue' . ucfirst(strtolower($checkname));
-				if(method_exists($this, $check_attribute_method_name))
-				{
-					$ok = $this->$check_attribute_method_name($value, $checkvalue, $vless);
-				}
-
-				return $ok;
-			}
-
-			/**
-			 *	Helper method invoked by checkAttributeValue().
-			 *
-			 *	The maxlen check makes sure that the attribute value has a length not
-			 *	greater than the given value. This can be used to avoid Buffer Overflows
-			 *	in WWW clients and various Internet servers.
-			 *
-			 *	@access private
-			 *	@param string $value The value of the attribute to be checked.
-			 *	@param int $checkvalue The maximum value allowed
-			 *	@return bool Indicates whether the check passed or not
-			 *	@see checkAttributeValue()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			private function checkAttributeValueMaxlen($value, $checkvalue)
-			{
-				if (strlen($value) > intval($checkvalue))
-				{
-					return false;
-				}
-				return true;
-			}
-
-			/**
-			 *	Helper method invoked by checkAttributeValue().
-			 *
-			 *	The minlen check makes sure that the attribute value has a length not
-			 *	smaller than the given value.
-			 *
-			 *	@access private
-			 *	@param string $value The value of the attribute to be checked.
-			 *	@param int $checkvalue The minimum value allowed
-			 *	@return bool Indicates whether the check passed or not
-			 *	@see checkAttributeValue()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			private function checkAttributeValueMinlen($value, $checkvalue)
-			{
-				if (strlen($value) < intval($checkvalue))
-				{
-					return false;
-				}
-				return true;
-			}
-
-			/**
-			 *	Helper method invoked by checkAttributeValue().
-			 *
-			 *	The maxval check does two things: it checks that the attribute value is
-			 *	an integer from 0 and up, without an excessive amount of zeroes or
-			 *	whitespace (to avoid Buffer Overflows). It also checks that the attribute
-			 *	value is not greater than the given value.
-			 *
-			 *	This check can be used to avoid Denial of Service attacks.
-			 *
-			 *	@access private
-			 *	@param int $value The value of the attribute to be checked.
-			 *	@param int $checkvalue The maximum numeric value allowed
-			 *	@return bool Indicates whether the check passed or not
-			 *	@see checkAttributeValue()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			private function checkAttributeValueMaxval($value, $checkvalue)
-			{
-				if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-				{
-					return false;
-				}
-				if (intval($value) > intval($checkvalue))
-				{
-					return false;
-				}
-				return true;
-			}
-
-			/**
-			 *	Helper method invoked by checkAttributeValue().
-			 *
-			 *	The minval check checks that the attribute value is a positive integer,
-			 *	and that it is not smaller than the given value.
-			 *
-			 *	@access private
-			 *	@param int $value The value of the attribute to be checked.
-			 *	@param int $checkvalue The minimum numeric value allowed
-			 *	@return bool Indicates whether the check passed or not
-			 *	@see checkAttributeValue()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			private function checkAttributeValueMinval($value, $checkvalue)
-			{
-				if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
-				{
-					return false;
-				}
-				if (intval($value) < ($checkvalue))
-				{
-					return false;
-				}
-				return true;
-			}
-
-			/**
-			 *	Helper method invoked by checkAttributeValue().
-			 *
-			 *	The valueless check checks if the attribute has a value
-			 *	(like <a href="blah">) or not (<option selected>). If the given value
-			 *	is a "y" or a "Y", the attribute must not have a value.
-			 *
-			 *	If the given value is an "n" or an "N", the attribute must have one.
-			 *
-			 *	@access private
-			 *	@param int $value The value of the attribute to be checked.
-			 *	@param mixed $checkvalue This variable is ignored for this test
-			 *	@param string $vless Flag indicating if this attribute is not supposed to have an attribute
-			 *	@return bool Indicates whether the check passed or not
-			 *	@see checkAttributeValue()
-			 *	@since PHP5 OOP 1.0.0
-			 */
-			private function checkAttributeValueValueless($value, $checkvalue, $vless)
-			{
-				if (strtolower($checkvalue) != $vless)
-				{
-					return false;
-				}
-				return true;
-			}
-
-			/**
-			 *	Decodes numeric HTML entities
-			 *
-			 *	This method decodes numeric HTML entities (&#65; and &#x41;). It doesn't
-			 *	do anything with other entities like &auml;, but we don't need them in the
-			 *	URL protocol white listing system anyway.
-			 *
-			 *	@access private
-			 *	@param string $value The entitiy to be decoded.
-			 *	@return string Decoded entity
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			private function decodeEntities($string)
-			{
-				$string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string);
-				$string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))', $string);
-				return $string;
-			}
-
-			/**
-			 *	Returns PHP5 OOP version # of kses.
-			 *
-			 *	Since this class has been refactored and documented and proven to work,
-			 *	I'm fixing the version number at 1.0.0.
-			 *
-			 *	This version is syntax compatible with the PHP4 OOP version 0.0.2.  Future
-			 *	versions may not be syntax compatible.
-			 *
-			 *	@access public
-			 *	@return string Version number
-			 *	@since PHP4 OOP 0.0.1
-			 */
-			public function Version()
-			{
-				return 'PHP5 OOP 1.0.2';
-			}
-		}
-	}
+            private $allowed_protocols;
+            private $allowed_html;
+            /**#@-*/
+
+            /**
+             *	Constructor for kses.
+             *
+             *	This sets a default collection of protocols allowed in links, and creates an
+             *	empty set of allowed HTML tags.
+             *	@since PHP5 OOP 1.0.0
+             */
+            public function __construct()
+            {
+                /**
+                 *	You could add protocols such as ftp, new, gopher, mailto, irc, etc.
+                 *
+                 *	The base values the original kses provided were:
+                 *		'http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto'
+                 */
+                $this->allowed_protocols = array('http', 'ftp', 'mailto');
+                $this->allowed_html      = array();
+            }
+
+            /**
+             *	Basic task of kses - parses $string and strips it as required.
+             *
+             *	This method strips all the disallowed (X)HTML tags, attributes
+             *	and protocols from the input $string.
+             *
+             *	@access public
+             *	@param string $string String to be stripped of 'evil scripts'
+             *	@return string The stripped string
+             *	@since PHP4 OOP 0.0.1
+             */
+            public function Parse($string = "")
+            {
+                if (get_magic_quotes_gpc())
+                {
+                    $string = stripslashes($string);
+                }
+                $string = $this->removeNulls($string);
+                //	Remove JavaScript entities from early Netscape 4 versions
+                $string = preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
+                $string = $this->normalizeEntities($string);
+                $string = $this->filterKsesTextHook($string);
+                $string = preg_replace('%(<' . '[^>]*' . '(>|$)' . '|>)%e', "\$this->stripTags('\\1')", $string);
+                return $string;
+            }
+
+            /**
+             *	Allows for single/batch addition of protocols
+             *
+             *	This method accepts one argument that can be either a string
+             *	or an array of strings.  Invalid data will be ignored.
+             *
+             *	The argument will be processed, and each string will be added
+             *	via AddProtocol().
+             *
+             *	@access public
+             *	@param mixed , A string or array of protocols that will be added to the internal list of allowed protocols.
+             *	@return bool Status of adding valid protocols.
+             *	@see AddProtocol()
+             *	@since PHP5 OOP 1.0.0
+             */
+            public function AddProtocols()
+            {
+                $c_args = func_num_args();
+                if($c_args != 1)
+                {
+                    trigger_error("kses5::AddProtocols() did not receive an argument.", E_USER_WARNING);
+                    return false;
+                }
+
+                $protocol_data = func_get_arg(0);
+
+                if(is_array($protocol_data) && count($protocol_data) > 0)
+                {
+                    foreach($protocol_data as $protocol)
+                    {
+                        $this->AddProtocol($protocol);
+                    }
+                    return true;
+                }
+                elseif(is_string($protocol_data))
+                {
+                    $this->AddProtocol($protocol_data);
+                    return true;
+                }
+                else
+                {
+                    trigger_error("kses5::AddProtocols() did not receive a string or an array.", E_USER_WARNING);
+                    return false;
+                }
+            }
+
+            /**
+             *	Allows for single/batch addition of protocols
+             *
+             *	@deprecated Use AddProtocols()
+             *	@see AddProtocols()
+             *	@return bool
+             *	@since PHP4 OOP 0.0.1
+             */
+            public function Protocols()
+            {
+                $c_args = func_num_args();
+                if($c_args != 1)
+                {
+                    trigger_error("kses5::Protocols() did not receive an argument.", E_USER_WARNING);
+                    return false;
+                }
+
+                return $this->AddProtocols(func_get_arg(0));
+            }
+
+            /**
+             *	Adds a single protocol to $this->allowed_protocols.
+             *
+             *	This method accepts a string argument and adds it to
+             *	the list of allowed protocols to keep when performing
+             *	Parse().
+             *
+             *	@access public
+             *	@param string $protocol The name of the protocol to be added.
+             *	@return bool Status of adding valid protocol.
+             *	@since PHP4 OOP 0.0.1
+             */
+            public function AddProtocol($protocol = "")
+            {
+                if(!is_string($protocol))
+                {
+                    trigger_error("kses5::AddProtocol() requires a string.", E_USER_WARNING);
+                    return false;
+                }
+
+                // Remove any inadvertent ':' at the end of the protocol.
+                if(substr($protocol, strlen($protocol) - 1, 1) == ":")
+                {
+                    $protocol = substr($protocol, 0, strlen($protocol) - 1);
+                }
+
+                $protocol = strtolower(trim($protocol));
+                if($protocol == "")
+                {
+                    trigger_error("kses5::AddProtocol() tried to add an empty/NULL protocol.", E_USER_WARNING);
+                    return false;
+                }
+
+                //	prevent duplicate protocols from being added.
+                if(!in_array($protocol, $this->allowed_protocols))
+                {
+                    array_push($this->allowed_protocols, $protocol);
+                    sort($this->allowed_protocols);
+                }
+                return true;
+            }
+
+            /**
+             *	Removes a single protocol from $this->allowed_protocols.
+             *
+             *	This method accepts a string argument and removes it from
+             *	the list of allowed protocols to keep when performing
+             *	Parse().
+             *
+             *	@access public
+             *	@param string $protocol The name of the protocol to be removed.
+             *	@return bool Status of removing valid protocol.
+             *	@since PHP5 OOP 1.0.0
+             */
+            public function RemoveProtocol($protocol = "")
+            {
+                if(!is_string($protocol))
+                {
+                    trigger_error("kses5::RemoveProtocol() requires a string.", E_USER_WARNING);
+                    return false;
+                }
+
+                // Remove any inadvertent ':' at the end of the protocol.
+                if(substr($protocol, strlen($protocol) - 1, 1) == ":")
+                {
+                    $protocol = substr($protocol, 0, strlen($protocol) - 1);
+                }
+
+                $protocol = strtolower(trim($protocol));
+                if($protocol == "")
+                {
+                    trigger_error("kses5::RemoveProtocol() tried to remove an empty/NULL protocol.", E_USER_WARNING);
+                    return false;
+                }
+
+                //	Ensures that the protocol exists before removing it.
+                if(in_array($protocol, $this->allowed_protocols))
+                {
+                    $this->allowed_protocols = array_diff($this->allowed_protocols, array($protocol));
+                    sort($this->allowed_protocols);
+                }
+
+                return true;
+            }
+
+            /**
+             *	Allows for single/batch removal of protocols
+             *
+             *	This method accepts one argument that can be either a string
+             *	or an array of strings.  Invalid data will be ignored.
+             *
+             *	The argument will be processed, and each string will be removed
+             *	via RemoveProtocol().
+             *
+             *	@access public
+             *	@param mixed , A string or array of protocols that will be removed from the internal list of allowed protocols.
+             *	@return bool Status of removing valid protocols.
+             *	@see RemoveProtocol()
+             *	@since PHP5 OOP 1.0.0
+             */
+            public function RemoveProtocols()
+            {
+                $c_args = func_num_args();
+                if($c_args != 1)
+                {
+                    return false;
+                }
+
+                $protocol_data = func_get_arg(0);
+
+                if(is_array($protocol_data) && count($protocol_data) > 0)
+                {
+                    foreach($protocol_data as $protocol)
+                    {
+                        $this->RemoveProtocol($protocol);
+                    }
+                }
+                elseif(is_string($protocol_data))
+                {
+                    $this->RemoveProtocol($protocol_data);
+                    return true;
+                }
+                else
+                {
+                    trigger_error("kses5::RemoveProtocols() did not receive a string or an array.", E_USER_WARNING);
+                    return false;
+                }
+            }
+
+            /**
+             *	Allows for single/batch replacement of protocols
+             *
+             *	This method accepts one argument that can be either a string
+             *	or an array of strings.  Invalid data will be ignored.
+             *
+             *	Existing protocols will be removed, then the argument will be
+             *	processed, and each string will be added via AddProtocol().
+             *
+             *	@access public
+             *	@param mixed , A string or array of protocols that will be the new internal list of allowed protocols.
+             *	@return bool Status of replacing valid protocols.
+             *	@since PHP5 OOP 1.0.1
+             *	@see AddProtocol()
+             */
+            public function SetProtocols()
+            {
+                $c_args = func_num_args();
+                if($c_args != 1)
+                {
+                    trigger_error("kses5::SetProtocols() did not receive an argument.", E_USER_WARNING);
+                    return false;
+                }
+
+                $protocol_data = func_get_arg(0);
+
+                if(is_array($protocol_data) && count($protocol_data) > 0)
+                {
+                    $this->allowed_protocols = array();
+                    foreach($protocol_data as $protocol)
+                    {
+                        $this->AddProtocol($protocol);
+                    }
+                    return true;
+                }
+                elseif(is_string($protocol_data))
+                {
+                    $this->allowed_protocols = array();
+                    $this->AddProtocol($protocol_data);
+                    return true;
+                }
+                else
+                {
+                    trigger_error("kses5::SetProtocols() did not receive a string or an array.", E_USER_WARNING);
+                    return false;
+                }
+            }
+
+            /**
+             *	Raw dump of allowed protocols
+             *
+             *	This returns an indexed array of allowed protocols for a particular KSES
+             *	instantiation.
+             *
+             *	@access public
+             *	@return array The list of allowed protocols.
+             *	@since PHP5 OOP 1.0.2
+             */
+            public function DumpProtocols()
+            {
+                return $this->allowed_protocols;
+            }
+
+            /**
+             *	Raw dump of allowed (X)HTML elements
+             *
+             *	This returns an indexed array of allowed (X)HTML elements and attributes
+             *	for a particular KSES instantiation.
+             *
+             *	@access public
+             *	@return array The list of allowed elements.
+             *	@since PHP5 OOP 1.0.2
+             */
+            public function DumpElements()
+            {
+                return $this->allowed_html;
+            }
+
+
+            /**
+             *	Adds valid (X)HTML with corresponding attributes that will be kept when stripping 'evil scripts'.
+             *
+             *	This method accepts one argument that can be either a string
+             *	or an array of strings.  Invalid data will be ignored.
+             *
+             *	@access public
+             *	@param string $tag (X)HTML tag that will be allowed after stripping text.
+             *	@param array $attribs Associative array of allowed attributes - key => attribute name - value => attribute parameter
+             *	@return bool Status of Adding (X)HTML and attributes.
+             *	@since PHP4 OOP 0.0.1
+             */
+            public function AddHTML($tag = "", $attribs = array())
+            {
+                if(!is_string($tag))
+                {
+                    trigger_error("kses5::AddHTML() requires the tag to be a string", E_USER_WARNING);
+                    return false;
+                }
+
+                $tag = strtolower(trim($tag));
+                if($tag == "")
+                {
+                    trigger_error("kses5::AddHTML() tried to add an empty/NULL tag", E_USER_WARNING);
+                    return false;
+                }
+
+                if(!is_array($attribs))
+                {
+                    trigger_error("kses5::AddHTML() requires an array (even an empty one) of attributes for '$tag'", E_USER_WARNING);
+                    return false;
+                }
+
+                $new_attribs = array();
+                if(is_array($attribs) && count($attribs) > 0)
+                {
+                    foreach($attribs as $idx1 => $val1)
+                    {
+                        $new_idx1 = strtolower($idx1);
+                        $new_val1 = $attribs[$idx1];
+
+                        if(is_array($new_val1) && count($attribs) > 0)
+                        {
+                            $tmp_val = array();
+                            foreach($new_val1 as $idx2 => $val2)
+                            {
+                                $new_idx2 = strtolower($idx2);
+                                $tmp_val[$new_idx2] = $val2;
+                            }
+                            $new_val1 = $tmp_val;
+                        }
+
+                        $new_attribs[$new_idx1] = $new_val1;
+                    }
+                }
+
+                $this->allowed_html[$tag] = $new_attribs;
+                return true;
+            }
+
+            /**
+             *	This method removes any NULL characters in $string.
+             *
+             *	@access private
+             *	@param string $string
+             *	@return string String without any NULL/chr(173)
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function removeNulls($string)
+            {
+                $string = preg_replace('/\0+/', '', $string);
+                $string = preg_replace('/(\\\\0)+/', '', $string);
+                return $string;
+            }
+
+            /**
+             *	Normalizes HTML entities
+             *
+             *	This function normalizes HTML entities. It will convert "AT&T" to the correct
+             *	"AT&amp;T", "&#00058;" to "&#58;", "&#XYZZY;" to "&amp;#XYZZY;" and so on.
+             *
+             *	@access private
+             *	@param string $string
+             *	@return string String with normalized entities
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function normalizeEntities($string)
+            {
+                # Disarm all entities by converting & to &amp;
+                $string = str_replace('&', '&amp;', $string);
+
+                #	TODO: Change back (Keep?) the allowed entities in our entity white list
+
+                #	Keeps entities that start with [A-Za-z]
+                $string = preg_replace(
+                    '/&amp;([A-Za-z][A-Za-z0-9]{0,19});/',
+                    '&\\1;',
+                    $string
+                );
+
+                #	Change numeric entities to valid 16 bit values
+
+                $string = preg_replace(
+                    '/&amp;#0*([0-9]{1,5});/e',
+                    '\$this->normalizeEntities16bit("\\1")',
+                    $string
+                );
+
+                #	Change &XHHHHHHH (Hex digits) to 16 bit hex values
+                $string = preg_replace(
+                    '/&amp;#([Xx])0*(([0-9A-Fa-f]{2}){1,2});/',
+                    '&#\\1\\2;',
+                    $string
+                );
+
+                return $string;
+            }
+
+            /**
+             *	Helper method used by normalizeEntites()
+             *
+             *	This method helps normalizeEntities() to only accept 16 bit values
+             *	and nothing more for &#number; entities.
+             *
+             *	This method helps normalize_entities() during a preg_replace()
+             *	where a &#(0)*XXXXX; occurs.  The '(0)*XXXXXX' value is converted to
+             *	a number and the result is returned as a numeric entity if the number
+             *	is less than 65536.  Otherwise, the value is returned 'as is'.
+             *
+             *	@access private
+             *	@param string $i
+             *	@return string Normalized numeric entity
+             *	@see normalizeEntities()
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function normalizeEntities16bit($i)
+            {
+                return (($i > 65535) ? "&amp;#$i;" : "&#$i;");
+            }
+
+            /**
+             *	Allows for additional user defined modifications to text.
+             *
+             *	This method allows for additional modifications to be performed on
+             *	a string that's being run through Parse().  Currently, it returns the
+             *	input string 'as is'.
+             *
+             *	This method is provided for users to extend the kses class for their own
+             *	requirements.
+             *
+             *	@access public
+             *	@param string $string String to perfrom additional modifications on.
+             *	@return string User modified string.
+             *	@see Parse()
+             *	@since PHP5 OOP 1.0.0
+             */
+            private function filterKsesTextHook($string)
+            {
+                return $string;
+            }
+
+            /**
+             *	Allows for additional user defined modifications to text.
+             *
+             *	@deprecated use filterKsesTextHook()
+             *	@param string $string
+             *	@return string
+             *	@see filterKsesTextHook()
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function _hook($string)
+            {
+                return $this->filterKsesTextHook($string);
+            }
+
+            /**
+             *	This method goes through an array, and changes the keys to all lower case.
+             *
+             *	@access private
+             *	@param array $in_array Associative array
+             *	@return array Modified array
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function makeArrayKeysLowerCase($in_array)
+            {
+                $out_array = array();
+
+                if(is_array($in_array) && count($in_array) > 0)
+                {
+                    foreach ($in_array as $in_key => $in_val)
+                    {
+                        $out_key = strtolower($in_key);
+                        $out_array[$out_key] = array();
+
+                        if(is_array($in_val) && count($in_val) > 0)
+                        {
+                            foreach ($in_val as $in_key2 => $in_val2)
+                            {
+                                $out_key2 = strtolower($in_key2);
+                                $out_array[$out_key][$out_key2] = $in_val2;
+                            }
+                        }
+                    }
+                }
+
+                return $out_array;
+            }
+
+            /**
+             *	This method strips out disallowed and/or mangled (X)HTML tags along with assigned attributes.
+             *
+             *	This method does a lot of work. It rejects some very malformed things
+             *	like <:::>. It returns an empty string if the element isn't allowed (look
+             *	ma, no strip_tags()!). Otherwise it splits the tag into an element and an
+             *	allowed attribute list.
+             *
+             *	@access private
+             *	@param string $string
+             *	@return string Modified string minus disallowed/mangled (X)HTML and attributes
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function stripTags($string)
+            {
+                $string = preg_replace('%\\\\"%', '"', $string);
+
+                if (substr($string, 0, 1) != '<')
+                {
+                    # It matched a ">" character
+                    return '&gt;';
+                }
+
+                if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9]+)([^>]*)>?$%', $string, $matches))
+                {
+                    # It's seriously malformed
+                    return '';
+                }
+
+                $slash    = trim($matches[1]);
+                $elem     = $matches[2];
+                $attrlist = $matches[3];
+
+                if (
+                    !isset($this->allowed_html[strtolower($elem)]) ||
+                    !is_array($this->allowed_html[strtolower($elem)]))
+                {
+                    #	Found an HTML element not in the white list
+                    return '';
+                }
+
+                if ($slash != '')
+                {
+                    return "<$slash$elem>";
+                }
+                # No attributes are allowed for closing elements
+
+                return $this->stripAttributes("$slash$elem", $attrlist);
+            }
+
+            /**
+             *	This method strips out disallowed attributes for (X)HTML tags.
+             *
+             *	This method removes all attributes if none are allowed for this element.
+             *	If some are allowed it calls combAttributes() to split them further, and then it
+             *	builds up new HTML code from the data that combAttributes() returns. It also
+             *	removes "<" and ">" characters, if there are any left. One more thing it
+             *	does is to check if the tag has a closing XHTML slash, and if it does,
+             *	it puts one in the returned code as well.
+             *
+             *	@access private
+             *	@param string $element (X)HTML tag to check
+             *	@param string $attr Text containing attributes to check for validity.
+             *	@return string Resulting valid (X)HTML or ''
+             *	@see combAttributes()
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function stripAttributes($element, $attr)
+            {
+                # Is there a closing XHTML slash at the end of the attributes?
+                $xhtml_slash = '';
+                if (preg_match('%\s/\s*$%', $attr))
+                {
+                    $xhtml_slash = ' /';
+                }
+
+                # Are any attributes allowed at all for this element?
+                if (
+                    !isset($this->allowed_html[strtolower($element)]) ||
+                    count($this->allowed_html[strtolower($element)]) == 0
+                )
+                {
+                    return "<$element$xhtml_slash>";
+                }
+
+                # Split it
+                $attrarr = $this->combAttributes($attr);
+
+                # Go through $attrarr, and save the allowed attributes for this element
+                # in $attr2
+                $attr2 = '';
+                if(is_array($attrarr) && count($attrarr) > 0)
+                {
+                    foreach ($attrarr as $arreach)
+                    {
+                        if(!isset($this->allowed_html[strtolower($element)][strtolower($arreach['name'])]))
+                        {
+                            continue;
+                        }
+
+                        $current = $this->allowed_html[strtolower($element)][strtolower($arreach['name'])];
+
+                        if (!is_array($current))
+                        {
+                            # there are no checks
+                            $attr2 .= ' '.$arreach['whole'];
+                        }
+                        else
+                        {
+                            # there are some checks
+                            $ok = true;
+                            if(is_array($current) && count($current) > 0)
+                            {
+                                foreach ($current as $currkey => $currval)
+                                {
+                                    if (!$this->checkAttributeValue($arreach['value'], $arreach['vless'], $currkey, $currval))
+                                    {
+                                        $ok = false;
+                                        break;
+                                    }
+                                }
+                            }
+
+                            if ($ok)
+                            {
+                                # it passed them
+                                $attr2 .= ' '.$arreach['whole'];
+                            }
+                        }
+                    }
+                }
+
+                # Remove any "<" or ">" characters
+                $attr2 = preg_replace('/[<>]/', '', $attr2);
+                return "<$element$attr2$xhtml_slash>";
+            }
+
+            /**
+             *	This method combs through an attribute list string and returns an associative array of attributes and values.
+             *
+             *	This method does a lot of work. It parses an attribute list into an array
+             *	with attribute data, and tries to do the right thing even if it gets weird
+             *	input. It will add quotes around attribute values that don't have any quotes
+             *	or apostrophes around them, to make it easier to produce HTML code that will
+             *	conform to W3C's HTML specification. It will also remove bad URL protocols
+             *	from attribute values.
+             *
+             *	@access private
+             *	@param string $attr Text containing tag attributes for parsing
+             *	@return array Associative array containing data on attribute and value
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function combAttributes($attr)
+            {
+                $attrarr  = array();
+                $mode     = 0;
+                $attrname = '';
+
+                # Loop through the whole attribute list
+
+                while (strlen($attr) != 0)
+                {
+                    # Was the last operation successful?
+                    $working = 0;
+
+                    switch ($mode)
+                    {
+                        case 0:	# attribute name, href for instance
+                            if (preg_match('/^([-a-zA-Z]+)/', $attr, $match))
+                            {
+                                $attrname = $match[1];
+                                $working = $mode = 1;
+                                $attr = preg_replace('/^[-a-zA-Z]+/', '', $attr);
+                            }
+                            break;
+                        case 1:	# equals sign or valueless ("selected")
+                            if (preg_match('/^\s*=\s*/', $attr)) # equals sign
+                            {
+                                $working = 1;
+                                $mode    = 2;
+                                $attr    = preg_replace('/^\s*=\s*/', '', $attr);
+                                break;
+                            }
+                            if (preg_match('/^\s+/', $attr)) # valueless
+                            {
+                                $working   = 1;
+                                $mode      = 0;
+                                $attrarr[] = array(
+                                    'name'  => $attrname,
+                                    'value' => '',
+                                    'whole' => $attrname,
+                                    'vless' => 'y'
+                                );
+                                $attr      = preg_replace('/^\s+/', '', $attr);
+                            }
+                            break;
+                        case 2: # attribute value, a URL after href= for instance
+                            if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) # "value"
+                            {
+                                $thisval   = $this->removeBadProtocols($match[1]);
+                                $attrarr[] = array(
+                                    'name'  => $attrname,
+                                    'value' => $thisval,
+                                    'whole' => $attrname . '="' . $thisval . '"',
+                                    'vless' => 'n'
+                                );
+                                $working   = 1;
+                                $mode      = 0;
+                                $attr      = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
+                                break;
+                            }
+                            if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) # 'value'
+                            {
+                                $thisval   = $this->removeBadProtocols($match[1]);
+                                $attrarr[] = array(
+                                    'name'  => $attrname,
+                                    'value' => $thisval,
+                                    'whole' => "$attrname='$thisval'",
+                                    'vless' => 'n'
+                                );
+                                $working   = 1;
+                                $mode      = 0;
+                                $attr      = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
+                                break;
+                            }
+                            if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) # value
+                            {
+                                $thisval   = $this->removeBadProtocols($match[1]);
+                                $attrarr[] = array(
+                                    'name'  => $attrname,
+                                    'value' => $thisval,
+                                    'whole' => $attrname . '="' . $thisval . '"',
+                                    'vless' => 'n'
+                                );
+                                # We add quotes to conform to W3C's HTML spec.
+                                $working   = 1;
+                                $mode      = 0;
+                                $attr      = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr);
+                            }
+                            break;
+                    }
+
+                    if ($working == 0) # not well formed, remove and try again
+                    {
+                        $attr = preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $attr);
+                        $mode = 0;
+                    }
+                }
+
+                # special case, for when the attribute list ends with a valueless
+                # attribute like "selected"
+                if ($mode == 1)
+                {
+                    $attrarr[] = array(
+                        'name'  => $attrname,
+                        'value' => '',
+                        'whole' => $attrname,
+                        'vless' => 'y'
+                    );
+                }
+
+                return $attrarr;
+            }
+
+            /**
+             *	This method removes disallowed protocols.
+             *
+             *	This method removes all non-allowed protocols from the beginning of
+             *	$string. It ignores whitespace and the case of the letters, and it does
+             *	understand HTML entities. It does its work in a while loop, so it won't be
+             *	fooled by a string like "javascript:javascript:alert(57)".
+             *
+             *	@access private
+             *	@param string $string String to check for protocols
+             *	@return string String with removed protocols
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function removeBadProtocols($string)
+            {
+                $string  = $this->RemoveNulls($string);
+                $string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature"
+                $string2 = $string . 'a';
+
+                $string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
+                if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
+                {
+                    $string = $this->filterProtocols($string2[0]).trim($string2[1]);
+                }
+                return $string;
+            }
+
+            /**
+             *	Helper method used by removeBadProtocols()
+             *
+             *	This function processes URL protocols, checks to see if they're in the white-
+             *	list or not, and returns different data depending on the answer.
+             *
+             *	@access private
+             *	@param string $string String to check for protocols
+             *	@return string String with removed protocols
+             *	@see removeBadProtocols()
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function filterProtocols($string)
+            {
+                $string = $this->decodeEntities($string);
+                $string = preg_replace('/\s/', '', $string);
+                $string = $this->removeNulls($string);
+                $string = preg_replace('/\xad+/', '', $string2); # deals with Opera "feature"
+                $string = strtolower($string);
+
+                if(is_array($this->allowed_protocols) && count($this->allowed_protocols) > 0)
+                {
+                    foreach ($this->allowed_protocols as $one_protocol)
+                    {
+                        if (strtolower($one_protocol) == $string)
+                        {
+                            return "$string:";
+                        }
+                    }
+                }
+
+                return '';
+            }
+
+            /**
+             *	Controller method for performing checks on attribute values.
+             *
+             *	This method calls the appropriate method as specified by $checkname with
+             *	the parameters $value, $vless, and $checkvalue, and returns the result
+             *	of the call.
+             *
+             *	This method's functionality can be expanded by creating new methods
+             *	that would match checkAttributeValue[$checkname].
+             *
+             *	Current checks implemented are: "maxlen", "minlen", "maxval", "minval" and "valueless"
+             *
+             *	@access private
+             *	@param string $value The value of the attribute to be checked.
+             *	@param string $vless Indicates whether the the value is supposed to be valueless
+             *	@param string $checkname The check to be performed
+             *	@param string $checkvalue The value that is to be checked against
+             *	@return bool Indicates whether the check passed or not
+             *	@since PHP5 OOP 1.0.0
+             */
+            private function checkAttributeValue($value, $vless, $checkname, $checkvalue)
+            {
+                $ok = true;
+                $check_attribute_method_name  = 'checkAttributeValue' . ucfirst(strtolower($checkname));
+                if(method_exists($this, $check_attribute_method_name))
+                {
+                    $ok = $this->$check_attribute_method_name($value, $checkvalue, $vless);
+                }
+
+                return $ok;
+            }
+
+            /**
+             *	Helper method invoked by checkAttributeValue().
+             *
+             *	The maxlen check makes sure that the attribute value has a length not
+             *	greater than the given value. This can be used to avoid Buffer Overflows
+             *	in WWW clients and various Internet servers.
+             *
+             *	@access private
+             *	@param string $value The value of the attribute to be checked.
+             *	@param int $checkvalue The maximum value allowed
+             *	@return bool Indicates whether the check passed or not
+             *	@see checkAttributeValue()
+             *	@since PHP5 OOP 1.0.0
+             */
+            private function checkAttributeValueMaxlen($value, $checkvalue)
+            {
+                if (strlen($value) > intval($checkvalue))
+                {
+                    return false;
+                }
+                return true;
+            }
+
+            /**
+             *	Helper method invoked by checkAttributeValue().
+             *
+             *	The minlen check makes sure that the attribute value has a length not
+             *	smaller than the given value.
+             *
+             *	@access private
+             *	@param string $value The value of the attribute to be checked.
+             *	@param int $checkvalue The minimum value allowed
+             *	@return bool Indicates whether the check passed or not
+             *	@see checkAttributeValue()
+             *	@since PHP5 OOP 1.0.0
+             */
+            private function checkAttributeValueMinlen($value, $checkvalue)
+            {
+                if (strlen($value) < intval($checkvalue))
+                {
+                    return false;
+                }
+                return true;
+            }
+
+            /**
+             *	Helper method invoked by checkAttributeValue().
+             *
+             *	The maxval check does two things: it checks that the attribute value is
+             *	an integer from 0 and up, without an excessive amount of zeroes or
+             *	whitespace (to avoid Buffer Overflows). It also checks that the attribute
+             *	value is not greater than the given value.
+             *
+             *	This check can be used to avoid Denial of Service attacks.
+             *
+             *	@access private
+             *	@param int $value The value of the attribute to be checked.
+             *	@param int $checkvalue The maximum numeric value allowed
+             *	@return bool Indicates whether the check passed or not
+             *	@see checkAttributeValue()
+             *	@since PHP5 OOP 1.0.0
+             */
+            private function checkAttributeValueMaxval($value, $checkvalue)
+            {
+                if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
+                {
+                    return false;
+                }
+                if (intval($value) > intval($checkvalue))
+                {
+                    return false;
+                }
+                return true;
+            }
+
+            /**
+             *	Helper method invoked by checkAttributeValue().
+             *
+             *	The minval check checks that the attribute value is a positive integer,
+             *	and that it is not smaller than the given value.
+             *
+             *	@access private
+             *	@param int $value The value of the attribute to be checked.
+             *	@param int $checkvalue The minimum numeric value allowed
+             *	@return bool Indicates whether the check passed or not
+             *	@see checkAttributeValue()
+             *	@since PHP5 OOP 1.0.0
+             */
+            private function checkAttributeValueMinval($value, $checkvalue)
+            {
+                if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
+                {
+                    return false;
+                }
+                if (intval($value) < ($checkvalue))
+                {
+                    return false;
+                }
+                return true;
+            }
+
+            /**
+             *	Helper method invoked by checkAttributeValue().
+             *
+             *	The valueless check checks if the attribute has a value
+             *	(like <a href="blah">) or not (<option selected>). If the given value
+             *	is a "y" or a "Y", the attribute must not have a value.
+             *
+             *	If the given value is an "n" or an "N", the attribute must have one.
+             *
+             *	@access private
+             *	@param int $value The value of the attribute to be checked.
+             *	@param mixed $checkvalue This variable is ignored for this test
+             *	@param string $vless Flag indicating if this attribute is not supposed to have an attribute
+             *	@return bool Indicates whether the check passed or not
+             *	@see checkAttributeValue()
+             *	@since PHP5 OOP 1.0.0
+             */
+            private function checkAttributeValueValueless($value, $checkvalue, $vless)
+            {
+                if (strtolower($checkvalue) != $vless)
+                {
+                    return false;
+                }
+                return true;
+            }
+
+            /**
+             *	Decodes numeric HTML entities
+             *
+             *	This method decodes numeric HTML entities (&#65; and &#x41;). It doesn't
+             *	do anything with other entities like &auml;, but we don't need them in the
+             *	URL protocol white listing system anyway.
+             *
+             *	@access private
+             *	@param string $value The entitiy to be decoded.
+             *	@return string Decoded entity
+             *	@since PHP4 OOP 0.0.1
+             */
+            private function decodeEntities($string)
+            {
+                $string = preg_replace('/&#([0-9]+);/e', 'chr("\\1")', $string);
+                $string = preg_replace('/&#[Xx]([0-9A-Fa-f]+);/e', 'chr(hexdec("\\1"))', $string);
+                return $string;
+            }
+
+            /**
+             *	Returns PHP5 OOP version # of kses.
+             *
+             *	Since this class has been refactored and documented and proven to work,
+             *	I'm fixing the version number at 1.0.0.
+             *
+             *	This version is syntax compatible with the PHP4 OOP version 0.0.2.  Future
+             *	versions may not be syntax compatible.
+             *
+             *	@access public
+             *	@return string Version number
+             *	@since PHP4 OOP 0.0.1
+             */
+            public function Version()
+            {
+                return 'PHP5 OOP 1.0.2';
+            }
+        }
+    }
 ?>
\ No newline at end of file

Spacing +44 added lines, -44 removed lines

@@ -50,7 +50,7 @@ 
 	*	@subpackage kses5
 	*/
 
-	if(substr(phpversion(), 0, 1) < 5)
+	if (substr(phpversion(), 0, 1) < 5)
 	{
 		die("Class kses requires PHP 5 or higher.");
 	}
@@ -58,7 +58,7 @@ 
 	/**
 	*	Only install KSES5 once
 	*/
-	if(!defined('KSES_CLASS_PHP5'))
+	if (!defined('KSES_CLASS_PHP5'))
 	{
 		define('KSES_CLASS_PHP5', true);
 
@@ -155,7 +155,7 @@ 
 				$string = preg_replace('%&\s*\{[^}]*(\}\s*;?|$)%', '', $string);
 				$string = $this->normalizeEntities($string);
 				$string = $this->filterKsesTextHook($string);
-				$string = preg_replace('%(<' . '[^>]*' . '(>|$)' . '|>)%e', "\$this->stripTags('\\1')", $string);
+				$string = preg_replace('%(<'.'[^>]*'.'(>|$)'.'|>)%e', "\$this->stripTags('\\1')", $string);
 				return $string;
 			}
 
@@ -177,7 +177,7 @@ 
 			public function AddProtocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					trigger_error("kses5::AddProtocols() did not receive an argument.", E_USER_WARNING);
 					return false;
@@ -185,15 +185,15 @@ 
 
 				$protocol_data = func_get_arg(0);
 
-				if(is_array($protocol_data) && count($protocol_data) > 0)
+				if (is_array($protocol_data) && count($protocol_data) > 0)
 				{
-					foreach($protocol_data as $protocol)
+					foreach ($protocol_data as $protocol)
 					{
 						$this->AddProtocol($protocol);
 					}
 					return true;
 				}
-				elseif(is_string($protocol_data))
+				elseif (is_string($protocol_data))
 				{
 					$this->AddProtocol($protocol_data);
 					return true;
@@ -216,7 +216,7 @@ 
 			public function Protocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					trigger_error("kses5::Protocols() did not receive an argument.", E_USER_WARNING);
 					return false;
@@ -239,27 +239,27 @@ 
 			 */
 			public function AddProtocol($protocol = "")
 			{
-				if(!is_string($protocol))
+				if (!is_string($protocol))
 				{
 					trigger_error("kses5::AddProtocol() requires a string.", E_USER_WARNING);
 					return false;
 				}
 
 				// Remove any inadvertent ':' at the end of the protocol.
-				if(substr($protocol, strlen($protocol) - 1, 1) == ":")
+				if (substr($protocol, strlen($protocol) - 1, 1) == ":")
 				{
 					$protocol = substr($protocol, 0, strlen($protocol) - 1);
 				}
 
 				$protocol = strtolower(trim($protocol));
-				if($protocol == "")
+				if ($protocol == "")
 				{
 					trigger_error("kses5::AddProtocol() tried to add an empty/NULL protocol.", E_USER_WARNING);
 					return false;
 				}
 
 				//	prevent duplicate protocols from being added.
-				if(!in_array($protocol, $this->allowed_protocols))
+				if (!in_array($protocol, $this->allowed_protocols))
 				{
 					array_push($this->allowed_protocols, $protocol);
 					sort($this->allowed_protocols);
@@ -281,27 +281,27 @@ 
 			 */
 			public function RemoveProtocol($protocol = "")
 			{
-				if(!is_string($protocol))
+				if (!is_string($protocol))
 				{
 					trigger_error("kses5::RemoveProtocol() requires a string.", E_USER_WARNING);
 					return false;
 				}
 
 				// Remove any inadvertent ':' at the end of the protocol.
-				if(substr($protocol, strlen($protocol) - 1, 1) == ":")
+				if (substr($protocol, strlen($protocol) - 1, 1) == ":")
 				{
 					$protocol = substr($protocol, 0, strlen($protocol) - 1);
 				}
 
 				$protocol = strtolower(trim($protocol));
-				if($protocol == "")
+				if ($protocol == "")
 				{
 					trigger_error("kses5::RemoveProtocol() tried to remove an empty/NULL protocol.", E_USER_WARNING);
 					return false;
 				}
 
 				//	Ensures that the protocol exists before removing it.
-				if(in_array($protocol, $this->allowed_protocols))
+				if (in_array($protocol, $this->allowed_protocols))
 				{
 					$this->allowed_protocols = array_diff($this->allowed_protocols, array($protocol));
 					sort($this->allowed_protocols);
@@ -328,21 +328,21 @@ 
 			public function RemoveProtocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					return false;
 				}
 
 				$protocol_data = func_get_arg(0);
 
-				if(is_array($protocol_data) && count($protocol_data) > 0)
+				if (is_array($protocol_data) && count($protocol_data) > 0)
 				{
-					foreach($protocol_data as $protocol)
+					foreach ($protocol_data as $protocol)
 					{
 						$this->RemoveProtocol($protocol);
 					}
 				}
-				elseif(is_string($protocol_data))
+				elseif (is_string($protocol_data))
 				{
 					$this->RemoveProtocol($protocol_data);
 					return true;
@@ -372,7 +372,7 @@ 
 			public function SetProtocols()
 			{
 				$c_args = func_num_args();
-				if($c_args != 1)
+				if ($c_args != 1)
 				{
 					trigger_error("kses5::SetProtocols() did not receive an argument.", E_USER_WARNING);
 					return false;
@@ -380,16 +380,16 @@ 
 
 				$protocol_data = func_get_arg(0);
 
-				if(is_array($protocol_data) && count($protocol_data) > 0)
+				if (is_array($protocol_data) && count($protocol_data) > 0)
 				{
 					$this->allowed_protocols = array();
-					foreach($protocol_data as $protocol)
+					foreach ($protocol_data as $protocol)
 					{
 						$this->AddProtocol($protocol);
 					}
 					return true;
 				}
-				elseif(is_string($protocol_data))
+				elseif (is_string($protocol_data))
 				{
 					$this->allowed_protocols = array();
 					$this->AddProtocol($protocol_data);
@@ -447,37 +447,37 @@ 
 			 */
 			public function AddHTML($tag = "", $attribs = array())
 			{
-				if(!is_string($tag))
+				if (!is_string($tag))
 				{
 					trigger_error("kses5::AddHTML() requires the tag to be a string", E_USER_WARNING);
 					return false;
 				}
 
 				$tag = strtolower(trim($tag));
-				if($tag == "")
+				if ($tag == "")
 				{
 					trigger_error("kses5::AddHTML() tried to add an empty/NULL tag", E_USER_WARNING);
 					return false;
 				}
 
-				if(!is_array($attribs))
+				if (!is_array($attribs))
 				{
 					trigger_error("kses5::AddHTML() requires an array (even an empty one) of attributes for '$tag'", E_USER_WARNING);
 					return false;
 				}
 
 				$new_attribs = array();
-				if(is_array($attribs) && count($attribs) > 0)
+				if (is_array($attribs) && count($attribs) > 0)
 				{
-					foreach($attribs as $idx1 => $val1)
+					foreach ($attribs as $idx1 => $val1)
 					{
 						$new_idx1 = strtolower($idx1);
 						$new_val1 = $attribs[$idx1];
 
-						if(is_array($new_val1) && count($attribs) > 0)
+						if (is_array($new_val1) && count($attribs) > 0)
 						{
 							$tmp_val = array();
-							foreach($new_val1 as $idx2 => $val2)
+							foreach ($new_val1 as $idx2 => $val2)
 							{
 								$new_idx2 = strtolower($idx2);
 								$tmp_val[$new_idx2] = $val2;
@@ -620,14 +620,14 @@ 
 			{
 				$out_array = array();
 
-				if(is_array($in_array) && count($in_array) > 0)
+				if (is_array($in_array) && count($in_array) > 0)
 				{
 					foreach ($in_array as $in_key => $in_val)
 					{
 						$out_key = strtolower($in_key);
 						$out_array[$out_key] = array();
 
-						if(is_array($in_val) && count($in_val) > 0)
+						if (is_array($in_val) && count($in_val) > 0)
 						{
 							foreach ($in_val as $in_key2 => $in_val2)
 							{
@@ -732,11 +732,11 @@ 
 				# Go through $attrarr, and save the allowed attributes for this element
 				# in $attr2
 				$attr2 = '';
-				if(is_array($attrarr) && count($attrarr) > 0)
+				if (is_array($attrarr) && count($attrarr) > 0)
 				{
 					foreach ($attrarr as $arreach)
 					{
-						if(!isset($this->allowed_html[strtolower($element)][strtolower($arreach['name'])]))
+						if (!isset($this->allowed_html[strtolower($element)][strtolower($arreach['name'])]))
 						{
 							continue;
 						}
@@ -752,7 +752,7 @@ 
 						{
 							# there are some checks
 							$ok = true;
-							if(is_array($current) && count($current) > 0)
+							if (is_array($current) && count($current) > 0)
 							{
 								foreach ($current as $currkey => $currval)
 								{
@@ -834,7 +834,7 @@ 
 									'whole' => $attrname,
 									'vless' => 'y'
 								);
-								$attr      = preg_replace('/^\s+/', '', $attr);
+								$attr = preg_replace('/^\s+/', '', $attr);
 							}
 							break;
 						case 2: # attribute value, a URL after href= for instance
@@ -844,7 +844,7 @@ 
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
-									'whole' => $attrname . '="' . $thisval . '"',
+									'whole' => $attrname.'="'.$thisval.'"',
 									'vless' => 'n'
 								);
 								$working   = 1;
@@ -872,7 +872,7 @@ 
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
-									'whole' => $attrname . '="' . $thisval . '"',
+									'whole' => $attrname.'="'.$thisval.'"',
 									'vless' => 'n'
 								);
 								# We add quotes to conform to W3C's HTML spec.
@@ -922,10 +922,10 @@ 
 			{
 				$string  = $this->RemoveNulls($string);
 				$string = preg_replace('/\xad+/', '', $string); # deals with Opera "feature"
-				$string2 = $string . 'a';
+				$string2 = $string.'a';
 
 				$string2 = preg_split('/:|&#58;|&#x3a;/i', $string, 2);
-				if(isset($string2[1]) && !preg_match('%/\?%',$string2[0]))
+				if (isset($string2[1]) && !preg_match('%/\?%', $string2[0]))
 				{
 					$string = $this->filterProtocols($string2[0]).trim($string2[1]);
 				}
@@ -952,7 +952,7 @@ 
 				$string = preg_replace('/\xad+/', '', $string2); # deals with Opera "feature"
 				$string = strtolower($string);
 
-				if(is_array($this->allowed_protocols) && count($this->allowed_protocols) > 0)
+				if (is_array($this->allowed_protocols) && count($this->allowed_protocols) > 0)
 				{
 					foreach ($this->allowed_protocols as $one_protocol)
 					{
@@ -989,8 +989,8 @@ 
 			private function checkAttributeValue($value, $vless, $checkname, $checkvalue)
 			{
 				$ok = true;
-				$check_attribute_method_name  = 'checkAttributeValue' . ucfirst(strtolower($checkname));
-				if(method_exists($this, $check_attribute_method_name))
+				$check_attribute_method_name = 'checkAttributeValue'.ucfirst(strtolower($checkname));
+				if (method_exists($this, $check_attribute_method_name))
 				{
 					$ok = $this->$check_attribute_method_name($value, $checkvalue, $vless);
 				}

Braces +25 added lines, -20 removed lines

@@ -192,13 +192,11 @@ 
 						$this->AddProtocol($protocol);
 					}
 					return true;
-				}
-				elseif(is_string($protocol_data))
+				} elseif(is_string($protocol_data))
 				{
 					$this->AddProtocol($protocol_data);
 					return true;
-				}
-				else
+				} else
 				{
 					trigger_error("kses5::AddProtocols() did not receive a string or an array.", E_USER_WARNING);
 					return false;
@@ -341,13 +339,11 @@ 
 					{
 						$this->RemoveProtocol($protocol);
 					}
-				}
-				elseif(is_string($protocol_data))
+				} elseif(is_string($protocol_data))
 				{
 					$this->RemoveProtocol($protocol_data);
 					return true;
-				}
-				else
+				} else
 				{
 					trigger_error("kses5::RemoveProtocols() did not receive a string or an array.", E_USER_WARNING);
 					return false;
@@ -388,14 +384,12 @@ 
 						$this->AddProtocol($protocol);
 					}
 					return true;
-				}
-				elseif(is_string($protocol_data))
+				} elseif(is_string($protocol_data))
 				{
 					$this->allowed_protocols = array();
 					$this->AddProtocol($protocol_data);
 					return true;
-				}
-				else
+				} else
 				{
 					trigger_error("kses5::SetProtocols() did not receive a string or an array.", E_USER_WARNING);
 					return false;
@@ -747,8 +741,7 @@ 
 						{
 							# there are no checks
 							$attr2 .= ' '.$arreach['whole'];
-						}
-						else
+						} else
 						{
 							# there are some checks
 							$ok = true;
@@ -817,16 +810,20 @@ 
 							}
 							break;
 						case 1:	# equals sign or valueless ("selected")
-							if (preg_match('/^\s*=\s*/', $attr)) # equals sign
+							if (preg_match('/^\s*=\s*/', $attr)) {
+							    # equals sign
 							{
 								$working = 1;
+							}
 								$mode    = 2;
 								$attr    = preg_replace('/^\s*=\s*/', '', $attr);
 								break;
 							}
-							if (preg_match('/^\s+/', $attr)) # valueless
+							if (preg_match('/^\s+/', $attr)) {
+							    # valueless
 							{
 								$working   = 1;
+							}
 								$mode      = 0;
 								$attrarr[] = array(
 									'name'  => $attrname,
@@ -838,9 +835,11 @@ 
 							}
 							break;
 						case 2: # attribute value, a URL after href= for instance
-							if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) # "value"
+							if (preg_match('/^"([^"]*)"(\s+|$)/', $attr, $match)) {
+							    # "value"
 							{
 								$thisval   = $this->removeBadProtocols($match[1]);
+							}
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
@@ -852,9 +851,11 @@ 
 								$attr      = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
 								break;
 							}
-							if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) # 'value'
+							if (preg_match("/^'([^']*)'(\s+|$)/", $attr, $match)) {
+							    # 'value'
 							{
 								$thisval   = $this->removeBadProtocols($match[1]);
+							}
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
@@ -866,9 +867,11 @@ 
 								$attr      = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
 								break;
 							}
-							if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) # value
+							if (preg_match("%^([^\s\"']+)(\s+|$)%", $attr, $match)) {
+							    # value
 							{
 								$thisval   = $this->removeBadProtocols($match[1]);
+							}
 								$attrarr[] = array(
 									'name'  => $attrname,
 									'value' => $thisval,
@@ -883,9 +886,11 @@ 
 							break;
 					}
 
-					if ($working == 0) # not well formed, remove and try again
+					if ($working == 0) {
+					    # not well formed, remove and try again
 					{
 						$attr = preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $attr);
+					}
 						$mode = 0;
 					}
 				}

main/inc/lib/kses-0.2.2/oop/test.oop.kses.php

Doc Comments +3 added lines

@@ -121,6 +121,9 @@
 		return $out;
 	}
 
+	/**
+	 * @param string $text
+	 */
 	function output_code_wrap($text)
 	{
 		if(KSESTEST_ENV == 'CLI')

Indentation +503 added lines, -503 removed lines

@@ -1,507 +1,507 @@
 <?php
 
-	//	This is a q&d program that shows some of the results of
-	//	running KSES.  If you have further questions, check the
-	//	current valid email address at http://chaos.org/contact/
-
-	//	Make sure we're in a usable PHP environment
-	if(substr(phpversion(), 0, 1) < 4)
-	{
-		define('KSESTEST_VER', 0);
-	}
-	elseif(substr(phpversion(), 0, 1) >= 5)
-	{
-		define('KSESTEST_VER', 5);
-	}
-	else
-	{
-		define('KSESTEST_VER', 4);
-	}
-
-	//	See if we're in command line or web
-	if($_SERVER["DOCUMENT_ROOT"] == "")
-	{
-		define('KSESTEST_ENV', 'CLI');
-	}
-	else
-	{
-		define('KSESTEST_ENV', 'WEB');
-	}
-
-	if(KSESTEST_VER == 0)
-	{
-		$message = array(
-			"Error: Not using a current version of PHP!",
-			"You are using PHP version " . phpversion() . ".",
-			"KSES Class version requires PHP4 or better.",
-			"KSES test program ending."
-			);
-
-		displayPage(
-			array("title" => "Error running KSES test", "message" => $message)
-		);
-
-		exit();
-	}
-
-	$include_file = "php" . KSESTEST_VER . ".class.kses.php";
-	if(file_exists($include_file) && is_readable($include_file))
-	{
-		include_once($include_file);
-	}
-	else
-	{
-		$message = array(
-			"Error:  Unable to find '" . $include_file . "'.",
-			"Please check your include path and make sure the file is available.",
-			"Path: " . ini_get('include_path')
-		);
-
-		displayPage(
-			array('title' => 'Unable to include ' . $include_file, 'message' => $message)
-		);
-
-		exit();
-	}
-
-	$kses_type = "kses" . KSESTEST_VER;
-	$myKses = new $kses_type;
-
-	$test_text = array();
-	$test_text = test1_protocols($myKses);
-	$test_text = array_merge($test_text, test1_html($myKses));
-	$test_text = array_merge($test_text, test1_kses($myKses));
-
-	displayPage(
-		array('title' => 'New Test', 'message' => $test_text)
-	);
-
-	function test1_kses(&$myKses)
-	{
-		$out = array(output_hr(), "Testing current configuration");
-
-		$test_tags = array(
-			'<a href="http://www.chaos.org/">www.chaos.org</a>',
-			'<a name="X">Short \'a name\' tag</a>',
-			'<td colspan="3" rowspan="5">Foo</td>',
-			'<td rowspan="2" class="mugwump" style="background-color: rgb(255, 204 204);">Bar</td>',
-			'<td nowrap>Very Long String running to 1000 characters...</td>',
-			'<td bgcolor="#00ff00" nowrap>Very Long String with a blue background</td>',
-			'<a href="proto1://www.foo.com">New protocol test</a>',
-			'<img src="proto2://www.foo.com" />',
-			'<a href="javascript:javascript:javascript:javascript:javascript:alert(\'Boo!\');">bleep</a>',
-			'<a href="proto4://abc.xyz.foo.com">Another new protocol</a>',
-			'<a href="proto9://foo.foo.foo.foo.foo.org/">Test of "proto9"</a>',
-			'<td width="75">Bar!</td>',
-			'<td width="200">Long Cell</td>'
-		);
-
-		$out_li = array();
-		// Keep only allowed HTML from the presumed 'form'.
-		foreach($test_tags as $tag)
-		{
-			$temp  = $myKses->Parse($tag);
-			$check = ($temp == $tag) ? true : false;
-			$text  = ($temp == $tag) ? 'pass' : 'fail';
-
-			$li_text  = output_testresult($check, $text) . output_newline();
-			$li_text .= "Input: &nbsp;" . output_translate($tag) . output_newline();
-			$li_text .= "Output: " . output_translate($temp);
-			if(KSESTEST_ENV == 'CLI')
-			{
-				$li_text .= output_newline();
-			}
-
-			array_push($out_li, output_code_wrap($li_text));
-		}
-
-		$out = array_merge($out, array(output_ul($out_li)));
-		array_push($out, output_hr());
-		array_push($out, "Testing is now finished.");
-		return $out;
-	}
-
-	function output_code_wrap($text)
-	{
-		if(KSESTEST_ENV == 'CLI')
-		{
-			return $text;
-		}
-		else
-		{
-			return "<code>\n$text<code>\n";
-		}
-	}
-
-	function output_translate($text)
-	{
-		if(KSESTEST_ENV == 'CLI')
-		{
-			return $text;
-		}
-		else
-		{
-			return htmlentities($text);
-		}
-	}
-
-	function output_testresult($pass = false, $text = "")
-	{
-		if(KSESTEST_ENV == 'CLI')
-		{
-			return '[' . $text . ']';
-		}
-		else
-		{
-			if($pass == true)
-			{
-				return '<span style="color: green;">[' . $text . ']</span>';
-			}
-			else
-			{
-				return '<span style="color: red;">[' . $text . ']</span>';
-			}
-		}
-	}
-
-	function output_spaces()
-	{
-		if(KSESTEST_ENV == 'WEB')
-		{
-			$out = "&nbsp;&nbsp;&nbsp;";
-		}
-		else
-		{
-			$out = "   ";
-		}
-
-		return $out;
-	}
-
-	function output_newline()
-	{
-		if(KSESTEST_ENV == 'WEB')
-		{
-			$out = "<br />\n";
-		}
-		else
-		{
-			$out = "\n";
-		}
-
-		return $out;
-	}
-
-	function displayPage($data = array())
-	{
-		$title   = ($data['title'] == '') ? 'No title' : $data['title'];
-		$message = ($data['message'] == '') ? array('No message') : $data['message'];
-
-		$out = "";
-
-		foreach($message as $text)
-		{
-			if(KSESTEST_ENV == 'WEB')
-			{
-				$header = "\t\t<h1>$title</h1>\n\t\t<hr />\n";
-				$out .= "\t\t<p>\n";
-				$out .= "\t\t\t$text\n";
-				$out .= "\t\t</p>\n";
-			}
-			else
-			{
-				$header = "$title\n" . str_repeat('-', 60) . "\n\n";
-				$out .= "\t$text\n\n";
-			}
-		}
-
-		if(KSESTEST_ENV == 'WEB')
-		{
-			echo "<html>\n";
-			echo "\t<head>\n";
-			echo "\t\t<title>$title</title>\n";
-			echo "\t</head>\n";
-			echo "\t<body>\n";
-			echo $header;
-			echo $out;
-			echo "\t</body>\n";
-			echo "</html>\n";
-		}
-		else
-		{
-			echo $header;
-			echo $out;
-		}
-	}
-
-	function output_hr()
-	{
-		if(KSESTEST_ENV == 'WEB')
-		{
-			return "\t\t\t<hr />\n";
-		}
-		else
-		{
-			return str_repeat(60, '-') . "\n";
-		}
-	}
-
-	function output_ul($data = array(), $padding = "")
-	{
-		if(!is_array($data) || count($data) < 1)
-		{
-			return "";
-		}
-
-		$text = "";
-		if(KSESTEST_ENV == 'WEB')
-		{
-			$text = "\t\t\t<ul>\n";
-			foreach($data as $li)
-			{
-				$text .= "\t\t\t\t<li>$li</li>\n";
-			}
-			$text .= "\t\t\t</ul>\n";
-		}
-		else
-		{
-			foreach($data as $li)
-			{
-				$text .= $padding . "   * $li\n";
-			}
-		}
-
-		return $text;
-	}
-
-	function test1_protocols(&$myKses)
-	{
-		$default_prots = $myKses->dumpProtocols();
-		$out_text = array();
-		if(count($default_prots) > 0)
-		{
-			array_push($out_text, "Initial protocols from KSES" . KSESTEST_VER . ":");
-			array_push($out_text, output_ul($default_prots));
-			array_push($out_text, output_hr());
-		}
-
-		$myKses->AddProtocols(array("proto1", "proto2:", "proto3"));   // Add a list of protocols
-		$myKses->AddProtocols("proto4:");  // Add a single protocol (Note ':' is optional at end)
-		$myKses->AddProtocol("proto9", "mystery:", "anarchy");
-		$myKses->AddProtocol("alpha", "beta", "gamma:");
-
-		$add_protocol  = "\t\t\t<ol>\n";
-		$add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocols(array("proto1", "proto2:", "proto3"));</li>' . "\n";
-		$add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocols("proto4:");</li>' . "\n";
-		$add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocols("proto4:");</li>' . "\n";
-		$add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocol("proto9", "mystery:", "anarchy");</li>' . "\n";
-		$add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocol("alpha", "beta", "gamma:");</li>' . "\n";
-		$add_protocol .= "\t\t\t</ol>\n";
-
-		array_push($out_text, $add_protocol);
-
-		$new_prots = $myKses->dumpProtocols();
-		if(count($new_prots) > 0)
-		{
-			array_push($out_text, "New protocols from KSES" . KSESTEST_VER . " after using AddProtocol(s):");
-			array_push($out_text, output_ul($new_prots));
-			array_push($out_text, output_hr());
-		}
-
-		$myKses->RemoveProtocols(array("mystery", "anarchy:"));
-		$myKses->RemoveProtocols("alpha:");
-		$myKses->RemoveProtocol("beta:");
-		$myKses->RemoveProtocol("gamma");
-
-		$remove_protocol  = "\t\t\t<ol>\n";
-		$remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocols(array("mystery", "anarchy:"));</li>' . "\n";
-		$remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocols("alpha:");</li>' . "\n";
-		$remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocol("beta:");</li>' . "\n";
-		$remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocol("gamma");</li>' . "\n";
-		$remove_protocol .= "\t\t\t</ol>\n";
-		array_push($out_text, $remove_protocol);
-
-		$new_prots = $myKses->dumpProtocols();
-		if(count($new_prots) > 0)
-		{
-			array_push($out_text, "Resulting protocols from KSES" . KSESTEST_VER . " after using RemoveProtocol(s):");
-			array_push($out_text, output_ul($new_prots));
-			array_push($out_text, output_hr());
-		}
-
-		$myKses->SetProtocols(array("https", "gopher", "news"));
-		$set_protocol  = "\t\t\t<ol>\n";
-		$set_protocol .= "\t\t\t\t" . '<li>$myKses->SetProtocols(array("https", "gopher", "news"));</li>' . "\n";
-		$set_protocol .= "\t\t\t</ol>\n";
-		array_push($out_text, $set_protocol);
-
-		$new_prots = $myKses->dumpProtocols();
-		if(count($new_prots) > 0)
-		{
-			array_push($out_text, "Resulting protocols from KSES" . KSESTEST_VER . " after using SetProtocols:");
-			array_push($out_text, output_ul($new_prots));
-			array_push($out_text, output_hr());
-		}
-
-		//	Invisible reset
-		$myKses->SetProtocols(array("http", "proto1", "proto2", "proto9"));
-
-		return $out_text;
-	}
-
-	function test1_html(&$myKses)
-	{
-		$out = array();
-
-		//	Allows <p>|</p> tag
-		$myKses->AddHTML("p");
-
-		//	Allows 'a' tag with href|name attributes,
-		//	href has minlen of 10 chars, and maxlen of 25 chars
-		//	name has minlen of  2 chars
-		$myKses->AddHTML(
-			"a",
-			array(
-				"href" => array('maxlen' => 25, 'minlen' => 10),
-				"name" => array('minlen' => 2)
-			)
-		);
-
-		//	Allows 'td' tag with colspan|rowspan|class|style|width|nowrap attributes,
-		//		colspan has minval of   2       and maxval of 5
-		//		rowspan has minval of   3       and maxval of 6
-		//		class   has minlen of   1 char  and maxlen of   10 chars
-		//		style   has minlen of  10 chars and maxlen of 100 chars
-		//		width   has maxval of 100
-		//		nowrap  is valueless
-		$myKses->AddHTML(
-			"td",
-			array(
-				"colspan" => array('minval' =>   2, 'maxval' =>   5),
-				"rowspan" => array('minval' =>   3, 'maxval' =>   6),
-				"class"   => array("minlen" =>   1, 'maxlen' =>  10),
-				"width"   => array("maxval" => 100),
-				"style"   => array('minlen' =>  10, 'maxlen' => 100),
-				"nowrap"  => array('valueless' => 'y')
-			)
-		);
-
-		array_push($out, "Modifying HTML Tests:");
-		$code_text  = "<pre>\n";
-		$code_text .= "      //   Allows &lt;p&gt;|&lt;/p&gt; tag\n";
-		$code_text .= "      \$myKses-&gt;AddHTML(\"p\");\n";
-		$code_text .= "\n";
-		$code_text .= "      //   Allows 'a' tag with href|name attributes,\n";
-		$code_text .= "      //   href has minlen of 10 chars, and maxlen of 25 chars\n";
-		$code_text .= "      //   name has minlen of  2 chars\n";
-		$code_text .= "      \$myKses-&gt;AddHTML(\n";
-		$code_text .= "         \"a\",\n";
-		$code_text .= "         array(\n";
-		$code_text .= "            \"href\" =&gt; array('maxlen' =&gt; 25, 'minlen' =&gt; 10),\n";
-		$code_text .= "            \"name\" =&gt; array('minlen' =&gt; 2)\n";
-		$code_text .= "         )\n";
-		$code_text .= "      );\n";
-		$code_text .= "\n";
-		$code_text .= "      //   Allows 'td' tag with colspan|rowspan|class|style|width|nowrap attributes,\n";
-		$code_text .= "      //      colspan has minval of   2       and maxval of 5\n";
-		$code_text .= "      //      rowspan has minval of   3       and maxval of 6\n";
-		$code_text .= "      //      class   has minlen of   1 char  and maxlen of   10 chars\n";
-		$code_text .= "      //      style   has minlen of  10 chars and maxlen of 100 chars\n";
-		$code_text .= "      //      width   has maxval of 100\n";
-		$code_text .= "      //      nowrap  is valueless\n";
-		$code_text .= "      \$myKses-&gt;AddHTML(\n";
-		$code_text .= "         \"td\",\n";
-		$code_text .= "         array(\n";
-		$code_text .= "            \"colspan\" =&gt; array('minval' =&gt;   2, 'maxval' =&gt;   5),\n";
-		$code_text .= "            \"rowspan\" =&gt; array('minval' =&gt;   3, 'maxval' =&gt;   6),\n";
-		$code_text .= "            \"class\"   =&gt; array(\"minlen\" =&gt;   1, 'maxlen' =&gt;  10),\n";
-		$code_text .= "            \"width\"   =&gt; array(\"maxval\" =&gt; 100),\n";
-		$code_text .= "            \"style\"   =&gt; array('minlen' =&gt;  10, 'maxlen' =&gt; 100),\n";
-		$code_text .= "            \"nowrap\"  =&gt; array('valueless' =&gt; 'y')\n";
-		$code_text .= "         )\n";
-		$code_text .= "      );\n";
-		$code_text .= "</pre>\n";
-
-		array_push($out, $code_text);
-		array_push($out, output_hr());
-		array_push($out, "Net results:");
-
-		$out_elems = $myKses->DumpElements();
-		if(count($out_elems) > 0)
-		{
-			//array_push($out, "\t\t\t<ul>\n");
-			foreach($out_elems as $tag => $attr_data)
-			{
-				$out_li_elems = array();
-				$elem_text = "(X)HTML element $tag";
-				$allow = "";
-				if(isset($attr_data) && is_array($attr_data) && count($attr_data) > 0)
-				{
-					$allow = " allows attribute";
-					if(count($attr_data) > 1)
-					{
-						$allow .= "s";
-					}
-					$allow .= ":\n";
-				}
-
-				array_push($out_li_elems, "$elem_text$allow");
-
-				$attr_test_li = array();
-				if(isset($attr_data) && is_array($attr_data) && count($attr_data) > 0)
-				{
-					foreach($attr_data as $attr_name => $attr_tests)
-					{
-						$li_text = $attr_name;
-						if(isset($attr_tests) && count($attr_tests) > 0)
-						{
-							foreach($attr_tests as $test_name => $test_val)
-							{
-								switch($test_name)
-								{
-									case "maxlen":
-										$li_text .= " - maximum length of '" . $test_val . "' characters";
-										break;
-									case "minlen":
-										$li_text .= " - minimum length of '" . $test_val . "' characters";
-										break;
-									case "minval":
-										$li_text .= " - minimum value of '" . $test_val . "'";
-										break;
-									case "maxval":
-										$li_text .= " - maximum value of '" . $test_val . "'";
-										break;
-									case "valueless":
-										switch(strtolower($test_val))
-										{
-											case 'n':
-												$li_text .= " - must not be valueless";
-												break;
-											case 'y':
-												$li_text .= " - must be valueless";
-												break;
-											default:
-												break;
-										}
-										break;
-									default:
-										break;
-								}
-							}
-						}
-						array_push($attr_test_li, $li_text);
-					}
-					if(count($attr_test_li) > 0)
-					{
-						$attr_test_li = output_ul($attr_test_li, "   ");
-						$out_li_elems = array("$elem_text$allow$attr_test_li");
-					}
-				}
-				$out = array_merge($out, $out_li_elems);
-			}
-		}
-
-		return $out;
-	}
+    //	This is a q&d program that shows some of the results of
+    //	running KSES.  If you have further questions, check the
+    //	current valid email address at http://chaos.org/contact/
+
+    //	Make sure we're in a usable PHP environment
+    if(substr(phpversion(), 0, 1) < 4)
+    {
+        define('KSESTEST_VER', 0);
+    }
+    elseif(substr(phpversion(), 0, 1) >= 5)
+    {
+        define('KSESTEST_VER', 5);
+    }
+    else
+    {
+        define('KSESTEST_VER', 4);
+    }
+
+    //	See if we're in command line or web
+    if($_SERVER["DOCUMENT_ROOT"] == "")
+    {
+        define('KSESTEST_ENV', 'CLI');
+    }
+    else
+    {
+        define('KSESTEST_ENV', 'WEB');
+    }
+
+    if(KSESTEST_VER == 0)
+    {
+        $message = array(
+            "Error: Not using a current version of PHP!",
+            "You are using PHP version " . phpversion() . ".",
+            "KSES Class version requires PHP4 or better.",
+            "KSES test program ending."
+            );
+
+        displayPage(
+            array("title" => "Error running KSES test", "message" => $message)
+        );
+
+        exit();
+    }
+
+    $include_file = "php" . KSESTEST_VER . ".class.kses.php";
+    if(file_exists($include_file) && is_readable($include_file))
+    {
+        include_once($include_file);
+    }
+    else
+    {
+        $message = array(
+            "Error:  Unable to find '" . $include_file . "'.",
+            "Please check your include path and make sure the file is available.",
+            "Path: " . ini_get('include_path')
+        );
+
+        displayPage(
+            array('title' => 'Unable to include ' . $include_file, 'message' => $message)
+        );
+
+        exit();
+    }
+
+    $kses_type = "kses" . KSESTEST_VER;
+    $myKses = new $kses_type;
+
+    $test_text = array();
+    $test_text = test1_protocols($myKses);
+    $test_text = array_merge($test_text, test1_html($myKses));
+    $test_text = array_merge($test_text, test1_kses($myKses));
+
+    displayPage(
+        array('title' => 'New Test', 'message' => $test_text)
+    );
+
+    function test1_kses(&$myKses)
+    {
+        $out = array(output_hr(), "Testing current configuration");
+
+        $test_tags = array(
+            '<a href="http://www.chaos.org/">www.chaos.org</a>',
+            '<a name="X">Short \'a name\' tag</a>',
+            '<td colspan="3" rowspan="5">Foo</td>',
+            '<td rowspan="2" class="mugwump" style="background-color: rgb(255, 204 204);">Bar</td>',
+            '<td nowrap>Very Long String running to 1000 characters...</td>',
+            '<td bgcolor="#00ff00" nowrap>Very Long String with a blue background</td>',
+            '<a href="proto1://www.foo.com">New protocol test</a>',
+            '<img src="proto2://www.foo.com" />',
+            '<a href="javascript:javascript:javascript:javascript:javascript:alert(\'Boo!\');">bleep</a>',
+            '<a href="proto4://abc.xyz.foo.com">Another new protocol</a>',
+            '<a href="proto9://foo.foo.foo.foo.foo.org/">Test of "proto9"</a>',
+            '<td width="75">Bar!</td>',
+            '<td width="200">Long Cell</td>'
+        );
+
+        $out_li = array();
+        // Keep only allowed HTML from the presumed 'form'.
+        foreach($test_tags as $tag)
+        {
+            $temp  = $myKses->Parse($tag);
+            $check = ($temp == $tag) ? true : false;
+            $text  = ($temp == $tag) ? 'pass' : 'fail';
+
+            $li_text  = output_testresult($check, $text) . output_newline();
+            $li_text .= "Input: &nbsp;" . output_translate($tag) . output_newline();
+            $li_text .= "Output: " . output_translate($temp);
+            if(KSESTEST_ENV == 'CLI')
+            {
+                $li_text .= output_newline();
+            }
+
+            array_push($out_li, output_code_wrap($li_text));
+        }
+
+        $out = array_merge($out, array(output_ul($out_li)));
+        array_push($out, output_hr());
+        array_push($out, "Testing is now finished.");
+        return $out;
+    }
+
+    function output_code_wrap($text)
+    {
+        if(KSESTEST_ENV == 'CLI')
+        {
+            return $text;
+        }
+        else
+        {
+            return "<code>\n$text<code>\n";
+        }
+    }
+
+    function output_translate($text)
+    {
+        if(KSESTEST_ENV == 'CLI')
+        {
+            return $text;
+        }
+        else
+        {
+            return htmlentities($text);
+        }
+    }
+
+    function output_testresult($pass = false, $text = "")
+    {
+        if(KSESTEST_ENV == 'CLI')
+        {
+            return '[' . $text . ']';
+        }
+        else
+        {
+            if($pass == true)
+            {
+                return '<span style="color: green;">[' . $text . ']</span>';
+            }
+            else
+            {
+                return '<span style="color: red;">[' . $text . ']</span>';
+            }
+        }
+    }
+
+    function output_spaces()
+    {
+        if(KSESTEST_ENV == 'WEB')
+        {
+            $out = "&nbsp;&nbsp;&nbsp;";
+        }
+        else
+        {
+            $out = "   ";
+        }
+
+        return $out;
+    }
+
+    function output_newline()
+    {
+        if(KSESTEST_ENV == 'WEB')
+        {
+            $out = "<br />\n";
+        }
+        else
+        {
+            $out = "\n";
+        }
+
+        return $out;
+    }
+
+    function displayPage($data = array())
+    {
+        $title   = ($data['title'] == '') ? 'No title' : $data['title'];
+        $message = ($data['message'] == '') ? array('No message') : $data['message'];
+
+        $out = "";
+
+        foreach($message as $text)
+        {
+            if(KSESTEST_ENV == 'WEB')
+            {
+                $header = "\t\t<h1>$title</h1>\n\t\t<hr />\n";
+                $out .= "\t\t<p>\n";
+                $out .= "\t\t\t$text\n";
+                $out .= "\t\t</p>\n";
+            }
+            else
+            {
+                $header = "$title\n" . str_repeat('-', 60) . "\n\n";
+                $out .= "\t$text\n\n";
+            }
+        }
+
+        if(KSESTEST_ENV == 'WEB')
+        {
+            echo "<html>\n";
+            echo "\t<head>\n";
+            echo "\t\t<title>$title</title>\n";
+            echo "\t</head>\n";
+            echo "\t<body>\n";
+            echo $header;
+            echo $out;
+            echo "\t</body>\n";
+            echo "</html>\n";
+        }
+        else
+        {
+            echo $header;
+            echo $out;
+        }
+    }
+
+    function output_hr()
+    {
+        if(KSESTEST_ENV == 'WEB')
+        {
+            return "\t\t\t<hr />\n";
+        }
+        else
+        {
+            return str_repeat(60, '-') . "\n";
+        }
+    }
+
+    function output_ul($data = array(), $padding = "")
+    {
+        if(!is_array($data) || count($data) < 1)
+        {
+            return "";
+        }
+
+        $text = "";
+        if(KSESTEST_ENV == 'WEB')
+        {
+            $text = "\t\t\t<ul>\n";
+            foreach($data as $li)
+            {
+                $text .= "\t\t\t\t<li>$li</li>\n";
+            }
+            $text .= "\t\t\t</ul>\n";
+        }
+        else
+        {
+            foreach($data as $li)
+            {
+                $text .= $padding . "   * $li\n";
+            }
+        }
+
+        return $text;
+    }
+
+    function test1_protocols(&$myKses)
+    {
+        $default_prots = $myKses->dumpProtocols();
+        $out_text = array();
+        if(count($default_prots) > 0)
+        {
+            array_push($out_text, "Initial protocols from KSES" . KSESTEST_VER . ":");
+            array_push($out_text, output_ul($default_prots));
+            array_push($out_text, output_hr());
+        }
+
+        $myKses->AddProtocols(array("proto1", "proto2:", "proto3"));   // Add a list of protocols
+        $myKses->AddProtocols("proto4:");  // Add a single protocol (Note ':' is optional at end)
+        $myKses->AddProtocol("proto9", "mystery:", "anarchy");
+        $myKses->AddProtocol("alpha", "beta", "gamma:");
+
+        $add_protocol  = "\t\t\t<ol>\n";
+        $add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocols(array("proto1", "proto2:", "proto3"));</li>' . "\n";
+        $add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocols("proto4:");</li>' . "\n";
+        $add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocols("proto4:");</li>' . "\n";
+        $add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocol("proto9", "mystery:", "anarchy");</li>' . "\n";
+        $add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocol("alpha", "beta", "gamma:");</li>' . "\n";
+        $add_protocol .= "\t\t\t</ol>\n";
+
+        array_push($out_text, $add_protocol);
+
+        $new_prots = $myKses->dumpProtocols();
+        if(count($new_prots) > 0)
+        {
+            array_push($out_text, "New protocols from KSES" . KSESTEST_VER . " after using AddProtocol(s):");
+            array_push($out_text, output_ul($new_prots));
+            array_push($out_text, output_hr());
+        }
+
+        $myKses->RemoveProtocols(array("mystery", "anarchy:"));
+        $myKses->RemoveProtocols("alpha:");
+        $myKses->RemoveProtocol("beta:");
+        $myKses->RemoveProtocol("gamma");
+
+        $remove_protocol  = "\t\t\t<ol>\n";
+        $remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocols(array("mystery", "anarchy:"));</li>' . "\n";
+        $remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocols("alpha:");</li>' . "\n";
+        $remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocol("beta:");</li>' . "\n";
+        $remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocol("gamma");</li>' . "\n";
+        $remove_protocol .= "\t\t\t</ol>\n";
+        array_push($out_text, $remove_protocol);
+
+        $new_prots = $myKses->dumpProtocols();
+        if(count($new_prots) > 0)
+        {
+            array_push($out_text, "Resulting protocols from KSES" . KSESTEST_VER . " after using RemoveProtocol(s):");
+            array_push($out_text, output_ul($new_prots));
+            array_push($out_text, output_hr());
+        }
+
+        $myKses->SetProtocols(array("https", "gopher", "news"));
+        $set_protocol  = "\t\t\t<ol>\n";
+        $set_protocol .= "\t\t\t\t" . '<li>$myKses->SetProtocols(array("https", "gopher", "news"));</li>' . "\n";
+        $set_protocol .= "\t\t\t</ol>\n";
+        array_push($out_text, $set_protocol);
+
+        $new_prots = $myKses->dumpProtocols();
+        if(count($new_prots) > 0)
+        {
+            array_push($out_text, "Resulting protocols from KSES" . KSESTEST_VER . " after using SetProtocols:");
+            array_push($out_text, output_ul($new_prots));
+            array_push($out_text, output_hr());
+        }
+
+        //	Invisible reset
+        $myKses->SetProtocols(array("http", "proto1", "proto2", "proto9"));
+
+        return $out_text;
+    }
+
+    function test1_html(&$myKses)
+    {
+        $out = array();
+
+        //	Allows <p>|</p> tag
+        $myKses->AddHTML("p");
+
+        //	Allows 'a' tag with href|name attributes,
+        //	href has minlen of 10 chars, and maxlen of 25 chars
+        //	name has minlen of  2 chars
+        $myKses->AddHTML(
+            "a",
+            array(
+                "href" => array('maxlen' => 25, 'minlen' => 10),
+                "name" => array('minlen' => 2)
+            )
+        );
+
+        //	Allows 'td' tag with colspan|rowspan|class|style|width|nowrap attributes,
+        //		colspan has minval of   2       and maxval of 5
+        //		rowspan has minval of   3       and maxval of 6
+        //		class   has minlen of   1 char  and maxlen of   10 chars
+        //		style   has minlen of  10 chars and maxlen of 100 chars
+        //		width   has maxval of 100
+        //		nowrap  is valueless
+        $myKses->AddHTML(
+            "td",
+            array(
+                "colspan" => array('minval' =>   2, 'maxval' =>   5),
+                "rowspan" => array('minval' =>   3, 'maxval' =>   6),
+                "class"   => array("minlen" =>   1, 'maxlen' =>  10),
+                "width"   => array("maxval" => 100),
+                "style"   => array('minlen' =>  10, 'maxlen' => 100),
+                "nowrap"  => array('valueless' => 'y')
+            )
+        );
+
+        array_push($out, "Modifying HTML Tests:");
+        $code_text  = "<pre>\n";
+        $code_text .= "      //   Allows &lt;p&gt;|&lt;/p&gt; tag\n";
+        $code_text .= "      \$myKses-&gt;AddHTML(\"p\");\n";
+        $code_text .= "\n";
+        $code_text .= "      //   Allows 'a' tag with href|name attributes,\n";
+        $code_text .= "      //   href has minlen of 10 chars, and maxlen of 25 chars\n";
+        $code_text .= "      //   name has minlen of  2 chars\n";
+        $code_text .= "      \$myKses-&gt;AddHTML(\n";
+        $code_text .= "         \"a\",\n";
+        $code_text .= "         array(\n";
+        $code_text .= "            \"href\" =&gt; array('maxlen' =&gt; 25, 'minlen' =&gt; 10),\n";
+        $code_text .= "            \"name\" =&gt; array('minlen' =&gt; 2)\n";
+        $code_text .= "         )\n";
+        $code_text .= "      );\n";
+        $code_text .= "\n";
+        $code_text .= "      //   Allows 'td' tag with colspan|rowspan|class|style|width|nowrap attributes,\n";
+        $code_text .= "      //      colspan has minval of   2       and maxval of 5\n";
+        $code_text .= "      //      rowspan has minval of   3       and maxval of 6\n";
+        $code_text .= "      //      class   has minlen of   1 char  and maxlen of   10 chars\n";
+        $code_text .= "      //      style   has minlen of  10 chars and maxlen of 100 chars\n";
+        $code_text .= "      //      width   has maxval of 100\n";
+        $code_text .= "      //      nowrap  is valueless\n";
+        $code_text .= "      \$myKses-&gt;AddHTML(\n";
+        $code_text .= "         \"td\",\n";
+        $code_text .= "         array(\n";
+        $code_text .= "            \"colspan\" =&gt; array('minval' =&gt;   2, 'maxval' =&gt;   5),\n";
+        $code_text .= "            \"rowspan\" =&gt; array('minval' =&gt;   3, 'maxval' =&gt;   6),\n";
+        $code_text .= "            \"class\"   =&gt; array(\"minlen\" =&gt;   1, 'maxlen' =&gt;  10),\n";
+        $code_text .= "            \"width\"   =&gt; array(\"maxval\" =&gt; 100),\n";
+        $code_text .= "            \"style\"   =&gt; array('minlen' =&gt;  10, 'maxlen' =&gt; 100),\n";
+        $code_text .= "            \"nowrap\"  =&gt; array('valueless' =&gt; 'y')\n";
+        $code_text .= "         )\n";
+        $code_text .= "      );\n";
+        $code_text .= "</pre>\n";
+
+        array_push($out, $code_text);
+        array_push($out, output_hr());
+        array_push($out, "Net results:");
+
+        $out_elems = $myKses->DumpElements();
+        if(count($out_elems) > 0)
+        {
+            //array_push($out, "\t\t\t<ul>\n");
+            foreach($out_elems as $tag => $attr_data)
+            {
+                $out_li_elems = array();
+                $elem_text = "(X)HTML element $tag";
+                $allow = "";
+                if(isset($attr_data) && is_array($attr_data) && count($attr_data) > 0)
+                {
+                    $allow = " allows attribute";
+                    if(count($attr_data) > 1)
+                    {
+                        $allow .= "s";
+                    }
+                    $allow .= ":\n";
+                }
+
+                array_push($out_li_elems, "$elem_text$allow");
+
+                $attr_test_li = array();
+                if(isset($attr_data) && is_array($attr_data) && count($attr_data) > 0)
+                {
+                    foreach($attr_data as $attr_name => $attr_tests)
+                    {
+                        $li_text = $attr_name;
+                        if(isset($attr_tests) && count($attr_tests) > 0)
+                        {
+                            foreach($attr_tests as $test_name => $test_val)
+                            {
+                                switch($test_name)
+                                {
+                                    case "maxlen":
+                                        $li_text .= " - maximum length of '" . $test_val . "' characters";
+                                        break;
+                                    case "minlen":
+                                        $li_text .= " - minimum length of '" . $test_val . "' characters";
+                                        break;
+                                    case "minval":
+                                        $li_text .= " - minimum value of '" . $test_val . "'";
+                                        break;
+                                    case "maxval":
+                                        $li_text .= " - maximum value of '" . $test_val . "'";
+                                        break;
+                                    case "valueless":
+                                        switch(strtolower($test_val))
+                                        {
+                                            case 'n':
+                                                $li_text .= " - must not be valueless";
+                                                break;
+                                            case 'y':
+                                                $li_text .= " - must be valueless";
+                                                break;
+                                            default:
+                                                break;
+                                        }
+                                        break;
+                                    default:
+                                        break;
+                                }
+                            }
+                        }
+                        array_push($attr_test_li, $li_text);
+                    }
+                    if(count($attr_test_li) > 0)
+                    {
+                        $attr_test_li = output_ul($attr_test_li, "   ");
+                        $out_li_elems = array("$elem_text$allow$attr_test_li");
+                    }
+                }
+                $out = array_merge($out, $out_li_elems);
+            }
+        }
+
+        return $out;
+    }
 
 ?>
\ No newline at end of file

Spacing +71 added lines, -71 removed lines

@@ -5,11 +5,11 @@ 
 	//	current valid email address at http://chaos.org/contact/
 
 	//	Make sure we're in a usable PHP environment
-	if(substr(phpversion(), 0, 1) < 4)
+	if (substr(phpversion(), 0, 1) < 4)
 	{
 		define('KSESTEST_VER', 0);
 	}
-	elseif(substr(phpversion(), 0, 1) >= 5)
+	elseif (substr(phpversion(), 0, 1) >= 5)
 	{
 		define('KSESTEST_VER', 5);
 	}
@@ -19,7 +19,7 @@ 
 	}
 
 	//	See if we're in command line or web
-	if($_SERVER["DOCUMENT_ROOT"] == "")
+	if ($_SERVER["DOCUMENT_ROOT"] == "")
 	{
 		define('KSESTEST_ENV', 'CLI');
 	}
@@ -28,11 +28,11 @@ 
 		define('KSESTEST_ENV', 'WEB');
 	}
 
-	if(KSESTEST_VER == 0)
+	if (KSESTEST_VER == 0)
 	{
 		$message = array(
 			"Error: Not using a current version of PHP!",
-			"You are using PHP version " . phpversion() . ".",
+			"You are using PHP version ".phpversion().".",
 			"KSES Class version requires PHP4 or better.",
 			"KSES test program ending."
 			);
@@ -44,27 +44,27 @@ 
 		exit();
 	}
 
-	$include_file = "php" . KSESTEST_VER . ".class.kses.php";
-	if(file_exists($include_file) && is_readable($include_file))
+	$include_file = "php".KSESTEST_VER.".class.kses.php";
+	if (file_exists($include_file) && is_readable($include_file))
 	{
 		include_once($include_file);
 	}
 	else
 	{
 		$message = array(
-			"Error:  Unable to find '" . $include_file . "'.",
+			"Error:  Unable to find '".$include_file."'.",
 			"Please check your include path and make sure the file is available.",
-			"Path: " . ini_get('include_path')
+			"Path: ".ini_get('include_path')
 		);
 
 		displayPage(
-			array('title' => 'Unable to include ' . $include_file, 'message' => $message)
+			array('title' => 'Unable to include '.$include_file, 'message' => $message)
 		);
 
 		exit();
 	}
 
-	$kses_type = "kses" . KSESTEST_VER;
+	$kses_type = "kses".KSESTEST_VER;
 	$myKses = new $kses_type;
 
 	$test_text = array();
@@ -98,16 +98,16 @@ 
 
 		$out_li = array();
 		// Keep only allowed HTML from the presumed 'form'.
-		foreach($test_tags as $tag)
+		foreach ($test_tags as $tag)
 		{
 			$temp  = $myKses->Parse($tag);
 			$check = ($temp == $tag) ? true : false;
 			$text  = ($temp == $tag) ? 'pass' : 'fail';
 
-			$li_text  = output_testresult($check, $text) . output_newline();
-			$li_text .= "Input: &nbsp;" . output_translate($tag) . output_newline();
-			$li_text .= "Output: " . output_translate($temp);
-			if(KSESTEST_ENV == 'CLI')
+			$li_text  = output_testresult($check, $text).output_newline();
+			$li_text .= "Input: &nbsp;".output_translate($tag).output_newline();
+			$li_text .= "Output: ".output_translate($temp);
+			if (KSESTEST_ENV == 'CLI')
 			{
 				$li_text .= output_newline();
 			}
@@ -123,7 +123,7 @@ 
 
 	function output_code_wrap($text)
 	{
-		if(KSESTEST_ENV == 'CLI')
+		if (KSESTEST_ENV == 'CLI')
 		{
 			return $text;
 		}
@@ -135,7 +135,7 @@ 
 
 	function output_translate($text)
 	{
-		if(KSESTEST_ENV == 'CLI')
+		if (KSESTEST_ENV == 'CLI')
 		{
 			return $text;
 		}
@@ -147,26 +147,26 @@ 
 
 	function output_testresult($pass = false, $text = "")
 	{
-		if(KSESTEST_ENV == 'CLI')
+		if (KSESTEST_ENV == 'CLI')
 		{
-			return '[' . $text . ']';
+			return '['.$text.']';
 		}
 		else
 		{
-			if($pass == true)
+			if ($pass == true)
 			{
-				return '<span style="color: green;">[' . $text . ']</span>';
+				return '<span style="color: green;">['.$text.']</span>';
 			}
 			else
 			{
-				return '<span style="color: red;">[' . $text . ']</span>';
+				return '<span style="color: red;">['.$text.']</span>';
 			}
 		}
 	}
 
 	function output_spaces()
 	{
-		if(KSESTEST_ENV == 'WEB')
+		if (KSESTEST_ENV == 'WEB')
 		{
 			$out = "&nbsp;&nbsp;&nbsp;";
 		}
@@ -180,7 +180,7 @@ 
 
 	function output_newline()
 	{
-		if(KSESTEST_ENV == 'WEB')
+		if (KSESTEST_ENV == 'WEB')
 		{
 			$out = "<br />\n";
 		}
@@ -199,9 +199,9 @@ 
 
 		$out = "";
 
-		foreach($message as $text)
+		foreach ($message as $text)
 		{
-			if(KSESTEST_ENV == 'WEB')
+			if (KSESTEST_ENV == 'WEB')
 			{
 				$header = "\t\t<h1>$title</h1>\n\t\t<hr />\n";
 				$out .= "\t\t<p>\n";
@@ -210,12 +210,12 @@ 
 			}
 			else
 			{
-				$header = "$title\n" . str_repeat('-', 60) . "\n\n";
+				$header = "$title\n".str_repeat('-', 60)."\n\n";
 				$out .= "\t$text\n\n";
 			}
 		}
 
-		if(KSESTEST_ENV == 'WEB')
+		if (KSESTEST_ENV == 'WEB')
 		{
 			echo "<html>\n";
 			echo "\t<head>\n";
@@ -236,28 +236,28 @@ 
 
 	function output_hr()
 	{
-		if(KSESTEST_ENV == 'WEB')
+		if (KSESTEST_ENV == 'WEB')
 		{
 			return "\t\t\t<hr />\n";
 		}
 		else
 		{
-			return str_repeat(60, '-') . "\n";
+			return str_repeat(60, '-')."\n";
 		}
 	}
 
 	function output_ul($data = array(), $padding = "")
 	{
-		if(!is_array($data) || count($data) < 1)
+		if (!is_array($data) || count($data) < 1)
 		{
 			return "";
 		}
 
 		$text = "";
-		if(KSESTEST_ENV == 'WEB')
+		if (KSESTEST_ENV == 'WEB')
 		{
 			$text = "\t\t\t<ul>\n";
-			foreach($data as $li)
+			foreach ($data as $li)
 			{
 				$text .= "\t\t\t\t<li>$li</li>\n";
 			}
@@ -265,9 +265,9 @@ 
 		}
 		else
 		{
-			foreach($data as $li)
+			foreach ($data as $li)
 			{
-				$text .= $padding . "   * $li\n";
+				$text .= $padding."   * $li\n";
 			}
 		}
 
@@ -278,32 +278,32 @@ 
 	{
 		$default_prots = $myKses->dumpProtocols();
 		$out_text = array();
-		if(count($default_prots) > 0)
+		if (count($default_prots) > 0)
 		{
-			array_push($out_text, "Initial protocols from KSES" . KSESTEST_VER . ":");
+			array_push($out_text, "Initial protocols from KSES".KSESTEST_VER.":");
 			array_push($out_text, output_ul($default_prots));
 			array_push($out_text, output_hr());
 		}
 
-		$myKses->AddProtocols(array("proto1", "proto2:", "proto3"));   // Add a list of protocols
-		$myKses->AddProtocols("proto4:");  // Add a single protocol (Note ':' is optional at end)
+		$myKses->AddProtocols(array("proto1", "proto2:", "proto3")); // Add a list of protocols
+		$myKses->AddProtocols("proto4:"); // Add a single protocol (Note ':' is optional at end)
 		$myKses->AddProtocol("proto9", "mystery:", "anarchy");
 		$myKses->AddProtocol("alpha", "beta", "gamma:");
 
 		$add_protocol  = "\t\t\t<ol>\n";
-		$add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocols(array("proto1", "proto2:", "proto3"));</li>' . "\n";
-		$add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocols("proto4:");</li>' . "\n";
-		$add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocols("proto4:");</li>' . "\n";
-		$add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocol("proto9", "mystery:", "anarchy");</li>' . "\n";
-		$add_protocol .= "\t\t\t\t" . '<li>$myKses->AddProtocol("alpha", "beta", "gamma:");</li>' . "\n";
+		$add_protocol .= "\t\t\t\t".'<li>$myKses->AddProtocols(array("proto1", "proto2:", "proto3"));</li>'."\n";
+		$add_protocol .= "\t\t\t\t".'<li>$myKses->AddProtocols("proto4:");</li>'."\n";
+		$add_protocol .= "\t\t\t\t".'<li>$myKses->AddProtocols("proto4:");</li>'."\n";
+		$add_protocol .= "\t\t\t\t".'<li>$myKses->AddProtocol("proto9", "mystery:", "anarchy");</li>'."\n";
+		$add_protocol .= "\t\t\t\t".'<li>$myKses->AddProtocol("alpha", "beta", "gamma:");</li>'."\n";
 		$add_protocol .= "\t\t\t</ol>\n";
 
 		array_push($out_text, $add_protocol);
 
 		$new_prots = $myKses->dumpProtocols();
-		if(count($new_prots) > 0)
+		if (count($new_prots) > 0)
 		{
-			array_push($out_text, "New protocols from KSES" . KSESTEST_VER . " after using AddProtocol(s):");
+			array_push($out_text, "New protocols from KSES".KSESTEST_VER." after using AddProtocol(s):");
 			array_push($out_text, output_ul($new_prots));
 			array_push($out_text, output_hr());
 		}
@@ -314,31 +314,31 @@ 
 		$myKses->RemoveProtocol("gamma");
 
 		$remove_protocol  = "\t\t\t<ol>\n";
-		$remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocols(array("mystery", "anarchy:"));</li>' . "\n";
-		$remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocols("alpha:");</li>' . "\n";
-		$remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocol("beta:");</li>' . "\n";
-		$remove_protocol .= "\t\t\t\t" . '<li>$myKses->RemoveProtocol("gamma");</li>' . "\n";
+		$remove_protocol .= "\t\t\t\t".'<li>$myKses->RemoveProtocols(array("mystery", "anarchy:"));</li>'."\n";
+		$remove_protocol .= "\t\t\t\t".'<li>$myKses->RemoveProtocols("alpha:");</li>'."\n";
+		$remove_protocol .= "\t\t\t\t".'<li>$myKses->RemoveProtocol("beta:");</li>'."\n";
+		$remove_protocol .= "\t\t\t\t".'<li>$myKses->RemoveProtocol("gamma");</li>'."\n";
 		$remove_protocol .= "\t\t\t</ol>\n";
 		array_push($out_text, $remove_protocol);
 
 		$new_prots = $myKses->dumpProtocols();
-		if(count($new_prots) > 0)
+		if (count($new_prots) > 0)
 		{
-			array_push($out_text, "Resulting protocols from KSES" . KSESTEST_VER . " after using RemoveProtocol(s):");
+			array_push($out_text, "Resulting protocols from KSES".KSESTEST_VER." after using RemoveProtocol(s):");
 			array_push($out_text, output_ul($new_prots));
 			array_push($out_text, output_hr());
 		}
 
 		$myKses->SetProtocols(array("https", "gopher", "news"));
 		$set_protocol  = "\t\t\t<ol>\n";
-		$set_protocol .= "\t\t\t\t" . '<li>$myKses->SetProtocols(array("https", "gopher", "news"));</li>' . "\n";
+		$set_protocol .= "\t\t\t\t".'<li>$myKses->SetProtocols(array("https", "gopher", "news"));</li>'."\n";
 		$set_protocol .= "\t\t\t</ol>\n";
 		array_push($out_text, $set_protocol);
 
 		$new_prots = $myKses->dumpProtocols();
-		if(count($new_prots) > 0)
+		if (count($new_prots) > 0)
 		{
-			array_push($out_text, "Resulting protocols from KSES" . KSESTEST_VER . " after using SetProtocols:");
+			array_push($out_text, "Resulting protocols from KSES".KSESTEST_VER." after using SetProtocols:");
 			array_push($out_text, output_ul($new_prots));
 			array_push($out_text, output_hr());
 		}
@@ -427,18 +427,18 @@ 
 		array_push($out, "Net results:");
 
 		$out_elems = $myKses->DumpElements();
-		if(count($out_elems) > 0)
+		if (count($out_elems) > 0)
 		{
 			//array_push($out, "\t\t\t<ul>\n");
-			foreach($out_elems as $tag => $attr_data)
+			foreach ($out_elems as $tag => $attr_data)
 			{
 				$out_li_elems = array();
 				$elem_text = "(X)HTML element $tag";
 				$allow = "";
-				if(isset($attr_data) && is_array($attr_data) && count($attr_data) > 0)
+				if (isset($attr_data) && is_array($attr_data) && count($attr_data) > 0)
 				{
 					$allow = " allows attribute";
-					if(count($attr_data) > 1)
+					if (count($attr_data) > 1)
 					{
 						$allow .= "s";
 					}
@@ -448,31 +448,31 @@ 
 				array_push($out_li_elems, "$elem_text$allow");
 
 				$attr_test_li = array();
-				if(isset($attr_data) && is_array($attr_data) && count($attr_data) > 0)
+				if (isset($attr_data) && is_array($attr_data) && count($attr_data) > 0)
 				{
-					foreach($attr_data as $attr_name => $attr_tests)
+					foreach ($attr_data as $attr_name => $attr_tests)
 					{
 						$li_text = $attr_name;
-						if(isset($attr_tests) && count($attr_tests) > 0)
+						if (isset($attr_tests) && count($attr_tests) > 0)
 						{
-							foreach($attr_tests as $test_name => $test_val)
+							foreach ($attr_tests as $test_name => $test_val)
 							{
-								switch($test_name)
+								switch ($test_name)
 								{
 									case "maxlen":
-										$li_text .= " - maximum length of '" . $test_val . "' characters";
+										$li_text .= " - maximum length of '".$test_val."' characters";
 										break;
 									case "minlen":
-										$li_text .= " - minimum length of '" . $test_val . "' characters";
+										$li_text .= " - minimum length of '".$test_val."' characters";
 										break;
 									case "minval":
-										$li_text .= " - minimum value of '" . $test_val . "'";
+										$li_text .= " - minimum value of '".$test_val."'";
 										break;
 									case "maxval":
-										$li_text .= " - maximum value of '" . $test_val . "'";
+										$li_text .= " - maximum value of '".$test_val."'";
 										break;
 									case "valueless":
-										switch(strtolower($test_val))
+										switch (strtolower($test_val))
 										{
 											case 'n':
 												$li_text .= " - must not be valueless";
@@ -491,7 +491,7 @@ 
 						}
 						array_push($attr_test_li, $li_text);
 					}
-					if(count($attr_test_li) > 0)
+					if (count($attr_test_li) > 0)
 					{
 						$attr_test_li = output_ul($attr_test_li, "   ");
 						$out_li_elems = array("$elem_text$allow$attr_test_li");

Braces +14 added lines, -28 removed lines

@@ -8,12 +8,10 @@ 
 	if(substr(phpversion(), 0, 1) < 4)
 	{
 		define('KSESTEST_VER', 0);
-	}
-	elseif(substr(phpversion(), 0, 1) >= 5)
+	} elseif(substr(phpversion(), 0, 1) >= 5)
 	{
 		define('KSESTEST_VER', 5);
-	}
-	else
+	} else
 	{
 		define('KSESTEST_VER', 4);
 	}
@@ -22,8 +20,7 @@ 
 	if($_SERVER["DOCUMENT_ROOT"] == "")
 	{
 		define('KSESTEST_ENV', 'CLI');
-	}
-	else
+	} else
 	{
 		define('KSESTEST_ENV', 'WEB');
 	}
@@ -48,8 +45,7 @@ 
 	if(file_exists($include_file) && is_readable($include_file))
 	{
 		include_once($include_file);
-	}
-	else
+	} else
 	{
 		$message = array(
 			"Error:  Unable to find '" . $include_file . "'.",
@@ -126,8 +122,7 @@ 
 		if(KSESTEST_ENV == 'CLI')
 		{
 			return $text;
-		}
-		else
+		} else
 		{
 			return "<code>\n$text<code>\n";
 		}
@@ -138,8 +133,7 @@ 
 		if(KSESTEST_ENV == 'CLI')
 		{
 			return $text;
-		}
-		else
+		} else
 		{
 			return htmlentities($text);
 		}
@@ -150,14 +144,12 @@ 
 		if(KSESTEST_ENV == 'CLI')
 		{
 			return '[' . $text . ']';
-		}
-		else
+		} else
 		{
 			if($pass == true)
 			{
 				return '<span style="color: green;">[' . $text . ']</span>';
-			}
-			else
+			} else
 			{
 				return '<span style="color: red;">[' . $text . ']</span>';
 			}
@@ -169,8 +161,7 @@ 
 		if(KSESTEST_ENV == 'WEB')
 		{
 			$out = "&nbsp;&nbsp;&nbsp;";
-		}
-		else
+		} else
 		{
 			$out = "   ";
 		}
@@ -183,8 +174,7 @@ 
 		if(KSESTEST_ENV == 'WEB')
 		{
 			$out = "<br />\n";
-		}
-		else
+		} else
 		{
 			$out = "\n";
 		}
@@ -207,8 +197,7 @@ 
 				$out .= "\t\t<p>\n";
 				$out .= "\t\t\t$text\n";
 				$out .= "\t\t</p>\n";
-			}
-			else
+			} else
 			{
 				$header = "$title\n" . str_repeat('-', 60) . "\n\n";
 				$out .= "\t$text\n\n";
@@ -226,8 +215,7 @@ 
 			echo $out;
 			echo "\t</body>\n";
 			echo "</html>\n";
-		}
-		else
+		} else
 		{
 			echo $header;
 			echo $out;
@@ -239,8 +227,7 @@ 
 		if(KSESTEST_ENV == 'WEB')
 		{
 			return "\t\t\t<hr />\n";
-		}
-		else
+		} else
 		{
 			return str_repeat(60, '-') . "\n";
 		}
@@ -262,8 +249,7 @@ 
 				$text .= "\t\t\t\t<li>$li</li>\n";
 			}
 			$text .= "\t\t\t</ul>\n";
-		}
-		else
+		} else
 		{
 			foreach($data as $li)
 			{

main/inc/lib/model.lib.php

Doc Comments +1 added lines

@@ -25,6 +25,7 @@
 
     /**
      * Useful finder - experimental akelos like only use in notification.lib.php send function
+     * @param string $type
      */
     public function find($type, $options = null)
     {

main/inc/lib/myspace.lib.php

Doc Comments +3 added lines, -3 removed lines

@@ -634,7 +634,6 @@ 
      * @param   int $sessionId  The session ID
      * @param   int $courseId   The course ID
      * @param   int $exerciseId The quiz ID
-     * @param   int $answer Answer status (0 = incorrect, 1 = correct, 2 = both)
      * @return  string  HTML array of results formatted for gridJS
      * @author César Perales <cesar.perales@beeznest.com>, Beeznest Team
      */
@@ -1222,6 +1221,7 @@ 
      * @param int Number of items to select
      * @param string Column to order on
      * @param string Order direction
+     * @param integer $number_of_items
      * @return array Results
      */
     public static function get_course_data_tracking_overview($from, $number_of_items, $column, $direction)
@@ -1556,6 +1556,7 @@ 
      * @param int Number of items to select
      * @param string Column to order on
      * @param string Order direction
+     * @param integer $number_of_items
      * @return array Results
      */
     public static function get_session_data_tracking_overview($from, $number_of_items, $column, $direction)
@@ -1576,7 +1577,6 @@ 
     /**
      * Fills in session reporting data
      *
-     * @param integer $user_id the id of the user
      * @param array $url_params additonal url parameters
      * @param array $row the row information (the other columns)
      * @return string html code
@@ -2206,6 +2206,7 @@ 
      * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
      * @version Dokeos 1.8.6
      * @since October 2008
+     * @param integer $number_of_items
      */
     public static function get_user_data_tracking_overview($from, $number_of_items, $column, $direction)
     {
@@ -2308,7 +2309,6 @@ 
     /**
      * Checks if there are repeted users in a given array
      * @param  array $usernames list of the usernames in the uploaded file
-     * @param  array $user_array['username'] and $user_array['sufix'] where sufix is the number part in a login i.e -> jmontoya2
      * @return array with the $usernames array and the $user_array array
      * @author Julio Montoya Armas
      */

Spacing +170 added lines, -170 removed lines

@@ -25,7 +25,7 @@ 
             array('url' => api_get_path(WEB_CODE_PATH).'mySpace/admin_view.php?display=course', 'content' => get_lang('DisplayCourseOverview')),
             array('url' => api_get_path(WEB_CODE_PATH).'tracking/question_course_report.php?view=admin', 'content' => get_lang('LPQuestionListResults')),
             array('url' => api_get_path(WEB_CODE_PATH).'tracking/course_session_report.php?view=admin', 'content' => get_lang('LPExerciseResultsBySession')),
-            ['url' => api_get_path(WEB_CODE_PATH) . 'mySpace/admin_view.php?display=accessoverview', 'content' => get_lang('DisplayAccessOverview') . ' (' . get_lang('Beta') . ')']
+            ['url' => api_get_path(WEB_CODE_PATH).'mySpace/admin_view.php?display=accessoverview', 'content' => get_lang('DisplayAccessOverview').' ('.get_lang('Beta').')']
         );
 
         return Display :: actions($actions, null);
@@ -34,7 +34,7 @@ 
     public static function getTopMenu()
     {
         $menu_items = array();
-        $menu_items[] = Display::url(Display::return_icon('stats.png', get_lang('MyStats'),'',ICON_SIZE_MEDIUM),api_get_path(WEB_CODE_PATH)."auth/my_progress.php" );
+        $menu_items[] = Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php");
         $menu_items[] = Display::url(Display::return_icon('teacher.png', get_lang('TeacherInterface'), array(), 32), api_get_path(WEB_CODE_PATH).'mySpace/?view=teacher');
         $menu_items[] = Display::url(Display::return_icon('star_na.png', get_lang('AdminInterface'), array(), 32), '#');
         $menu_items[] = Display::url(Display::return_icon('quiz.png', get_lang('ExamTracking'), array(), 32), api_get_path(WEB_CODE_PATH).'tracking/exams.php');
@@ -104,7 +104,7 @@ 
         $session_id  = intval($session_id);
 
         $sql = 'SELECT login_course_date, logout_course_date
-                FROM ' . $tbl_track_course . '
+                FROM ' . $tbl_track_course.'
                 WHERE
                     user_id = '.$user_id.' AND
                     c_id = '.$courseId.' AND
@@ -143,7 +143,7 @@ 
         foreach ($course_list as $course_item) {
             $courseInfo = api_get_course_info($course_item['code']);
             $courseId = $courseInfo['real_id'];
-            $new_course_list[] =  '"'.$courseId.'"';
+            $new_course_list[] = '"'.$courseId.'"';
         }
         $course_list = implode(', ', $new_course_list);
 
@@ -151,7 +151,7 @@ 
             return false;
         }
         $sql = 'SELECT login_course_date, logout_course_date, c_id
-                FROM ' . $tbl_track_course . '
+                FROM ' . $tbl_track_course.'
                 WHERE
                     user_id = '.$user_id.' AND
                     c_id IN ('.$course_list.') AND
@@ -229,7 +229,7 @@ 
             // student score
             $avg_score = Tracking :: get_avg_student_score($user_id, $courseCode);
             if (is_numeric($avg_score)) {
-                $avg_score = round($avg_score,2);
+                $avg_score = round($avg_score, 2);
             } else {
                 $$avg_score = '-';
             }
@@ -265,7 +265,7 @@ 
 
         $t_head = '    <table style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">';
         //$t_head .= '  <caption>'.get_lang('CourseInformation').'</caption>';
-        $t_head .=      '<tr>';
+        $t_head .= '<tr>';
         $t_head .= '        <th width="155px" style="border-left:0;border-bottom:0"><span>'.get_lang('Course').'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgStudentsProgress'), 6, true).'</span></th>';
@@ -283,7 +283,7 @@ 
 
         $addparams = array('view' => 'admin', 'display' => 'user');
 
-        $table = new SortableTable('tracking_user_overview', array('MySpace','get_number_of_users_tracking_overview'), array('MySpace','get_user_data_tracking_overview'), 0);
+        $table = new SortableTable('tracking_user_overview', array('MySpace', 'get_number_of_users_tracking_overview'), array('MySpace', 'get_user_data_tracking_overview'), 0);
         $table->additional_parameters = $addparams;
 
         $table->set_header(0, get_lang('OfficialCode'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt'));
@@ -296,7 +296,7 @@ 
         }
         $table->set_header(3, get_lang('LoginName'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt'));
         $table->set_header(4, $t_head, false, array('style' => 'width:90%;border:0;padding:0;font-size:7.5pt;'), array('style' => 'width:90%;padding:0;font-size:7.5pt;'));
-        $table->set_column_filter(4, array('MySpace','course_info_tracking_filter'));
+        $table->set_column_filter(4, array('MySpace', 'course_info_tracking_filter'));
         $table->display();
     }
 
@@ -341,7 +341,7 @@ 
         $table -> set_header(7, get_lang('Sessions'), false);
 
         if ($is_western_name_order) {
-            $csv_header[] = array (
+            $csv_header[] = array(
                 get_lang('FirstName', ''),
                 get_lang('LastName', ''),
                 get_lang('TimeSpentOnThePlatform', ''),
@@ -351,7 +351,7 @@ 
                 get_lang('NumberOfSessions', '')
             );
         } else {
-            $csv_header[] = array (
+            $csv_header[] = array(
                 get_lang('LastName', ''),
                 get_lang('FirstName', ''),
                 get_lang('TimeSpentOnThePlatform', ''),
@@ -491,9 +491,9 @@ 
 
         if ($tracking_column != 3) {
             if ($tracking_direction == 'DESC') {
-                usort($all_datas, array('MySpace','rsort_users'));
+                usort($all_datas, array('MySpace', 'rsort_users'));
             } else {
-                usort($all_datas, array('MySpace','sort_users'));
+                usort($all_datas, array('MySpace', 'sort_users'));
             }
         }
 
@@ -552,7 +552,7 @@ 
         /**
          * Column config
          */
-        $column_model   = array(
+        $column_model = array(
             array(
                 'name' => 'username',
                 'index' => 'username',
@@ -593,7 +593,7 @@ 
 
         $action_links = '';
         // jqgrid will use this URL to do the selects
-        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_lp_progress&session_id=' . $sessionId . '&course_id=' . $courseId . '&date_to=' . $date_to . '&date_from=' . $date_from;
+        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_lp_progress&session_id='.$sessionId.'&course_id='.$courseId.'&date_to='.$date_to.'&date_from='.$date_from;
 
         //Table Id
         $tableId = 'lpProgress';
@@ -615,11 +615,11 @@ 
             true
         );
 
-        $return = '<script>$(function() {'. $table .
+        $return = '<script>$(function() {'.$table.
             'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true});
                 jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{
                        caption:"",
-                       title:"' . get_lang('ExportExcel') . '",
+                       title:"' . get_lang('ExportExcel').'",
                        onClickButton : function () {
                            jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"});
                        }
@@ -669,7 +669,7 @@ 
         /**
          * Column config
          */
-        $column_model   = array(
+        $column_model = array(
             array('name'=>'session', 'index'=>'session', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
             array('name'=>'exercise_id', 'index'=>'exercise_id', 'align'=>'left', 'search' => 'true'),
             array('name'=>'quiz_title', 'index'=>'quiz_title', 'align'=>'left', 'search' => 'true'),
@@ -686,7 +686,7 @@ 
         //get dynamic column names
 
         // jqgrid will use this URL to do the selects
-        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_progress&session_id=' . $sessionId . '&course_id=' . $courseId  . '&exercise_id=' . $exerciseId . '&date_to=' . $date_to . '&date_from=' . $date_from;
+        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_progress&session_id='.$sessionId.'&course_id='.$courseId.'&exercise_id='.$exerciseId.'&date_to='.$date_to.'&date_from='.$date_from;
 
         // Autowidth
         $extra_params['autowidth'] = 'true';
@@ -697,11 +697,11 @@ 
         $tableId = 'exerciseProgressOverview';
         $table = Display::grid_js($tableId, $url, $columns, $column_model, $extra_params, array(), '', true);
 
-        $return = '<script>$(function() {'. $table .
+        $return = '<script>$(function() {'.$table.
             'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true});
                 jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{
                        caption:"",
-                       title:"' . get_lang('ExportExcel') . '",
+                       title:"' . get_lang('ExportExcel').'",
                        onClickButton : function () {
                            jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"});
                        }
@@ -787,8 +787,8 @@ 
 
                     $column[] = $title;
                     $column_model[] = array(
-                        'name' => 'exer' . $i,
-                        'index' => 'exer' . $i,
+                        'name' => 'exer'.$i,
+                        'index' => 'exer'.$i,
                         'align' => 'center',
                         'search' => 'true',
                         'wrap_cell' => "true"
@@ -800,7 +800,7 @@ 
 
         //end get dynamic column names
         // jqgrid will use this URL to do the selects
-        $url = api_get_path(WEB_AJAX_PATH) . 'model.ajax.php?a=get_exercise_grade&session_id=' . $sessionId . '&course_id=' . $courseId;
+        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_exercise_grade&session_id='.$sessionId.'&course_id='.$courseId;
 
         // Autowidth
         $extra_params['autowidth'] = 'true';
@@ -811,13 +811,13 @@ 
         $tableId = 'exerciseGradeOverview';
         $table = Display::grid_js($tableId, $url, $column, $column_model, $extra_params, array(), '', true);
 
-        $return = '<script>$(function() {' . $table .
-            'jQuery("#' . $tableId . '").jqGrid("navGrid","#' . $tableId . '_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true});
-                jQuery("#' . $tableId . '").jqGrid("navButtonAdd","#' . $tableId . '_pager",{
+        $return = '<script>$(function() {'.$table.
+            'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true});
+                jQuery("#' . $tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{
                        caption:"",
-                       title:"' . get_lang('ExportExcel') . '",
+                       title:"' . get_lang('ExportExcel').'",
                        onClickButton : function () {
-                           jQuery("#' . $tableId . '").jqGrid("excelExport",{"url":"' . $url . '&export_format=xls"});
+                           jQuery("#' . $tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"});
                        }
                 });
             });</script>';
@@ -850,10 +850,10 @@ 
         /**
          * Column config
          */
-        $column_model   = array(
-            array('name'=>'username',   'index'=>'username',    'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
-            array('name'=>'firstname',  'index'=>'firstname',   'align'=>'left', 'search' => 'true'),
-            array('name'=>'lastname',   'index'=>'lastname',    'align'=>'left', 'search' => 'true'),
+        $column_model = array(
+            array('name'=>'username', 'index'=>'username', 'align'=>'left', 'search' => 'true', 'wrap_cell' => "true"),
+            array('name'=>'firstname', 'index'=>'firstname', 'align'=>'left', 'search' => 'true'),
+            array('name'=>'lastname', 'index'=>'lastname', 'align'=>'left', 'search' => 'true'),
         );
         //get dinamic column names
         foreach ($questions as $question_id => $question) {
@@ -869,7 +869,7 @@ 
         $action_links = '';
 
         // jqgrid will use this URL to do the selects
-        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_survey_overview&session_id=' . $sessionId . '&course_id=' . $courseId . '&survey_id=' . $surveyId . '&date_to=' . $date_to . '&date_from=' . $date_from;
+        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_survey_overview&session_id='.$sessionId.'&course_id='.$courseId.'&survey_id='.$surveyId.'&date_to='.$date_to.'&date_from='.$date_from;
 
         // Table Id
         $tableId = 'lpProgress';
@@ -891,11 +891,11 @@ 
             true
         );
 
-        $return = '<script>$(function() {'. $table .
+        $return = '<script>$(function() {'.$table.
             'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true});
                 jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{
                        caption:"",
-                       title:"' . get_lang('ExportExcel') . '",
+                       title:"' . get_lang('ExportExcel').'",
                        onClickButton : function () {
                            jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"});
                        }
@@ -910,7 +910,7 @@ 
      * Display a sortable table that contains an overview off all the progress of the user in a session
      * @author César Perales <cesar.perales@beeznest.com>, Beeznest Team
      */
-    static function display_tracking_progress_overview($sessionId = 0, $courseId = 0,  $date_from, $date_to)
+    static function display_tracking_progress_overview($sessionId = 0, $courseId = 0, $date_from, $date_to)
     {
         //The order is important you need to check the the $column variable in the model.ajax.php file
         $columns = array(
@@ -960,55 +960,55 @@ 
         );
 
         //Column config
-        $column_model   = array(
-            array('name'=>'lastname',   'index'=>'lastname',     'align'=>'left'),
-            array('name'=>'firstname',  'index'=>'firstname',    'align'=>'left'),
-            array('name'=>'username',   'index'=>'username',     'align'=>'left'),
+        $column_model = array(
+            array('name'=>'lastname', 'index'=>'lastname', 'align'=>'left'),
+            array('name'=>'firstname', 'index'=>'firstname', 'align'=>'left'),
+            array('name'=>'username', 'index'=>'username', 'align'=>'left'),
             #array('name'=>'profile',   'index'=>'username',     'align'=>'left'),
-            array('name'=>'total',      'index'=>'total',        'align'=>'left'),
-            array('name'=>'courses',    'index'=>'courses',      'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'lessons',    'index'=>'lessons',      'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'exercises',  'index'=>'exercises',    'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'forums',     'index'=>'forums',       'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'homeworks',  'index'=>'homeworks',    'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'wikis',      'index'=>'wikis',        'align'=>'left', 'sortable' => 'false'),
-            array('name'=>'surveys',    'index'=>'surveys',      'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'total', 'index'=>'total', 'align'=>'left'),
+            array('name'=>'courses', 'index'=>'courses', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'lessons', 'index'=>'lessons', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'exercises', 'index'=>'exercises', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'forums', 'index'=>'forums', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'homeworks', 'index'=>'homeworks', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'wikis', 'index'=>'wikis', 'align'=>'left', 'sortable' => 'false'),
+            array('name'=>'surveys', 'index'=>'surveys', 'align'=>'left', 'sortable' => 'false'),
             //Lessons
-            array('name'=>'lessons_total',    'index'=>'lessons_total',      'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'lessons_done',     'index'=>'lessons_done',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'lessons_left',     'index'=>'lessons_left',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'lessons_progress', 'index'=>'lessons_progress',   'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'lessons_total', 'index'=>'lessons_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'lessons_done', 'index'=>'lessons_done', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'lessons_left', 'index'=>'lessons_left', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'lessons_progress', 'index'=>'lessons_progress', 'align'=>'center', 'sortable' => 'false'),
             //Exercises
-            array('name'=>'exercises_total',    'index'=>'exercises_total',      'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'exercises_done',     'index'=>'exercises_done',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'exercises_left',     'index'=>'exercises_left',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'exercises_progress', 'index'=>'exercises_progress',   'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'exercises_total', 'index'=>'exercises_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'exercises_done', 'index'=>'exercises_done', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'exercises_left', 'index'=>'exercises_left', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'exercises_progress', 'index'=>'exercises_progress', 'align'=>'center', 'sortable' => 'false'),
             //Assignments
-            array('name'=>'forums_total',    'index'=>'forums_total',        'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'forums_done',     'index'=>'forums_done',         'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'forums_left',     'index'=>'forums_left',         'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'forums_progress', 'index'=>'forums_progress',     'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'forums_total', 'index'=>'forums_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'forums_done', 'index'=>'forums_done', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'forums_left', 'index'=>'forums_left', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'forums_progress', 'index'=>'forums_progress', 'align'=>'center', 'sortable' => 'false'),
             //Assignments
-            array('name'=>'assigments_total',    'index'=>'assigments_total',        'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'assigments_done',     'index'=>'assigments_done',         'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'assigments_left',     'index'=>'assigments_left',         'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'assigments_progress', 'index'=>'assigments_progress',     'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'assigments_total', 'index'=>'assigments_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'assigments_done', 'index'=>'assigments_done', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'assigments_left', 'index'=>'assigments_left', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'assigments_progress', 'index'=>'assigments_progress', 'align'=>'center', 'sortable' => 'false'),
             //Assignments
-            array('name'=>'wiki_total',         'index'=>'wiki_total',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'wiki_revisions',     'index'=>'wiki_revisions',   'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'wiki_read',          'index'=>'wiki_read',        'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'wiki_unread',        'index'=>'wiki_unread',      'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'wiki_progress',      'index'=>'wiki_progress',    'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'wiki_total', 'index'=>'wiki_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'wiki_revisions', 'index'=>'wiki_revisions', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'wiki_read', 'index'=>'wiki_read', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'wiki_unread', 'index'=>'wiki_unread', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'wiki_progress', 'index'=>'wiki_progress', 'align'=>'center', 'sortable' => 'false'),
             //Surveys
-            array('name'=>'surveys_total',    'index'=>'surveys_total',      'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'surveys_done',     'index'=>'surveys_done',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'surveys_left',     'index'=>'surveys_left',       'align'=>'center', 'sortable' => 'false'),
-            array('name'=>'surveys_progress', 'index'=>'surveys_progress',   'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'surveys_total', 'index'=>'surveys_total', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'surveys_done', 'index'=>'surveys_done', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'surveys_left', 'index'=>'surveys_left', 'align'=>'center', 'sortable' => 'false'),
+            array('name'=>'surveys_progress', 'index'=>'surveys_progress', 'align'=>'center', 'sortable' => 'false'),
         );
 
         $action_links = '';
         // jqgrid will use this URL to do the selects
-        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_progress&session_id=' . $sessionId . '&course_id=' . $courseId . '&date_to=' . $date_to . '&date_from=' . $date_from;
+        $url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_session_progress&session_id='.$sessionId.'&course_id='.$courseId.'&date_to='.$date_to.'&date_from='.$date_from;
 
         //Table Id
         $tableId = 'progressOverview';
@@ -1068,11 +1068,11 @@ 
             true
         );
 
-        $return = '<script>$(function() {'. $table .
+        $return = '<script>$(function() {'.$table.
             'jQuery("#'.$tableId.'").jqGrid("navGrid","#'.$tableId.'_pager",{view:false, edit:false, add:false, del:false, search:false, excel:true});
                 jQuery("#'.$tableId.'").jqGrid("navButtonAdd","#'.$tableId.'_pager",{
                        caption:"",
-                       title:"' . get_lang('ExportExcel') . '",
+                       title:"' . get_lang('ExportExcel').'",
                        onClickButton : function () {
                            jQuery("#'.$tableId.'").jqGrid("excelExport",{"url":"'.$url.'&export_format=xls"});
                        }
@@ -1132,7 +1132,7 @@ 
                 // adding the fields that are checked to the session
                 $message = '';
                 foreach ($values as $field_ids => $value) {
-                    if ($value == 1 && strstr($field_ids,'extra_export_field')) {
+                    if ($value == 1 && strstr($field_ids, 'extra_export_field')) {
                         $_SESSION['additional_export_fields'][] = str_replace('extra_export_field', '', $field_ids);
                     }
                 }
@@ -1147,7 +1147,7 @@ 
                 // Displaying a feedback message
                 if (!empty($_SESSION['additional_export_fields'])) {
                     Display::display_confirmation_message(get_lang('FollowingFieldsWillAlsoBeExported').': <br /><ul>'.$message.'</ul>', false);
-                } else  {
+                } else {
                     Display::display_confirmation_message(get_lang('NoAdditionalFieldsWillBeExported'), false);
                 }
             } else {
@@ -1175,7 +1175,7 @@ 
     {
         $t_head = '    <table style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">';
         //$t_head .= '  <caption>'.get_lang('CourseInformation').'</caption>';
-        $t_head .=      '<tr>';
+        $t_head .= '<tr>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgStudentsProgress'), 6, true).'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgCourseScore'), 6, true).'</span></th>';
@@ -1192,13 +1192,13 @@ 
 
         $addparams = array('view' => 'admin', 'display' => 'courseoverview');
 
-        $table = new SortableTable('tracking_session_overview', array('MySpace', 'get_total_number_courses'), array('MySpace','get_course_data_tracking_overview'), 1);
+        $table = new SortableTable('tracking_session_overview', array('MySpace', 'get_total_number_courses'), array('MySpace', 'get_course_data_tracking_overview'), 1);
         $table->additional_parameters = $addparams;
 
         $table->set_header(0, '', false, null, array('style' => 'display: none'));
         $table->set_header(1, get_lang('Course'), true, array('style' => 'font-size:8pt'), array('style' => 'font-size:8pt'));
         $table->set_header(2, $t_head, false, array('style' => 'width:90%;border:0;padding:0;font-size:7.5pt;'), array('style' => 'width:90%;padding:0;font-size:7.5pt;'));
-        $table->set_column_filter(2, array('MySpace','course_tracking_filter'));
+        $table->set_column_filter(2, array('MySpace', 'course_tracking_filter'));
         $table->display();
     }
 
@@ -1234,7 +1234,7 @@ 
         $sql .= " ORDER BY col$column $direction ";
         $sql .= " LIMIT $from,$number_of_items";
         $result = Database::query($sql);
-        $return = array ();
+        $return = array();
         while ($course = Database::fetch_row($result)) {
             $return[] = $course;
         }
@@ -1287,18 +1287,18 @@ 
             $progress += $progress_tmp[0];
             $nb_progress_lp += $progress_tmp[1];
             $score_tmp = Tracking :: get_avg_student_score($row->user_id, $course_code, array(), null, true);
-            if(is_array($score_tmp)) {
+            if (is_array($score_tmp)) {
                 $score += $score_tmp[0];
                 $nb_score_lp += $score_tmp[1];
             }
             $nb_messages += Tracking::count_student_messages($row->user_id, $course_code);
             $nb_assignments += Tracking::count_student_assignments($row->user_id, $course_code);
             $last_login_date_tmp = Tracking :: get_last_connection_date_on_the_course($row->user_id, $courseInfo, null, false);
-            if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned
+            if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned
                 $last_login_date = $last_login_date_tmp;
-            } else if($last_login_date_tmp != false && $last_login_date != false) { // TODO: Repeated previous condition. To be cleaned.
+            } else if ($last_login_date_tmp != false && $last_login_date != false) { // TODO: Repeated previous condition. To be cleaned.
                 // Find the max and assign it to first_login_date
-                if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
+                if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
                     $last_login_date = $last_login_date_tmp;
                 }
             }
@@ -1308,27 +1308,27 @@ 
             $total_score_possible += $exercise_results_tmp['score_possible'];
             $total_questions_answered += $exercise_results_tmp['questions_answered'];
         }
-        if($nb_progress_lp > 0) {
+        if ($nb_progress_lp > 0) {
             $avg_progress = round($progress / $nb_progress_lp, 2);
         } else {
             $avg_progress = 0;
         }
-        if($nb_score_lp > 0) {
+        if ($nb_score_lp > 0) {
             $avg_score = round($score / $nb_score_lp, 2);
         } else {
             $avg_score = '-';
         }
-        if($last_login_date) {
+        if ($last_login_date) {
             $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get());
         } else {
             $last_login_date = '-';
         }
-        if($total_score_possible > 0) {
+        if ($total_score_possible > 0) {
             $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2);
         } else {
             $total_score_percentage = 0;
         }
-        if($total_score_percentage > 0) {
+        if ($total_score_percentage > 0) {
             $total_score = $total_score_obtained.'/'.$total_score_possible.' ('.$total_score_percentage.' %)';
         } else {
             $total_score = '-';
@@ -1436,7 +1436,7 @@ 
                 $progress += $progress_tmp[0];
                 $nb_progress_lp += $progress_tmp[1];
                 $score_tmp = Tracking :: get_avg_student_score($row->user_id, $course_code, array(), null, true);
-                if(is_array($score_tmp)) {
+                if (is_array($score_tmp)) {
                     $score += $score_tmp[0];
                     $nb_score_lp += $score_tmp[1];
                 }
@@ -1444,11 +1444,11 @@ 
                 $nb_assignments += Tracking::count_student_assignments($row->user_id, $course_code);
 
                 $last_login_date_tmp = Tracking::get_last_connection_date_on_the_course($row->user_id, $courseInfo, null, false);
-                if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned.
+                if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned.
                     $last_login_date = $last_login_date_tmp;
-                } else if($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned.
+                } else if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned.
                     // Find the max and assign it to first_login_date
-                    if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
+                    if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
                         $last_login_date = $last_login_date_tmp;
                     }
                 }
@@ -1458,22 +1458,22 @@ 
                 $total_score_possible += $exercise_results_tmp['score_possible'];
                 $total_questions_answered += $exercise_results_tmp['questions_answered'];
             }
-            if($nb_progress_lp > 0) {
+            if ($nb_progress_lp > 0) {
                 $avg_progress = round($progress / $nb_progress_lp, 2);
             } else {
                 $avg_progress = 0;
             }
-            if($nb_score_lp > 0) {
+            if ($nb_score_lp > 0) {
                 $avg_score = round($score / $nb_score_lp, 2);
             } else {
                 $avg_score = '-';
             }
-            if($last_login_date) {
+            if ($last_login_date) {
                 $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get());
             } else {
                 $last_login_date = '-';
             }
-            if($total_score_possible > 0) {
+            if ($total_score_possible > 0) {
                 $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2);
             } else {
                 $total_score_percentage = 0;
@@ -1509,7 +1509,7 @@ 
     {
         $t_head = '    <table style="width: 100%;border:0;padding:0;border-collapse:collapse;table-layout: fixed">';
         //$t_head .= '  <caption>'.get_lang('CourseInformation').'</caption>';
-        $t_head .=      '<tr>';
+        $t_head .= '<tr>';
         $t_head .= '        <th width="155px" style="border-left:0;border-bottom:0"><span>'.get_lang('Course').'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgTimeSpentInTheCourse'), 6, true).'</span></th>';
         $t_head .= '        <th style="padding:0;border-bottom:0"><span>'.cut(get_lang('AvgStudentsProgress'), 6, true).'</span></th>';
@@ -1527,7 +1527,7 @@ 
 
         $addparams = array('view' => 'admin', 'display' => 'sessionoverview');
 
-        $table = new SortableTable('tracking_session_overview', array('MySpace','get_total_number_sessions'), array('MySpace','get_session_data_tracking_overview'), 1);
+        $table = new SortableTable('tracking_session_overview', array('MySpace', 'get_total_number_sessions'), array('MySpace', 'get_session_data_tracking_overview'), 1);
         $table->additional_parameters = $addparams;
 
         $table->set_header(0, '', false, null, array('style' => 'display: none'));
@@ -1566,7 +1566,7 @@ 
         $sql .= " ORDER BY col$column $direction ";
         $sql .= " LIMIT $from,$number_of_items";
         $result = Database::query($sql);
-        $return = array ();
+        $return = array();
         while ($session = Database::fetch_row($result)) {
             $return[] = $session;
         }
@@ -1655,10 +1655,10 @@ 
                 if ($last_login_date_tmp != false && $last_login_date == false) {
                     // TODO: To be cleaned.
                     $last_login_date = $last_login_date_tmp;
-                } else if($last_login_date_tmp != false && $last_login_date != false) {
+                } else if ($last_login_date_tmp != false && $last_login_date != false) {
                     // TODO: Repeated previous condition! To be cleaned.
                     // Find the max and assign it to first_login_date
-                    if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
+                    if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
                         $last_login_date = $last_login_date_tmp;
                     }
                 }
@@ -1668,27 +1668,27 @@ 
                 $total_score_possible += $exercise_results_tmp['score_possible'];
                 $total_questions_answered += $exercise_results_tmp['questions_answered'];
             }
-            if($nb_progress_lp > 0) {
+            if ($nb_progress_lp > 0) {
                 $avg_progress = round($progress / $nb_progress_lp, 2);
             } else {
                 $avg_progress = 0;
             }
-            if($nb_score_lp > 0) {
+            if ($nb_score_lp > 0) {
                 $avg_score = round($score / $nb_score_lp, 2);
             } else {
                 $avg_score = '-';
             }
-            if($last_login_date) {
+            if ($last_login_date) {
                 $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get());
             } else {
                 $last_login_date = '-';
             }
-            if($total_score_possible > 0) {
+            if ($total_score_possible > 0) {
                 $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2);
             } else {
                 $total_score_percentage = 0;
             }
-            if($total_score_percentage > 0) {
+            if ($total_score_percentage > 0) {
                 $total_score = $total_score_obtained.'/'.$total_score_possible.' ('.$total_score_percentage.' %)';
             } else {
                 $total_score = '-';
@@ -1799,7 +1799,7 @@ 
                 $total_score_obtained = 0;
                 $total_score_possible = 0;
                 $total_questions_answered = 0;
-                while($row_user = Database::fetch_object($result_users)) {
+                while ($row_user = Database::fetch_object($result_users)) {
                     // get time spent in the course and session
                     $time_spent += Tracking::get_time_spent_on_the_course($row_user->user_id, $courseId, $session_id);
                     $progress_tmp = Tracking::get_avg_student_progress($row_user->user_id, $row->code, array(), $session_id, true);
@@ -1828,11 +1828,11 @@ 
                         $session_id,
                         false
                     );
-                    if($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned.
+                    if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: To be cleaned.
                         $last_login_date = $last_login_date_tmp;
-                    } else if($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned.
+                    } else if ($last_login_date_tmp != false && $last_login_date == false) { // TODO: Repeated previous condition. To be cleaned.
                         // Find the max and assign it to first_login_date
-                        if(strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
+                        if (strtotime($last_login_date_tmp) > strtotime($last_login_date)) {
                             $last_login_date = $last_login_date_tmp;
                         }
                     }
@@ -1842,27 +1842,27 @@ 
                     $total_score_possible += $exercise_results_tmp['score_possible'];
                     $total_questions_answered += $exercise_results_tmp['questions_answered'];
                 }
-                if($nb_progress_lp > 0) {
+                if ($nb_progress_lp > 0) {
                     $avg_progress = round($progress / $nb_progress_lp, 2);
                 } else {
                     $avg_progress = 0;
                 }
-                if($nb_score_lp > 0) {
+                if ($nb_score_lp > 0) {
                     $avg_score = round($score / $nb_score_lp, 2);
                 } else {
                     $avg_score = '-';
                 }
-                if($last_login_date) {
+                if ($last_login_date) {
                     $last_login_date = api_convert_and_format_date($last_login_date, DATE_FORMAT_SHORT, date_default_timezone_get());
                 } else {
                     $last_login_date = '-';
                 }
-                if($total_score_possible > 0) {
+                if ($total_score_possible > 0) {
                     $total_score_percentage = round($total_score_obtained / $total_score_possible * 100, 2);
                 } else {
                     $total_score_percentage = 0;
                 }
-                if($total_score_percentage > 0) {
+                if ($total_score_percentage > 0) {
                     $total_score = $total_score_obtained.'/'.$total_score_possible.' ('.$total_score_percentage.' %)';
                 } else {
                     $total_score = '-';
@@ -1912,7 +1912,7 @@ 
             FROM '.Database :: get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES)."
             WHERE c_id = ' . $courseId . '
             AND exe_user_id = '".intval($user_id)."'";
-        if($session_id !== false) {
+        if ($session_id !== false) {
             $sql .= " AND session_id = '".$session_id."' ";
         }
         $result = Database::query($sql);
@@ -1922,7 +1922,7 @@ 
         while ($row = Database::fetch_array($result)) {
             $score_obtained += $row['exe_result'];
             $score_possible += $row['exe_weighting'];
-            $questions_answered ++;
+            $questions_answered++;
         }
 
         if ($score_possible != 0) {
@@ -2043,9 +2043,9 @@ 
                     }
                 }
                 // time spent in the course
-                $csv_row[] = api_time_to_hms(Tracking::get_time_spent_on_the_course ($user[4], $courseId));
+                $csv_row[] = api_time_to_hms(Tracking::get_time_spent_on_the_course($user[4], $courseId));
                 // student progress in course
-                $csv_row[] = round(Tracking::get_avg_student_progress ($user[4], $row[0]), 2);
+                $csv_row[] = round(Tracking::get_avg_student_progress($user[4], $row[0]), 2);
                 // student score
                 $csv_row[] = round(Tracking::get_avg_student_score($user[4], $row[0]), 2);
                 // student tes score
@@ -2053,7 +2053,7 @@ 
                 // student messages
                 $csv_row[] = Tracking::count_student_messages($user[4], $row[0]);
                 // student assignments
-                $csv_row[] = Tracking::count_student_assignments ($user[4], $row[0]);
+                $csv_row[] = Tracking::count_student_assignments($user[4], $row[0]);
                 // student exercises results
                 $exercises_results = MySpace::exercises_results($user[4], $row[0]);
                 $csv_row[] = $exercises_results['score_obtained'];
@@ -2061,7 +2061,7 @@ 
                 $csv_row[] = $exercises_results['questions_answered'];
                 $csv_row[] = $exercises_results['percentage'];
                 // first connection
-                $csv_row[] = Tracking::get_first_connection_date_on_the_course ($user[4], $courseId);
+                $csv_row[] = Tracking::get_first_connection_date_on_the_course($user[4], $courseId);
                 // last connection
                 $csv_row[] = strip_tags(Tracking::get_last_connection_date_on_the_course($user[4], $courseInfo));
 
@@ -2095,9 +2095,9 @@ 
         // get all courses with limit
         $sql = "SELECT course.code as col1, course.title as col2
                 FROM $tbl_course course
-                WHERE course.code IN (".implode(',',$courses_code).")";
+                WHERE course.code IN (".implode(',', $courses_code).")";
 
-        if (!in_array($direction, array('ASC','DESC'))) $direction = 'ASC';
+        if (!in_array($direction, array('ASC', 'DESC'))) $direction = 'ASC';
 
         $column = intval($column);
         $from = intval($from);
@@ -2166,7 +2166,7 @@ 
             $table_row[] = $avg_assignments_in_course;
 
             //set the "from" value to know if I access the Reporting by the chamilo tab or the course link
-            $table_row[] = '<center><a href="../../tracking/courseLog.php?cidReq=' .$course_code.'&from=myspace&id_session='.$session_id.'">
+            $table_row[] = '<center><a href="../../tracking/courseLog.php?cidReq='.$course_code.'&from=myspace&id_session='.$session_id.'">
                              <img src="'.api_get_path(WEB_IMG_PATH).'icons/22/2rightarrow.png" border="0" /></a>
                             </center>';
             $csv_content[] = array(
@@ -2174,7 +2174,7 @@ 
                 $nb_students_in_course,
                 $avg_time_spent_in_course,
                 is_null($avg_progress_in_course) ? null : $avg_progress_in_course.'%',
-                is_null($avg_score_in_course) ? null : is_numeric($avg_score_in_course) ? $avg_score_in_course.'%' : $avg_score_in_course ,
+                is_null($avg_score_in_course) ? null : is_numeric($avg_score_in_course) ? $avg_score_in_course.'%' : $avg_score_in_course,
                 is_null($avg_score_in_exercise) ? null : $avg_score_in_exercise.'%',
                 $avg_messages_in_course,
                 $avg_assignments_in_course,
@@ -2242,7 +2242,7 @@ 
         $sql .= " ORDER BY col$column $direction ";
         $sql .= " LIMIT $from,$number_of_items";
         $result = Database::query($sql);
-        $return = array ();
+        $return = array();
         while ($user = Database::fetch_row($result)) {
             $return[] = $user;
         }
@@ -2297,7 +2297,7 @@ 
                     $i++;
                 }
             }
-            $username_array = array('username' => $desired_username , 'sufix' => $sufix);
+            $username_array = array('username' => $desired_username, 'sufix' => $sufix);
             return $username_array;
         } else {
             $username_array = array('username' => $username, 'sufix' => '');
@@ -2571,7 +2571,7 @@ 
         foreach ($users as $index => $user) {
             $userid = $user['id'];
             $sql_insert = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at)
-                           VALUES ('$id_session','$userid', '" . api_get_utc_datetime() . "')";
+                           VALUES ('$id_session','$userid', '".api_get_utc_datetime()."')";
             Database::query($sql_insert);
             $user['added_at_session'] = 1;
             $new_users[] = $user;
@@ -2605,10 +2605,10 @@ 
                 );
                 $userInfo = api_get_user_info($user['id']);
 
-                if (($user['added_at_platform'] == 1  && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) {
+                if (($user['added_at_platform'] == 1 && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) {
                     if ($user['added_at_platform'] == 1) {
                         $addedto = get_lang('UserCreatedPlatform');
-                    } else  {
+                    } else {
                         $addedto = '          ';
                     }
 
@@ -2671,7 +2671,7 @@ 
         global $current_tag;
         switch ($data) {
             case 'Contact' :
-                $user = array ();
+                $user = array();
                 break;
             default :
                 $current_tag = $data;
@@ -2718,9 +2718,9 @@ 
         global $current_value;
         global $user;
         global $users;
-        $users = array ();
+        $users = array();
         $parser = xml_parser_create('UTF-8');
-        xml_set_element_handler($parser, array('MySpace','element_start'), array('MySpace','element_end'));
+        xml_set_element_handler($parser, array('MySpace', 'element_start'), array('MySpace', 'element_end'));
         xml_set_character_data_handler($parser, "character_data");
         xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false);
         xml_parse($parser, api_utf8_encode_xml(file_get_contents($file)));
@@ -2766,7 +2766,7 @@ 
             get_lang('SearchCourse'),
             $courseList,
             [
-                'url' => api_get_path(WEB_AJAX_PATH) . 'course.ajax.php?' . http_build_query([
+                'url' => api_get_path(WEB_AJAX_PATH).'course.ajax.php?'.http_build_query([
                     'a' => 'search_course_by_session_all',
                     'session_id' => $sessionId
                 ])
@@ -2785,7 +2785,7 @@ 
                             course_id: $('#course_id').val() || 0
                         });
 
-                        return '" . api_get_path(WEB_AJAX_PATH) . "session.ajax.php?' + params;
+                        return '" . api_get_path(WEB_AJAX_PATH)."session.ajax.php?' + params;
                     }
                 "
             ]
@@ -2816,7 +2816,7 @@ 
                             course_id: $('#course_id').val()
                         });
 
-                        return '" . api_get_path(WEB_AJAX_PATH) . "course.ajax.php?' + params;
+                        return '" . api_get_path(WEB_AJAX_PATH)."course.ajax.php?' + params;
                     }
                 "
             ]
@@ -2842,8 +2842,8 @@ 
         if ($form->validate()) {
             $table = new SortableTable(
                 'tracking_access_overview',
-                ['MySpace','getNumberOfRrackingAccessOverview'],
-                ['MySpace','getUserDataAccessTrackingOverview'],
+                ['MySpace', 'getNumberOfRrackingAccessOverview'],
+                ['MySpace', 'getUserDataAccessTrackingOverview'],
                 0
             );
             $table->additional_parameters = $form->exportValues();
@@ -2904,7 +2904,7 @@ 
                     " : "
                         u.lastname AS col2,
                         u.firstname AS col3,
-                " ) . "
+                " )."
                 a.logout_course_date,
                 c.title, 
                 c.code, 
@@ -2915,7 +2915,7 @@ 
 
         if (isset($_GET['session_id']) && !empty($_GET['session_id'])) {
             $sessionId = intval($_GET['session_id']);
-            $sql .= " WHERE a.session_id = " . $sessionId;
+            $sql .= " WHERE a.session_id = ".$sessionId;
         }
 
         $sql .= " ORDER BY col$column $orderDirection ";
@@ -2976,14 +2976,14 @@ 
 function get_stats($user_id, $courseId, $start_date = null, $end_date = null)
 {
     // Database table definitions
-    $tbl_track_course   = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
+    $tbl_track_course = Database :: get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
 
     $course_info = api_get_course_info_by_id($courseId);
     if (!empty($course_info)) {
         $strg_sd    = "";
         $strg_ed    = "";
-        if ($start_date != null && $end_date != null){
-            $end_date = add_day_to( $end_date );
+        if ($start_date != null && $end_date != null) {
+            $end_date = add_day_to($end_date);
             $strg_sd = "AND login_course_date BETWEEN '$start_date' AND '$end_date'";
             $strg_ed = "AND logout_course_date BETWEEN '$start_date' AND '$end_date'";
         }
@@ -2991,10 +2991,10 @@ 
                 SEC_TO_TIME(avg(time_to_sec(timediff(logout_course_date,login_course_date)))) as avrg,
                 SEC_TO_TIME(sum(time_to_sec(timediff(logout_course_date,login_course_date)))) as total,
                 count(user_id) as times
-                FROM ' . $tbl_track_course . '
+                FROM ' . $tbl_track_course.'
                 WHERE
-                    user_id = ' . intval($user_id) . ' AND
-                    c_id = ' . intval($courseId) . ' '.$strg_sd.' '.$strg_ed.' '.'
+                    user_id = ' . intval($user_id).' AND
+                    c_id = ' . intval($courseId).' '.$strg_sd.' '.$strg_ed.' '.'
                 ORDER BY login_course_date ASC';
 
         $rs = Database::query($sql);
@@ -3012,7 +3012,7 @@ 
 }
 
 function add_day_to($end_date) {
-    $foo_date = strtotime( $end_date );
+    $foo_date = strtotime($end_date);
     $foo_date = strtotime(" +1 day", $foo_date);
     $foo_date = date("Y-m-d", $foo_date);
     return $foo_date;
@@ -3072,7 +3072,7 @@ 
  * @version OCT-22- 2010
  * @return array
  */
-function convert_to_array($sql_result){
+function convert_to_array($sql_result) {
     $result_to_print = '<table>';
     foreach ($sql_result as $key => $data) {
         $result_to_print .= '<tr><td>'.date('d-m-Y (H:i:s)', $data['login']).'</td><td>'.api_time_to_hms($data['logout'] - $data['login']).'</tr></td>'."\n";
@@ -3091,7 +3091,7 @@ 
  * @version OCT-22- 2010
  * @return string
  */
-function convert_to_string($sql_result){
+function convert_to_string($sql_result) {
     $result_to_print = '<table>';
     if (!empty($sql_result)) {
         foreach ($sql_result as $key => $data) {
@@ -3116,18 +3116,18 @@ 
  */
 function grapher($sql_result, $start_date, $end_date, $type = "")
 {
-    if (empty($start_date)) { $start_date =""; }
-    if (empty($end_date)) { $end_date =""; }
-    if ($type == ""){ $type = 'day'; }
-    $main_year  = $main_month_year = $main_day = array();
+    if (empty($start_date)) { $start_date = ""; }
+    if (empty($end_date)) { $end_date = ""; }
+    if ($type == "") { $type = 'day'; }
+    $main_year = $main_month_year = $main_day = array();
     // get last 8 days/months
     $last_days      = 5;
     $last_months    = 3;
     for ($i = $last_days; $i >= 0; $i--) {
-        $main_day[date ('d-m-Y', mktime () - $i * 3600 * 24)] = 0;
+        $main_day[date('d-m-Y', mktime() - $i * 3600 * 24)] = 0;
     }
     for ($i = $last_months; $i >= 0; $i--) {
-        $main_month_year[date ('m-Y', mktime () - $i * 30 * 3600 * 24)] = 0;
+        $main_month_year[date('m-Y', mktime() - $i * 30 * 3600 * 24)] = 0;
     }
 
     $i = 0;
@@ -3163,7 +3163,7 @@ 
         /* Create and populate the pData object */
         $myData = new pData();
         $myData->addPoints($main_date, 'Serie1');
-        if (count($main_date)!= 1) {
+        if (count($main_date) != 1) {
             $myData->addPoints($labels, 'Labels');
             $myData->setSerieDescription('Labels', 'Months');
             $myData->setAbscissa('Labels');
@@ -3171,7 +3171,7 @@ 
         $myData->setSerieWeight('Serie1', 1);
         $myData->setSerieDescription('Serie1', get_lang('MyResults'));
         $myData->setAxisName(0, get_lang('Minutes'));
-        $myData->loadPalette(api_get_path(SYS_CODE_PATH) . 'palettes/pchart/default.color', true);
+        $myData->loadPalette(api_get_path(SYS_CODE_PATH).'palettes/pchart/default.color', true);
 
         // Cache definition
         $cachePath = api_get_path(SYS_ARCHIVE_PATH);
@@ -3180,9 +3180,9 @@ 
 
         if ($myCache->isInCache($chartHash)) {
             //if we already created the img
-            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
             $myCache->saveFromCache($chartHash, $imgPath);
-            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
         } else {
             /* Define width, height and angle */
             $mainWidth = 760;
@@ -3211,7 +3211,7 @@ 
             /* Set the default font */
             $myPicture->setFontProperties(
                 array(
-                    "FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    "FontName" => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                     "FontSize" => 10)
             );
             /* Write the chart title */
@@ -3228,7 +3228,7 @@ 
             /* Set the default font */
             $myPicture->setFontProperties(
                 array(
-                    "FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    "FontName" => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                     "FontSize" => 8
                 )
             );
@@ -3270,7 +3270,7 @@ 
             /* Draw the line chart */
             $myPicture->setFontProperties(
                 array(
-                    "FontName" => api_get_path(SYS_FONTS_PATH) . 'opensans/OpenSans-Regular.ttf',
+                    "FontName" => api_get_path(SYS_FONTS_PATH).'opensans/OpenSans-Regular.ttf',
                     "FontSize" => 10
                 )
             );
@@ -3289,15 +3289,15 @@ 
 
             /* Write and save into cache */
             $myCache->writeToCache($chartHash, $myPicture);
-            $imgPath = api_get_path(SYS_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(SYS_ARCHIVE_PATH).$chartHash;
             $myCache->saveFromCache($chartHash, $imgPath);
-            $imgPath = api_get_path(WEB_ARCHIVE_PATH) . $chartHash;
+            $imgPath = api_get_path(WEB_ARCHIVE_PATH).$chartHash;
         }
-        $html = '<img src="' . $imgPath . '">';
+        $html = '<img src="'.$imgPath.'">';
 
         return $html;
     } else {
-        $foo_img = api_convert_encoding('<div id="messages" class="warning-message">'.get_lang('GraphicNotAvailable').'</div>','UTF-8');
+        $foo_img = api_convert_encoding('<div id="messages" class="warning-message">'.get_lang('GraphicNotAvailable').'</div>', 'UTF-8');
 
         return $foo_img;
     }

Braces +3 added lines, -1 removed lines

@@ -2097,7 +2097,9 @@
                 FROM $tbl_course course
                 WHERE course.code IN (".implode(',',$courses_code).")";
 
-        if (!in_array($direction, array('ASC','DESC'))) $direction = 'ASC';
+        if (!in_array($direction, array('ASC','DESC'))) {
+            $direction = 'ASC';
+        }
 
         $column = intval($column);
         $from = intval($from);

main/inc/lib/nanogong.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
     }
 
     /**
-     * @return bool
+     * @return false|null
      */
     public function create_user_folder()
     {

Indentation +240 added lines, -240 removed lines

@@ -71,7 +71,7 @@ 
         ) {
             mkdir($this->store_path.$this->session_id.'/'.$this->exercise_id.'/'.$this->question_id.'/'.$this->user_id, $directoryPermissions);
         }
-	}
+    }
 
     /**
      * Setting parameters: course id, session id, etc
@@ -119,24 +119,24 @@ 
             $this->question_id = 0;
         }
 
-		$this->can_edit = false;
+        $this->can_edit = false;
 
-		if (api_is_allowed_to_edit()) {
-			$this->can_edit = true;
-		} else {
-			if ($this->user_id ==  api_get_user_id()) {
-				$this->can_edit = true;
-			}
-		}
+        if (api_is_allowed_to_edit()) {
+            $this->can_edit = true;
+        } else {
+            if ($this->user_id ==  api_get_user_id()) {
+                $this->can_edit = true;
+            }
+        }
 
-		// Settings the params array
-		$this->params = $params;
-		$this->store_path = api_get_path(SYS_COURSE_PATH).$this->course_info['path'].'/exercises/';
-		$this->create_user_folder();
-		$this->store_path = $this->store_path.implode('/', array($this->session_id, $this->exercise_id, $this->question_id, $this->user_id)).'/';
-		$this->filename = $this->generate_filename();
-		$this->store_filename = $this->store_path.$this->filename;
-	}
+        // Settings the params array
+        $this->params = $params;
+        $this->store_path = api_get_path(SYS_COURSE_PATH).$this->course_info['path'].'/exercises/';
+        $this->create_user_folder();
+        $this->store_path = $this->store_path.implode('/', array($this->session_id, $this->exercise_id, $this->question_id, $this->user_id)).'/';
+        $this->filename = $this->generate_filename();
+        $this->store_filename = $this->store_path.$this->filename;
+    }
 
     /**
      * Generates the filename with the next format:
@@ -187,30 +187,30 @@ 
         return $delete_found;
     }
 
-	/**
-	 *
-	 * Tricky stuff to deal with the feedback = 0 in exercises (all question per page)
+    /**
+     *
+     * Tricky stuff to deal with the feedback = 0 in exercises (all question per page)
      * @param int $exe_id
-	 */
+     */
     public function replace_with_real_exe($exe_id)
     {
-		$filename = null;
-		//@ugly fix
-		foreach($this->available_extensions as $extension) {
-			$items = explode('-', $this->filename);
-			$items[5] = 'temp_exe';
-			$filename = implode('-', $items);
-			if (is_file($this->store_path.$filename.'.'.$extension)) {
-				$old_name = $this->store_path.$filename.'.'.$extension;
-				$items = explode('-', $this->filename);
-				$items[5] = $exe_id;
-				$filename = $filename = implode('-', $items);
-				$new_name = $this->store_path.$filename.'.'.$extension;
-				rename($old_name, $new_name);
-				break;
-			}
-		}
-	}
+        $filename = null;
+        //@ugly fix
+        foreach($this->available_extensions as $extension) {
+            $items = explode('-', $this->filename);
+            $items[5] = 'temp_exe';
+            $filename = implode('-', $items);
+            if (is_file($this->store_path.$filename.'.'.$extension)) {
+                $old_name = $this->store_path.$filename.'.'.$extension;
+                $items = explode('-', $this->filename);
+                $items[5] = $exe_id;
+                $filename = $filename = implode('-', $items);
+                $new_name = $this->store_path.$filename.'.'.$extension;
+                rename($old_name, $new_name);
+                break;
+            }
+        }
+    }
 
     /**
      * @param bool $load_from_database
@@ -218,24 +218,24 @@ 
      */
     public function load_filename_if_exists($load_from_database = false)
     {
-		$filename = null;
-		//@ugly fix
-		foreach($this->available_extensions as $extension) {
-			if (is_file($this->store_path.$this->filename.'.'.$extension)) {
-				$filename = $this->filename.'.'.$extension;
-				break;
-			}
-		}
+        $filename = null;
+        //@ugly fix
+        foreach($this->available_extensions as $extension) {
+            if (is_file($this->store_path.$this->filename.'.'.$extension)) {
+                $filename = $this->filename.'.'.$extension;
+                break;
+            }
+        }
 
-		// temp_exe
-		if ($load_from_database) {
+        // temp_exe
+        if ($load_from_database) {
 
-			//Load the real filename just if exists
-			if (isset($this->params['exe_id']) && isset($this->params['user_id']) &&
+            //Load the real filename just if exists
+            if (isset($this->params['exe_id']) && isset($this->params['user_id']) &&
                 isset($this->params['question_id']) && isset($this->params['session_id']) && isset($this->params['course_id'])
             ) {
-				$attempt_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
-				$sql = "SELECT filename FROM $attempt_table
+                $attempt_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
+                $sql = "SELECT filename FROM $attempt_table
                         WHERE
                             exe_id = ".$this->params['exe_id']." AND
                             user_id = ".$this->params['user_id']." AND
@@ -243,107 +243,107 @@ 
                             session_id 	= ".$this->params['session_id']." AND
                             course_code = '".$this->course_info['code']."'
                         LIMIT 1";
-				$result = Database::query($sql);
-				$result = Database::fetch_row($result,'ASSOC');
+                $result = Database::query($sql);
+                $result = Database::fetch_row($result,'ASSOC');
 
-				if (isset($result) && isset($result[0]) && !empty($result[0])) {
-					$filename = $result[0];
-				}
-			}
-		}
+                if (isset($result) && isset($result[0]) && !empty($result[0])) {
+                    $filename = $result[0];
+                }
+            }
+        }
 
-		if (is_file($this->store_path.$filename)) {
-			return $this->store_path.$filename;
-		}
+        if (is_file($this->store_path.$filename)) {
+            return $this->store_path.$filename;
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 *
-	 * Get the URL of the file
-	 * path courses/XXX/exercises/(session_id)/(exercise_id)/(question_id)/(user_id)/
+    /**
+     *
+     * Get the URL of the file
+     * path courses/XXX/exercises/(session_id)/(exercise_id)/(question_id)/(user_id)/
      * @param int $force_download
-	 *
-	 * @return string
-	 */
+     *
+     * @return string
+     */
     public function get_public_url($force_download = 0)
     {
-		$params = $this->get_params();
-		$filename = basename($this->load_filename_if_exists());
+        $params = $this->get_params();
+        $filename = basename($this->load_filename_if_exists());
         $url = api_get_path(WEB_COURSE_PATH).$this->course_info['path'].'/exercises/'.$params['session_id'].'/'.$params['exercise_id'].'/'.$params['question_id'].'/'.$params['user_id'].'/'.$filename;
-		return $url;
-	}
+        return $url;
+    }
 
-	/**
-	 * Uploads the nanogong wav file
+    /**
+     * Uploads the nanogong wav file
      * @param bool
-	 */
-	public function upload_file($is_nano = false)
-	{
-		if (!empty($_FILES)) {
-			$upload_ok = process_uploaded_file($_FILES['file'], false);
-
-			if (!is_uploaded_file($_FILES['file']['tmp_name'])) {
-				return 0;
-			}
+     */
+    public function upload_file($is_nano = false)
+    {
+        if (!empty($_FILES)) {
+            $upload_ok = process_uploaded_file($_FILES['file'], false);
 
-			if ($upload_ok) {
-				// Check if there is enough space to save the file
-				if (!DocumentManager::enough_space($_FILES['file']['size'], DocumentManager::get_course_quota())) {
-					return 0;
-				}
+            if (!is_uploaded_file($_FILES['file']['tmp_name'])) {
+                return 0;
+            }
 
-				//first we delete everything before uploading the file
-				$this->delete_files();
+            if ($upload_ok) {
+                // Check if there is enough space to save the file
+                if (!DocumentManager::enough_space($_FILES['file']['size'], DocumentManager::get_course_quota())) {
+                    return 0;
+                }
 
-				//Reload the filename variable
-				$file_name = add_ext_on_mime($_FILES['file']['name'], $_FILES['file']['type']);
-				$file_name = strtolower($file_name);
-				$file_info = pathinfo($file_name);
+                //first we delete everything before uploading the file
+                $this->delete_files();
 
-				if ($is_nano == true) {
-					$file_info['extension'] = 'wav';
-				}
+                //Reload the filename variable
+                $file_name = add_ext_on_mime($_FILES['file']['name'], $_FILES['file']['type']);
+                $file_name = strtolower($file_name);
+                $file_info = pathinfo($file_name);
 
-				$file_name = $this->filename.'.'.$file_info['extension'];
+                if ($is_nano == true) {
+                    $file_info['extension'] = 'wav';
+                }
 
-				if (in_array($file_info['extension'], $this->available_extensions)) {
-					if (move_uploaded_file($_FILES['file']['tmp_name'], $this->store_path.$file_name)) {
-						$this->store_filename = $this->store_path.$file_name;
-						return 1;
-					}
-				}
-			}
-		}
+                $file_name = $this->filename.'.'.$file_info['extension'];
+
+                if (in_array($file_info['extension'], $this->available_extensions)) {
+                    if (move_uploaded_file($_FILES['file']['tmp_name'], $this->store_path.$file_name)) {
+                        $this->store_filename = $this->store_path.$file_name;
+                        return 1;
+                    }
+                }
+            }
+        }
 
-		return 0;
-	}
+        return 0;
+    }
 
-	/**
-	 * Show the audio file + a button to download
+    /**
+     * Show the audio file + a button to download
      * @param bool
-	 */
-	public function show_audio_file($show_delete_button = false)
-	{
-		$html = '';
-		$file_path = $this->load_filename_if_exists();
-
-		if (!empty($file_path)) {
-			$url = $this->get_public_url(true);
-			$actions = Display::url(Display::return_icon('save.png', get_lang('Download'), array(), ICON_SIZE_SMALL), $url, array('target'=>'_blank'));
-			$download_button = Display::url(get_lang('Download'), $url, array('class' =>'btn btn-default'));
-
-			if ($show_delete_button) {
-				$actions .= ' '.Display::url(Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL), "#", array('onclick'=>'delete_file();'));
-			}
+     */
+    public function show_audio_file($show_delete_button = false)
+    {
+        $html = '';
+        $file_path = $this->load_filename_if_exists();
+
+        if (!empty($file_path)) {
+            $url = $this->get_public_url(true);
+            $actions = Display::url(Display::return_icon('save.png', get_lang('Download'), array(), ICON_SIZE_SMALL), $url, array('target'=>'_blank'));
+            $download_button = Display::url(get_lang('Download'), $url, array('class' =>'btn btn-default'));
 
-			$basename = basename($file_path);
-			$path_info = pathinfo($basename);
+            if ($show_delete_button) {
+                $actions .= ' '.Display::url(Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL), "#", array('onclick'=>'delete_file();'));
+            }
 
-			if ($path_info['extension'] == 'wav') {
+            $basename = basename($file_path);
+            $path_info = pathinfo($basename);
 
-				$html .= '<script>
+            if ($path_info['extension'] == 'wav') {
+
+                $html .= '<script>
 				$(document).ready( function() {
 					var java_enabled = navigator.javaEnabled();
 
@@ -357,56 +357,56 @@ 
 				});
 				</script>';
 
-				$html .= '<div id="nanogong_player_id" class="nanogong_player_container">';
-					$html .= '<div class="action_player">'.$actions.'</div>';
-					$html .= '<div class="nanogong_player">';
-						$html .= '<applet id="nanogong_player" archive="'.api_get_path(WEB_LIBRARY_PATH).'nanogong/nanogong.jar" code="gong.NanoGong" width="250" height="95" ALIGN="middle">';
-						$html .= '<param name="ShowRecordButton" value="false" />'; // default true
-						$html .= '<param name="ShowSaveButton" value="false" />'; //you can save in local computer | (default true)
-						//echo '<param name="ShowAudioLevel" value="false" />'; //  it displays the audiometer | (default true)
-						$html .= '<param name="ShowTime" value="true" />'; // default false
-						$html .= '<param name="Color" value="#FFFFFF" />';
+                $html .= '<div id="nanogong_player_id" class="nanogong_player_container">';
+                    $html .= '<div class="action_player">'.$actions.'</div>';
+                    $html .= '<div class="nanogong_player">';
+                        $html .= '<applet id="nanogong_player" archive="'.api_get_path(WEB_LIBRARY_PATH).'nanogong/nanogong.jar" code="gong.NanoGong" width="250" height="95" ALIGN="middle">';
+                        $html .= '<param name="ShowRecordButton" value="false" />'; // default true
+                        $html .= '<param name="ShowSaveButton" value="false" />'; //you can save in local computer | (default true)
+                        //echo '<param name="ShowAudioLevel" value="false" />'; //  it displays the audiometer | (default true)
+                        $html .= '<param name="ShowTime" value="true" />'; // default false
+                        $html .= '<param name="Color" value="#FFFFFF" />';
                         $html .= '<param name="ShowSpeedButton" value="false" />';
-						//echo '<param name="StartTime" value="10.5" />';
-						//echo '<param name="EndTime" value="65" />';
-						$html .= '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
-						//$html .= '<param name="AudioFormat" value="Speex" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
-						//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
-						//echo '<param name="SamplingRate" value="32000" />';
-						//echo '<param name="MaxDuration" value="60" />';
-						$html .=  '<param name="SoundFileURL" value="'.$url.'" />';//load a file |(default "")
-						$html .= '</applet>';
-					$html .= '</div>';
-				$html .= '</div>';
+                        //echo '<param name="StartTime" value="10.5" />';
+                        //echo '<param name="EndTime" value="65" />';
+                        $html .= '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
+                        //$html .= '<param name="AudioFormat" value="Speex" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
+                        //Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
+                        //echo '<param name="SamplingRate" value="32000" />';
+                        //echo '<param name="MaxDuration" value="60" />';
+                        $html .=  '<param name="SoundFileURL" value="'.$url.'" />';//load a file |(default "")
+                        $html .= '</applet>';
+                    $html .= '</div>';
+                $html .= '</div>';
                 $html .= '<div id="nanogong_warning">'.Display::return_message(get_lang('BrowserDoesNotSupportNanogongPlayer'), 'warning').$download_button.'</div>';
 
-			} elseif(in_array($path_info['extension'],array('mp3', 'ogg','wav'))) {
-				$js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
-				$html .= '<link rel="stylesheet" href="'.$js_path.'jquery-jplayer/skin/blue.monday/css/jplayer.blue.monday.css" type="text/css">';
-				$html .= '<script type="text/javascript" src="'.$js_path.'jquery-jplayer/jplayer/jquery.jplayer.min.js"></script>';
+            } elseif(in_array($path_info['extension'],array('mp3', 'ogg','wav'))) {
+                $js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
+                $html .= '<link rel="stylesheet" href="'.$js_path.'jquery-jplayer/skin/blue.monday/css/jplayer.blue.monday.css" type="text/css">';
+                $html .= '<script type="text/javascript" src="'.$js_path.'jquery-jplayer/jplayer/jquery.jplayer.min.js"></script>';
 
-				$html .= '<div class="nanogong_player"></div>';
-				$html .= '<br /><div class="action_player">'.$actions.'</div><br /><br /><br />';
+                $html .= '<div class="nanogong_player"></div>';
+                $html .= '<br /><div class="action_player">'.$actions.'</div><br /><br /><br />';
 
                 $params = array(
                     'url' => $url,
                     'extension' =>$path_info['extension'],
                     'count'=> 1
-                 );
+                    );
                 $jquery = DocumentManager::generate_jplayer_jquery($params);
-				$html .= '<script>
+                $html .= '<script>
 				$(document).ready( function() {
 				    //Experimental changes to preview mp3, ogg files
 				     '.$jquery.'
 				});
 				</script>';
-				$html .= DocumentManager::generate_media_preview(1, 'advanced');
-			}
-		}
+                $html .= DocumentManager::generate_media_preview(1, 'advanced');
+            }
+        }
         return $html;
-	}
+    }
 
-	/*
+    /*
 	var filename = document.getElementById("audio_title").value+".wav";
 	var filename = filename.replace(/\s/g, "_");//replace spaces by _
 	var filename = encodeURIComponent(filename);
@@ -416,19 +416,19 @@ 
 	var urlnanogong="'.$url.'?filename="+filename+"&filepath="+filepath+"&dir="+dir+"&course_code="+course_code;
 	*/
 
-	/**
-	 * Returns the nanogong javascript code
-	 * @return string
-	 */
+    /**
+     * Returns the nanogong javascript code
+     * @return string
+     */
     public function return_js()
     {
-		$params = $this->get_params(true);
-		$url = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=save_file&'.$params.'&is_nano=1';
-		$url_load_file = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=show_audio&'.$params;
+        $params = $this->get_params(true);
+        $url = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=save_file&'.$params.'&is_nano=1';
+        $url_load_file = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=show_audio&'.$params;
 
-		$url_delete = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=delete&'.$params;
+        $url_delete = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=delete&'.$params;
 
-		$js =  '<script language="javascript">
+        $js =  '<script language="javascript">
 
 			//lang vars
 
@@ -544,77 +544,77 @@ 
 				return false;
 			}
 			</script>';
-		return $js;
-	}
+        return $js;
+    }
 
-	/**
-	 * Returns the HTML form to upload a nano file or upload a file
+    /**
+     * Returns the HTML form to upload a nano file or upload a file
      * @param string
-	 */
-	public function return_form($message = null)
+     */
+    public function return_form($message = null)
     {
 
-		$params = $this->get_params(true);
-		$url = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=save_file&'.$params;
+        $params = $this->get_params(true);
+        $url = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=save_file&'.$params;
 
-		//check browser support and load form
-		$array_browser = api_browser_support('check_browser');
+        //check browser support and load form
+        $array_browser = api_browser_support('check_browser');
 
-		$preview_file = $this->show_audio_file(true, true);
+        $preview_file = $this->show_audio_file(true, true);
 
         $preview_file = Display::div(
             $preview_file,
             array('id' => 'preview', 'style' => 'text-align:center; padding-left: 25px;')
         );
 
-		$html = '<center>';
+        $html = '<center>';
 
-		//Use normal upload file
-		$html .= Display::return_icon('microphone.png', get_lang('PressRecordButton'),'', ICON_SIZE_BIG);
-		$html .='<br />';
+        //Use normal upload file
+        $html .= Display::return_icon('microphone.png', get_lang('PressRecordButton'),'', ICON_SIZE_BIG);
+        $html .='<br />';
 
-		$html .= '<div id="nanogong_div">';
+        $html .= '<div id="nanogong_div">';
 
-		$html .= '<applet id="nanogong" archive="'.api_get_path(WEB_LIBRARY_PATH).'nanogong/nanogong.jar" code="gong.NanoGong" width="250" height="95" align="middle">';
-		//echo '<param name="ShowRecordButton" value="false" />'; // default true
-		// echo '<param name="ShowSaveButton" value="false" />'; //you can save in local computer | (default true)
+        $html .= '<applet id="nanogong" archive="'.api_get_path(WEB_LIBRARY_PATH).'nanogong/nanogong.jar" code="gong.NanoGong" width="250" height="95" align="middle">';
+        //echo '<param name="ShowRecordButton" value="false" />'; // default true
+        // echo '<param name="ShowSaveButton" value="false" />'; //you can save in local computer | (default true)
         $html .= '<param name="ShowSpeedButton" value="false" />'; // default true
-		//echo '<param name="ShowAudioLevel" value="false" />'; //  it displays the audiometer | (default true)
-		$html .= '<param name="ShowTime" value="true" />'; // default false
-		$html .= '<param name="Color" value="#FFFFFF" />'; // default #FFFFFF
-		//echo '<param name="StartTime" value="10.5" />';
-		//echo '<param name="EndTime" value="65" />';
-		$html .= '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
-		//$html .= '<param name="AudioFormat" value="Speex" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
+        //echo '<param name="ShowAudioLevel" value="false" />'; //  it displays the audiometer | (default true)
+        $html .= '<param name="ShowTime" value="true" />'; // default false
+        $html .= '<param name="Color" value="#FFFFFF" />'; // default #FFFFFF
+        //echo '<param name="StartTime" value="10.5" />';
+        //echo '<param name="EndTime" value="65" />';
+        $html .= '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
+        //$html .= '<param name="AudioFormat" value="Speex" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
 
-		//echo '<param name="SamplingRate" value="32000" />';//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
-		//echo '<param name="MaxDuration" value="60" />';
-		//echo '<param name="SoundFileURL" value="http://somewhere.com/mysoundfile.wav" />';//load a file |(default "")
-		$html .= '</applet>';
+        //echo '<param name="SamplingRate" value="32000" />';//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
+        //echo '<param name="MaxDuration" value="60" />';
+        //echo '<param name="SoundFileURL" value="http://somewhere.com/mysoundfile.wav" />';//load a file |(default "")
+        $html .= '</applet>';
 
-		$html .= '<br /><br /><br />';
+        $html .= '<br /><br /><br />';
 
         $html .= '<form name="form_nanogong_advanced">';
-		$html .= '<input type="hidden" name="is_nano" value="1">';
-		$html .= '<a href="#" class="btn btn-default"  onclick="send_voice()" />'.get_lang('SendRecord').'</a>';
-		$html .= '</form></div>';
+        $html .= '<input type="hidden" name="is_nano" value="1">';
+        $html .= '<a href="#" class="btn btn-default"  onclick="send_voice()" />'.get_lang('SendRecord').'</a>';
+        $html .= '</form></div>';
 
         $html .= Display::url(get_lang('ProblemsRecordingUploadYourOwnAudioFile'), 'javascript:void(0)', array('onclick' => 'show_simple_upload_form();'));
 
-		$html .= '<br /><br /><div id="no_nanogong_div">';
-		//$html .= Display::return_message(get_lang('BrowserNotSupportNanogongSend'), 'warning');
-		$html .= '<form id="form_nanogong_simple" class="form-search" action="'.$url.'" name="form_nanogong" method="POST" enctype="multipart/form-data">';
-		$html .= '<input type="file" name="file">';
-		$html .= '<a href="#" class="btn btn-default"  onclick="upload_file()" /><em class="fa fa-upload"></em> '.get_lang('UploadFile').'</a>';
-		$html .= '</form>';
+        $html .= '<br /><br /><div id="no_nanogong_div">';
+        //$html .= Display::return_message(get_lang('BrowserNotSupportNanogongSend'), 'warning');
+        $html .= '<form id="form_nanogong_simple" class="form-search" action="'.$url.'" name="form_nanogong" method="POST" enctype="multipart/form-data">';
+        $html .= '<input type="file" name="file">';
+        $html .= '<a href="#" class="btn btn-default"  onclick="upload_file()" /><em class="fa fa-upload"></em> '.get_lang('UploadFile').'</a>';
+        $html .= '</form>';
         $html .= '</div>';
-		$html .= '</center>';
-		$html .= '<div style="display:none" id="status_ok" class="confirmation-message"></div><div style="display:none" id="status_warning" class="warning-message"></div>';
-		$html .= '<div id="messages">'.$message.'</div>';
-		$html .= $preview_file;
+        $html .= '</center>';
+        $html .= '<div style="display:none" id="status_ok" class="confirmation-message"></div><div style="display:none" id="status_warning" class="warning-message"></div>';
+        $html .= '<div id="messages">'.$message.'</div>';
+        $html .= $preview_file;
 
-		return $html;
-	}
+        return $html;
+    }
 
     /**
      * @param bool $return_as_query
@@ -622,15 +622,15 @@ 
      */
     public function get_params($return_as_query = false)
     {
-		if (empty($this->params)) {
-			return false;
-		}
-		if ($return_as_query) {
-			return http_build_query($this->params);
-		}
+        if (empty($this->params)) {
+            return false;
+        }
+        if ($return_as_query) {
+            return http_build_query($this->params);
+        }
 
-		return $this->params;
-	}
+        return $this->params;
+    }
 
     /**
      * @param $attribute
@@ -638,18 +638,18 @@ 
      */
     public function get_param_value($attribute)
     {
-		if (isset($this->params[$attribute])) {
-			return $this->params[$attribute];
-		}
-	}
-
-	/**
-	 * Show a button to load the form
-	 * @return string
-	 */
+        if (isset($this->params[$attribute])) {
+            return $this->params[$attribute];
+        }
+    }
+
+    /**
+     * Show a button to load the form
+     * @return string
+     */
     public function show_button()
     {
-		$params_string = $this->get_params(true);
+        $params_string = $this->get_params(true);
 
         $url = api_get_path(WEB_AJAX_PATH)
             . 'nanogong.ajax.php?a=show_form&'
@@ -664,7 +664,7 @@ 
                 'data-title' => get_lang('RecordAnswer')
             ]
         );
-		$html .= '<br /><br />'.Display::return_message(get_lang('UseTheMessageBelowToAddSomeComments'));
-		return $html;
-	}
+        $html .= '<br /><br />'.Display::return_message(get_lang('UseTheMessageBelowToAddSomeComments'));
+        return $html;
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -124,7 +124,7 @@ 
 		if (api_is_allowed_to_edit()) {
 			$this->can_edit = true;
 		} else {
-			if ($this->user_id ==  api_get_user_id()) {
+			if ($this->user_id == api_get_user_id()) {
 				$this->can_edit = true;
 			}
 		}
@@ -196,7 +196,7 @@ 
     {
 		$filename = null;
 		//@ugly fix
-		foreach($this->available_extensions as $extension) {
+		foreach ($this->available_extensions as $extension) {
 			$items = explode('-', $this->filename);
 			$items[5] = 'temp_exe';
 			$filename = implode('-', $items);
@@ -220,7 +220,7 @@ 
     {
 		$filename = null;
 		//@ugly fix
-		foreach($this->available_extensions as $extension) {
+		foreach ($this->available_extensions as $extension) {
 			if (is_file($this->store_path.$this->filename.'.'.$extension)) {
 				$filename = $this->filename.'.'.$extension;
 				break;
@@ -244,7 +244,7 @@ 
                             course_code = '".$this->course_info['code']."'
                         LIMIT 1";
 				$result = Database::query($sql);
-				$result = Database::fetch_row($result,'ASSOC');
+				$result = Database::fetch_row($result, 'ASSOC');
 
 				if (isset($result) && isset($result[0]) && !empty($result[0])) {
 					$filename = $result[0];
@@ -369,18 +369,18 @@ 
                         $html .= '<param name="ShowSpeedButton" value="false" />';
 						//echo '<param name="StartTime" value="10.5" />';
 						//echo '<param name="EndTime" value="65" />';
-						$html .= '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
+						$html .= '<param name="AudioFormat" value="ImaADPCM" />'; // ImaADPCM (more speed), Speex (more compression)|(default Speex)
 						//$html .= '<param name="AudioFormat" value="Speex" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
 						//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
 						//echo '<param name="SamplingRate" value="32000" />';
 						//echo '<param name="MaxDuration" value="60" />';
-						$html .=  '<param name="SoundFileURL" value="'.$url.'" />';//load a file |(default "")
+						$html .= '<param name="SoundFileURL" value="'.$url.'" />'; //load a file |(default "")
 						$html .= '</applet>';
 					$html .= '</div>';
 				$html .= '</div>';
                 $html .= '<div id="nanogong_warning">'.Display::return_message(get_lang('BrowserDoesNotSupportNanogongPlayer'), 'warning').$download_button.'</div>';
 
-			} elseif(in_array($path_info['extension'],array('mp3', 'ogg','wav'))) {
+			} elseif (in_array($path_info['extension'], array('mp3', 'ogg', 'wav'))) {
 				$js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
 				$html .= '<link rel="stylesheet" href="'.$js_path.'jquery-jplayer/skin/blue.monday/css/jplayer.blue.monday.css" type="text/css">';
 				$html .= '<script type="text/javascript" src="'.$js_path.'jquery-jplayer/jplayer/jquery.jplayer.min.js"></script>';
@@ -428,7 +428,7 @@ 
 
 		$url_delete = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=delete&'.$params;
 
-		$js =  '<script language="javascript">
+		$js = '<script language="javascript">
 
 			//lang vars
 
@@ -570,8 +570,8 @@ 
 		$html = '<center>';
 
 		//Use normal upload file
-		$html .= Display::return_icon('microphone.png', get_lang('PressRecordButton'),'', ICON_SIZE_BIG);
-		$html .='<br />';
+		$html .= Display::return_icon('microphone.png', get_lang('PressRecordButton'), '', ICON_SIZE_BIG);
+		$html .= '<br />';
 
 		$html .= '<div id="nanogong_div">';
 
@@ -584,7 +584,7 @@ 
 		$html .= '<param name="Color" value="#FFFFFF" />'; // default #FFFFFF
 		//echo '<param name="StartTime" value="10.5" />';
 		//echo '<param name="EndTime" value="65" />';
-		$html .= '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
+		$html .= '<param name="AudioFormat" value="ImaADPCM" />'; // ImaADPCM (more speed), Speex (more compression)|(default Speex)
 		//$html .= '<param name="AudioFormat" value="Speex" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
 
 		//echo '<param name="SamplingRate" value="32000" />';//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)