iNextrix / ASTPP

web_interface/astpp/application/libraries/astpp/form.php

Braces +62 added lines, -62 removed lines

@@ -21,8 +21,9 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-if (!defined('BASEPATH'))
+if (!defined('BASEPATH')) {
     exit('No direct script access allowed');
+}
 
 /**
  * Dynamically build forms for display
@@ -65,7 +66,7 @@ 
             $file_name = explode("/", $url);
             if(isset($file_name['1']) ){
 	      $module = explode('_', $file_name['1']);
-            }else{
+            } else{
               $module=$file_name;
             }
             if($this->CI->session->userdata('userlevel_logintype')==1 ){
@@ -74,7 +75,7 @@ 
             if (in_array($module[0], $module_info)) {
                 if($this->CI->session->userdata('userlevel_logintype')== 0 && $module[0] == 'customer' && isset($file_name[1]) && $file_name[1] !='customer_transfer'){
                      redirect(base_url() . 'user/user/');
-                }else{
+                } else{
                    return true;
                 }
             } else {
@@ -139,23 +140,23 @@ 
             foreach ($form_fileds as $fieldkey => $fieldvalue) {
                 $form_contents.= '<li class="col-md-12">';
                 if ($fieldvalue[1] == 'HIDDEN') {
-                    if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-                    else
-                        $fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : ''):(isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] :'');
+                    if (isset($this->CI->input->post)) {
+                                            $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+                    } else {
+                                            $fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : ''):(isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] :'');
+                    }
                     $form_contents.= form_hidden($fieldvalue[2]['name'], $fieldvalue[2]['value']);
-                }else {
+                } else {
 		      $validation_arr=array();
 		      if($fieldvalue[1]=='INPUT'){
 		        if(!empty($fieldvalue[3])){
 		          $validation_arr=explode("|",$fieldvalue[3]);
 		        }
-		      }
-		      elseif($fieldvalue[2]=='SELECT'){
+		      } elseif($fieldvalue[2]=='SELECT'){
 
 		        if(is_array($fieldvalue[4])){
 		          $validation_arr=explode("|",$fieldvalue[4]['rules']);
-		        }else{
+		        } else{
 		        $validation_arr=explode("|",$fieldvalue[4]);
 		        }
 		      }
@@ -182,7 +183,7 @@ 
 
                         if (isset($this->CI->input->post)){
                             $fieldvalue['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
-                        }else{
+                        } else{
                             if (is_array($fieldvalue[1])) {
                                 $fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]['name']] : @$fieldvalue[1];
                             } else {
@@ -201,16 +202,16 @@ 
 								
 								if(isset($fieldvalue[1]['name'])){
 									$fieldvalue_pass=$fieldvalue[1]['name'];
-								}else{
+								} else{
 									$fieldvalue_pass=$fieldvalue[1];
 								}
 								
         				        $this->CI->form_validation->set_rules($fieldvalue_pass, $fieldvalue[0], $fieldvalue[4]['rules']);
-        				    }else{
+        				    } else{
 								
 								if(isset($fieldvalue[1]['name'])){
 									$fieldvalue_pass=$fieldvalue[1]['name'];
-								}else{
+								} else{
 									$fieldvalue_pass=$fieldvalue[1];
 								}
 								
@@ -246,10 +247,11 @@ 
                     /* For multi select code */
                     $str = $fieldvalue[7] . "," . $fieldvalue[8];
 
-                    if (isset($this->CI->input->post))
-                        $fieldvalue['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
-                    else
-                        $fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]] : @$fieldvalue[1];
+                    if (isset($this->CI->input->post)) {
+                                            $fieldvalue['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
+                    } else {
+                                            $fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]] : @$fieldvalue[1];
+                    }
 
                     $drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
                     if ($fieldset_key === 'System Configuration Information') {
@@ -266,9 +268,9 @@ 
                 } else if ($fieldvalue[1] == 'INPUT') {
 
 
-                    if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? $fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-                    else{
+                    if (isset($this->CI->input->post)) {
+                                            $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? $fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+                    } else{
                         $fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : ''):(isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] :'');
                     }    
                     $form_contents.= form_input($fieldvalue[2], 'readonly');
@@ -284,11 +286,11 @@ 
                  * Image upload from invoice configuration code.
                  */
                 else if ($fieldvalue[1] == 'IMAGE') {
-                    if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-                       
-                    else
-                        $fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+                    if (isset($this->CI->input->post)) {
+                                            $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+                    } else {
+                                            $fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+                    }
                         $fieldvalue[2]['style'] = isset($fieldvalue[2]['style']) ? $fieldvalue[2]['style'] : "";
                     $form_contents.= form_image($fieldvalue[2], 'readonly',$fieldvalue[2]['style']);
                     	 $form_contents.=@$fieldvalue[6];
@@ -296,13 +298,12 @@ 
                     $form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
                     $form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
                     </span></div>';
-                }
-                else if ($fieldvalue[1] == 'DEL_BUTTON') {
-                    if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-                       
-                    else
-                        $fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+                } else if ($fieldvalue[1] == 'DEL_BUTTON') {
+                    if (isset($this->CI->input->post)) {
+                                            $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+                    } else {
+                                            $fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+                    }
                         $fieldvalue[2]['style'] = isset($fieldvalue[2]['style']) ? $fieldvalue[2]['style'] : "";
                     $form_contents.= form_img_delete($fieldvalue[2], 'readonly',$fieldvalue[2]['style']);
                     	 $form_contents.=@$fieldvalue[6];
@@ -313,10 +314,11 @@ 
                 }
                 /**********************************************************************************/
                 else if ($fieldvalue[1] == 'PASSWORD') {
-                    if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-                    else
-                        $fieldvalue[2]['value'] = ($values) ?@$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+                    if (isset($this->CI->input->post)) {
+                                            $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+                    } else {
+                                            $fieldvalue[2]['value'] = ($values) ?@$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+                    }
                     $form_contents.= form_password($fieldvalue[2]);
                     $this->CI->form_validation->set_rules($fieldvalue[2]['name'], $fieldvalue[0], $fieldvalue[3]);
                     $form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
@@ -325,12 +327,12 @@ 
                 } else if ($fieldvalue[2] == 'CHECKBOX') {
                     $OptionArray = array();
 
-					if(isset($fieldvalue[7]) && $fieldvalue[7] != '')
-					$OptionArray = call_user_func_array(array($this->CI->common, $fieldvalue[7]), array($fieldvalue[6]));
+					if(isset($fieldvalue[7]) && $fieldvalue[7] != '') {
+										$OptionArray = call_user_func_array(array($this->CI->common, $fieldvalue[7]), array($fieldvalue[6]));
+					}
                     if (isset($this->CI->input->post)){
                         $fieldvalue[3]['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[3]['value'] : $this->CI->input->post($fieldvalue[1]);
-                    }    
-                    else
+                    } else
                     {
                         $fieldvalue[3]['value'] = ($values) ? (isset($values[$fieldvalue[1]]) && $values[$fieldvalue[1]] ? 1: 0) : @$fieldvalue[3]['value'];
 					}
@@ -342,18 +344,18 @@ 
                     if(isset($fieldvalue[3]['table_name']) && $fieldvalue[3]['table_name'] != ""){
 							
 						 $form_contents.= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'],$checked , $OptionArray);
-					}else{
+					} else{
 						 $form_contents.= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'],$checked ,$OptionArray);
 					}
                 } else if ($fieldvalue[1] == 'TEXTAREA') {
 
-                    if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-                    else
-                        $fieldvalue[2]['value'] = ($values) ? $values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+                    if (isset($this->CI->input->post)) {
+                                            $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+                    } else {
+                                            $fieldvalue[2]['value'] = ($values) ? $values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+                    }
                     $form_contents.= form_textarea($fieldvalue[2]);
-                }
-                else if ($fieldvalue[2] == 'RADIO') {
+                } else if ($fieldvalue[2] == 'RADIO') {
 
                     $form_contents.= form_radio($fieldvalue[1], $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
                 }
@@ -583,8 +585,9 @@ 
         $json_data["json_paging"]['total'] = $config['total_rows'];
         $perpage = $config['per_page'];
         $start = ($page_no - 1) * $perpage;
-        if ($start < 0)
-            $start = 0;
+        if ($start < 0) {
+                    $start = 0;
+        }
         $json_data["paging"]['start'] = $start;
         $json_data["paging"]['page_no'] = $perpage;
         return $json_data;
@@ -613,7 +616,7 @@ 
                            if($field_arr[2]=="status"){
                             $row['id'] = $row_id;
                             $jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row));
-			   }else{
+			   } else{
                             $jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row[$field_arr[2]]));
 			   }
 
@@ -638,13 +641,13 @@ 
                 $fieldstr = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT,$row[$field_arr[2]],$row["id"]);
                 if($acctype != ''){
                     $jsn_tmp[$field_key] = $fieldstr."<br/>".$acctype;
-                }else{
+                } else{
                     $jsn_tmp[$field_key] = $fieldstr;
                 }
 			    
 
 /*********************************/
-		      }else {
+		      } else {
                             $jsn_tmp[$field_key] = $row[$field_arr[2]];
                   }                  				
             } else {
@@ -678,15 +681,13 @@ 
 */			   
                             $jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row_id);
                             /****************************************************************************/
-                        }
-                        elseif($field_arr[0] == gettext("Profile Action"))
+                        } elseif($field_arr[0] == gettext("Profile Action"))
                         {
                            if(isset($field_arr[5]) && isset($field_arr[5]->START) && isset($field_arr[5]->STOP) && isset($field_arr[5]->RELOAD) && isset($field_arr[5]->RESCAN)){
                             }
                            $jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row["id"]);
                         
-                        }
-                        else {
+                        } else {
                             $className = (isset($field_arr['9']) && $field_arr['9'] != '')?$field_arr['9']:"chkRefNos";
                             $jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id=' . $row['id'] . ' class="ace '.$className.'" onclick="clickchkbox(' . $row['id'] . ')" value=' . $row['id'] . '><lable class="lbl"></lable>';                        }
                     }
@@ -715,7 +716,7 @@ 
                          if($field_arr[2]=="status"){
                             $row['id'] = $row_id;
                             $jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row));
-						 }else{
+						 } else{
                             $jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row[$field_arr[2]]));
 						 }
 /**
@@ -733,14 +734,13 @@ 
                 }
 			    $jsn_tmp[$field_key] = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT,$row[$field_arr[2]],$row["id"]);
 /*******************************/
-		    }else {
+		    } else {
                         $jsn_tmp[$field_key] = isset($row[$field_arr[2]]) ? $row[$field_arr[2]] : "";
                     }
                 } else {
                     if ($field_arr[0] == "Action") {
                         $jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row["id"]);
-                    }
-		      else {
+                    } else {
                             $jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id=' . $row['id'] . ' class="ace chkRefNos" onclick="clickchkbox(' . $row['id'] . ')" value=' . $row['id'] . '><lable class="lbl"></lable>';
                         }
                 }

web_interface/astpp/application/libraries/astpp/email_lib.php

Braces +24 added lines, -19 removed lines

@@ -21,8 +21,9 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-if (!defined('BASEPATH'))
+if (!defined('BASEPATH')) {
     exit('No direct script access allowed');
+}
 
 /**
  * Dynamically build forms for display
@@ -118,9 +119,9 @@ 
     }
 
     function build_template($template_type,$detail,$detail_type='') {
-	if(!is_array($template_type))
-		$this->get_template($template_type);
-	else{
+	if(!is_array($template_type)) {
+			$this->get_template($template_type);
+	} else{
 		$this->message=$template_type['message'];
 		$this->subject=$template_type['subject'];
 		$template_type='';
@@ -142,11 +143,11 @@ 
 /*************/
 		$this->account_id=$templateinfo['accountid'];
 		unset($templateinfo['number']);
+	} else if(!is_array($detail) && $detail_type=='') {
+			$templateinfo=$this->get_account_info($detail);
+	} else {
+			$templateinfo=$this->get_info($detail,$detail_type);
 	}
