chamilo / chamilo-lms

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

Spacing +2526 added lines, -2526 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');
 /*********************************************************************************/
 /*********************************************************************************/
 /**
@@ -96,15 +96,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();
     }
@@ -120,8 +120,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;
@@ -138,8 +138,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;
     }
     /*********************************************************************************/
@@ -154,8 +154,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;
@@ -172,8 +172,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;
     }
@@ -193,9 +193,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;
@@ -212,7 +212,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.
@@ -228,7 +228,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';
     }
     /*********************************************************************************/
     /**
@@ -245,9 +245,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;
@@ -274,8 +274,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;
     }
@@ -291,29 +291,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;
     }
@@ -327,14 +327,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;
     }
     /*********************************************************************************/
@@ -347,39 +347,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++;
                     }
@@ -399,41 +399,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++;
                     }
@@ -452,23 +452,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;
     }
@@ -481,23 +481,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;
@@ -505,32 +505,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();
                 }
@@ -551,7 +551,7 @@ 
                 return $this->unique_id;
                 break;
             case 'URL':
-                if( !empty( $this->url ))
+                if (!empty($this->url))
                     return $this->url;
                 else
                     return FALSE;
@@ -567,12 +567,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':
@@ -580,11 +580,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;
@@ -595,16 +595,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;
@@ -612,7 +612,7 @@ 
                     else
                         return FALSE;
                 }
-                elseif( FALSE !== touch( $dirfile )) {
+                elseif (FALSE !== touch($dirfile)) {
                     /* new local file created */
                     $this->filename = $value;
                     return TRUE;
@@ -621,8 +621,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;
@@ -632,46 +632,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
                 }
@@ -690,8 +690,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
@@ -702,33 +702,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;
             }
         }
@@ -743,49 +743,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;
     }
     /**
@@ -812,242 +812,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;
     }
@@ -1061,48 +1061,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;
             }
@@ -1123,79 +1123,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;
     }
     /**
@@ -1207,104 +1207,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;
@@ -1335,74 +1335,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};
@@ -1410,46 +1410,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;
     }
     /*********************************************************************************/
@@ -1462,7 +1462,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.
@@ -1478,38 +1478,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;
@@ -1536,7 +1536,7 @@ 
             }
             $calendarInit2 = ']'.$calendarInit2;
         }
-        switch( $this->format ) {
+        switch ($this->format) {
             case 'xcal':
                 $calendar .= '</vcalendar>'.$this->nl;
                 break;
@@ -1554,18 +1554,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();
     }
@@ -1579,20 +1579,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
@@ -1610,38 +1610,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();
         }
@@ -1690,8 +1690,8 @@ 
      * @since 2.4.19 - 2008-10-23
      */
     function __construct() {
-        $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();
 
@@ -1717,11 +1717,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
@@ -1732,9 +1732,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;
     }
     /*********************************************************************************/
@@ -1749,14 +1749,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;
     }
@@ -1770,9 +1770,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;
     }
     /*********************************************************************************/
@@ -1787,26 +1787,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,12 +1820,12 @@ 
                                 $attendee11 = $this->intAttrDelimiter.'MEMBER=';
                             //no break
                             case 'DELEGATED-TO':
-                                $attendee11 = ( !$attendee11 ) ? $this->intAttrDelimiter.'DELEGATED-TO='   : $attendee11;
+                                $attendee11 = (!$attendee11) ? $this->intAttrDelimiter.'DELEGATED-TO=' : $attendee11;
                             //no break
                             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;
@@ -1846,7 +1846,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;
     }
@@ -1860,63 +1860,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;
     }
     /*********************************************************************************/
@@ -1931,23 +1931,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;
     }
@@ -1961,9 +1961,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;
     }
     /*********************************************************************************/
@@ -1978,11 +1978,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
@@ -1993,9 +1993,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;
     }
     /*********************************************************************************/
@@ -2010,16 +2010,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;
     }
@@ -2033,9 +2033,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;
     }
     /*********************************************************************************/
@@ -2050,19 +2050,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
@@ -2078,16 +2078,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;
     }
     /*********************************************************************************/
