chamilo / chamilo-lms

main/session/add_courses_to_session.php

Braces +8 added lines, -2 removed lines

@@ -207,7 +207,10 @@ 
 
 unset($Courses);
 ?>
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $sessionId; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?page=<?php echo $page; ?>&id_session=<?php echo $sessionId; ?><?php if(!empty($_GET['add'])) {
+    echo '&add=true' ;
+}
+?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
     <legend><?php echo $tool_name.' ('.$session_info['name'].')'; ?></legend>
     <input type="hidden" name="formSent" value="1" />
 
@@ -230,7 +233,10 @@ 
                 <div id="ajax_list_courses_multiple">
                     <select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" class="form-control">
                         <?php foreach ($nosessionCourses as $enreg) { ?>
-                            <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES).'"'; if(in_array($enreg['code'],$CourseList)) echo 'selected="selected"'; ?>>
+                            <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES).'"'; if(in_array($enreg['code'],$CourseList)) {
+    echo 'selected="selected"';
+}
+?>>
                                 <?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?>
                             </option>
                         <?php } ?>

main/inc/lib/course.lib.php

Braces +5 added lines, -5 removed lines

@@ -3342,7 +3342,7 @@ 
             $html .= '<a class="thumbnail" href="'.$params['link'].'">';
             $html .= $params['icon'];
             $html .= '</a>';
-        }else{
+        } else{
             $html .= $params['icon'];
         }
         $html .= '</div>';
@@ -3423,7 +3423,7 @@ 
                                . Display::returnFontAwesomeIcon('folder-open') . '</a>';
                             $params['document'] .= Display::div('', ['id' => 'document_result_' . $course_info['real_id'] . '_0', 'class' => 'document_preview_container']);
                         }
-                    }else{
+                    } else{
                         if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED && $load_dirs) {
                             $params['document'] = '<a id="document_preview_' . $course_info['real_id'] . '_0" class="document_preview btn btn-default btn-sm" href="javascript:void(0);">'
                                . Display::returnFontAwesomeIcon('folder-open') . '</a>';
@@ -3598,7 +3598,7 @@ 
             if ($showCustomIcon === 'true' && $iconName != 'course.png') {
                 $thumbnails = $course_info['course_image'];
                 $image = $course_info['course_image_large'];
-            }else{
+            } else{
                 $image = Display::return_icon('session_default.png', null, null, null,null, true);
             }
 
@@ -3736,7 +3736,7 @@ 
             if ($showCustomIcon === 'true' && $iconName != 'course.png') {
                 $thumbnails = $course_info['course_image'];
                 $image = $course_info['course_image_large'];
-            }else{
+            } else{
                 $image = Display::return_icon('session_default.png', null, null, null,null, true);
             }
 
@@ -3998,7 +3998,7 @@ 
         if ($showCustomIcon === 'true' && $iconName != 'course.png') {
             $thumbnails = $course_info['course_image'];
             $image = $course_info['course_image_large'];
-        }else{
+        } else{
             $image = Display::return_icon('session_default.png', null, null, null,null, true);
         }
         $params['thumbnails'] = $thumbnails;

main/course_progress/thematic_plan.php

Braces +3 added lines, -2 removed lines

@@ -9,9 +9,10 @@
 
 // actions menu
 $new_thematic_plan_data = array();
-if (!empty($thematic_plan_data))
-foreach($thematic_plan_data as $thematic_item) {
+if (!empty($thematic_plan_data)) {
+    foreach($thematic_plan_data as $thematic_item) {
     $thematic_simple_list[] = $thematic_item['description_type'];
+}
     $new_thematic_plan_data[$thematic_item['description_type']] = $thematic_item;
 }
 

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

Braces +2255 added lines, -1331 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 = array()) {
-        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] );
         }
     }
@@ -489,7 +532,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;
@@ -504,8 +549,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':
@@ -518,10 +564,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;
@@ -529,8 +578,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;
@@ -550,10 +600,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;
+                }
                 // no break needed
         }
     }
@@ -581,8 +632,9 @@ 
             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();
@@ -610,8 +662,7 @@ 
                     } else {
                         return FALSE;
                     }
-                }
-                elseif( FALSE !== touch( $dirfile )) {
+                } elseif( FALSE !== touch( $dirfile )) {
                     /* new local file created */
                     $this->filename = $value;
                     return TRUE;
@@ -625,8 +676,7 @@ 
                     $this->format             = 'xcal';
                     $this->attributeDelimiter = $this->nl;
                     $this->valueInit          = null;
-                }
-                else {
+                } else {
                     $this->format             = null;
                     $this->attributeDelimiter = ';';
                     $this->valueInit          = ':';
@@ -665,13 +715,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
                 }
             }
@@ -706,27 +759,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;
             }
