iNextrix / ASTPP

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

Braces +57 added lines, -57 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
@@ -137,10 +138,11 @@ 
             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 {
 		      $validation_arr = array();
@@ -148,8 +150,7 @@ 
 		        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']);
@@ -199,16 +200,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];
 								}
 								
@@ -244,10 +245,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') {
@@ -264,9 +266,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');
@@ -282,11 +284,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];
@@ -294,13 +296,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];
@@ -311,10 +312,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>';
@@ -323,12 +325,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'];
 					}
@@ -340,18 +342,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']);
 				}
@@ -581,8 +583,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;
@@ -611,7 +614,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]]));
 			   }
 
@@ -636,13 +639,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 {
@@ -676,15 +679,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>';                        }
 					}
@@ -713,7 +714,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]]));
 						 }
 /**
@@ -731,14 +732,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/common.php

Braces +32 added lines, -29 removed lines

@@ -22,8 +22,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
@@ -113,8 +114,9 @@ 
             $flag = false;
             $uname = $this->random_string($length);
             $uname = strtolower($uname);
-            if (isset($default))
-                $uname = $default.$uname;
+            if (isset($default)) {
+                            $uname = $default.$uname;
+            }
             if ( ! in_array($uname, $number)) {
                 $where = array($field => $uname);
                 $acc_result = $this->CI->db_model->getSelect('Count(id) as count', $tablename, $where);
@@ -243,8 +245,7 @@ 
       $accountinfo = $this->CI->session->userdata('accountinfo');
       if ($did_info['accountid'] == 0 && $did_info['parent_id'] == 0) {
 	$status = 'Not in use';
-      }
-      elseif ($accountinfo['type'] != 1) {
+      } elseif ($accountinfo['type'] != 1) {
 	if ($did_info['accountid'] == 0 && $did_info['parent_id'] > 0) {
 	  $status = 'Purchase by Reseller';
 	}
@@ -274,8 +275,7 @@ 
         $did_info = (array)$this->CI->db->get('dids')->first_row();
         if ($did_info['accountid'] > 0 && $did_info['parent_id'] == $accountinfo['id']) {
 	    $flag_status = "<a href='../did_list_release/".$did_info['id']."' title='Release' onClick='return get_reliase_msg();'><span class=' label label-sm label-inverse_blue arrowed_blue-in' title='release'>Release(C)<span></a>";
-	}
-        else if ($accountinfo['type'] != 1 && $did_info['parent_id'] != $accountinfo['id']) {
+	} else if ($accountinfo['type'] != 1 && $did_info['parent_id'] != $accountinfo['id']) {
 	    $flag_status = "<a href='../did_list_release/".$did_info['id']."' title='Release' onClick='return get_reliase_msg();'><span class=' label label-sm label-inverse_blue arrowed_blue-in' title='release'>Release(R)</span></a>";
         } else {
 	    $reseller_id = $accountinfo['type'] != 1 ? 0 : $accountinfo['id'];
@@ -870,9 +870,9 @@ 
 			$rel = (isset($button_params->layout) && $button_params->layout != '')?"facebox_".$button_params->layout:"facebox";
 			return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" rel="'.$rel.'" title="Edit" ="small"><i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
             
-		}else if(strpos($link,'customer_edit') !== false){
+		} else if(strpos($link,'customer_edit') !== false){
 		return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Edit"><i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
-		}else {
+		} else {
 			return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Edit"><i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
 		}
 	}
@@ -913,14 +913,18 @@ 
 		$data=  explode("/",$url);
 		$link = base_url() . $url . "" . $linkid;
 		foreach($data as $key=>$value){
-			if($value == 'price_delete')
-				$flag = '1';
-			if($value == 'trunk_remove')
-				$flag='2';
-			if($value == 'customer_delete' ||$value =='provider_delete')
-				$flag='3';
-			if($value == 'reseller_delete')
-				$flag='4';
+			if($value == 'price_delete') {
+							$flag = '1';
+			}
+			if($value == 'trunk_remove') {
+							$flag='2';
+			}
+			if($value == 'customer_delete' ||$value =='provider_delete') {
+							$flag='3';
+			}
+			if($value == 'reseller_delete') {
+							$flag='4';
+			}
 			}    
 			if($flag=='1'){
 				$where=array('pricelist_id'=>$linkid,'deleted !=' =>'1');
@@ -930,8 +934,7 @@ 
 					if($rategroup_cnt > 0 || $customer_cnt > 0 ){
                         
 						return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_message('.$rategroup_cnt.','.$customer_cnt.','.$linkid.',1);"><i class="fa fa-trash fa-fw"></i></a>';
-					}
-					else{
+					} else{
 						return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();"><i class="fa fa-trash fa-fw"></i></a>';
 					}
 			}
@@ -940,8 +943,7 @@ 
 				$trunk_cnt=$this->get_field_count('id','outbound_routes',$where);
 				if($trunk_cnt > 0){
 					return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_message('.$trunk_cnt.',null,'.$linkid.',2);"><i class="fa fa-trash fa-fw"></i></a>';
-				}
-				else{
+				} else{
 					return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();"><i class="fa fa-trash fa-fw"></i></a>';
 				}
 			}
@@ -2045,7 +2047,7 @@ 
 
 		$ACCOUNT_DESCRIPTION .= '<td style="width:20%;font-size: 12px;color:#525252;font-family:arial; line-height: 22px;text-align:right;">'.$this->currency_decimal($this->CI->common_model->calculate_currency($charge_res['debit'])).'</td>';
 		$ACCOUNT_DESCRIPTION .= '</tr>';
-		 }else{
+		 } else{
 			$cdrs_data = $this->CI->db_model->getSelect("sum(billseconds) as billseconds,count(*) as count", "cdrs", array("accountid" => $charge_res['accountid'],"calltype" => $charge_res['item_type']));
 			$cdrs_result = $cdrs_data->result_array();
 		if($cdrs_result[0]['count'] > 0 ){
@@ -2185,7 +2187,7 @@ 
 		$download_path = $invoicedata['invoice_prefix'].$invoicedata['invoiceid'].".pdf";
        
 		$this->CI->html2pdf->Output($download_path,"D");        
-	   }else{
+	   } else{
 		$current_dir = getcwd()."/invoices/";
 		$dir_name = $accountdata["id"];
 		if(!is_dir($current_dir.$dir_name)){
@@ -2208,16 +2210,17 @@ 
 		$select = "concat($cnt_str) as $select_params[2] ";
 		$drp_array = $this->CI->db_model->getSelect($select, $table, $where);
 		$drp_array = $drp_array->result();
-		if (isset($drp_array[0]))
-			return $drp_array[0]->$select_params[2];
-	else
-	   return 'Admin';
+		if (isset($drp_array[0])) {
+					return $drp_array[0]->$select_params[2];
+		} else {
+		   return 'Admin';
+	}
 	}
     
 	function get_subreseller_info($parent_id){
 		if(!empty($parent_id)){
 	  $str=$parent_id.",";
-		}else{
+		} else{
 		  $str=null;
 		}
 		$query = "select id from accounts where reseller_id = '$parent_id' AND deleted =0 AND type=1";
@@ -2235,7 +2238,7 @@ 
 	function get_parent_info($child_id,$parent_id){
 		if(!empty($child_id)){
 	  $str=$child_id.",";
-		}else{
+		} else{
 		  $str=null;
 		}
 		if($child_id > 0){

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

Braces +20 added lines, -15 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
@@ -121,9 +122,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='';
@@ -226,7 +227,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;
@@ -243,14 +246,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();
@@ -287,14 +291,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/_class/myPdf.class.php

Braces +58 added lines, -23 removed lines

@@ -549,8 +549,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;
@@ -592,8 +596,9 @@ 
      */
     public function SetY($y, $resetx = true, $rtloff = false)
     {
-        if ($resetx)
-            $this->x = $this->lMargin;
+        if ($resetx) {
+                    $this->x = $this->lMargin;
+        }
 
         $this->y = $y;
     }