@@ -2102,15 +2102,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;
     }
@@ -2124,9 +2124,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;
     }
     /*********************************************************************************/
@@ -2141,10 +2141,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
@@ -2160,11 +2160,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;
     }
     /*********************************************************************************/
@@ -2179,15 +2179,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;
     }
@@ -2201,9 +2201,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;
     }
     /*********************************************************************************/
@@ -2218,19 +2218,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
@@ -2247,16 +2247,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;
     }
     /*********************************************************************************/
@@ -2271,16 +2271,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
@@ -2290,12 +2290,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;
     }
     /**
@@ -2312,11 +2312,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;
     }
     /*********************************************************************************/
@@ -2331,21 +2331,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
@@ -2362,16 +2362,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;
     }
     /*********************************************************************************/
@@ -2386,19 +2386,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
@@ -2414,16 +2414,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;
     }
     /*********************************************************************************/
@@ -2438,17 +2438,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
@@ -2463,20 +2463,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;
     }
     /*********************************************************************************/
@@ -2491,36 +2491,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;
     }
@@ -2534,44 +2534,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;
     }
     /*********************************************************************************/
@@ -2586,8 +2586,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
@@ -2599,9 +2599,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;
     }
     /*********************************************************************************/
@@ -2616,47 +2616,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;
     }
@@ -2671,52 +2671,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;
+                $freebusyPeriod[] = $freebusyPairMember;
             }
-            $input[]              = $freebusyPeriod;
+            $input[] = $freebusyPeriod;
         }
-        $this->_setMval( $this->freebusy, $input, $params, FALSE, $index );
+        $this->_setMval($this->freebusy, $input, $params, FALSE, $index);
         return TRUE;
     }
     /*********************************************************************************/
@@ -2731,15 +2731,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
@@ -2751,15 +2751,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;
@@ -2776,10 +2776,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
@@ -2795,10 +2795,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;
     }
     /*********************************************************************************/
@@ -2813,12 +2813,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
@@ -2829,9 +2829,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;
     }
     /*********************************************************************************/
@@ -2846,13 +2846,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
@@ -2863,14 +2863,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;
     }
@@ -2886,11 +2886,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
@@ -2901,9 +2901,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;
     }
     /*********************************************************************************/
@@ -2918,11 +2918,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
@@ -2933,9 +2933,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;
     }
     /*********************************************************************************/
@@ -2950,91 +2950,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;
     }
@@ -3048,93 +3048,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;
     }
     /*********************************************************************************/
@@ -3149,12 +3149,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
@@ -3170,16 +3170,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;
     }
     /*********************************************************************************/
@@ -3194,18 +3194,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;
     }
@@ -3219,12 +3219,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;
     }
     /*********************************************************************************/
@@ -3239,11 +3239,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
@@ -3254,9 +3254,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;
     }
     /*********************************************************************************/
@@ -3270,19 +3270,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;
     }
@@ -3298,12 +3298,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;
     }
     /*********************************************************************************/
@@ -3318,22 +3318,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;
     }
@@ -3347,9 +3347,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;
     }
     /*********************************************************************************/
@@ -3364,8 +3364,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
@@ -3377,9 +3377,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;
     }
     /*********************************************************************************/
@@ -3393,11 +3393,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
@@ -3407,10 +3407,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;
     }
     /*********************************************************************************/
@@ -3425,11 +3425,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
@@ -3440,9 +3440,9 @@ 
      * @param mixed $params optional (array or false)
      * @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;
     }
     /*********************************************************************************/
@@ -3457,12 +3457,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
@@ -3473,9 +3473,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;
     }
     /*********************************************************************************/
@@ -3490,11 +3490,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
@@ -3505,9 +3505,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;
     }
     /*********************************************************************************/
@@ -3522,23 +3522,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
@@ -3557,86 +3557,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;
@@ -3653,11 +3653,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
@@ -3668,9 +3668,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;
     }
     /*********************************************************************************/
@@ -3686,14 +3686,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;
     }
@@ -3707,9 +3707,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;
     }
     /*********************************************************************************/