@@ -748,37 +800,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();
             }
@@ -813,46 +867,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 );
@@ -886,8 +962,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
@@ -905,55 +982,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'];
@@ -963,16 +1060,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';
@@ -981,30 +1078,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
@@ -1012,19 +1116,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
@@ -1038,8 +1152,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] );
@@ -1061,8 +1176,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' ));
@@ -1081,27 +1197,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;
             }
@@ -1128,73 +1243,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;
     }
     /**
@@ -1209,42 +1375,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;                 /* err 4 */
+            if( !$this->setConfig( 'filename', $parts['basename'] )) {
+                            return FALSE;
+            }
+            /* err 4 */
         }
         if( 'http://' != substr( $filename, 0, 7 )) {
             /* local file error tests */
-            if( !is_file( $filename ))      /* err 5 */
+            if( !is_file( $filename )) {
+                /* err 5 */
                 return FALSE;
-            if( !is_readable( $filename ))
-                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] );
@@ -1254,34 +1435,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;
                 }
@@ -1292,17 +1476,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();
@@ -1351,8 +1536,7 @@ 
                     $newProp = FALSE;
                     $lastix++;
                     $proprows[$lastix]  = $line;
-                }
-                else {
+                } else {
                     /* remove line breaks */
                     if(( '\n' == substr( $proprows[$lastix], -2 )) &&
                         (  ' ' == substr( $line, 0, 1 ))) {
@@ -1364,19 +1548,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();
@@ -1401,20 +1588,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, ',' )) {
@@ -1428,13 +1617,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 );
@@ -1443,12 +1633,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;
     }
     /*********************************************************************************/
@@ -1480,8 +1672,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:
@@ -1489,9 +1682,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' ));
@@ -1504,8 +1700,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
@@ -1558,10 +1756,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' );
@@ -1579,23 +1778,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
@@ -1614,15 +1818,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();
@@ -1630,10 +1838,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' );
@@ -1716,9 +1925,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'] );
     }
@@ -1732,8 +1944,12 @@ 
      * @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 ));
+        if( empty( $value )) {
+            if( $this->getConfig( 'allowEmpty' )) $value = null;
+        } else {
+            return FALSE;
+        }
+        $this->action = array( 'value' => $value, 'params' => $this->_setParams( $params ));
         return TRUE;
     }
     /*********************************************************************************/
@@ -1748,14 +1964,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;
     }
@@ -1770,7 +1989,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;
     }