-	else if(!is_array($detail) && $detail_type=='')
-		$templateinfo=$this->get_account_info($detail);
-	else
-		$templateinfo=$this->get_info($detail,$detail_type);
 
 	if($this->get_admin_details() && is_array($templateinfo) && isset($templateinfo['first_name']) && $templateinfo['first_name']!=''){
 		$this->message = html_entity_decode($this->message);
@@ -219,7 +220,9 @@ 
     }
     function get_smtp_details()
     {
-	if($this->smtp_port=='' || $this->smtp_host=='' || $this->smtp_user=='' || $this->smtp_pass=='')exit;
+	if($this->smtp_port=='' || $this->smtp_host=='' || $this->smtp_user=='' || $this->smtp_pass=='') {
+		exit;
+	}
 		$config['protocol'] = "smtp";
 		$config['smtp_host'] = $this->smtp_host;
 		$config['smtp_port'] = $this->smtp_port;
@@ -236,14 +239,15 @@ 
 	if(!$this->email){
 		if(!$resend){
 			$this->build_template($template_type,$details,$detail_type);
-		}else{
+		} else{
 			$this->set_email_paramenters($details);
 		}
 
-		if(!$brodcast)
-	        	$history_id=$this->mail_history($attachment);
-		else	
-			$history_id=$details['history_id'];
+		if(!$brodcast) {
+			        	$history_id=$this->mail_history($attachment);
+		} else {
+					$history_id=$details['history_id'];
+		}
 		if(isset($this->from) && $this->from!='' && isset($this->to) && $this->to!='' && !$mass_mail){
 			if(!$this->smtp){
 				$this->get_smtp_details();
@@ -280,14 +284,15 @@ 
 		
 		if(!$resend){
 			$this->build_template($template_type,$details,$detail_type);
-		}else{
+		} else{
 			$this->set_email_paramenters($details);
 		}
 
-		if(!$brodcast)
-	        	$history_id=$this->mail_history($attachment);
-		else	
-			$history_id=$details['history_id'];
+		if(!$brodcast) {
+			        	$history_id=$this->mail_history($attachment);
+		} else {
+					$history_id=$details['history_id'];
+		}
 		if(isset($this->from) && $this->from!='' && isset($this->to) && $this->to!='' && !$mass_mail){
 			if(!$this->smtp){
 				$this->get_smtp_details();

web_interface/astpp/application/libraries/html2pdf/_tcpdf_5.0.002/config/tcpdf_config.php

Braces +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 			$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF'])));
 		} elseif(isset($_SERVER['PATH_TRANSLATED'])) {
 			$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF'])));
-		}	else {
+		} else {
 			// define here your DOCUMENT_ROOT path if the previous fails
 			$_SERVER['DOCUMENT_ROOT'] = '/var/www';
 		}

web_interface/astpp/application/libraries/html2pdf/_tcpdf_5.0.002/config/tcpdf_config_alt.php

Braces +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 		$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF'])));
 	} elseif(isset($_SERVER['PATH_TRANSLATED'])) {
 		$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF'])));
-	}	else {
+	} else {
 		// define here your DOCUMENT_ROOT path if the previous fails
 		$_SERVER['DOCUMENT_ROOT'] = '/var/www';
 	}

web_interface/astpp/application/libraries/html2pdf/_class/locale.class.php

Braces +3 added lines, -1 removed lines

@@ -65,7 +65,9 @@
         $handle = fopen($file, 'r');
         while (!feof($handle)) {
             $line = fgetcsv($handle);
-            if (count($line)!=2) continue;
+            if (count($line)!=2) {
+            	continue;
+            }
             self::$_list[trim($line[0])] = trim($line[1]);
         }
         fclose($handle);

web_interface/astpp/application/libraries/html2pdf/_class/parsingHtml.class.php

Braces +83 added lines, -41 removed lines

@@ -114,12 +114,13 @@ 
                         // if it is a closure tag
                         if ($res['close']) {
                             // HTML validation
-                            if (count($parents)<1)
-                                throw new HTML2PDF_exception(3, $res['name'], $this->getHtmlErrorCode($res['html_pos']));
-                            else if ($parents[count($parents)-1]!=$res['name'])
-                                throw new HTML2PDF_exception(4, $parents, $this->getHtmlErrorCode($res['html_pos']));
-                            else
-                                unset($parents[count($parents)-1]);
+                            if (count($parents)<1) {
+                                                            throw new HTML2PDF_exception(3, $res['name'], $this->getHtmlErrorCode($res['html_pos']));
+                            } else if ($parents[count($parents)-1]!=$res['name']) {
+                                                            throw new HTML2PDF_exception(4, $parents, $this->getHtmlErrorCode($res['html_pos']));
+                            } else {
+                                                            unset($parents[count($parents)-1]);
+                            }
                         } else {
                             // if it is a autoclosed tag
                             if ($res['autoclose']) {
@@ -131,8 +132,9 @@ 
                                 $res['close'] = true;
                             }
                             // else :add a child for validation
-                            else
-                                $parents[count($parents)] = $res['name'];
+                            else {
+                                                            $parents[count($parents)] = $res['name'];
+                            }
                         }
 
                         // if it is a <pre> tag (or <code> tag) not auclosed => update the flag
@@ -169,7 +171,9 @@ 
                         $txt = str_replace(' ', '&nbsp;', $txt);
 
                         // add a break line
-                        if ($k>0) $actions[] = $tagPreBr;
+                        if ($k>0) {
+                        	$actions[] = $tagPreBr;
+                        }
 
                         // save the action
                         $actions[] = array(
@@ -202,21 +206,26 @@ 
             // if it is a Text
             if ($actions[$k]['name']=='write') {
                 // if the tag before the text is a tag to clean => ltrim on the text
-                if ($k>0 && in_array($actions[$k-1]['name'], $tagsToClean))
-                    $actions[$k]['param']['txt'] = ltrim($actions[$k]['param']['txt']);
+                if ($k>0 && in_array($actions[$k-1]['name'], $tagsToClean)) {
+                                    $actions[$k]['param']['txt'] = ltrim($actions[$k]['param']['txt']);
+                }
 
                 // if the tag after the text is a tag to clean => rtrim on the text
-                if ($k<$nb-1 && in_array($actions[$k+1]['name'], $tagsToClean))
-                    $actions[$k]['param']['txt'] = rtrim($actions[$k]['param']['txt']);
+                if ($k<$nb-1 && in_array($actions[$k+1]['name'], $tagsToClean)) {
+                                    $actions[$k]['param']['txt'] = rtrim($actions[$k]['param']['txt']);
+                }
 
                 // if the text is empty => remove the action
-                if (!strlen($actions[$k]['param']['txt']))
-                    unset($actions[$k]);
+                if (!strlen($actions[$k]['param']['txt'])) {
+                                    unset($actions[$k]);
+                }
             }
         }
 
         // if we are not on the level 0 => HTML validator ERROR
-        if (count($parents)) throw new HTML2PDF_exception(5, $parents);
+        if (count($parents)) {
+        	throw new HTML2PDF_exception(5, $parents);
+        }
 
         // save the actions to do
         $this->code = array_values($actions);
@@ -232,7 +241,9 @@ 
      */
     protected function _prepareTxt($txt, $spaces = true)
     {
-        if ($spaces) $txt = preg_replace('/\s+/is', ' ', $txt);
+        if ($spaces) {
+        	$txt = preg_replace('/\s+/is', ' ', $txt);
+        }
         $txt = str_replace('&euro;', '€', $txt);
         $txt = html_entity_decode($txt, ENT_QUOTES, $this->_encoding);
         return $txt;
@@ -261,7 +272,9 @@ 
             // if it is a tag
             if ($parse[1][0]) {
                 // save the previous text if it exists
-                if ($str!=='')    $tmp[] = array('txt', $str);
+                if ($str!=='') {
+                	$tmp[] = array('txt', $str);
+                }
 
                 // save the tag, with the offset
                 $tmp[] = array('code', trim($parse[1][0]), $offset);
@@ -278,7 +291,9 @@ 
             unset($parse);
         }
         // if a text is present in the end, we save it
-        if ($str!='') $tmp[] = array('txt', $str);
+        if ($str!='') {
+        	$tmp[] = array('txt', $str);
+        }
         unset($str);
     }
 
@@ -292,7 +307,9 @@ 
     {
         // name of the tag, opening, closure, autoclosure
         $tag = '<([\/]{0,1})([_a-z0-9]+)([\/>\s]+)';
-        if (!preg_match('/'.$tag.'/isU', $code, $match)) return null;
+        if (!preg_match('/'.$tag.'/isU', $code, $match)) {
+        	return null;
+        }
         $close     = ($match[1]=='/' ? true : false);
         $autoclose = preg_match('/\/>$/isU', $code);
         $name      = strtolower($match[2]);
@@ -311,20 +328,23 @@ 
         // read the parameters : nom=valeur
         $prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
         preg_match_all('/'.$prop.'/is', $code, $match);
-        for($k=0; $k<count($match[0]); $k++)
-            $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        for($k=0; $k<count($match[0]); $k++) {
+                    $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        }
 
         // read the parameters : nom="valeur"
         $prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
         preg_match_all('/'.$prop.'/is', $code, $match);
-        for($k=0; $k<count($match[0]); $k++)
-            $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        for($k=0; $k<count($match[0]); $k++) {
+                    $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        }
 
         // read the parameters : nom='valeur'
         $prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
         preg_match_all('/'.$prop.'/is', $code, $match);
-        for($k=0; $k<count($match[0]); $k++)
-            $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        for($k=0; $k<count($match[0]); $k++) {
+                    $param[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+        }
 
         // compliance of each parameter
         $color  = "#000000";
@@ -370,19 +390,25 @@ 
 
                 case 'border':
                     unset($param[$key]);
-                    if (preg_match('/^[0-9]+$/isU', $val)) $val = $val.'px';
+                    if (preg_match('/^[0-9]+$/isU', $val)) {
+                    	$val = $val.'px';
+                    }
                     $border = $val;
                     break;
 
                 case 'cellpadding':
                 case 'cellspacing':
-                    if (preg_match('/^([0-9]+)$/isU', $val)) $param[$key] = $val.'px';
+                    if (preg_match('/^([0-9]+)$/isU', $val)) {
+                    	$param[$key] = $val.'px';
+                    }
                     break;
 
                 case 'colspan':
                 case 'rowspan':
                     $val = preg_replace('/[^0-9]/isU', '', $val);
-                    if (!$val) $val = 1;
+                    if (!$val) {
+                    	$val = 1;
+                    }
                     $param[$key] = $val;
                     break;
             }
@@ -390,8 +416,11 @@ 
 
         // compliance of the border
         if ($border!==null) {
-            if ($border)    $border = 'border: solid '.$border.' '.$color;
-            else            $border = 'border: none';
+            if ($border) {
+            	$border = 'border: solid '.$border.' '.$color;
+            } else {
+            	$border = 'border: none';
+            }
 
             $param['style'] .= $border.'; ';
             $param['border'] = $border;
@@ -427,10 +456,18 @@ 
         }
 
         // prepare the parameters
-        if (isset($param['value']))  $param['value']  = $this->_prepareTxt($param['value']);
-        if (isset($param['alt']))    $param['alt']    = $this->_prepareTxt($param['alt']);
-        if (isset($param['title']))  $param['title']  = $this->_prepareTxt($param['title']);
-        if (isset($param['class']))  $param['class']  = $this->_prepareTxt($param['class']);
+        if (isset($param['value'])) {
+        	$param['value']  = $this->_prepareTxt($param['value']);
+        }
+        if (isset($param['alt'])) {
+        	$param['alt']    = $this->_prepareTxt($param['alt']);
+        }
+        if (isset($param['title'])) {
+        	$param['title']  = $this->_prepareTxt($param['title']);
+        }
+        if (isset($param['class'])) {
+        	$param['class']  = $this->_prepareTxt($param['class']);
+        }
 
         // return the new action to do
         return array('name' => $name, 'close' => $close ? 1 : 0, 'autoclose' => $autoclose, 'param' => $param);
@@ -445,7 +482,9 @@ 
     public function getLevel($k)
     {
         // if the code does not exist => return empty
-        if (!isset($this->code[$k])) return array();
+        if (!isset($this->code[$k])) {
+        	return array();
+        }
 
         // the tag to detect
         $detect = $this->code[$k]['name'];
@@ -490,16 +529,19 @@ 
 
                 // if we can takin into account the current tag => save it
                 if (!$not) {
-                    if (isset($row['style']['text-align'])) unset($row['style']['text-align']);
+                    if (isset($row['style']['text-align'])) {
+                    	unset($row['style']['text-align']);
+                    }
                     $code[] = $row;
                 }
             }
 
             // it continues as long as there has code to analise
-            if (isset($this->code[$k+1]))
-                $k++;
-            else
-                $end = true;
+            if (isset($this->code[$k+1])) {
+                            $k++;
+            } else {
+                            $end = true;
+            }
         }
 
         // return the extract

web_interface/astpp/application/libraries/html2pdf/_class/myPdf.class.php

Braces +70 added lines, -27 removed lines

@@ -552,8 +552,12 @@ 
     public function setRotation($angle, $xC=null, $yC=null)
     {
         // if no center, rotate around the current posiition
-        if($xC === null) $xC=$this->x;
-        if($yC === null) $yC=$this->y;
+        if($xC === null) {
+        	$xC=$this->x;
+        }
+        if($yC === null) {
+        	$yC=$this->y;
+        }
 
         // prepare the coordinate
         $yC=($this->h-$yC)*$this->k;
@@ -595,8 +599,9 @@ 
      */
     public function SetY($y, $resetx=true, $rtloff=false)
     {
-        if ($resetx)
-            $this->x=$this->lMargin;
+        if ($resetx) {
+                    $this->x=$this->lMargin;
+        }
 
         $this->y=$y;
     }
@@ -713,9 +718,13 @@ 
         $y4=$y+$h;
 
         // get the Closing operator from the PDF Style
-        if($style=='F') $op='f';
-        elseif($style=='FD' || $style=='DF') $op='B';
-        else $op='S';
+        if($style=='F') {
+        	$op='f';
+        } elseif($style=='FD' || $style=='DF') {
+        	$op='B';
+        } else {
+        	$op='S';
+        }
 
         // drawing
         $this->_Point($x1, $y1, true);
@@ -759,9 +768,13 @@ 
     public function svgEllipse($x0, $y0, $rx, $ry, $style)
     {
         // get the Closing operator from the PDF Style
-        if($style=='F') $op='f';
-        elseif($style=='FD' || $style=='DF') $op='B';
-        else $op='S';
+        if($style=='F') {
+        	$op='f';
+        } elseif($style=='FD' || $style=='DF') {
+        	$op='B';
+        } else {
+        	$op='S';
+        }
 
         // drawing
         $this->_Arc($x0, $y0, $rx, $ry, 0, 2*M_PI, true, true, true);
@@ -778,9 +791,13 @@ 
     public function svgPolygone($actions, $style)
     {
         // get the Closing operator from the PDF Style
-        if($style=='F') $op='f';
-        elseif($style=='FD' || $style=='DF') $op='B';
-        else $op='S';
+        if($style=='F') {
+        	$op='f';
+        } elseif($style=='FD' || $style=='DF') {
+        	$op='B';
+        } else {
+        	$op='S';
+        }
 
         // To save the First action and the last point
         $first = array('', 0, 0);
@@ -919,7 +936,9 @@ 
      */
     protected function _Point($x, $y, $trans = false)
     {
-        if ($trans) $this->ptTransform($x, $y);
+        if ($trans) {
+        	$this->ptTransform($x, $y);
+        }
 
         $this->_out(sprintf('%.2F %.2F m', $x, $y));
     }
@@ -934,7 +953,9 @@ 
      */
     protected function _Line($x, $y, $trans = false)
     {
-        if ($trans) $this->ptTransform($x, $y);
+        if ($trans) {
+        	$this->ptTransform($x, $y);
+        }
 
         $this->_out(sprintf('%.2F %.2F l', $x, $y));
     }
@@ -987,7 +1008,9 @@ 
         $trans=false)
     {
         // if we want the no trigo direction : add 2PI to the begin angle, to invert the direction
-        if (!$direction) $angleBegin+= M_PI*2.;
+        if (!$direction) {
+        	$angleBegin+= M_PI*2.;
+        }
 
         // cut in segment to convert in berize curv
         $dt = ($angleEnd - $angleBegin)/self::ARC_NB_SEGMENT;
@@ -1004,7 +1027,9 @@ 
         $d0 = $ry * cos($t1);
 
         // if drawFirst => draw the first point
-        if ($drawFirst) $this->_Point($a0, $b0, $trans);
+        if ($drawFirst) {
+        	$this->_Point($a0, $b0, $trans);
+        }
 
         // foreach segment
         for ($i = 1; $i <= self::ARC_NB_SEGMENT; $i++) {
@@ -1091,7 +1116,9 @@ 
         $v['s1']['y'] =-$v['s1']['xr']*sin($angle)+$v['s1']['yr']*cos($angle);
         $v['s1']['a1'] = atan2($v['y1']-$v['s1']['y'], $v['x1']-$v['s1']['x']);
         $v['s1']['a2'] = atan2($v['y2']-$v['s1']['y'], $v['x2']-$v['s1']['x']);
-        if ($v['s1']['a1']>$v['s1']['a2']) $v['s1']['a1']-=2*M_PI;
+        if ($v['s1']['a1']>$v['s1']['a2']) {
+        	$v['s1']['a1']-=2*M_PI;
+        }
 
         $v['s2'] = array();
         $v['s2']['t'] = -$v['s1']['t'];
@@ -1103,7 +1130,9 @@ 
         $v['s2']['y'] =-$v['s2']['xr']*sin($angle)+$v['s2']['yr']*cos($angle);
         $v['s2']['a1'] = atan2($v['y1']-$v['s2']['y'], $v['x1']-$v['s2']['x']);
         $v['s2']['a2'] = atan2($v['y2']-$v['s2']['y'], $v['x2']-$v['s2']['x']);
-        if ($v['s2']['a1']>$v['s2']['a2']) $v['s2']['a1']-=2*M_PI;
+        if ($v['s2']['a1']>$v['s2']['a2']) {
+        	$v['s2']['a1']-=2*M_PI;
+        }
 
         if (!$l) {
             if ($s) {
@@ -1149,8 +1178,11 @@ 
     {
         // load the last Transfomation Matrix
         $nb = count($this->_transf);
-        if ($nb)    $m = $this->_transf[$nb-1];
-        else        $m = array(1,0,0,1,0,0);
+        if ($nb) {
+        	$m = $this->_transf[$nb-1];
+        } else {
+        	$m = array(1,0,0,1,0,0);
+        }
 
         // apply the Transformation Matrix
         list($x,$y) = array(($x*$m[0]+$y*$m[2]+$m[4]),($x*$m[1]+$y*$m[3]+$m[5]));
@@ -1174,11 +1206,16 @@ 
     {
         // get the last Transformation Matrix
         $nb = count($this->_transf);
-        if ($nb)    $m = $this->_transf[$nb-1];
-        else        $m = array(1,0,0,1,0,0);
+        if ($nb) {
+        	$m = $this->_transf[$nb-1];
+        } else {
+        	$m = array(1,0,0,1,0,0);
+        }
 
         // if no transform, get the Identity Matrix
-        if (!$n) $n = array(1,0,0,1,0,0);
+        if (!$n) {
+        	$n = array(1,0,0,1,0,0);
+        }
 
         // create the new Transformation Matrix
         $this->_transf[] = array(
@@ -1228,7 +1265,9 @@ 
         $this->write1DBarcode($code, $type, $x, $y, $w, $h, '', $style, 'N');
 
         // it Label => add the FontSize to the height
-        if ($labelFontsize) $h+= ($labelFontsize);
+        if ($labelFontsize) {
+        	$h+= ($labelFontsize);
+        }
 
         // return the size of the barcode
         return array($w, $h);
@@ -1258,7 +1297,9 @@ 
         $fontName = 'helvetica')
     {
         // bookmark the Title if wanted
-        if ($bookmarkTitle) $this->Bookmark($titre, 0, -1);
+        if ($bookmarkTitle) {
+        	$this->Bookmark($titre, 0, -1);
+        }
 
         // display the Title with the good Font size
         $this->SetFont($fontName, '', $sizeTitle);
@@ -1284,7 +1325,9 @@ 
 
             // Offset of the current level
             $level=$this->outlines[$i]['l'];
-            if($level>0) $this->Cell($level*8);
+            if($level>0) {
+            	$this->Cell($level*8);
+            }
 
             // Caption (cut to fit on the width page)
             $str=$this->outlines[$i]['t'];

web_interface/astpp/application/libraries/html2pdf/_class/parsingCss.class.php

Braces +389 added lines, -155 removed lines

@@ -82,7 +82,9 @@ 
     {
         $old = $this->_defaultFont;
         $this->_defaultFont = $default;
-        if ($default) $this->value['font-family'] = $default;
+        if ($default) {
+        	$this->value['font-family'] = $default;
+        }
         return $old;
     }
 
@@ -179,7 +181,9 @@ 
 
         // prepare the Collapse attribute
         $collapse = isset($this->value['border']['collapse']) ? $this->value['border']['collapse'] : false;
-        if (!in_array($tagName, array('tr', 'td', 'th', 'thead', 'tbody', 'tfoot'))) $collapse = false;
+        if (!in_array($tagName, array('tr', 'td', 'th', 'thead', 'tbody', 'tfoot'))) {
+        	$collapse = false;
+        }
 
         // set the global css values
         $this->value['position']   = null;
@@ -315,20 +319,23 @@ 
         $style = $b.$i;
 
         if ($this->_defaultFont) {
-            if($family=='arial')
-                $family='helvetica';
-            elseif($family=='symbol' || $family=='zapfdingbats')
-                $style='';
+            if($family=='arial') {
+                            $family='helvetica';
+            } elseif($family=='symbol' || $family=='zapfdingbats') {
+                            $style='';
+            }
 
             $fontkey = $family.$style;
-            if (!$this->_pdf->isLoadedFont($fontkey))
-                $family = $this->_defaultFont;
+            if (!$this->_pdf->isLoadedFont($fontkey)) {
+                            $family = $this->_defaultFont;
+            }
         }
 
-        if($family=='arial')
-            $family='helvetica';
-        elseif($family=='symbol' || $family=='zapfdingbats')
-            $style='';
+        if($family=='arial') {
+                    $family='helvetica';
+        } elseif($family=='symbol' || $family=='zapfdingbats') {
+                    $style='';
+        }
 
         // complete style
         $style.= $u.$d.$o;
@@ -340,10 +347,11 @@ 
         // apply the font
         $this->_pdf->SetFont($family, $style, $this->value['mini-size']*$size);
         $this->_pdf->setTextColorArray($this->value['color']);
-        if ($this->value['background']['color'])
-            $this->_pdf->setFillColorArray($this->value['background']['color']);
-        else
-            $this->_pdf->setFillColor(255);
+        if ($this->value['background']['color']) {
+                    $this->_pdf->setFillColorArray($this->value['background']['color']);
+        } else {
+                    $this->_pdf->setFillColor(255);
+        }
     }
 
      /**
@@ -375,7 +383,9 @@ 
      */
     public function restorePosition()
     {
-        if ($this->value['y']==$this->_pdf->getY()) $this->_pdf->setY($this->value['yc'], false);
+        if ($this->value['y']==$this->_pdf->getY()) {
+        	$this->_pdf->setY($this->value['yc'], false);
+        }
     }
 
      /**
@@ -396,18 +406,26 @@ 
         if ($this->value['position']=='relative' || $this->value['position']=='absolute') {
             if ($this->value['right']!==null) {
                 $x = $this->getLastWidth(true) - $this->value['right'] - $this->value['width'];
-                if ($this->value['margin']['r']) $x-= $this->value['margin']['r'];
+                if ($this->value['margin']['r']) {
+                	$x-= $this->value['margin']['r'];
+                }
             } else {
                 $x = $this->value['left'];
-                if ($this->value['margin']['l']) $x+= $this->value['margin']['l'];
+                if ($this->value['margin']['l']) {
+                	$x+= $this->value['margin']['l'];
+                }
             }
 
             if ($this->value['bottom']!==null) {
                 $y = $this->getLastHeight(true) - $this->value['bottom'] - $this->value['height'];
-                if ($this->value['margin']['b']) $y-= $this->value['margin']['b'];
+                if ($this->value['margin']['b']) {
+                	$y-= $this->value['margin']['b'];
+                }
             } else {
                 $y = $this->value['top'];
-                if ($this->value['margin']['t']) $y+= $this->value['margin']['t'];
+                if ($this->value['margin']['t']) {
+                	$y+= $this->value['margin']['t'];
+                }
             }
 
             if ($this->value['position']=='relative') {
@@ -420,8 +438,12 @@ 
         } else {
             $this->value['x'] = $currentX;
             $this->value['y'] = $currentY;
-            if ($this->value['margin']['l']) $this->value['x']+= $this->value['margin']['l'];
-            if ($this->value['margin']['t']) $this->value['y']+= $this->value['margin']['t'];
+            if ($this->value['margin']['l']) {
+            	$this->value['x']+= $this->value['margin']['l'];
+            }
+            if ($this->value['margin']['t']) {
+            	$this->value['y']+= $this->value['margin']['t'];
+            }
         }
 
         // save the new position
@@ -478,8 +500,12 @@ 
     {
         // prepare
         $tagName = strtolower($tagName);
-        $id   = isset($param['id'])   ? strtolower(trim($param['id']))   : null; if (!$id)   $id   = null;
-        $name = isset($param['name']) ? strtolower(trim($param['name'])) : null; if (!$name) $name = null;
+        $id   = isset($param['id'])   ? strtolower(trim($param['id']))   : null; if (!$id) {
+        	$id   = null;
+        }
+        $name = isset($param['name']) ? strtolower(trim($param['name'])) : null; if (!$name) {
+        	$name = null;
+        }
 
         // read the class attribute
         $class = array();
@@ -487,7 +513,9 @@ 
         $tmp = explode(' ', $tmp);
         foreach ($tmp as $k => $v) {
             $v = trim($v);
-            if ($v) $class[] = $v;
+            if ($v) {
+            	$class[] = $v;
+            }
         }
 
         // identify the tag, and the direct styles
@@ -526,10 +554,18 @@ 
         // adding the style from the tag
         $styles = array_merge($styles, $param['style']);
 
-        if (isset($styles['stroke']))        $this->value['svg']['stroke']       = $this->convertToColor($styles['stroke'], $res);
-        if (isset($styles['stroke-width']))  $this->value['svg']['stroke-width'] = $this->convertToMM($styles['stroke-width']);
-        if (isset($styles['fill']))          $this->value['svg']['fill']         = $this->convertToColor($styles['fill'], $res);
-        if (isset($styles['fill-opacity']))  $this->value['svg']['fill-opacity'] = 1.*$styles['fill-opacity'];
+        if (isset($styles['stroke'])) {
+        	$this->value['svg']['stroke']       = $this->convertToColor($styles['stroke'], $res);
+        }
+        if (isset($styles['stroke-width'])) {
+        	$this->value['svg']['stroke-width'] = $this->convertToMM($styles['stroke-width']);
+        }
+        if (isset($styles['fill'])) {
+        	$this->value['svg']['fill']         = $this->convertToColor($styles['fill'], $res);
+        }
+        if (isset($styles['fill-opacity'])) {
+        	$this->value['svg']['fill-opacity'] = 1.*$styles['fill-opacity'];
+        }
 
         return $this->value['svg'];
     }
@@ -546,8 +582,12 @@ 
     {
         // prepare the informations
         $tagName = strtolower($tagName);
-        $id   = isset($param['id'])   ? strtolower(trim($param['id']))    : null; if (!$id)   $id   = null;
-        $name = isset($param['name']) ? strtolower(trim($param['name']))  : null; if (!$name) $name = null;
+        $id   = isset($param['id'])   ? strtolower(trim($param['id']))    : null; if (!$id) {
+        	$id   = null;
+        }
+        $name = isset($param['name']) ? strtolower(trim($param['name']))  : null; if (!$name) {
+        	$name = null;
+        }
 
         // get the class names to use
         $class = array();
@@ -555,7 +595,9 @@ 
         $tmp = explode(' ', $tmp);
         foreach ($tmp as $k => $v) {
             $v = trim($v);
-            if ($v) $class[] = $v;
+            if ($v) {
+            	$class[] = $v;
+            }
         }
 
         // prepare the values, and the list of css tags to identify
@@ -584,7 +626,9 @@ 
 
         // merge with the css styles from tag
         $styles = array_merge($styles, $param['style']);
-        if (isset($param['allwidth']) && !isset($styles['width'])) $styles['width'] = '100%';
+        if (isset($param['allwidth']) && !isset($styles['width'])) {
+        	$styles['width'] = '100%';
+        }
 
         // reset some styles, depending on the tag name
         $this->resetStyle($tagName);
@@ -593,8 +637,9 @@ 
         if ($legacy) {
             foreach ($legacy as $legacyName => $legacyValue) {
                 if (is_array($legacyValue)) {
-                    foreach($legacyValue as $legacy2Name => $legacy2Value)
-                        $this->value[$legacyName][$legacy2Name] = $legacy2Value;
+                    foreach($legacyValue as $legacy2Name => $legacy2Value) {
+                                            $this->value[$legacyName][$legacy2Name] = $legacy2Value;
+                    }
                 } else {
                     $this->value[$legacyName] = $legacyValue;
                 }
@@ -612,7 +657,9 @@ 
                 case 'font-family':
                     $val = explode(',', $val);
                     $val = trim($val[0]);
-                    if ($val) $this->value['font-family'] = $val;
+                    if ($val) {
+                    	$this->value['font-family'] = $val;
+                    }
                     break;
 
                 case 'font-weight':
@@ -635,13 +682,17 @@ 
                     break;
 
                 case 'text-transform':
-                    if (!in_array($val, array('none', 'capitalize', 'uppercase', 'lowercase'))) $val = 'none';
+                    if (!in_array($val, array('none', 'capitalize', 'uppercase', 'lowercase'))) {
+                    	$val = 'none';
+                    }
                     $this->value['text-transform']  = $val;
                     break;
 
                 case 'font-size':
                     $val = $this->convertToMM($val, $this->value['font-size']);
-                    if ($val) $this->value['font-size'] = $val;
+                    if ($val) {
+                    	$this->value['font-size'] = $val;
+                    }
                     break;
 
                 case 'color':
@@ -657,7 +708,9 @@ 
 
                 case 'text-align':
                     $val = strtolower($val);
-                    if (!in_array($val, array('left', 'right', 'center', 'justify', 'li_right'))) $val = 'left';
+                    if (!in_array($val, array('left', 'right', 'center', 'justify', 'li_right'))) {
+                    	$val = 'left';
+                    }
                     $this->value['text-align'] = $val;
                     break;
 
@@ -667,7 +720,9 @@ 
 
                 case 'width':
                     $this->value['width'] = $this->convertToMM($val, $this->getLastWidth());
-                    if ($this->value['width'] && substr($val, -1)=='%') $correctWidth=true;
+                    if ($this->value['width'] && substr($val, -1)=='%') {
+                    	$correctWidth=true;
+                    }
                     $noWidth = false;
                     break;
 
@@ -676,18 +731,26 @@ 
                     break;
 
                 case 'line-height':
-                    if (preg_match('/^[0-9\.]+$/isU', $val)) $val = floor($val*100).'%';
+                    if (preg_match('/^[0-9\.]+$/isU', $val)) {
+                    	$val = floor($val*100).'%';
+                    }
                     $this->value['line-height'] = $val;
                     break;
 
                 case 'rotate':
-                    if (!in_array($val, array(0, -90, 90, 180, 270, -180, -270))) $val = null;
-                    if ($val<0) $val+= 360;
+                    if (!in_array($val, array(0, -90, 90, 180, 270, -180, -270))) {
+                    	$val = null;
+                    }
+                    if ($val<0) {
+                    	$val+= 360;
+                    }
                     $this->value['rotate'] = $val;
                     break;
 
                 case 'overflow':
-                    if (!in_array($val, array('visible', 'hidden'))) $val = 'visible';
+                    if (!in_array($val, array('visible', 'hidden'))) {
+                    	$val = 'visible';
+                    }
                     $this->value['overflow'] = $val;
                     break;
 
@@ -779,10 +842,18 @@ 
                         }
                     }
                     $this->_duplicateBorder($val);
-                    if ($val[0]) $this->value['border']['t']['type'] = $val[0];
-                    if ($val[1]) $this->value['border']['r']['type'] = $val[1];
-                    if ($val[2]) $this->value['border']['b']['type'] = $val[2];
-                    if ($val[3]) $this->value['border']['l']['type'] = $val[3];
+                    if ($val[0]) {
+                    	$this->value['border']['t']['type'] = $val[0];
+                    }
+                    if ($val[1]) {
+                    	$this->value['border']['r']['type'] = $val[1];
+                    }
+                    if ($val[2]) {
+                    	$this->value['border']['b']['type'] = $val[2];
+                    }
+                    if ($val[3]) {
+                    	$this->value['border']['l']['type'] = $val[3];
+                    }
                     break;
 
                 case 'border-top-style':
@@ -804,8 +875,9 @@ 
                     break;
 
                 case 'border-left-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed')))
-                        $this->value['border']['l']['type'] = $val;
+                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
+                                            $this->value['border']['l']['type'] = $val;
+                    }
                     break;
 
                 case 'border-color':
@@ -819,35 +891,51 @@ 
                             }
                     }
                     $this->_duplicateBorder($val);
-                    if (is_array($val[0])) $this->value['border']['t']['color'] = $val[0];
-                    if (is_array($val[1])) $this->value['border']['r']['color'] = $val[1];
-                    if (is_array($val[2])) $this->value['border']['b']['color'] = $val[2];
-                    if (is_array($val[3])) $this->value['border']['l']['color'] = $val[3];
+                    if (is_array($val[0])) {
+                    	$this->value['border']['t']['color'] = $val[0];
+                    }
+                    if (is_array($val[1])) {
+                    	$this->value['border']['r']['color'] = $val[1];
+                    }
+                    if (is_array($val[2])) {
+                    	$this->value['border']['b']['color'] = $val[2];
+                    }
+                    if (is_array($val[3])) {
+                    	$this->value['border']['l']['color'] = $val[3];
+                    }
 
                     break;
 
                 case 'border-top-color':
                     $res = false;
                     $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['t']['color'] = $val;
+                    if ($res) {
+                    	$this->value['border']['t']['color'] = $val;
+                    }
                     break;
 
                 case 'border-right-color':
                     $res = false;
                     $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['r']['color'] = $val;
+                    if ($res) {
+                    	$this->value['border']['r']['color'] = $val;
+                    }
                     break;
 
                 case 'border-bottom-color':
                     $res = false;
                     $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['b']['color'] = $val;
+                    if ($res) {
+                    	$this->value['border']['b']['color'] = $val;
+                    }
                     break;
 
                 case 'border-left-color':
                     $res = false;
                     $val = $this->convertToColor($val, $res);
-                    if ($res) $this->value['border']['l']['color'] = $val;
+                    if ($res) {
+                    	$this->value['border']['l']['color'] = $val;
+                    }
                     break;
 
                 case 'border-width':
@@ -856,34 +944,52 @@ 
                             $val[$valK] = $this->convertToMM($valV, 0);
                     }
                     $this->_duplicateBorder($val);
-                    if ($val[0]) $this->value['border']['t']['width'] = $val[0];
-                    if ($val[1]) $this->value['border']['r']['width'] = $val[1];
-                    if ($val[2]) $this->value['border']['b']['width'] = $val[2];
-                    if ($val[3]) $this->value['border']['l']['width'] = $val[3];
+                    if ($val[0]) {
+                    	$this->value['border']['t']['width'] = $val[0];
+                    }
+                    if ($val[1]) {
+                    	$this->value['border']['r']['width'] = $val[1];
+                    }
+                    if ($val[2]) {
+                    	$this->value['border']['b']['width'] = $val[2];
+                    }
+                    if ($val[3]) {
+                    	$this->value['border']['l']['width'] = $val[3];
+                    }
                     break;
 
                 case 'border-top-width':
                     $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['t']['width'] = $val;
+                    if ($val) {
+                    	$this->value['border']['t']['width'] = $val;
+                    }
                     break;
 
                 case 'border-right-width':
                     $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['r']['width'] = $val;
+                    if ($val) {
+                    	$this->value['border']['r']['width'] = $val;
+                    }
                     break;
 
                 case 'border-bottom-width':
                     $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['b']['width'] = $val;
+                    if ($val) {
+                    	$this->value['border']['b']['width'] = $val;
+                    }
                     break;
 
                 case 'border-left-width':
                     $val = $this->convertToMM($val, 0);
-                    if ($val) $this->value['border']['l']['width'] = $val;
+                    if ($val) {
+                    	$this->value['border']['l']['width'] = $val;
+                    }
                     break;
 
                 case 'border-collapse':
-                    if ($tagName=='table') $this->value['border']['collapse'] = ($val=='collapse');
+                    if ($tagName=='table') {
+                    	$this->value['border']['collapse'] = ($val=='collapse');
+                    }
                     break;
 
                 case 'border-radius':
@@ -895,17 +1001,29 @@ 
                     if (count($valH)<1 || count($valH)>4) {
                         break;
                     }
-                    if (!isset($valH[1])) $valH[1] = $valH[0];
-                    if (!isset($valH[2])) $valH = array($valH[0], $valH[0], $valH[1], $valH[1]);
-                    if (!isset($valH[3])) $valH[3] = $valH[1];
+                    if (!isset($valH[1])) {
+                    	$valH[1] = $valH[0];
+                    }
+                    if (!isset($valH[2])) {
+                    	$valH = array($valH[0], $valH[0], $valH[1], $valH[1]);
+                    }
+                    if (!isset($valH[3])) {
+                    	$valH[3] = $valH[1];
+                    }
                     if (isset($val[1])) {
                         $valV = $this->convertToRadius(trim($val[1]));
                         if (count($valV)<1 || count($valV)>4) {
                             break;
                         }
-                        if (!isset($valV[1])) $valV[1] = $valV[0];
-                        if (!isset($valV[2])) $valV = array($valV[0], $valV[0], $valV[1], $valV[1]);
-                        if (!isset($valV[3])) $valV[3] = $valV[1];
+                        if (!isset($valV[1])) {
+                        	$valV[1] = $valV[0];
+                        }
+                        if (!isset($valV[2])) {
+                        	$valV = array($valV[0], $valV[0], $valV[1], $valV[1]);
+                        }
+                        if (!isset($valV[3])) {
+                        	$valV[3] = $valV[1];
+                        }
                     } else {
                         $valV = $valH;
                     }
@@ -987,22 +1105,35 @@ 
                     break;
 
                 case 'position':
-                    if ($val=='absolute')       $this->value['position'] = 'absolute';
-                    else if ($val=='relative')  $this->value['position'] = 'relative';
-                    else                        $this->value['position'] = null;
+                    if ($val=='absolute') {
+                    	$this->value['position'] = 'absolute';
+                    } else if ($val=='relative') {
+                    	$this->value['position'] = 'relative';
+                    } else {
+                    	$this->value['position'] = null;
+                    }
                     break;
 
                 case 'float':
-                    if ($val=='left')           $this->value['float'] = 'left';
-                    else if ($val=='right')     $this->value['float'] = 'right';
-                    else                        $this->value['float'] = null;
+                    if ($val=='left') {
+                    	$this->value['float'] = 'left';
+                    } else if ($val=='right') {
+                    	$this->value['float'] = 'right';
+                    } else {
+                    	$this->value['float'] = null;
+                    }
                     break;
 
                 case 'display':
-                    if ($val=='inline')         $this->value['display'] = 'inline';
-                    else if ($val=='block')     $this->value['display'] = 'block';
-                    else if ($val=='none')      $this->value['display'] = 'none';
-                    else                        $this->value['display'] = null;
+                    if ($val=='inline') {
+                    	$this->value['display'] = 'inline';
+                    } else if ($val=='block') {
+                    	$this->value['display'] = 'block';
+                    } else if ($val=='none') {
+                    	$this->value['display'] = 'none';
+                    } else {
+                    	$this->value['display'] = null;
+                    }
                     break;
 
                 case 'top':
@@ -1015,7 +1146,9 @@ 
                 case 'list-style':
                 case 'list-style-type':
                 case 'list-style-image':
-                    if ($nom=='list-style') $nom = 'list-style-type';
+                    if ($nom=='list-style') {
+                    	$nom = 'list-style-type';
+                    }
                     $this->value[$nom] = $val;
                     break;
 
@@ -1027,11 +1160,17 @@ 
         $return = true;
 
         // only for P tag
-        if ($this->value['margin']['t']===null) $this->value['margin']['t'] = $this->value['font-size'];
-        if ($this->value['margin']['b']===null) $this->value['margin']['b'] = $this->value['font-size'];
+        if ($this->value['margin']['t']===null) {
+        	$this->value['margin']['t'] = $this->value['font-size'];
+        }
+        if ($this->value['margin']['b']===null) {
+        	$this->value['margin']['b'] = $this->value['font-size'];
+        }
 
         // force the text align to left, if asked by html2pdf
-        if ($this->_onlyLeft) $this->value['text-align'] = 'left';
+        if ($this->_onlyLeft) {
+        	$this->value['text-align'] = 'left';
+        }
 
         // correction on the width (quick box)
         if ($noWidth && in_array($tagName, array('div', 'blockquote', 'fieldset')) && $this->value['position']!='absolute') {
@@ -1047,30 +1186,60 @@ 
                     $this->value['width']-= $this->convertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
                     $return = false;
                 }
-                if ($this->value['width']<0) $this->value['width']=0;
+                if ($this->value['width']<0) {
+                	$this->value['width']=0;
+                }
             } else {
                 if ($this->value['width']) {
-                    if ($this->value['border']['l']['width']) $this->value['width'] += $this->value['border']['l']['width'];
-                    if ($this->value['border']['r']['width']) $this->value['width'] += $this->value['border']['r']['width'];
-                    if ($this->value['padding']['l'])         $this->value['width'] += $this->value['padding']['l'];
-                    if ($this->value['padding']['r'])         $this->value['width'] += $this->value['padding']['r'];
+                    if ($this->value['border']['l']['width']) {
+                    	$this->value['width'] += $this->value['border']['l']['width'];
+                    }
+                    if ($this->value['border']['r']['width']) {
+                    	$this->value['width'] += $this->value['border']['r']['width'];
+                    }
+                    if ($this->value['padding']['l']) {
+                    	$this->value['width'] += $this->value['padding']['l'];
+                    }
+                    if ($this->value['padding']['r']) {
+                    	$this->value['width'] += $this->value['padding']['r'];
+                    }
                 }
             }
         }
         if ($this->value['height']) {
-            if ($this->value['border']['b']['width']) $this->value['height'] += $this->value['border']['b']['width'];
-            if ($this->value['border']['t']['width']) $this->value['height'] += $this->value['border']['t']['width'];
-            if ($this->value['padding']['b'])         $this->value['height'] += $this->value['padding']['b'];
-            if ($this->value['padding']['t'])         $this->value['height'] += $this->value['padding']['t'];
+            if ($this->value['border']['b']['width']) {
+            	$this->value['height'] += $this->value['border']['b']['width'];
+            }
+            if ($this->value['border']['t']['width']) {
+            	$this->value['height'] += $this->value['border']['t']['width'];
+            }
+            if ($this->value['padding']['b']) {
+            	$this->value['height'] += $this->value['padding']['b'];
+            }
+            if ($this->value['padding']['t']) {
+            	$this->value['height'] += $this->value['padding']['t'];
+            }
         }
 
-        if ($this->value['top']!=null)      $this->value['top']     = $this->convertToMM($this->value['top'], $this->getLastHeight(true));
-        if ($this->value['bottom']!=null)   $this->value['bottom']  = $this->convertToMM($this->value['bottom'], $this->getLastHeight(true));
-        if ($this->value['left']!=null)     $this->value['left']    = $this->convertToMM($this->value['left'], $this->getLastWidth(true));
-        if ($this->value['right']!=null)    $this->value['right']   = $this->convertToMM($this->value['right'], $this->getLastWidth(true));
+        if ($this->value['top']!=null) {
+        	$this->value['top']     = $this->convertToMM($this->value['top'], $this->getLastHeight(true));
+        }
+        if ($this->value['bottom']!=null) {
+        	$this->value['bottom']  = $this->convertToMM($this->value['bottom'], $this->getLastHeight(true));
+        }
+        if ($this->value['left']!=null) {
+        	$this->value['left']    = $this->convertToMM($this->value['left'], $this->getLastWidth(true));
+        }
+        if ($this->value['right']!=null) {
+        	$this->value['right']   = $this->convertToMM($this->value['right'], $this->getLastWidth(true));
+        }
 
-        if ($this->value['top'] && $this->value['bottom'] && $this->value['height'])    $this->value['bottom']  = null;
-        if ($this->value['left'] && $this->value['right'] && $this->value['width'])     $this->value['right']   = null;
+        if ($this->value['top'] && $this->value['bottom'] && $this->value['height']) {
+        	$this->value['bottom']  = null;
+        }
+        if ($this->value['left'] && $this->value['right'] && $this->value['width']) {
+        	$this->value['right']   = null;
+        }
 
         return $return;
     }
@@ -1084,7 +1253,9 @@ 
     public function getLineHeight()
     {
         $val = $this->value['line-height'];
-        if ($val=='normal') $val = '108%';
+        if ($val=='normal') {
+        	$val = '108%';
+        }
         return $this->convertToMM($val, $this->value['font-size']);
     }
 
@@ -1140,8 +1311,12 @@ 
      */
     public function getFloat()
     {
-        if ($this->value['float']=='left')    return 'left';
-        if ($this->value['float']=='right')   return 'right';
+        if ($this->value['float']=='left') {
+        	return 'left';
+        }
+        if ($this->value['float']=='right') {
+        	return 'right';
+        }
         return null;
     }
 
@@ -1171,7 +1346,9 @@ 
     protected function _getLastAbsoluteX()
     {
         for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['x'] && $this->table[$k]['position']) return $this->table[$k]['x'];
+            if ($this->table[$k]['x'] && $this->table[$k]['position']) {
+            	return $this->table[$k]['x'];
+            }
         }
         return $this->_pdf->getlMargin();
     }
@@ -1185,7 +1362,9 @@ 
     protected function _getLastAbsoluteY()
     {
         for ($k=count($this->table)-1; $k>=0; $k--) {
-            if ($this->table[$k]['y'] && $this->table[$k]['position']) return $this->table[$k]['y'];
+            if ($this->table[$k]['y'] && $this->table[$k]['position']) {
+            	return $this->table[$k]['y'];
+            }
         }
         return $this->_pdf->gettMargin();
     }
@@ -1222,7 +1401,9 @@ 
         if (count($getit)) {
             // get them, but in the definition order, because of priority
             asort($getit);
-            foreach ($getit as $key => $val) $styles = array_merge($styles, $this->css[$key]);
+            foreach ($getit as $key => $val) {
+            	$styles = array_merge($styles, $this->css[$key]);
+            }
         }
 
         return $styles;
@@ -1242,7 +1423,9 @@ 
         // if next step
         if ($next!==null) {
             // we remove this step
-            if ($next) $key = trim(substr($key, 0, -strlen($next)));
+            if ($next) {
+            	$key = trim(substr($key, 0, -strlen($next)));
+            }
             array_shift($lst);
 
             // if no more step to identify => return false
@@ -1294,8 +1477,11 @@ 
         $css = explode(' ', $css);
         foreach ($css as $k => $v) {
             $v = trim($v);
-            if ($v) $css[$k] = $v;
-            else    unset($css[$k]);
+            if ($v) {
+            	$css[$k] = $v;
+            } else {
+            	unset($css[$k]);
+            }
         }
         $css = array_values($css);
 
@@ -1320,12 +1506,16 @@ 
             // else, it could be the color
             } else {
                 $tmp = $this->convertToColor($value, $res);
-                if ($res) $color = $tmp;
+                if ($res) {
+                	$color = $tmp;
+                }
             }
         }
 
         // if no witdh => return none
-        if (!$width) return $none;
+        if (!$width) {
+        	return $none;
+        }
 
         // return the border properties
         return array('type' => $type, 'width' => $width, 'color' => $color);
@@ -1414,7 +1604,9 @@ 
         if ($pos) {
             // try to read it
             $pos = $this->convertBackgroundPosition($pos, $ok);
-            if ($ok) $value['position'] = $pos;
+            if ($ok) {
+            	$value['position'] = $pos;
+            }
         }
     }
 
@@ -1428,8 +1620,11 @@ 
     public function convertBackgroundColor($css)
     {
         $res = null;
-        if ($css=='transparent') return null;
-        else                     return $this->convertToColor($css, $res);
+        if ($css=='transparent') {
+        	return null;
+        } else {
+        	return $this->convertToColor($css, $res);
+        }
     }
 
     /**
@@ -1441,12 +1636,13 @@ 
      */
     public function convertBackgroundImage($css)
     {
-        if ($css=='none')
-            return null;
-        else if (preg_match('/^url\(([^)]*)\)$/isU', $css, $match))
-            return $match[1];
-        else
-            return null;
+        if ($css=='none') {
+                    return null;
+        } else if (preg_match('/^url\(([^)]*)\)$/isU', $css, $match)) {
+                    return $match[1];
+        } else {
+                    return null;
+        }
     }
 
     /**
@@ -1467,10 +1663,14 @@ 
 
         // we must have 2 values. if 0 or >2 : error. if 1 => put center for 2
         if (count($css)<2) {
-            if (!$css[0]) return null;
+            if (!$css[0]) {
+            	return null;
+            }
             $css[1] = 'center';
         }
-        if (count($css)>2) return null;
+        if (count($css)>2) {
+        	return null;
+        }
 
         // prepare the values
         $x = 0;
@@ -1478,24 +1678,42 @@ 
         $res = true;
 
         // convert the first value
-        if ($css[0]=='left')        $x = '0%';
-        else if ($css[0]=='center') $x = '50%';
-        else if ($css[0]=='right')  $x = '100%';
-        else if ($css[0]=='top')    $y = '0%';
-        else if ($css[0]=='bottom') $y = '100%';
-        else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[0])) $x = $css[0];
-        else if ($this->convertToMM($css[0])) $x = $this->convertToMM($css[0]);
-        else $res = false;
+        if ($css[0]=='left') {
+        	$x = '0%';
+        } else if ($css[0]=='center') {
+        	$x = '50%';
+        } else if ($css[0]=='right') {
+        	$x = '100%';
+        } else if ($css[0]=='top') {
+        	$y = '0%';
+        } else if ($css[0]=='bottom') {
+        	$y = '100%';
+        } else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[0])) {
+        	$x = $css[0];
+        } else if ($this->convertToMM($css[0])) {
+        	$x = $this->convertToMM($css[0]);
+        } else {
+        	$res = false;
+        }
 
         // convert the second value
-        if ($css[1]=='left')        $x = '0%';
-        else if ($css[1]=='right')  $x = '100%';
-        else if ($css[1]=='top')    $y = '0%';
-        else if ($css[1]=='center') $y = '50%';
-        else if ($css[1]=='bottom') $y = '100%';
-        else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[1])) $y = $css[1];
-        else if ($this->convertToMM($css[1])) $y = $this->convertToMM($css[1]);
-        else $res = false;
+        if ($css[1]=='left') {
+        	$x = '0%';
+        } else if ($css[1]=='right') {
+        	$x = '100%';
+        } else if ($css[1]=='top') {
+        	$y = '0%';
+        } else if ($css[1]=='center') {
+        	$y = '50%';
+        } else if ($css[1]=='bottom') {
+        	$y = '100%';
+        } else if (preg_match('/^[-]?[0-9\.]+%$/isU', $css[1])) {
+        	$y = $css[1];
+        } else if ($this->convertToMM($css[1])) {
+        	$y = $this->convertToMM($css[1]);
+        } else {
+        	$res = false;
+        }
 
         // return the values
         return array($x, $y);
@@ -1535,13 +1753,22 @@ 
     public function convertToMM($css, $old=0.)
     {
         $css = trim($css);
-        if (preg_match('/^[0-9\.\-]+$/isU', $css))        $css.= 'px';
-        if (preg_match('/^[0-9\.\-]+px$/isU', $css))      $css = 25.4/96. * str_replace('px', '', $css);
-        else if (preg_match('/^[0-9\.\-]+pt$/isU', $css)) $css = 25.4/72. * str_replace('pt', '', $css);
-        else if (preg_match('/^[0-9\.\-]+in$/isU', $css)) $css = 25.4 * str_replace('in', '', $css);
-        else if (preg_match('/^[0-9\.\-]+mm$/isU', $css)) $css = 1.*str_replace('mm', '', $css);
-        else if (preg_match('/^[0-9\.\-]+%$/isU', $css))  $css = 1.*$old*str_replace('%', '', $css)/100.;
-        else                                              $css = null;
+        if (preg_match('/^[0-9\.\-]+$/isU', $css)) {
+        	$css.= 'px';
+        }
+        if (preg_match('/^[0-9\.\-]+px$/isU', $css)) {
+        	$css = 25.4/96. * str_replace('px', '', $css);
+        } else if (preg_match('/^[0-9\.\-]+pt$/isU', $css)) {
+        	$css = 25.4/72. * str_replace('pt', '', $css);
+        } else if (preg_match('/^[0-9\.\-]+in$/isU', $css)) {
+        	$css = 25.4 * str_replace('in', '', $css);
+        } else if (preg_match('/^[0-9\.\-]+mm$/isU', $css)) {
+        	$css = 1.*str_replace('mm', '', $css);
+        } else if (preg_match('/^[0-9\.\-]+%$/isU', $css)) {
+        	$css = 1.*$old*str_replace('%', '', $css)/100.;
+        } else {
+        	$css = null;
+        }
 
         return $css;
     }
@@ -1590,7 +1817,9 @@ 
         $res = true;
 
         // if transparent => return null
-        if (strtolower($css)=='transparent') return array(null, null, null);
+        if (strtolower($css)=='transparent') {
+        	return array(null, null, null);
+        }
 
         // HTML color
         if (isset($this->_htmlColor[strtolower($css)])) {
@@ -1651,7 +1880,9 @@ 
             $c = floatVal(substr($c, 0, -1))/100.;
         } else {
             $c = floatVal($c);
-            if ($c>1) $c = $c/255.;
+            if ($c>1) {
+            	$c = $c/255.;
+            }
         }
 
         return $c;
@@ -1705,13 +1936,16 @@ 
                 $name = trim($name);
 
                 // if a selector with somethink lige :hover => continue
-                if (strpos($name, ':')!==false) continue;
+                if (strpos($name, ':')!==false) {
+                	continue;
+                }
 
                 // save the value
-                if (!isset($this->css[$name]))
-                    $this->css[$name] = $css;
-                else
-                    $this->css[$name] = array_merge($this->css[$name], $css);
+                if (!isset($this->css[$name])) {
+                                    $this->css[$name] = $css;
+                } else {
+                                    $this->css[$name] = array_merge($this->css[$name], $css);
+                }
 
             }
         }

web_interface/astpp/application/libraries/html2pdf/html2pdf.php

Braces +862 added lines, -322 removed lines

@@ -162,7 +162,9 @@ 
             $this->_subPart = false;
 
             // init the marges of the page
-            if (!is_array($marges)) $marges = array($marges, $marges, $marges, $marges);
+            if (!is_array($marges)) {
+            	$marges = array($marges, $marges, $marges, $marges);
+            }
             $this->_setDefaultMargins($marges[0], $marges[1], $marges[2], $marges[3]);
             $this->_setMargins();
             $this->_marges = array();
@@ -310,7 +312,9 @@ 
         {
             $oldPage = $this->_INDEX_NewPage($onPage);
             $this->pdf->createIndex($this, $titre, $sizeTitle, $sizeBookmark, $bookmarkTitle, $displayPage, $onPage, $fontName);
-            if ($oldPage) $this->pdf->setPage($oldPage);
+            if ($oldPage) {
+            	$this->pdf->setPage($oldPage);
+            }
         }
 
         /**
@@ -356,14 +360,24 @@ 
             }
 
             // complete parameters
-            if ($dest===false) $dest = 'I';
-            if ($dest===true)  $dest = 'S';
-            if ($dest==='')    $dest = 'I';
-            if ($name=='')     $name='document.pdf';
+            if ($dest===false) {
+            	$dest = 'I';
+            }
+            if ($dest===true) {
+            	$dest = 'S';
+            }
+            if ($dest==='') {
+            	$dest = 'I';
+            }
+            if ($name=='') {
+            	$name='document.pdf';
+            }
 
             // clean up the destination
             $dest = strtoupper($dest);
-            if (!in_array($dest, array('I', 'D', 'F', 'S', 'FI','FD'))) $dest = 'I';
+            if (!in_array($dest, array('I', 'D', 'F', 'S', 'FI','FD'))) {
+            	$dest = 'I';
+            }
 
             // the name must be a PDF name
             if (strtolower(substr($name, -4))!='.pdf') {
@@ -385,8 +399,9 @@ 
         public function writeHTML($html, $debugVue = false)
         {
             // if it is a real html page, we have to convert it
-            if (preg_match('/<body/isU', $html))
-                $html = $this->getHtmlFromPage($html);
+            if (preg_match('/<body/isU', $html)) {
+                            $html = $this->getHtmlFromPage($html);
+            }
 
             $html = str_replace('[[date_y]]', date('Y'), $html);
             $html = str_replace('[[date_m]]', date('m'), $html);
@@ -422,20 +437,24 @@ 
 
             // extract the content
             $res = explode('<body', $html);
-            if (count($res)<2) return $html;
+            if (count($res)<2) {
+            	return $html;
+            }
             $content = '<page'.$res[1];
             $content = explode('</body', $content);
             $content = $content[0].'</page>';
 
             // extract the link tags
             preg_match_all('/<link([^>]*)>/isU', $html, $match);
-            foreach ($match[0] as $src)
-                $content = $src.'</link>'.$content;
+            foreach ($match[0] as $src) {
+                            $content = $src.'</link>'.$content;
+            }
 
             // extract the css style tags
             preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
-            foreach ($match[0] as $src)
-                $content = $src.$content;
+            foreach ($match[0] as $src) {
+                            $content = $src.$content;
+            }
 
             return $content;
         }
@@ -513,8 +532,12 @@ 
          */
         protected function _setDefaultMargins($left, $top, $right = null, $bottom = null)
         {
-            if ($right===null)  $right = $left;
-            if ($bottom===null) $bottom = 8;
+            if ($right===null) {
+            	$right = $left;
+            }
+            if ($bottom===null) {
+            	$bottom = 8;
+            }
 
             $this->_defaultLeft   = $this->parsingCss->ConvertToMM($left.'mm');
             $this->_defaultTop    = $this->parsingCss->ConvertToMM($top.'mm');
@@ -565,8 +588,9 @@ 
                         $this->pdf->Rect(0, 0, $this->pdf->getW(), $this->pdf->getH(), 'F');
                     }
 
-                    if (isset($this->_background['img']) && $this->_background['img'])
-                        $this->pdf->Image($this->_background['img'], $this->_background['posX'], $this->_background['posY'], $this->_background['width']);
+                    if (isset($this->_background['img']) && $this->_background['img']) {
+                                            $this->pdf->Image($this->_background['img'], $this->_background['posX'], $this->_background['posY'], $this->_background['width']);
+                    }
                 }
 
                 $this->_setPageHeader();
@@ -617,7 +641,9 @@ 
         protected function _DEBUG_add($name, $level=null)
         {
             // if true : UP
-            if ($level===true) $this->_debugLevel++;
+            if ($level===true) {
+            	$this->_debugLevel++;
+            }
 
             $name   = str_repeat('  ', $this->_debugLevel). $name.($level===true ? ' Begin' : ($level===false ? ' End' : ''));
             $time  = microtime(true);
@@ -635,7 +661,9 @@ 
             $this->_debugLastTime = $time;
 
             // it false : DOWN
-            if ($level===false) $this->_debugLevel--;
+            if ($level===false) {
+            	$this->_debugLevel--;
+            }
 
             return $this;
         }
@@ -674,8 +702,9 @@ 
             $y = floor($y*100);
             $x = array($this->pdf->getlMargin(), $this->pdf->getW()-$this->pdf->getrMargin());
 
-            foreach ($this->_pageMarges as $mY => $mX)
-                if ($mY<=$y) $x = $mX;
+            foreach ($this->_pageMarges as $mY => $mX) {
+                            if ($mY<=$y) $x = $mX;
+            }
 
             return $x;
         }
@@ -697,18 +726,30 @@ 
             $oldBottom = $this->_getMargins($yBottom);
 
             // update the top float margin
-            if ($float=='left'  && $oldTop[0]<$xRight) $oldTop[0] = $xRight;
-            if ($float=='right' && $oldTop[1]>$xLeft)  $oldTop[1] = $xLeft;
+            if ($float=='left'  && $oldTop[0]<$xRight) {
+            	$oldTop[0] = $xRight;
+            }
+            if ($float=='right' && $oldTop[1]>$xLeft) {
+            	$oldTop[1] = $xLeft;
+            }
 
             $yTop = floor($yTop*100);
             $yBottom = floor($yBottom*100);
 
             // erase all the float margins that are smaller than the new one
             foreach ($this->_pageMarges as $mY => $mX) {
-                if ($mY<$yTop) continue;
-                if ($mY>$yBottom) break;
-                if ($float=='left' && $this->_pageMarges[$mY][0]<$xRight)  unset($this->_pageMarges[$mY]);
-                if ($float=='right' && $this->_pageMarges[$mY][1]>$xLeft) unset($this->_pageMarges[$mY]);
+                if ($mY<$yTop) {
+                	continue;
+                }
+                if ($mY>$yBottom) {
+                	break;
+                }
+                if ($float=='left' && $this->_pageMarges[$mY][0]<$xRight) {
+                	unset($this->_pageMarges[$mY]);
+                }
+                if ($float=='right' && $this->_pageMarges[$mY][1]>$xLeft) {
+                	unset($this->_pageMarges[$mY]);
+                }
             }
 
             // save the new Top and Bottom margins
@@ -806,7 +847,9 @@ 
          */
         protected function _setPageHeader()
         {
-            if (!count($this->_subHEADER)) return false;
+            if (!count($this->_subHEADER)) {
+            	return false;
+            }
 
             $oldParsePos = $this->_parsePos;
             $oldParseCode = $this->parsingHtml->code;
@@ -826,7 +869,9 @@ 
          */
         protected function _setPageFooter()
         {
-            if (!count($this->_subFOOTER)) return false;
+            if (!count($this->_subFOOTER)) {
+            	return false;
+            }
 
             $oldParsePos = $this->_parsePos;
             $oldParseCode = $this->parsingHtml->code;
@@ -887,15 +932,18 @@ 
                 $txt = $sub->parsingHtml->code[$this->_parsePos]['param']['txt'];
                 $txt = str_replace('[[page_cu]]', $sub->pdf->getMyNumPage($this->_page), $txt);
                 $sub->parsingHtml->code[$this->_parsePos]['param']['txt'] = substr($txt, $curr+1);
-            } else
-                $sub->_parsePos++;
+            } else {
+                            $sub->_parsePos++;
+            }
 
             // for each element of the parsing => load the action
             $res = null;
             for ($sub->_parsePos; $sub->_parsePos<count($sub->parsingHtml->code); $sub->_parsePos++) {
                 $action = $sub->parsingHtml->code[$sub->_parsePos];
                 $res = $sub->_executeAction($action);
-                if (!$res) break;
+                if (!$res) {
+                	break;
+                }
             }
 
             $w = $sub->_maxX; // max width
@@ -906,12 +954,13 @@ 
             $this->_destroySubHTML($sub);
 
             // adapt the start of the line, depending on the text-align
-            if ($this->parsingCss->value['text-align']=='center')
-                $this->pdf->setX(($rx+$this->pdf->getX()-$w)*0.5-0.01);
-            else if ($this->parsingCss->value['text-align']=='right')
-                $this->pdf->setX($rx-$w-0.01);
-            else
-                $this->pdf->setX($lx);
+            if ($this->parsingCss->value['text-align']=='center') {
+                            $this->pdf->setX(($rx+$this->pdf->getX()-$w)*0.5-0.01);
+            } else if ($this->parsingCss->value['text-align']=='right') {
+                            $this->pdf->setX($rx-$w-0.01);
+            } else {
+                            $this->pdf->setX($lx);
+            }
 
             // set the height of the line
             $this->_currentH = $h;
@@ -1024,8 +1073,12 @@ 
             $nbBaseFive    = array('V','L','D');
             $nbRoman    = '';
 
-            if ($nbArabic<1)    return $nbArabic;
-            if ($nbArabic>3999) return $nbArabic;
+            if ($nbArabic<1) {
+            	return $nbArabic;
+            }
+            if ($nbArabic>3999) {
+            	return $nbArabic;
+            }
 
             for ($i=3; $i>=0 ; $i--) {
                 $chiffre=floor($nbArabic/pow(10, $i));
@@ -1095,7 +1148,9 @@ 
             $nb = $this->_defList[count($this->_defList)-1]['nb'];
             $up = (substr($st, 0, 6)=='upper-');
 
-            if ($im) return array(false, false, $im);
+            if ($im) {
+            	return array(false, false, $im);
+            }
 
             switch($st)
             {
@@ -1156,12 +1211,19 @@ 
             }
 
             // prepare the datas
-            if (!in_array($type, array('ul', 'ol'))) $type = 'ul';
-            if (!in_array($style, array('lower-alpha', 'upper-alpha', 'upper-roman', 'lower-roman', 'decimal', 'square', 'circle', 'disc', 'none'))) $style = '';
+            if (!in_array($type, array('ul', 'ol'))) {
+            	$type = 'ul';
+            }
+            if (!in_array($style, array('lower-alpha', 'upper-alpha', 'upper-roman', 'lower-roman', 'decimal', 'square', 'circle', 'disc', 'none'))) {
+            	$style = '';
+            }
 
             if (!$style) {
-                if ($type=='ul')    $style = 'disc';
-                else                $style = 'decimal';
+                if ($type=='ul') {
+                	$style = 'disc';
+                } else {
+                	$style = 'decimal';
+                }
             }
 
             // add the new level
@@ -1270,8 +1332,9 @@ 
          */
         protected function _getElementY($h)
         {
-            if ($this->_subPart || $this->_isSubPart || !$this->_currentH || $this->_currentH<$h)
-                return 0;
+            if ($this->_subPart || $this->_isSubPart || !$this->_currentH || $this->_currentH<$h) {
+                            return 0;
+            }
 
             return ($this->_currentH-$h)*0.8;
         }
@@ -1286,10 +1349,11 @@ 
         protected function _makeBreakLine($h, $curr = null)
         {
             if ($h) {
-                if (($this->pdf->getY()+$h<$this->pdf->getH() - $this->pdf->getbMargin()) || $this->_isInOverflow || $this->_isInFooter)
-                    $this->_setNewLine($h, $curr);
-                else
-                    $this->_setNewPage(null, '', null, $curr);
+                if (($this->pdf->getY()+$h<$this->pdf->getH() - $this->pdf->getbMargin()) || $this->_isInOverflow || $this->_isInFooter) {
+                                    $this->_setNewLine($h, $curr);
+                } else {
+                                    $this->_setNewPage(null, '', null, $curr);
+                }
             } else {
                 $this->_setNewPositionForNewLine($curr);
             }
@@ -1413,7 +1477,9 @@ 
 
             // calculate the position of the image, if align to the right
             if ($parentWidth>$w && $float!='left') {
-                if ($float=='right' || $this->parsingCss->value['text-align']=='li_right')    $x = $parentX + $parentWidth - $w-$this->parsingCss->value['margin']['r']-$this->parsingCss->value['margin']['l'];
+                if ($float=='right' || $this->parsingCss->value['text-align']=='li_right') {
+                	$x = $parentX + $parentWidth - $w-$this->parsingCss->value['margin']['r']-$this->parsingCss->value['margin']['l'];
+                }
             }
 
             // display the image
@@ -1484,7 +1550,9 @@ 
         protected function _drawRectangle($x, $y, $w, $h, $border, $padding, $margin, $background)
         {
             // if we are in a subpart or if height is null => return false
-            if ($this->_subPart || $this->_isSubPart || $h===null) return false;
+            if ($this->_subPart || $this->_isSubPart || $h===null) {
+            	return false;
+            }
 
             // add the margin
             $x+= $margin;
@@ -1527,10 +1595,18 @@ 
                 $inBL[1]-= $border['b']['width'];
             }
 
-            if ($inTL[0]<=0 || $inTL[1]<=0) $inTL = null;
-            if ($inTR[0]<=0 || $inTR[1]<=0) $inTR = null;
-            if ($inBR[0]<=0 || $inBR[1]<=0) $inBR = null;
-            if ($inBL[0]<=0 || $inBL[1]<=0) $inBL = null;
+            if ($inTL[0]<=0 || $inTL[1]<=0) {
+            	$inTL = null;
+            }
+            if ($inTR[0]<=0 || $inTR[1]<=0) {
+            	$inTR = null;
+            }
+            if ($inBR[0]<=0 || $inBR[1]<=0) {
+            	$inBR = null;
+            }
+            if ($inBL[0]<=0 || $inBL[1]<=0) {
+            	$inBL = null;
+            }
 
             // prepare the background color
             $pdfStyle = '';
@@ -1588,13 +1664,21 @@ 
                     $imageHeight    = 72./96.*$imageInfos[1]/$this->pdf->getK();
 
                     // prepare the position of the backgroung
-                    if ($iRepeat[0]) $iPosition[0] = $bX;
-                    else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[0], $match)) $iPosition[0] = $bX + $match[1]*($bW-$imageWidth)/100;
-                    else $iPosition[0] = $bX+$iPosition[0];
+                    if ($iRepeat[0]) {
+                    	$iPosition[0] = $bX;
+                    } else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[0], $match)) {
+                    	$iPosition[0] = $bX + $match[1]*($bW-$imageWidth)/100;
+                    } else {
+                    	$iPosition[0] = $bX+$iPosition[0];
+                    }
 
-                    if ($iRepeat[1]) $iPosition[1] = $bY;
-                    else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[1], $match)) $iPosition[1] = $bY + $match[1]*($bH-$imageHeight)/100;
-                    else $iPosition[1] = $bY+$iPosition[1];
+                    if ($iRepeat[1]) {
+                    	$iPosition[1] = $bY;
+                    } else if (preg_match('/^([-]?[0-9\.]+)%/isU', $iPosition[1], $match)) {
+                    	$iPosition[1] = $bY + $match[1]*($bH-$imageHeight)/100;
+                    } else {
+                    	$iPosition[1] = $bY+$iPosition[1];
+                    }
 
                     $imageXmin = $bX;
                     $imageXmax = $bX+$bW;
@@ -1646,10 +1730,18 @@ 
             $y-= $loose;
             $w+= 2.*$loose;
             $h+= 2.*$loose;
-            if ($border['l']['width']) $border['l']['width']+= 2.*$loose;
-            if ($border['t']['width']) $border['t']['width']+= 2.*$loose;
-            if ($border['r']['width']) $border['r']['width']+= 2.*$loose;
-            if ($border['b']['width']) $border['b']['width']+= 2.*$loose;
+            if ($border['l']['width']) {
+            	$border['l']['width']+= 2.*$loose;
+            }
+            if ($border['t']['width']) {
+            	$border['t']['width']+= 2.*$loose;
+            }
+            if ($border['r']['width']) {
+            	$border['r']['width']+= 2.*$loose;
+            }
+            if ($border['b']['width']) {
+            	$border['b']['width']+= 2.*$loose;
+            }
 
             // prepare the test on borders
             $testBl = ($border['l']['width'] && $border['l']['color'][0]!==null);
@@ -1747,13 +1839,17 @@ 
                 if (is_array($outBL)) {
                     $bord-=1;
                     $pt[3] -= $outBL[1] - $border['b']['width'];
-                    if ($inBL) $pt[11]-= $inBL[1];
+                    if ($inBL) {
+                    	$pt[11]-= $inBL[1];
+                    }
                     unset($pt[0]);unset($pt[1]);
                 }
                 if (is_array($outTL)) {
                     $bord-=2;
                     $pt[5] += $outTL[1]-$border['t']['width'];
-                    if ($inTL) $pt[9] += $inTL[1];
+                    if ($inTL) {
+                    	$pt[9] += $inTL[1];
+                    }
                     unset($pt[6]);unset($pt[7]);
                 }
 
@@ -1775,13 +1871,17 @@ 
                 if (is_array($outTL)) {
                     $bord-=1;
                     $pt[2] += $outTL[0] - $border['l']['width'];
-                    if ($inTL) $pt[10]+= $inTL[0];
+                    if ($inTL) {
+                    	$pt[10]+= $inTL[0];
+                    }
                     unset($pt[0]);unset($pt[1]);
                 }
                 if (is_array($outTR)) {
                     $bord-=2;
                     $pt[4] -= $outTR[0] - $border['r']['width'];
-                    if ($inTR) $pt[8] -= $inTR[0];
+                    if ($inTR) {
+                    	$pt[8] -= $inTR[0];
+                    }
                     unset($pt[6]);unset($pt[7]);
                 }
 
@@ -1803,13 +1903,17 @@ 
                 if (is_array($outTR)) {
                     $bord-=1;
                     $pt[3] += $outTR[1] - $border['t']['width'];
-                    if ($inTR) $pt[11]+= $inTR[1];
+                    if ($inTR) {
+                    	$pt[11]+= $inTR[1];
+                    }
                     unset($pt[0]);unset($pt[1]);
                 }
                 if (is_array($outBR)) {
                     $bord-=2;
                     $pt[5] -= $outBR[1] - $border['b']['width'];
-                    if ($inBR) $pt[9] -= $inBR[1];
+                    if ($inBR) {
+                    	$pt[9] -= $inBR[1];
+                    }
                     unset($pt[6]);unset($pt[7]);
                 }
 
@@ -1831,13 +1935,17 @@ 
                 if (is_array($outBL)) {
                     $bord-=2;
                     $pt[4] += $outBL[0] - $border['l']['width'];
-                    if ($inBL) $pt[8] += $inBL[0];
+                    if ($inBL) {
+                    	$pt[8] += $inBL[0];
+                    }
                     unset($pt[6]);unset($pt[7]);
                 }
                 if (is_array($outBR)) {
                     $bord-=1;
                     $pt[2] -= $outBR[0] - $border['r']['width'];
-                    if ($inBR) $pt[10]-= $inBR[0];
+                    if ($inBR) {
+                    	$pt[10]-= $inBR[0];
+                    }
                     unset($pt[0]);unset($pt[1]);
 
                 }
@@ -1864,10 +1972,11 @@ 
         {
             $this->pdf->setFillColorArray($color);
 
-            if (count($pt)==10)
-                $this->pdf->drawCurve($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7], $pt[8], $pt[9]);
-            else
-                $this->pdf->drawCorner($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7]);
+            if (count($pt)==10) {
+                            $this->pdf->drawCurve($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7], $pt[8], $pt[9]);
+            } else {
+                            $this->pdf->drawCorner($pt[0], $pt[1], $pt[2], $pt[3], $pt[4], $pt[5], $pt[6], $pt[7]);
+            }
         }
 
         /**
@@ -1938,10 +2047,18 @@ 
                 for ($i=0; $l-($px+$py)*($i-0.5)>0; $i++) {
                     if (($i%2)==$mode) {
                         $j = $i-0.5;
-                        $lx1 = $px*($j);   if ($lx1<-$l) $lx1 =-$l;
-                        $ly1 = $py*($j);   if ($ly1<-$l) $ly1 =-$l;
-                        $lx2 = $px*($j+1); if ($lx2>$l)  $lx2 = $l;
-                        $ly2 = $py*($j+1); if ($ly2>$l)  $ly2 = $l;
+                        $lx1 = $px*($j);   if ($lx1<-$l) {
+                        	$lx1 =-$l;
+                        }
+                        $ly1 = $py*($j);   if ($ly1<-$l) {
+                        	$ly1 =-$l;
+                        }
+                        $lx2 = $px*($j+1); if ($lx2>$l) {
+                        	$lx2 = $l;
+                        }
+                        $ly2 = $py*($j+1); if ($ly2>$l) {
+                        	$ly2 = $l;
+                        }
 
                         $tmp = array();
                         $tmp[] = $x1+$lx1; $tmp[] = $y1+$ly1;
@@ -2017,10 +2134,14 @@ 
         protected function _prepareTransform($transform)
         {
             // it can not be  empty
-            if (!$transform) return null;
+            if (!$transform) {
+            	return null;
+            }
 
             // sctions must be like scale(...)
-            if (!preg_match_all('/([a-z]+)\(([^\)]*)\)/isU', $transform, $match)) return null;
+            if (!preg_match_all('/([a-z]+)\(([^\)]*)\)/isU', $transform, $match)) {
+            	return null;
+            }
 
             // prepare the list of the actions
             $actions = array();
@@ -2041,49 +2162,115 @@ 
                 switch($name)
                 {
                     case 'scale':
-                        if (!isset($val[0])) $val[0] = 1.;      else $val[0] = 1.*$val[0];
-                        if (!isset($val[1])) $val[1] = $val[0]; else $val[1] = 1.*$val[1];
+                        if (!isset($val[0])) {
+                        	$val[0] = 1.;
+                        } else {
+                        	$val[0] = 1.*$val[0];
+                        }
+                        if (!isset($val[1])) {
+                        	$val[1] = $val[0];
+                        } else {
+                        	$val[1] = 1.*$val[1];
+                        }
                         $actions[] = array($val[0],0,0,$val[1],0,0);
                         break;
 
                     case 'translate':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $this->parsingCss->ConvertToMM($val[0], $this->_isInDraw['w']);
-                        if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['h']);
+                        if (!isset($val[0])) {
+                        	$val[0] = 0.;
+                        } else {
+                        	$val[0] = $this->parsingCss->ConvertToMM($val[0], $this->_isInDraw['w']);
+                        }
+                        if (!isset($val[1])) {
+                        	$val[1] = 0.;
+                        } else {
+                        	$val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['h']);
+                        }
                         $actions[] = array(1,0,0,1,$val[0],$val[1]);
                         break;
 
                     case 'rotate':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
-                        if (!isset($val[1])) $val[1] = 0.; else $val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['w']);
-                        if (!isset($val[2])) $val[2] = 0.; else $val[2] = $this->parsingCss->ConvertToMM($val[2], $this->_isInDraw['h']);
-                        if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,-$val[1],-$val[2]);
+                        if (!isset($val[0])) {
+                        	$val[0] = 0.;
+                        } else {
+                        	$val[0] = $val[0]*M_PI/180.;
+                        }
+                        if (!isset($val[1])) {
+                        	$val[1] = 0.;
+                        } else {
+                        	$val[1] = $this->parsingCss->ConvertToMM($val[1], $this->_isInDraw['w']);
+                        }
+                        if (!isset($val[2])) {
+                        	$val[2] = 0.;
+                        } else {
+                        	$val[2] = $this->parsingCss->ConvertToMM($val[2], $this->_isInDraw['h']);
+                        }
+                        if ($val[1] || $val[2]) {
+                        	$actions[] = array(1,0,0,1,-$val[1],-$val[2]);
+                        }
                         $actions[] = array(cos($val[0]),sin($val[0]),-sin($val[0]),cos($val[0]),0,0);
-                        if ($val[1] || $val[2]) $actions[] = array(1,0,0,1,$val[1],$val[2]);
+                        if ($val[1] || $val[2]) {
+                        	$actions[] = array(1,0,0,1,$val[1],$val[2]);
+                        }
                         break;
 
                     case 'skewx':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
+                        if (!isset($val[0])) {
+                        	$val[0] = 0.;
+                        } else {
+                        	$val[0] = $val[0]*M_PI/180.;
+                        }
                         $actions[] = array(1,0,tan($val[0]),1,0,0);
                         break;
 
                     case 'skewy':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*M_PI/180.;
+                        if (!isset($val[0])) {
+                        	$val[0] = 0.;
+                        } else {
+                        	$val[0] = $val[0]*M_PI/180.;
+                        }
                         $actions[] = array(1,tan($val[0]),0,1,0,0);
                         break;
                     case 'matrix':
-                        if (!isset($val[0])) $val[0] = 0.; else $val[0] = $val[0]*1.;
-                        if (!isset($val[1])) $val[1] = 0.; else $val[1] = $val[1]*1.;
-                        if (!isset($val[2])) $val[2] = 0.; else $val[2] = $val[2]*1.;
-                        if (!isset($val[3])) $val[3] = 0.; else $val[3] = $val[3]*1.;
-                        if (!isset($val[4])) $val[4] = 0.; else $val[4] = $this->parsingCss->ConvertToMM($val[4], $this->_isInDraw['w']);
-                        if (!isset($val[5])) $val[5] = 0.; else $val[5] = $this->parsingCss->ConvertToMM($val[5], $this->_isInDraw['h']);
+                        if (!isset($val[0])) {
+                        	$val[0] = 0.;
+                        } else {
+                        	$val[0] = $val[0]*1.;
+                        }
+                        if (!isset($val[1])) {
+                        	$val[1] = 0.;
+                        } else {
+                        	$val[1] = $val[1]*1.;
+                        }
+                        if (!isset($val[2])) {
+                        	$val[2] = 0.;
+                        } else {
+                        	$val[2] = $val[2]*1.;
+                        }
+                        if (!isset($val[3])) {
+                        	$val[3] = 0.;
+                        } else {
+                        	$val[3] = $val[3]*1.;
+                        }
+                        if (!isset($val[4])) {
+                        	$val[4] = 0.;
+                        } else {
+                        	$val[4] = $this->parsingCss->ConvertToMM($val[4], $this->_isInDraw['w']);
+                        }
+                        if (!isset($val[5])) {
+                        	$val[5] = 0.;
+                        } else {
+                        	$val[5] = $this->parsingCss->ConvertToMM($val[5], $this->_isInDraw['h']);
+                        }
                         $actions[] =$val;
                         break;
                 }
             }
 
             // if ther is no actions => return
-            if (!$actions) return null;
+            if (!$actions) {
+            	return null;
+            }
 
             // get the first matrix
             $m = $actions[0]; unset($actions[0]);
@@ -2111,7 +2298,9 @@ 
          */
         protected function _calculateTableCellSize(&$cases, &$corr)
         {
-            if (!isset($corr[0])) return true;
+            if (!isset($corr[0])) {
+            	return true;
+            }
 
             // for each cell without colspan, we get the max width for each column
             $sw = array();
@@ -2131,7 +2320,9 @@ 
                     if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][2]>1) {
 
                         // sum the max width of each column in colspan
-                        $s = 0; for ($i=0; $i<$corr[$y][$x][2]; $i++) $s+= $sw[$x+$i];
+                        $s = 0; for ($i=0; $i<$corr[$y][$x][2]; $i++) {
+                        	$s+= $sw[$x+$i];
+                        }
 
                         // if the max width is < the width of the cell with colspan => we adapt the width of each max width
                         if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['w']) {
@@ -2180,7 +2371,9 @@ 
                     if (isset($corr[$y][$x]) && is_array($corr[$y][$x]) && $corr[$y][$x][3]>1) {
 
                         // sum the max height of each line in rowspan
-                        $s = 0; for ($i=0; $i<$corr[$y][$x][3]; $i++) $s+= $sh[$y+$i];
+                        $s = 0; for ($i=0; $i<$corr[$y][$x][3]; $i++) {
+                        	$s+= $sh[$y+$i];
+                        }
 
                         // if the max height is < the height of the cell with rowspan => we adapt the height of each max height
                         if ($s>0 && $s<$cases[$corr[$y][$x][1]][$corr[$y][$x][0]]['h']) {
@@ -2230,8 +2423,12 @@ 
          */
         protected function _tag_open_PAGE($param)
         {
-            if ($this->_isForOneLine) return false;
-            if ($this->_debugActif) $this->_DEBUG_add('PAGE '.($this->_page+1), true);
+            if ($this->_isForOneLine) {
+            	return false;
+            }
+            if ($this->_debugActif) {
+            	$this->_DEBUG_add('PAGE '.($this->_page+1), true);
+            }
 
             $newPageSet= (!isset($param['pageset']) || $param['pageset']!='old');
 
@@ -2248,12 +2445,22 @@ 
                 $orientation = '';
                 if (isset($param['orientation'])) {
                     $param['orientation'] = strtolower($param['orientation']);
-                    if ($param['orientation']=='p')         $orientation = 'P';
-                    if ($param['orientation']=='portrait')  $orientation = 'P';
+                    if ($param['orientation']=='p') {
+                    	$orientation = 'P';
+                    }
+                    if ($param['orientation']=='portrait') {
+                    	$orientation = 'P';
+                    }
 
-                    if ($param['orientation']=='l')         $orientation = 'L';
-                    if ($param['orientation']=='paysage')   $orientation = 'L';
-                    if ($param['orientation']=='landscape') $orientation = 'L';
+                    if ($param['orientation']=='l') {
+                    	$orientation = 'L';
+                    }
+                    if ($param['orientation']=='paysage') {
+                    	$orientation = 'L';
+                    }
+                    if ($param['orientation']=='landscape') {
+                    	$orientation = 'L';
+                    }
                 }
 
                 // format
@@ -2277,12 +2484,24 @@ 
                     $background['img'] = str_replace('&amp;', '&', $background['img']);
 
                     // convert the positions
-                    if ($background['posX']=='left')    $background['posX'] = '0%';
-                    if ($background['posX']=='center')  $background['posX'] = '50%';
-                    if ($background['posX']=='right')   $background['posX'] = '100%';
-                    if ($background['posY']=='top')     $background['posY'] = '0%';
-                    if ($background['posY']=='middle')  $background['posY'] = '50%';
-                    if ($background['posY']=='bottom')  $background['posY'] = '100%';
+                    if ($background['posX']=='left') {
+                    	$background['posX'] = '0%';
+                    }
+                    if ($background['posX']=='center') {
+                    	$background['posX'] = '50%';
+                    }
+                    if ($background['posX']=='right') {
+                    	$background['posX'] = '100%';
+                    }
+                    if ($background['posY']=='top') {
+                    	$background['posY'] = '0%';
+                    }
+                    if ($background['posY']=='middle') {
+                    	$background['posY'] = '50%';
+                    }
+                    if ($background['posY']=='bottom') {
+                    	$background['posY'] = '100%';
+                    }
 
                     if ($background['img']) {
                         // get the size of the image
@@ -2310,10 +2529,18 @@ 
                 $background['right']  = isset($param['backright'])  ? $param['backright']  : '0';
 
                 // if no unit => mm
-                if (preg_match('/^([0-9]*)$/isU', $background['top']))    $background['top']    .= 'mm';
-                if (preg_match('/^([0-9]*)$/isU', $background['bottom'])) $background['bottom'] .= 'mm';
-                if (preg_match('/^([0-9]*)$/isU', $background['left']))   $background['left']   .= 'mm';
-                if (preg_match('/^([0-9]*)$/isU', $background['right']))  $background['right']  .= 'mm';
+                if (preg_match('/^([0-9]*)$/isU', $background['top'])) {
+                	$background['top']    .= 'mm';
+                }
+                if (preg_match('/^([0-9]*)$/isU', $background['bottom'])) {
+                	$background['bottom'] .= 'mm';
+                }
+                if (preg_match('/^([0-9]*)$/isU', $background['left'])) {
+                	$background['left']   .= 'mm';
+                }
+                if (preg_match('/^([0-9]*)$/isU', $background['right'])) {
+                	$background['right']  .= 'mm';
+                }
 
                 // convert to mm
                 $background['top']    = $this->parsingCss->ConvertToMM($background['top'], $this->pdf->getH());
@@ -2324,7 +2551,9 @@ 
                 // get the background color
                 $res = false;
                 $background['color']    = isset($param['backcolor'])    ? $this->parsingCss->convertToColor($param['backcolor'], $res) : null;
-                if (!$res) $background['color'] = null;
+                if (!$res) {
+                	$background['color'] = null;
+                }
 
                 $this->parsingCss->save();
                 $this->parsingCss->analyse('PAGE', $param);
@@ -2337,7 +2566,9 @@ 
                 // automatic footer
                 if (isset($param['footer'])) {
                     $lst = explode(';', $param['footer']);
-                    foreach ($lst as $key => $val) $lst[$key] = trim(strtolower($val));
+                    foreach ($lst as $key => $val) {
+                    	$lst[$key] = trim(strtolower($val));
+                    }
                     $page    = in_array('page', $lst);
                     $date    = in_array('date', $lst);
                     $hour    = in_array('heure', $lst);
@@ -2371,14 +2602,18 @@ 
          */
         protected function _tag_close_PAGE($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
 
-            if ($this->_debugActif) $this->_DEBUG_add('PAGE '.$this->_page, false);
+            if ($this->_debugActif) {
+            	$this->_DEBUG_add('PAGE '.$this->_page, false);
+            }
 
             return true;
         }
@@ -2392,14 +2627,20 @@ 
          */
         protected function _tag_open_PAGE_HEADER($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_subHEADER = array();
             for ($this->_parsePos; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
                 $action = $this->parsingHtml->code[$this->_parsePos];
-                if ($action['name']=='page_header') $action['name']='page_header_sub';
+                if ($action['name']=='page_header') {
+                	$action['name']='page_header_sub';
+                }
                 $this->_subHEADER[] = $action;
-                if (strtolower($action['name'])=='page_header_sub' && $action['close']) break;
+                if (strtolower($action['name'])=='page_header_sub' && $action['close']) {
+                	break;
+                }
             }
 
             $this->_setPageHeader();
@@ -2416,14 +2657,20 @@ 
          */
         protected function _tag_open_PAGE_FOOTER($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_subFOOTER = array();
             for ($this->_parsePos; $this->_parsePos<count($this->parsingHtml->code); $this->_parsePos++) {
                 $action = $this->parsingHtml->code[$this->_parsePos];
-                if ($action['name']=='page_footer') $action['name']='page_footer_sub';
+                if ($action['name']=='page_footer') {
+                	$action['name']='page_footer_sub';
+                }
                 $this->_subFOOTER[] = $action;
-                if (strtolower($action['name'])=='page_footer_sub' && $action['close']) break;
+                if (strtolower($action['name'])=='page_footer_sub' && $action['close']) {
+                	break;
+                }
             }
 
             $this->_setPageFooter();
@@ -2439,7 +2686,9 @@ 
          */
         protected function _tag_open_PAGE_HEADER_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             // save the current stat
             $this->_subSTATES = array();
@@ -2484,7 +2733,9 @@ 
          */
         protected function _tag_close_PAGE_HEADER_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->load();
 
@@ -2515,7 +2766,9 @@ 
          */
         protected function _tag_open_PAGE_FOOTER_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             // save the current stat
             $this->_subSTATES = array();
@@ -2569,7 +2822,9 @@ 
          */
         protected function _tag_close_PAGE_FOOTER_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->load();
 
@@ -2599,7 +2854,9 @@ 
          */
         protected function _tag_open_NOBREAK($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
@@ -2634,7 +2891,9 @@ 
          */
         protected function _tag_close_NOBREAK($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
@@ -2651,8 +2910,12 @@ 
          */
         protected function _tag_open_DIV($param, $other = 'div')
         {
-            if ($this->_isForOneLine) return false;
-            if ($this->_debugActif) $this->_DEBUG_add(strtoupper($other), true);
+            if ($this->_isForOneLine) {
+            	return false;
+            }
+            if ($this->_debugActif) {
+            	$this->_DEBUG_add(strtoupper($other), true);
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse($other, $param);
@@ -2660,13 +2923,21 @@ 
 
             // for fieldset and legend
             if (in_array($other, array('fieldset', 'legend'))) {
-                if (isset($param['moveTop']))  $this->parsingCss->value['margin']['t']    += $param['moveTop'];
-                if (isset($param['moveLeft'])) $this->parsingCss->value['margin']['l']    += $param['moveLeft'];
-                if (isset($param['moveDown'])) $this->parsingCss->value['margin']['b']    += $param['moveDown'];
+                if (isset($param['moveTop'])) {
+                	$this->parsingCss->value['margin']['t']    += $param['moveTop'];
+                }
+                if (isset($param['moveLeft'])) {
+                	$this->parsingCss->value['margin']['l']    += $param['moveLeft'];
+                }
+                if (isset($param['moveDown'])) {
+                	$this->parsingCss->value['margin']['b']    += $param['moveDown'];
+                }
             }
 
             $alignObject = null;
-            if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
+            if ($this->parsingCss->value['margin-auto']) {
+            	$alignObject = 'center';
+            }
 
             $marge = array();
             $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
@@ -2752,22 +3023,27 @@ 
                 if (
                     $w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
                     $this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
-                    )
-                    $this->_tag_open_BR(array());
+                    ) {
+                                    $this->_tag_open_BR(array());
+                }
 
                 if (
                         ($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
                         ($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) &&
                         !$this->_isInOverflow
-                    )
-                    $this->_setNewPage();
+                    ) {
+                                    $this->_setNewPage();
+                }
 
                 $old = $this->parsingCss->getOldValues();
                 $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
 
                 if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    if ($alignObject=='center') {
+                    	$this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
+                    } else if ($alignObject=='right') {
+                    	$this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    }
                 }
 
                 $this->parsingCss->setPosition();
@@ -2776,8 +3052,11 @@ 
                 $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
 
                 if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    if ($alignObject=='center') {
+                    	$this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
+                    } else if ($alignObject=='right') {
+                    	$this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    }
                 }
 
                 $this->parsingCss->setPosition();
@@ -2826,7 +3105,9 @@ 
                         $xCorr = ($this->parsingCss->value['width']-$wReel)*0.5;
                         break;
                 }
-                if ($xCorr>0) $xCorr=0;
+                if ($xCorr>0) {
+                	$xCorr=0;
+                }
                 switch($this->parsingCss->value['vertical-align'])
                 {
                     case 'bottom':
@@ -2910,7 +3191,9 @@ 
             // get height of LEGEND element and make fieldset corrections
             for ($tempPos = $this->_parsePos + 1; $tempPos<count($this->parsingHtml->code); $tempPos++) {
                 $action = $this->parsingHtml->code[$tempPos];
-                if ($action['name'] == 'fieldset') break;
+                if ($action['name'] == 'fieldset') {
+                	break;
+                }
                 if ($action['name'] == 'legend' && !$action['close']) {
                     $legendOpenPos = $tempPos;
 
@@ -2923,8 +3206,9 @@ 
                         $action = $sub->parsingHtml->code[$sub->_parsePos];
                         $sub->_executeAction($action);
 
-                        if ($action['name'] == 'legend' && $action['close'])
-                            break;
+                        if ($action['name'] == 'legend' && $action['close']) {
+                                                    break;
+                        }
                     }
 
                     $legendH = $sub->_maxY;
@@ -2955,7 +3239,9 @@ 
          */
         protected function _tag_close_DIV($param, $other='div')
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             if ($this->parsingCss->value['overflow']=='hidden') {
                 $this->_maxX = $this->parsingCss->value['old_maxX'];
@@ -2965,8 +3251,9 @@ 
                 $this->pdf->clippingPathStop();
             }
 
-            if ($this->parsingCss->value['rotate'])
-                $this->pdf->stopTransform();
+            if ($this->parsingCss->value['rotate']) {
+                            $this->pdf->stopTransform();
+            }
 
             $marge = array();
             $marge['l'] = $this->parsingCss->value['border']['l']['width'] + $this->parsingCss->value['padding']['l']+0.03;
@@ -3012,8 +3299,12 @@ 
             $this->parsingCss->fontSet();
             $this->_loadMargin();
 
-            if ($block) $this->_tag_open_BR(array());
-            if ($this->_debugActif) $this->_DEBUG_add(strtoupper($other), false);
+            if ($block) {
+            	$this->_tag_open_BR(array());
+            }
+            if ($this->_debugActif) {
+            	$this->_DEBUG_add(strtoupper($other), false);
+            }
 
             return true;
         }
@@ -3068,16 +3359,27 @@ 
             $lstBarcode['UPC_A']  =    'UPCA';
             $lstBarcode['CODE39'] =    'C39';
 
-            if (!isset($param['type']))     $param['type'] = 'C39';
-            if (!isset($param['value']))    $param['value']    = 0;
-            if (!isset($param['label']))    $param['label']    = 'label';
-            if (!isset($param['style']['color'])) $param['style']['color'] = '#000000';
+            if (!isset($param['type'])) {
+            	$param['type'] = 'C39';
+            }
+            if (!isset($param['value'])) {
+            	$param['value']    = 0;
+            }
+            if (!isset($param['label'])) {
+            	$param['label']    = 'label';
+            }
+            if (!isset($param['style']['color'])) {
+            	$param['style']['color'] = '#000000';
+            }
 
-            if ($this->_testIsDeprecated && (isset($param['bar_h']) || isset($param['bar_w'])))
-                throw new HTML2PDF_exception(9, array('BARCODE', 'bar_h, bar_w'));
+            if ($this->_testIsDeprecated && (isset($param['bar_h']) || isset($param['bar_w']))) {
+                            throw new HTML2PDF_exception(9, array('BARCODE', 'bar_h, bar_w'));
+            }
 
             $param['type'] = strtoupper($param['type']);
-            if (isset($lstBarcode[$param['type']])) $param['type'] = $lstBarcode[$param['type']];
+            if (isset($lstBarcode[$param['type']])) {
+            	$param['type'] = $lstBarcode[$param['type']];
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('barcode', $param);
@@ -3086,8 +3388,12 @@ 
 
             $x = $this->pdf->getX();
             $y = $this->pdf->getY();
-            $w = $this->parsingCss->value['width'];    if (!$w) $w = $this->parsingCss->ConvertToMM('50mm');
-            $h = $this->parsingCss->value['height'];    if (!$h) $h = $this->parsingCss->ConvertToMM('10mm');
+            $w = $this->parsingCss->value['width'];    if (!$w) {
+            	$w = $this->parsingCss->ConvertToMM('50mm');
+            }
+            $h = $this->parsingCss->value['height'];    if (!$h) {
+            	$h = $this->parsingCss->ConvertToMM('10mm');
+            }
             $txt = ($param['label']!=='none' ? $this->parsingCss->value['font-size'] : false);
             $c = $this->parsingCss->value['color'];
             $infos = $this->pdf->myBarcode($param['value'], $param['type'], $x, $y, $w, $h, $txt, $c);
@@ -3128,15 +3434,26 @@ 
          */
         protected function _tag_open_QRCODE($param)
         {
-            if ($this->_testIsDeprecated && (isset($param['size']) || isset($param['noborder'])))
-                throw new HTML2PDF_exception(9, array('QRCODE', 'size, noborder'));
+            if ($this->_testIsDeprecated && (isset($param['size']) || isset($param['noborder']))) {
+                            throw new HTML2PDF_exception(9, array('QRCODE', 'size, noborder'));
+            }
 
-            if ($this->_debugActif) $this->_DEBUG_add('QRCODE');
+            if ($this->_debugActif) {
+            	$this->_DEBUG_add('QRCODE');
+            }
 
-            if (!isset($param['value']))                     $param['value'] = '';
-            if (!isset($param['ec']))                        $param['ec'] = 'H';
-            if (!isset($param['style']['color']))            $param['style']['color'] = '#000000';
-            if (!isset($param['style']['background-color'])) $param['style']['background-color'] = '#FFFFFF';
+            if (!isset($param['value'])) {
+            	$param['value'] = '';
+            }
+            if (!isset($param['ec'])) {
+            	$param['ec'] = 'H';
+            }
+            if (!isset($param['style']['color'])) {
+            	$param['style']['color'] = '#000000';
+            }
+            if (!isset($param['style']['background-color'])) {
+            	$param['style']['background-color'] = '#FFFFFF';
+            }
             if (isset($param['style']['border'])) {
                 $borders = $param['style']['border']!='none';
                 unset($param['style']['border']);
@@ -3144,8 +3461,12 @@ 
                 $borders = true;
             }
 
-            if ($param['value']==='') return true;
-            if (!in_array($param['ec'], array('L', 'M', 'Q', 'H'))) $param['ec'] = 'H';
+            if ($param['value']==='') {
+            	return true;
+            }
+            if (!in_array($param['ec'], array('L', 'M', 'Q', 'H'))) {
+            	$param['ec'] = 'H';
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('qrcode', $param);
@@ -3156,7 +3477,9 @@ 
             $y = $this->pdf->getY();
             $w = $this->parsingCss->value['width'];
             $h = $this->parsingCss->value['height'];
-            $size = max($w, $h); if (!$size) $size = $this->parsingCss->ConvertToMM('50mm');
+            $size = max($w, $h); if (!$size) {
+            	$size = $this->parsingCss->ConvertToMM('50mm');
+            }
 
             $style = array(
                     'fgcolor' => $this->parsingCss->value['color'],
@@ -3214,8 +3537,12 @@ 
             $titre = isset($param['title']) ? trim($param['title']) : '';
             $level = isset($param['level']) ? floor($param['level']) : 0;
 
-            if ($level<0) $level = 0;
-            if ($titre) $this->pdf->Bookmark($titre, $level, -1);
+            if ($level<0) {
+            	$level = 0;
+            }
+            if ($titre) {
+            	$this->pdf->Bookmark($titre, $level, -1);
+            }
 
             return true;
         }
@@ -3259,12 +3586,13 @@ 
             $txt = str_replace('[[page_cu]]', $this->pdf->getMyNumPage($this->_page), $txt);
 
             if ($this->parsingCss->value['text-transform']!='none') {
-                if ($this->parsingCss->value['text-transform']=='capitalize')
-                    $txt = ucwords($txt);
-                else if ($this->parsingCss->value['text-transform']=='uppercase')
-                    $txt = strtoupper($txt);
-                else if ($this->parsingCss->value['text-transform']=='lowercase')
-                    $txt = strtolower($txt);
+                if ($this->parsingCss->value['text-transform']=='capitalize') {
+                                    $txt = ucwords($txt);
+                } else if ($this->parsingCss->value['text-transform']=='uppercase') {
+                                    $txt = strtoupper($txt);
+                } else if ($this->parsingCss->value['text-transform']=='lowercase') {
+                                    $txt = strtolower($txt);
+                }
             }
 
             // size of the text
@@ -3320,7 +3648,9 @@ 
                     array_shift($words);
                     $old = $str;
 
-                    if (!count($words)) break;
+                    if (!count($words)) {
+                    	break;
+                    }
                     $str[0].= ' '.$words[0][0];
                     $str[1]+= $space+$words[0][1];
                 }
@@ -3337,7 +3667,9 @@ 
 
                 // write the extract sentence that fit on the page
                 $wc = ($align=='L' ? $str[1] : $this->parsingCss->value['width']);
-                if ($right - $left<$wc) $wc = $right - $left;
+                if ($right - $left<$wc) {
+                	$wc = $right - $left;
+                }
 
                 if (strlen($str[0])) {
                     $this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
@@ -3358,7 +3690,9 @@ 
                 // if we have again words to write
                 if (count($words)) {
                     // remove the space at the end
-                    if ($add) $w-= $space;
+                    if ($add) {
+                    	$w-= $space;
+                    }
 
                     // if we don't add any word, and if the first word is empty => useless space to skip
                     if (!$add && $words[0][0]==='') {
@@ -3393,7 +3727,9 @@ 
                     // if more than 10000 line => error
                     $nb++;
                     if ($nb>10000) {
-                        $txt = ''; foreach ($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
+                        $txt = ''; foreach ($words as $k => $word) {
+                        	$txt.= ($k ? ' ' : '').$word[0];
+                        }
                         throw new HTML2PDF_exception(2, array($txt, $right-$left, $w));
                     }
 
@@ -3404,7 +3740,9 @@ 
 
             // if we have words after automatic cut, it is because they fit on the line => we write the text
             if (count($words)) {
-                $txt = ''; foreach ($words as $k => $word) $txt.= ($k ? ' ' : '').$word[0];
+                $txt = ''; foreach ($words as $k => $word) {
+                	$txt.= ($k ? ' ' : '').$word[0];
+                }
                 $w+= $this->pdf->getWordSpacing()*(count($words));
                 $this->pdf->setXY($this->pdf->getX(), $y+$dh+$dy);
                 $this->pdf->Cell(($align=='L' ? $w : $this->parsingCss->value['width']), $h, $txt, 0, 0, $align, $fill, $this->_isInLink);
@@ -3432,11 +3770,15 @@ 
          */
         protected function _tag_open_BR($param, $curr = null)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $h = max($this->_maxH, $this->parsingCss->getLineHeight());
 
-            if ($this->_maxH==0) $this->_maxY = max($this->_maxY, $this->pdf->getY()+$h);
+            if ($this->_maxH==0) {
+            	$this->_maxY = max($this->_maxY, $this->pdf->getY()+$h);
+            }
 
             $this->_makeBreakLine($h, $curr);
 
@@ -3455,11 +3797,15 @@ 
          */
         protected function _tag_open_HR($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
             $oldAlign = $this->parsingCss->value['text-align'];
             $this->parsingCss->value['text-align'] = 'left';
 
-            if ($this->_maxH) $this->_tag_open_BR($param);
+            if ($this->_maxH) {
+            	$this->_tag_open_BR($param);
+            }
 
             $fontSize = $this->parsingCss->value['font-size'];
             $this->parsingCss->value['font-size']=$fontSize*0.5; $this->_tag_open_BR($param);
@@ -3475,8 +3821,12 @@ 
             $this->parsingCss->fontSet();
 
             $h = $this->parsingCss->value['height'];
-            if ($h)    $h-= $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
-            if ($h<=0) $h = $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
+            if ($h) {
+            	$h-= $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
+            }
+            if ($h<=0) {
+            	$h = $this->parsingCss->value['border']['t']['width']+$this->parsingCss->value['border']['b']['width'];
+            }
 
             $this->_drawRectangle($this->pdf->getX(), $this->pdf->getY(), $this->parsingCss->value['width'], $h, $this->parsingCss->value['border'], 0, 0, $this->parsingCss->value['background']);
             $this->_maxH = $h;
@@ -3812,7 +4162,9 @@ 
 
             if (isset($param['name'])) {
                 $name =     $param['name'];
-                if (!isset($this->_lstAnchor[$name])) $this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
+                if (!isset($this->_lstAnchor[$name])) {
+                	$this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
+                }
 
                 if (!$this->_lstAnchor[$name][1]) {
                     $this->_lstAnchor[$name][1] = true;
@@ -3822,7 +4174,9 @@ 
 
             if (preg_match('/^#([^#]+)$/isU', $this->_isInLink, $match)) {
                 $name = $match[1];
-                if (!isset($this->_lstAnchor[$name])) $this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
+                if (!isset($this->_lstAnchor[$name])) {
+                	$this->_lstAnchor[$name] = array($this->pdf->AddLink(), false);
+                }
 
                 $this->_isInLink = $this->_lstAnchor[$name][0];
             }
@@ -3863,9 +4217,13 @@ 
          */
         protected function _tag_open_H1($param, $other = 'h1')
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
-            if ($this->_maxH) $this->_tag_open_BR(array());
+            if ($this->_maxH) {
+            	$this->_tag_open_BR(array());
+            }
             $this->parsingCss->save();
             $this->parsingCss->value['font-bold'] = true;
 
@@ -3953,7 +4311,9 @@ 
          */
         protected function _tag_close_H1($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH+= $this->parsingCss->value['margin']['b'];
             $h = max($this->_maxH, $this->parsingCss->getLineHeight());
@@ -4120,10 +4480,14 @@ 
          */
         protected function _tag_open_P($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             if (!in_array($this->_previousCall, array('_tag_close_P', '_tag_close_UL'))) {
-                if ($this->_maxH) $this->_tag_open_BR(array());
+                if ($this->_maxH) {
+                	$this->_tag_open_BR(array());
+                }
             }
 
             $this->parsingCss->save();
@@ -4160,9 +4524,13 @@ 
          */
         protected function _tag_close_P($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
-            if ($this->_maxH) $this->_tag_open_BR(array());
+            if ($this->_maxH) {
+            	$this->_tag_open_BR(array());
+            }
             $this->_isInParagraph = false;
             $this->_loadMargin();
             $h = $this->parsingCss->value['margin']['b']+$this->parsingCss->value['padding']['b'];
@@ -4184,7 +4552,9 @@ 
          */
         protected function _tag_open_PRE($param, $other = 'pre')
         {
-            if ($other=='pre' && $this->_maxH) $this->_tag_open_BR(array());
+            if ($other=='pre' && $this->_maxH) {
+            	$this->_tag_open_BR(array());
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->value['font-family'] = 'courier';
@@ -4192,7 +4562,9 @@ 
             $this->parsingCss->setPosition();
             $this->parsingCss->fontSet();
 
-            if ($other=='pre') return $this->_tag_open_DIV($param, $other);
+            if ($other=='pre') {
+            	return $this->_tag_open_DIV($param, $other);
+            }
 
             return true;
         }
@@ -4221,7 +4593,9 @@ 
         protected function _tag_close_PRE($param, $other = 'pre')
         {
             if ($other=='pre') {
-                if ($this->_isForOneLine) return false;
+                if ($this->_isForOneLine) {
+                	return false;
+                }
 
                 $this->_tag_close_DIV($param, $other);
                 $this->_tag_open_BR(array());
@@ -4387,14 +4761,22 @@ 
          */
         protected function _tag_open_UL($param, $other = 'ul')
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             if (!in_array($this->_previousCall, array('_tag_close_P', '_tag_close_UL'))) {
-                if ($this->_maxH) $this->_tag_open_BR(array());
-                if (!count($this->_defList)) $this->_tag_open_BR(array());
+                if ($this->_maxH) {
+                	$this->_tag_open_BR(array());
+                }
+                if (!count($this->_defList)) {
+                	$this->_tag_open_BR(array());
+                }
             }
 
-            if (!isset($param['style']['width'])) $param['allwidth'] = true;
+            if (!isset($param['style']['width'])) {
+            	$param['allwidth'] = true;
+            }
             $param['cellspacing'] = 0;
 
             // a list is like a table
@@ -4427,14 +4809,18 @@ 
          */
         protected function _tag_close_UL($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_tag_close_TABLE($param);
 
             $this->_listeDelLevel();
 
             if (!$this->_subPart) {
-                if (!count($this->_defList)) $this->_tag_open_BR(array());
+                if (!count($this->_defList)) {
+                	$this->_tag_open_BR(array());
+                }
             }
 
             return true;
@@ -4461,11 +4847,15 @@ 
          */
         protected function _tag_open_LI($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_listeAddLi();
 
-            if (!isset($param['style']['width'])) $param['style']['width'] = '100%';
+            if (!isset($param['style']['width'])) {
+            	$param['style']['width'] = '100%';
+            }
 
             $paramPUCE = $param;
 
@@ -4519,8 +4909,11 @@ 
                 // TD for the puce
                 $this->_tag_open_TD($paramPUCE, 'li_sub');
                 unset($paramPUCE['style']['width']);
-                if (isset($paramPUCE['src']))    $this->_tag_open_IMG($paramPUCE);
-                else                            $this->_tag_open_WRITE($paramPUCE);
+                if (isset($paramPUCE['src'])) {
+                	$this->_tag_open_IMG($paramPUCE);
+                } else {
+                	$this->_tag_open_WRITE($paramPUCE);
+                }
                 $this->_tag_close_TD($paramPUCE);
             }
             $this->parsingCss->load();
@@ -4541,7 +4934,9 @@ 
          */
         protected function _tag_close_LI($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_tag_close_TD($param);
 
@@ -4559,7 +4954,9 @@ 
          */
         protected function _tag_open_TBODY($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('tbody', $param);
@@ -4578,7 +4975,9 @@ 
          */
         protected function _tag_close_TBODY($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -4595,7 +4994,9 @@ 
          */
         protected function _tag_open_THEAD($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('thead', $param);
@@ -4608,9 +5009,13 @@ 
                 HTML2PDF::$_tables[$param['num']]['thead']['code'] = array();
                 for ($pos=$this->_tempPos; $pos<count($this->parsingHtml->code); $pos++) {
                     $action = $this->parsingHtml->code[$pos];
-                    if (strtolower($action['name'])=='thead') $action['name'] = 'thead_sub';
+                    if (strtolower($action['name'])=='thead') {
+                    	$action['name'] = 'thead_sub';
+                    }
                     HTML2PDF::$_tables[$param['num']]['thead']['code'][] = $action;
-                    if (strtolower($action['name'])=='thead_sub' && $action['close']) break;
+                    if (strtolower($action['name'])=='thead_sub' && $action['close']) {
+                    	break;
+                    }
                 }
             } else {
                 $level = $this->parsingHtml->getLevel($this->_parsePos);
@@ -4630,7 +5035,9 @@ 
          */
         protected function _tag_close_THEAD($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -4654,7 +5061,9 @@ 
          */
         protected function _tag_open_TFOOT($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('tfoot', $param);
@@ -4667,9 +5076,13 @@ 
                 HTML2PDF::$_tables[$param['num']]['tfoot']['code'] = array();
                 for ($pos=$this->_tempPos; $pos<count($this->parsingHtml->code); $pos++) {
                     $action = $this->parsingHtml->code[$pos];
-                    if (strtolower($action['name'])=='tfoot') $action['name'] = 'tfoot_sub';
+                    if (strtolower($action['name'])=='tfoot') {
+                    	$action['name'] = 'tfoot_sub';
+                    }
                     HTML2PDF::$_tables[$param['num']]['tfoot']['code'][] = $action;
-                    if (strtolower($action['name'])=='tfoot_sub' && $action['close']) break;
+                    if (strtolower($action['name'])=='tfoot_sub' && $action['close']) {
+                    	break;
+                    }
                 }
             } else {
                 $level = $this->parsingHtml->getLevel($this->_parsePos);
@@ -4689,7 +5102,9 @@ 
          */
         protected function _tag_close_TFOOT($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -4712,7 +5127,9 @@ 
          */
         protected function _tag_open_THEAD_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('thead', $param);
@@ -4730,7 +5147,9 @@ 
          */
         protected function _tag_close_THEAD_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -4746,7 +5165,9 @@ 
          */
         protected function _tag_open_TFOOT_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('tfoot', $param);
@@ -4764,7 +5185,9 @@ 
          */
         protected function _tag_close_TFOOT_SUB($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -4826,7 +5249,9 @@ 
         protected function _tag_open_TABLE($param, $other = 'table')
         {
             if ($this->_maxH) {
-                if ($this->_isForOneLine) return false;
+                if ($this->_isForOneLine) {
+                	return false;
+                }
                 $this->_tag_open_BR(array());
             }
 
@@ -4838,15 +5263,21 @@ 
             $this->_maxH = 0;
 
             $alignObject = isset($param['align']) ? strtolower($param['align']) : 'left';
-            if (isset($param['align'])) unset($param['align']);
-            if (!in_array($alignObject, array('left', 'center', 'right'))) $alignObject = 'left';
+            if (isset($param['align'])) {
+            	unset($param['align']);
+            }
+            if (!in_array($alignObject, array('left', 'center', 'right'))) {
+            	$alignObject = 'left';
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse($other, $param);
             $this->parsingCss->setPosition();
             $this->parsingCss->fontSet();
 
-            if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
+            if ($this->parsingCss->value['margin-auto']) {
+            	$alignObject = 'center';
+            }
 
             // collapse table ?
             $collapse = false;
@@ -4867,7 +5298,9 @@ 
 
             // if we are in a SUB html => prepare the properties of the table
             if ($this->_subPart) {
-                if ($this->_debugActif) $this->_DEBUG_add('Table n'.$param['num'], true);
+                if ($this->_debugActif) {
+                	$this->_DEBUG_add('Table n'.$param['num'], true);
+                }
                 HTML2PDF::$_tables[$param['num']] = array();
                 HTML2PDF::$_tables[$param['num']]['border']          = isset($param['border']) ? $this->parsingCss->readBorder($param['border']) : null;
                 HTML2PDF::$_tables[$param['num']]['cellpadding']     = $this->parsingCss->ConvertToMM(isset($param['cellpadding']) ? $param['cellpadding'] : '1px');
@@ -4939,7 +5372,9 @@ 
          */
         protected function _tag_close_TABLE($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
@@ -4955,9 +5390,10 @@ 
                     foreach (HTML2PDF::$_tables[$param['num']][$mode]['tr'] as $tr) {
                         // hauteur de la ligne tr
                         $h = 0;
-                        for ($i=0; $i<count(HTML2PDF::$_tables[$param['num']]['cases'][$tr]); $i++)
-                            if (HTML2PDF::$_tables[$param['num']]['cases'][$tr][$i]['rowspan']==1)
+                        for ($i=0; $i<count(HTML2PDF::$_tables[$param['num']]['cases'][$tr]); $i++) {
+                                                    if (HTML2PDF::$_tables[$param['num']]['cases'][$tr][$i]['rowspan']==1)
                                 $h = max($h, HTML2PDF::$_tables[$param['num']]['cases'][$tr][$i]['h']);
+                        }
                         HTML2PDF::$_tables[$param['num']][$mode]['height']+= $h;
                     }
                 }
@@ -4976,10 +5412,11 @@ 
                 $x = HTML2PDF::$_tables[$param['num']]['curr_x'];
                 $w = HTML2PDF::$_tables[$param['num']]['width'];
                 if ($parentWidth>$w) {
-                    if (HTML2PDF::$_tables[$param['num']]['align']=='center')
-                        $x = $x + ($parentWidth-$w)*0.5;
-                    else if (HTML2PDF::$_tables[$param['num']]['align']=='right')
-                        $x = $x + $parentWidth-$w;
+                    if (HTML2PDF::$_tables[$param['num']]['align']=='center') {
+                                            $x = $x + ($parentWidth-$w)*0.5;
+                    } else if (HTML2PDF::$_tables[$param['num']]['align']=='right') {
+                                            $x = $x + $parentWidth-$w;
+                    }
 
                     HTML2PDF::$_tables[$param['num']]['curr_x'] = $x;
                 }
@@ -5002,8 +5439,12 @@ 
                 for ($k=0; $k<count(HTML2PDF::$_tables[$param['num']]['cases']); $k++) {
 
                     // if it is a TR of the thead or of the tfoot => skip
-                    if (in_array($k, HTML2PDF::$_tables[$param['num']]['thead']['tr'])) continue;
-                    if (in_array($k, HTML2PDF::$_tables[$param['num']]['tfoot']['tr'])) continue;
+                    if (in_array($k, HTML2PDF::$_tables[$param['num']]['thead']['tr'])) {
+                    	continue;
+                    }
+                    if (in_array($k, HTML2PDF::$_tables[$param['num']]['tfoot']['tr'])) {
+                    	continue;
+                    }
 
                     // height of the line
                     $th = 0;
@@ -5011,13 +5452,16 @@ 
                     for ($i=0; $i<count(HTML2PDF::$_tables[$param['num']]['cases'][$k]); $i++) {
                         $h = max($h, HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['h']);
 
-                        if (HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['rowspan']==1)
-                            $th = max($th, HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['h']);
+                        if (HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['rowspan']==1) {
+                                                    $th = max($th, HTML2PDF::$_tables[$param['num']]['cases'][$k][$i]['h']);
+                        }
                     }
 
                     // if the row does not fit on the page => new page
                     if ($y+$h+$height>$max) {
-                        if ($height==$h0) $height = null;
+                        if ($height==$h0) {
+                        	$height = null;
+                        }
                         HTML2PDF::$_tables[$param['num']]['height'][] = $height;
                         $height = $h0;
                         $y = $this->_margeTop;
@@ -5026,7 +5470,9 @@ 
                 }
 
                 // if ther is a height at the end, add it
-                if ($height!=$h0 || $k==0) HTML2PDF::$_tables[$param['num']]['height'][] = $height;
+                if ($height!=$h0 || $k==0) {
+                	HTML2PDF::$_tables[$param['num']]['height'][] = $height;
+                }
             } else {
                 // if we have tfoor, draw it
                 if (count(HTML2PDF::$_tables[$param['num']]['tfoot']['code'])) {
@@ -5051,12 +5497,13 @@ 
 
                 // get the positions of the end of the table
                 $x = HTML2PDF::$_tables[$param['num']]['curr_x'] + HTML2PDF::$_tables[$param['num']]['width'];
-                if (count(HTML2PDF::$_tables[$param['num']]['height'])>1)
-                    $y = $this->_margeTop+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
-                else if (count(HTML2PDF::$_tables[$param['num']]['height'])==1)
-                    $y = HTML2PDF::$_tables[$param['num']]['curr_y']+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
-                else
-                    $y = HTML2PDF::$_tables[$param['num']]['curr_y'];
+                if (count(HTML2PDF::$_tables[$param['num']]['height'])>1) {
+                                    $y = $this->_margeTop+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
+                } else if (count(HTML2PDF::$_tables[$param['num']]['height'])==1) {
+                                    $y = HTML2PDF::$_tables[$param['num']]['curr_y']+HTML2PDF::$_tables[$param['num']]['height'][count(HTML2PDF::$_tables[$param['num']]['height'])-1];
+                } else {
+                                    $y = HTML2PDF::$_tables[$param['num']]['curr_y'];
+                }
 
                 $this->_maxX = max($this->_maxX, $x);
                 $this->_maxY = max($this->_maxY, $y);
@@ -5065,7 +5512,9 @@ 
 
                 $this->_loadMargin();
 
-                if ($this->_debugActif) $this->_DEBUG_add('Table '.$param['num'], false);
+                if ($this->_debugActif) {
+                	$this->_DEBUG_add('Table '.$param['num'], false);
+                }
             }
 
             $this->parsingCss->load();
@@ -5085,8 +5534,9 @@ 
         protected function _tag_open_COL($param)
         {
             $span = isset($param['span']) ? $param['span'] : 1;
-            for ($k=0; $k<$span; $k++)
-                HTML2PDF::$_tables[$param['num']]['cols'][] = $param;
+            for ($k=0; $k<$span; $k++) {
+                            HTML2PDF::$_tables[$param['num']]['cols'][] = $param;
+            }
         }
 
         /**
@@ -5112,7 +5562,9 @@ 
          */
         protected function _tag_open_TR($param, $other = 'tr')
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
@@ -5216,12 +5668,14 @@ 
             } else {
                 // prepare it
                 HTML2PDF::$_tables[$param['num']]['cases'][HTML2PDF::$_tables[$param['num']]['tr_curr']-1] = array();
-                if (!isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']]))
-                    HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']] = array();
+                if (!isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']])) {
+                                    HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']] = array();
+                }
 
                 HTML2PDF::$_tables[$param['num']]['corr_x']=0;
-                while(isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']][HTML2PDF::$_tables[$param['num']]['corr_x']]))
-                    HTML2PDF::$_tables[$param['num']]['corr_x']++;
+                while(isset(HTML2PDF::$_tables[$param['num']]['corr'][HTML2PDF::$_tables[$param['num']]['corr_y']][HTML2PDF::$_tables[$param['num']]['corr_x']])) {
+                                    HTML2PDF::$_tables[$param['num']]['corr_x']++;
+                }
             }
 
             return true;
@@ -5236,7 +5690,9 @@ 
          */
         protected function _tag_close_TR($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
@@ -5274,7 +5730,9 @@ 
          */
         protected function _tag_open_TD($param, $other = 'td')
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
@@ -5329,10 +5787,11 @@ 
                     if (count($colParam['style']['width'])) {
                         $total = $colParam['style']['width'][0]; unset($colParam['style']['width'][0]);
                         foreach ($colParam['style']['width'] as $width) {
-                            if (substr($total, -1)=='%' && substr($width, -1)=='%')
-                                $total = (str_replace('%', '', $total)+str_replace('%', '', $width)).'%';
-                            else
-                                $total = ($this->parsingCss->ConvertToMM($total, $last) + $this->parsingCss->ConvertToMM($width, $last)).'mm';
+                            if (substr($total, -1)=='%' && substr($width, -1)=='%') {
+                                                            $total = (str_replace('%', '', $total)+str_replace('%', '', $width)).'%';
+                            } else {
+                                                            $total = ($this->parsingCss->ConvertToMM($total, $last) + $this->parsingCss->ConvertToMM($width, $last)).'mm';
+                            }
                         }
                     }
 
@@ -5364,8 +5823,9 @@ 
                 $legacy = array();
 
                 $old = $this->parsingCss->getLastValue('background');
-                if ($old && ($old['color'] || $old['image']))
-                    $legacy['background'] = $old;
+                if ($old && ($old['color'] || $old['image'])) {
+                                    $legacy['background'] = $old;
+                }
 
                 if (HTML2PDF::$_tables[$param['num']]['border']) {
                     $legacy['border'] = array();
@@ -5396,7 +5856,9 @@ 
                 }
 
                 if (HTML2PDF::$_tables[$param['num']]['td_curr']>0) {
-                    if (!$return) $this->parsingCss->value['width']+= $this->parsingCss->value['border']['l']['width'];
+                    if (!$return) {
+                    	$this->parsingCss->value['width']+= $this->parsingCss->value['border']['l']['width'];
+                    }
                     $this->parsingCss->value['border']['l'] = $this->parsingCss->readBorder('none');
                 }
             }
@@ -5502,7 +5964,9 @@ 
          */
         protected function _tag_close_TD($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_maxH = 0;
 
@@ -5565,7 +6029,9 @@ 
          */
         protected function _tag_open_TH($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->value['font-bold'] = true;
@@ -5584,7 +6050,9 @@ 
          */
         protected function _tag_close_TH($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->_tag_close_TD($param);
 
@@ -5614,7 +6082,9 @@ 
             $this->parsingCss->fontSet();
 
             $res = $this->_drawImage($src, isset($param['sub_li']));
-            if (!$res) return $res;
+            if (!$res) {
+            	return $res;
+            }
 
             $this->parsingCss->load();
             $this->parsingCss->fontSet();
@@ -5655,7 +6125,9 @@ 
             $this->_lstSelect['size']    = isset($param['size']) ? $param['size'] : 1;
             $this->_lstSelect['options']    = array();
 
-            if ($this->_lstSelect['multi'] && $this->_lstSelect['size']<3) $this->_lstSelect['size'] = 3;
+            if ($this->_lstSelect['multi'] && $this->_lstSelect['size']<3) {
+            	$this->_lstSelect['size'] = 3;
+            }
 
             return true;
         }
@@ -5708,7 +6180,9 @@ 
             $f = 1.08*$this->parsingCss->value['font-size'];
 
             // width
-            $w = $this->parsingCss->value['width']; if (!$w) $w = 50;
+            $w = $this->parsingCss->value['width']; if (!$w) {
+            	$w = 50;
+            }
 
             // height (automatic)
             $h = ($f*1.07*$this->_lstSelect['size'] + 1);
@@ -5821,9 +6295,15 @@ 
          */
         protected function _tag_open_INPUT($param)
         {
-            if (!isset($param['name']))  $param['name']  = 'champs_pdf_'.(count($this->_lstField)+1);
-            if (!isset($param['value'])) $param['value'] = '';
-            if (!isset($param['type']))  $param['type']  = 'text';
+            if (!isset($param['name'])) {
+            	$param['name']  = 'champs_pdf_'.(count($this->_lstField)+1);
+            }
+            if (!isset($param['value'])) {
+            	$param['value'] = '';
+            }
+            if (!isset($param['type'])) {
+            	$param['type']  = 'text';
+            }
 
             $param['name'] = strtolower($param['name']);
             $param['type'] = strtolower($param['type']);
@@ -5857,7 +6337,9 @@ 
                 case 'checkbox':
                     $w = 3;
                     $h = $w;
-                    if ($h<$f) $y+= ($f-$h)*0.5;
+                    if ($h<$f) {
+                    	$y+= ($f-$h)*0.5;
+                    }
                     $checked = (isset($param['checked']) && $param['checked']=='checked');
                     $this->pdf->CheckBox($name, $w, $checked, $prop, array(), ($param['value'] ? $param['value'] : 'Yes'), $x, $y);
                     break;
@@ -5865,7 +6347,9 @@ 
                 case 'radio':
                     $w = 3;
                     $h = $w;
-                    if ($h<$f) $y+= ($f-$h)*0.5;
+                    if ($h<$f) {
+                    	$y+= ($f-$h)*0.5;
+                    }
                     $checked = (isset($param['checked']) && $param['checked']=='checked');
                     $this->pdf->RadioButton($name, $w, $prop, array(), ($param['value'] ? $param['value'] : 'On'), $checked, $x, $y);
                     break;
@@ -5878,29 +6362,43 @@ 
                     break;
 
                 case 'text':
-                    $w = $this->parsingCss->value['width']; if (!$w) $w = 40;
+                    $w = $this->parsingCss->value['width']; if (!$w) {
+                    	$w = 40;
+                    }
                     $h = $f*1.3;
                     $prop['value'] = $param['value'];
                     $this->pdf->TextField($name, $w, $h, $prop, array(), $x, $y);
                     break;
 
                 case 'submit':
-                    $w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
-                    $h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
+                    $w = $this->parsingCss->value['width'];    if (!$w) {
+                    	$w = 40;
+                    }
+                    $h = $this->parsingCss->value['height'];    if (!$h) {
+                    	$h = $f*1.3;
+                    }
                     $action = array('S'=>'SubmitForm', 'F'=>$this->_isInForm, 'Flags'=>array('ExportFormat'));
                     $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
                     break;
 
                 case 'reset':
-                    $w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
-                    $h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
+                    $w = $this->parsingCss->value['width'];    if (!$w) {
+                    	$w = 40;
+                    }
+                    $h = $this->parsingCss->value['height'];    if (!$h) {
+                    	$h = $f*1.3;
+                    }
                     $action = array('S'=>'ResetForm');
                     $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
                     break;
 
                 case 'button':
-                    $w = $this->parsingCss->value['width'];    if (!$w) $w = 40;
-                    $h = $this->parsingCss->value['height'];    if (!$h) $h = $f*1.3;
+                    $w = $this->parsingCss->value['width'];    if (!$w) {
+                    	$w = 40;
+                    }
+                    $h = $this->parsingCss->value['height'];    if (!$h) {
+                    	$h = $f*1.3;
+                    }
                     $action = isset($param['onclick']) ? $param['onclick'] : '';
                     $this->pdf->Button($name, $w, $h, $param['value'], $action, $prop, array(), $x, $y);
                     break;
@@ -5932,15 +6430,21 @@ 
          */
         protected function _tag_open_DRAW($param)
         {
-            if ($this->_isForOneLine) return false;
-            if ($this->_debugActif) $this->_DEBUG_add('DRAW', true);
+            if ($this->_isForOneLine) {
+            	return false;
+            }
+            if ($this->_debugActif) {
+            	$this->_DEBUG_add('DRAW', true);
+            }
 
             $this->parsingCss->save();
             $this->parsingCss->analyse('draw', $param);
             $this->parsingCss->fontSet();
 
             $alignObject = null;
-            if ($this->parsingCss->value['margin-auto']) $alignObject = 'center';
+            if ($this->parsingCss->value['margin-auto']) {
+            	$alignObject = 'center';
+            }
 
             $overW = $this->parsingCss->value['width'];
             $overH = $this->parsingCss->value['height'];
@@ -5955,22 +6459,27 @@ 
                 if (
                     $w < ($this->pdf->getW() - $this->pdf->getlMargin()-$this->pdf->getrMargin()) &&
                     $this->pdf->getX() + $w>=($this->pdf->getW() - $this->pdf->getrMargin())
-                    )
-                    $this->_tag_open_BR(array());
+                    ) {
+                                    $this->_tag_open_BR(array());
+                }
 
                 if (
                         ($h < ($this->pdf->getH() - $this->pdf->gettMargin()-$this->pdf->getbMargin())) &&
                         ($this->pdf->getY() + $h>=($this->pdf->getH() - $this->pdf->getbMargin())) &&
                         !$this->_isInOverflow
-                    )
-                    $this->_setNewPage();
+                    ) {
+                                    $this->_setNewPage();
+                }
 
                 $old = $this->parsingCss->getOldValues();
                 $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
 
                 if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    if ($alignObject=='center') {
+                    	$this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
+                    } else if ($alignObject=='right') {
+                    	$this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    }
                 }
 
                 $this->parsingCss->setPosition();
@@ -5979,8 +6488,11 @@ 
                 $parentWidth = $old['width'] ? $old['width'] : $this->pdf->getW() - $this->pdf->getlMargin() - $this->pdf->getrMargin();
 
                 if ($parentWidth>$w) {
-                    if ($alignObject=='center')        $this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
-                    else if ($alignObject=='right')    $this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    if ($alignObject=='center') {
+                    	$this->pdf->setX($this->pdf->getX() + ($parentWidth-$w)*0.5);
+                    } else if ($alignObject=='right') {
+                    	$this->pdf->setX($this->pdf->getX() + $parentWidth-$w);
+                    }
                 }
 
                 $this->parsingCss->setPosition();
@@ -6057,7 +6569,9 @@ 
          */
         protected function _tag_close_DRAW($param)
         {
-            if ($this->_isForOneLine) return false;
+            if ($this->_isForOneLine) {
+            	return false;
+            }
 
             $this->pdf->SetAlpha(1.);
             $this->pdf->undoTransform();
@@ -6098,8 +6612,12 @@ 
             $this->parsingCss->fontSet();
             $this->_loadMargin();
 
-            if ($block) $this->_tag_open_BR(array());
-            if ($this->_debugActif) $this->_DEBUG_add('DRAW', false);
+            if ($block) {
+            	$this->_tag_open_BR(array());
+            }
+            if ($this->_debugActif) {
+            	$this->_DEBUG_add('DRAW', false);
+            }
 
             $this->_isInDraw = null;
 
@@ -6115,7 +6633,9 @@ 
          */
         protected function _tag_open_LINE($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'LINE');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'LINE');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();
@@ -6142,7 +6662,9 @@ 
          */
         protected function _tag_open_RECT($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'RECT');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'RECT');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();
@@ -6169,7 +6691,9 @@ 
          */
         protected function _tag_open_CIRCLE($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'CIRCLE');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'CIRCLE');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();
@@ -6194,7 +6718,9 @@ 
          */
         protected function _tag_open_ELLIPSE($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'ELLIPSE');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'ELLIPSE');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();
@@ -6221,7 +6747,9 @@ 
          */
         protected function _tag_open_POLYLINE($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'POLYGON');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'POLYGON');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();
@@ -6237,7 +6765,9 @@ 
                 $path = explode(' ', $path);
                 foreach ($path as $k => $v) {
                     $path[$k] = trim($v);
-                    if ($path[$k]==='') unset($path[$k]);
+                    if ($path[$k]==='') {
+                    	unset($path[$k]);
+                    }
                 }
                 $path = array_values($path);
 
@@ -6267,7 +6797,9 @@ 
          */
         protected function _tag_open_POLYGON($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'POLYGON');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'POLYGON');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();
@@ -6283,7 +6815,9 @@ 
                 $path = explode(' ', $path);
                 foreach ($path as $k => $v) {
                     $path[$k] = trim($v);
-                    if ($path[$k]==='') unset($path[$k]);
+                    if ($path[$k]==='') {
+                    	unset($path[$k]);
+                    }
                 }
                 $path = array_values($path);
 
@@ -6314,7 +6848,9 @@ 
          */
         protected function _tag_open_PATH($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'PATH');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'PATH');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();
@@ -6334,7 +6870,9 @@ 
                 $path = explode(' ', $path);
                 foreach ($path as $k => $v) {
                     $path[$k] = trim($v);
-                    if ($path[$k]==='') unset($path[$k]);
+                    if ($path[$k]==='') {
+                    	unset($path[$k]);
+                    }
                 }
                 $path = array_values($path);
 
@@ -6443,7 +6981,9 @@ 
          */
         protected function _tag_open_G($param)
         {
-            if (!$this->_isInDraw) throw new HTML2PDF_exception(8, 'G');
+            if (!$this->_isInDraw) {
+            	throw new HTML2PDF_exception(8, 'G');
+            }
 
             $this->pdf->doTransform(isset($param['transform']) ? $this->_prepareTransform($param['transform']) : null);
             $this->parsingCss->save();