@@ -3724,11 +3724,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
@@ -3739,9 +3739,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;
     }
     /*********************************************************************************/
@@ -3756,11 +3756,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
@@ -3771,9 +3771,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;
     }
     /*********************************************************************************/
@@ -3788,11 +3788,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
@@ -3803,9 +3803,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;
     }
     /*********************************************************************************/
@@ -3820,10 +3820,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
@@ -3837,13 +3837,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
@@ -3854,9 +3854,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;
     }
     /*********************************************************************************/
@@ -3871,11 +3871,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
@@ -3886,9 +3886,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;
     }
     /*********************************************************************************/
@@ -3903,22 +3903,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;
     }
@@ -3932,14 +3932,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,11 +3952,11 @@ 
      * @return string
      */
     function _createFormat() {
-        $objectname                   = null;
-        switch( $this->format ) {
+        $objectname = null;
+        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   = '</';
@@ -3966,8 +3966,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:';
@@ -3993,82 +3993,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;
@@ -4076,18 +4076,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;
         }
     }
@@ -4100,36 +4100,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;
@@ -4143,47 +4143,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;
         }
     }
@@ -4198,28 +4198,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;
     }
     /**
@@ -4231,19 +4231,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;
     }
     /**
@@ -4255,13 +4255,13 @@ 
      * @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;
+                    $output['year'] = $datePart;
                     break;
                 case '1':
                 case 'month':
@@ -4269,40 +4269,40 @@ 
                     break;
                 case '2':
                 case 'day':
-                    $output['day']   = $datePart;
+                    $output['day'] = $datePart;
                     break;
             }
-            if( 3 != $parno ) {
-                switch ( $dateKey ) {
+            if (3 != $parno) {
+                switch ($dateKey) {
                     case '0':
                     case '1':
                     case '2':
                         break;
                     case '3':
                     case 'hour':
-                        $output['hour']  = $datePart;
+                        $output['hour'] = $datePart;
                         break;
                     case '4':
                     case 'min':
-                        $output['min']   = $datePart;
+                        $output['min'] = $datePart;
                         break;
                     case '5':
                     case 'sec':
-                        $output['sec']   = $datePart;
+                        $output['sec'] = $datePart;
                         break;
                     case '6':
                     case 'tz':
-                        $output['tz']    = $datePart;
+                        $output['tz'] = $datePart;
                         break;
                 }
             }
         }
-        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;
@@ -4316,88 +4316,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['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 );
+        $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);
             }
-            if( !empty( $tz ))
-                $output['tz']  = $tz;
+            if (!empty($tz))
+                $output['tz'] = $tz;
         }
         return $output;
     }
@@ -4409,62 +4409,62 @@ 
      * @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;
+                        $output['week'] = $durValue;
                         break;
                     case '1':
                     case 'day':
-                        $output['day']   = $durValue;
+                        $output['day'] = $durValue;
                         break;
                     case '2':
                     case 'hour':
-                        $output['hour']  = $durValue;
+                        $output['hour'] = $durValue;
                         break;
                     case '3':
                     case 'min':
-                        $output['min']   = $durValue;
+                        $output['min'] = $durValue;
                         break;
                     case '4':
                     case 'sec':
-                        $output['sec']   = $durValue;
+                        $output['sec'] = $durValue;
                         break;
                 }
             }
         }
-        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;
     }
@@ -4477,43 +4477,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['tz']   = $d1['tz'];
-        if( $dateOnly && (( 0 == $dtend2['hour'] ) && ( 0 == $dtend2['min'] ) && ( 0 == $dtend2['sec'] )))
-            unset( $dtend2['hour'], $dtend2['min'], $dtend2['sec'] );
+        $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']);
         return $dtend2;
     }
     /**
@@ -4524,21 +4524,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;
@@ -4560,13 +4560,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
@@ -4581,15 +4581,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;
                 }
             }
@@ -4605,48 +4605,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;
@@ -4659,26 +4659,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'] ))
-            $output   .= $duration['week'].'W';
+        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;
@@ -4692,23 +4692,23 @@ 
      * @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':
                     case 'INTERVAL':
@@ -4724,9 +4724,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;
                             }
                         } else {
@@ -4736,12 +4736,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;
@@ -4750,8 +4750,8 @@ 
                                 $bydaycnt++;
                             }
                             else {
-                                $content2 .= ( $bydaycnt ) ? ',' : null;
-                                if( 'DAY' != strtoupper( $vix ))
+                                $content2 .= ($bydaycnt) ? ',' : null;
+                                if ('DAY' != strtoupper($vix))
                                     $content21 .= $valuePart;
                                 else {
                                     $content22 .= $valuePart;
@@ -4766,7 +4766,7 @@ 
                         break;
                 }
             }
-            $output .= $this->_createElement( $recurlabel, $attributes, $content1.$content2 );
+            $output .= $this->_createElement($recurlabel, $attributes, $content1.$content2);
         }
         return $output;
     }
@@ -4778,13 +4778,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;
         }
     }
@@ -4796,25 +4796,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;
     }
     /**
@@ -4825,8 +4825,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
@@ -4836,17 +4836,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;
 
@@ -4859,15 +4859,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;
     }
     /**
@@ -4885,101 +4885,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]++;
@@ -4987,64 +4987,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
@@ -5052,69 +5052,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;
                         }
@@ -5123,25 +5123,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;
@@ -5150,7 +5150,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
                     }
@@ -5159,39 +5159,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'] )) {
-                $bysetpos       = FALSE;
-                if( isset( $recur['FREQ'] ) && ( 'YEARLY'  == $recur['FREQ'] ) &&
-                    ( $bysetposYold != $wdate['year'] )) {
+            if ($updateOK && isset($recur['BYSETPOS'])) {
+                $bysetpos = FALSE;
+                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;
                     }
@@ -5199,18 +5199,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;
@@ -5219,18 +5219,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;
@@ -5238,8 +5238,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:
@@ -5256,22 +5256,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 )
-                $input[$rexrulelabel]   = $rexrulevalue;
+        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';
             }
         }
@@ -5292,85 +5292,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'] )) {
-                $tz            = null;
+            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;
     }
@@ -5388,37 +5388,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;
     }
@@ -5434,18 +5434,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
@@ -5458,31 +5458,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
@@ -5494,13 +5494,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;
         }
     }
@@ -5513,20 +5513,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;
@@ -5539,19 +5539,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;
     }
     /*********************************************************************************/