@@ -1786,19 +2009,22 @@ 
      * @return string
      */
     function createAttendee() {
-        if( empty( $this->attendee )) return FALSE;
+        if( empty( $this->attendee )) {
+            return FALSE;
+        }
         $output = null;
         foreach( $this->attendee as $attendeePart ) {                      // start foreach 1
             if( empty( $attendeePart['value'] )) {
-                if( $this->getConfig( 'allowEmpty' ))
-                    $output .= $this->_createElement( 'ATTENDEE' );
+                if( $this->getConfig( 'allowEmpty' )) {
+                                    $output .= $this->_createElement( 'ATTENDEE' );
+                }
                 continue;
             }
             $attendee1 = $attendee2 = $attendeeLANG = $attendeeCN = null;
             foreach( $attendeePart as $paramlabel => $paramvalue ) {         // start foreach 2
-                if( 'value' == $paramlabel )
-                    $attendee2  .= 'MAILTO:'.$paramvalue;
-                elseif(( 'params' == $paramlabel ) && ( is_array( $paramvalue ))) { // start elseif
+                if( 'value' == $paramlabel ) {
+                                    $attendee2  .= 'MAILTO:'.$paramvalue;
+                } elseif(( 'params' == $paramlabel ) && ( is_array( $paramvalue ))) { // start elseif
                     foreach( $paramvalue as $optparamlabel => $optparamvalue ) { // start foreach 3
                         $attendee11 = $attendee12 = null;
                         if( is_int( $optparamlabel )) {
@@ -1860,7 +2086,11 @@ 
      * @return bool
      */
     function setAttendee( $value, $params=FALSE, $index=FALSE ) {
-        if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+        if( empty( $value )) {
+            if( $this->getConfig( 'allowEmpty' )) $value = null;
+        } else {
+            return FALSE;
+        }
         $value = str_replace ( 'MAILTO:', '', $value );
         $value = str_replace ( 'mailto:', '', $value );
         $params2 = array();
@@ -1876,16 +2106,17 @@ 
                             foreach( $optparamvalue as $part ) {
                                 $part = str_replace( 'MAILTO:', '', $part );
                                 $part = str_replace( 'mailto:', '', $part );
-                                if(( '"' == $part{0} ) && ( '"' == $part{strlen($part)-1} ))
-                                    $part = substr( $part, 1, ( strlen($part)-2 ));
+                                if(( '"' == $part{0} ) && ( '"' == $part{strlen($part)-1} )) {
+                                                                    $part = substr( $part, 1, ( strlen($part)-2 ));
+                                }
                                 $optarrays[$optparamlabel][] = $part;
                             }
-                        }
-                        else {
+                        } else {
                             $part = str_replace( 'MAILTO:', '', $optparamvalue );
                             $part = str_replace( 'mailto:', '', $part );
-                            if(( '"' == $part{0} ) && ( '"' == $part{strlen($part)-1} ))
-                                $part = substr( $part, 1, ( strlen($part)-2 ));
+                            if(( '"' == $part{0} ) && ( '"' == $part{strlen($part)-1} )) {
+                                                            $part = substr( $part, 1, ( strlen($part)-2 ));
+                            }
                             $optarrays[$optparamlabel][] = $part;
                         }
                         break;
@@ -1895,14 +2126,16 @@ 
                             $optparamvalue = str_replace( 'mailto:', '', $optparamvalue );
                         }
                         if(( '"' == substr( $optparamvalue, 0, 1 )) &&
-                            ( '"' == substr( $optparamvalue, -1 )))
-                            $optparamvalue = substr( $optparamvalue, 1, ( strlen( $optparamvalue ) - 2 ));
+                            ( '"' == substr( $optparamvalue, -1 ))) {
+                                                    $optparamvalue = substr( $optparamvalue, 1, ( strlen( $optparamvalue ) - 2 ));
+                        }
                         $params2[$optparamlabel] = $optparamvalue;
                         break;
                 } // end switch( $optparamlabel.. .
             } // end foreach( $optparam.. .
-            foreach( $optarrays as $optparamlabel => $optparams )
-                $params2[$optparamlabel] = $optparams;
+            foreach( $optarrays as $optparamlabel => $optparams ) {
+                            $params2[$optparamlabel] = $optparams;
+            }
         }
         // remove defaults
         $this->_existRem( $params2, 'CUTYPE',   'INDIVIDUAL' );
@@ -1912,8 +2145,9 @@ 
         // check language setting
         if( isset( $params2['CN' ] )) {
             $lang = $this->getConfig( 'language' );
-            if( !isset( $params2['LANGUAGE' ] ) && !empty( $lang ))
-                $params2['LANGUAGE' ] = $lang;
+            if( !isset( $params2['LANGUAGE' ] ) && !empty( $lang )) {
+                            $params2['LANGUAGE' ] = $lang;
+            }
         }
         $this->_setMval( $this->attendee, $value, $params2, FALSE, $index );
         return TRUE;
@@ -1930,22 +2164,26 @@ 
      * @return string
      */
     function createCategories() {
-        if( empty( $this->categories )) return FALSE;
+        if( empty( $this->categories )) {
+            return FALSE;
+        }
         $output = null;
         foreach( $this->categories as $category ) {
             if( empty( $category['value'] )) {
-                if ( $this->getConfig( 'allowEmpty' ))
-                    $output .= $this->_createElement( 'CATEGORIES' );
+                if ( $this->getConfig( 'allowEmpty' )) {
+                                    $output .= $this->_createElement( 'CATEGORIES' );
+                }
                 continue;
             }
             $attributes = $this->_createParams( $category['params'], array( 'LANGUAGE' ));
             if( is_array( $category['value'] )) {
-                foreach( $category['value'] as $cix => $categoryPart )
-                    $category['value'][$cix] = $this->_strrep( $categoryPart );
+                foreach( $category['value'] as $cix => $categoryPart ) {
+                                    $category['value'][$cix] = $this->_strrep( $categoryPart );
+                }
                 $content  = implode( ',', $category['value'] );
+            } else {
+                            $content  = $this->_strrep( $category['value'] );
             }
-            else
-                $content  = $this->_strrep( $category['value'] );
             $output    .= $this->_createElement( 'CATEGORIES', $attributes, $content );
         }
         return $output;
@@ -1961,7 +2199,11 @@ 
      * @return bool
      */
     function setCategories( $value, $params=FALSE, $index=FALSE ) {
-        if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+        if( empty( $value )) {
+            if( $this->getConfig( 'allowEmpty' )) $value = null;
+        } else {
+            return FALSE;
+        }
         $this->_setMval( $this->categories, $value, $params, FALSE, $index );
         return TRUE;
     }
@@ -1977,9 +2219,12 @@ 
      * @return string
      */
     function createClass() {
-        if( empty( $this->class )) return FALSE;
-        if( empty( $this->class['value'] ))
-            return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'CLASS' ) : FALSE;
+        if( empty( $this->class )) {
+            return FALSE;
+        }
+        if( empty( $this->class['value'] )) {
+                    return ( $this->getConfig( 'allowEmpty' )) ? $this->_createElement( 'CLASS' ) : FALSE;
+        }
         $attributes = $this->_createParams( $this->class['params'] );
         return $this->_createElement( 'CLASS', $attributes, $this->class['value'] );
     }
@@ -1993,7 +2238,11 @@ 
      * @return bool
      */
     function setClass( $value, $params=FALSE ) {
-        if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+        if( empty( $value )) {
+            if( $this->getConfig( 'allowEmpty' )) $value = null;
+        } else {
+            return FALSE;
+        }
         $this->class = array( 'value' => $value, 'params' => $this->_setParams( $params ));
         return TRUE;
     }
@@ -2009,11 +2258,15 @@ 
      * @return string
      */
     function createComment() {
-        if( empty( $this->comment )) return FALSE;
+        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,13 +2761,18 @@ 
      * @return bool
      */
     function setDuration( $week, $day=FALSE, $hour=FALSE, $min=FALSE, $sec=FALSE, $params=array() ) {
-        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;
@@ -2494,31 +2796,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;
             }
@@ -2542,34 +2850,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'] );
@@ -2589,7 +2902,9 @@ 
      * @return string
      */
     function createExrule() {
-        if( empty( $this->exrule )) return FALSE;
+        if( empty( $this->exrule )) {
+            return FALSE;
+        }
         return $this->_format_recur( 'EXRULE', $this->exrule );
     }
     /**
@@ -2603,7 +2918,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;
     }
@@ -2619,11 +2938,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;
@@ -2631,9 +2954,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']);
@@ -2642,21 +2965,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 );
@@ -2679,14 +3005,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();
@@ -2696,22 +3023,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';
                 }
@@ -2734,9 +3058,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, '.', '');
@@ -2756,15 +3083,17 @@ 
      */
     function setGeo( $latitude, $longitude, $params=array() ) {
         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;
     }
     /*********************************************************************************/
@@ -2779,7 +3108,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 );
@@ -2799,8 +3130,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;
     }
@@ -2816,9 +3148,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 );
@@ -2833,7 +3168,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;
     }