@@ -726,9 +731,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);
@@ -772,9 +781,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);
@@ -791,9 +804,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);
@@ -1004,7 +1021,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;
@@ -1110,7 +1129,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'];
@@ -1122,7 +1143,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) {
@@ -1170,8 +1193,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]));
@@ -1195,11 +1221,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(
@@ -1249,7 +1280,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);
@@ -1307,7 +1340,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/parsingHtml.class.php

Braces +65 added lines, -34 removed lines

@@ -115,12 +115,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']) {
@@ -171,7 +172,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(
@@ -204,21 +207,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);
@@ -265,7 +273,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);
@@ -282,7 +292,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);
     }
 
@@ -296,7 +308,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]);
@@ -315,20 +329,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";
@@ -374,19 +391,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;
             }
@@ -394,8 +417,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;
@@ -458,7 +484,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'];
@@ -503,16 +531,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/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/parsingCss.class.php

Braces +319 added lines, -128 removed lines

@@ -183,7 +183,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;
@@ -319,20 +321,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;
@@ -380,7 +385,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);
+        }
     }
 
      /**
@@ -401,18 +408,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') {
@@ -425,8 +440,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
@@ -484,8 +503,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();
@@ -534,10 +557,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'];
     }
@@ -554,8 +585,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();
@@ -594,7 +629,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);
@@ -603,8 +640,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;
                 }
@@ -647,13 +685,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':
@@ -669,7 +711,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;
 
@@ -679,7 +723,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;
 
@@ -688,18 +734,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;
 
@@ -893,34 +947,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':
@@ -932,17 +1004,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;
                     }
@@ -1024,22 +1108,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':
@@ -1052,7 +1149,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;
 
@@ -1064,11 +1163,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') {
@@ -1084,30 +1189,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;
     }
@@ -1121,7 +1256,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']);
     }
 
@@ -1177,8 +1314,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;
     }
 
@@ -1208,7 +1349,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();
     }
@@ -1222,7 +1365,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();
     }
@@ -1364,12 +1509,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);
@@ -1474,8 +1623,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);
+        }
     }
 
     /**
@@ -1487,12 +1639,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;
+        }
     }
 
     /**
@@ -1513,10 +1666,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;
@@ -1524,24 +1681,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);
@@ -1581,13 +1756,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;
     }
@@ -1636,7 +1820,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)])) {
@@ -1697,7 +1883,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;
@@ -1751,13 +1939,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 +662 added lines, -250 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();
@@ -357,14 +359,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') {
@@ -425,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;
         }
@@ -516,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');
@@ -621,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);
@@ -639,7 +661,9 @@ 
             $this->_debugLastTime = $time;
 
             // it false : DOWN
-            if ($level === false) $this->_debugLevel--;
+            if ($level === false) {
+            	$this->_debugLevel--;
+            }
 
             return $this;
         }
@@ -678,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;
         }
@@ -701,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
@@ -810,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;
@@ -830,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;
@@ -891,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
@@ -910,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;
@@ -1028,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));
@@ -1162,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
@@ -1276,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;
         }
@@ -1292,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);
             }
@@ -1419,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
@@ -1490,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;
@@ -1533,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 = '';
@@ -1594,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;
@@ -1652,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);
@@ -1753,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]);
                 }
 
@@ -1781,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]);
                 }
 
@@ -1809,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]);
                 }
 
@@ -1837,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]);
 
                 }
@@ -1870,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]);
+            }
         }
 
         /**
@@ -1944,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;
@@ -2023,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();
@@ -2047,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]);
@@ -2117,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();
@@ -2137,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']) {
@@ -2186,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']) {
@@ -2236,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');
 
@@ -2254,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
@@ -2283,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
@@ -2338,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);
@@ -2412,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();
@@ -2436,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();
@@ -2796,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();
@@ -2820,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();
@@ -2870,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':
@@ -2954,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;
 
@@ -3120,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);
@@ -3138,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);
@@ -3180,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']);
@@ -3196,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);
@@ -3208,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'],
@@ -3266,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;
         }
@@ -3311,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
@@ -3372,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];
                 }
@@ -3389,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);
@@ -3410,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] === '') {
@@ -3445,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));
                     }
 
@@ -3456,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);
@@ -3484,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);
 
@@ -3531,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;
@@ -3868,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;
@@ -3878,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];
             }
@@ -4182,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();
@@ -4250,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';
@@ -4258,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;
         }
@@ -4286,7 +4592,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());
@@ -4452,14 +4760,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
@@ -4492,14 +4808,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;
@@ -4526,11 +4846,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;
 
@@ -4684,9 +5008,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);
@@ -4747,9 +5075,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);
@@ -4930,15 +5262,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;
@@ -5051,9 +5389,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;
                     }
                 }
@@ -5072,10 +5411,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;
                 }
@@ -5111,13 +5451,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;
@@ -5126,7 +5469,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'])) {
@@ -5151,12 +5496,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);
@@ -5187,8 +5533,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;
+            }
         }
 
         /**
@@ -5320,12 +5667,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;
@@ -5437,10 +5786,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';
+                            }
                         }
                     }
 
@@ -5505,7 +5855,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');
                 }
             }
@@ -5729,7 +6081,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();
@@ -5770,7 +6124,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;
         }
@@ -5822,7 +6178,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);
@@ -5934,9 +6292,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']);
@@ -5970,7 +6334,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;
@@ -5978,7 +6344,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;
@@ -5991,29 +6359,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;
@@ -6074,22 +6456,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();
@@ -6098,8 +6485,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();
@@ -6240,7 +6630,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();
@@ -6267,7 +6659,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();
@@ -6294,7 +6688,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();
@@ -6319,7 +6715,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();
@@ -6346,7 +6744,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();
@@ -6362,7 +6762,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);
 
@@ -6392,7 +6794,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();
@@ -6408,7 +6812,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);
 
@@ -6439,7 +6845,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();
@@ -6459,7 +6867,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);
 
@@ -6568,7 +6978,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();

web_interface/astpp/application/libraries/freeswitch_lib.php

Braces +2 added lines, -4 removed lines

@@ -42,8 +42,7 @@ 
 			}

 		}

 		return $fp;

-		}

-		else {

+		} else {

 		return false;

 		}           

 	}

@@ -86,8 +85,7 @@ 
 		}

 				

 		return $response;

-		}

-		else {

+		} else {

 // 	      echo "no handle";

 		}

 	}