@@ -5564,24 +5564,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;
@@ -5599,58 +5599,58 @@ 
                 break;
             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 (!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;
         }
@@ -5664,47 +5664,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
                 }
@@ -5722,248 +5722,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++;
                     }
@@ -5983,11 +5983,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
@@ -6002,183 +6002,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++;
                     }
@@ -6199,105 +6199,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;
     }
@@ -6311,18 +6311,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;
                     }
@@ -6331,217 +6331,217 @@ 
                 }
             }
             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-' );
-        $proprows  = array();
-        foreach( $this->unparsed as $line ) {
+        , 'tzoffsetto', 'tzurl', 'uid', 'url', 'x-');
+        $proprows = array();
+        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);
                     }
                 //no break
                 case 'X-':
-                    $propname = ( isset( $propname2 )) ? $propname2 : $propname;
+                    $propname = (isset($propname2)) ? $propname2 : $propname;
                 //no break
                 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;
                                     }
@@ -6549,39 +6549,39 @@ 
                                 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();
             }
         }
@@ -6598,7 +6598,7 @@ 
     function copy() {
         $serialized_contents = serialize($this);
         $copy = unserialize($serialized_contents);
-        unset( $copy->propix );
+        unset($copy->propix);
         return $copy;
     }
     /*********************************************************************************/
@@ -6612,34 +6612,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;
             }
         }