@@ -2849,9 +3188,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'];
@@ -2867,13 +3209,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;
     }
@@ -2889,9 +3236,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'] );
     }
@@ -2905,7 +3255,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;
     }
@@ -2921,9 +3275,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'] );
     }
@@ -2937,7 +3294,11 @@ 
      * @return bool
      */
     function setPriority( $value, $params=array()  ) {
-        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;
     }
@@ -2953,18 +3314,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;
@@ -2973,68 +3340,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 );
@@ -3056,9 +3439,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' ))) {
@@ -3072,15 +3455,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;
@@ -3088,48 +3475,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;
         }
@@ -3152,9 +3551,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 );
@@ -3178,9 +3580,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;
@@ -3197,11 +3599,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'] );
@@ -3223,9 +3629,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;
@@ -3242,9 +3653,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'] );
     }
@@ -3258,7 +3672,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;
     }
@@ -3273,18 +3691,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;
@@ -3302,10 +3725,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;
     }
@@ -3321,21 +3749,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;
@@ -3351,7 +3784,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;
     }
@@ -3367,7 +3804,9 @@ 
      * @return string
      */
     function createRrule() {
-        if( empty( $this->rrule )) return FALSE;
+        if( empty( $this->rrule )) {
+            return FALSE;
+        }
         return $this->_format_recur( 'RRULE', $this->rrule );
     }
     /**
@@ -3381,7 +3820,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;
     }
@@ -3396,9 +3839,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'] );
     }
@@ -3411,8 +3857,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;
     }
@@ -3428,9 +3875,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'] );
     }
@@ -3444,8 +3894,12 @@ 
      * @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 ));
+        if( empty( $value )) {
+            if( $this->getConfig( 'allowEmpty' )) $value = null;
+        } else {
+            return FALSE;
+        }
+        $this->status = array( 'value' => $value, 'params' => $this->_setParams( $params ));
         return TRUE;
     }
     /*********************************************************************************/
@@ -3460,9 +3914,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 );
@@ -3477,7 +3934,11 @@ 
      * @return bool
      */
     function setSummary( $value, $params=FALSE ) {
-        if( empty( $value )) if( $this->getConfig( 'allowEmpty' )) $value = null; else return FALSE;
+        if( empty( $value )) {
+            if( $this->getConfig( 'allowEmpty' )) $value = null;
+        } else {
+            return FALSE;
+        }
         $this->summary = array( 'value' => $value, 'params' => $this->_setParams( $params ));
         return TRUE;
     }
@@ -3493,9 +3954,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'] );
     }
@@ -3509,7 +3973,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;
     }