@@ -6654,50 +6654,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;
     }
     /**
@@ -6708,8 +6708,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
@@ -6721,49 +6721,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;
             }
@@ -6781,15 +6781,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;
     }
@@ -6816,21 +6816,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;
     }
@@ -6842,38 +6842,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;
@@ -6886,10 +6886,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;
     }
@@ -6986,7 +6986,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();
@@ -7023,8 +7023,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;
@@ -7123,7 +7123,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();
@@ -7161,8 +7161,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;
@@ -7241,7 +7241,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();
@@ -7270,8 +7270,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;
@@ -7328,7 +7328,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();
@@ -7345,8 +7345,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;
@@ -7397,7 +7397,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();
@@ -7445,11 +7445,11 @@ 
      * @since 2.5.1 - 2008-10-31
      * @param string $timezonetype optional, default FALSE ( STANDARD / DAYLIGHT )
      */
-    function __construct($timezonetype=false) {
+    function __construct($timezonetype = false) {
         if (!$timezonetype) {
             $this->timezonetype = 'VTIMEZONE';
         } else {
-            $this->timezonetype = strtoupper( $timezonetype );
+            $this->timezonetype = strtoupper($timezonetype);
         }
         $this->calendarComponent();
 
@@ -7475,7 +7475,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();
@@ -7491,8 +7491,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 +2268 added lines, -1344 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' );
 /*********************************************************************************/
@@ -96,8 +98,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');
@@ -120,7 +123,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;
@@ -139,7 +144,9 @@ 
      * @return void
      */
     function setCalscale( $value ) {
-        if( empty( $value )) return FALSE;
+        if( empty( $value )) {
+            return FALSE;
+        }
         $this->calscale = $value;
     }
     /*********************************************************************************/
@@ -154,7 +161,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;
@@ -173,7 +182,9 @@ 
      * @return bool
      */
     function setMethod( $value ) {
-        if( empty( $value )) return FALSE;
+        if( empty( $value )) {
+            return FALSE;
+        }
         $this->method = $value;
         return TRUE;
     }
@@ -193,8 +204,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;
@@ -245,8 +257,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;
@@ -275,7 +288,9 @@ 
      * @return void
      */
     function setVersion( $value ) {
-        if( empty( $value )) return FALSE;
+        if( empty( $value )) {
+            return FALSE;
+        }
         $this->version = $value;
         return TRUE;
     }
@@ -291,10 +306,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' ));
@@ -307,12 +324,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;
@@ -328,12 +346,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;
     }
@@ -349,8 +375,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 ) {
@@ -369,18 +396,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++;
                     }
                 }
@@ -402,8 +434,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 ) {
@@ -414,8 +447,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':
@@ -423,19 +457,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 ??
                 }
@@ -454,8 +492,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] ) {
@@ -466,8 +505,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;
@@ -490,7 +533,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;
@@ -505,8 +550,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':
@@ -519,10 +565,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;
@@ -530,8 +579,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;
@@ -551,10 +601,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;
         }
     }
@@ -582,17 +633,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 );
@@ -608,17 +660,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 );
@@ -626,8 +677,7 @@ 
                     $this->format             = 'xcal';
                     $this->attributeDelimiter = $this->nl;
                     $this->valueInit          = null;
-                }
-                else {
+                } else {
                     $this->format             = null;
                     $this->attributeDelimiter = ';';
                     $this->valueInit          = ':';
@@ -666,13 +716,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
                 }
             }
@@ -707,27 +760,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;
             }
@@ -749,37 +801,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();
             }
@@ -814,46 +868,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 );
@@ -887,8 +963,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
@@ -906,55 +983,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'];
@@ -964,16 +1061,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';
@@ -982,30 +1079,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
@@ -1013,19 +1117,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
@@ -1039,8 +1153,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] );
@@ -1062,8 +1177,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' ));
@@ -1082,27 +1198,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;
             }
@@ -1129,73 +1244,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] ))
+            if    ( empty( $astart[$key] )) {
                 return -1;
-            elseif(( (int) $astart[$key] ) > ((int) $bstart[$key] ))
+            } 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;
     }
     /**
@@ -1210,42 +1376,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] );
@@ -1255,34 +1436,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;
                 }
@@ -1293,17 +1477,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();
@@ -1352,8 +1537,7 @@ 
                     $newProp = FALSE;
                     $lastix++;
                     $proprows[$lastix]  = $line;
-                }
-                else {
+                } else {
                     /* remove line breaks */
                     if(( '\n' == substr( $proprows[$lastix], -2 )) &&
                         (  ' ' == substr( $line, 0, 1 ))) {
@@ -1365,19 +1549,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();
@@ -1402,20 +1589,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, ',' )) {
@@ -1429,13 +1618,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 );
@@ -1444,12 +1634,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;
     }
     /*********************************************************************************/