@@ -3525,19 +3993,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'] );
@@ -3561,28 +4034,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;
@@ -3593,24 +4068,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;
@@ -3625,8 +4103,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
@@ -3635,11 +4112,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;
@@ -3656,9 +4143,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'] ));
     }
@@ -3672,7 +4162,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;
     }
@@ -3689,14 +4183,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;
     }
@@ -3711,7 +4208,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;
     }
@@ -3727,9 +4228,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'] );
     }
@@ -3743,7 +4247,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;
     }
@@ -3759,9 +4267,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'] );
     }
@@ -3775,7 +4286,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;
     }
@@ -3791,9 +4306,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'] );
     }
@@ -3807,7 +4325,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;
     }
@@ -3823,8 +4345,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'] );
     }
@@ -3843,8 +4366,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' );
     }
@@ -3858,7 +4382,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;
     }
@@ -3874,9 +4401,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'] );
     }
@@ -3890,7 +4420,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;
     }
@@ -3906,21 +4440,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;
@@ -3936,12 +4475,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;
     }
@@ -4009,30 +4556,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 ))) {
@@ -4042,8 +4588,7 @@ 
                         $attributes .= '"'.htmlspecialchars( $attrValue ).'"';
                     }
                 }
-            }
-            else {
+            } else {
                 $attributes = str_replace( $this->intAttrDelimiter, $this->attributeDelimiter, $attributes );
             }
         }
@@ -4065,8 +4610,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;
@@ -4110,30 +4654,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;
     }
@@ -4147,47 +4691,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;
+            }
         }
     }
     /**
@@ -4203,14 +4757,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;
@@ -4236,15 +4794,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;
@@ -4301,12 +4867,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;
     }
@@ -4326,39 +4895,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 );
@@ -4367,8 +4934,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 )
@@ -4388,10 +4954,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 ))) {
@@ -4399,8 +4965,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;
     }
@@ -4427,10 +4994,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':
@@ -4460,14 +5028,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;
     }
@@ -4484,28 +5060,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 );
@@ -4513,10 +5093,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;
     }
     /**
@@ -4530,10 +5112,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 );
@@ -4563,10 +5147,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 );
@@ -4585,10 +5172,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] ))) {
@@ -4614,13 +5203,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'] )  ||
@@ -4628,29 +5219,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;
     }
@@ -4667,14 +5262,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'] ))) {
@@ -4699,7 +5296,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;
@@ -4744,19 +5343,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++;
                                 }
@@ -4800,24 +5399,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;
     }
     /**
@@ -4841,16 +5448,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;
 
     }
@@ -4863,14 +5471,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;
     }
     /**
@@ -4889,7 +5512,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 ) {
@@ -4898,43 +5523,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 );
@@ -4947,11 +5583,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);
@@ -4960,10 +5597,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();
@@ -4972,8 +5611,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();
@@ -4990,8 +5630,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;
@@ -4999,9 +5640,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;
                         }
@@ -5009,8 +5650,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-- ) {
@@ -5029,8 +5671,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);
+                        }
                     }
                 }
             }
@@ -5041,36 +5684,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;
@@ -5078,42 +5727,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 ) ||
@@ -5130,12 +5782,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'] )  &&
@@ -5144,13 +5796,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
@@ -5170,21 +5822,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'] ))) {
@@ -5197,14 +5846,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
@@ -5213,8 +5863,9 @@ 
                             }
                             $countcnt++;
                         }
-                        if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] ))
-                            break;
+                        if( isset( $recur['COUNT'] ) && ( $countcnt >= $recur['COUNT'] )) {
+                                                    break;
+                        }
                     }
                     $bysetposarr1 = $bysetposarr2;
                     $bysetposarr2 = array();
@@ -5224,12 +5875,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 */
@@ -5261,21 +5913,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;
@@ -5299,7 +5957,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';
@@ -5309,9 +5969,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';
@@ -5321,9 +5982,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';
@@ -5332,17 +5994,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;
             }
@@ -5358,23 +6019,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;
     }
     /**
@@ -5396,16 +6062,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
@@ -5415,14 +6078,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;
     }
     /**
@@ -5438,15 +6105,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 );
     }
@@ -5462,27 +6131,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;
@@ -5498,13 +6171,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;
+            }
         }
     }
     /**
@@ -5518,8 +6193,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 )
@@ -5529,8 +6205,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;
     }
@@ -5548,8 +6225,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';
@@ -5577,7 +6255,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;
@@ -5603,57 +6283,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;
         }
@@ -5702,13 +6471,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
                 }
             }
@@ -5726,12 +6498,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;
@@ -5785,8 +6560,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;
@@ -5940,8 +6716,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;
@@ -5956,18 +6733,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++;
                     }
                 }
@@ -5987,9 +6769,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;
     }
     /**
@@ -6006,184 +6792,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 ??
                 }
@@ -6202,15 +7081,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':
@@ -6324,20 +7209,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'
@@ -6361,8 +7245,7 @@ 
                 $newProp = FALSE;
                 $lastix++;
                 $proprows[$lastix]  = $line;
-            }
-            else {
+            } else {
                 /* remove line breaks */
                 if(( '\n' == substr( $proprows[$lastix], -2 )) &&
                     (  ' ' == substr( $line, 0, 1 ))) {
@@ -6375,14 +7258,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};
                 }
             }