@@ -1481,8 +1673,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:
@@ -1490,9 +1683,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' ));
@@ -1505,8 +1701,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
@@ -1559,10 +1757,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' );
@@ -1580,23 +1779,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
@@ -1615,15 +1819,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();
@@ -1631,10 +1839,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' );
@@ -1644,9 +1853,9 @@ 
                 fclose( $fp );
             }
             die();
+        } else {
+                    return FALSE;
         }
-        else
-            return FALSE;
     }
 }
 /*********************************************************************************/
@@ -1717,9 +1926,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'] );
     }
@@ -1733,7 +1945,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;
     }
@@ -1749,14 +1965,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;
     }
@@ -1771,7 +1990,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;
     }
@@ -1787,19 +2010,22 @@ 
      * @return string
      */
     function createAttendee() {
-        if( empty( $this->attendee )) return FALSE;
-        $output = null;
+        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 )) {
@@ -1861,7 +2087,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();
@@ -1877,16 +2107,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;
@@ -1896,14 +2127,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' );
@@ -1913,8 +2146,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;
@@ -1931,22 +2165,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;
@@ -1962,7 +2200,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;
     }
@@ -1978,9 +2220,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'] );
     }
@@ -1994,7 +2239,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;
     }
@@ -2010,11 +2259,15 @@ 
      * @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' );
+                if( $this->getConfig( 'allowEmpty' )) {
+                    $output .= $this->_createElement( 'COMMENT' );
+                }
                 continue;
             }
             $attributes = $this->_createParams( $commentPart['params'], array( 'ALTREP', 'LANGUAGE' ));
@@ -2034,7 +2287,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;
     }
@@ -2050,16 +2307,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 );
@@ -2083,9 +2344,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;
@@ -2102,15 +2363,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;
     }
@@ -2125,7 +2389,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;
     }
@@ -2141,7 +2409,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 );
@@ -2179,15 +2449,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;
     }
@@ -2202,7 +2475,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;
     }
@@ -2218,16 +2496,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 );
@@ -2252,9 +2534,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;
@@ -2276,8 +2558,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 );
@@ -2313,10 +2596,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;
     }
     /*********************************************************************************/
@@ -2331,18 +2615,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 );
@@ -2367,9 +2656,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;
@@ -2386,16 +2675,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 );
@@ -2419,9 +2712,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;
@@ -2438,15 +2731,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'] ));
     }
@@ -2464,19 +2761,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;
     }
     /*********************************************************************************/
@@ -2491,31 +2793,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;
             }
@@ -2539,34 +2847,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'] );
@@ -2586,7 +2899,9 @@ 
      * @return string
      */
     function createExrule() {
-        if( empty( $this->exrule )) return FALSE;
+        if( empty( $this->exrule )) {
+            return FALSE;
+        }
         return $this->_format_recur( 'EXRULE', $this->exrule );
     }
     /**
@@ -2600,7 +2915,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;
     }
@@ -2616,11 +2935,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;
@@ -2628,9 +2951,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']);
@@ -2639,21 +2962,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 );
@@ -2676,14 +3002,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();
@@ -2693,22 +3020,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';
                 }
@@ -2731,9 +3055,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, '.', '');
@@ -2753,15 +3080,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;
     }
     /*********************************************************************************/
@@ -2776,7 +3105,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 );
@@ -2796,8 +3127,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;
     }
@@ -2813,9 +3145,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 );
@@ -2830,7 +3165,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;
     }
@@ -2846,9 +3185,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'];
@@ -2864,13 +3206,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;
     }
@@ -2886,9 +3233,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'] );
     }
@@ -2902,7 +3252,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;
     }
@@ -2918,9 +3272,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'] );
     }
@@ -2934,7 +3291,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;
     }
@@ -2950,18 +3311,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;
@@ -2970,68 +3337,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 );
@@ -3053,9 +3436,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' ))) {
@@ -3069,15 +3452,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;
@@ -3085,48 +3472,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;
         }
@@ -3149,9 +3548,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 );
@@ -3175,9 +3577,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;
@@ -3194,11 +3596,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'] );
@@ -3220,9 +3626,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;
@@ -3239,9 +3650,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'] );
     }
@@ -3255,7 +3669,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;
     }
@@ -3270,18 +3688,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;
@@ -3299,10 +3722,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;
     }
@@ -3318,21 +3746,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;
@@ -3348,7 +3781,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;
     }
@@ -3364,7 +3801,9 @@ 
      * @return string
      */
     function createRrule() {
-        if( empty( $this->rrule )) return FALSE;
+        if( empty( $this->rrule )) {
+            return FALSE;
+        }
         return $this->_format_recur( 'RRULE', $this->rrule );
     }
     /**
@@ -3378,7 +3817,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;
     }
@@ -3393,9 +3836,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'] );
     }
@@ -3408,8 +3854,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;
     }
@@ -3425,9 +3872,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'] );
     }
@@ -3441,7 +3891,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;
     }
@@ -3457,9 +3911,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 );
@@ -3474,9 +3931,13 @@ 
      * @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;
+        if( empty( $value )) {
+            if( $this->getConfig( 'allowEmpty' )) $value = null;
+        } else {
+            return FALSE;
+        }
+        $this->summary = array( 'value' => $value, 'params' => $this->_setParams( $params ));
+        return TRUE;
     }
     /*********************************************************************************/
     /**
@@ -3490,9 +3951,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'] );
     }
@@ -3506,7 +3970,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;
     }
@@ -3522,19 +3990,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'] );
@@ -3558,28 +4031,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;
@@ -3590,24 +4065,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;
@@ -3622,8 +4100,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
@@ -3632,11 +4109,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;
@@ -3653,9 +4140,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'] ));
     }
@@ -3669,7 +4159,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;
     }
@@ -3686,14 +4180,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;
     }
@@ -3708,7 +4205,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;
     }
@@ -3724,9 +4225,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'] );
     }
@@ -3740,7 +4244,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;
     }
@@ -3756,9 +4264,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'] );
     }
@@ -3772,7 +4283,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;
     }
@@ -3788,9 +4303,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'] );
     }
@@ -3804,7 +4322,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;
     }
@@ -3820,8 +4342,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'] );
     }
@@ -3840,8 +4363,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' );
     }
@@ -3855,7 +4379,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;
     }
@@ -3871,9 +4398,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'] );
     }
@@ -3887,7 +4417,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;
     }
@@ -3903,21 +4437,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;
@@ -3933,12 +4472,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;
     }
@@ -4006,30 +4553,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 ))) {
@@ -4039,8 +4585,7 @@ 
                         $attributes .= '"'.htmlspecialchars( $attrValue ).'"';
                     }
                 }
-            }
-            else {
+            } else {
                 $attributes = str_replace( $this->intAttrDelimiter, $this->attributeDelimiter, $attributes );
             }
         }
@@ -4062,8 +4607,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;
@@ -4107,30 +4651,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;
     }
@@ -4144,47 +4688,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;
+            }
         }
     }
     /**
@@ -4200,14 +4754,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;
@@ -4233,15 +4791,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;
@@ -4298,12 +4864,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;
     }
@@ -4323,39 +4892,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 );
@@ -4364,8 +4931,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 )
@@ -4385,10 +4951,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 ))) {
@@ -4396,8 +4962,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;
     }
@@ -4424,10 +4991,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':
@@ -4457,14 +5025,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;
     }
@@ -4481,28 +5057,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 );
@@ -4510,10 +5090,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;
     }
     /**
@@ -4527,10 +5109,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 );
@@ -4560,10 +5144,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 );
@@ -4582,10 +5169,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] ))) {
@@ -4611,13 +5200,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'] )  ||
@@ -4625,29 +5216,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;
     }
@@ -4664,14 +5259,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'] ))) {
@@ -4696,7 +5293,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;
@@ -4741,19 +5340,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++;
                                 }
@@ -4797,24 +5396,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;
     }
     /**
@@ -4838,16 +5445,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;
 
     }
@@ -4860,14 +5468,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;
     }
     /**
@@ -4886,7 +5509,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 ) {
@@ -4895,43 +5520,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 );
@@ -4944,11 +5580,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);
@@ -4957,10 +5594,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();
@@ -4969,8 +5608,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();
@@ -4987,8 +5627,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;
@@ -4996,9 +5637,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;
                         }
@@ -5006,8 +5647,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-- ) {
@@ -5026,8 +5668,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);
+                        }
                     }
                 }
             }
@@ -5038,36 +5681,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;
@@ -5075,42 +5724,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 ) ||
@@ -5127,12 +5779,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'] )  &&
@@ -5141,13 +5793,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
@@ -5167,21 +5819,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'] ))) {
@@ -5194,14 +5843,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
@@ -5210,8 +5860,9 @@ 
                             }
                             $countcnt++;
                         }
-                        if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] ))
-                            break;
+                        if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] )) {
+                                                    break;
+                        }
                     }
                     $bysetposarr1 = $bysetposarr2;
                     $bysetposarr2 = array();
@@ -5221,12 +5872,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 */
@@ -5258,21 +5910,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;
@@ -5296,7 +5954,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';
@@ -5306,9 +5966,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';
@@ -5318,9 +5979,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';
@@ -5329,17 +5991,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;
             }