@@ -6415,27 +7299,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;
@@ -6453,13 +7340,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-':
@@ -6470,8 +7358,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;
@@ -6491,15 +7380,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':
@@ -6514,8 +7405,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;
@@ -6524,8 +7416,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 ) {
@@ -6539,37 +7433,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
@@ -6584,8 +7484,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();
+                }
             }
         }
     }
@@ -6616,32 +7517,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;
             }
@@ -6658,43 +7560,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();
             }
@@ -6725,9 +7631,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' ));
@@ -6746,27 +7655,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;
             }
@@ -6785,9 +7693,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' ));
@@ -6825,16 +7736,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;
     }
     /**
@@ -6855,27 +7768,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;
         }
@@ -7027,8 +7946,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;
     }
@@ -7165,8 +8085,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;
     }
@@ -7274,8 +8195,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;
     }
@@ -7349,8 +8271,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;
     }
@@ -7495,8 +8418,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;
     }

main/admin/subscribe_user2course.php

Braces +8 added lines, -2 removed lines

@@ -287,7 +287,10 @@ 
     <td width="40%" align="center">
      <select name="UserList[]" multiple="multiple" size="20" style="width:300px;">
     <?php foreach ($db_users as $user) { ?>
-          <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'],$users)) echo 'selected="selected"'; ?>>
+          <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'],$users)) {
+    echo 'selected="selected"';
+}
+?>>
       <?php
         $userName = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')';
         if ($showOfficialCode) {
@@ -308,7 +311,10 @@ 
    <td width="40%" align="center">
     <select name="CourseList[]" multiple="multiple" size="20" style="width:300px;">
     <?php foreach ($db_courses as $course) { ?>
-         <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>>
+         <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) {
+    echo 'selected="selected"';
+}
+?>>
              <?php echo '('.$course['visual_code'].') '.$course['title']; ?>
          </option>
     <?php } ?>

main/lp/learnpath.class.php

Braces +104 added lines, -71 removed lines

@@ -3944,8 +3944,9 @@ 
                 WHERE c_id = ".$course_id."
                 ORDER BY display_order";
         $res = Database::query($sql);
-        if ($res === false)
-            return false;
+        if ($res === false) {
+                    return false;
+        }
         $lps = array ();
         $lp_order = array ();
         $num = Database :: num_rows($res);
@@ -4545,8 +4546,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_maker()', 0);
         }
-        if (empty ($name))
-            return false;
+        if (empty ($name)) {
+                    return false;
+        }
         $this->maker = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
         $course_id = api_get_course_int_id();
@@ -4611,8 +4613,9 @@ 
     public function set_terms_by_prefix($terms_string, $prefix)
     {
         $course_id = api_get_course_int_id();
-        if (api_get_setting('search_enabled') !== 'true')
-            return false;
+        if (api_get_setting('search_enabled') !== 'true') {
+                    return false;
+        }
 
         if (!extension_loaded('xapian')) {
             return false;
@@ -4625,8 +4628,9 @@ 
         $stored_terms = $this->get_common_index_terms_by_prefix($prefix);
 
         // Don't do anything if no change, verify only at DB, not the search engine.
-        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0))
-            return false;
+        if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0)) {
+                    return false;
+        }
 
         require_once 'xapian.php'; // TODO: Try catch every xapian use or make wrappers on API.
         require_once api_get_path(LIBRARY_PATH).'search/ChamiloIndexer.class.php';
@@ -4818,8 +4822,9 @@ 
         if ($this->debug > 0) {
             error_log('New LP - In learnpath::set_proximity()', 0);
         }
-        if (empty ($name))
-            return false;
+        if (empty ($name)) {
+                    return false;
+        }
 
         $this->proximity = $name;
         $lp_table = Database :: get_course_table(TABLE_LP_MAIN);
@@ -5163,8 +5168,9 @@ 
 
         $sql = "SELECT * FROM $lp_table WHERE c_id = ".$course_id." ORDER BY display_order";
         $res = Database::query($sql);
-        if ($res === false)
-            return false;
+        if ($res === false) {
+                    return false;
+        }
 
         $num = Database :: num_rows($res);
         // First check the order is correct, globally (might be wrong because
@@ -5475,8 +5481,9 @@ 
             $position[$key] = $row['display_order'];
         }
 
-        if (count($array) > 0)
-            array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array);
+        if (count($array) > 0) {
+                    array_multisort($parent, SORT_ASC, $position, SORT_ASC, $array);
+        }
 
         return $array;
     }
@@ -6190,10 +6197,12 @@ 
                     if ($new_comment || $new_title) {
                         $tbl_doc = Database :: get_course_table(TABLE_DOCUMENT);
                         $ct = '';
-                        if ($new_comment)
-                            $ct .= ", comment='" . Database::escape_string($new_comment). "'";
-                        if ($new_title)
-                            $ct .= ", title='" . Database::escape_string($new_title)."' ";
+                        if ($new_comment) {
+                                                    $ct .= ", comment='" . Database::escape_string($new_comment). "'";
+                        }
+                        if ($new_title) {
+                                                    $ct .= ", title='" . Database::escape_string($new_title)."' ";
+                        }
 
                         $sql = "UPDATE " . $tbl_doc ." SET " . substr($ct, 1)."
                                WHERE c_id = ".$course_id." AND id = " . $document_id;
@@ -6217,17 +6226,21 @@ 
         // Please, do not modify this dirname formatting.
         $dir = isset($_GET['dir']) ? $_GET['dir'] : $_POST['dir'];
 
-        if (strstr($dir, '..'))
-            $dir = '/';
+        if (strstr($dir, '..')) {
+                    $dir = '/';
+        }
 
-        if ($dir[0] == '.')
-            $dir = substr($dir, 1);
+        if ($dir[0] == '.') {
+                    $dir = substr($dir, 1);
+        }
 
-        if ($dir[0] != '/')
-            $dir = '/' . $dir;
+        if ($dir[0] != '/') {
+                    $dir = '/' . $dir;
+        }
 
-        if ($dir[strlen($dir) - 1] != '/')
-            $dir .= '/';
+        if ($dir[strlen($dir) - 1] != '/') {
+                    $dir .= '/';
+        }
 
         $filepath = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/document' . $dir;
 
@@ -6292,8 +6305,9 @@ 
                 }
                 $return .= '<div style="padding:10px;">';
 
-                if ($msg != '')
-                    $return .= $msg;
+                if ($msg != '') {
+                                    $return .= $msg;
+                }
 
                 $return .= '<h3>'.$row['title'].'</h3>';
                 switch ($row['item_type']) {
@@ -6554,10 +6568,11 @@ 
         $item_title			= Security::remove_XSS($item_title);
         $item_description 	= Security::remove_XSS($item_description);
 
-        if ($id != 0 && is_array($extra_info))
-            $parent = $extra_info['parent_item_id'];
-        else
-            $parent = 0;
+        if ($id != 0 && is_array($extra_info)) {
+                    $parent = $extra_info['parent_item_id'];
+        } else {
+                    $parent = 0;
+        }
 
         $sql = "SELECT * FROM " . $tbl_lp_item . "
                 WHERE c_id = ".$course_id." AND lp_id = " . $this->lp_id;
@@ -6822,11 +6837,13 @@ 
         }
 
         $legend = '<legend>';
-        if ($action == 'add')
-            $legend .= get_lang('CreateTheExercise');
-        elseif ($action == 'move') $legend .= get_lang('MoveTheCurrentExercise');
-        else
-            $legend .= get_lang('EditCurrentExecice');
+        if ($action == 'add') {
+                    $legend .= get_lang('CreateTheExercise');
+        } elseif ($action == 'move') {
+            $legend .= get_lang('MoveTheCurrentExercise');
+        } else {
+                    $legend .= get_lang('EditCurrentExecice');
+        }
         if (isset ($_GET['edit']) && $_GET['edit'] == 'true') {
             $legend .= Display :: return_warning_message(get_lang('Warning') . ' ! ' . get_lang('WarningEditingDocument'));
         }
@@ -6853,8 +6870,9 @@ 
                         $arrHide[] = $arrLP[$i]['id'];
                     }
                 } else {
-                    if ($arrLP[$i]['item_type'] == 'dir')
-                        $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    if ($arrLP[$i]['item_type'] == 'dir') {
+                                            $return .= '<option ' . (($parent == $arrLP[$i]['id']) ? 'selected="selected" ' : '') . 'style="padding-left:' . ($arrLP[$i]['depth'] * 10) . 'px;" value="' . $arrLP[$i]['id'] . '">' . $arrLP[$i]['title'] . '</option>';
+                    }
                 }
             }
 
@@ -6872,11 +6890,13 @@ 
 
         for ($i = 0; $i < count($arrLP); $i++) {
             if ($arrLP[$i]['parent_item_id'] == $parent && $arrLP[$i]['id'] != $id) {
-                if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                    $selected = 'selected="selected" ';
+                } elseif ($action == 'add') {
                     $selected = 'selected="selected" ';
-                elseif ($action == 'add') $selected = 'selected="selected" ';
-                else
-                    $selected = '';
+                } else {
+                                    $selected = '';
+                }
 
                 $return .= '<option ' . $selected . 'value="' . $arrLP[$i]['id'] . '">' . get_lang('After') . ' "' . $arrLP[$i]['title'] . '"</option>';
             }
@@ -6903,9 +6923,11 @@ 
                 $arrHide = array ();
                 for ($i = 0; $i < count($arrLP); $i++) {
                     if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
-                        if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                            $s_selected_position = $arrLP[$i]['id'];
-                        elseif ($action == 'add') $s_selected_position = 0;
+                        if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                                    $s_selected_position = $arrLP[$i]['id'];
+                        } elseif ($action == 'add') {
+                            $s_selected_position = 0;
+                        }
                         $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                     }
@@ -7098,9 +7120,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
-                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
                 }
             }
@@ -7295,9 +7319,11 @@ 
 
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -7331,8 +7357,7 @@ 
 
         if (is_numeric($extra_info)) {
             $form->addHidden('path', $extra_info);
-        }
-        elseif (is_array($extra_info)) {
+        } elseif (is_array($extra_info)) {
             $form->addHidden('path', $extra_info['path']);
         }
 
@@ -7385,8 +7410,9 @@ 
                     lp_id = " . $this->lp_id . " AND
                     id != $id";
 
-        if ($item_type == 'dir')
-            $sql .= " AND parent_item_id = 0";
+        if ($item_type == 'dir') {
+                    $sql .= " AND parent_item_id = 0";
+        }
 
         $result = Database::query($sql);
         $arrLP = array ();
@@ -7787,9 +7813,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir' && $arrLP[$i]['item_type'] !== TOOL_LP_FINAL_ITEM) {
-                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id'])
+                    if (isset($extra_info['previous_item_id']) && $extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
                         $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = $arrLP[$i]['id'];
+                    }
 
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
@@ -7800,17 +7828,18 @@ 
                 $item_type = isset($extra_info['item_type']) ? $extra_info['item_type'] : null;
                 $edit = isset($_GET['edit']) ? $_GET['edit'] : null;
                 if (($extra_info == 'new' || $item_type == TOOL_DOCUMENT || $item_type == TOOL_LP_FINAL_ITEM || $edit == 'true')) {
-                    if (isset ($_POST['content']))
-                        $content = stripslashes($_POST['content']);
-                    elseif (is_array($extra_info)) {
+                    if (isset ($_POST['content'])) {
+                                            $content = stripslashes($_POST['content']);
+                    } elseif (is_array($extra_info)) {
                         //If it's an html document or a text file
                         if (!$no_display_edit_textarea) {
                             $content = $this->display_document($extra_info['path'], false, false);
                         }
-                    } elseif (is_numeric($extra_info))
-                        $content = $this->display_document($extra_info, false, false);
-                    else
-                        $content = '';
+                    } elseif (is_numeric($extra_info)) {
+                                            $content = $this->display_document($extra_info, false, false);
+                    } else {
+                                            $content = '';
+                    }
 
                     if (!$no_display_edit_textarea) {
                         // We need to calculate here some specific settings for the online editor.
@@ -8074,9 +8103,11 @@ 
             $arrHide = array();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }
@@ -8272,9 +8303,11 @@ 
             $arrHide = array ();
             for ($i = 0; $i < count($arrLP); $i++) {
                 if ($arrLP[$i]['id'] != $id && $arrLP[$i]['item_type'] != 'dir') {
-                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id'])
-                        $s_selected_position = $arrLP[$i]['id'];
-                    elseif ($action == 'add') $s_selected_position = 0;
+                    if ($extra_info['previous_item_id'] == $arrLP[$i]['id']) {
+                                            $s_selected_position = $arrLP[$i]['id'];
+                    } elseif ($action == 'add') {
+                        $s_selected_position = 0;
+                    }
                     $arrHide[$arrLP[$i]['id']]['value'] = $arrLP[$i]['title'];
 
                 }

main/ticket/tickets.php

Braces +3 added lines, -2 removed lines

@@ -138,8 +138,8 @@ 
 $isAdmin = api_is_platform_admin();
 
 Display::display_header(get_lang('MyTickets'));
-if (!empty($projectId))
-if ($isAdmin ) {
+if (!empty($projectId)) {
+    if ($isAdmin ) {
     $getParameters = [
         'keyword',
         'keyword_status',
@@ -151,6 +151,7 @@ 
         'Tickets_per_page',
         'Tickets_column'
     ];
+}
     $get_parameter = '';
     foreach ($getParameters as $getParameter) {
         if (isset($_GET[$getParameter])) {