@@ -5355,23 +6016,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;
     }
     /**
@@ -5393,16 +6059,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
@@ -5412,14 +6075,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;
     }
     /**
@@ -5435,15 +6102,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 );
     }
@@ -5459,27 +6128,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;
@@ -5495,13 +6168,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;
+            }
         }
     }
     /**
@@ -5515,8 +6190,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 )
@@ -5526,8 +6202,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;
     }
@@ -5545,8 +6222,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';
@@ -5574,7 +6252,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;
@@ -5600,57 +6280,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;
         }
@@ -5699,13 +6468,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
                 }
             }
@@ -5723,12 +6495,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;
@@ -5782,8 +6557,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;
@@ -5937,8 +6713,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;
@@ -5953,18 +6730,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++;
                     }
                 }
@@ -5984,9 +6766,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;
     }
     /**
@@ -6003,184 +6789,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 ??
                 }
@@ -6199,15 +7078,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] )))
+        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':
@@ -6321,20 +7206,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'
@@ -6358,8 +7242,7 @@ 
                 $newProp = FALSE;
                 $lastix++;
                 $proprows[$lastix]  = $line;
-            }
-            else {
+            } else {
                 /* remove line breaks */
                 if(( '\n' == substr( $proprows[$lastix], -2 )) &&
                     (  ' ' == substr( $line, 0, 1 ))) {
@@ -6372,14 +7255,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};
                 }
             }
@@ -6412,27 +7296,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;
@@ -6450,13 +7337,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 );
                     }
                 //no break
                 case 'X-':
@@ -6467,8 +7355,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;
@@ -6488,15 +7377,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':
@@ -6511,8 +7402,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;
@@ -6521,8 +7413,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 ) {
@@ -6536,37 +7430,43 @@ 
                                         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;
                         } // end - switch $rulelabel
@@ -6581,8 +7481,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();
+                }
             }
         }
     }
@@ -6613,32 +7514,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;
             }
@@ -6655,43 +7557,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();
             }
@@ -6722,9 +7628,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' ));
@@ -6743,27 +7652,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;
             }
@@ -6782,9 +7690,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' ));
@@ -6822,16 +7733,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;
     }
     /**
@@ -6852,27 +7765,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;
         }
@@ -7024,8 +7943,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;
     }
@@ -7162,8 +8082,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;
     }
@@ -7271,8 +8192,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;
     }
@@ -7346,8 +8268,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;
     }
@@ -7492,8 +8415,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;
     }