iNextrix / ASTPP

freeswitch/fs/lib/astpp.cdr.php

Doc Comments +1 added lines

@@ -256,6 +256,7 @@
 //Insert callee cdr entry for DID calls
 /**
  * @param boolean $flag_parent
+ * @param string $provider_cost
  */
 function insert_extra_receiver_entry($dataVariable,$origination_rate,$termination_rate,$account_type,$actual_duration,$provider_cost,$parentid,$flag_parent,$accountid,$logger,$db,$decimal_points)
 {

Braces +13 added lines, -10 removed lines

@@ -47,7 +47,7 @@ 
 	if ($dataVariable['billsec'] == 0 && $dataVariable['hangup_cause'] == 'NORMAL_CLEARING')
 	{
 		$hangup_cause = isset($dataVariable['last_bridge_hangup_cause'])?$dataVariable['last_bridge_hangup_cause']:$dataVariable['hangup_cause'];
-	}else{
+	} else{
 		$hangup_cause = $dataVariable['hangup_cause'];
 	}   
 
@@ -86,10 +86,12 @@ 
 	$actual_calltype = $dataVariable['calltype'];
 	
 	//Normalize origination and termination rates array 		   
-	if(isset($dataVariable['origination_rates']))
-	   $origination_rate = normalize_origination_rate($dataVariable['origination_rates']);
-	if(isset($dataVariable['termination_rates']))
-	   $termination_rate = normalize_rate($dataVariable['termination_rates']);
+	if(isset($dataVariable['origination_rates'])) {
+		   $origination_rate = normalize_origination_rate($dataVariable['origination_rates']);
+	}
+	if(isset($dataVariable['termination_rates'])) {
+		   $termination_rate = normalize_rate($dataVariable['termination_rates']);
+	}
 
 	//If receiver account id found then explicitly set call direction and call type 
 	if(isset($dataVariable['receiver_accid']))
@@ -441,11 +443,12 @@ 
 	$query_counter = "SELECT id,seconds FROM counters  WHERE  accountid = ".$accountid." AND package_id = ".$package_id." AND status=1 LIMIT 1";
 	$counter = $db->run($query_counter);
 	$logger->log("GET Counters  : " . $query_counter);
-	if($counter)
-		return $counter[0];	
-	else
-		return "";
-}
+	if($counter) {
+			return $counter[0];
+	} else {
+			return "";
+	}
+	}
 
 //Get user info
 function get_accounts($parent_id,$logger, $db) {

Indentation +24 added lines, -24 removed lines

@@ -159,16 +159,16 @@ 
 		$dataVariable['call_direction'] = "inbound";
 		$dataVariable['calltype'] = "DID";
 
-    //Override variables if call for DID PSTN
-    if(isset($dataVariable['caller_did_account_id']))
-    {
-        $dataVariable['receiver_accid'] = $dataVariable['caller_did_account_id'];
-    		$dataVariable['call_direction'] = "outbound";
-        $dataVariable['calltype'] = "STANDARD";
-	      $dataVariable['effective_destination_number']=$dataVariable['sip_to_user'];
-        unset($termination_rate);
-        unset($provider_cost);
-     }
+	//Override variables if call for DID PSTN
+	if(isset($dataVariable['caller_did_account_id']))
+	{
+		$dataVariable['receiver_accid'] = $dataVariable['caller_did_account_id'];
+			$dataVariable['call_direction'] = "outbound";
+		$dataVariable['calltype'] = "STANDARD";
+		  $dataVariable['effective_destination_number']=$dataVariable['sip_to_user'];
+		unset($termination_rate);
+		unset($provider_cost);
+	 }
 
         
 
@@ -316,7 +316,7 @@ 
 //Generate CDR string for insert query for reseller
 function get_reseller_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost)
 {
-        $dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER')?"DID":$dataVariable['calltype'];
+		$dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER')?"DID":$dataVariable['calltype'];
 	$callerIdNumber = isset($dataVariable['effective_caller_id_number']) && !empty($dataVariable['effective_caller_id_number'])? $dataVariable['effective_caller_id_number'] :$dataVariable['caller_id'];
 	
 	return $cdr_string = "'".($dataVariable['uuid'])."','".$accountid."','".(urldecode($callerIdNumber))."','".($dataVariable['effective_destination_number'])."','".$actual_duration."','".($dataVariable['hangup_cause'])."','".convert_to_gmt(urldecode($dataVariable['callstart']))."','".$debit."','".$cost."','".$origination_rate[$accountid]['RATEGROUP']."','".$dataVariable['package_id']."','".($origination_rate[$accountid]['CODE'])."',".(($origination_rate[$accountid]['DESTINATION']) ? "'".$origination_rate[$accountid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$accountid]['COST']) ? "'".$origination_rate[$accountid]['COST']."'" : "'".'0'."'").",'".$parentid."',".(($origination_rate[$parentid]['CODE'] ) ? "'".$origination_rate[$parentid]['CODE']."'" : "'".'0'."'").",".(($origination_rate[$parentid]['DESTINATION']) ?  "'".$origination_rate[$parentid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$parentid]['COST']) ?  "'".$origination_rate[$parentid]['COST']."'" :  '0').",".(($dataVariable['call_direction']) ? "'".$dataVariable['call_direction']."'" : "'internal'").",'".($dataVariable['calltype'])."'";
@@ -327,27 +327,27 @@ 
  * @param integer $entity_id
  */
 function update_balance($user_id, $amount, $entity_id, $logger, $db) {
-    $math_sign = ($entity_id == 0 || $entity_id == 1) ? '-' : '+';
-    $query = "UPDATE accounts SET balance=balance-" . $amount . " WHERE id=" . $user_id;
-    $logger->log("Balance update : " . $query);
-    $db->run($query);
+	$math_sign = ($entity_id == 0 || $entity_id == 1) ? '-' : '+';
+	$query = "UPDATE accounts SET balance=balance-" . $amount . " WHERE id=" . $user_id;
+	$logger->log("Balance update : " . $query);
+	$db->run($query);
 }
 
 //Normalize rate string which we are getting from dialplan
 function normalize_rate($dataVariable)
 {
 	$rates = urldecode($dataVariable);
-    $data = explode("|", $rates);
+	$data = explode("|", $rates);
 
 	$newarray = array();
-    foreach ($data as $key => $value)
-    {
-            $data1 = explode(":", $value);
-            foreach ($data1 as $newkey => $newvalue)
-            {
-                    $newarray[$data1[0]] = $data1[$newkey];
-            }
-    }
+	foreach ($data as $key => $value)
+	{
+			$data1 = explode(":", $value);
+			foreach ($data1 as $newkey => $newvalue)
+			{
+					$newarray[$data1[0]] = $data1[$newkey];
+			}
+	}
 	return $newarray;
 }
 

Spacing +89 added lines, -89 removed lines

@@ -46,15 +46,15 @@ 
 
 	if ($dataVariable['billsec'] == 0 && $dataVariable['hangup_cause'] == 'NORMAL_CLEARING')
 	{
-		$hangup_cause = isset($dataVariable['last_bridge_hangup_cause'])?$dataVariable['last_bridge_hangup_cause']:$dataVariable['hangup_cause'];
-	}else{
+		$hangup_cause = isset($dataVariable['last_bridge_hangup_cause']) ? $dataVariable['last_bridge_hangup_cause'] : $dataVariable['hangup_cause'];
+	} else {
 		$hangup_cause = $dataVariable['hangup_cause'];
 	}   
 
 	if ($dataVariable['error_cdr'] == '1')
 	{
 		//Get actual hangup cause 
-		$hangup_cause= (isset($dataVariable['error_cdr'])) ? $dataVariable['last_bridge_hangup_cause'] : (isset($dataVariable['last_bridge_hangup_cause'])?$dataVariable['last_bridge_hangup_cause']:$dataVariable['hangup_cause']); 
+		$hangup_cause = (isset($dataVariable['error_cdr'])) ? $dataVariable['last_bridge_hangup_cause'] : (isset($dataVariable['last_bridge_hangup_cause']) ? $dataVariable['last_bridge_hangup_cause'] : $dataVariable['hangup_cause']); 
 	}
 
 	/*#### PATCH FOR ONE WAY AUDIO ####*/
@@ -65,7 +65,7 @@ 
 	/*#### ************* END *************####*/
 
 	//Don't thing this will be useful anytime. Need to remove it after testing. 
-	if($hangup_cause == "NONE")
+	if ($hangup_cause == "NONE")
 	{
 		$hangup_cause = $dataVariable['current_application_data'];
 	}
@@ -86,13 +86,13 @@ 
 	$actual_calltype = $dataVariable['calltype'];
 	
 	//Normalize origination and termination rates array 		   
-	if(isset($dataVariable['origination_rates']))
+	if (isset($dataVariable['origination_rates']))
 	   $origination_rate = normalize_origination_rate($dataVariable['origination_rates']);
-	if(isset($dataVariable['termination_rates']))
+	if (isset($dataVariable['termination_rates']))
 	   $termination_rate = normalize_rate($dataVariable['termination_rates']);
 
 	//If receiver account id found then explicitly set call direction and call type 
-	if(isset($dataVariable['receiver_accid']))
+	if (isset($dataVariable['receiver_accid']))
 	{
 		$dataVariable['call_direction'] = "outbound";
 		$dataVariable['calltype'] = "STANDARD";
@@ -101,23 +101,23 @@ 
 	//Check if cusotmer have any package seconds left to use
 	if ($actual_duration > 0)			
 	{
-			$package_array = package_calculation( $dataVariable['effective_destination_number'],$origination_rate[$accountid]['RATEGROUP'],$actual_duration,$dataVariable['call_direction'],$accountid,$db,$logger);
-			if(!empty($package_array))
+			$package_array = package_calculation($dataVariable['effective_destination_number'], $origination_rate[$accountid]['RATEGROUP'], $actual_duration, $dataVariable['call_direction'], $accountid, $db, $logger);
+			if ( ! empty($package_array))
 			{
 				$dataVariable['calltype'] = "FREE";
-				$dataVariable['package_id']= $package_array['package_id'];
+				$dataVariable['package_id'] = $package_array['package_id'];
 			}
 	}
 	
 	//Calculate debit of customer call 			
-	$debit = calc_cost($dataVariable,$origination_rate[$accountid],$logger,$decimal_points);
+	$debit = calc_cost($dataVariable, $origination_rate[$accountid], $logger, $decimal_points);
 
 	//Calculate cost for customer call for provider
-	$provider_cost = calc_cost($dataVariable,$termination_rate,$logger,$decimal_points);
+	$provider_cost = calc_cost($dataVariable, $termination_rate, $logger, $decimal_points);
 
 	//Calculate parent cost if customer have any parent 
-	$parent_cost = ($parentid > 0) ? calc_cost($dataVariable,$origination_rate[$parentid],$logger,$decimal_points) : $provider_cost;
-	$logger->log("Debit :".$debit ." Cost : ".$cost ." Provider Cost : ".$parent_cost);
+	$parent_cost = ($parentid > 0) ? calc_cost($dataVariable, $origination_rate[$parentid], $logger, $decimal_points) : $provider_cost;
+	$logger->log("Debit :".$debit." Cost : ".$cost." Provider Cost : ".$parent_cost);
     
 	//Initialize final cost variable to use for billing
 	$cost = ($parent_cost > 0) ? $parent_cost : $provider_cost;    
@@ -125,33 +125,33 @@ 
 	//Outbound call entry for all type of calls 
 	$logger->log("*********************** OUTBOUND CALL ENTRY START *************");
 
-	$cdr_string = get_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost,$logger);
+	$cdr_string = get_cdr_string($dataVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate, $provider_cost, $parentid, $debit, $cost, $logger);
 
 	$query = "INSERT INTO cdrs (uniqueid,accountid,type,callerid,callednum,billseconds,trunk_id,trunkip,callerip,disposition,callstart,debit,cost,provider_id,pricelist_id,package_id,pattern,notes,rate_cost,reseller_id,reseller_code,reseller_code_destination,reseller_cost,provider_code,provider_code_destination,provider_cost,provider_call_cost,call_direction,calltype,profile_start_stamp,answer_stamp,bridge_stamp,progress_stamp,progress_media_stamp,end_stamp,billmsec,answermsec,waitmsec,progress_mediamsec,flow_billmsec)  values ($cdr_string)";
 	$logger->log($query);
 	$db->run($query);
 	
 	//Update customer balance
-	if($debit > 0 && $dataVariable['calltype'] != "FREE")
+	if ($debit > 0 && $dataVariable['calltype'] != "FREE")
 	{
 		update_balance($accountid, $debit, 0, $logger, $db);
 	}
 
 	//Update parent or provider balance
-	if($parent_cost > 0){
+	if ($parent_cost > 0) {
 		update_balance($termination_rate['PROVIDER'], ($parent_cost * -1), 3, $logger, $db);
 	}
 
 	//Resellers CDR entry
 	$flag_parent = false;
-	insert_parent_data($dataVariable,$actual_calltype,$parentid,$origination_rate,$actual_duration,$provider_cost,$flag_parent,$logger,$db,$decimal_points);
+	insert_parent_data($dataVariable, $actual_calltype, $parentid, $origination_rate, $actual_duration, $provider_cost, $flag_parent, $logger, $db, $decimal_points);
 
 	$logger->log("*********************** OUTBOUND CALL ENTRY END *************");
 
    
 	//************ ADDING EXTRA ENTRY For local/DID Inbound call ****************************
-	$receiver_parentid=0;
-	if(isset($dataVariable['receiver_accid']) && $dataVariable['receiver_accid'] != "")
+	$receiver_parentid = 0;
+	if (isset($dataVariable['receiver_accid']) && $dataVariable['receiver_accid'] != "")
 	{
 		$logger->log("*********************** EXTRA ENTRY SECTION FOR BILLING START *************");            
 
@@ -160,12 +160,12 @@ 
 		$dataVariable['calltype'] = "DID";
 
     //Override variables if call for DID PSTN
-    if(isset($dataVariable['caller_did_account_id']))
+    if (isset($dataVariable['caller_did_account_id']))
     {
         $dataVariable['receiver_accid'] = $dataVariable['caller_did_account_id'];
     		$dataVariable['call_direction'] = "outbound";
         $dataVariable['calltype'] = "STANDARD";
-	      $dataVariable['effective_destination_number']=$dataVariable['sip_to_user'];
+	      $dataVariable['effective_destination_number'] = $dataVariable['sip_to_user'];
         unset($termination_rate);
         unset($provider_cost);
      }
@@ -173,17 +173,17 @@ 
         
 
 		//Get call receiver account information 
-		$receiver_carddata = get_accounts($dataVariable['receiver_accid'],$logger,$db);
+		$receiver_carddata = get_accounts($dataVariable['receiver_accid'], $logger, $db);
 		$receiver_parentid = $receiver_carddata['reseller_id'];
 
 		//For additional cdr entry of receiver
-		insert_extra_receiver_entry($dataVariable,$origination_rate,$termination_rate,$account_type,$actual_duration,$provider_cost,$receiver_parentid,$flag_parent,$dataVariable['receiver_accid'],$logger,$db,$decimal_points);
+		insert_extra_receiver_entry($dataVariable, $origination_rate, $termination_rate, $account_type, $actual_duration, $provider_cost, $receiver_parentid, $flag_parent, $dataVariable['receiver_accid'], $logger, $db, $decimal_points);
 
 		$flag_parent = true;
 		$dataVariable['uuid'] = $dataVariable['uuid'].$dataVariable['calltype']."_".$receiver_parentid;
 
 		//Insert parent reseller cdr
-		insert_parent_data($dataVariable,$actual_calltype,$receiver_parentid,$origination_rate,$actual_duration,$provider_cost,$flag_parent,$logger,$db,$decimal_points);
+		insert_parent_data($dataVariable, $actual_calltype, $receiver_parentid, $origination_rate, $actual_duration, $provider_cost, $flag_parent, $logger, $db, $decimal_points);
 		$logger->log("*********************** EXTRA ENTRY SECTION FOR BILLING END *************");            
 	}
 	//*****************************************************************************************
@@ -195,16 +195,16 @@ 
  * @param string $provider_cost
  * @param boolean $flag_parent
  */
-function insert_parent_data($dataVariable,$actual_calltype,$parentid,$origination_rate,$actual_duration,$provider_cost,$flag_parent,$logger,$db,$decimal_points)
+function insert_parent_data($dataVariable, $actual_calltype, $parentid, $origination_rate, $actual_duration, $provider_cost, $flag_parent, $logger, $db, $decimal_points)
 {
-	while($parentid > 0 )
+	while ($parentid > 0)
 	{
 		$logger->log("*************** IN PARENT DATA SECTION ********");
 		$dataVariable['calltype'] = $actual_calltype;
-		$carddata = get_accounts($parentid,$logger,$db);
+		$carddata = get_accounts($parentid, $logger, $db);
 		$accountid = $carddata['id'];
 
-		$debit = calc_cost($dataVariable,$origination_rate[$accountid],$logger,$decimal_points);
+		$debit = calc_cost($dataVariable, $origination_rate[$accountid], $logger, $decimal_points);
 
 		//If receiver account id found then explicitly set call direction and call type
 		/*if(isset($dataVariable['receiver_accid']))
@@ -214,31 +214,31 @@ 
         }*/
 
 		//Check if reseller have any package seconds left to use        
-		if ($actual_duration > 0)		{
-			$package_array = package_calculation( $dataVariable['effective_destination_number'],$origination_rate[$accountid]['RATEGROUP'],$actual_duration,$dataVariable['call_direction'],$accountid,$db,$logger);
-			if(!empty($package_array))
+		if ($actual_duration > 0) {
+			$package_array = package_calculation($dataVariable['effective_destination_number'], $origination_rate[$accountid]['RATEGROUP'], $actual_duration, $dataVariable['call_direction'], $accountid, $db, $logger);
+			if ( ! empty($package_array))
 			{
 				$dataVariable['calltype'] = "FREE";
-				$dataVariable['package_id']= $package_array['package_id'];
+				$dataVariable['package_id'] = $package_array['package_id'];
 			}
 		}	
 
 		//Get parent id for cost calculation 
 		$parentid = $carddata['reseller_id'];
-		$parent_cost = ($parentid > 0) ? calc_cost($dataVariable,$origination_rate[$parentid],$logger,$decimal_points) : $provider_cost;
+		$parent_cost = ($parentid > 0) ? calc_cost($dataVariable, $origination_rate[$parentid], $logger, $decimal_points) : $provider_cost;
 		$cost = ($parent_cost > 0) ? $parent_cost : $provider_cost;
 	
-		if(isset($dataVariable['receiver_accid']) && $dataVariable['receiver_accid'] != "" && $flag_parent == true)
+		if (isset($dataVariable['receiver_accid']) && $dataVariable['receiver_accid'] != "" && $flag_parent == true)
 		{
 			$logger->log("********* IN RESELLER FOR RECEIVER ENTRY START ******");
 			$flag_parent = true;
-			insert_extra_receiver_entry($dataVariable,$origination_rate,$termination_rate,$account_type,$actual_duration,$provider_cost,$parentid,$flag_parent,$accountid,$logger,$db,$decimal_points);
+			insert_extra_receiver_entry($dataVariable, $origination_rate, $termination_rate, $account_type, $actual_duration, $provider_cost, $parentid, $flag_parent, $accountid, $logger, $db, $decimal_points);
 			$logger->log("********* IN RESELLER FOR RECEIVER ENTRY END ******");
 			return true;	
 
-		} else{
+		} else {
 
-			$cdr_string = get_reseller_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost);	
+			$cdr_string = get_reseller_cdr_string($dataVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate, $provider_cost, $parentid, $debit, $cost);	
 
  			$query = "INSERT INTO reseller_cdrs (uniqueid,accountid,callerid,callednum,billseconds,disposition,callstart,debit,cost,pricelist_id,package_id,pattern,notes,rate_cost,
 		reseller_id,reseller_code,reseller_code_destination,reseller_cost,call_direction,calltype) values ($cdr_string)";
@@ -259,38 +259,38 @@ 
 /**
  * @param boolean $flag_parent
  */
-function insert_extra_receiver_entry($dataVariable,$origination_rate,$termination_rate,$account_type,$actual_duration,$provider_cost,$parentid,$flag_parent,$accountid,$logger,$db,$decimal_points)
+function insert_extra_receiver_entry($dataVariable, $origination_rate, $termination_rate, $account_type, $actual_duration, $provider_cost, $parentid, $flag_parent, $accountid, $logger, $db, $decimal_points)
 {
 		$localVariable = $dataVariable;
 		$localVariable['call_direction'] = "inbound";
 		$localVariable['uuid'] = $localVariable['uuid'].$dataVariable['calltype']."_".$accountid;
 		
-		if($dataVariable['calltype'] == "LOCAL")
+		if ($dataVariable['calltype'] == "LOCAL")
 		{
 			$origination_rate[$accountid]['CODE'] = $dataVariable['effective_destination_number'];
 			$origination_rate[$accountid]['DESTINATION'] = $dataVariable['calltype'];
-			if($flag_parent == false){
-				$cdr_string = get_cdr_string($localVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,0,0,$logger);
-			} else{
-				$cdr_string = get_reseller_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost);
+			if ($flag_parent == false) {
+				$cdr_string = get_cdr_string($localVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate, $provider_cost, $parentid, 0, 0, $logger);
+			} else {
+				$cdr_string = get_reseller_cdr_string($dataVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate, $provider_cost, $parentid, $debit, $cost);
 			}
-		} else{
+		} else {
 
 			$origination_rate_did = normalize_origination_rate($dataVariable['origination_rates_did']);
-			$debit = calc_cost($dataVariable,$origination_rate_did[$accountid],$logger,$decimal_points);
+			$debit = calc_cost($dataVariable, $origination_rate_did[$accountid], $logger, $decimal_points);
 
-			if($flag_parent == false){
+			if ($flag_parent == false) {
 				
-				$cdr_string = get_cdr_string($localVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate_did,$provider_cost,$parentid,$debit,0,$logger);
-			} else{
-				$cdr_string = get_reseller_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost);
+				$cdr_string = get_cdr_string($localVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate_did, $provider_cost, $parentid, $debit, 0, $logger);
+			} else {
+				$cdr_string = get_reseller_cdr_string($dataVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate, $provider_cost, $parentid, $debit, $cost);
 			}
 		}
 	  
-		if($flag_parent == false)
+		if ($flag_parent == false)
 		{
 			$query = "INSERT INTO cdrs(uniqueid,accountid,type,callerid,callednum,billseconds,trunk_id,trunkip,callerip,disposition,callstart,debit,cost,provider_id,pricelist_id,package_id,pattern,notes,rate_cost,reseller_id,reseller_code,reseller_code_destination,reseller_cost,provider_code,provider_code_destination,provider_cost,provider_call_cost,call_direction,calltype,profile_start_stamp,answer_stamp,bridge_stamp,progress_stamp,progress_media_stamp,end_stamp,billmsec,answermsec,waitmsec,progress_mediamsec,flow_billmsec) values ($cdr_string)";
-		} else{
+		} else {
 			$query = "INSERT INTO reseller_cdrs (uniqueid,accountid,callerid,callednum,billseconds,disposition,callstart,debit,cost,pricelist_id,package_id,pattern,notes,rate_cost,
 	reseller_id,reseller_code,reseller_code_destination,reseller_cost,call_direction,calltype) values ($cdr_string)";
 		}
@@ -306,20 +306,20 @@ 
 }
 
 //Generate CDR string for insert query for customer.
-function get_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost,$logger)
+function get_cdr_string($dataVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate, $provider_cost, $parentid, $debit, $cost, $logger)
 {
-   	$dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER')?"DID":$dataVariable['calltype'];
-		$callerIdNumber = isset($dataVariable['effective_caller_id_number']) && !empty($dataVariable['effective_caller_id_number'])? $dataVariable['effective_caller_id_number'] :$dataVariable['caller_id'];
-		return  $cdr_string = "'".($dataVariable['uuid'])."','".$accountid."','".$account_type."','".(urldecode($callerIdNumber))."','".($dataVariable['effective_destination_number'])."','".$actual_duration."',".(($termination_rate['TRUNK']) ? $termination_rate['TRUNK'] : '0').",".(($dataVariable['sip_via_host']) ? "'".$dataVariable['sip_via_host']."'" : '""').",".(($dataVariable['sip_contact_host']) ? "'".$dataVariable['sip_contact_host']."'" : '""').",'".($dataVariable['hangup_cause'])."','".urldecode($dataVariable['callstart'])."','".$debit."','".$cost."',".(($termination_rate['PROVIDER']) ? $termination_rate['PROVIDER'] : '0').",'".$origination_rate[$accountid]['RATEGROUP']."','".$dataVariable['package_id']."','".($origination_rate[$accountid]['CODE'])."',".(($origination_rate[$accountid]['DESTINATION']) ? "'".htmlentities($origination_rate[$accountid]['DESTINATION'],ENT_COMPAT, 'UTF-8')."'" : "'".''."'").",".(($origination_rate[$accountid]['COST']) ? "'".$origination_rate[$accountid]['COST']."'" : "'".'0'."'").",'".$parentid."',".(($origination_rate[$parentid]['CODE'] ) ? "'".$origination_rate[$parentid]['CODE']."'" : "'".'0'."'").",".(($origination_rate[$parentid]['DESTINATION']) ?  "'".$origination_rate[$parentid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$parentid]['COST']) ?  "'".$origination_rate[$parentid]['COST']."'" :  '0').",".(($termination_rate['CODE']) ? "'".$termination_rate['CODE']."'" : "'".''."'" ).",".(($termination_rate['DESTINATION']) ? "'".$termination_rate['DESTINATION']."'" : "'".''."'").",".(($termination_rate['COST']) ? "'".$termination_rate['COST']."'" : '0').",'".$provider_cost."',".(($dataVariable['call_direction']) ? "'".$dataVariable['call_direction']."'" : "'internal'").",'".($dataVariable['calltype'])."','".convert_to_gmt(urldecode($dataVariable['profile_start_stamp']))."','".convert_to_gmt(urldecode($dataVariable['answer_stamp']))."','".convert_to_gmt(urldecode($dataVariable['bridge_stamp']))."','".convert_to_gmt(urldecode(@$dataVariable['progress_stamp']))."','".convert_to_gmt(urldecode(@$dataVariable['progress_media_stamp']))."','".convert_to_gmt(urldecode($dataVariable['end_stamp']))."',".$dataVariable['billmsec'].",'".$dataVariable['answermsec']."','".$dataVariable['waitmsec']."','".$dataVariable['progress_mediamsec']."','".$dataVariable['flow_billmsec']."'";
+   	$dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER') ? "DID" : $dataVariable['calltype'];
+		$callerIdNumber = isset($dataVariable['effective_caller_id_number']) && ! empty($dataVariable['effective_caller_id_number']) ? $dataVariable['effective_caller_id_number'] : $dataVariable['caller_id'];
+		return  $cdr_string = "'".($dataVariable['uuid'])."','".$accountid."','".$account_type."','".(urldecode($callerIdNumber))."','".($dataVariable['effective_destination_number'])."','".$actual_duration."',".(($termination_rate['TRUNK']) ? $termination_rate['TRUNK'] : '0').",".(($dataVariable['sip_via_host']) ? "'".$dataVariable['sip_via_host']."'" : '""').",".(($dataVariable['sip_contact_host']) ? "'".$dataVariable['sip_contact_host']."'" : '""').",'".($dataVariable['hangup_cause'])."','".urldecode($dataVariable['callstart'])."','".$debit."','".$cost."',".(($termination_rate['PROVIDER']) ? $termination_rate['PROVIDER'] : '0').",'".$origination_rate[$accountid]['RATEGROUP']."','".$dataVariable['package_id']."','".($origination_rate[$accountid]['CODE'])."',".(($origination_rate[$accountid]['DESTINATION']) ? "'".htmlentities($origination_rate[$accountid]['DESTINATION'], ENT_COMPAT, 'UTF-8')."'" : "'".''."'").",".(($origination_rate[$accountid]['COST']) ? "'".$origination_rate[$accountid]['COST']."'" : "'".'0'."'").",'".$parentid."',".(($origination_rate[$parentid]['CODE']) ? "'".$origination_rate[$parentid]['CODE']."'" : "'".'0'."'").",".(($origination_rate[$parentid]['DESTINATION']) ? "'".$origination_rate[$parentid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$parentid]['COST']) ? "'".$origination_rate[$parentid]['COST']."'" : '0').",".(($termination_rate['CODE']) ? "'".$termination_rate['CODE']."'" : "'".''."'").",".(($termination_rate['DESTINATION']) ? "'".$termination_rate['DESTINATION']."'" : "'".''."'").",".(($termination_rate['COST']) ? "'".$termination_rate['COST']."'" : '0').",'".$provider_cost."',".(($dataVariable['call_direction']) ? "'".$dataVariable['call_direction']."'" : "'internal'").",'".($dataVariable['calltype'])."','".convert_to_gmt(urldecode($dataVariable['profile_start_stamp']))."','".convert_to_gmt(urldecode($dataVariable['answer_stamp']))."','".convert_to_gmt(urldecode($dataVariable['bridge_stamp']))."','".convert_to_gmt(urldecode(@$dataVariable['progress_stamp']))."','".convert_to_gmt(urldecode(@$dataVariable['progress_media_stamp']))."','".convert_to_gmt(urldecode($dataVariable['end_stamp']))."',".$dataVariable['billmsec'].",'".$dataVariable['answermsec']."','".$dataVariable['waitmsec']."','".$dataVariable['progress_mediamsec']."','".$dataVariable['flow_billmsec']."'";
 }
 
 //Generate CDR string for insert query for reseller
-function get_reseller_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost)
+function get_reseller_cdr_string($dataVariable, $accountid, $account_type, $actual_duration, $termination_rate, $origination_rate, $provider_cost, $parentid, $debit, $cost)
 {
-        $dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER')?"DID":$dataVariable['calltype'];
-	$callerIdNumber = isset($dataVariable['effective_caller_id_number']) && !empty($dataVariable['effective_caller_id_number'])? $dataVariable['effective_caller_id_number'] :$dataVariable['caller_id'];
+        $dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER') ? "DID" : $dataVariable['calltype'];
+	$callerIdNumber = isset($dataVariable['effective_caller_id_number']) && ! empty($dataVariable['effective_caller_id_number']) ? $dataVariable['effective_caller_id_number'] : $dataVariable['caller_id'];
 	
-	return $cdr_string = "'".($dataVariable['uuid'])."','".$accountid."','".(urldecode($callerIdNumber))."','".($dataVariable['effective_destination_number'])."','".$actual_duration."','".($dataVariable['hangup_cause'])."','".convert_to_gmt(urldecode($dataVariable['callstart']))."','".$debit."','".$cost."','".$origination_rate[$accountid]['RATEGROUP']."','".$dataVariable['package_id']."','".($origination_rate[$accountid]['CODE'])."',".(($origination_rate[$accountid]['DESTINATION']) ? "'".$origination_rate[$accountid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$accountid]['COST']) ? "'".$origination_rate[$accountid]['COST']."'" : "'".'0'."'").",'".$parentid."',".(($origination_rate[$parentid]['CODE'] ) ? "'".$origination_rate[$parentid]['CODE']."'" : "'".'0'."'").",".(($origination_rate[$parentid]['DESTINATION']) ?  "'".$origination_rate[$parentid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$parentid]['COST']) ?  "'".$origination_rate[$parentid]['COST']."'" :  '0').",".(($dataVariable['call_direction']) ? "'".$dataVariable['call_direction']."'" : "'internal'").",'".($dataVariable['calltype'])."'";
+	return $cdr_string = "'".($dataVariable['uuid'])."','".$accountid."','".(urldecode($callerIdNumber))."','".($dataVariable['effective_destination_number'])."','".$actual_duration."','".($dataVariable['hangup_cause'])."','".convert_to_gmt(urldecode($dataVariable['callstart']))."','".$debit."','".$cost."','".$origination_rate[$accountid]['RATEGROUP']."','".$dataVariable['package_id']."','".($origination_rate[$accountid]['CODE'])."',".(($origination_rate[$accountid]['DESTINATION']) ? "'".$origination_rate[$accountid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$accountid]['COST']) ? "'".$origination_rate[$accountid]['COST']."'" : "'".'0'."'").",'".$parentid."',".(($origination_rate[$parentid]['CODE']) ? "'".$origination_rate[$parentid]['CODE']."'" : "'".'0'."'").",".(($origination_rate[$parentid]['DESTINATION']) ? "'".$origination_rate[$parentid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$parentid]['COST']) ? "'".$origination_rate[$parentid]['COST']."'" : '0').",".(($dataVariable['call_direction']) ? "'".$dataVariable['call_direction']."'" : "'internal'").",'".($dataVariable['calltype'])."'";
 }
 
 //Update user balance
@@ -328,8 +328,8 @@ 
  */
 function update_balance($user_id, $amount, $entity_id, $logger, $db) {
     $math_sign = ($entity_id == 0 || $entity_id == 1) ? '-' : '+';
-    $query = "UPDATE accounts SET balance=balance-" . $amount . " WHERE id=" . $user_id;
-    $logger->log("Balance update : " . $query);
+    $query = "UPDATE accounts SET balance=balance-".$amount." WHERE id=".$user_id;
+    $logger->log("Balance update : ".$query);
     $db->run($query);
 }
 
@@ -388,46 +388,46 @@ 
     
 			if ($billseconds > 0)
 			{
-				$call_cost += (ceil($billseconds/$rates['INC'])*$rates['INC'])*($rates['COST']/60);
+				$call_cost += (ceil($billseconds / $rates['INC']) * $rates['INC']) * ($rates['COST'] / 60);
 			}
 	}
-	$call_cost = number_format($call_cost,$decimal_points);
+	$call_cost = number_format($call_cost, $decimal_points);
 	$logger->log("Return cost ".$call_cost);
 	return $call_cost;
 }
 
 // get intial package information
-function package_calculation($destination_number,$pricelist_id,$duration,$call_direction,$accountid,$db,$logger)
+function package_calculation($destination_number, $pricelist_id, $duration, $call_direction, $accountid, $db, $logger)
 {
 	$package_array = array();
-	$custom_destination = number_loop($destination_number,"patterns",$db);
+	$custom_destination = number_loop($destination_number, "patterns", $db);
 
 	$query = "SELECT * FROM packages  as P inner join package_patterns as PKGPTR on P.id = PKGPTR.package_id WHERE ".$custom_destination." AND status = 0 AND pricelist_id = ".$pricelist_id." ORDER BY LENGTH(PKGPTR.patterns) DESC LIMIT 1";
 
 	$package_info = $db->run($query);
-	if($package_info){
+	if ($package_info) {
 		$package_info = $package_info[0];
 
-		if( ($package_info['applicable_for'] == "0" && $call_direction == "outbound") || ($package_info['applicable_for'] == "1" && $call_direction == "inbound") || ($package_info['applicable_for'] == "2") ) {
+		if (($package_info['applicable_for'] == "0" && $call_direction == "outbound") || ($package_info['applicable_for'] == "1" && $call_direction == "inbound") || ($package_info['applicable_for'] == "2")) {
 	
-			$counter_info =  get_counters($accountid,$package_info['package_id'],$db,$logger);
+			$counter_info = get_counters($accountid, $package_info['package_id'], $db, $logger);
 
-			if(!$counter_info) {
+			if ( ! $counter_info) {
 				$Insert_Query = "INSERT INTO counters (package_id,accountid) VALUES (".$package_info['package_id'].",".$accountid.")";		
-				$logger->log("Insert Counters  : " . $Insert_query);
+				$logger->log("Insert Counters  : ".$Insert_query);
 				$db->run($Insert_Query);
-				$counter_info =  get_counters($accountid,$package_info['package_id'],$db,$logger);
+				$counter_info = get_counters($accountid, $package_info['package_id'], $db, $logger);
 				
 			}	
 			//print_r($counter_info);
-			if ( $package_info['includedseconds'] > ($counter_info['seconds'] )) {
+			if ($package_info['includedseconds'] > ($counter_info['seconds'])) {
 				$availableseconds = $package_info['includedseconds'] - $counter_info['seconds'];
 				$freeseconds = ($availableseconds >= $duration) ? $duration : $availableseconds;
 				$duration = ($availableseconds >= $duration) ? $duration : $availableseconds;
-				$update_query = "UPDATE counters SET seconds = ".($counter_info['seconds'] + $freeseconds ). " WHERE id = ". $counter_info['id'];
-				$logger->log("Update Counters  : " . $update_query);
+				$update_query = "UPDATE counters SET seconds = ".($counter_info['seconds'] + $freeseconds)." WHERE id = ".$counter_info['id'];
+				$logger->log("Update Counters  : ".$update_query);
 				$db->run($update_query);
-				$package_array['package_id']= $package_info['package_id'];
+				$package_array['package_id'] = $package_info['package_id'];
 				$package_array['calltype'] = "FREE";
 			}						
 		} 
@@ -436,21 +436,21 @@ 
 } 
 
 // Getting used package minutes in counter table
-function get_counters($accountid,$package_id,$db,$logger)
+function get_counters($accountid, $package_id, $db, $logger)
 {
 	$query_counter = "SELECT id,seconds FROM counters  WHERE  accountid = ".$accountid." AND package_id = ".$package_id." AND status=1 LIMIT 1";
 	$counter = $db->run($query_counter);
-	$logger->log("GET Counters  : " . $query_counter);
-	if($counter)
+	$logger->log("GET Counters  : ".$query_counter);
+	if ($counter)
 		return $counter[0];	
 	else
 		return "";
 }
 
 //Get user info
-function get_accounts($parent_id,$logger, $db) {
-	$query = "SELECT * FROM accounts WHERE id=" . $parent_id;
-	$logger->log("GET configuration  : " . $query);
+function get_accounts($parent_id, $logger, $db) {
+	$query = "SELECT * FROM accounts WHERE id=".$parent_id;
+	$logger->log("GET configuration  : ".$query);
 	$res_user = $db->run($query);
 	return $res_user[0];
 }
@@ -460,7 +460,7 @@ 
 {
 	$query = "SELECT name,value FROM system WHERE name='decimal_points' and group_title = 'global'";
 	$config = $db->run($query);
-	$logger->log("GET configuration  : " . $query);
+	$logger->log("GET configuration  : ".$query);
 	return $config[0];
 }
 
@@ -468,16 +468,16 @@ 
 /**
  * @param string $field
  */
-function number_loop($destination,$field,$db)
+function number_loop($destination, $field, $db)
 {
-	$max_len_prefix  = strlen($destination);
+	$max_len_prefix = strlen($destination);
 	$number_prefix = '(';
-	while ($max_len_prefix  > 0)
+	while ($max_len_prefix > 0)
 	{
-		$number_prefix .= "$field='^".substr($destination,0,$max_len_prefix).".*' OR ";
+		$number_prefix .= "$field='^".substr($destination, 0, $max_len_prefix).".*' OR ";
 		$max_len_prefix--;
 	}
-	$number_prefix .= "$field='^defaultprefix.*')";//echo $number_prefix;exit;
+	$number_prefix .= "$field='^defaultprefix.*')"; //echo $number_prefix;exit;
 	return $number_prefix;
 }
 
@@ -487,6 +487,6 @@ 
  */
 function convert_to_gmt($date)
 {
-	return gmdate('Y-m-d H:i:s', strtotime($date) );
+	return gmdate('Y-m-d H:i:s', strtotime($date));
 }
 ?>

web_interface/astpp/application/controllers/generateInvoice.php

Doc Comments +4 added lines

@@ -115,6 +115,10 @@
         $this->process_invoice($account_value, $start_date, $end_date);
     }
 
+    /**
+     * @param string $start_date
+     * @param string $end_date
+     */
     function process_invoice($accountdata, $start_date, $end_date) {
         //Get Invoice configuration using single query instead of multiple queries.
         $invoice_conf = array();

Indentation +234 added lines, -234 removed lines

@@ -24,264 +24,264 @@
 
 class GenerateInvoice extends MX_Controller {
 
-    public static $global_config;
+	public static $global_config;
 
-    function __construct() {
-        parent::__construct();
-        $this->load->model("db_model");
-        $this->load->library("astpp/common");
-        $this->load->library('html2pdf');
-        ini_set("memory_limit", "2048M");
-        ini_set("max_execution_time", "259200");
-        $this->get_system_config();
-    }
+	function __construct() {
+		parent::__construct();
+		$this->load->model("db_model");
+		$this->load->library("astpp/common");
+		$this->load->library('html2pdf');
+		ini_set("memory_limit", "2048M");
+		ini_set("max_execution_time", "259200");
+		$this->get_system_config();
+	}
 
-    function get_system_config() {
-        $query = $this->db->get("system");
-        $config = array();
-        $result = $query->result_array();
-        foreach ($result as $row) {
-            $config[$row['name']] = $row['value'];
-        }
-        self::$global_config['system_config'] = $config;
-    }
+	function get_system_config() {
+		$query = $this->db->get("system");
+		$config = array();
+		$result = $query->result_array();
+		foreach ($result as $row) {
+			$config[$row['name']] = $row['value'];
+		}
+		self::$global_config['system_config'] = $config;
+	}
 
-    function getInvoiceData() {
-        $where = array("posttoexternal" => 1, "deleted" => "0", "status" => "0");
-        $query = $this->db_model->getSelect("*", "accounts", $where);
-        if ($query->num_rows > 0) {
-            $account_data = $query->result_array();
-            foreach ($account_data as $data_key => $account_value) {
-                $end_date = gmdate("Y-m-d")." 23:59:59";
-                $account_value['sweep_id'] = (int)$account_value['sweep_id'];
-                switch ($account_value['sweep_id']) {
-                    case 0:
-                        $start_date = $this->validate_invoice_date($account_value);
-                        if (strtotime($start_date) >= strtotime(gmdate("Y-m-d H:i:s"))) {
-                            $start_date = gmdate("Y-m-d H:i:s");
-                        }
-                        $end_date = gmdate("Y-m-d 23:59:59", strtotime($start_date." + 1 days"));
-                        $this->Generate_Daily_invoice($account_value, $start_date, $end_date);
-                        break;
-                    case 2:
-                        if (date("d") == $account_value['invoice_day']) {
-                            $start_date = $this->validate_invoice_date($account_value);
-                            if (strtotime($start_date) >= strtotime(gmdate("Y-m-d H:i:s"))) {
-                                $start_date = gmdate("Y-m-d H:i:s");
-                            }
-                            $end_date = gmdate("Y-m-d 23:59:59", strtotime($start_date." + 1 month"));
-                            $this->Generate_Monthly_invoice($account_value, $start_date, $end_date);
-                        }
-                        break;
-                }
-            }
-            $screen_path = getcwd()."/cron";
-            $screen_filename = "Email_Broadcast_".strtotime('now');
-            $command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php BroadcastEmail";
-            exec($command);
-        }
-    }
+	function getInvoiceData() {
+		$where = array("posttoexternal" => 1, "deleted" => "0", "status" => "0");
+		$query = $this->db_model->getSelect("*", "accounts", $where);
+		if ($query->num_rows > 0) {
+			$account_data = $query->result_array();
+			foreach ($account_data as $data_key => $account_value) {
+				$end_date = gmdate("Y-m-d")." 23:59:59";
+				$account_value['sweep_id'] = (int)$account_value['sweep_id'];
+				switch ($account_value['sweep_id']) {
+					case 0:
+						$start_date = $this->validate_invoice_date($account_value);
+						if (strtotime($start_date) >= strtotime(gmdate("Y-m-d H:i:s"))) {
+							$start_date = gmdate("Y-m-d H:i:s");
+						}
+						$end_date = gmdate("Y-m-d 23:59:59", strtotime($start_date." + 1 days"));
+						$this->Generate_Daily_invoice($account_value, $start_date, $end_date);
+						break;
+					case 2:
+						if (date("d") == $account_value['invoice_day']) {
+							$start_date = $this->validate_invoice_date($account_value);
+							if (strtotime($start_date) >= strtotime(gmdate("Y-m-d H:i:s"))) {
+								$start_date = gmdate("Y-m-d H:i:s");
+							}
+							$end_date = gmdate("Y-m-d 23:59:59", strtotime($start_date." + 1 month"));
+							$this->Generate_Monthly_invoice($account_value, $start_date, $end_date);
+						}
+						break;
+				}
+			}
+			$screen_path = getcwd()."/cron";
+			$screen_filename = "Email_Broadcast_".strtotime('now');
+			$command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php BroadcastEmail";
+			exec($command);
+		}
+	}
 
-    function validate_invoice_date($account_value) {
-        $last_invoice_date = $this->common->get_invoice_date("to_date", $account_value["id"], $account_value['reseller_id'], "to_date");
-        $last_invoice_date = ($last_invoice_date) ? $last_invoice_date : $account_value['creation'];
-        $last_invoice_date = gmdate("Y-m-d H:i:s", strtotime("+1 Second", strtotime($last_invoice_date)));
-        return $last_invoice_date;
-    }
+	function validate_invoice_date($account_value) {
+		$last_invoice_date = $this->common->get_invoice_date("to_date", $account_value["id"], $account_value['reseller_id'], "to_date");
+		$last_invoice_date = ($last_invoice_date) ? $last_invoice_date : $account_value['creation'];
+		$last_invoice_date = gmdate("Y-m-d H:i:s", strtotime("+1 Second", strtotime($last_invoice_date)));
+		return $last_invoice_date;
+	}
 
-    /**
-     * @param string $start_date
-     * @param string $end_date
-     */
-    function Generate_Daily_invoice($account_value, $start_date, $end_date) {
-        //  echo "INVOICE SCRIPT-------start date :".$start_date."-------end date....".$end_date;
+	/**
+	 * @param string $start_date
+	 * @param string $end_date
+	 */
+	function Generate_Daily_invoice($account_value, $start_date, $end_date) {
+		//  echo "INVOICE SCRIPT-------start date :".$start_date."-------end date....".$end_date;
 
-        require_once('updateBalance.php');
-        $updateBalance = new updateBalance();
-        $updateBalance->process_subscriptions($account_value, $start_date, $end_date, TRUE);
-        $updateBalance->process_DID_charges($account_value, $start_date, $end_date, TRUE);
-        $this->process_invoice($account_value, $start_date, $end_date);
-    }
+		require_once('updateBalance.php');
+		$updateBalance = new updateBalance();
+		$updateBalance->process_subscriptions($account_value, $start_date, $end_date, TRUE);
+		$updateBalance->process_DID_charges($account_value, $start_date, $end_date, TRUE);
+		$this->process_invoice($account_value, $start_date, $end_date);
+	}
 
-    /**
-     * @param string $start_date
-     * @param string $end_date
-     */
-    function Generate_Monthly_invoice($account_value, $start_date, $end_date) {
-        require_once('updateBalance.php');
-        $updateBalance = new updateBalance();
-        $updateBalance->process_subscriptions($account_value, $start_date, $end_date, TRUE);
-        $updateBalance->process_DID_charges($account_value, $start_date, $end_date, TRUE); 
-        $this->process_invoice($account_value, $start_date, $end_date);
-    }
+	/**
+	 * @param string $start_date
+	 * @param string $end_date
+	 */
+	function Generate_Monthly_invoice($account_value, $start_date, $end_date) {
+		require_once('updateBalance.php');
+		$updateBalance = new updateBalance();
+		$updateBalance->process_subscriptions($account_value, $start_date, $end_date, TRUE);
+		$updateBalance->process_DID_charges($account_value, $start_date, $end_date, TRUE); 
+		$this->process_invoice($account_value, $start_date, $end_date);
+	}
 
-    function process_invoice($accountdata, $start_date, $end_date) {
-        //Get Invoice configuration using single query instead of multiple queries.
-        $invoice_conf = array();
-        $reseller_id = ($accountdata['reseller_id'] == 0) ? 1 : $accountdata['reseller_id'];
-        $where = "accountid IN ('".$reseller_id."','1')";
-        $this->db->select('*');
-        $this->db->where($where);
-        $this->db->order_by('accountid', 'desc');
-        $this->db->limit(1);
-        $invoice_conf = $this->db->get('invoice_conf');
-        $invoice_conf = (array)$invoice_conf->first_row();
-        /*******************************************************/
-        $last_invoice_ID = $this->common->get_invoice_date("invoiceid", "", $accountdata['reseller_id']);
-        if ($last_invoice_ID && $last_invoice_ID > 0) {
-            $last_invoice_ID = ($last_invoice_ID + 1);
-        } else {
-            $last_invoice_ID = $invoice_conf['invoice_start_from'];
-        }
-        $last_invoice_ID = str_pad($last_invoice_ID, (strlen($last_invoice_ID) + 4), '0', STR_PAD_LEFT);
-        $invoice_sub_total = $this->count_invoice_data($accountdata, $start_date, $end_date);
-        if ($invoice_sub_total > 0) {
-            $invoiceid = $this->create_invoice($accountdata, $start_date, $end_date, $last_invoice_ID, $invoice_conf['invoice_prefix'], $invoice_conf);
-            $this->update_cdrs_data($accountdata['id'], $invoiceid, $start_date, $end_date);
-            $sort_order = $this->common_model->apply_invoice_taxes($invoiceid, $accountdata, $start_date);
-            $invoice_total = $this->set_invoice_total($invoiceid, $accountdata['id']);
-            $this->download_invoice($invoiceid, $accountdata, $invoice_conf);
-        } else {
-            $invoiceid = $this->create_invoice($accountdata, $start_date, $end_date, $last_invoice_ID, $invoice_conf['invoice_prefix'], $invoice_conf);
-            $sort_order = $this->common_model->apply_invoice_taxes($invoiceid, $accountdata, $start_date);
-            $invoice_total = $this->set_invoice_total($invoiceid, $accountdata['id']);
-        }
-    }
+	function process_invoice($accountdata, $start_date, $end_date) {
+		//Get Invoice configuration using single query instead of multiple queries.
+		$invoice_conf = array();
+		$reseller_id = ($accountdata['reseller_id'] == 0) ? 1 : $accountdata['reseller_id'];
+		$where = "accountid IN ('".$reseller_id."','1')";
+		$this->db->select('*');
+		$this->db->where($where);
+		$this->db->order_by('accountid', 'desc');
+		$this->db->limit(1);
+		$invoice_conf = $this->db->get('invoice_conf');
+		$invoice_conf = (array)$invoice_conf->first_row();
+		/*******************************************************/
+		$last_invoice_ID = $this->common->get_invoice_date("invoiceid", "", $accountdata['reseller_id']);
+		if ($last_invoice_ID && $last_invoice_ID > 0) {
+			$last_invoice_ID = ($last_invoice_ID + 1);
+		} else {
+			$last_invoice_ID = $invoice_conf['invoice_start_from'];
+		}
+		$last_invoice_ID = str_pad($last_invoice_ID, (strlen($last_invoice_ID) + 4), '0', STR_PAD_LEFT);
+		$invoice_sub_total = $this->count_invoice_data($accountdata, $start_date, $end_date);
+		if ($invoice_sub_total > 0) {
+			$invoiceid = $this->create_invoice($accountdata, $start_date, $end_date, $last_invoice_ID, $invoice_conf['invoice_prefix'], $invoice_conf);
+			$this->update_cdrs_data($accountdata['id'], $invoiceid, $start_date, $end_date);
+			$sort_order = $this->common_model->apply_invoice_taxes($invoiceid, $accountdata, $start_date);
+			$invoice_total = $this->set_invoice_total($invoiceid, $accountdata['id']);
+			$this->download_invoice($invoiceid, $accountdata, $invoice_conf);
+		} else {
+			$invoiceid = $this->create_invoice($accountdata, $start_date, $end_date, $last_invoice_ID, $invoice_conf['invoice_prefix'], $invoice_conf);
+			$sort_order = $this->common_model->apply_invoice_taxes($invoiceid, $accountdata, $start_date);
+			$invoice_total = $this->set_invoice_total($invoiceid, $accountdata['id']);
+		}
+	}
 
-    function count_invoice_data($account, $start_date = "", $end_date = "") {
-        $cdr_query = "";
-        $inv_data_query = "";
-        $cdr_query = "select calltype,sum(debit) as debit from cdrs where accountid = ".$account['id'];
-        $cdr_query .= " AND callstart >='".$start_date."' AND callstart <= '".$end_date."' AND invoiceid=0 group by calltype";
+	function count_invoice_data($account, $start_date = "", $end_date = "") {
+		$cdr_query = "";
+		$inv_data_query = "";
+		$cdr_query = "select calltype,sum(debit) as debit from cdrs where accountid = ".$account['id'];
+		$cdr_query .= " AND callstart >='".$start_date."' AND callstart <= '".$end_date."' AND invoiceid=0 group by calltype";
 //echo $cdr_query; 
-        $cdr_data = $this->db->query($cdr_query);
-        if ($cdr_data->num_rows > 0) {
-            $cdr_data = $cdr_data->result_array();
-            //echo '<pre>'; print_r($cdr_data); exit;
-            foreach ($cdr_data as $cdrvalue) {
-                $cdrvalue['debit'] = round($cdrvalue['debit'], self::$global_config['system_config']['decimalpoints']);
-                $tempArr = array("accountid" => $account['id'], "reseller_id" => $account['reseller_id'], "item_id" => "0",
-                    "description" => $cdrvalue['calltype']." CALLS for the period (".$start_date." to ".$end_date, "debit" => $cdrvalue['debit'], "item_type" => $cdrvalue['calltype'], "created_date" => $end_date);
-                $this->db->insert("invoice_details", $tempArr);
-            }
-        }
-        $inv_data_query = "select count(id) as count,sum(debit) as debit,sum(credit) as credit from invoice_details where accountid=".$account['id']." AND created_date >='".$start_date."' AND created_date <= '".$end_date."'  AND invoiceid=0 AND item_type != 'FREECALL'";
+		$cdr_data = $this->db->query($cdr_query);
+		if ($cdr_data->num_rows > 0) {
+			$cdr_data = $cdr_data->result_array();
+			//echo '<pre>'; print_r($cdr_data); exit;
+			foreach ($cdr_data as $cdrvalue) {
+				$cdrvalue['debit'] = round($cdrvalue['debit'], self::$global_config['system_config']['decimalpoints']);
+				$tempArr = array("accountid" => $account['id'], "reseller_id" => $account['reseller_id'], "item_id" => "0",
+					"description" => $cdrvalue['calltype']." CALLS for the period (".$start_date." to ".$end_date, "debit" => $cdrvalue['debit'], "item_type" => $cdrvalue['calltype'], "created_date" => $end_date);
+				$this->db->insert("invoice_details", $tempArr);
+			}
+		}
+		$inv_data_query = "select count(id) as count,sum(debit) as debit,sum(credit) as credit from invoice_details where accountid=".$account['id']." AND created_date >='".$start_date."' AND created_date <= '".$end_date."'  AND invoiceid=0 AND item_type != 'FREECALL'";
 //echo $inv_data_query;         
-        $invoice_data = $this->db->query($inv_data_query);
-        if ($invoice_data->num_rows > 0) {
-            $invoice_data = $invoice_data->result_array();
-            foreach ($invoice_data as $data_value) {
-                if ($data_value['count'] > 0) {
-                    $sub_total = ($data_value['debit'] - $data_value['credit']);
-                    $sub_total = round($sub_total, self::$global_config['system_config']['decimalpoints']);
-                    return $sub_total;
-                }
-            }
-        }
-        return "0";
-    }
+		$invoice_data = $this->db->query($inv_data_query);
+		if ($invoice_data->num_rows > 0) {
+			$invoice_data = $invoice_data->result_array();
+			foreach ($invoice_data as $data_value) {
+				if ($data_value['count'] > 0) {
+					$sub_total = ($data_value['debit'] - $data_value['credit']);
+					$sub_total = round($sub_total, self::$global_config['system_config']['decimalpoints']);
+					return $sub_total;
+				}
+			}
+		}
+		return "0";
+	}
 
-    //Change Order of arguements
-    function update_cdrs_data($accountid, $invoiceid, $start_date = "", $end_date = "") {
-        $inv_data_query = "update invoice_details SET invoiceid = '".$invoiceid."' where accountid=".$accountid;
-        $inv_data_query .= " AND created_date >='".$start_date."' AND created_date <= '".$end_date."'  AND invoiceid=0 AND item_type !='PAYMENT'";
-        $this->db->query($inv_data_query);
-        return true;
-    }
+	//Change Order of arguements
+	function update_cdrs_data($accountid, $invoiceid, $start_date = "", $end_date = "") {
+		$inv_data_query = "update invoice_details SET invoiceid = '".$invoiceid."' where accountid=".$accountid;
+		$inv_data_query .= " AND created_date >='".$start_date."' AND created_date <= '".$end_date."'  AND invoiceid=0 AND item_type !='PAYMENT'";
+		$this->db->query($inv_data_query);
+		return true;
+	}
 
-    /**
-     * @param string $last_invoice_ID
-     */
-    function create_invoice($account, $from_date, $to_date, $last_invoice_ID, $INVprefix, $invoiceconf) {
-        //$due_date = gmdate("Y-m-d H:i:s",strtotime($to_date." +".$invoiceconf['interval']." days"));
-        if ($invoiceconf['interval'] > 0) {
-            $due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));
-        } else {
-            $due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +7 days"));
-        }
-        // echo "due daye-------".$due_date.'----------'.$to_date.'------------> Invoice interval'.$invoiceconf['interval']; 
-        $balance = ($account['credit_limit'] - $account['balance']);
-        $automatic_flag = self::$global_config['system_config']['automatic_invoice'];
+	/**
+	 * @param string $last_invoice_ID
+	 */
+	function create_invoice($account, $from_date, $to_date, $last_invoice_ID, $INVprefix, $invoiceconf) {
+		//$due_date = gmdate("Y-m-d H:i:s",strtotime($to_date." +".$invoiceconf['interval']." days"));
+		if ($invoiceconf['interval'] > 0) {
+			$due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));
+		} else {
+			$due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +7 days"));
+		}
+		// echo "due daye-------".$due_date.'----------'.$to_date.'------------> Invoice interval'.$invoiceconf['interval']; 
+		$balance = ($account['credit_limit'] - $account['balance']);
+		$automatic_flag = self::$global_config['system_config']['automatic_invoice'];
 	if ($automatic_flag == 1) {
-	        $invoice_data = array("accountid" => $account['id'], "invoice_prefix" => $INVprefix, "invoiceid" => $last_invoice_ID, "reseller_id" =>
-            $account['reseller_id'], "invoice_date" => gmdate("Y-m-d H:i:s"), "from_date" => $from_date, "to_date" => $to_date, "due_date" => $due_date, "status" => 1, "amount" => "0.00", "balance" => $balance);
+			$invoice_data = array("accountid" => $account['id'], "invoice_prefix" => $INVprefix, "invoiceid" => $last_invoice_ID, "reseller_id" =>
+			$account['reseller_id'], "invoice_date" => gmdate("Y-m-d H:i:s"), "from_date" => $from_date, "to_date" => $to_date, "due_date" => $due_date, "status" => 1, "amount" => "0.00", "balance" => $balance);
 	} else {
-	        $invoice_data = array("accountid" => $account['id'], "invoice_prefix" => $INVprefix, "invoiceid" => $last_invoice_ID, "reseller_id" =>
-            $account['reseller_id'], "invoice_date" => gmdate("Y-m-d H:i:s"), "from_date" => $from_date, "to_date" => $to_date, "due_date" => $due_date, "status" => 1, "amount" => "0.00", "balance" => $balance, "confirm" => 1);
+			$invoice_data = array("accountid" => $account['id'], "invoice_prefix" => $INVprefix, "invoiceid" => $last_invoice_ID, "reseller_id" =>
+			$account['reseller_id'], "invoice_date" => gmdate("Y-m-d H:i:s"), "from_date" => $from_date, "to_date" => $to_date, "due_date" => $due_date, "status" => 1, "amount" => "0.00", "balance" => $balance, "confirm" => 1);
 	}
-        // echo "<pre>"; print_r($invoice_data); exit;
-        $this->db->insert("invoices", $invoice_data);
-        $invoiceid = $this->db->insert_id();
+		// echo "<pre>"; print_r($invoice_data); exit;
+		$this->db->insert("invoices", $invoice_data);
+		$invoiceid = $this->db->insert_id();
 	if ($automatic_flag == 0) {
-            $this->download_invoice($invoiceid, $account, $invoiceconf);
+			$this->download_invoice($invoiceid, $account, $invoiceconf);
+	}
+		return $invoiceid;
 	}
-        return $invoiceid;
-    }
 
-    function set_invoice_total($invoiceid, $accountid) {
-        $query = $this->db_model->getSelect("SUM(debit) as total", "invoice_details", array("invoiceid" => $invoiceid, "item_type <>" => "FREECALL"));
-        $query = $query->result_array();
-        $sub_total = $query["0"]["total"];
-        $updateArr = array("amount" => $sub_total);
-        $this->db->where(array("id" => $invoiceid));
-        $this->db->update("invoices", $updateArr);
+	function set_invoice_total($invoiceid, $accountid) {
+		$query = $this->db_model->getSelect("SUM(debit) as total", "invoice_details", array("invoiceid" => $invoiceid, "item_type <>" => "FREECALL"));
+		$query = $query->result_array();
+		$sub_total = $query["0"]["total"];
+		$updateArr = array("amount" => $sub_total);
+		$this->db->where(array("id" => $invoiceid));
+		$this->db->update("invoices", $updateArr);
 
-        $updateArr = array("balance" => "0.00");
-        $this->db->where(array("id" => $accountid));
-        $this->db->update("accounts", $updateArr);
+		$updateArr = array("balance" => "0.00");
+		$this->db->where(array("id" => $accountid));
+		$this->db->update("accounts", $updateArr);
 
-        return true;
-    }
+		return true;
+	}
 
-    function download_invoice($invoiceid, $accountdata, $invoice_conf) {
-        $invoicedata = $this->db_model->getSelect("*", "invoices", array("id" => $invoiceid));
-        $invoicedata = $invoicedata->result_array();
-        $invoicedata = $invoicedata[0];
-        $FilePath = FCPATH."invoices/".$accountdata["id"].'/'.$invoicedata['invoice_prefix']."".$invoicedata['invoiceid']."_invoice.pdf";
-        $Filenm = $invoicedata['invoice_prefix']."_".$invoicedata['invoiceid']."_invoice.pdf";
-        $this->common->get_invoice_template($invoicedata, $accountdata, false);
-        if ($invoice_conf['invoice_notification']) {
-            $this->send_email_notification($FilePath, $Filenm, $accountdata, $invoice_conf, $invoicedata);
-        }
-    }
+	function download_invoice($invoiceid, $accountdata, $invoice_conf) {
+		$invoicedata = $this->db_model->getSelect("*", "invoices", array("id" => $invoiceid));
+		$invoicedata = $invoicedata->result_array();
+		$invoicedata = $invoicedata[0];
+		$FilePath = FCPATH."invoices/".$accountdata["id"].'/'.$invoicedata['invoice_prefix']."".$invoicedata['invoiceid']."_invoice.pdf";
+		$Filenm = $invoicedata['invoice_prefix']."_".$invoicedata['invoiceid']."_invoice.pdf";
+		$this->common->get_invoice_template($invoicedata, $accountdata, false);
+		if ($invoice_conf['invoice_notification']) {
+			$this->send_email_notification($FilePath, $Filenm, $accountdata, $invoice_conf, $invoicedata);
+		}
+	}
 
-    /**
-     * @param string $FilePath
-     * @param string $Filenm
-     */
-    function send_email_notification($FilePath, $Filenm, $AccountData, $invoice_conf, $invData) {
-        $TemplateData = array();
-        $where = array('name' => 'email_new_invoice');
-        $EmailTemplate = $this->db_model->getSelect("*", "default_templates", $where);
-        foreach ($EmailTemplate->result_array() as $TemplateVal) {
-            $TemplateData = $TemplateVal;
-            $TemplateData['subject'] = str_replace('#NAME#', $AccountData['first_name']." ".$AccountData['last_name'], $TemplateData['subject']);
-            $TemplateData['subject'] = str_replace('#INVOICE_NUMBER#', $invData['invoice_prefix'].$invData['invoiceid'], $TemplateData['subject']);
-            $TemplateData['template'] = str_replace('#NAME#', $AccountData['first_name']." ".$AccountData['last_name'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#INVOICE_NUMBER#', $invData['invoice_prefix'].$invData['invoiceid'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#AMOUNT#', $invData['amount'], $TemplateData['template']);
+	/**
+	 * @param string $FilePath
+	 * @param string $Filenm
+	 */
+	function send_email_notification($FilePath, $Filenm, $AccountData, $invoice_conf, $invData) {
+		$TemplateData = array();
+		$where = array('name' => 'email_new_invoice');
+		$EmailTemplate = $this->db_model->getSelect("*", "default_templates", $where);
+		foreach ($EmailTemplate->result_array() as $TemplateVal) {
+			$TemplateData = $TemplateVal;
+			$TemplateData['subject'] = str_replace('#NAME#', $AccountData['first_name']." ".$AccountData['last_name'], $TemplateData['subject']);
+			$TemplateData['subject'] = str_replace('#INVOICE_NUMBER#', $invData['invoice_prefix'].$invData['invoiceid'], $TemplateData['subject']);
+			$TemplateData['template'] = str_replace('#NAME#', $AccountData['first_name']." ".$AccountData['last_name'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#INVOICE_NUMBER#', $invData['invoice_prefix'].$invData['invoiceid'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#AMOUNT#', $invData['amount'], $TemplateData['template']);
 
-            $TemplateData['template'] = str_replace("#COMPANY_EMAIL#", $invoice_conf['emailaddress'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace("#COMPANY_NAME#", $invoice_conf['company_name'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace("#COMPANY_WEBSITE#", $invoice_conf['website'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace("#INVOICE_DATE#", $invData['invoice_date'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace("#DUE_DATE#", $invData['due_date'], $TemplateData['template']);
-        }
-        $dir_path = getcwd()."/attachments/";
-        $path = $dir_path.$Filenm;
-        $command = "cp ".$FilePath." ".$path;
-        exec($command);
-        $email_array = array('accountid' => $AccountData['id'],
-            'subject' => $TemplateData['subject'],
-            'body' => $TemplateData['template'],
-            'from' => $invoice_conf['emailaddress'],
-            'to' => $AccountData['email'],
-            'status' => "1",
-            'attachment' => $Filenm,
-            'template' => '');
-        //echo "<pre>"; print_r($TemplateData); exit;
-        $this->db->insert("mail_details", $email_array);
-    }
+			$TemplateData['template'] = str_replace("#COMPANY_EMAIL#", $invoice_conf['emailaddress'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace("#COMPANY_NAME#", $invoice_conf['company_name'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace("#COMPANY_WEBSITE#", $invoice_conf['website'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace("#INVOICE_DATE#", $invData['invoice_date'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace("#DUE_DATE#", $invData['due_date'], $TemplateData['template']);
+		}
+		$dir_path = getcwd()."/attachments/";
+		$path = $dir_path.$Filenm;
+		$command = "cp ".$FilePath." ".$path;
+		exec($command);
+		$email_array = array('accountid' => $AccountData['id'],
+			'subject' => $TemplateData['subject'],
+			'body' => $TemplateData['template'],
+			'from' => $invoice_conf['emailaddress'],
+			'to' => $AccountData['email'],
+			'status' => "1",
+			'attachment' => $Filenm,
+			'template' => '');
+		//echo "<pre>"; print_r($TemplateData); exit;
+		$this->db->insert("mail_details", $email_array);
+	}
 
 }
 

web_interface/astpp/application/controllers/updateBalance.php

Doc Comments +9 added lines

@@ -43,6 +43,10 @@ 
         }
     }
 
+    /**
+     * @param string $startdate
+     * @param string $enddate
+     */
     function process_subscriptions($accountinfo, $startdate, $enddate, $Manualflg = false) {
 //        Defined Original Sweep it for calculation start date for first time.
         $accountinfo['original_sweep_id'] = $accountinfo['sweep_id'];
@@ -101,6 +105,10 @@ 
         }
     }
 
+    /**
+     * @param string $startdate
+     * @param string $enddate
+     */
     function process_DID_charges($AccountDATA, $startdate, $enddate, $Manualflg = false) {
         $dids_data = $this->get_table_data("*", "dids", array("status" => "0", "accountid " => $AccountDATA["id"]));
         $AccountDATA['original_sweep_id'] = $AccountDATA['sweep_id'];
@@ -225,6 +233,7 @@ 
 
     /**
      * @param string $todate
+     * @param string $invoicedate
      */
     function Manage_invoice_item($AccountData, $description, $item_id, $charge, $type, $fromdate, $todate, $invoicedate) {
         $invoiceid = 0;

Indentation +240 added lines, -240 removed lines

@@ -24,271 +24,271 @@
 
 class UpdateBalance extends MX_Controller {
 
-    public $account_arr = array();
-    public $currentdate = '';
+	public $account_arr = array();
+	public $currentdate = '';
 
-    function __construct() {
-        parent::__construct();
-        $this->load->model("db_model");
-        $this->load->model("common_model");
-        $this->load->library("astpp/common");
-        $this->currentdate = gmdate('Y-m-d H:i:s');
-    }
+	function __construct() {
+		parent::__construct();
+		$this->load->model("db_model");
+		$this->load->model("common_model");
+		$this->load->library("astpp/common");
+		$this->currentdate = gmdate('Y-m-d H:i:s');
+	}
 
-    function GetUpdateBalance() {
-        $accounts_data = $this->get_table_data("*", "accounts", array("status" => "0", "deleted" => "0"));
-        foreach ($accounts_data as $account_val) {
-            $this->process_subscriptions($account_val, gmdate("Y-m-d H:i:s"), gmdate("Y-m-d H:i:s"));
-            $this->process_DID_charges($account_val, gmdate("Y-m-d H:i:s"), gmdate("Y-m-d H:i:s"));
-        }
-    }
+	function GetUpdateBalance() {
+		$accounts_data = $this->get_table_data("*", "accounts", array("status" => "0", "deleted" => "0"));
+		foreach ($accounts_data as $account_val) {
+			$this->process_subscriptions($account_val, gmdate("Y-m-d H:i:s"), gmdate("Y-m-d H:i:s"));
+			$this->process_DID_charges($account_val, gmdate("Y-m-d H:i:s"), gmdate("Y-m-d H:i:s"));
+		}
+	}
 
-    function process_subscriptions($accountinfo, $startdate, $enddate, $Manualflg = false) {
+	function process_subscriptions($accountinfo, $startdate, $enddate, $Manualflg = false) {
 //        Defined Original Sweep it for calculation start date for first time.
-        $accountinfo['original_sweep_id'] = $accountinfo['sweep_id'];
-        $invoiceid = 0;
+		$accountinfo['original_sweep_id'] = $accountinfo['sweep_id'];
+		$invoiceid = 0;
         
-        // Check Charge is applied that is for first time or already calculated before
+		// Check Charge is applied that is for first time or already calculated before
 
-        $where = "(charge_upto ='0000-00-00 00:00:00' OR charge_upto <='".gmdate("Y-m-d H:i:s")."')";
-        $this->db->where('accountid', $accountinfo['id']);
-        $this->db->where($where);
-        $this->db->select('*');
-        $account_charges = $this->db->get('charge_to_account');
-        if ($account_charges->num_rows() > 0) {
-            $accountchargs = $account_charges->result_array();
+		$where = "(charge_upto ='0000-00-00 00:00:00' OR charge_upto <='".gmdate("Y-m-d H:i:s")."')";
+		$this->db->where('accountid', $accountinfo['id']);
+		$this->db->where($where);
+		$this->db->select('*');
+		$account_charges = $this->db->get('charge_to_account');
+		if ($account_charges->num_rows() > 0) {
+			$accountchargs = $account_charges->result_array();
 
-            foreach ($accountchargs as $accharges) {
-                //Get information from database of active charges.
-                $charge_data = $this->get_table_data("*", "charges", array("id" => $accharges['charge_id'], "status" => "0"));
-                if ($charge_data && ! empty($charge_data)) {
-                    $charge_data = $charge_data[0];
-                    //Get Start Date of Charge
-                    $charge_upto = ($accharges["charge_upto"] != "0000-00-00 00:00:00" && $accharges["charge_upto"] != "") ?
-                            date("Y-m-d H:i:s", strtotime("+1 Second", strtotime($accharges["charge_upto"]))) : $accharges["assign_date"];
-                   if ($accountinfo['original_sweep_id'] == 2 && $charge_data['pro_rate'] == 0 && $charge_data['sweep_id'] == 2 && ($accountinfo['invoice_day'] < gmdate("d", strtotime($accharges['assign_date'])))) {
-                      $charge_upto = date("Y-m-".$accountinfo['invoice_day']." H:i:s", strtotime($accharges["assign_date"]));
-                   }
-                    //Overwrite Billing scehdule of customer assign proper charge
-                    if ($accountinfo['sweep_id'] != $charge_data['sweep_id']) {
-                        $accountinfo['sweep_id'] = $charge_data['sweep_id'];
-                    }
-                    //IF its already assigned before invoice start date then no need to applied same charge one more time
-                    if ($charge_upto != "0000-00-00 00:00:00" && $charge_upto != "" && strtotime($charge_upto) < strtotime($enddate)) {
-                        $fromdate = gmdate("Y-m-d H:i:s", strtotime($charge_upto));
-                        if ($Manualflg) {
-                            $todate = gmdate("Y-m-d H:i:s", strtotime($enddate));
-                        } else {
-                            $todate = gmdate("Y-m-d H:i:s", strtotime($charge_upto));
-                        }
-                        /*
+			foreach ($accountchargs as $accharges) {
+				//Get information from database of active charges.
+				$charge_data = $this->get_table_data("*", "charges", array("id" => $accharges['charge_id'], "status" => "0"));
+				if ($charge_data && ! empty($charge_data)) {
+					$charge_data = $charge_data[0];
+					//Get Start Date of Charge
+					$charge_upto = ($accharges["charge_upto"] != "0000-00-00 00:00:00" && $accharges["charge_upto"] != "") ?
+							date("Y-m-d H:i:s", strtotime("+1 Second", strtotime($accharges["charge_upto"]))) : $accharges["assign_date"];
+				   if ($accountinfo['original_sweep_id'] == 2 && $charge_data['pro_rate'] == 0 && $charge_data['sweep_id'] == 2 && ($accountinfo['invoice_day'] < gmdate("d", strtotime($accharges['assign_date'])))) {
+					  $charge_upto = date("Y-m-".$accountinfo['invoice_day']." H:i:s", strtotime($accharges["assign_date"]));
+				   }
+					//Overwrite Billing scehdule of customer assign proper charge
+					if ($accountinfo['sweep_id'] != $charge_data['sweep_id']) {
+						$accountinfo['sweep_id'] = $charge_data['sweep_id'];
+					}
+					//IF its already assigned before invoice start date then no need to applied same charge one more time
+					if ($charge_upto != "0000-00-00 00:00:00" && $charge_upto != "" && strtotime($charge_upto) < strtotime($enddate)) {
+						$fromdate = gmdate("Y-m-d H:i:s", strtotime($charge_upto));
+						if ($Manualflg) {
+							$todate = gmdate("Y-m-d H:i:s", strtotime($enddate));
+						} else {
+							$todate = gmdate("Y-m-d H:i:s", strtotime($charge_upto));
+						}
+						/*
                          * Add assign_date and charge_upto variable for calculation purpose.
                          */
-                        $itemArr = array('description' => $charge_data['description'],
-                            'item_id' => $charge_data['id'],
-                            "type" => "SUBCHRG",
-                            "cycle" => $charge_data["sweep_id"],
-                            "assign_date"=>$accharges['assign_date'],
-                            "charge_upto"=>$accharges['charge_upto']);
+						$itemArr = array('description' => $charge_data['description'],
+							'item_id' => $charge_data['id'],
+							"type" => "SUBCHRG",
+							"cycle" => $charge_data["sweep_id"],
+							"assign_date"=>$accharges['assign_date'],
+							"charge_upto"=>$accharges['charge_upto']);
 			//Add a new arguement ($accharges) which have all information of charges.
-                        $lastdate = $this->calculate_charges($accountinfo, $itemArr, $charge_data["charge"], $fromdate, $todate, $charge_data["pro_rate"]);
-                        if ($lastdate) {
-                                               $this->db->update("charge_to_account", array("charge_upto" => $lastdate), array("charge_id" => $charge_data["id"], "accountid" => $accountinfo["id"]));
-                        }
-                    }
-                }
-            }
-        }
-    }
+						$lastdate = $this->calculate_charges($accountinfo, $itemArr, $charge_data["charge"], $fromdate, $todate, $charge_data["pro_rate"]);
+						if ($lastdate) {
+											   $this->db->update("charge_to_account", array("charge_upto" => $lastdate), array("charge_id" => $charge_data["id"], "accountid" => $accountinfo["id"]));
+						}
+					}
+				}
+			}
+		}
+	}
 
-    function process_DID_charges($AccountDATA, $startdate, $enddate, $Manualflg = false) {
-        $dids_data = $this->get_table_data("*", "dids", array("status" => "0", "accountid " => $AccountDATA["id"]));
-        $AccountDATA['original_sweep_id'] = $AccountDATA['sweep_id'];
-        $AccountDATA['sweep_id'] = '2';
-        if ($dids_data) {
-            foreach ($dids_data as $did_value) {
-                $charge_upto = ($did_value["charge_upto"] != "0000-00-00 00:00:00" && $did_value["charge_upto"] != "") ? $did_value["charge_upto"] : $did_value["assign_date"];
+	function process_DID_charges($AccountDATA, $startdate, $enddate, $Manualflg = false) {
+		$dids_data = $this->get_table_data("*", "dids", array("status" => "0", "accountid " => $AccountDATA["id"]));
+		$AccountDATA['original_sweep_id'] = $AccountDATA['sweep_id'];
+		$AccountDATA['sweep_id'] = '2';
+		if ($dids_data) {
+			foreach ($dids_data as $did_value) {
+				$charge_upto = ($did_value["charge_upto"] != "0000-00-00 00:00:00" && $did_value["charge_upto"] != "") ? $did_value["charge_upto"] : $did_value["assign_date"];
 
-                if ($charge_upto != "0000-00-00 00:00:00" && $charge_upto != "" && strtotime($charge_upto) < strtotime($enddate)) {
-                    $fromdate = gmdate("Y-m-d H:i:s", strtotime($charge_upto));
-                    if ($Manualflg) {
-                        $todate = gmdate("Y-m-d H:i:s", strtotime($enddate));
-                    } else {
-                        $todate = gmdate("Y-m-d H:i:s", strtotime($did_value["upto_date"]));
-                    }
-                    $itemArr = array('description' => $did_value['number'],
-                                    'item_id' => $did_value['id'],
-                                    "type" => "DIDCHRG",
-                                    "cycle" => "2",
-                                    "assign_date"=>$did_value['assign_date'],
-                                    "charge_upto"=>$did_value['charge_upto']);
-                    if ($did_value['parent_id'] > 0) {
-                        $parent_id = $did_value['parent_id'];
-                        while ($parent_id != 0) {
-                            $reseller_dids = $this->get_table_data("*", "reseller_pricing", array("reseller_id" => $parent_id, "note" => $did_value['number']));
-                            $reseller_acc_data = $this->get_table_data("*", "accounts", array("id" => $parent_id));
-                            $reseller_acc_data = $reseller_acc_data['0'];
-                            $reseller_acc_data['sweep_id'] = '2';
-                            $reseller_dids = $reseller_dids[0];
-                            if (($parent_id == $reseller_dids['reseller_id'] && $did_value['accountid'] > 0) || $reseller_dids['parent_id'] == 0) {
-                                //Apply charges to resellers customers.
-                                $lastdate = $this->calculate_charges($reseller_acc_data, $itemArr, $reseller_dids["monthlycost"], $fromdate, $todate, "1");
-                                if ($lastdate)
-                                    $this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
-                            } else {
-                                //Apply charges to Resellers.
-                                $lastdate = $this->calculate_charges($reseller_acc_data, $itemArr, $reseller_dids["monthlycost"], $fromdate, $todate, "1");
-                                if ($lastdate)
-                                    $this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
-                            }
-                            $parent_id = $reseller_dids['parent_id'];
-                        }
-                    }
+				if ($charge_upto != "0000-00-00 00:00:00" && $charge_upto != "" && strtotime($charge_upto) < strtotime($enddate)) {
+					$fromdate = gmdate("Y-m-d H:i:s", strtotime($charge_upto));
+					if ($Manualflg) {
+						$todate = gmdate("Y-m-d H:i:s", strtotime($enddate));
+					} else {
+						$todate = gmdate("Y-m-d H:i:s", strtotime($did_value["upto_date"]));
+					}
+					$itemArr = array('description' => $did_value['number'],
+									'item_id' => $did_value['id'],
+									"type" => "DIDCHRG",
+									"cycle" => "2",
+									"assign_date"=>$did_value['assign_date'],
+									"charge_upto"=>$did_value['charge_upto']);
+					if ($did_value['parent_id'] > 0) {
+						$parent_id = $did_value['parent_id'];
+						while ($parent_id != 0) {
+							$reseller_dids = $this->get_table_data("*", "reseller_pricing", array("reseller_id" => $parent_id, "note" => $did_value['number']));
+							$reseller_acc_data = $this->get_table_data("*", "accounts", array("id" => $parent_id));
+							$reseller_acc_data = $reseller_acc_data['0'];
+							$reseller_acc_data['sweep_id'] = '2';
+							$reseller_dids = $reseller_dids[0];
+							if (($parent_id == $reseller_dids['reseller_id'] && $did_value['accountid'] > 0) || $reseller_dids['parent_id'] == 0) {
+								//Apply charges to resellers customers.
+								$lastdate = $this->calculate_charges($reseller_acc_data, $itemArr, $reseller_dids["monthlycost"], $fromdate, $todate, "1");
+								if ($lastdate)
+									$this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
+							} else {
+								//Apply charges to Resellers.
+								$lastdate = $this->calculate_charges($reseller_acc_data, $itemArr, $reseller_dids["monthlycost"], $fromdate, $todate, "1");
+								if ($lastdate)
+									$this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
+							}
+							$parent_id = $reseller_dids['parent_id'];
+						}
+					}
 //   		else{
-                    $lastdate = $this->calculate_charges($AccountDATA, $itemArr, $did_value["monthlycost"], $fromdate, $todate, "1");
-                    if ($lastdate)
-                      $this->db->update("dids", array("charge_upto" => $lastdate), array("id" => $did_value["id"], "accountid" => $AccountDATA["id"]));
+					$lastdate = $this->calculate_charges($AccountDATA, $itemArr, $did_value["monthlycost"], $fromdate, $todate, "1");
+					if ($lastdate)
+					  $this->db->update("dids", array("charge_upto" => $lastdate), array("id" => $did_value["id"], "accountid" => $AccountDATA["id"]));
 //            	}
-                }
-            }
-        }
-    }
+				}
+			}
+		}
+	}
 
-    /**
-     * @param string $fromdate
-     * @param string $todate
-     */
-    function calculate_charges($AccountDATA, $itemArr, $charge, $fromdate, $todate, $pro_rate = "1") {
-        $lastdate = false;
-        $billing_cycle = ($AccountDATA['sweep_id'] == "0") ? "1 day" : "1 month";
-        $last_invoice_date = $this->common->get_invoice_date("invoice_date", $AccountDATA['id'], $AccountDATA['reseller_id']);
-      //Below variable gives date based on assign or creation or monthly user billing day
-        $last_invoice_date = ($last_invoice_date) ? $last_invoice_date : (($pro_rate == 0 && $AccountDATA['original_sweep_id'] == 2 && ($AccountDATA['invoice_day'] < gmdate("d", strtotime($itemArr['assign_date'])))) ? date("Y-m-".$AccountDATA['invoice_day']." 00:00:00") : (($pro_rate == 1 && $AccountDATA['original_sweep_id'] == 0) ? date("Y-m-d 00:00:00", strtotime($itemArr['assign_date'])) : date("Y-m-d 00:00:00", strtotime($AccountDATA['creation']))));
-        $last_invoice_date = ($last_invoice_date <= $fromdate) ? $last_invoice_date : $fromdate;
-        $Charges_date_range = array();
-        $prorate_array = array();
-        $daylen = 60 * 60 * 24;
-        /*Get assign day and billing day for postpaid monthly user.
+	/**
+	 * @param string $fromdate
+	 * @param string $todate
+	 */
+	function calculate_charges($AccountDATA, $itemArr, $charge, $fromdate, $todate, $pro_rate = "1") {
+		$lastdate = false;
+		$billing_cycle = ($AccountDATA['sweep_id'] == "0") ? "1 day" : "1 month";
+		$last_invoice_date = $this->common->get_invoice_date("invoice_date", $AccountDATA['id'], $AccountDATA['reseller_id']);
+	  //Below variable gives date based on assign or creation or monthly user billing day
+		$last_invoice_date = ($last_invoice_date) ? $last_invoice_date : (($pro_rate == 0 && $AccountDATA['original_sweep_id'] == 2 && ($AccountDATA['invoice_day'] < gmdate("d", strtotime($itemArr['assign_date'])))) ? date("Y-m-".$AccountDATA['invoice_day']." 00:00:00") : (($pro_rate == 1 && $AccountDATA['original_sweep_id'] == 0) ? date("Y-m-d 00:00:00", strtotime($itemArr['assign_date'])) : date("Y-m-d 00:00:00", strtotime($AccountDATA['creation']))));
+		$last_invoice_date = ($last_invoice_date <= $fromdate) ? $last_invoice_date : $fromdate;
+		$Charges_date_range = array();
+		$prorate_array = array();
+		$daylen = 60 * 60 * 24;
+		/*Get assign day and billing day for postpaid monthly user.
          */
-        $assign_day = ($AccountDATA['original_sweep_id'] == 2 && $AccountDATA['posttoexternal'] == 1) ? gmdate("d", strtotime($itemArr['assign_date'])) : 0;
-        $billing_day = ($AccountDATA['original_sweep_id'] == 2 && $AccountDATA['posttoexternal'] == 1) ? $AccountDATA['invoice_day'] : 0;
-        //Create an array if charge not applied yet and invoice day is greater than assign_day
-        if ($itemArr['charge_upto'] == "0000-00-00 00:00:00" && ($billing_day > $assign_day) && $pro_rate == 0 && $itemArr['cycle'] == 2 && $AccountDATA['original_sweep_id'] == 2) {
+		$assign_day = ($AccountDATA['original_sweep_id'] == 2 && $AccountDATA['posttoexternal'] == 1) ? gmdate("d", strtotime($itemArr['assign_date'])) : 0;
+		$billing_day = ($AccountDATA['original_sweep_id'] == 2 && $AccountDATA['posttoexternal'] == 1) ? $AccountDATA['invoice_day'] : 0;
+		//Create an array if charge not applied yet and invoice day is greater than assign_day
+		if ($itemArr['charge_upto'] == "0000-00-00 00:00:00" && ($billing_day > $assign_day) && $pro_rate == 0 && $itemArr['cycle'] == 2 && $AccountDATA['original_sweep_id'] == 2) {
 	  $last_invoice_date = gmdate("Y-m-d H:i:s", strtotime("-1 second", strtotime(date("Y-m-".$AccountDATA['invoice_day']." 00:00:00", strtotime($itemArr["assign_date"])))));
 	  $prorate_array[] = array("start_date" => date("Y-m-d H:i:s", strtotime($itemArr['assign_date'])), "end_date" => $last_invoice_date);
 	  
-        }
-        while (strtotime($last_invoice_date) <= strtotime($todate)) {
-            $startdate = $last_invoice_date;
-            $last_invoice_date = gmdate("Y-m-d H:i:s", strtotime("+".$billing_cycle, strtotime($last_invoice_date)));
-            $Charges_date_range[] = array("start_date" =>gmdate("Y-m-d H:i:s", strtotime("+1 Second", strtotime($startdate))), "end_date" => $last_invoice_date);
-        }
-        if ( ! empty($prorate_array)) {
-         array_pop($Charges_date_range);
-         $Charges_date_range = array_merge($prorate_array, $Charges_date_range);
-        }
-        if ( ! empty($Charges_date_range)) {
-            foreach ($Charges_date_range as $ChargeVal) {
-                if (($pro_rate == 0 && $itemArr['cycle'] != 2) || (($billing_day <= $assign_day) && $pro_rate == 0 && $itemArr['cycle'] == 2 && $AccountDATA['original_sweep_id'] == 2)) {
-                    $ChargeVal['end_date'] = gmdate("Y-m-d 23:59:59", strtotime("-1 Day", strtotime($ChargeVal['end_date'])));
-                }
-                if ( ! empty($itemArr['charge_upto']) && empty($lastdate)) {
-                    $start_date = ($itemArr['charge_upto'] == '0000-00-00 00:00:00' && $AccountDATA['sweep_id'] == 2) ? $itemArr['assign_date'] : $ChargeVal['start_date'];
-                } else {
-                    $start_date = (empty($lastdate)) ? $ChargeVal['start_date'] : gmdate("Y-m-d H:i:s", strtotime("+1 second", strtotime($lastdate)));
-                }
+		}
+		while (strtotime($last_invoice_date) <= strtotime($todate)) {
+			$startdate = $last_invoice_date;
+			$last_invoice_date = gmdate("Y-m-d H:i:s", strtotime("+".$billing_cycle, strtotime($last_invoice_date)));
+			$Charges_date_range[] = array("start_date" =>gmdate("Y-m-d H:i:s", strtotime("+1 Second", strtotime($startdate))), "end_date" => $last_invoice_date);
+		}
+		if ( ! empty($prorate_array)) {
+		 array_pop($Charges_date_range);
+		 $Charges_date_range = array_merge($prorate_array, $Charges_date_range);
+		}
+		if ( ! empty($Charges_date_range)) {
+			foreach ($Charges_date_range as $ChargeVal) {
+				if (($pro_rate == 0 && $itemArr['cycle'] != 2) || (($billing_day <= $assign_day) && $pro_rate == 0 && $itemArr['cycle'] == 2 && $AccountDATA['original_sweep_id'] == 2)) {
+					$ChargeVal['end_date'] = gmdate("Y-m-d 23:59:59", strtotime("-1 Day", strtotime($ChargeVal['end_date'])));
+				}
+				if ( ! empty($itemArr['charge_upto']) && empty($lastdate)) {
+					$start_date = ($itemArr['charge_upto'] == '0000-00-00 00:00:00' && $AccountDATA['sweep_id'] == 2) ? $itemArr['assign_date'] : $ChargeVal['start_date'];
+				} else {
+					$start_date = (empty($lastdate)) ? $ChargeVal['start_date'] : gmdate("Y-m-d H:i:s", strtotime("+1 second", strtotime($lastdate)));
+				}
 
-                $lastdate = date("Y-m-d H:i:s", strtotime($ChargeVal['end_date']));
-                $end_date_str_time = strtotime("+1 Seconds", strtotime($lastdate));
-                $start_date_str_time = strtotime(gmdate("Y-m-d 00:00:00", strtotime($start_date)));
-                $temp_f_date = new DateTime(gmdate("Y-m-d H:i:s", strtotime("+1 second", strtotime($lastdate))));
-                $temp_t_date = new DateTime($start_date);
-                $diff = $temp_f_date->diff($temp_t_date);
-                $month = (($diff->format('%y') * 12) + $diff->format('%m'));
-                $temp_charge = $charge;
-                if (($month != "1" || $pro_rate == "0") && $itemArr['cycle'] != '0') {
-                  //Calculate Number of days in month from start date
-                    $total_num_of_day = cal_days_in_month(CAL_GREGORIAN, date('m', $start_date_str_time), date('Y', $start_date_str_time));
-                    $days_diff = floor(($end_date_str_time - $start_date_str_time) / $daylen);
-                    $chrg_per_day = ($charge / $total_num_of_day);
-                    $temp_charge = ($chrg_per_day * $days_diff);
-                }
+				$lastdate = date("Y-m-d H:i:s", strtotime($ChargeVal['end_date']));
+				$end_date_str_time = strtotime("+1 Seconds", strtotime($lastdate));
+				$start_date_str_time = strtotime(gmdate("Y-m-d 00:00:00", strtotime($start_date)));
+				$temp_f_date = new DateTime(gmdate("Y-m-d H:i:s", strtotime("+1 second", strtotime($lastdate))));
+				$temp_t_date = new DateTime($start_date);
+				$diff = $temp_f_date->diff($temp_t_date);
+				$month = (($diff->format('%y') * 12) + $diff->format('%m'));
+				$temp_charge = $charge;
+				if (($month != "1" || $pro_rate == "0") && $itemArr['cycle'] != '0') {
+				  //Calculate Number of days in month from start date
+					$total_num_of_day = cal_days_in_month(CAL_GREGORIAN, date('m', $start_date_str_time), date('Y', $start_date_str_time));
+					$days_diff = floor(($end_date_str_time - $start_date_str_time) / $daylen);
+					$chrg_per_day = ($charge / $total_num_of_day);
+					$temp_charge = ($chrg_per_day * $days_diff);
+				}
                 
-                if (strtotime($ChargeVal['start_date']) < strtotime($ChargeVal['end_date'])) {
-                                    $this->Manage_invoice_item($AccountDATA, $itemArr['description'], $itemArr['item_id'], $temp_charge, $itemArr['type'], $start_date, $lastdate, $todate);
-                }
-                //                echo "<br/> ORG CHARG : " . $charge . " Charges : " . $temp_charge . "<br/>";
-            }
-        }
-        return $lastdate;
-    }
+				if (strtotime($ChargeVal['start_date']) < strtotime($ChargeVal['end_date'])) {
+									$this->Manage_invoice_item($AccountDATA, $itemArr['description'], $itemArr['item_id'], $temp_charge, $itemArr['type'], $start_date, $lastdate, $todate);
+				}
+				//                echo "<br/> ORG CHARG : " . $charge . " Charges : " . $temp_charge . "<br/>";
+			}
+		}
+		return $lastdate;
+	}
 
-    /**
-     * @param string $todate
-     */
-    function Manage_invoice_item($AccountData, $description, $item_id, $charge, $type, $fromdate, $todate, $invoicedate) {
-        $invoiceid = 0;
-        $Bal = "0.00"; 
-        if ($AccountData["posttoexternal"] == 0) {
-	    $reseller_id = $AccountData['type'] == 1 ? $AccountData['id'] : 0;
-	    $where = "accountid IN ('".$reseller_id."','1')";
-	    $this->db->where($where);
-	    $this->db->select('*');
-	    $this->db->order_by('accountid', 'desc');
-	    $this->db->limit(1);
-	    $invoiceconf = $this->db->get('invoice_conf');
-	    $invoice_conf = (array)$invoiceconf->first_row();
-	    $last_invoiceid = $this->common->get_invoice_date('invoiceid', '', $AccountData['reseller_id']);
-	    if ($last_invoiceid && $last_invoiceid > 0) {
-	    	$last_invoiceid = ($last_invoiceid + 1);
-  	    } else {
-	    	$last_invoiceid = $invoice_conf['invoice_start_from'];
-	    }
-	    $last_invoiceid = str_pad($last_invoiceid, (strlen($last_invoiceid) + 4), '0', STR_PAD_LEFT);
-	    $invoice_prefix = $invoice_conf['invoice_prefix'];
-	    $due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoice_conf['interval']." days"));
+	/**
+	 * @param string $todate
+	 */
+	function Manage_invoice_item($AccountData, $description, $item_id, $charge, $type, $fromdate, $todate, $invoicedate) {
+		$invoiceid = 0;
+		$Bal = "0.00"; 
+		if ($AccountData["posttoexternal"] == 0) {
+		$reseller_id = $AccountData['type'] == 1 ? $AccountData['id'] : 0;
+		$where = "accountid IN ('".$reseller_id."','1')";
+		$this->db->where($where);
+		$this->db->select('*');
+		$this->db->order_by('accountid', 'desc');
+		$this->db->limit(1);
+		$invoiceconf = $this->db->get('invoice_conf');
+		$invoice_conf = (array)$invoiceconf->first_row();
+		$last_invoiceid = $this->common->get_invoice_date('invoiceid', '', $AccountData['reseller_id']);
+		if ($last_invoiceid && $last_invoiceid > 0) {
+			$last_invoiceid = ($last_invoiceid + 1);
+  		} else {
+			$last_invoiceid = $invoice_conf['invoice_start_from'];
+		}
+		$last_invoiceid = str_pad($last_invoiceid, (strlen($last_invoiceid) + 4), '0', STR_PAD_LEFT);
+		$invoice_prefix = $invoice_conf['invoice_prefix'];
+		$due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoice_conf['interval']." days"));
 
-            $invoiceid = $this->common_model->generate_receipt($AccountData["id"], $charge, $AccountData, $last_invoiceid, $invoice_prefix, $due_date);
-            $this->db->set('balance', 'balance-'.$charge, FALSE);
-            $this->db->where('id', $AccountData["id"]);
-            $this->db->update("accounts");
-            $AccountData['balance'] = ($AccountData['balance'] - $charge);
-            $Bal = $AccountData['balance'];
-        } else {
-            $Bal = ($AccountData["credit_limit"] - $AccountData["balance"]);
-        }
-        if ($Bal <= 0) {
-            $this->db->set('status', "1", FALSE);
-            $this->db->where('id', $AccountData["id"]);
-            $this->db->update("accounts");
-        }
-        $invoice_item_arr = array("accountid" => $AccountData["id"],
-            "reseller_id" => $AccountData["reseller_id"],
-            "description" => trim($description."-".$fromdate." to ".$todate),
-            "item_id" => $item_id, "debit" => $charge, "invoiceid" => $invoiceid,
-            "created_date" => trim($invoicedate),
-            "item_type" => $type
-        );
-        $this->manage_invoice($invoice_item_arr);
-    }
+			$invoiceid = $this->common_model->generate_receipt($AccountData["id"], $charge, $AccountData, $last_invoiceid, $invoice_prefix, $due_date);
+			$this->db->set('balance', 'balance-'.$charge, FALSE);
+			$this->db->where('id', $AccountData["id"]);
+			$this->db->update("accounts");
+			$AccountData['balance'] = ($AccountData['balance'] - $charge);
+			$Bal = $AccountData['balance'];
+		} else {
+			$Bal = ($AccountData["credit_limit"] - $AccountData["balance"]);
+		}
+		if ($Bal <= 0) {
+			$this->db->set('status', "1", FALSE);
+			$this->db->where('id', $AccountData["id"]);
+			$this->db->update("accounts");
+		}
+		$invoice_item_arr = array("accountid" => $AccountData["id"],
+			"reseller_id" => $AccountData["reseller_id"],
+			"description" => trim($description."-".$fromdate." to ".$todate),
+			"item_id" => $item_id, "debit" => $charge, "invoiceid" => $invoiceid,
+			"created_date" => trim($invoicedate),
+			"item_type" => $type
+		);
+		$this->manage_invoice($invoice_item_arr);
+	}
     
-    /**
-     * @param string $select
-     * @param string $table
-     */
-    function get_table_data($select, $table, $where) {
-        $query = $this->db_model->getSelect($select, $table, $where);
-        if ($query->num_rows > 0) {
-            $query_result = $query->result_array();
-            return $query_result;
-        } else {
-            return false;
-        }
-    }
+	/**
+	 * @param string $select
+	 * @param string $table
+	 */
+	function get_table_data($select, $table, $where) {
+		$query = $this->db_model->getSelect($select, $table, $where);
+		if ($query->num_rows > 0) {
+			$query_result = $query->result_array();
+			return $query_result;
+		} else {
+			return false;
+		}
+	}
 
-    function Manage_Invoice($invoice_item_arr) {
-       $this->db->insert("invoice_details", $invoice_item_arr);
-    }
+	function Manage_Invoice($invoice_item_arr) {
+	   $this->db->insert("invoice_details", $invoice_item_arr);
+	}
 
 }
 ?> 

Braces +10 added lines, -7 removed lines

@@ -133,22 +133,25 @@
                             if (($parent_id == $reseller_dids['reseller_id'] && $did_value['accountid'] > 0) || $reseller_dids['parent_id'] == 0) {
                                 //Apply charges to resellers customers.
                                 $lastdate = $this->calculate_charges($reseller_acc_data, $itemArr, $reseller_dids["monthlycost"], $fromdate, $todate, "1");
-                                if ($lastdate)
-                                    $this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
+                                if ($lastdate) {
+                                                                    $this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
+                                }
                             } else {
                                 //Apply charges to Resellers.
                                 $lastdate = $this->calculate_charges($reseller_acc_data, $itemArr, $reseller_dids["monthlycost"], $fromdate, $todate, "1");
-                                if ($lastdate)
-                                    $this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
+                                if ($lastdate) {
+                                                                    $this->db->update("reseller_pricing", array("charge_upto" => $lastdate), array("note" => $did_value["number"], "reseller_id" => $reseller_acc_data["id"]));
+                                }
                             }
                             $parent_id = $reseller_dids['parent_id'];
                         }
                     }
 //   		else{
                     $lastdate = $this->calculate_charges($AccountDATA, $itemArr, $did_value["monthlycost"], $fromdate, $todate, "1");
-                    if ($lastdate)
-                      $this->db->update("dids", array("charge_upto" => $lastdate), array("id" => $did_value["id"], "accountid" => $AccountDATA["id"]));
-//            	}
+                    if ($lastdate) {
+                                          $this->db->update("dids", array("charge_upto" => $lastdate), array("id" => $did_value["id"], "accountid" => $AccountDATA["id"]));
+                    }
+                    //            	}
                 }
             }
         }

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

Doc Comments +1 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
      *
      * @param string  $orientation page orientation, same as TCPDF
      * @param string  $unit        User measure unit, same as TCPDF
-     * @param mixed   $format      The format used for pages, same as TCPDF
+     * @param string   $format      The format used for pages, same as TCPDF
      * @param boolean $unicode     TRUE means that the input text is unicode (default = true)
      * @param String  $encoding    charset encoding; default is UTF-8
      * @param boolean $diskcache   if TRUE reduce the RAM memory usage by caching temporary data on filesystem (slower).
@@ -1407,7 +1407,6 @@ 
      * set $_myLastPageGroup;
      *
      * @access public
-     * @param integer $myLastPageGroup;
      * @param integer $myLastPageGroup
      */
     public function setMyLastPageGroup($myLastPageGroup)
@@ -1430,7 +1429,6 @@ 
      * set $_myLastPageGroupNb;
      *
      * @access public
-     * @param integer $myLastPageGroupNb;
      * @param integer $myLastPageGroupNb
      */
     public function setMyLastPageGroupNb($myLastPageGroupNb)

Indentation +1423 added lines, -1423 removed lines

@@ -14,1427 +14,1427 @@
 
 class HTML2PDF_myPdf extends TCPDF
 {
-    protected $_footerParam = array();
-    protected $_transf      = array();
-    protected $_myLastPageGroup = null;
-    protected $_myLastPageGroupNb = 0;
-
-    // used to make a radius with bezier : (4/3 * (sqrt(2) - 1))
-    const MY_ARC = 0.5522847498;
-
-    // nb of segment to build a arc with bezier curv
-    const ARC_NB_SEGMENT = 8;
-
-    /**
-     * class constructor
-     *
-     * @param string  $orientation page orientation, same as TCPDF
-     * @param string  $unit        User measure unit, same as TCPDF
-     * @param mixed   $format      The format used for pages, same as TCPDF
-     * @param boolean $unicode     TRUE means that the input text is unicode (default = true)
-     * @param String  $encoding    charset encoding; default is UTF-8
-     * @param boolean $diskcache   if TRUE reduce the RAM memory usage by caching temporary data on filesystem (slower).
-     * @access public
-     */
-    public function __construct(
-        $orientation = 'P',
-        $unit = 'mm',
-        $format = 'A4',
-        $unicode = true,
-        $encoding = 'UTF-8',
-        $diskcache = false)
-    {
-        // call the parent constructor
-        parent::__construct($orientation, $unit, $format, $unicode, $encoding, $diskcache);
-
-        // init the specific parameters used by HTML2PDF
-        $this->SetCreator(PDF_CREATOR);
-        $this->SetAutoPageBreak(false, 0);
-        $this->linestyleCap = '2 J';
-        $this->setPrintHeader(false);
-        $this->jpeg_quality = 90;
-
-        // prepare the automatic footer
-        $this->SetMyFooter();
-
-        $this->cMargin = 0;
-    }
-
-    /**
-     * Set the parameters for the automatic footer
-     *
-     * @param boolean $page display the page number
-     * @param boolean $date display the date
-     * @param boolean $hour display the hour
-     * @param boolean $form display a warning abour forms
-     * @access public
-     */
-    public function SetMyFooter($page = false, $date = false, $hour = false, $form = false)
-    {
-        $page    = ($page ? true : false);
-        $date    = ($date ? true : false);
-        $hour    = ($hour ? true : false);
-        $form    = ($form ? true : false);
-
-        $this->_footerParam = array('page' => $page, 'date' => $date, 'hour' => $hour, 'form' => $form);
-    }
-
-    /**
-     * This function is call automatically by TCPDF at the end of a page
-     * It takes no parameters
-     *
-     * @access public
-     */
-    public function Footer()
-    {
-        // prepare the text from the tranlated text
-        $txt = '';
-        if ($this->_footerParam['form']) {
-            $txt = (HTML2PDF_locale::get('pdf05'));
-        }
-        if ($this->_footerParam['date'] && $this->_footerParam['hour']) {
-            $txt .= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf03'));
-        }
-        if ($this->_footerParam['date'] && ! $this->_footerParam['hour']) {
-            $txt .= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf01'));
-        }
-        if ( ! $this->_footerParam['date'] && $this->_footerParam['hour']) {
-            $txt .= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf02'));
-        }
-        if ($this->_footerParam['page']) {
-            $txt .= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf04'));
-        }
-
-        if (strlen($txt) > 0) {
-            // replace some values
-            $toReplace = array(
-                '[[date_d]]'  => date('d'),
-                '[[date_m]]'  => date('m'),
-                '[[date_y]]'  => date('Y'),
-                '[[date_h]]'  => date('H'),
-                '[[date_i]]'  => date('i'),
-                '[[date_s]]'  => date('s'),
-                '[[page_cu]]' => $this->getMyNumPage(),
-                '[[page_nb]]' => $this->getMyAliasNbPages(),
-            );
-            $txt = str_replace(array_keys($toReplace), array_values($toReplace), $txt);
-
-            // draw the footer
-            parent::SetY(-11);
-            $this->SetFont('helvetica', 'I', 8);
-            $this->Cell(0, 10, $txt, 0, 0, 'R');
-        }
-    }
-
-     /**
-     * after cloning a object, we does not want to clone all the front informations
-     * because it take a lot a time and a lot of memory => we use reference
-     *
-     * @param &HTML2PDF_myPdf object
-     * @param HTML2PDF_myPdf $pdf
-     * @access public
-     */
-    public function cloneFontFrom(&$pdf)
-    {
-        $this->fonts            = &$pdf->getFonts();
-        $this->FontFiles        = &$pdf->getFontFiles();
-        $this->diffs            = &$pdf->getDiffs();
-        $this->fontlist         = &$pdf->getFontList();
-        $this->numfonts         = &$pdf->getNumFonts();
-        $this->fontkeys         = &$pdf->getFontKeys();
-        $this->font_obj_ids     = &$pdf->getFontObjIds();
-        $this->annotation_fonts = &$pdf->getAnnotFonts();
-    }
-
-    /**
-     * multiple public accessor for some private attributs
-     * used only by cloneFontFrom
-     *
-     * @return &array
-     * @access public
-     */
-    public function &getFonts()
-    {
-        return $this->fonts;
-    }
-    public function &getFontFiles()
-    {
-        return $this->FontFiles;
-    }
-    public function &getDiffs()
-    {
-        return $this->diffs;
-    }
-    public function &getFontList()
-    {
-        return $this->fontlist;
-    }
-    public function &getNumFonts()
-    {
-        return $this->numfonts;
-    }
-    public function &getFontKeys()
-    {
-        return $this->fontkeys;
-    }
-    public function &getFontObjIds()
-    {
-        return $this->font_obj_ids;
-    }
-    public function &getAnnotFonts()
-    {
-        return $this->annotation_fonts;
-    }
-
-    /**
-     * Verify that a Font is already loaded
-     *
-     * @param string Font Key
-     * @return boolean
-     * @access public
-     */
-    public function isLoadedFont($fontKey)
-    {
-        if (isset($this->fonts[$fontKey])) {
-            return true;
-        }
-
-        if (isset($this->CoreFonts[$fontKey])) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the Word Spacing
-     *
-     * @access public
-     * @return float word spacing
-     */
-    public function getWordSpacing()
-    {
-        return $this->ws;
-    }
-
-    /**
-     * set the Word Spacing
-     *
-     * @param float word spacing
-     * @access public
-     */
-    public function setWordSpacing($ws = 0.)
-    {
-        $this->ws = $ws;
-        $this->_out(sprintf('%.3F Tw', $ws * $this->k));
-    }
-
-    /**
-     * start to use a rectangular Cliping Path with radius corners
-     *
-     * @param float $x (top left corner)
-     * @param float $y (top left corner)
-     * @param float $w (x+w  = botom rigth corner)
-     * @param float $h (y+h = botom rigth corner)
-     * @param array $cornerTL radius of the Top Left corner
-     * @param array $cornerTR radius of the Top Right corner
-     * @param array $cornerBL radius of the Bottom Left corner
-     * @param array $cornerBR radius of the Bottom Right corner
-     * @access public
-     */
-    public function clippingPathStart(
-        $x = null,
-        $y = null,
-        $w = null,
-        $h = null,
-        $cornerTL = null,
-        $cornerTR = null,
-        $cornerBL = null,
-        $cornerBR = null)
-    {
-        // init the path
-        $path = '';
-
-        // if we have the position and the size of the rectangle, we can proceed
-        if ($x !== null && $y !== null && $w !== null && $h !== null) {
-            // the positions of the rectangle's corners
-            $x1 = $x * $this->k;
-            $y1 = ($this->h - $y) * $this->k;
-
-            $x2 = ($x + $w) * $this->k;
-            $y2 = ($this->h - $y) * $this->k;
-
-            $x3 = ($x + $w) * $this->k;
-            $y3 = ($this->h - $y - $h) * $this->k;
-
-            $x4 = $x * $this->k;
-            $y4 = ($this->h - $y - $h) * $this->k;
-
-            // if we have at least one radius corner, then we proceed to a specific path, else it is just a rectangle
-            if ($cornerTL || $cornerTR || $cornerBL || $cornerBR) {
-                // prepare the radius values
-                if ($cornerTL) {
-                    $cornerTL[0] = $cornerTL[0] * $this->k;
-                    $cornerTL[1] = -$cornerTL[1] * $this->k;
-                }
-                if ($cornerTR) {
-                    $cornerTR[0] = $cornerTR[0] * $this->k;
-                    $cornerTR[1] = -$cornerTR[1] * $this->k;
-                }
-                if ($cornerBL) {
-                    $cornerBL[0] = $cornerBL[0] * $this->k;
-                    $cornerBL[1] = -$cornerBL[1] * $this->k;
-                }
-                if ($cornerBR) {
-                    $cornerBR[0] = $cornerBR[0] * $this->k;
-                    $cornerBR[1] = -$cornerBR[1] * $this->k;
-                }
-
-                // if TL radius then specific start else (X1,Y1)
-                if ($cornerTL) {
-                    $path .= sprintf('%.2F %.2F m ', $x1 + $cornerTL[0], $y1);
-                } else {
-                    $path .= sprintf('%.2F %.2F m ', $x1, $y1);
-                }
-
-                // if TR radius then line + arc, else line to (X2,Y2)
-                if ($cornerTR) {
-                    $xt1 = ($x2 - $cornerTR[0]) + $cornerTR[0] * self::MY_ARC;
-                    $yt1 = ($y2 + $cornerTR[1]) - $cornerTR[1];
-                    $xt2 = ($x2 - $cornerTR[0]) + $cornerTR[0];
-                    $yt2 = ($y2 + $cornerTR[1]) - $cornerTR[1] * self::MY_ARC;
-
-                    $path .= sprintf('%.2F %.2F l ', $x2 - $cornerTR[0], $y2);
-                    $path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x2, $y2 + $cornerTR[1]);
-                } else {
-                    $path .= sprintf('%.2F %.2F l ', $x2, $y2);
-                }
-
-                // if BR radius then line + arc, else line to (X3, Y3)
-                if ($cornerBR) {
-                    $xt1 = ($x3 - $cornerBR[0]) + $cornerBR[0];
-                    $yt1 = ($y3 - $cornerBR[1]) + $cornerBR[1] * self::MY_ARC;
-                    $xt2 = ($x3 - $cornerBR[0]) + $cornerBR[0] * self::MY_ARC;
-                    $yt2 = ($y3 - $cornerBR[1]) + $cornerBR[1];
-
-                    $path .= sprintf('%.2F %.2F l ', $x3, $y3 - $cornerBR[1]);
-                    $path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x3 - $cornerBR[0], $y3);
-                } else {
-                    $path .= sprintf('%.2F %.2F l ', $x3, $y3);
-                }
-
-                // if BL radius then line + arc, else line to (X4, Y4)
-                if ($cornerBL) {
-                    $xt1 = ($x4 + $cornerBL[0]) - $cornerBL[0] * self::MY_ARC;
-                    $yt1 = ($y4 - $cornerBL[1]) + $cornerBL[1];
-                    $xt2 = ($x4 + $cornerBL[0]) - $cornerBL[0];
-                    $yt2 = ($y4 - $cornerBL[1]) + $cornerBL[1] * self::MY_ARC;
-
-                    $path .= sprintf('%.2F %.2F l ', $x4 + $cornerBL[0], $y4);
-                    $path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x4, $y4 - $cornerBL[1]);
-                } else {
-                    $path .= sprintf('%.2F %.2F l ', $x4, $y4);
-                }
-
-                // if RL radius then line + arc
-                if ($cornerTL) {
-                    $xt1 = ($x1 + $cornerTL[0]) - $cornerTL[0];
-                    $yt1 = ($y1 + $cornerTL[1]) - $cornerTL[1] * self::MY_ARC;
-                    $xt2 = ($x1 + $cornerTL[0]) - $cornerTL[0] * self::MY_ARC;
-                    $yt2 = ($y1 + $cornerTL[1]) - $cornerTL[1];
-
-                    $path .= sprintf('%.2F %.2F l ', $x1, $y1 + $cornerTL[1]);
-                    $path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x1 + $cornerTL[0], $y1);
-                }
-            } else {
-                $path .= sprintf('%.2F %.2F m ', $x1, $y1);
-                $path .= sprintf('%.2F %.2F l ', $x2, $y2);
-                $path .= sprintf('%.2F %.2F l ', $x3, $y3);
-                $path .= sprintf('%.2F %.2F l ', $x4, $y4);
-            }
-
-            // close the path
-            $path .= ' h W n';
-        }
-
-        // using the path as a clipping path
-        $this->_out('q '.$path.' ');
-    }
-
-    /**
-     * stop to use the Cliping Path
-     *
-     * @access public
-     */
-    public function clippingPathStop()
-    {
-        $this->_out(' Q');
-    }
-
-    /**
-     * draw a filled corner of a border with a external and a internal radius
-     *         /--------+ ext2
-     *        /         |
-     *       /  /-------+ int2
-     *      /  /
-     *      | /
-     *      | |
-     *      | |
-     * ext1 +-+ int1        + cen
-     *
-     * @param float $ext1X
-     * @param float $ext1Y
-     * @param float $ext2X
-     * @param float $ext2Y
-     * @param float $int1X
-     * @param float $int1Y
-     * @param float $int2X
-     * @param float $int2Y
-     * @param float $cenX
-     * @param float $cenY
-     * @access public
-     */
-    public function drawCurve($ext1X, $ext1Y, $ext2X, $ext2Y, $int1X, $int1Y, $int2X, $int2Y, $cenX, $cenY)
-    {
-        // prepare the coordinates
-        $ext1X = $ext1X * $this->k;
-        $ext2X = $ext2X * $this->k;
-        $int1X = $int1X * $this->k;
-        $int2X = $int2X * $this->k;
-        $cenX  = $cenX * $this->k;
-
-        $ext1Y = ($this->h - $ext1Y) * $this->k;
-        $ext2Y = ($this->h - $ext2Y) * $this->k;
-        $int1Y = ($this->h - $int1Y) * $this->k;
-        $int2Y = ($this->h - $int2Y) * $this->k;
-        $cenY  = ($this->h - $cenY) * $this->k;
-
-        // init the curve
-        $path = '';
-
-        if ($ext1X - $cenX != 0) {
-            $xt1 = $cenX + ($ext1X - $cenX);
-            $yt1 = $cenY + ($ext2Y - $cenY) * self::MY_ARC;
-            $xt2 = $cenX + ($ext1X - $cenX) * self::MY_ARC;
-            $yt2 = $cenY + ($ext2Y - $cenY);
-        } else {
-            $xt1 = $cenX + ($ext2X - $cenX) * self::MY_ARC;
-            $yt1 = $cenY + ($ext1Y - $cenY);
-            $xt2 = $cenX + ($ext2X - $cenX);
-            $yt2 = $cenY + ($ext1Y - $cenY) * self::MY_ARC;
-        }
-        $path .= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
-        $path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
-
-        if ($int1X - $cenX != 0) {
-            $xt1 = $cenX + ($int1X - $cenX) * self::MY_ARC;
-            $yt1 = $cenY + ($int2Y - $cenY);
-            $xt2 = $cenX + ($int1X - $cenX);
-            $yt2 = $cenY + ($int2Y - $cenY) * self::MY_ARC;
-        } else {
-            $xt1 = $cenX + ($int2X - $cenX);
-            $yt1 = $cenY + ($int1Y - $cenY) * self::MY_ARC;
-            $xt2 = $cenX + ($int2X - $cenX) * self::MY_ARC;
-            $yt2 = $cenY + ($int1Y - $cenY);
-        }
-        $path .= sprintf('%.2F %.2F l ', $int2X, $int2Y);
-        $path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $int1X, $int1Y);
-
-        // draw the curve
-        $this->_out($path.'f');
-    }
-
-    /**
-     * draw a filled corner of a border with only a external radius
-     *         /--+ ext2
-     *        /   |
-     *       /    |
-     *      /     |
-     *      |     |
-     *      |     |
-     *      |     |
-     * ext1 +-----+ int      + cen
-     *
-     * @param float $ext1X
-     * @param float $ext1Y
-     * @param float $ext2X
-     * @param float $ext2Y
-     * @param float $intX
-     * @param float $intY
-     * @param float $cenX
-     * @param float $cenY
-     * @access public
-     */
-    public function drawCorner($ext1X, $ext1Y, $ext2X, $ext2Y, $intX, $intY, $cenX, $cenY)
-    {
-        // prepare the coordinates
-        $ext1X = $ext1X * $this->k;
-        $ext2X = $ext2X * $this->k;
-        $intX  = $intX * $this->k;
-        $cenX  = $cenX * $this->k;
-
-        $ext1Y = ($this->h - $ext1Y) * $this->k;
-        $ext2Y = ($this->h - $ext2Y) * $this->k;
-        $intY  = ($this->h - $intY) * $this->k;
-        $cenY  = ($this->h - $cenY) * $this->k;
-
-        // init the curve
-        $path = '';
-
-        if ($ext1X - $cenX != 0) {
-            $xt1 = $cenX + ($ext1X - $cenX);
-            $yt1 = $cenY + ($ext2Y - $cenY) * self::MY_ARC;
-            $xt2 = $cenX + ($ext1X - $cenX) * self::MY_ARC;
-            $yt2 = $cenY + ($ext2Y - $cenY);
-        } else {
-            $xt1 = $cenX + ($ext2X - $cenX) * self::MY_ARC;
-            $yt1 = $cenY + ($ext1Y - $cenY);
-            $xt2 = $cenX + ($ext2X - $cenX);
-            $yt2 = $cenY + ($ext1Y - $cenY) * self::MY_ARC;
-        }
-        $path .= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
-        $path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
-        $path .= sprintf('%.2F %.2F l ', $intX, $intY);
-        $path .= sprintf('%.2F %.2F l ', $ext1X, $ext1Y);
-
-        // draw the curve
-        $this->_out($path.'f');
-    }
-
-    /**
-     * Start a transformation
-     *
-     * @access public
-     */
-    public function startTransform()
-    {
-        $this->_out('q');
-    }
-
-    /**
-     * Stop a transformation
-     *
-     * @access public
-     */
-    public function stopTransform()
-    {
-        $this->_out('Q');
-    }
-
-    /**
-     * add a Translate transformation
-     *
-     * @access public
-     */
-    public function setTranslate($xT, $yT)
-    {
-        // Matrix for Translate
-        $tm[0] = 1;
-        $tm[1] = 0;
-        $tm[2] = 0;
-        $tm[3] = 1;
-        $tm[4] = $xT * $this->k;
-        $tm[5] = -$yT * $this->k;
-
-        // apply the Transform Matric
-        $this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
-    }
-
-    /**
-     * add a Rotate transformation
-     *
-     * @param float $angle
-     * @access public
-     */
-    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;
-
-        // prepare the coordinate
-        $yC = ($this->h - $yC) * $this->k;
-        $xC *= $this->k;
-
-        // Matrix for Rotate
-        $tm[0] = cos(deg2rad($angle));
-        $tm[1] = sin(deg2rad($angle));
-        $tm[2] = -$tm[1];
-        $tm[3] = $tm[0];
-        $tm[4] = $xC + $tm[1] * $yC - $tm[0] * $xC;
-        $tm[5] = $yC - $tm[0] * $yC - $tm[1] * $xC;
-
-        // apply the Transform Matric
-        $this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
-    }
-
-    /**
-     * we redifine the original SetX method, because we don't want the automatic treatment.
-     * It is HTML2PDF that make the treatment
-     *
-     * @param float   $x
-     * @param boolean $rtloff NOT USED
-     * @access public
-     */
-    public function SetX($x, $rtloff = false)
-    {
-        $this->x = $x;
-    }
-
-    /**
-     * we redifine the original SetY method, because we don't want the automatic treatment.
-     * It is HTML2PDF that make the treatment
-     *
-     * @param float   $y
-     * @param boolean $resetx Reset the X position
-     * @param boolean $rtloff NOT USED
-     * @access public
-     */
-    public function SetY($y, $resetx = true, $rtloff = false)
-    {
-        if ($resetx)
-            $this->x = $this->lMargin;
-
-        $this->y = $y;
-    }
-
-    /**
-     * we redifine the original SetXY method, because we don't want the automatic treatment.
-     * It is HTML2PDF that make the treatment
-     *
-     * @param integer $x
-     * @param integer $y
-     * @param boolean $rtloff NOT USED
-     * @access public
-     */
-    public function SetXY($x, $y, $rtloff = false)
-    {
-        $this->x = $x;
-        $this->y = $y;
-    }
-
-    /**
-     * multiple public accessor because HTML2PDF need to use TCPDF without being a extend of it
-     *
-     * @param  mixed
-     * @return mixed
-     * @access public
-     */
-    public function getK()
-    {
-        return $this->k;
-    }
-
-    /**
-     * @return double
-     */
-    public function getW()
-    {
-        return $this->w;
-    }
-
-    /**
-     * @return double
-     */
-    public function getH()
-    {
-        return $this->h;
-    }
-    public function getlMargin()
-    {
-        return $this->lMargin;
-    }
-
-    /**
-     * @return double
-     */
-    public function getrMargin()
-    {
-        return $this->rMargin;
-    }
-
-    /**
-     * @return double
-     */
-    public function gettMargin()
-    {
-        return $this->tMargin;
-    }
-    public function getbMargin()
-    {
-        return $this->bMargin;
-    }
-    public function setbMargin($v)
-    {
-        $this->bMargin = $v;
-    }
-
-    /**
-     * SVG - Convert a SVG Style in PDF Style
-     *
-     * @param  array  $styles SVG Style
-     * @return string PDF style
-     * @access public
-     */
-    public function svgSetStyle($styles)
-    {
-        // init the PDF style
-        $style = '';
-
-        // Style : fill
-        if ($styles['fill']) {
-            $this->setFillColorArray($styles['fill']);
-            $style .= 'F';
-        }
-
-        // Style : stroke
-        if ($styles['stroke'] && $styles['stroke-width']) {
-            $this->SetDrawColorArray($styles['stroke']);
-            $this->SetLineWidth($styles['stroke-width']);
-            $style .= 'D';
-        }
-
-        // Style : opacity
-        if ($styles['fill-opacity']) {
-            $this->SetAlpha($styles['fill-opacity']);
-        }
-
-        return $style;
-    }
-
-    /**
-     * SVG - make a Rectangle
-     *
-     * @param float $x
-     * @param float $y
-     * @param float $w
-     * @param float $h
-     * @param string $style PDF Style
-     * @access public
-     */
-    public function svgRect($x, $y, $w, $h, $style)
-    {
-        // prepare the 4 corners
-        $x1 = $x;
-        $x2 = $x + $w;
-        $x3 = $x + $w;
-        $x4 = $x;
-
-        $y1 = $y;
-        $y2 = $y;
-        $y3 = $y + $h;
-        $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';
-
-        // drawing
-        $this->_Point($x1, $y1, true);
-        $this->_Line($x2, $y2, true);
-        $this->_Line($x3, $y3, true);
-        $this->_Line($x4, $y4, true);
-        $this->_Line($x1, $y1, true);
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - make a Line
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @access public
-     */
-    public function svgLine($x1, $y1, $x2, $y2)
-    {
-        // get the Closing operator
-        $op = 'S';
-
-        // drawing
-        $this->_Point($x1, $y1, true);
-        $this->_Line($x2, $y2, true);
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - make a Ellipse
-     *
-     * @param float  $x0 x Center
-     * @param float  $y0 y Center
-     * @param float  $rx x radius
-     * @param float  $ry y radius
-     * @param string $style PDF Style
-     * @access public
-     */
-    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';
-
-        // drawing
-        $this->_Arc($x0, $y0, $rx, $ry, 0, 2 * M_PI, true, true, true);
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - make a Advanced Polygone
-     *
-     * @param array  $actions list of actions
-     * @param string $style PDF Style
-     * @access public
-     */
-    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';
-
-        // To save the First action and the last point
-        $first = array('', 0, 0);
-        $last = array(0, 0, 0, 0);
-
-        foreach ($actions as $action) {
-            switch ($action[0])
-            {
-                // Start the Path
-                case 'M':
-                case 'm':
-                    $first = $action;
-                    $x = $action[1]; $y = $action[2]; $xc = $x; $yc = $y;
-                    $this->_Point($x, $y, true);
-                    break;
-
-                // Close the Path
-                case 'Z':
-                case 'z':
-                    $x = $first[1]; $y = $first[2]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Line (new point)
-                case 'L':
-                    $x = $action[1]; $y = $action[2]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Line (vector from last point)
-                case 'l':
-                    $x = $last[0] + $action[1]; $y = $last[1] + $action[2]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Horizontal Line (new point)
-                case 'H':
-                    $x = $action[1]; $y = $last[1]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Horisontal Line (vector from last point)
-                case 'h':
-                    $x = $last[0] + $action[1]; $y = $last[1]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Vertical Line (new point)
-                case 'V':
-                    $x = $last[0]; $y = $action[1]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Vertical Line (vector from last point)
-                case 'v':
-                    $x = $last[0]; $y = $last[1] + $action[1]; $xc = $x; $yc = $y;
-                    $this->_Line($x, $y, true);
-                    break;
-
-                // Make a Arc (new point)
-                case 'A':
-                    $rx = $action[1]; // rx
-                    $ry = $action[2]; // ry
-                    $a = $action[3]; // deviation angle of the axis X
-                    $l = $action[4]; // large-arc-flag
-                    $s = $action[5]; // sweep-flag
-                    $x1 = $last[0]; // begin x
-                    $y1 = $last[1]; // begin y
-                    $x2 = $action[6]; // final x
-                    $y2 = $action[7]; // final y
-
-                    $this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
-                    $x = $x2; $y = $y2; $xc = $x; $yc = $y;
-                    break;
-
-                // Make a Arc (vector from last point)
-                case 'a':
-                    $rx = $action[1]; // rx
-                    $ry = $action[2]; // ry
-                    $a = $action[3]; // deviation angle of the axis X
-                    $l = $action[4]; // large-arc-flag
-                    $s = $action[5]; // sweep-flag
-                    $x1 = $last[0]; // begin x
-                    $y1 = $last[1]; // begin y
-                    $x2 = $last[0] + $action[6]; // final x
-                    $y2 = $last[1] + $action[7]; // final y
-
-                    $this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
-                    $x = $x2; $y = $y2; $xc = $x; $yc = $y;
-                    break;
-
-                // Make a Bezier Curve (new point)
-                case 'C':
-                    $x1 = $action[1];
-                    $y1 = $action[2];
-                    $x2 = $action[3];
-                    $y2 = $action[4];
-                    $xf = $action[5];
-                    $yf = $action[6];
-                    $this->_Curve($x1, $y1, $x2, $y2, $xf, $yf, true);
-                    $x = $xf; $y = $yf; $xc = $x2; $yc = $y2;
-                    break;
-
-                // Make a Bezier Curve (vector from last point)
-                case 'c':
-                    $x1 = $last[0] + $action[1];
-                    $y1 = $last[1] + $action[2];
-                    $x2 = $last[0] + $action[3];
-                    $y2 = $last[1] + $action[4];
-                    $xf = $last[0] + $action[5];
-                    $yf = $last[1] + $action[6];
-                    $this->_Curve($x1, $y1, $x2, $y2, $xf, $yf, true);
-                    $x = $xf; $y = $yf; $xc = $x2; $yc = $y2;
-                    break;
-
-                // Unknown Path
-                default:
-                    throw new HTML2PDF_exception(0, 'SVG Path Error : ['.$action[0].'] unkown');
-            }
-
-            // save the last point
-            $last = array($x, $y, $xc, $yc);
-        }
-
-        // finish the path
-        $this->_out($op);
-    }
-
-    /**
-     * SVG - go to a point
-     *
-     * @param float   $x
-     * @param float   $y
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Point($x, $y, $trans = false)
-    {
-        if ($trans) {
-        	$this->ptTransform($x, $y);
-        }
-
-        $this->_out(sprintf('%.2F %.2F m', $x, $y));
-    }
-
-    /**
-     * SVG - make a line from the last point to (x,y)
-     *
-     * @param float   $x
-     * @param float   $y
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Line($x, $y, $trans = false)
-    {
-        if ($trans) {
-        	$this->ptTransform($x, $y);
-        }
-
-        $this->_out(sprintf('%.2F %.2F l', $x, $y));
-    }
-
-    /**
-     * SVG - make a bezier curve from the last point to (xf,yf), with the 2 direction points (x1,y1) and (x2,y2)
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param float $xf
-     * @param float $yf
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Curve($x1, $y1, $x2, $y2, $xf, $yf, $trans = false)
-    {
-        if ($trans) {
-            $this->ptTransform($x1, $y1);
-            $this->ptTransform($x2, $y2);
-            $this->ptTransform($xf, $yf);
-        }
-        $this->_out(sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c', $x1, $y1, $x2, $y2, $xf, $yf));
-    }
-
-    /**
-     * SVG - make a arc with Center, Radius, from angleBegin to angleEnd
-     *
-     * @param float $xc
-     * @param float $yc
-     * @param float $rx
-     * @param float $ry
-     * @param float $angleBegin in radians
-     * @param float $angleEnd in radians
-     * @param boolean $direction
-     * @param boolean $drawFirst, true => add the first point
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Arc(
-        $xc,
-        $yc,
-        $rx,
-        $ry,
-        $angleBegin,
-        $angleEnd,
-        $direction = true,
-        $drawFirst = true,
-        $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.;
-
-        // cut in segment to convert in berize curv
-        $dt = ($angleEnd - $angleBegin) / self::ARC_NB_SEGMENT;
-        $dtm = $dt / 3;
-
-        // center of the arc
-        $x0 = $xc; $y0 = $yc;
-
-        // calculing the first point
-        $t1 = $angleBegin;
-        $a0 = $x0 + ($rx * cos($t1));
-        $b0 = $y0 + ($ry * sin($t1));
-        $c0 = -$rx * sin($t1);
-        $d0 = $ry * cos($t1);
-
-        // if drawFirst => draw the first point
-        if ($drawFirst) {
-        	$this->_Point($a0, $b0, $trans);
-        }
-
-        // foreach segment
-        for ($i = 1; $i <= self::ARC_NB_SEGMENT; $i++) {
-            // calculing the next point
-            $t1 = ($i * $dt) + $angleBegin;
-            $a1 = $x0 + ($rx * cos($t1));
-            $b1 = $y0 + ($ry * sin($t1));
-            $c1 = -$rx * sin($t1);
-            $d1 = $ry * cos($t1);
-
-            // make the bezier curv
-            $this->_Curve(
-                $a0 + ($c0 * $dtm), $b0 + ($d0 * $dtm),
-                $a1 - ($c1 * $dtm), $b1 - ($d1 * $dtm),
-                $a1, $b1,
-                $trans
-            );
-
-            // save the point
-            $a0 = $a1;
-            $b0 = $b1;
-            $c0 = $c1;
-            $d0 = $d1;
-        }
-    }
-
-    /**
-     * SVG - make a arc from Pt1 to Pt2, with Radius
-     *
-     * @param float $x1
-     * @param float $y1
-     * @param float $x2
-     * @param float $y2
-     * @param float $rx
-     * @param float $ry
-     * @param float $angle deviation angle of the axis X
-     * @param integer $l large-arc-flag
-     * @param integer $s sweep-flag
-     * @param boolean $trans apply transformation
-     * @access protected
-     */
-    protected function _Arc2($x1, $y1, $x2, $y2, $rx, $ry, $angle = 0., $l = 0, $s = 0, $trans = false)
-    {
-        // array to stock the parameters
-        $v = array();
-
-        // the original values
-        $v['x1'] = $x1;
-        $v['y1'] = $y1;
-        $v['x2'] = $x2;
-        $v['y2'] = $y2;
-        $v['rx'] = $rx;
-        $v['ry'] = $ry;
-
-        // rotate with the deviation angle of the axis X
-        $v['xr1'] = $v['x1'] * cos($angle) - $v['y1'] * sin($angle);
-        $v['yr1'] = $v['x1'] * sin($angle) + $v['y1'] * cos($angle);
-        $v['xr2'] = $v['x2'] * cos($angle) - $v['y2'] * sin($angle);
-        $v['yr2'] = $v['x2'] * sin($angle) + $v['y2'] * cos($angle);
-
-        // the normalized vector
-        $v['Xr1'] = $v['xr1'] / $v['rx'];
-        $v['Yr1'] = $v['yr1'] / $v['ry'];
-        $v['Xr2'] = $v['xr2'] / $v['rx'];
-        $v['Yr2'] = $v['yr2'] / $v['ry'];
-        $v['dXr'] = $v['Xr2'] - $v['Xr1'];
-        $v['dYr'] = $v['Yr2'] - $v['Yr1'];
-        $v['D'] = $v['dXr'] * $v['dXr'] + $v['dYr'] * $v['dYr'];
-
-        // if |vector| is Null, or if |vector| > 2 : impossible to make a arc => Line
-        if ($v['D'] == 0 || $v['D'] > 4) {
-            $this->_Line($x2, $y2, $trans);
-            return false;
-        }
-
-        // convert paramters for make a arc with Center, Radius, from angleBegin to angleEnd
-        $v['s1'] = array();
-        $v['s1']['t'] = sqrt((4. - $v['D']) / $v['D']);
-        $v['s1']['Xr'] = ($v['Xr1'] + $v['Xr2']) / 2. + $v['s1']['t'] * ($v['Yr2'] - $v['Yr1']) / 2.;
-        $v['s1']['Yr'] = ($v['Yr1'] + $v['Yr2']) / 2. + $v['s1']['t'] * ($v['Xr1'] - $v['Xr2']) / 2.;
-        $v['s1']['xr'] = $v['s1']['Xr'] * $v['rx'];
-        $v['s1']['yr'] = $v['s1']['Yr'] * $v['ry'];
-        $v['s1']['x'] = $v['s1']['xr'] * cos($angle) + $v['s1']['yr'] * sin($angle);
-        $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;
-
-        $v['s2'] = array();
-        $v['s2']['t'] = -$v['s1']['t'];
-        $v['s2']['Xr'] = ($v['Xr1'] + $v['Xr2']) / 2. + $v['s2']['t'] * ($v['Yr2'] - $v['Yr1']) / 2.;
-        $v['s2']['Yr'] = ($v['Yr1'] + $v['Yr2']) / 2. + $v['s2']['t'] * ($v['Xr1'] - $v['Xr2']) / 2.;
-        $v['s2']['xr'] = $v['s2']['Xr'] * $v['rx'];
-        $v['s2']['yr'] = $v['s2']['Yr'] * $v['ry'];
-        $v['s2']['x'] = $v['s2']['xr'] * cos($angle) + $v['s2']['yr'] * sin($angle);
-        $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 ( ! $l) {
-            if ($s) {
-                $xc = $v['s2']['x'];
-                $yc = $v['s2']['y'];
-                $a1 = $v['s2']['a1'];
-                $a2 = $v['s2']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
-            } else {
-                $xc = $v['s1']['x'];
-                $yc = $v['s1']['y'];
-                $a1 = $v['s1']['a1'];
-                $a2 = $v['s1']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
-            }
-        } else {
-            if ($s) {
-                $xc = $v['s1']['x'];
-                $yc = $v['s1']['y'];
-                $a1 = $v['s1']['a1'];
-                $a2 = $v['s1']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
-            } else {
-                $xc = $v['s2']['x'];
-                $yc = $v['s2']['y'];
-                $a1 = $v['s2']['a1'];
-                $a2 = $v['s2']['a2'];
-                $this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
-            }
-        }
-    }
-
-    /**
-     * SVG - transform the point (reference)
-     *
-     * @param float &$x
-     * @param float &$y
-     * @param boolean $trans true => convert into PDF unit
-     * @param double $x
-     * @param double $y
-     * @return boolean
-     * @access public
-     */
-    public function ptTransform(&$x, &$y, $trans = true)
-    {
-        // 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);
-
-        // apply the Transformation Matrix
-        list($x, $y) = array(($x * $m[0] + $y * $m[2] + $m[4]), ($x * $m[1] + $y * $m[3] + $m[5]));
-
-        // if true => convert into PDF unit
-        if ($trans) {
-            $x = $x * $this->k;
-            $y = ($this->h - $y) * $this->k;
-        }
-
-        return true;
-    }
-
-    /**
-     * SVG - add a transformation Matric
-     *
-     * @param array $n matrix
-     * @access public
-     */
-    public function doTransform($n = null)
-    {
-        // 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 no transform, get the Identity Matrix
-        if ( ! $n) $n = array(1, 0, 0, 1, 0, 0);
-
-        // create the new Transformation Matrix
-        $this->_transf[] = array(
-            $m[0] * $n[0] + $m[2] * $n[1],
-            $m[1] * $n[0] + $m[3] * $n[1],
-            $m[0] * $n[2] + $m[2] * $n[3],
-            $m[1] * $n[2] + $m[3] * $n[3],
-            $m[0] * $n[4] + $m[2] * $n[5] + $m[4],
-            $m[1] * $n[4] + $m[3] * $n[5] + $m[5]
-        );
-    }
-
-    /**
-     * SVG - remove a transformation Matric
-     *
-     * @access public
-     */
-    public function undoTransform()
-    {
-        array_pop($this->_transf);
-    }
-
-    /**
-     * Convert a HTML2PDF barcode in a TCPDF barcode
-     *
-     * @param string $code code to print
-     * @param string $type type of barcode (see tcpdf/barcodes.php for supported formats)
-     * @param int $x x position in user units
-     * @param int $y y position in user units
-     * @param int $w width in user units
-     * @param int $h height in user units
-     * @param int $labelFontsize of the Test Label. If false : no Label
-     * @param array $color color of the foreground
-     * @access public
-     */
-    public function myBarcode($code, $type, $x, $y, $w, $h, $labelFontsize, $color)
-    {
-        // the style of the barcode
-        $style = array(
-            'position' => 'S',
-            'text' => ($labelFontsize ? true : false),
-            'fgcolor' => $color,
-            'bgcolor' => false,
-        );
-
-        // build the barcode
-        $this->write1DBarcode($code, $type, $x, $y, $w, $h, '', $style, 'N');
-
-        // it Label => add the FontSize to the height
-        if ($labelFontsize) $h += ($labelFontsize);
-
-        // return the size of the barcode
-        return array($w, $h);
-    }
-
-    /**
-     * create a automatic Index on a page
-     *
-     * @param html2pdf $obj           parent object
-     * @param string   $titre         Title of the Index Page
-     * @param integer  $sizeTitle     Font size for hthe Title
-     * @param integer  $sizeBookmark  Font size for the bookmarks
-     * @param boolean  $bookmarkTitle Bookmark the Title
-     * @param boolean  $displayPage   Display the page number for each bookmark
-     * @param integer  $page draw the automatic Index on a specific Page. if null => add a page at the end
-     * @param string   $fontName      FontName to use
-     * @access public
-     */
-    public function createIndex(
-        &$obj,
-        $titre = 'Index',
-        $sizeTitle = 20,
-        $sizeBookmark = 15,
-        $bookmarkTitle = true,
-        $displayPage = true,
-        $page = null,
-        $fontName = 'helvetica')
-    {
-        // bookmark the Title if wanted
-        if ($bookmarkTitle) {
-        	$this->Bookmark($titre, 0, -1);
-        }
-
-        // display the Title with the good Font size
-        $this->SetFont($fontName, '', $sizeTitle);
-        $this->Cell(0, 5, $titre, 0, 1, 'C');
-
-        // set the good Font size for the bookmarks
-        $this->SetFont($fontName, '', $sizeBookmark);
-        $this->Ln(10);
-
-        // get the number of bookmarks
-        $size = sizeof($this->outlines);
-
-        // get the size of the "P. xx" cell
-        $pageCellSize = $this->GetStringWidth('p. '.$this->outlines[$size - 1]['p']) + 2;
-
-        // Foreach bookmark
-        for ($i = 0; $i < $size; $i++) {
-            // if we need a new page => add a new page
-            if ($this->getY() + $this->FontSize >= ($this->h - $this->bMargin)) {
-                $obj->_INDEX_NewPage($page);
-                $this->SetFont($fontName, '', $sizeBookmark);
-            }
-
-            // Offset of the current level
-            $level = $this->outlines[$i]['l'];
-            if ($level > 0) $this->Cell($level * 8);
-
-            // Caption (cut to fit on the width page)
-            $str = $this->outlines[$i]['t'];
-            $strsize = $this->GetStringWidth($str);
-            $availableSize = $this->w - $this->lMargin - $this->rMargin - $pageCellSize - ($level * 8) - 4;
-            while ($strsize >= $availableSize) {
-                $str = substr($str, 0, -1);
-                $strsize = $this->GetStringWidth($str);
-            }
-
-            // if we want to display the page nmber
-            if ($displayPage) {
-                // display the Bookmark Caption
-                $this->Cell($strsize + 2, $this->FontSize + 2, $str);
-
-                //Filling dots
-                $w = $this->w - $this->lMargin - $this->rMargin - $pageCellSize - ($level * 8) - ($strsize + 2);
-                $nb = $w / $this->GetStringWidth('.');
-                $dots = str_repeat('.', $nb);
-                $this->Cell($w, $this->FontSize + 2, $dots, 0, 0, 'R');
-
-                //Page number
-                $this->Cell($pageCellSize, $this->FontSize + 2, 'p. '.$this->outlines[$i]['p'], 0, 1, 'R');
-            } else {
-                // display the Bookmark Caption
-                $this->Cell($strsize + 2, $this->FontSize + 2, $str, 0, 1);
-            }
-        }
-    }
-
-    /**
-     * Returns the string alias used for the total number of pages.
-     *
-     * @access public
-     * @return string;
-     * @see TCPDF::getAliasNbPages(), TCPDF::getPageGroupAlias()
-     */
-    public function getMyAliasNbPages()
-    {
-        if ($this->_myLastPageGroupNb == 0) {
-            return $this->getAliasNbPages();
-        } else {
-            $old = $this->currpagegroup;
-            $this->currpagegroup = '{nb'.$this->_myLastPageGroupNb.'}';
-            $new = $this->getPageGroupAlias();
-            $this->currpagegroup = $old;
-
-            return $new;
-        }
-    }
-
-    /**
-     * Returns the current page number.
-     *
-     * @access public
-     * @param  integer $page
-     * @return integer;
-     */
-    public function getMyNumPage($page = null)
-    {
-        if ($page === null) {
-            $page = $this->page;
-        }
-
-        if ($this->_myLastPageGroupNb == 0) {
-            return $page;
-        } else {
-            return $page - $this->_myLastPageGroup;
-        }
-    }
-
-    /**
-     * Start a new group of pages
-     *
-     * @access public
-     * @return integer;
-     * @see tcpdf::startPageGroup
-     */
-    public function myStartPageGroup()
-    {
-        $this->_myLastPageGroup = $this->page - 1;
-        $this->_myLastPageGroupNb++;
-    }
-
-    /**
-     * get $_myLastPageGroup;
-     *
-     * @access public
-     * @return integer $_myLastPageGroup;
-     */
-    public function getMyLastPageGroup()
-    {
-        return $this->_myLastPageGroup;
-    }
-
-    /**
-     * set $_myLastPageGroup;
-     *
-     * @access public
-     * @param integer $myLastPageGroup;
-     * @param integer $myLastPageGroup
-     */
-    public function setMyLastPageGroup($myLastPageGroup)
-    {
-        $this->_myLastPageGroup = $myLastPageGroup;
-    }
-
-    /**
-     * get $_myLastPageGroupNb;
-     *
-     * @access public
-     * @return integer $_myLastPageGroupNb;
-     */
-    public function getMyLastPageGroupNb()
-    {
-        return $this->_myLastPageGroupNb;
-    }
-
-    /**
-     * set $_myLastPageGroupNb;
-     *
-     * @access public
-     * @param integer $myLastPageGroupNb;
-     * @param integer $myLastPageGroupNb
-     */
-    public function setMyLastPageGroupNb($myLastPageGroupNb)
-    {
-        $this->_myLastPageGroupNb = $myLastPageGroupNb;
-    }
+	protected $_footerParam = array();
+	protected $_transf      = array();
+	protected $_myLastPageGroup = null;
+	protected $_myLastPageGroupNb = 0;
+
+	// used to make a radius with bezier : (4/3 * (sqrt(2) - 1))
+	const MY_ARC = 0.5522847498;
+
+	// nb of segment to build a arc with bezier curv
+	const ARC_NB_SEGMENT = 8;
+
+	/**
+	 * class constructor
+	 *
+	 * @param string  $orientation page orientation, same as TCPDF
+	 * @param string  $unit        User measure unit, same as TCPDF
+	 * @param mixed   $format      The format used for pages, same as TCPDF
+	 * @param boolean $unicode     TRUE means that the input text is unicode (default = true)
+	 * @param String  $encoding    charset encoding; default is UTF-8
+	 * @param boolean $diskcache   if TRUE reduce the RAM memory usage by caching temporary data on filesystem (slower).
+	 * @access public
+	 */
+	public function __construct(
+		$orientation = 'P',
+		$unit = 'mm',
+		$format = 'A4',
+		$unicode = true,
+		$encoding = 'UTF-8',
+		$diskcache = false)
+	{
+		// call the parent constructor
+		parent::__construct($orientation, $unit, $format, $unicode, $encoding, $diskcache);
+
+		// init the specific parameters used by HTML2PDF
+		$this->SetCreator(PDF_CREATOR);
+		$this->SetAutoPageBreak(false, 0);
+		$this->linestyleCap = '2 J';
+		$this->setPrintHeader(false);
+		$this->jpeg_quality = 90;
+
+		// prepare the automatic footer
+		$this->SetMyFooter();
+
+		$this->cMargin = 0;
+	}
+
+	/**
+	 * Set the parameters for the automatic footer
+	 *
+	 * @param boolean $page display the page number
+	 * @param boolean $date display the date
+	 * @param boolean $hour display the hour
+	 * @param boolean $form display a warning abour forms
+	 * @access public
+	 */
+	public function SetMyFooter($page = false, $date = false, $hour = false, $form = false)
+	{
+		$page    = ($page ? true : false);
+		$date    = ($date ? true : false);
+		$hour    = ($hour ? true : false);
+		$form    = ($form ? true : false);
+
+		$this->_footerParam = array('page' => $page, 'date' => $date, 'hour' => $hour, 'form' => $form);
+	}
+
+	/**
+	 * This function is call automatically by TCPDF at the end of a page
+	 * It takes no parameters
+	 *
+	 * @access public
+	 */
+	public function Footer()
+	{
+		// prepare the text from the tranlated text
+		$txt = '';
+		if ($this->_footerParam['form']) {
+			$txt = (HTML2PDF_locale::get('pdf05'));
+		}
+		if ($this->_footerParam['date'] && $this->_footerParam['hour']) {
+			$txt .= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf03'));
+		}
+		if ($this->_footerParam['date'] && ! $this->_footerParam['hour']) {
+			$txt .= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf01'));
+		}
+		if ( ! $this->_footerParam['date'] && $this->_footerParam['hour']) {
+			$txt .= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf02'));
+		}
+		if ($this->_footerParam['page']) {
+			$txt .= ($txt ? ' - ' : '').(HTML2PDF_locale::get('pdf04'));
+		}
+
+		if (strlen($txt) > 0) {
+			// replace some values
+			$toReplace = array(
+				'[[date_d]]'  => date('d'),
+				'[[date_m]]'  => date('m'),
+				'[[date_y]]'  => date('Y'),
+				'[[date_h]]'  => date('H'),
+				'[[date_i]]'  => date('i'),
+				'[[date_s]]'  => date('s'),
+				'[[page_cu]]' => $this->getMyNumPage(),
+				'[[page_nb]]' => $this->getMyAliasNbPages(),
+			);
+			$txt = str_replace(array_keys($toReplace), array_values($toReplace), $txt);
+
+			// draw the footer
+			parent::SetY(-11);
+			$this->SetFont('helvetica', 'I', 8);
+			$this->Cell(0, 10, $txt, 0, 0, 'R');
+		}
+	}
+
+	 /**
+	  * after cloning a object, we does not want to clone all the front informations
+	  * because it take a lot a time and a lot of memory => we use reference
+	  *
+	  * @param &HTML2PDF_myPdf object
+	  * @param HTML2PDF_myPdf $pdf
+	  * @access public
+	  */
+	public function cloneFontFrom(&$pdf)
+	{
+		$this->fonts            = &$pdf->getFonts();
+		$this->FontFiles        = &$pdf->getFontFiles();
+		$this->diffs            = &$pdf->getDiffs();
+		$this->fontlist         = &$pdf->getFontList();
+		$this->numfonts         = &$pdf->getNumFonts();
+		$this->fontkeys         = &$pdf->getFontKeys();
+		$this->font_obj_ids     = &$pdf->getFontObjIds();
+		$this->annotation_fonts = &$pdf->getAnnotFonts();
+	}
+
+	/**
+	 * multiple public accessor for some private attributs
+	 * used only by cloneFontFrom
+	 *
+	 * @return &array
+	 * @access public
+	 */
+	public function &getFonts()
+	{
+		return $this->fonts;
+	}
+	public function &getFontFiles()
+	{
+		return $this->FontFiles;
+	}
+	public function &getDiffs()
+	{
+		return $this->diffs;
+	}
+	public function &getFontList()
+	{
+		return $this->fontlist;
+	}
+	public function &getNumFonts()
+	{
+		return $this->numfonts;
+	}
+	public function &getFontKeys()
+	{
+		return $this->fontkeys;
+	}
+	public function &getFontObjIds()
+	{
+		return $this->font_obj_ids;
+	}
+	public function &getAnnotFonts()
+	{
+		return $this->annotation_fonts;
+	}
+
+	/**
+	 * Verify that a Font is already loaded
+	 *
+	 * @param string Font Key
+	 * @return boolean
+	 * @access public
+	 */
+	public function isLoadedFont($fontKey)
+	{
+		if (isset($this->fonts[$fontKey])) {
+			return true;
+		}
+
+		if (isset($this->CoreFonts[$fontKey])) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Get the Word Spacing
+	 *
+	 * @access public
+	 * @return float word spacing
+	 */
+	public function getWordSpacing()
+	{
+		return $this->ws;
+	}
+
+	/**
+	 * set the Word Spacing
+	 *
+	 * @param float word spacing
+	 * @access public
+	 */
+	public function setWordSpacing($ws = 0.)
+	{
+		$this->ws = $ws;
+		$this->_out(sprintf('%.3F Tw', $ws * $this->k));
+	}
+
+	/**
+	 * start to use a rectangular Cliping Path with radius corners
+	 *
+	 * @param float $x (top left corner)
+	 * @param float $y (top left corner)
+	 * @param float $w (x+w  = botom rigth corner)
+	 * @param float $h (y+h = botom rigth corner)
+	 * @param array $cornerTL radius of the Top Left corner
+	 * @param array $cornerTR radius of the Top Right corner
+	 * @param array $cornerBL radius of the Bottom Left corner
+	 * @param array $cornerBR radius of the Bottom Right corner
+	 * @access public
+	 */
+	public function clippingPathStart(
+		$x = null,
+		$y = null,
+		$w = null,
+		$h = null,
+		$cornerTL = null,
+		$cornerTR = null,
+		$cornerBL = null,
+		$cornerBR = null)
+	{
+		// init the path
+		$path = '';
+
+		// if we have the position and the size of the rectangle, we can proceed
+		if ($x !== null && $y !== null && $w !== null && $h !== null) {
+			// the positions of the rectangle's corners
+			$x1 = $x * $this->k;
+			$y1 = ($this->h - $y) * $this->k;
+
+			$x2 = ($x + $w) * $this->k;
+			$y2 = ($this->h - $y) * $this->k;
+
+			$x3 = ($x + $w) * $this->k;
+			$y3 = ($this->h - $y - $h) * $this->k;
+
+			$x4 = $x * $this->k;
+			$y4 = ($this->h - $y - $h) * $this->k;
+
+			// if we have at least one radius corner, then we proceed to a specific path, else it is just a rectangle
+			if ($cornerTL || $cornerTR || $cornerBL || $cornerBR) {
+				// prepare the radius values
+				if ($cornerTL) {
+					$cornerTL[0] = $cornerTL[0] * $this->k;
+					$cornerTL[1] = -$cornerTL[1] * $this->k;
+				}
+				if ($cornerTR) {
+					$cornerTR[0] = $cornerTR[0] * $this->k;
+					$cornerTR[1] = -$cornerTR[1] * $this->k;
+				}
+				if ($cornerBL) {
+					$cornerBL[0] = $cornerBL[0] * $this->k;
+					$cornerBL[1] = -$cornerBL[1] * $this->k;
+				}
+				if ($cornerBR) {
+					$cornerBR[0] = $cornerBR[0] * $this->k;
+					$cornerBR[1] = -$cornerBR[1] * $this->k;
+				}
+
+				// if TL radius then specific start else (X1,Y1)
+				if ($cornerTL) {
+					$path .= sprintf('%.2F %.2F m ', $x1 + $cornerTL[0], $y1);
+				} else {
+					$path .= sprintf('%.2F %.2F m ', $x1, $y1);
+				}
+
+				// if TR radius then line + arc, else line to (X2,Y2)
+				if ($cornerTR) {
+					$xt1 = ($x2 - $cornerTR[0]) + $cornerTR[0] * self::MY_ARC;
+					$yt1 = ($y2 + $cornerTR[1]) - $cornerTR[1];
+					$xt2 = ($x2 - $cornerTR[0]) + $cornerTR[0];
+					$yt2 = ($y2 + $cornerTR[1]) - $cornerTR[1] * self::MY_ARC;
+
+					$path .= sprintf('%.2F %.2F l ', $x2 - $cornerTR[0], $y2);
+					$path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x2, $y2 + $cornerTR[1]);
+				} else {
+					$path .= sprintf('%.2F %.2F l ', $x2, $y2);
+				}
+
+				// if BR radius then line + arc, else line to (X3, Y3)
+				if ($cornerBR) {
+					$xt1 = ($x3 - $cornerBR[0]) + $cornerBR[0];
+					$yt1 = ($y3 - $cornerBR[1]) + $cornerBR[1] * self::MY_ARC;
+					$xt2 = ($x3 - $cornerBR[0]) + $cornerBR[0] * self::MY_ARC;
+					$yt2 = ($y3 - $cornerBR[1]) + $cornerBR[1];
+
+					$path .= sprintf('%.2F %.2F l ', $x3, $y3 - $cornerBR[1]);
+					$path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x3 - $cornerBR[0], $y3);
+				} else {
+					$path .= sprintf('%.2F %.2F l ', $x3, $y3);
+				}
+
+				// if BL radius then line + arc, else line to (X4, Y4)
+				if ($cornerBL) {
+					$xt1 = ($x4 + $cornerBL[0]) - $cornerBL[0] * self::MY_ARC;
+					$yt1 = ($y4 - $cornerBL[1]) + $cornerBL[1];
+					$xt2 = ($x4 + $cornerBL[0]) - $cornerBL[0];
+					$yt2 = ($y4 - $cornerBL[1]) + $cornerBL[1] * self::MY_ARC;
+
+					$path .= sprintf('%.2F %.2F l ', $x4 + $cornerBL[0], $y4);
+					$path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x4, $y4 - $cornerBL[1]);
+				} else {
+					$path .= sprintf('%.2F %.2F l ', $x4, $y4);
+				}
+
+				// if RL radius then line + arc
+				if ($cornerTL) {
+					$xt1 = ($x1 + $cornerTL[0]) - $cornerTL[0];
+					$yt1 = ($y1 + $cornerTL[1]) - $cornerTL[1] * self::MY_ARC;
+					$xt2 = ($x1 + $cornerTL[0]) - $cornerTL[0] * self::MY_ARC;
+					$yt2 = ($y1 + $cornerTL[1]) - $cornerTL[1];
+
+					$path .= sprintf('%.2F %.2F l ', $x1, $y1 + $cornerTL[1]);
+					$path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $x1 + $cornerTL[0], $y1);
+				}
+			} else {
+				$path .= sprintf('%.2F %.2F m ', $x1, $y1);
+				$path .= sprintf('%.2F %.2F l ', $x2, $y2);
+				$path .= sprintf('%.2F %.2F l ', $x3, $y3);
+				$path .= sprintf('%.2F %.2F l ', $x4, $y4);
+			}
+
+			// close the path
+			$path .= ' h W n';
+		}
+
+		// using the path as a clipping path
+		$this->_out('q '.$path.' ');
+	}
+
+	/**
+	 * stop to use the Cliping Path
+	 *
+	 * @access public
+	 */
+	public function clippingPathStop()
+	{
+		$this->_out(' Q');
+	}
+
+	/**
+	 * draw a filled corner of a border with a external and a internal radius
+	 *         /--------+ ext2
+	 *        /         |
+	 *       /  /-------+ int2
+	 *      /  /
+	 *      | /
+	 *      | |
+	 *      | |
+	 * ext1 +-+ int1        + cen
+	 *
+	 * @param float $ext1X
+	 * @param float $ext1Y
+	 * @param float $ext2X
+	 * @param float $ext2Y
+	 * @param float $int1X
+	 * @param float $int1Y
+	 * @param float $int2X
+	 * @param float $int2Y
+	 * @param float $cenX
+	 * @param float $cenY
+	 * @access public
+	 */
+	public function drawCurve($ext1X, $ext1Y, $ext2X, $ext2Y, $int1X, $int1Y, $int2X, $int2Y, $cenX, $cenY)
+	{
+		// prepare the coordinates
+		$ext1X = $ext1X * $this->k;
+		$ext2X = $ext2X * $this->k;
+		$int1X = $int1X * $this->k;
+		$int2X = $int2X * $this->k;
+		$cenX  = $cenX * $this->k;
+
+		$ext1Y = ($this->h - $ext1Y) * $this->k;
+		$ext2Y = ($this->h - $ext2Y) * $this->k;
+		$int1Y = ($this->h - $int1Y) * $this->k;
+		$int2Y = ($this->h - $int2Y) * $this->k;
+		$cenY  = ($this->h - $cenY) * $this->k;
+
+		// init the curve
+		$path = '';
+
+		if ($ext1X - $cenX != 0) {
+			$xt1 = $cenX + ($ext1X - $cenX);
+			$yt1 = $cenY + ($ext2Y - $cenY) * self::MY_ARC;
+			$xt2 = $cenX + ($ext1X - $cenX) * self::MY_ARC;
+			$yt2 = $cenY + ($ext2Y - $cenY);
+		} else {
+			$xt1 = $cenX + ($ext2X - $cenX) * self::MY_ARC;
+			$yt1 = $cenY + ($ext1Y - $cenY);
+			$xt2 = $cenX + ($ext2X - $cenX);
+			$yt2 = $cenY + ($ext1Y - $cenY) * self::MY_ARC;
+		}
+		$path .= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
+		$path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
+
+		if ($int1X - $cenX != 0) {
+			$xt1 = $cenX + ($int1X - $cenX) * self::MY_ARC;
+			$yt1 = $cenY + ($int2Y - $cenY);
+			$xt2 = $cenX + ($int1X - $cenX);
+			$yt2 = $cenY + ($int2Y - $cenY) * self::MY_ARC;
+		} else {
+			$xt1 = $cenX + ($int2X - $cenX);
+			$yt1 = $cenY + ($int1Y - $cenY) * self::MY_ARC;
+			$xt2 = $cenX + ($int2X - $cenX) * self::MY_ARC;
+			$yt2 = $cenY + ($int1Y - $cenY);
+		}
+		$path .= sprintf('%.2F %.2F l ', $int2X, $int2Y);
+		$path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $int1X, $int1Y);
+
+		// draw the curve
+		$this->_out($path.'f');
+	}
+
+	/**
+	 * draw a filled corner of a border with only a external radius
+	 *         /--+ ext2
+	 *        /   |
+	 *       /    |
+	 *      /     |
+	 *      |     |
+	 *      |     |
+	 *      |     |
+	 * ext1 +-----+ int      + cen
+	 *
+	 * @param float $ext1X
+	 * @param float $ext1Y
+	 * @param float $ext2X
+	 * @param float $ext2Y
+	 * @param float $intX
+	 * @param float $intY
+	 * @param float $cenX
+	 * @param float $cenY
+	 * @access public
+	 */
+	public function drawCorner($ext1X, $ext1Y, $ext2X, $ext2Y, $intX, $intY, $cenX, $cenY)
+	{
+		// prepare the coordinates
+		$ext1X = $ext1X * $this->k;
+		$ext2X = $ext2X * $this->k;
+		$intX  = $intX * $this->k;
+		$cenX  = $cenX * $this->k;
+
+		$ext1Y = ($this->h - $ext1Y) * $this->k;
+		$ext2Y = ($this->h - $ext2Y) * $this->k;
+		$intY  = ($this->h - $intY) * $this->k;
+		$cenY  = ($this->h - $cenY) * $this->k;
+
+		// init the curve
+		$path = '';
+
+		if ($ext1X - $cenX != 0) {
+			$xt1 = $cenX + ($ext1X - $cenX);
+			$yt1 = $cenY + ($ext2Y - $cenY) * self::MY_ARC;
+			$xt2 = $cenX + ($ext1X - $cenX) * self::MY_ARC;
+			$yt2 = $cenY + ($ext2Y - $cenY);
+		} else {
+			$xt1 = $cenX + ($ext2X - $cenX) * self::MY_ARC;
+			$yt1 = $cenY + ($ext1Y - $cenY);
+			$xt2 = $cenX + ($ext2X - $cenX);
+			$yt2 = $cenY + ($ext1Y - $cenY) * self::MY_ARC;
+		}
+		$path .= sprintf('%.2F %.2F m ', $ext1X, $ext1Y);
+		$path .= sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c ', $xt1, $yt1, $xt2, $yt2, $ext2X, $ext2Y);
+		$path .= sprintf('%.2F %.2F l ', $intX, $intY);
+		$path .= sprintf('%.2F %.2F l ', $ext1X, $ext1Y);
+
+		// draw the curve
+		$this->_out($path.'f');
+	}
+
+	/**
+	 * Start a transformation
+	 *
+	 * @access public
+	 */
+	public function startTransform()
+	{
+		$this->_out('q');
+	}
+
+	/**
+	 * Stop a transformation
+	 *
+	 * @access public
+	 */
+	public function stopTransform()
+	{
+		$this->_out('Q');
+	}
+
+	/**
+	 * add a Translate transformation
+	 *
+	 * @access public
+	 */
+	public function setTranslate($xT, $yT)
+	{
+		// Matrix for Translate
+		$tm[0] = 1;
+		$tm[1] = 0;
+		$tm[2] = 0;
+		$tm[3] = 1;
+		$tm[4] = $xT * $this->k;
+		$tm[5] = -$yT * $this->k;
+
+		// apply the Transform Matric
+		$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
+	}
+
+	/**
+	 * add a Rotate transformation
+	 *
+	 * @param float $angle
+	 * @access public
+	 */
+	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;
+
+		// prepare the coordinate
+		$yC = ($this->h - $yC) * $this->k;
+		$xC *= $this->k;
+
+		// Matrix for Rotate
+		$tm[0] = cos(deg2rad($angle));
+		$tm[1] = sin(deg2rad($angle));
+		$tm[2] = -$tm[1];
+		$tm[3] = $tm[0];
+		$tm[4] = $xC + $tm[1] * $yC - $tm[0] * $xC;
+		$tm[5] = $yC - $tm[0] * $yC - $tm[1] * $xC;
+
+		// apply the Transform Matric
+		$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $tm[0], $tm[1], $tm[2], $tm[3], $tm[4], $tm[5]));
+	}
+
+	/**
+	 * we redifine the original SetX method, because we don't want the automatic treatment.
+	 * It is HTML2PDF that make the treatment
+	 *
+	 * @param float   $x
+	 * @param boolean $rtloff NOT USED
+	 * @access public
+	 */
+	public function SetX($x, $rtloff = false)
+	{
+		$this->x = $x;
+	}
+
+	/**
+	 * we redifine the original SetY method, because we don't want the automatic treatment.
+	 * It is HTML2PDF that make the treatment
+	 *
+	 * @param float   $y
+	 * @param boolean $resetx Reset the X position
+	 * @param boolean $rtloff NOT USED
+	 * @access public
+	 */
+	public function SetY($y, $resetx = true, $rtloff = false)
+	{
+		if ($resetx)
+			$this->x = $this->lMargin;
+
+		$this->y = $y;
+	}
+
+	/**
+	 * we redifine the original SetXY method, because we don't want the automatic treatment.
+	 * It is HTML2PDF that make the treatment
+	 *
+	 * @param integer $x
+	 * @param integer $y
+	 * @param boolean $rtloff NOT USED
+	 * @access public
+	 */
+	public function SetXY($x, $y, $rtloff = false)
+	{
+		$this->x = $x;
+		$this->y = $y;
+	}
+
+	/**
+	 * multiple public accessor because HTML2PDF need to use TCPDF without being a extend of it
+	 *
+	 * @param  mixed
+	 * @return mixed
+	 * @access public
+	 */
+	public function getK()
+	{
+		return $this->k;
+	}
+
+	/**
+	 * @return double
+	 */
+	public function getW()
+	{
+		return $this->w;
+	}
+
+	/**
+	 * @return double
+	 */
+	public function getH()
+	{
+		return $this->h;
+	}
+	public function getlMargin()
+	{
+		return $this->lMargin;
+	}
+
+	/**
+	 * @return double
+	 */
+	public function getrMargin()
+	{
+		return $this->rMargin;
+	}
+
+	/**
+	 * @return double
+	 */
+	public function gettMargin()
+	{
+		return $this->tMargin;
+	}
+	public function getbMargin()
+	{
+		return $this->bMargin;
+	}
+	public function setbMargin($v)
+	{
+		$this->bMargin = $v;
+	}
+
+	/**
+	 * SVG - Convert a SVG Style in PDF Style
+	 *
+	 * @param  array  $styles SVG Style
+	 * @return string PDF style
+	 * @access public
+	 */
+	public function svgSetStyle($styles)
+	{
+		// init the PDF style
+		$style = '';
+
+		// Style : fill
+		if ($styles['fill']) {
+			$this->setFillColorArray($styles['fill']);
+			$style .= 'F';
+		}
+
+		// Style : stroke
+		if ($styles['stroke'] && $styles['stroke-width']) {
+			$this->SetDrawColorArray($styles['stroke']);
+			$this->SetLineWidth($styles['stroke-width']);
+			$style .= 'D';
+		}
+
+		// Style : opacity
+		if ($styles['fill-opacity']) {
+			$this->SetAlpha($styles['fill-opacity']);
+		}
+
+		return $style;
+	}
+
+	/**
+	 * SVG - make a Rectangle
+	 *
+	 * @param float $x
+	 * @param float $y
+	 * @param float $w
+	 * @param float $h
+	 * @param string $style PDF Style
+	 * @access public
+	 */
+	public function svgRect($x, $y, $w, $h, $style)
+	{
+		// prepare the 4 corners
+		$x1 = $x;
+		$x2 = $x + $w;
+		$x3 = $x + $w;
+		$x4 = $x;
+
+		$y1 = $y;
+		$y2 = $y;
+		$y3 = $y + $h;
+		$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';
+
+		// drawing
+		$this->_Point($x1, $y1, true);
+		$this->_Line($x2, $y2, true);
+		$this->_Line($x3, $y3, true);
+		$this->_Line($x4, $y4, true);
+		$this->_Line($x1, $y1, true);
+		$this->_out($op);
+	}
+
+	/**
+	 * SVG - make a Line
+	 *
+	 * @param float $x1
+	 * @param float $y1
+	 * @param float $x2
+	 * @param float $y2
+	 * @access public
+	 */
+	public function svgLine($x1, $y1, $x2, $y2)
+	{
+		// get the Closing operator
+		$op = 'S';
+
+		// drawing
+		$this->_Point($x1, $y1, true);
+		$this->_Line($x2, $y2, true);
+		$this->_out($op);
+	}
+
+	/**
+	 * SVG - make a Ellipse
+	 *
+	 * @param float  $x0 x Center
+	 * @param float  $y0 y Center
+	 * @param float  $rx x radius
+	 * @param float  $ry y radius
+	 * @param string $style PDF Style
+	 * @access public
+	 */
+	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';
+
+		// drawing
+		$this->_Arc($x0, $y0, $rx, $ry, 0, 2 * M_PI, true, true, true);
+		$this->_out($op);
+	}
+
+	/**
+	 * SVG - make a Advanced Polygone
+	 *
+	 * @param array  $actions list of actions
+	 * @param string $style PDF Style
+	 * @access public
+	 */
+	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';
+
+		// To save the First action and the last point
+		$first = array('', 0, 0);
+		$last = array(0, 0, 0, 0);
+
+		foreach ($actions as $action) {
+			switch ($action[0])
+			{
+				// Start the Path
+				case 'M':
+				case 'm':
+					$first = $action;
+					$x = $action[1]; $y = $action[2]; $xc = $x; $yc = $y;
+					$this->_Point($x, $y, true);
+					break;
+
+				// Close the Path
+				case 'Z':
+				case 'z':
+					$x = $first[1]; $y = $first[2]; $xc = $x; $yc = $y;
+					$this->_Line($x, $y, true);
+					break;
+
+				// Make a Line (new point)
+				case 'L':
+					$x = $action[1]; $y = $action[2]; $xc = $x; $yc = $y;
+					$this->_Line($x, $y, true);
+					break;
+
+				// Make a Line (vector from last point)
+				case 'l':
+					$x = $last[0] + $action[1]; $y = $last[1] + $action[2]; $xc = $x; $yc = $y;
+					$this->_Line($x, $y, true);
+					break;
+
+				// Make a Horizontal Line (new point)
+				case 'H':
+					$x = $action[1]; $y = $last[1]; $xc = $x; $yc = $y;
+					$this->_Line($x, $y, true);
+					break;
+
+				// Make a Horisontal Line (vector from last point)
+				case 'h':
+					$x = $last[0] + $action[1]; $y = $last[1]; $xc = $x; $yc = $y;
+					$this->_Line($x, $y, true);
+					break;
+
+				// Make a Vertical Line (new point)
+				case 'V':
+					$x = $last[0]; $y = $action[1]; $xc = $x; $yc = $y;
+					$this->_Line($x, $y, true);
+					break;
+
+				// Make a Vertical Line (vector from last point)
+				case 'v':
+					$x = $last[0]; $y = $last[1] + $action[1]; $xc = $x; $yc = $y;
+					$this->_Line($x, $y, true);
+					break;
+
+				// Make a Arc (new point)
+				case 'A':
+					$rx = $action[1]; // rx
+					$ry = $action[2]; // ry
+					$a = $action[3]; // deviation angle of the axis X
+					$l = $action[4]; // large-arc-flag
+					$s = $action[5]; // sweep-flag
+					$x1 = $last[0]; // begin x
+					$y1 = $last[1]; // begin y
+					$x2 = $action[6]; // final x
+					$y2 = $action[7]; // final y
+
+					$this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
+					$x = $x2; $y = $y2; $xc = $x; $yc = $y;
+					break;
+
+				// Make a Arc (vector from last point)
+				case 'a':
+					$rx = $action[1]; // rx
+					$ry = $action[2]; // ry
+					$a = $action[3]; // deviation angle of the axis X
+					$l = $action[4]; // large-arc-flag
+					$s = $action[5]; // sweep-flag
+					$x1 = $last[0]; // begin x
+					$y1 = $last[1]; // begin y
+					$x2 = $last[0] + $action[6]; // final x
+					$y2 = $last[1] + $action[7]; // final y
+
+					$this->_Arc2($x1, $y1, $x2, $y2, $rx, $ry, $a, $l, $s, true);
+					$x = $x2; $y = $y2; $xc = $x; $yc = $y;
+					break;
+
+				// Make a Bezier Curve (new point)
+				case 'C':
+					$x1 = $action[1];
+					$y1 = $action[2];
+					$x2 = $action[3];
+					$y2 = $action[4];
+					$xf = $action[5];
+					$yf = $action[6];
+					$this->_Curve($x1, $y1, $x2, $y2, $xf, $yf, true);
+					$x = $xf; $y = $yf; $xc = $x2; $yc = $y2;
+					break;
+
+				// Make a Bezier Curve (vector from last point)
+				case 'c':
+					$x1 = $last[0] + $action[1];
+					$y1 = $last[1] + $action[2];
+					$x2 = $last[0] + $action[3];
+					$y2 = $last[1] + $action[4];
+					$xf = $last[0] + $action[5];
+					$yf = $last[1] + $action[6];
+					$this->_Curve($x1, $y1, $x2, $y2, $xf, $yf, true);
+					$x = $xf; $y = $yf; $xc = $x2; $yc = $y2;
+					break;
+
+				// Unknown Path
+				default:
+					throw new HTML2PDF_exception(0, 'SVG Path Error : ['.$action[0].'] unkown');
+			}
+
+			// save the last point
+			$last = array($x, $y, $xc, $yc);
+		}
+
+		// finish the path
+		$this->_out($op);
+	}
+
+	/**
+	 * SVG - go to a point
+	 *
+	 * @param float   $x
+	 * @param float   $y
+	 * @param boolean $trans apply transformation
+	 * @access protected
+	 */
+	protected function _Point($x, $y, $trans = false)
+	{
+		if ($trans) {
+			$this->ptTransform($x, $y);
+		}
+
+		$this->_out(sprintf('%.2F %.2F m', $x, $y));
+	}
+
+	/**
+	 * SVG - make a line from the last point to (x,y)
+	 *
+	 * @param float   $x
+	 * @param float   $y
+	 * @param boolean $trans apply transformation
+	 * @access protected
+	 */
+	protected function _Line($x, $y, $trans = false)
+	{
+		if ($trans) {
+			$this->ptTransform($x, $y);
+		}
+
+		$this->_out(sprintf('%.2F %.2F l', $x, $y));
+	}
+
+	/**
+	 * SVG - make a bezier curve from the last point to (xf,yf), with the 2 direction points (x1,y1) and (x2,y2)
+	 *
+	 * @param float $x1
+	 * @param float $y1
+	 * @param float $x2
+	 * @param float $y2
+	 * @param float $xf
+	 * @param float $yf
+	 * @param boolean $trans apply transformation
+	 * @access protected
+	 */
+	protected function _Curve($x1, $y1, $x2, $y2, $xf, $yf, $trans = false)
+	{
+		if ($trans) {
+			$this->ptTransform($x1, $y1);
+			$this->ptTransform($x2, $y2);
+			$this->ptTransform($xf, $yf);
+		}
+		$this->_out(sprintf('%.2F %.2F %.2F %.2F %.2F %.2F c', $x1, $y1, $x2, $y2, $xf, $yf));
+	}
+
+	/**
+	 * SVG - make a arc with Center, Radius, from angleBegin to angleEnd
+	 *
+	 * @param float $xc
+	 * @param float $yc
+	 * @param float $rx
+	 * @param float $ry
+	 * @param float $angleBegin in radians
+	 * @param float $angleEnd in radians
+	 * @param boolean $direction
+	 * @param boolean $drawFirst, true => add the first point
+	 * @param boolean $trans apply transformation
+	 * @access protected
+	 */
+	protected function _Arc(
+		$xc,
+		$yc,
+		$rx,
+		$ry,
+		$angleBegin,
+		$angleEnd,
+		$direction = true,
+		$drawFirst = true,
+		$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.;
+
+		// cut in segment to convert in berize curv
+		$dt = ($angleEnd - $angleBegin) / self::ARC_NB_SEGMENT;
+		$dtm = $dt / 3;
+
+		// center of the arc
+		$x0 = $xc; $y0 = $yc;
+
+		// calculing the first point
+		$t1 = $angleBegin;
+		$a0 = $x0 + ($rx * cos($t1));
+		$b0 = $y0 + ($ry * sin($t1));
+		$c0 = -$rx * sin($t1);
+		$d0 = $ry * cos($t1);
+
+		// if drawFirst => draw the first point
+		if ($drawFirst) {
+			$this->_Point($a0, $b0, $trans);
+		}
+
+		// foreach segment
+		for ($i = 1; $i <= self::ARC_NB_SEGMENT; $i++) {
+			// calculing the next point
+			$t1 = ($i * $dt) + $angleBegin;
+			$a1 = $x0 + ($rx * cos($t1));
+			$b1 = $y0 + ($ry * sin($t1));
+			$c1 = -$rx * sin($t1);
+			$d1 = $ry * cos($t1);
+
+			// make the bezier curv
+			$this->_Curve(
+				$a0 + ($c0 * $dtm), $b0 + ($d0 * $dtm),
+				$a1 - ($c1 * $dtm), $b1 - ($d1 * $dtm),
+				$a1, $b1,
+				$trans
+			);
+
+			// save the point
+			$a0 = $a1;
+			$b0 = $b1;
+			$c0 = $c1;
+			$d0 = $d1;
+		}
+	}
+
+	/**
+	 * SVG - make a arc from Pt1 to Pt2, with Radius
+	 *
+	 * @param float $x1
+	 * @param float $y1
+	 * @param float $x2
+	 * @param float $y2
+	 * @param float $rx
+	 * @param float $ry
+	 * @param float $angle deviation angle of the axis X
+	 * @param integer $l large-arc-flag
+	 * @param integer $s sweep-flag
+	 * @param boolean $trans apply transformation
+	 * @access protected
+	 */
+	protected function _Arc2($x1, $y1, $x2, $y2, $rx, $ry, $angle = 0., $l = 0, $s = 0, $trans = false)
+	{
+		// array to stock the parameters
+		$v = array();
+
+		// the original values
+		$v['x1'] = $x1;
+		$v['y1'] = $y1;
+		$v['x2'] = $x2;
+		$v['y2'] = $y2;
+		$v['rx'] = $rx;
+		$v['ry'] = $ry;
+
+		// rotate with the deviation angle of the axis X
+		$v['xr1'] = $v['x1'] * cos($angle) - $v['y1'] * sin($angle);
+		$v['yr1'] = $v['x1'] * sin($angle) + $v['y1'] * cos($angle);
+		$v['xr2'] = $v['x2'] * cos($angle) - $v['y2'] * sin($angle);
+		$v['yr2'] = $v['x2'] * sin($angle) + $v['y2'] * cos($angle);
+
+		// the normalized vector
+		$v['Xr1'] = $v['xr1'] / $v['rx'];
+		$v['Yr1'] = $v['yr1'] / $v['ry'];
+		$v['Xr2'] = $v['xr2'] / $v['rx'];
+		$v['Yr2'] = $v['yr2'] / $v['ry'];
+		$v['dXr'] = $v['Xr2'] - $v['Xr1'];
+		$v['dYr'] = $v['Yr2'] - $v['Yr1'];
+		$v['D'] = $v['dXr'] * $v['dXr'] + $v['dYr'] * $v['dYr'];
+
+		// if |vector| is Null, or if |vector| > 2 : impossible to make a arc => Line
+		if ($v['D'] == 0 || $v['D'] > 4) {
+			$this->_Line($x2, $y2, $trans);
+			return false;
+		}
+
+		// convert paramters for make a arc with Center, Radius, from angleBegin to angleEnd
+		$v['s1'] = array();
+		$v['s1']['t'] = sqrt((4. - $v['D']) / $v['D']);
+		$v['s1']['Xr'] = ($v['Xr1'] + $v['Xr2']) / 2. + $v['s1']['t'] * ($v['Yr2'] - $v['Yr1']) / 2.;
+		$v['s1']['Yr'] = ($v['Yr1'] + $v['Yr2']) / 2. + $v['s1']['t'] * ($v['Xr1'] - $v['Xr2']) / 2.;
+		$v['s1']['xr'] = $v['s1']['Xr'] * $v['rx'];
+		$v['s1']['yr'] = $v['s1']['Yr'] * $v['ry'];
+		$v['s1']['x'] = $v['s1']['xr'] * cos($angle) + $v['s1']['yr'] * sin($angle);
+		$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;
+
+		$v['s2'] = array();
+		$v['s2']['t'] = -$v['s1']['t'];
+		$v['s2']['Xr'] = ($v['Xr1'] + $v['Xr2']) / 2. + $v['s2']['t'] * ($v['Yr2'] - $v['Yr1']) / 2.;
+		$v['s2']['Yr'] = ($v['Yr1'] + $v['Yr2']) / 2. + $v['s2']['t'] * ($v['Xr1'] - $v['Xr2']) / 2.;
+		$v['s2']['xr'] = $v['s2']['Xr'] * $v['rx'];
+		$v['s2']['yr'] = $v['s2']['Yr'] * $v['ry'];
+		$v['s2']['x'] = $v['s2']['xr'] * cos($angle) + $v['s2']['yr'] * sin($angle);
+		$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 ( ! $l) {
+			if ($s) {
+				$xc = $v['s2']['x'];
+				$yc = $v['s2']['y'];
+				$a1 = $v['s2']['a1'];
+				$a2 = $v['s2']['a2'];
+				$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
+			} else {
+				$xc = $v['s1']['x'];
+				$yc = $v['s1']['y'];
+				$a1 = $v['s1']['a1'];
+				$a2 = $v['s1']['a2'];
+				$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
+			}
+		} else {
+			if ($s) {
+				$xc = $v['s1']['x'];
+				$yc = $v['s1']['y'];
+				$a1 = $v['s1']['a1'];
+				$a2 = $v['s1']['a2'];
+				$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, true, false, $trans);
+			} else {
+				$xc = $v['s2']['x'];
+				$yc = $v['s2']['y'];
+				$a1 = $v['s2']['a1'];
+				$a2 = $v['s2']['a2'];
+				$this->_Arc($xc, $yc, $rx, $ry, $a1, $a2, false, false, $trans);
+			}
+		}
+	}
+
+	/**
+	 * SVG - transform the point (reference)
+	 *
+	 * @param float &$x
+	 * @param float &$y
+	 * @param boolean $trans true => convert into PDF unit
+	 * @param double $x
+	 * @param double $y
+	 * @return boolean
+	 * @access public
+	 */
+	public function ptTransform(&$x, &$y, $trans = true)
+	{
+		// 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);
+
+		// apply the Transformation Matrix
+		list($x, $y) = array(($x * $m[0] + $y * $m[2] + $m[4]), ($x * $m[1] + $y * $m[3] + $m[5]));
+
+		// if true => convert into PDF unit
+		if ($trans) {
+			$x = $x * $this->k;
+			$y = ($this->h - $y) * $this->k;
+		}
+
+		return true;
+	}
+
+	/**
+	 * SVG - add a transformation Matric
+	 *
+	 * @param array $n matrix
+	 * @access public
+	 */
+	public function doTransform($n = null)
+	{
+		// 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 no transform, get the Identity Matrix
+		if ( ! $n) $n = array(1, 0, 0, 1, 0, 0);
+
+		// create the new Transformation Matrix
+		$this->_transf[] = array(
+			$m[0] * $n[0] + $m[2] * $n[1],
+			$m[1] * $n[0] + $m[3] * $n[1],
+			$m[0] * $n[2] + $m[2] * $n[3],
+			$m[1] * $n[2] + $m[3] * $n[3],
+			$m[0] * $n[4] + $m[2] * $n[5] + $m[4],
+			$m[1] * $n[4] + $m[3] * $n[5] + $m[5]
+		);
+	}
+
+	/**
+	 * SVG - remove a transformation Matric
+	 *
+	 * @access public
+	 */
+	public function undoTransform()
+	{
+		array_pop($this->_transf);
+	}
+
+	/**
+	 * Convert a HTML2PDF barcode in a TCPDF barcode
+	 *
+	 * @param string $code code to print
+	 * @param string $type type of barcode (see tcpdf/barcodes.php for supported formats)
+	 * @param int $x x position in user units
+	 * @param int $y y position in user units
+	 * @param int $w width in user units
+	 * @param int $h height in user units
+	 * @param int $labelFontsize of the Test Label. If false : no Label
+	 * @param array $color color of the foreground
+	 * @access public
+	 */
+	public function myBarcode($code, $type, $x, $y, $w, $h, $labelFontsize, $color)
+	{
+		// the style of the barcode
+		$style = array(
+			'position' => 'S',
+			'text' => ($labelFontsize ? true : false),
+			'fgcolor' => $color,
+			'bgcolor' => false,
+		);
+
+		// build the barcode
+		$this->write1DBarcode($code, $type, $x, $y, $w, $h, '', $style, 'N');
+
+		// it Label => add the FontSize to the height
+		if ($labelFontsize) $h += ($labelFontsize);
+
+		// return the size of the barcode
+		return array($w, $h);
+	}
+
+	/**
+	 * create a automatic Index on a page
+	 *
+	 * @param html2pdf $obj           parent object
+	 * @param string   $titre         Title of the Index Page
+	 * @param integer  $sizeTitle     Font size for hthe Title
+	 * @param integer  $sizeBookmark  Font size for the bookmarks
+	 * @param boolean  $bookmarkTitle Bookmark the Title
+	 * @param boolean  $displayPage   Display the page number for each bookmark
+	 * @param integer  $page draw the automatic Index on a specific Page. if null => add a page at the end
+	 * @param string   $fontName      FontName to use
+	 * @access public
+	 */
+	public function createIndex(
+		&$obj,
+		$titre = 'Index',
+		$sizeTitle = 20,
+		$sizeBookmark = 15,
+		$bookmarkTitle = true,
+		$displayPage = true,
+		$page = null,
+		$fontName = 'helvetica')
+	{
+		// bookmark the Title if wanted
+		if ($bookmarkTitle) {
+			$this->Bookmark($titre, 0, -1);
+		}
+
+		// display the Title with the good Font size
+		$this->SetFont($fontName, '', $sizeTitle);
+		$this->Cell(0, 5, $titre, 0, 1, 'C');
+
+		// set the good Font size for the bookmarks
+		$this->SetFont($fontName, '', $sizeBookmark);
+		$this->Ln(10);
+
+		// get the number of bookmarks
+		$size = sizeof($this->outlines);
+
+		// get the size of the "P. xx" cell
+		$pageCellSize = $this->GetStringWidth('p. '.$this->outlines[$size - 1]['p']) + 2;
+
+		// Foreach bookmark
+		for ($i = 0; $i < $size; $i++) {
+			// if we need a new page => add a new page
+			if ($this->getY() + $this->FontSize >= ($this->h - $this->bMargin)) {
+				$obj->_INDEX_NewPage($page);
+				$this->SetFont($fontName, '', $sizeBookmark);
+			}
+
+			// Offset of the current level
+			$level = $this->outlines[$i]['l'];
+			if ($level > 0) $this->Cell($level * 8);
+
+			// Caption (cut to fit on the width page)
+			$str = $this->outlines[$i]['t'];
+			$strsize = $this->GetStringWidth($str);
+			$availableSize = $this->w - $this->lMargin - $this->rMargin - $pageCellSize - ($level * 8) - 4;
+			while ($strsize >= $availableSize) {
+				$str = substr($str, 0, -1);
+				$strsize = $this->GetStringWidth($str);
+			}
+
+			// if we want to display the page nmber
+			if ($displayPage) {
+				// display the Bookmark Caption
+				$this->Cell($strsize + 2, $this->FontSize + 2, $str);
+
+				//Filling dots
+				$w = $this->w - $this->lMargin - $this->rMargin - $pageCellSize - ($level * 8) - ($strsize + 2);
+				$nb = $w / $this->GetStringWidth('.');
+				$dots = str_repeat('.', $nb);
+				$this->Cell($w, $this->FontSize + 2, $dots, 0, 0, 'R');
+
+				//Page number
+				$this->Cell($pageCellSize, $this->FontSize + 2, 'p. '.$this->outlines[$i]['p'], 0, 1, 'R');
+			} else {
+				// display the Bookmark Caption
+				$this->Cell($strsize + 2, $this->FontSize + 2, $str, 0, 1);
+			}
+		}
+	}
+
+	/**
+	 * Returns the string alias used for the total number of pages.
+	 *
+	 * @access public
+	 * @return string;
+	 * @see TCPDF::getAliasNbPages(), TCPDF::getPageGroupAlias()
+	 */
+	public function getMyAliasNbPages()
+	{
+		if ($this->_myLastPageGroupNb == 0) {
+			return $this->getAliasNbPages();
+		} else {
+			$old = $this->currpagegroup;
+			$this->currpagegroup = '{nb'.$this->_myLastPageGroupNb.'}';
+			$new = $this->getPageGroupAlias();
+			$this->currpagegroup = $old;
+
+			return $new;
+		}
+	}
+
+	/**
+	 * Returns the current page number.
+	 *
+	 * @access public
+	 * @param  integer $page
+	 * @return integer;
+	 */
+	public function getMyNumPage($page = null)
+	{
+		if ($page === null) {
+			$page = $this->page;
+		}
+
+		if ($this->_myLastPageGroupNb == 0) {
+			return $page;
+		} else {
+			return $page - $this->_myLastPageGroup;
+		}
+	}
+
+	/**
+	 * Start a new group of pages
+	 *
+	 * @access public
+	 * @return integer;
+	 * @see tcpdf::startPageGroup
+	 */
+	public function myStartPageGroup()
+	{
+		$this->_myLastPageGroup = $this->page - 1;
+		$this->_myLastPageGroupNb++;
+	}
+
+	/**
+	 * get $_myLastPageGroup;
+	 *
+	 * @access public
+	 * @return integer $_myLastPageGroup;
+	 */
+	public function getMyLastPageGroup()
+	{
+		return $this->_myLastPageGroup;
+	}
+
+	/**
+	 * set $_myLastPageGroup;
+	 *
+	 * @access public
+	 * @param integer $myLastPageGroup;
+	 * @param integer $myLastPageGroup
+	 */
+	public function setMyLastPageGroup($myLastPageGroup)
+	{
+		$this->_myLastPageGroup = $myLastPageGroup;
+	}
+
+	/**
+	 * get $_myLastPageGroupNb;
+	 *
+	 * @access public
+	 * @return integer $_myLastPageGroupNb;
+	 */
+	public function getMyLastPageGroupNb()
+	{
+		return $this->_myLastPageGroupNb;
+	}
+
+	/**
+	 * set $_myLastPageGroupNb;
+	 *
+	 * @access public
+	 * @param integer $myLastPageGroupNb;
+	 * @param integer $myLastPageGroupNb
+	 */
+	public function setMyLastPageGroupNb($myLastPageGroupNb)
+	{
+		$this->_myLastPageGroupNb = $myLastPageGroupNb;
+	}
 }

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/parsingCss.class.php

Doc Comments +1 added lines

@@ -43,6 +43,7 @@
      * Set the HTML2PDF parent object
      *
      * @param  &HTML2PDF reference to the HTML2PDF parent $object
+     * @param HTML2PDF_myPdf|null $pdf
      * @access public
      */
     public function setPdfParent(&$pdf)

Indentation +1844 added lines, -1844 removed lines

@@ -11,1849 +11,1849 @@
 
 class HTML2PDF_parsingCss
 {
-    /**
-     * reference to the pdf object
-     * @var TCPDF
-     */
-    protected $_pdf         = null;
-
-    protected $_htmlColor   = array(); // list of the HTML colors
-    protected $_onlyLeft    = false; // flag if we are in a sub html => only "text-align:left" is used
-    protected $_defaultFont = null; // default font to use if the asked font does not exist
-
-    public    $value        = array(); // current values
-    public    $css          = array(); // css values
-    public    $cssKeys      = array(); // css key, for the execution order
-    public    $table        = array(); // level history
-
-    /**
-     * Constructor
-     *
-     * @param  &HTML2PDF_myPdf reference to the PDF $object
-     * @param HTML2PDF_myPdf $pdf
-     * @access public
-     */
-    public function __construct(&$pdf)
-    {
-        $this->_init();
-        $this->setPdfParent($pdf);
-    }
-
-    /**
-     * Set the HTML2PDF parent object
-     *
-     * @param  &HTML2PDF reference to the HTML2PDF parent $object
-     * @access public
-     */
-    public function setPdfParent(&$pdf)
-    {
-        $this->_pdf = &$pdf;
-    }
-
-    /**
-     * Inform that we want only "test-align:left" because we are in a sub HTML
-     *
-     * @access public
-     */
-    public function setOnlyLeft()
-    {
-        $this->value['text-align'] = 'left';
-        $this->_onlyLeft = true;
-    }
-
-    /**
-     * Get the vales of the parent, if exist
-     *
-     * @return array CSS values
-     * @access public
-     */
-    public function getOldValues()
-    {
-        return isset($this->table[count($this->table) - 1]) ? $this->table[count($this->table) - 1] : $this->value;
-    }
-
-    /**
-    * define the Default Font to use, if the font does not exist, or if no font asked
-    *
-    * @param  string  default font-family. If null : Arial for no font asked, and error fot ont does not exist
-    * @param string $default
-    * @return string  old default font-family
-    * @access public
-    */
-    public function setDefaultFont($default = null)
-    {
-        $old = $this->_defaultFont;
-        $this->_defaultFont = $default;
-        if ($default) {
-        	$this->value['font-family'] = $default;
-        }
-        return $old;
-    }
-
-     /**
-     * Init the object
-     *
-     * @access protected
-     */
-    protected function _init()
-    {
-        // get the Web Colors from TCPDF
-        require(K_PATH_MAIN.'htmlcolors.php');
-        $this->_htmlColor = $webcolor;
-
-        // init the Style
-        $this->table = array();
-        $this->value = array();
-        $this->initStyle();
-
-        // Init the styles without legacy
-        $this->resetStyle();
-    }
-
-    /**
-     * Init the CSS Style
-     *
-     * @access public
-     */
-    public function initStyle()
-    {
-        $this->value['id_tag'] = 'body'; // tag name
-        $this->value['id_name']          = null; // tag - attribute name
-        $this->value['id_id']            = null; // tag - attribute id
-        $this->value['id_class']         = null; // tag - attribute class
-        $this->value['id_lst']           = array('*'); // tag - list of legacy
-        $this->value['mini-size']        = 1.; // specific size report for sup, sub
-        $this->value['mini-decal']       = 0; // specific position report for sup, sub
-        $this->value['font-family']      = 'Arial';
-        $this->value['font-bold']        = false;
-        $this->value['font-italic']      = false;
-        $this->value['font-underline']   = false;
-        $this->value['font-overline']    = false;
-        $this->value['font-linethrough'] = false;
-        $this->value['text-transform']   = 'none';
-        $this->value['font-size']        = $this->convertToMM('10pt');
-        $this->value['text-indent']      = 0;
-        $this->value['text-align']       = 'left';
-        $this->value['vertical-align']   = 'middle';
-        $this->value['line-height']      = 'normal';
-
-        $this->value['position']         = null;
-        $this->value['x']                = null;
-        $this->value['y']                = null;
-        $this->value['width']            = 0;
-        $this->value['height']           = 0;
-        $this->value['top']              = null;
-        $this->value['right']            = null;
-        $this->value['bottom']           = null;
-        $this->value['left']             = null;
-        $this->value['float']            = null;
-        $this->value['display']          = null;
-        $this->value['rotate']           = null;
-        $this->value['overflow']         = 'visible';
-
-        $this->value['color']            = array(0, 0, 0);
-        $this->value['background']       = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
-        $this->value['border']           = array();
-        $this->value['padding']          = array();
-        $this->value['margin']           = array();
-        $this->value['margin-auto']      = false;
-
-        $this->value['list-style-type']  = '';
-        $this->value['list-style-image'] = '';
-
-        $this->value['xc'] = null;
-        $this->value['yc'] = null;
-    }
-
-    /**
-     * Init the CSS Style without legacy
-     *
-     * @param  string  tag name
-     * @access public
-     */
-    public function resetStyle($tagName = '')
-    {
-        // prepare somme values
-        $border = $this->readBorder('solid 1px #000000');
-        $units = array(
-            '1px' => $this->convertToMM('1px'),
-            '5px' => $this->convertToMM('5px'),
-        );
-
-
-        // 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;
-
-        // set the global css values
-        $this->value['position']   = null;
-        $this->value['x']          = null;
-        $this->value['y']          = null;
-        $this->value['width']      = 0;
-        $this->value['height']     = 0;
-        $this->value['top']        = null;
-        $this->value['right']      = null;
-        $this->value['bottom']     = null;
-        $this->value['left']       = null;
-        $this->value['float']      = null;
-        $this->value['display']    = null;
-        $this->value['rotate']     = null;
-        $this->value['overflow']   = 'visible';
-        $this->value['background'] = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
-        $this->value['border']     = array(
-            't' => $this->readBorder('none'),
-            'r' => $this->readBorder('none'),
-            'b' => $this->readBorder('none'),
-            'l' => $this->readBorder('none'),
-            'radius' => array(
-                'tl' => array(0, 0),
-                'tr' => array(0, 0),
-                'br' => array(0, 0),
-                'bl' => array(0, 0)
-            ),
-            'collapse' => $collapse,
-        );
-
-        // specific values for some tags
-        if ( ! in_array($tagName, array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
-            $this->value['margin'] = array('t'=>0, 'r'=>0, 'b'=>0, 'l'=>0);
-        }
-
-        if (in_array($tagName, array('input', 'select', 'textarea'))) {
-            $this->value['border']['t'] = null;
-            $this->value['border']['r'] = null;
-            $this->value['border']['b'] = null;
-            $this->value['border']['l'] = null;
-        }
-
-        if ($tagName == 'p') {
-            $this->value['margin']['t'] = null;
-            $this->value['margin']['b'] = null;
-        }
-        if ($tagName == 'blockquote') {
-            $this->value['margin']['t'] = 3;
-            $this->value['margin']['r'] = 3;
-            $this->value['margin']['b'] = 3;
-            $this->value['margin']['l'] = 6;
-        }
-        $this->value['margin-auto'] = false;
-
-        if (in_array($tagName, array('blockquote', 'div', 'fieldset'))) {
-            $this->value['vertical-align'] = 'top';
-        }
-
-        if (in_array($tagName, array('fieldset', 'legend'))) {
-            $this->value['border'] = array(
-                't' => $border,
-                'r' => $border,
-                'b' => $border,
-                'l' => $border,
-                'radius' => array(
-                    'tl' => array($units['5px'], $units['5px']),
-                    'tr' => array($units['5px'], $units['5px']),
-                    'br' => array($units['5px'], $units['5px']),
-                    'bl' => array($units['5px'], $units['5px'])
-                ),
-                'collapse' => false,
-            );
-        }
-
-        if (in_array($tagName, array('ul', 'li'))) {
-            $this->value['list-style-type']  = '';
-            $this->value['list-style-image'] = '';
-        }
-
-        if ( ! in_array($tagName, array('tr', 'td'))) {
-            $this->value['padding'] = array(
-                't' => 0,
-                'r' => 0,
-                'b' => 0,
-                'l' => 0
-            );
-        } else {
-            $this->value['padding'] = array(
-                't' => $units['1px'],
-                'r' => $units['1px'],
-                'b' => $units['1px'],
-                'l' => $units['1px']
-            );
-        }
-
-        if ($tagName == 'hr') {
-            $this->value['border'] = array(
-                't' => $border,
-                'r' => $border,
-                'b' => $border,
-                'l' => $border,
-                'radius' => array(
-                    'tl' => array(0, 0),
-                    'tr' => array(0, 0),
-                    'br' => array(0, 0),
-                    'bl' => array(0, 0)
-                ),
-                'collapse' => false,
-            );
-            $this->convertBackground('#FFFFFF', $this->value['background']);
-        }
-
-        $this->value['xc'] = null;
-        $this->value['yc'] = null;
-    }
-
-    /**
-     * Init the PDF Font
-     *
-     * @access public
-     */
-    public function fontSet()
-    {
-        $family = strtolower($this->value['font-family']);
-
-        $b = ($this->value['font-bold'] ? 'B' : '');
-        $i = ($this->value['font-italic'] ? 'I' : '');
-        $u = ($this->value['font-underline'] ? 'U' : '');
-        $d = ($this->value['font-linethrough'] ? 'D' : '');
-        $o = ($this->value['font-overline'] ? 'O' : '');
-
-        // font style
-        $style = $b.$i;
-
-        if ($this->_defaultFont) {
-            if ($family == 'arial')
-                $family = 'helvetica';
-            elseif ($family == 'symbol' || $family == 'zapfdingbats')
-                $style = '';
-
-            $fontkey = $family.$style;
-            if ( ! $this->_pdf->isLoadedFont($fontkey))
-                $family = $this->_defaultFont;
-        }
-
-        if ($family == 'arial')
-            $family = 'helvetica';
-        elseif ($family == 'symbol' || $family == 'zapfdingbats')
-            $style = '';
-
-        // complete style
-        $style .= $u.$d.$o;
-
-        // size : mm => pt
-        $size = $this->value['font-size'];
-        $size = 72 * $size / 25.4;
-
-        // apply the font
-        $this->_pdf->SetFont($family, $style, $this->value['mini-size'] * $size);
-        $this->_pdf->setTextColorArray($this->value['color']);
-        if ($this->value['background']['color']) {
-                    $this->_pdf->setFillColorArray($this->value['background']['color']);
-        } else {
-                    $this->_pdf->setFillColor(255);
-        }
-    }
-
-     /**
-     * add a level in the CSS history
-     *
-     * @access public
-     */
-    public function save()
-    {
-        array_push($this->table, $this->value);
-    }
-
-     /**
-     * remove a level in the CSS history
-     *
-     * @access public
-     */
-    public function load()
-    {
-        if (count($this->table)) {
-            $this->value = array_pop($this->table);
-        }
-    }
-
-     /**
-     * restore the Y positiony (used after a span)
-     *
-     * @access public
-     */
-    public function restorePosition()
-    {
-        if ($this->value['y'] == $this->_pdf->getY()) $this->_pdf->setY($this->value['yc'], false);
-    }
-
-     /**
-     * set the New position for the current Tag
-     *
-     * @access public
-     */
-    public function setPosition()
-    {
-        // get the current position
-        $currentX = $this->_pdf->getX();
-        $currentY = $this->_pdf->getY();
-
-        // save it
-        $this->value['xc'] = $currentX;
-        $this->value['yc'] = $currentY;
-
-        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'];
-            } else {
-                $x = $this->value['left'];
-                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'];
-            } else {
-                $y = $this->value['top'];
-                if ($this->value['margin']['t']) $y += $this->value['margin']['t'];
-            }
-
-            if ($this->value['position'] == 'relative') {
-                $this->value['x'] = $currentX + $x;
-                $this->value['y'] = $currentY + $y;
-            } else {
-                $this->value['x'] = $this->_getLastAbsoluteX() + $x;
-                $this->value['y'] = $this->_getLastAbsoluteY() + $y;
-            }
-        } 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'];
-        }
-
-        // save the new position
-        $this->_pdf->setXY($this->value['x'], $this->value['y']);
-    }
-
-     /**
-     * Analise the CSS style to convert it into Form style
-     *
-     * @access public
-     * @param  array    styles
-     */
-    public function getFormStyle()
-    {
-        $prop = array();
-
-        $prop['alignment'] = $this->value['text-align'];
-
-        if (isset($this->value['background']['color']) && is_array($this->value['background']['color'])) {
-            $prop['fillColor'] = $this->value['background']['color'];
-        }
-
-        if (isset($this->value['border']['t']['color'])) {
-            $prop['strokeColor'] = $this->value['border']['t']['color'];
-        }
-
-        if (isset($this->value['border']['t']['width'])) {
-            $prop['lineWidth'] = $this->value['border']['t']['width'];
-        }
-
-        if (isset($this->value['border']['t']['type'])) {
-            $prop['borderStyle'] = $this->value['border']['t']['type'];
-        }
-
-        if ( ! empty($this->value['color'])) {
-            $prop['textColor'] = $this->value['color'];
-        }
-
-        if ( ! empty($this->value['font-size'])) {
-            $prop['textSize'] = $this->value['font-size'];
-        }
-
-        return $prop;
-    }
-
-     /**
-     * Analise the CSS style to convert it into SVG style
-     *
-     * @access public
-     * @param  string   tag name
-     * @param  array    styles
-     * @param string $tagName
-     */
-    public function getSvgStyle($tagName, &$param)
-    {
-        // 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;
-
-        // read the class attribute
-        $class = array();
-        $tmp = isset($param['class']) ? strtolower(trim($param['class'])) : '';
-        $tmp = explode(' ', $tmp);
-        foreach ($tmp as $k => $v) {
-            $v = trim($v);
-            if ($v) {
-            	$class[] = $v;
-            }
-        }
-
-        // identify the tag, and the direct styles
-        $this->value['id_tag'] = $tagName;
-        $this->value['id_name']   = $name;
-        $this->value['id_id']     = $id;
-        $this->value['id_class']  = $class;
-        $this->value['id_lst']    = array();
-        $this->value['id_lst'][] = '*';
-        $this->value['id_lst'][] = $tagName;
-        if ( ! isset($this->value['svg'])) {
-            $this->value['svg'] = array(
-                'stroke'         => null,
-                'stroke-width'   => $this->convertToMM('1pt'),
-                'fill'           => null,
-                'fill-opacity'   => null,
-            );
-        }
-
-        if (count($class)) {
-            foreach ($class as $v) {
-                $this->value['id_lst'][] = '*.'.$v;
-                $this->value['id_lst'][] = '.'.$v;
-                $this->value['id_lst'][] = $tagName.'.'.$v;
-            }
-        }
-        if ($id) {
-            $this->value['id_lst'][] = '*#'.$id;
-            $this->value['id_lst'][] = '#'.$id;
-            $this->value['id_lst'][] = $tagName.'#'.$id;
-        }
-
-        // CSS style
-        $styles = $this->_getFromCSS();
-
-        // 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'];
-
-        return $this->value['svg'];
-    }
-
-    /**
-     * analyse the css properties from the HTML parsing
-     *
-     * @access public
-     * @param  string  $tagName
-     * @param  array   $param
-     * @param  array   $legacy
-     */
-    public function analyse($tagName, &$param, $legacy = null)
-    {
-        // 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;
-
-        // get the class names to use
-        $class = array();
-        $tmp = isset($param['class']) ? strtolower(trim($param['class'])) : '';
-        $tmp = explode(' ', $tmp);
-        foreach ($tmp as $k => $v) {
-            $v = trim($v);
-            if ($v) {
-            	$class[] = $v;
-            }
-        }
-
-        // prepare the values, and the list of css tags to identify
-        $this->value['id_tag']   = $tagName;
-        $this->value['id_name']  = $name;
-        $this->value['id_id']    = $id;
-        $this->value['id_class'] = $class;
-        $this->value['id_lst']   = array();
-        $this->value['id_lst'][] = '*';
-        $this->value['id_lst'][] = $tagName;
-        if (count($class)) {
-            foreach ($class as $v) {
-                $this->value['id_lst'][] = '*.'.$v;
-                $this->value['id_lst'][] = '.'.$v;
-                $this->value['id_lst'][] = $tagName.'.'.$v;
-            }
-        }
-        if ($id) {
-            $this->value['id_lst'][] = '*#'.$id;
-            $this->value['id_lst'][] = '#'.$id;
-            $this->value['id_lst'][] = $tagName.'#'.$id;
-        }
-
-        // get the css styles from class
-        $styles = $this->_getFromCSS();
-
-        // merge with the css styles from tag
-        $styles = array_merge($styles, $param['style']);
-        if (isset($param['allwidth']) && ! isset($styles['width'])) $styles['width'] = '100%';
-
-        // reset some styles, depending on the tag name
-        $this->resetStyle($tagName);
-
-        // add the legacy values
-        if ($legacy) {
-            foreach ($legacy as $legacyName => $legacyValue) {
-                if (is_array($legacyValue)) {
-                    foreach ($legacyValue as $legacy2Name => $legacy2Value)
-                        $this->value[$legacyName][$legacy2Name] = $legacy2Value;
-                } else {
-                    $this->value[$legacyName] = $legacyValue;
-                }
-            }
-        }
-
-        // some flags
-        $correctWidth = false;
-        $noWidth = true;
-
-        // read all the css styles
-        foreach ($styles as $nom => $val) {
-            switch ($nom)
-            {
-                case 'font-family':
-                    $val = explode(',', $val);
-                    $val = trim($val[0]);
-                    if ($val) {
-                    	$this->value['font-family'] = $val;
-                    }
-                    break;
-
-                case 'font-weight':
-                    $this->value['font-bold'] = ($val == 'bold');
-                    break;
-
-                case 'font-style':
-                    $this->value['font-italic'] = ($val == 'italic');
-                    break;
-
-                case 'text-decoration':
-                    $val = explode(' ', $val);
-                    $this->value['font-underline']   = (in_array('underline', $val));
-                    $this->value['font-overline']    = (in_array('overline', $val));
-                    $this->value['font-linethrough'] = (in_array('line-through', $val));
-                    break;
-
-                case 'text-indent':
-                    $this->value['text-indent'] = $this->convertToMM($val);
-                    break;
-
-                case 'text-transform':
-                    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;
-                    break;
-
-                case 'color':
-                    $res = null;
-                    $this->value['color'] = $this->convertToColor($val, $res);
-                    if ($tagName == 'hr') {
-                        $this->value['border']['l']['color'] = $this->value['color'];
-                        $this->value['border']['t']['color'] = $this->value['color'];
-                        $this->value['border']['r']['color'] = $this->value['color'];
-                        $this->value['border']['b']['color'] = $this->value['color'];
-                    }
-                    break;
-
-                case 'text-align':
-                    $val = strtolower($val);
-                    if ( ! in_array($val, array('left', 'right', 'center', 'justify', 'li_right'))) $val = 'left';
-                    $this->value['text-align'] = $val;
-                    break;
-
-                case 'vertical-align':
-                    $this->value['vertical-align'] = $val;
-                    break;
-
-                case 'width':
-                    $this->value['width'] = $this->convertToMM($val, $this->getLastWidth());
-                    if ($this->value['width'] && substr($val, -1) == '%') $correctWidth = true;
-                    $noWidth = false;
-                    break;
-
-                case 'height':
-                    $this->value['height'] = $this->convertToMM($val, $this->getLastHeight());
-                    break;
-
-                case 'line-height':
-                    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;
-                    $this->value['rotate'] = $val;
-                    break;
-
-                case 'overflow':
-                    if ( ! in_array($val, array('visible', 'hidden'))) $val = 'visible';
-                    $this->value['overflow'] = $val;
-                    break;
-
-                case 'padding':
-                    $val = explode(' ', $val);
-                    foreach ($val as $k => $v) {
-                        $v = trim($v);
-                        if ($v != '') {
-                            $val[$k] = $v;
-                        } else {
-                            unset($val[$k]);
-                        }
-                    }
-                    $val = array_values($val);
-                    $this->_duplicateBorder($val);
-                    $this->value['padding']['t'] = $this->convertToMM($val[0], 0);
-                    $this->value['padding']['r'] = $this->convertToMM($val[1], 0);
-                    $this->value['padding']['b'] = $this->convertToMM($val[2], 0);
-                    $this->value['padding']['l'] = $this->convertToMM($val[3], 0);
-                    break;
-
-                case 'padding-top':
-                    $this->value['padding']['t'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'padding-right':
-                    $this->value['padding']['r'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'padding-bottom':
-                    $this->value['padding']['b'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'padding-left':
-                    $this->value['padding']['l'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'margin':
-                    if ($val == 'auto') {
-                        $this->value['margin-auto'] = true;
-                        break;
-                    }
-                    $val = explode(' ', $val);
-                    foreach ($val as $k => $v) {
-                        $v = trim($v);
-                        if ($v != '') {
-                            $val[$k] = $v;
-                        } else {
-                            unset($val[$k]);
-                        }
-                    }
-                    $val = array_values($val);
-                    $this->_duplicateBorder($val);
-                    $this->value['margin']['t'] = $this->convertToMM($val[0], 0);
-                    $this->value['margin']['r'] = $this->convertToMM($val[1], 0);
-                    $this->value['margin']['b'] = $this->convertToMM($val[2], 0);
-                    $this->value['margin']['l'] = $this->convertToMM($val[3], 0);
-                    break;
-
-                case 'margin-top':
-                    $this->value['margin']['t'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'margin-right':
-                    $this->value['margin']['r'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'margin-bottom':
-                    $this->value['margin']['b'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'margin-left':
-                    $this->value['margin']['l'] = $this->convertToMM($val, 0);
-                    break;
-
-                case 'border':
-                    $val = $this->readBorder($val);
-                    $this->value['border']['t'] = $val;
-                    $this->value['border']['r'] = $val;
-                    $this->value['border']['b'] = $val;
-                    $this->value['border']['l'] = $val;
-                    break;
-
-                case 'border-style':
-                    $val = explode(' ', $val);
-                    foreach ($val as $valK => $valV) {
-                        if ( ! in_array($valV, array('solid', 'dotted', 'dashed'))) {
-                            $val[$valK] = null;
-                        }
-                    }
-                    $this->_duplicateBorder($val);
-                    if ($val[0]) {
-                    	$this->value['border']['t']['type'] = $val[0];
-                    }
-                    if ($val[1]) {
-                    	$this->value['border']['r']['type'] = $val[1];
-                    }
-                    if ($val[2]) {
-                    	$this->value['border']['b']['type'] = $val[2];
-                    }
-                    if ($val[3]) {
-                    	$this->value['border']['l']['type'] = $val[3];
-                    }
-                    break;
-
-                case 'border-top-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
-                        $this->value['border']['t']['type'] = $val;
-                    }
-                    break;
-
-                case 'border-right-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
-                        $this->value['border']['r']['type'] = $val;
-                    }
-                    break;
-
-                case 'border-bottom-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
-                        $this->value['border']['b']['type'] = $val;
-                    }
-                    break;
-
-                case 'border-left-style':
-                    if (in_array($val, array('solid', 'dotted', 'dashed'))) {
-                                            $this->value['border']['l']['type'] = $val;
-                    }
-                    break;
-
-                case 'border-color':
-                    $res = false;
-                    $val = preg_replace('/,[\s]+/', ',', $val);
-                    $val = explode(' ', $val);
-                    foreach ($val as $valK => $valV) {
-                            $val[$valK] = $this->convertToColor($valV, $res);
-                            if ( ! $res) {
-                                $val[$valK] = null;
-                            }
-                    }
-                    $this->_duplicateBorder($val);
-                    if (is_array($val[0])) {
-                    	$this->value['border']['t']['color'] = $val[0];
-                    }
-                    if (is_array($val[1])) {
-                    	$this->value['border']['r']['color'] = $val[1];
-                    }
-                    if (is_array($val[2])) {
-                    	$this->value['border']['b']['color'] = $val[2];
-                    }
-                    if (is_array($val[3])) {
-                    	$this->value['border']['l']['color'] = $val[3];
-                    }
-
-                    break;
-
-                case 'border-top-color':
-                    $res = false;
-                    $val = $this->convertToColor($val, $res);
-                    if ($res) {
-                    	$this->value['border']['t']['color'] = $val;
-                    }
-                    break;
-
-                case 'border-right-color':
-                    $res = false;
-                    $val = $this->convertToColor($val, $res);
-                    if ($res) {
-                    	$this->value['border']['r']['color'] = $val;
-                    }
-                    break;
-
-                case 'border-bottom-color':
-                    $res = false;
-                    $val = $this->convertToColor($val, $res);
-                    if ($res) {
-                    	$this->value['border']['b']['color'] = $val;
-                    }
-                    break;
-
-                case 'border-left-color':
-                    $res = false;
-                    $val = $this->convertToColor($val, $res);
-                    if ($res) {
-                    	$this->value['border']['l']['color'] = $val;
-                    }
-                    break;
-
-                case 'border-width':
-                    $val = explode(' ', $val);
-                    foreach ($val as $valK => $valV) {
-                            $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];
-                    break;
-
-                case 'border-top-width':
-                    $val = $this->convertToMM($val, 0);
-                    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;
-                    break;
-
-                case 'border-bottom-width':
-                    $val = $this->convertToMM($val, 0);
-                    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;
-                    break;
-
-                case 'border-collapse':
-                    if ($tagName == 'table') $this->value['border']['collapse'] = ($val == 'collapse');
-                    break;
-
-                case 'border-radius':
-                    $val = explode('/', $val);
-                    if (count($val) > 2) {
-                        break;
-                    }
-                    $valH = $this->convertToRadius(trim($val[0]));
-                    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($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];
-                    } else {
-                        $valV = $valH;
-                    }
-                    $this->value['border']['radius'] = array(
-                                'tl' => array($valH[0], $valV[0]),
-                                'tr' => array($valH[1], $valV[1]),
-                                'br' => array($valH[2], $valV[2]),
-                                'bl' => array($valH[3], $valV[3])
-                            );
-                    break;
-
-                case 'border-top-left-radius':
-                    $val = $this->convertToRadius($val);
-                    if (count($val) < 1 || count($val) > 2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['tl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-top-right-radius':
-                    $val = $this->convertToRadius($val);
-                    if (count($val) < 1 || count($val) > 2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['tr'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-bottom-right-radius':
-                    $val = $this->convertToRadius($val);
-                    if (count($val) < 1 || count($val) > 2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['br'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-bottom-left-radius':
-                    $val = $this->convertToRadius($val);
-                    if (count($val) < 1 || count($val) > 2) {
-                        break;
-                    }
-                    $this->value['border']['radius']['bl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
-                    break;
-
-                case 'border-top':
-                    $this->value['border']['t'] = $this->readBorder($val);
-                    break;
-
-                case 'border-right':
-                    $this->value['border']['r'] = $this->readBorder($val);
-                    break;
-
-                case 'border-bottom':
-                    $this->value['border']['b'] = $this->readBorder($val);
-                    break;
-
-                case 'border-left':
-                    $this->value['border']['l'] = $this->readBorder($val);
-                    break;
-
-                case 'background-color':
-                    $this->value['background']['color'] = $this->convertBackgroundColor($val);
-                    break;
-
-                case 'background-image':
-                    $this->value['background']['image'] = $this->convertBackgroundImage($val);
-                    break;
-
-                case 'background-position':
-                    $res = null;
-                    $this->value['background']['position'] = $this->convertBackgroundPosition($val, $res);
-                    break;
-
-                case 'background-repeat':
-                    $this->value['background']['repeat'] = $this->convertBackgroundRepeat($val);
-                    break;
-
-                case 'background':
-                    $this->convertBackground($val, $this->value['background']);
-                    break;
-
-                case 'position':
-                    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;
-                    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;
-                    break;
-
-                case 'top':
-                case 'bottom':
-                case 'left':
-                case 'right':
-                    $this->value[$nom] = $val;
-                    break;
-
-                case 'list-style':
-                case 'list-style-type':
-                case 'list-style-image':
-                    if ($nom == 'list-style') $nom = 'list-style-type';
-                    $this->value[$nom] = $val;
-                    break;
-
-                default:
-                    break;
-            }
-        }
-
-        $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'];
-
-        // force the text align to left, if asked by html2pdf
-        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') {
-            $this->value['width'] = $this->getLastWidth();
-            $this->value['width'] -= $this->value['margin']['l'] + $this->value['margin']['r'];
-        } else {
-            if ($correctWidth) {
-                if ( ! in_array($tagName, array('table', 'div', 'blockquote', 'fieldset', 'hr'))) {
-                    $this->value['width'] -= $this->value['padding']['l'] + $this->value['padding']['r'];
-                    $this->value['width'] -= $this->value['border']['l']['width'] + $this->value['border']['r']['width'];
-                }
-                if (in_array($tagName, array('th', 'td'))) {
-                    $this->value['width'] -= $this->convertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
-                    $return = false;
-                }
-                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['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['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;
-
-        return $return;
-    }
-
-     /**
-     * get the height of the current line
-     *
-     * @access public
-     * @return float $height in mm
-     */
-    public function getLineHeight()
-    {
-        $val = $this->value['line-height'];
-        if ($val == 'normal') $val = '108%';
-        return $this->convertToMM($val, $this->value['font-size']);
-    }
-
-     /**
-     * get the width of the parent
-     *
-     * @access public
-     * @param  boolean $mode true => adding padding and border
-     * @return float $width in mm
-     */
-    public function getLastWidth($mode = false)
-    {
-        for ($k = count($this->table) - 1; $k >= 0; $k--) {
-            if ($this->table[$k]['width']) {
-                $w = $this->table[$k]['width'];
-                if ($mode) {
-                    $w += $this->table[$k]['border']['l']['width'] + $this->table[$k]['padding']['l'] + 0.02;
-                    $w += $this->table[$k]['border']['r']['width'] + $this->table[$k]['padding']['r'] + 0.02;
-                }
-                return $w;
-            }
-        }
-        return $this->_pdf->getW() - $this->_pdf->getlMargin() - $this->_pdf->getrMargin();
-    }
-
-     /**
-     * get the height of the parent
-     *
-     * @access public
-     * @param  boolean $mode true => adding padding and border
-     * @return float $height in mm
-     */
-    public function getLastHeight($mode = false)
-    {
-        for ($k = count($this->table) - 1; $k >= 0; $k--) {
-            if ($this->table[$k]['height']) {
-                $h = $this->table[$k]['height'];
-                if ($mode) {
-                    $h += $this->table[$k]['border']['t']['width'] + $this->table[$k]['padding']['t'] + 0.02;
-                    $h += $this->table[$k]['border']['b']['width'] + $this->table[$k]['padding']['b'] + 0.02;
-                }
-                return $h;
-            }
-        }
-        return $this->_pdf->getH() - $this->_pdf->gettMargin() - $this->_pdf->getbMargin();
-    }
-
-    /**
-     * get the value of the float property
-     *
-     * @access public
-     * @return $float left/right
-     */
-    public function getFloat()
-    {
-        if ($this->value['float'] == 'left')    return 'left';
-        if ($this->value['float'] == 'right')   return 'right';
-        return null;
-    }
-
-    /**
-     * get the last value for a specific key
-     *
-     * @access public
-     * @param  string $key
-     * @return mixed
-     */
-    public function getLastValue($key)
-    {
-        $nb = count($this->table);
-        if ($nb > 0) {
-            return $this->table[$nb - 1][$key];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * get the last absolute X
-     *
-     * @access protected
-     * @return float $x
-     */
-    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'];
-        }
-        return $this->_pdf->getlMargin();
-    }
-
-    /**
-     * get the last absolute Y
-     *
-     * @access protected
-     * @return float $y
-     */
-    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'];
-        }
-        return $this->_pdf->gettMargin();
-    }
-
-    /**
-     * get the CSS properties of the current tag
-     *
-     * @access protected
-     * @return array $styles
-     */
-    protected function _getFromCSS()
-    {
-        // styles to apply
-        $styles = array();
-
-        // list of the selectors to get in the CSS files
-        $getit  = array();
-
-        // get the list of the selectors of each tags
-        $lst = array();
-        $lst[] = $this->value['id_lst'];
-        for ($i = count($this->table) - 1; $i >= 0; $i--) {
-            $lst[] = $this->table[$i]['id_lst'];
-        }
-
-        // foreach selectors in the CSS files, verify if it match with the list of selectors
-        foreach ($this->cssKeys as $key => $num) {
-            if ($this->_getReccursiveStyle($key, $lst)) {
-                $getit[$key] = $num;
-            }
-        }
-
-        // if we have selectors
-        if (count($getit)) {
-            // get them, but in the definition order, because of priority
-            asort($getit);
-            foreach ($getit as $key => $val) {
-            	$styles = array_merge($styles, $this->css[$key]);
-            }
-        }
-
-        return $styles;
-    }
-
-    /**
-     * identify if the selector $key match with the list of tag selectors
-     *
-     * @access protected
-     * @param  string   $key CSS selector to analyse
-     * @param  array    $lst list of the selectors of each tags
-     * @param  string   $next next step of parsing the selector
-     * @return boolean
-     */
-    protected function _getReccursiveStyle($key, $lst, $next = null)
-    {
-        // if next step
-        if ($next !== null) {
-            // we remove this step
-            if ($next) {
-            	$key = trim(substr($key, 0, -strlen($next)));
-            }
-            array_shift($lst);
-
-            // if no more step to identify => return false
-            if ( ! count($lst)) {
-                return false;
-            }
-        }
-
-        // for each selector of the current step
-        foreach ($lst[0] as $name) {
-            // if selector = key => ok
-            if ($key == $name) {
-                return true;
-            }
-
-            // if the end of the key = the selector and the next step is ok => ok
-            if (substr($key, -strlen(' '.$name)) == ' '.$name && $this->_getReccursiveStyle($key, $lst, $name)) {
-                return true;
-            }
-        }
-
-        // if we are not in the first step, we analyse the sub steps (the pareng tag of the current tag)
-        if ($next !== null && $this->_getReccursiveStyle($key, $lst, '')) {
-            return true;
-        }
-
-        // no corresponding found
-        return false;
-    }
-
-    /**
-     * Analyse a border
-     *
-     * @access  public
-     * @param   string $css css border properties
-     * @return  array  border properties
-     */
-    public function readBorder($css)
-    {
-        // border none
-        $none = array('type' => 'none', 'width' => 0, 'color' => array(0, 0, 0));
-
-        // default value
-        $type  = 'solid';
-        $width = $this->convertToMM('1pt');
-        $color = array(0, 0, 0);
-
-        // clean up the values
-        $css = explode(' ', $css);
-        foreach ($css as $k => $v) {
-            $v = trim($v);
-            if ($v) {
-            	$css[$k] = $v;
-            } else {
-            	unset($css[$k]);
-            }
-        }
-        $css = array_values($css);
-
-        // read the values
-        $res = null;
-        foreach ($css as $value) {
-
-            // if no border => return none
-            if ($value == 'none' || $value == 'hidden') {
-                return $none;
-            }
-
-            // try to convert the value as a distance
-            $tmp = $this->convertToMM($value);
-
-            // if the convert is ok => it is a width
-            if ($tmp !== null) {
-                $width = $tmp;
-            // else, it could be the type
-            } else if (in_array($value, array('solid', 'dotted', 'dashed', 'double'))) {
-                $type = $value;
-            // else, it could be the color
-            } else {
-                $tmp = $this->convertToColor($value, $res);
-                if ($res) $color = $tmp;
-            }
-        }
-
-        // if no witdh => return none
-        if ( ! $width) return $none;
-
-        // return the border properties
-        return array('type' => $type, 'width' => $width, 'color' => $color);
-    }
-
-    /**
-     * duplicate the borders if needed
-     *
-     * @access protected
-     * @param  &array $val
-     */
-    protected function _duplicateBorder(&$val)
-    {
-        // 1 value => L => RTB
-        if (count($val) == 1) {
-            $val[1] = $val[0];
-            $val[2] = $val[0];
-            $val[3] = $val[0];
-        // 2 values => L => R & T => B
-        } else if (count($val) == 2) {
-            $val[2] = $val[0];
-            $val[3] = $val[1];
-        // 3 values => T => B
-        } else if (count($val) == 3) {
-            $val[3] = $val[1];
-        }
-    }
-
-    /**
-     * Analyse a background
-     *
-     * @access public
-     * @param  string $css css background properties
-     * @param  &array $value parsed values (by reference, because, ther is a legacy of the parent CSS properties)
-     */
-    public function convertBackground($css, &$value)
-    {
-        // is there a image ?
-        $text = '/url\(([^)]*)\)/isU';
-        if (preg_match($text, $css, $match)) {
-            // get the image
-            $value['image'] = $this->convertBackgroundImage($match[0]);
-
-            // remove if from the css properties
-            $css = preg_replace($text, '', $css);
-            $css = preg_replace('/[\s]+/', ' ', $css);
-        }
-
-        // protect some spaces
-        $css = preg_replace('/,[\s]+/', ',', $css);
-
-        // explode the values
-        $css = explode(' ', $css);
-
-        // background position to parse
-        $pos = '';
-
-        // foreach value
-        foreach ($css as $val) {
-            // try to parse the value as a color
-            $ok = false;
-            $color = $this->convertToColor($val, $ok);
-
-            // if ok => it is a color
-            if ($ok) {
-                $value['color'] = $color;
-            // else if transparent => no coloàr
-            } else if ($val == 'transparent') {
-                $value['color'] = null;
-            // else
-            } else {
-                // try to parse the value as a repeat
-                $repeat = $this->convertBackgroundRepeat($val);
-
-                // if ok => it is repeat
-                if ($repeat) {
-                    $value['repeat'] = $repeat;
-                // else => it could only be a position
-                } else {
-                    $pos .= ($pos ? ' ' : '').$val;
-                }
-            }
-        }
-
-        // if we have a position to parse
-        if ($pos) {
-            // try to read it
-            $pos = $this->convertBackgroundPosition($pos, $ok);
-            if ($ok) {
-            	$value['position'] = $pos;
-            }
-        }
-    }
-
-    /**
-     * parse a background color
-     *
-     * @access public
-     * @param  string $css
-     * @return string $value
-     */
-    public function convertBackgroundColor($css)
-    {
-        $res = null;
-        if ($css == 'transparent') return null;
-        else                     return $this->convertToColor($css, $res);
-    }
-
-    /**
-     * parse a background image
-     *
-     * @access public
-     * @param  string $css
-     * @return string $value
-     */
-    public function convertBackgroundImage($css)
-    {
-        if ($css == 'none')
-            return null;
-        else if (preg_match('/^url\(([^)]*)\)$/isU', $css, $match))
-            return $match[1];
-        else
-            return null;
-    }
-
-    /**
-     * parse a background position
-     *
-     * @access public
-     * @param  string $css
-     * @param  &boolean $res flag if conver is ok or not
-     * @return array ($x, $y)
-     */
-    public function convertBackgroundPosition($css, &$res)
-    {
-        // init the res
-        $res = false;
-
-        // explode the value
-        $css = explode(' ', $css);
-
-        // 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;
-            $css[1] = 'center';
-        }
-        if (count($css) > 2) return null;
-
-        // prepare the values
-        $x = 0;
-        $y = 0;
-        $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;
-
-        // 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;
-
-        // return the values
-        return array($x, $y);
-    }
-
-    /**
-     * parse a background repeat
-     *
-     * @access public
-     * @param  string $css
-     * @return string $value
-     */
-    public function convertBackgroundRepeat($css)
-    {
-        switch ($css)
-        {
-            case 'repeat':
-                return array(true, true);
-            case 'repeat-x':
-                return array(true, false);
-            case 'repeat-y':
-                return array(false, true);
-            case 'no-repeat':
-                return array(false, false);
-        }
-        return null;
-    }
-
-     /**
-     * convert a distance to mm
-     *
-     * @access public
-     * @param  string $css distance to convert
-     * @param  float  $old parent distance
-     * @return float  $value
-     */
-    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;
-
-        return $css;
-    }
-
-    /**
-     * convert a css radius
-     *
-     * @access public
-     * @param  string $css
-     * @return float  $value
-     */
-    public function convertToRadius($css)
-    {
-        // explode the value
-        $css = explode(' ', $css);
-
-        foreach ($css as $k => $v) {
-            $v = trim($v);
-            if ($v) {
-                $v = $this->convertToMM($v, 0);
-                if ($v !== null) {
-                    $css[$k] = $v;
-                } else {
-                    unset($css[$k]);
-                }
-            } else {
-                unset($css[$k]);
-            }
-        }
-
-        return array_values($css);
-    }
-
-    /**
-     * convert a css color
-     *
-     * @access public
-     * @param  string $css
-     * @param  &boolean $res
-     * @return array (r,g, b)
-     */
-    public function convertToColor($css, &$res)
-    {
-        // prepare the value
-        $css = trim($css);
-        $res = true;
-
-        // if transparent => return null
-        if (strtolower($css) == 'transparent') return array(null, null, null);
-
-        // HTML color
-        if (isset($this->_htmlColor[strtolower($css)])) {
-            $css = $this->_htmlColor[strtolower($css)];
-            $r = floatVal(hexdec(substr($css, 0, 2)));
-            $v = floatVal(hexdec(substr($css, 2, 2)));
-            $b = floatVal(hexdec(substr($css, 4, 2)));
-            return array($r, $v, $b);
-        }
-
-        // like #FFFFFF
-        if (preg_match('/^#[0-9A-Fa-f]{6}$/isU', $css)) {
-            $r = floatVal(hexdec(substr($css, 1, 2)));
-            $v = floatVal(hexdec(substr($css, 3, 2)));
-            $b = floatVal(hexdec(substr($css, 5, 2)));
-            return array($r, $v, $b);
-        }
-
-        // like #FFF
-        if (preg_match('/^#[0-9A-F]{3}$/isU', $css)) {
-            $r = floatVal(hexdec(substr($css, 1, 1).substr($css, 1, 1)));
-            $v = floatVal(hexdec(substr($css, 2, 1).substr($css, 2, 1)));
-            $b = floatVal(hexdec(substr($css, 3, 1).substr($css, 3, 1)));
-            return array($r, $v, $b);
-        }
-
-        // like rgb(100, 100, 100)
-        if (preg_match('/rgb\([\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*\)/isU', $css, $match)) {
-            $r = $this->_convertSubColor($match[1]);
-            $v = $this->_convertSubColor($match[2]);
-            $b = $this->_convertSubColor($match[3]);
-            return array($r * 255., $v * 255., $b * 255.);
-        }
-
-        // like cmyk(100, 100, 100, 100)
-        if (preg_match('/cmyk\([\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*\)/isU', $css, $match)) {
-            $c = $this->_convertSubColor($match[1]);
-            $m = $this->_convertSubColor($match[2]);
-            $y = $this->_convertSubColor($match[3]);
-            $k = $this->_convertSubColor($match[4]);
-            return array($c * 100., $m * 100., $y * 100., $k * 100.);
-        }
-
-        $res = false;
-        return array(0., 0., 0.);
-    }
-
-    /**
-     * color value to convert
-     *
-     * @access protected
-     * @param  string $c
-     * @return float $c 0.->1.
-     */
-    protected function _convertSubColor($c)
-    {
-        if (substr($c, -1) == '%') {
-            $c = floatVal(substr($c, 0, -1)) / 100.;
-        } else {
-            $c = floatVal($c);
-            if ($c > 1) $c = $c / 255.;
-        }
-
-        return $c;
-    }
-
-    /**
-     * read a css content
-     *
-     * @access protected
-     * @param  string $code
-     */
-    protected function _analyseStyle(&$code)
-    {
-        // clean the spaces
-        $code = preg_replace('/[\s]+/', ' ', $code);
-
-        // remove the comments
-        $code = preg_replace('/\/\*.*?\*\//s', '', $code);
-
-        // split each CSS code "selector { value }"
-        preg_match_all('/([^{}]+){([^}]*)}/isU', $code, $match);
-
-        // for each CSS code
-        for ($k = 0; $k < count($match[0]); $k++) {
-
-            // selectors
-            $names = strtolower(trim($match[1][$k]));
-
-            // css style
-            $styles = trim($match[2][$k]);
-
-            // explode each value
-            $styles = explode(';', $styles);
-
-            // parse each value
-            $css = array();
-            foreach ($styles as $style) {
-                $tmp = explode(':', $style);
-                if (count($tmp) > 1) {
-                    $cod = $tmp[0]; unset($tmp[0]); $tmp = implode(':', $tmp);
-                    $css[trim(strtolower($cod))] = trim($tmp);
-                }
-            }
-
-            // explode the names
-            $names = explode(',', $names);
-
-            // save the values for each names
-            foreach ($names as $name) {
-                // clean the name
-                $name = trim($name);
-
-                // if a selector with somethink lige :hover => 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);
-
-            }
-        }
-
-        // get he list of the keys
-        $this->cssKeys = array_flip(array_keys($this->css));
-    }
-
-    /**
-     * Extract the css files from a html code
-     *
-     * @access public
-     * @param  string   &$html
-     * @param string $html
-     */
-    public function readStyle(&$html)
-    {
-        // the CSS content
-        $style = ' ';
-
-        // extract the link tags, and remove them in the html code
-        preg_match_all('/<link([^>]*)>/isU', $html, $match);
-        $html = preg_replace('/<link[^>]*>/isU', '', $html);
-        $html = preg_replace('/<\/link[^>]*>/isU', '', $html);
-
-        // analyse each link tag
-        foreach ($match[1] as $code) {
-            $tmp = array();
-
-            // read the attributes name=value
-            $prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
-            preg_match_all('/'.$prop.'/is', $code, $match);
-            for ($k = 0; $k < count($match[0]); $k++) {
-                $tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-            }
-
-            // read the attributes name="value"
-            $prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
-            preg_match_all('/'.$prop.'/is', $code, $match);
-            for ($k = 0; $k < count($match[0]); $k++) {
-                $tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-            }
-
-            // read the attributes name='value'
-            $prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
-            preg_match_all('/'.$prop.'/is', $code, $match);
-            for ($k = 0; $k < count($match[0]); $k++) {
-                $tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
-            }
-
-            // if type text/css => we keep it
-            if (isset($tmp['type']) && strtolower($tmp['type']) == 'text/css' && isset($tmp['href'])) {
-
-                // get the href
-                $url = $tmp['href'];
-
-                // get the content of the css file
-                $content = @file_get_contents($url);
-
-                // if "http://" in the url
-                if (strpos($url, 'http://') !== false) {
-
-                    // get the domain "http://xxx/"
-                    $url = str_replace('http://', '', $url);
-                    $url = explode('/', $url);
-                    $urlMain = 'http://'.$url[0].'/';
-
-                    // get the absolute url of the path
-                    $urlSelf = $url; unset($urlSelf[count($urlSelf) - 1]); $urlSelf = 'http://'.implode('/', $urlSelf).'/';
-
-                    // adapt the url in the css content
-                    $content = preg_replace('/url\(([^\\\\][^)]*)\)/isU', 'url('.$urlSelf.'$1)', $content);
-                    $content = preg_replace('/url\((\\\\[^)]*)\)/isU', 'url('.$urlMain.'$1)', $content);
-                } else {
+	/**
+	 * reference to the pdf object
+	 * @var TCPDF
+	 */
+	protected $_pdf         = null;
+
+	protected $_htmlColor   = array(); // list of the HTML colors
+	protected $_onlyLeft    = false; // flag if we are in a sub html => only "text-align:left" is used
+	protected $_defaultFont = null; // default font to use if the asked font does not exist
+
+	public    $value        = array(); // current values
+	public    $css          = array(); // css values
+	public    $cssKeys      = array(); // css key, for the execution order
+	public    $table        = array(); // level history
+
+	/**
+	 * Constructor
+	 *
+	 * @param  &HTML2PDF_myPdf reference to the PDF $object
+	 * @param HTML2PDF_myPdf $pdf
+	 * @access public
+	 */
+	public function __construct(&$pdf)
+	{
+		$this->_init();
+		$this->setPdfParent($pdf);
+	}
+
+	/**
+	 * Set the HTML2PDF parent object
+	 *
+	 * @param  &HTML2PDF reference to the HTML2PDF parent $object
+	 * @access public
+	 */
+	public function setPdfParent(&$pdf)
+	{
+		$this->_pdf = &$pdf;
+	}
+
+	/**
+	 * Inform that we want only "test-align:left" because we are in a sub HTML
+	 *
+	 * @access public
+	 */
+	public function setOnlyLeft()
+	{
+		$this->value['text-align'] = 'left';
+		$this->_onlyLeft = true;
+	}
+
+	/**
+	 * Get the vales of the parent, if exist
+	 *
+	 * @return array CSS values
+	 * @access public
+	 */
+	public function getOldValues()
+	{
+		return isset($this->table[count($this->table) - 1]) ? $this->table[count($this->table) - 1] : $this->value;
+	}
+
+	/**
+	 * define the Default Font to use, if the font does not exist, or if no font asked
+	 *
+	 * @param  string  default font-family. If null : Arial for no font asked, and error fot ont does not exist
+	 * @param string $default
+	 * @return string  old default font-family
+	 * @access public
+	 */
+	public function setDefaultFont($default = null)
+	{
+		$old = $this->_defaultFont;
+		$this->_defaultFont = $default;
+		if ($default) {
+			$this->value['font-family'] = $default;
+		}
+		return $old;
+	}
+
+	 /**
+	  * Init the object
+	  *
+	  * @access protected
+	  */
+	protected function _init()
+	{
+		// get the Web Colors from TCPDF
+		require(K_PATH_MAIN.'htmlcolors.php');
+		$this->_htmlColor = $webcolor;
+
+		// init the Style
+		$this->table = array();
+		$this->value = array();
+		$this->initStyle();
+
+		// Init the styles without legacy
+		$this->resetStyle();
+	}
+
+	/**
+	 * Init the CSS Style
+	 *
+	 * @access public
+	 */
+	public function initStyle()
+	{
+		$this->value['id_tag'] = 'body'; // tag name
+		$this->value['id_name']          = null; // tag - attribute name
+		$this->value['id_id']            = null; // tag - attribute id
+		$this->value['id_class']         = null; // tag - attribute class
+		$this->value['id_lst']           = array('*'); // tag - list of legacy
+		$this->value['mini-size']        = 1.; // specific size report for sup, sub
+		$this->value['mini-decal']       = 0; // specific position report for sup, sub
+		$this->value['font-family']      = 'Arial';
+		$this->value['font-bold']        = false;
+		$this->value['font-italic']      = false;
+		$this->value['font-underline']   = false;
+		$this->value['font-overline']    = false;
+		$this->value['font-linethrough'] = false;
+		$this->value['text-transform']   = 'none';
+		$this->value['font-size']        = $this->convertToMM('10pt');
+		$this->value['text-indent']      = 0;
+		$this->value['text-align']       = 'left';
+		$this->value['vertical-align']   = 'middle';
+		$this->value['line-height']      = 'normal';
+
+		$this->value['position']         = null;
+		$this->value['x']                = null;
+		$this->value['y']                = null;
+		$this->value['width']            = 0;
+		$this->value['height']           = 0;
+		$this->value['top']              = null;
+		$this->value['right']            = null;
+		$this->value['bottom']           = null;
+		$this->value['left']             = null;
+		$this->value['float']            = null;
+		$this->value['display']          = null;
+		$this->value['rotate']           = null;
+		$this->value['overflow']         = 'visible';
+
+		$this->value['color']            = array(0, 0, 0);
+		$this->value['background']       = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
+		$this->value['border']           = array();
+		$this->value['padding']          = array();
+		$this->value['margin']           = array();
+		$this->value['margin-auto']      = false;
+
+		$this->value['list-style-type']  = '';
+		$this->value['list-style-image'] = '';
+
+		$this->value['xc'] = null;
+		$this->value['yc'] = null;
+	}
+
+	/**
+	 * Init the CSS Style without legacy
+	 *
+	 * @param  string  tag name
+	 * @access public
+	 */
+	public function resetStyle($tagName = '')
+	{
+		// prepare somme values
+		$border = $this->readBorder('solid 1px #000000');
+		$units = array(
+			'1px' => $this->convertToMM('1px'),
+			'5px' => $this->convertToMM('5px'),
+		);
+
+
+		// 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;
+
+		// set the global css values
+		$this->value['position']   = null;
+		$this->value['x']          = null;
+		$this->value['y']          = null;
+		$this->value['width']      = 0;
+		$this->value['height']     = 0;
+		$this->value['top']        = null;
+		$this->value['right']      = null;
+		$this->value['bottom']     = null;
+		$this->value['left']       = null;
+		$this->value['float']      = null;
+		$this->value['display']    = null;
+		$this->value['rotate']     = null;
+		$this->value['overflow']   = 'visible';
+		$this->value['background'] = array('color' => null, 'image' => null, 'position' => null, 'repeat' => null);
+		$this->value['border']     = array(
+			't' => $this->readBorder('none'),
+			'r' => $this->readBorder('none'),
+			'b' => $this->readBorder('none'),
+			'l' => $this->readBorder('none'),
+			'radius' => array(
+				'tl' => array(0, 0),
+				'tr' => array(0, 0),
+				'br' => array(0, 0),
+				'bl' => array(0, 0)
+			),
+			'collapse' => $collapse,
+		);
+
+		// specific values for some tags
+		if ( ! in_array($tagName, array('h1', 'h2', 'h3', 'h4', 'h5', 'h6'))) {
+			$this->value['margin'] = array('t'=>0, 'r'=>0, 'b'=>0, 'l'=>0);
+		}
+
+		if (in_array($tagName, array('input', 'select', 'textarea'))) {
+			$this->value['border']['t'] = null;
+			$this->value['border']['r'] = null;
+			$this->value['border']['b'] = null;
+			$this->value['border']['l'] = null;
+		}
+
+		if ($tagName == 'p') {
+			$this->value['margin']['t'] = null;
+			$this->value['margin']['b'] = null;
+		}
+		if ($tagName == 'blockquote') {
+			$this->value['margin']['t'] = 3;
+			$this->value['margin']['r'] = 3;
+			$this->value['margin']['b'] = 3;
+			$this->value['margin']['l'] = 6;
+		}
+		$this->value['margin-auto'] = false;
+
+		if (in_array($tagName, array('blockquote', 'div', 'fieldset'))) {
+			$this->value['vertical-align'] = 'top';
+		}
+
+		if (in_array($tagName, array('fieldset', 'legend'))) {
+			$this->value['border'] = array(
+				't' => $border,
+				'r' => $border,
+				'b' => $border,
+				'l' => $border,
+				'radius' => array(
+					'tl' => array($units['5px'], $units['5px']),
+					'tr' => array($units['5px'], $units['5px']),
+					'br' => array($units['5px'], $units['5px']),
+					'bl' => array($units['5px'], $units['5px'])
+				),
+				'collapse' => false,
+			);
+		}
+
+		if (in_array($tagName, array('ul', 'li'))) {
+			$this->value['list-style-type']  = '';
+			$this->value['list-style-image'] = '';
+		}
+
+		if ( ! in_array($tagName, array('tr', 'td'))) {
+			$this->value['padding'] = array(
+				't' => 0,
+				'r' => 0,
+				'b' => 0,
+				'l' => 0
+			);
+		} else {
+			$this->value['padding'] = array(
+				't' => $units['1px'],
+				'r' => $units['1px'],
+				'b' => $units['1px'],
+				'l' => $units['1px']
+			);
+		}
+
+		if ($tagName == 'hr') {
+			$this->value['border'] = array(
+				't' => $border,
+				'r' => $border,
+				'b' => $border,
+				'l' => $border,
+				'radius' => array(
+					'tl' => array(0, 0),
+					'tr' => array(0, 0),
+					'br' => array(0, 0),
+					'bl' => array(0, 0)
+				),
+				'collapse' => false,
+			);
+			$this->convertBackground('#FFFFFF', $this->value['background']);
+		}
+
+		$this->value['xc'] = null;
+		$this->value['yc'] = null;
+	}
+
+	/**
+	 * Init the PDF Font
+	 *
+	 * @access public
+	 */
+	public function fontSet()
+	{
+		$family = strtolower($this->value['font-family']);
+
+		$b = ($this->value['font-bold'] ? 'B' : '');
+		$i = ($this->value['font-italic'] ? 'I' : '');
+		$u = ($this->value['font-underline'] ? 'U' : '');
+		$d = ($this->value['font-linethrough'] ? 'D' : '');
+		$o = ($this->value['font-overline'] ? 'O' : '');
+
+		// font style
+		$style = $b.$i;
+
+		if ($this->_defaultFont) {
+			if ($family == 'arial')
+				$family = 'helvetica';
+			elseif ($family == 'symbol' || $family == 'zapfdingbats')
+				$style = '';
+
+			$fontkey = $family.$style;
+			if ( ! $this->_pdf->isLoadedFont($fontkey))
+				$family = $this->_defaultFont;
+		}
+
+		if ($family == 'arial')
+			$family = 'helvetica';
+		elseif ($family == 'symbol' || $family == 'zapfdingbats')
+			$style = '';
+
+		// complete style
+		$style .= $u.$d.$o;
+
+		// size : mm => pt
+		$size = $this->value['font-size'];
+		$size = 72 * $size / 25.4;
+
+		// apply the font
+		$this->_pdf->SetFont($family, $style, $this->value['mini-size'] * $size);
+		$this->_pdf->setTextColorArray($this->value['color']);
+		if ($this->value['background']['color']) {
+					$this->_pdf->setFillColorArray($this->value['background']['color']);
+		} else {
+					$this->_pdf->setFillColor(255);
+		}
+	}
+
+	 /**
+	  * add a level in the CSS history
+	  *
+	  * @access public
+	  */
+	public function save()
+	{
+		array_push($this->table, $this->value);
+	}
+
+	 /**
+	  * remove a level in the CSS history
+	  *
+	  * @access public
+	  */
+	public function load()
+	{
+		if (count($this->table)) {
+			$this->value = array_pop($this->table);
+		}
+	}
+
+	 /**
+	  * restore the Y positiony (used after a span)
+	  *
+	  * @access public
+	  */
+	public function restorePosition()
+	{
+		if ($this->value['y'] == $this->_pdf->getY()) $this->_pdf->setY($this->value['yc'], false);
+	}
+
+	 /**
+	  * set the New position for the current Tag
+	  *
+	  * @access public
+	  */
+	public function setPosition()
+	{
+		// get the current position
+		$currentX = $this->_pdf->getX();
+		$currentY = $this->_pdf->getY();
+
+		// save it
+		$this->value['xc'] = $currentX;
+		$this->value['yc'] = $currentY;
+
+		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'];
+			} else {
+				$x = $this->value['left'];
+				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'];
+			} else {
+				$y = $this->value['top'];
+				if ($this->value['margin']['t']) $y += $this->value['margin']['t'];
+			}
+
+			if ($this->value['position'] == 'relative') {
+				$this->value['x'] = $currentX + $x;
+				$this->value['y'] = $currentY + $y;
+			} else {
+				$this->value['x'] = $this->_getLastAbsoluteX() + $x;
+				$this->value['y'] = $this->_getLastAbsoluteY() + $y;
+			}
+		} 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'];
+		}
+
+		// save the new position
+		$this->_pdf->setXY($this->value['x'], $this->value['y']);
+	}
+
+	 /**
+	  * Analise the CSS style to convert it into Form style
+	  *
+	  * @access public
+	  * @param  array    styles
+	  */
+	public function getFormStyle()
+	{
+		$prop = array();
+
+		$prop['alignment'] = $this->value['text-align'];
+
+		if (isset($this->value['background']['color']) && is_array($this->value['background']['color'])) {
+			$prop['fillColor'] = $this->value['background']['color'];
+		}
+
+		if (isset($this->value['border']['t']['color'])) {
+			$prop['strokeColor'] = $this->value['border']['t']['color'];
+		}
+
+		if (isset($this->value['border']['t']['width'])) {
+			$prop['lineWidth'] = $this->value['border']['t']['width'];
+		}
+
+		if (isset($this->value['border']['t']['type'])) {
+			$prop['borderStyle'] = $this->value['border']['t']['type'];
+		}
+
+		if ( ! empty($this->value['color'])) {
+			$prop['textColor'] = $this->value['color'];
+		}
+
+		if ( ! empty($this->value['font-size'])) {
+			$prop['textSize'] = $this->value['font-size'];
+		}
+
+		return $prop;
+	}
+
+	 /**
+	  * Analise the CSS style to convert it into SVG style
+	  *
+	  * @access public
+	  * @param  string   tag name
+	  * @param  array    styles
+	  * @param string $tagName
+	  */
+	public function getSvgStyle($tagName, &$param)
+	{
+		// 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;
+
+		// read the class attribute
+		$class = array();
+		$tmp = isset($param['class']) ? strtolower(trim($param['class'])) : '';
+		$tmp = explode(' ', $tmp);
+		foreach ($tmp as $k => $v) {
+			$v = trim($v);
+			if ($v) {
+				$class[] = $v;
+			}
+		}
+
+		// identify the tag, and the direct styles
+		$this->value['id_tag'] = $tagName;
+		$this->value['id_name']   = $name;
+		$this->value['id_id']     = $id;
+		$this->value['id_class']  = $class;
+		$this->value['id_lst']    = array();
+		$this->value['id_lst'][] = '*';
+		$this->value['id_lst'][] = $tagName;
+		if ( ! isset($this->value['svg'])) {
+			$this->value['svg'] = array(
+				'stroke'         => null,
+				'stroke-width'   => $this->convertToMM('1pt'),
+				'fill'           => null,
+				'fill-opacity'   => null,
+			);
+		}
+
+		if (count($class)) {
+			foreach ($class as $v) {
+				$this->value['id_lst'][] = '*.'.$v;
+				$this->value['id_lst'][] = '.'.$v;
+				$this->value['id_lst'][] = $tagName.'.'.$v;
+			}
+		}
+		if ($id) {
+			$this->value['id_lst'][] = '*#'.$id;
+			$this->value['id_lst'][] = '#'.$id;
+			$this->value['id_lst'][] = $tagName.'#'.$id;
+		}
+
+		// CSS style
+		$styles = $this->_getFromCSS();
+
+		// 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'];
+
+		return $this->value['svg'];
+	}
+
+	/**
+	 * analyse the css properties from the HTML parsing
+	 *
+	 * @access public
+	 * @param  string  $tagName
+	 * @param  array   $param
+	 * @param  array   $legacy
+	 */
+	public function analyse($tagName, &$param, $legacy = null)
+	{
+		// 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;
+
+		// get the class names to use
+		$class = array();
+		$tmp = isset($param['class']) ? strtolower(trim($param['class'])) : '';
+		$tmp = explode(' ', $tmp);
+		foreach ($tmp as $k => $v) {
+			$v = trim($v);
+			if ($v) {
+				$class[] = $v;
+			}
+		}
+
+		// prepare the values, and the list of css tags to identify
+		$this->value['id_tag']   = $tagName;
+		$this->value['id_name']  = $name;
+		$this->value['id_id']    = $id;
+		$this->value['id_class'] = $class;
+		$this->value['id_lst']   = array();
+		$this->value['id_lst'][] = '*';
+		$this->value['id_lst'][] = $tagName;
+		if (count($class)) {
+			foreach ($class as $v) {
+				$this->value['id_lst'][] = '*.'.$v;
+				$this->value['id_lst'][] = '.'.$v;
+				$this->value['id_lst'][] = $tagName.'.'.$v;
+			}
+		}
+		if ($id) {
+			$this->value['id_lst'][] = '*#'.$id;
+			$this->value['id_lst'][] = '#'.$id;
+			$this->value['id_lst'][] = $tagName.'#'.$id;
+		}
+
+		// get the css styles from class
+		$styles = $this->_getFromCSS();
+
+		// merge with the css styles from tag
+		$styles = array_merge($styles, $param['style']);
+		if (isset($param['allwidth']) && ! isset($styles['width'])) $styles['width'] = '100%';
+
+		// reset some styles, depending on the tag name
+		$this->resetStyle($tagName);
+
+		// add the legacy values
+		if ($legacy) {
+			foreach ($legacy as $legacyName => $legacyValue) {
+				if (is_array($legacyValue)) {
+					foreach ($legacyValue as $legacy2Name => $legacy2Value)
+						$this->value[$legacyName][$legacy2Name] = $legacy2Value;
+				} else {
+					$this->value[$legacyName] = $legacyValue;
+				}
+			}
+		}
+
+		// some flags
+		$correctWidth = false;
+		$noWidth = true;
+
+		// read all the css styles
+		foreach ($styles as $nom => $val) {
+			switch ($nom)
+			{
+				case 'font-family':
+					$val = explode(',', $val);
+					$val = trim($val[0]);
+					if ($val) {
+						$this->value['font-family'] = $val;
+					}
+					break;
+
+				case 'font-weight':
+					$this->value['font-bold'] = ($val == 'bold');
+					break;
+
+				case 'font-style':
+					$this->value['font-italic'] = ($val == 'italic');
+					break;
+
+				case 'text-decoration':
+					$val = explode(' ', $val);
+					$this->value['font-underline']   = (in_array('underline', $val));
+					$this->value['font-overline']    = (in_array('overline', $val));
+					$this->value['font-linethrough'] = (in_array('line-through', $val));
+					break;
+
+				case 'text-indent':
+					$this->value['text-indent'] = $this->convertToMM($val);
+					break;
+
+				case 'text-transform':
+					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;
+					break;
+
+				case 'color':
+					$res = null;
+					$this->value['color'] = $this->convertToColor($val, $res);
+					if ($tagName == 'hr') {
+						$this->value['border']['l']['color'] = $this->value['color'];
+						$this->value['border']['t']['color'] = $this->value['color'];
+						$this->value['border']['r']['color'] = $this->value['color'];
+						$this->value['border']['b']['color'] = $this->value['color'];
+					}
+					break;
+
+				case 'text-align':
+					$val = strtolower($val);
+					if ( ! in_array($val, array('left', 'right', 'center', 'justify', 'li_right'))) $val = 'left';
+					$this->value['text-align'] = $val;
+					break;
+
+				case 'vertical-align':
+					$this->value['vertical-align'] = $val;
+					break;
+
+				case 'width':
+					$this->value['width'] = $this->convertToMM($val, $this->getLastWidth());
+					if ($this->value['width'] && substr($val, -1) == '%') $correctWidth = true;
+					$noWidth = false;
+					break;
+
+				case 'height':
+					$this->value['height'] = $this->convertToMM($val, $this->getLastHeight());
+					break;
+
+				case 'line-height':
+					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;
+					$this->value['rotate'] = $val;
+					break;
+
+				case 'overflow':
+					if ( ! in_array($val, array('visible', 'hidden'))) $val = 'visible';
+					$this->value['overflow'] = $val;
+					break;
+
+				case 'padding':
+					$val = explode(' ', $val);
+					foreach ($val as $k => $v) {
+						$v = trim($v);
+						if ($v != '') {
+							$val[$k] = $v;
+						} else {
+							unset($val[$k]);
+						}
+					}
+					$val = array_values($val);
+					$this->_duplicateBorder($val);
+					$this->value['padding']['t'] = $this->convertToMM($val[0], 0);
+					$this->value['padding']['r'] = $this->convertToMM($val[1], 0);
+					$this->value['padding']['b'] = $this->convertToMM($val[2], 0);
+					$this->value['padding']['l'] = $this->convertToMM($val[3], 0);
+					break;
+
+				case 'padding-top':
+					$this->value['padding']['t'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'padding-right':
+					$this->value['padding']['r'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'padding-bottom':
+					$this->value['padding']['b'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'padding-left':
+					$this->value['padding']['l'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'margin':
+					if ($val == 'auto') {
+						$this->value['margin-auto'] = true;
+						break;
+					}
+					$val = explode(' ', $val);
+					foreach ($val as $k => $v) {
+						$v = trim($v);
+						if ($v != '') {
+							$val[$k] = $v;
+						} else {
+							unset($val[$k]);
+						}
+					}
+					$val = array_values($val);
+					$this->_duplicateBorder($val);
+					$this->value['margin']['t'] = $this->convertToMM($val[0], 0);
+					$this->value['margin']['r'] = $this->convertToMM($val[1], 0);
+					$this->value['margin']['b'] = $this->convertToMM($val[2], 0);
+					$this->value['margin']['l'] = $this->convertToMM($val[3], 0);
+					break;
+
+				case 'margin-top':
+					$this->value['margin']['t'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'margin-right':
+					$this->value['margin']['r'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'margin-bottom':
+					$this->value['margin']['b'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'margin-left':
+					$this->value['margin']['l'] = $this->convertToMM($val, 0);
+					break;
+
+				case 'border':
+					$val = $this->readBorder($val);
+					$this->value['border']['t'] = $val;
+					$this->value['border']['r'] = $val;
+					$this->value['border']['b'] = $val;
+					$this->value['border']['l'] = $val;
+					break;
+
+				case 'border-style':
+					$val = explode(' ', $val);
+					foreach ($val as $valK => $valV) {
+						if ( ! in_array($valV, array('solid', 'dotted', 'dashed'))) {
+							$val[$valK] = null;
+						}
+					}
+					$this->_duplicateBorder($val);
+					if ($val[0]) {
+						$this->value['border']['t']['type'] = $val[0];
+					}
+					if ($val[1]) {
+						$this->value['border']['r']['type'] = $val[1];
+					}
+					if ($val[2]) {
+						$this->value['border']['b']['type'] = $val[2];
+					}
+					if ($val[3]) {
+						$this->value['border']['l']['type'] = $val[3];
+					}
+					break;
+
+				case 'border-top-style':
+					if (in_array($val, array('solid', 'dotted', 'dashed'))) {
+						$this->value['border']['t']['type'] = $val;
+					}
+					break;
+
+				case 'border-right-style':
+					if (in_array($val, array('solid', 'dotted', 'dashed'))) {
+						$this->value['border']['r']['type'] = $val;
+					}
+					break;
+
+				case 'border-bottom-style':
+					if (in_array($val, array('solid', 'dotted', 'dashed'))) {
+						$this->value['border']['b']['type'] = $val;
+					}
+					break;
+
+				case 'border-left-style':
+					if (in_array($val, array('solid', 'dotted', 'dashed'))) {
+											$this->value['border']['l']['type'] = $val;
+					}
+					break;
+
+				case 'border-color':
+					$res = false;
+					$val = preg_replace('/,[\s]+/', ',', $val);
+					$val = explode(' ', $val);
+					foreach ($val as $valK => $valV) {
+							$val[$valK] = $this->convertToColor($valV, $res);
+							if ( ! $res) {
+								$val[$valK] = null;
+							}
+					}
+					$this->_duplicateBorder($val);
+					if (is_array($val[0])) {
+						$this->value['border']['t']['color'] = $val[0];
+					}
+					if (is_array($val[1])) {
+						$this->value['border']['r']['color'] = $val[1];
+					}
+					if (is_array($val[2])) {
+						$this->value['border']['b']['color'] = $val[2];
+					}
+					if (is_array($val[3])) {
+						$this->value['border']['l']['color'] = $val[3];
+					}
+
+					break;
+
+				case 'border-top-color':
+					$res = false;
+					$val = $this->convertToColor($val, $res);
+					if ($res) {
+						$this->value['border']['t']['color'] = $val;
+					}
+					break;
+
+				case 'border-right-color':
+					$res = false;
+					$val = $this->convertToColor($val, $res);
+					if ($res) {
+						$this->value['border']['r']['color'] = $val;
+					}
+					break;
+
+				case 'border-bottom-color':
+					$res = false;
+					$val = $this->convertToColor($val, $res);
+					if ($res) {
+						$this->value['border']['b']['color'] = $val;
+					}
+					break;
+
+				case 'border-left-color':
+					$res = false;
+					$val = $this->convertToColor($val, $res);
+					if ($res) {
+						$this->value['border']['l']['color'] = $val;
+					}
+					break;
+
+				case 'border-width':
+					$val = explode(' ', $val);
+					foreach ($val as $valK => $valV) {
+							$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];
+					break;
+
+				case 'border-top-width':
+					$val = $this->convertToMM($val, 0);
+					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;
+					break;
+
+				case 'border-bottom-width':
+					$val = $this->convertToMM($val, 0);
+					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;
+					break;
+
+				case 'border-collapse':
+					if ($tagName == 'table') $this->value['border']['collapse'] = ($val == 'collapse');
+					break;
+
+				case 'border-radius':
+					$val = explode('/', $val);
+					if (count($val) > 2) {
+						break;
+					}
+					$valH = $this->convertToRadius(trim($val[0]));
+					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($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];
+					} else {
+						$valV = $valH;
+					}
+					$this->value['border']['radius'] = array(
+								'tl' => array($valH[0], $valV[0]),
+								'tr' => array($valH[1], $valV[1]),
+								'br' => array($valH[2], $valV[2]),
+								'bl' => array($valH[3], $valV[3])
+							);
+					break;
+
+				case 'border-top-left-radius':
+					$val = $this->convertToRadius($val);
+					if (count($val) < 1 || count($val) > 2) {
+						break;
+					}
+					$this->value['border']['radius']['tl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
+					break;
+
+				case 'border-top-right-radius':
+					$val = $this->convertToRadius($val);
+					if (count($val) < 1 || count($val) > 2) {
+						break;
+					}
+					$this->value['border']['radius']['tr'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
+					break;
+
+				case 'border-bottom-right-radius':
+					$val = $this->convertToRadius($val);
+					if (count($val) < 1 || count($val) > 2) {
+						break;
+					}
+					$this->value['border']['radius']['br'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
+					break;
+
+				case 'border-bottom-left-radius':
+					$val = $this->convertToRadius($val);
+					if (count($val) < 1 || count($val) > 2) {
+						break;
+					}
+					$this->value['border']['radius']['bl'] = array($val[0], isset($val[1]) ? $val[1] : $val[0]);
+					break;
+
+				case 'border-top':
+					$this->value['border']['t'] = $this->readBorder($val);
+					break;
+
+				case 'border-right':
+					$this->value['border']['r'] = $this->readBorder($val);
+					break;
+
+				case 'border-bottom':
+					$this->value['border']['b'] = $this->readBorder($val);
+					break;
+
+				case 'border-left':
+					$this->value['border']['l'] = $this->readBorder($val);
+					break;
+
+				case 'background-color':
+					$this->value['background']['color'] = $this->convertBackgroundColor($val);
+					break;
+
+				case 'background-image':
+					$this->value['background']['image'] = $this->convertBackgroundImage($val);
+					break;
+
+				case 'background-position':
+					$res = null;
+					$this->value['background']['position'] = $this->convertBackgroundPosition($val, $res);
+					break;
+
+				case 'background-repeat':
+					$this->value['background']['repeat'] = $this->convertBackgroundRepeat($val);
+					break;
+
+				case 'background':
+					$this->convertBackground($val, $this->value['background']);
+					break;
+
+				case 'position':
+					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;
+					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;
+					break;
+
+				case 'top':
+				case 'bottom':
+				case 'left':
+				case 'right':
+					$this->value[$nom] = $val;
+					break;
+
+				case 'list-style':
+				case 'list-style-type':
+				case 'list-style-image':
+					if ($nom == 'list-style') $nom = 'list-style-type';
+					$this->value[$nom] = $val;
+					break;
+
+				default:
+					break;
+			}
+		}
+
+		$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'];
+
+		// force the text align to left, if asked by html2pdf
+		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') {
+			$this->value['width'] = $this->getLastWidth();
+			$this->value['width'] -= $this->value['margin']['l'] + $this->value['margin']['r'];
+		} else {
+			if ($correctWidth) {
+				if ( ! in_array($tagName, array('table', 'div', 'blockquote', 'fieldset', 'hr'))) {
+					$this->value['width'] -= $this->value['padding']['l'] + $this->value['padding']['r'];
+					$this->value['width'] -= $this->value['border']['l']['width'] + $this->value['border']['r']['width'];
+				}
+				if (in_array($tagName, array('th', 'td'))) {
+					$this->value['width'] -= $this->convertToMM(isset($param['cellspacing']) ? $param['cellspacing'] : '2px');
+					$return = false;
+				}
+				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['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['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;
+
+		return $return;
+	}
+
+	 /**
+	  * get the height of the current line
+	  *
+	  * @access public
+	  * @return float $height in mm
+	  */
+	public function getLineHeight()
+	{
+		$val = $this->value['line-height'];
+		if ($val == 'normal') $val = '108%';
+		return $this->convertToMM($val, $this->value['font-size']);
+	}
+
+	 /**
+	  * get the width of the parent
+	  *
+	  * @access public
+	  * @param  boolean $mode true => adding padding and border
+	  * @return float $width in mm
+	  */
+	public function getLastWidth($mode = false)
+	{
+		for ($k = count($this->table) - 1; $k >= 0; $k--) {
+			if ($this->table[$k]['width']) {
+				$w = $this->table[$k]['width'];
+				if ($mode) {
+					$w += $this->table[$k]['border']['l']['width'] + $this->table[$k]['padding']['l'] + 0.02;
+					$w += $this->table[$k]['border']['r']['width'] + $this->table[$k]['padding']['r'] + 0.02;
+				}
+				return $w;
+			}
+		}
+		return $this->_pdf->getW() - $this->_pdf->getlMargin() - $this->_pdf->getrMargin();
+	}
+
+	 /**
+	  * get the height of the parent
+	  *
+	  * @access public
+	  * @param  boolean $mode true => adding padding and border
+	  * @return float $height in mm
+	  */
+	public function getLastHeight($mode = false)
+	{
+		for ($k = count($this->table) - 1; $k >= 0; $k--) {
+			if ($this->table[$k]['height']) {
+				$h = $this->table[$k]['height'];
+				if ($mode) {
+					$h += $this->table[$k]['border']['t']['width'] + $this->table[$k]['padding']['t'] + 0.02;
+					$h += $this->table[$k]['border']['b']['width'] + $this->table[$k]['padding']['b'] + 0.02;
+				}
+				return $h;
+			}
+		}
+		return $this->_pdf->getH() - $this->_pdf->gettMargin() - $this->_pdf->getbMargin();
+	}
+
+	/**
+	 * get the value of the float property
+	 *
+	 * @access public
+	 * @return $float left/right
+	 */
+	public function getFloat()
+	{
+		if ($this->value['float'] == 'left')    return 'left';
+		if ($this->value['float'] == 'right')   return 'right';
+		return null;
+	}
+
+	/**
+	 * get the last value for a specific key
+	 *
+	 * @access public
+	 * @param  string $key
+	 * @return mixed
+	 */
+	public function getLastValue($key)
+	{
+		$nb = count($this->table);
+		if ($nb > 0) {
+			return $this->table[$nb - 1][$key];
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * get the last absolute X
+	 *
+	 * @access protected
+	 * @return float $x
+	 */
+	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'];
+		}
+		return $this->_pdf->getlMargin();
+	}
+
+	/**
+	 * get the last absolute Y
+	 *
+	 * @access protected
+	 * @return float $y
+	 */
+	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'];
+		}
+		return $this->_pdf->gettMargin();
+	}
+
+	/**
+	 * get the CSS properties of the current tag
+	 *
+	 * @access protected
+	 * @return array $styles
+	 */
+	protected function _getFromCSS()
+	{
+		// styles to apply
+		$styles = array();
+
+		// list of the selectors to get in the CSS files
+		$getit  = array();
+
+		// get the list of the selectors of each tags
+		$lst = array();
+		$lst[] = $this->value['id_lst'];
+		for ($i = count($this->table) - 1; $i >= 0; $i--) {
+			$lst[] = $this->table[$i]['id_lst'];
+		}
+
+		// foreach selectors in the CSS files, verify if it match with the list of selectors
+		foreach ($this->cssKeys as $key => $num) {
+			if ($this->_getReccursiveStyle($key, $lst)) {
+				$getit[$key] = $num;
+			}
+		}
+
+		// if we have selectors
+		if (count($getit)) {
+			// get them, but in the definition order, because of priority
+			asort($getit);
+			foreach ($getit as $key => $val) {
+				$styles = array_merge($styles, $this->css[$key]);
+			}
+		}
+
+		return $styles;
+	}
+
+	/**
+	 * identify if the selector $key match with the list of tag selectors
+	 *
+	 * @access protected
+	 * @param  string   $key CSS selector to analyse
+	 * @param  array    $lst list of the selectors of each tags
+	 * @param  string   $next next step of parsing the selector
+	 * @return boolean
+	 */
+	protected function _getReccursiveStyle($key, $lst, $next = null)
+	{
+		// if next step
+		if ($next !== null) {
+			// we remove this step
+			if ($next) {
+				$key = trim(substr($key, 0, -strlen($next)));
+			}
+			array_shift($lst);
+
+			// if no more step to identify => return false
+			if ( ! count($lst)) {
+				return false;
+			}
+		}
+
+		// for each selector of the current step
+		foreach ($lst[0] as $name) {
+			// if selector = key => ok
+			if ($key == $name) {
+				return true;
+			}
+
+			// if the end of the key = the selector and the next step is ok => ok
+			if (substr($key, -strlen(' '.$name)) == ' '.$name && $this->_getReccursiveStyle($key, $lst, $name)) {
+				return true;
+			}
+		}
+
+		// if we are not in the first step, we analyse the sub steps (the pareng tag of the current tag)
+		if ($next !== null && $this->_getReccursiveStyle($key, $lst, '')) {
+			return true;
+		}
+
+		// no corresponding found
+		return false;
+	}
+
+	/**
+	 * Analyse a border
+	 *
+	 * @access  public
+	 * @param   string $css css border properties
+	 * @return  array  border properties
+	 */
+	public function readBorder($css)
+	{
+		// border none
+		$none = array('type' => 'none', 'width' => 0, 'color' => array(0, 0, 0));
+
+		// default value
+		$type  = 'solid';
+		$width = $this->convertToMM('1pt');
+		$color = array(0, 0, 0);
+
+		// clean up the values
+		$css = explode(' ', $css);
+		foreach ($css as $k => $v) {
+			$v = trim($v);
+			if ($v) {
+				$css[$k] = $v;
+			} else {
+				unset($css[$k]);
+			}
+		}
+		$css = array_values($css);
+
+		// read the values
+		$res = null;
+		foreach ($css as $value) {
+
+			// if no border => return none
+			if ($value == 'none' || $value == 'hidden') {
+				return $none;
+			}
+
+			// try to convert the value as a distance
+			$tmp = $this->convertToMM($value);
+
+			// if the convert is ok => it is a width
+			if ($tmp !== null) {
+				$width = $tmp;
+			// else, it could be the type
+			} else if (in_array($value, array('solid', 'dotted', 'dashed', 'double'))) {
+				$type = $value;
+			// else, it could be the color
+			} else {
+				$tmp = $this->convertToColor($value, $res);
+				if ($res) $color = $tmp;
+			}
+		}
+
+		// if no witdh => return none
+		if ( ! $width) return $none;
+
+		// return the border properties
+		return array('type' => $type, 'width' => $width, 'color' => $color);
+	}
+
+	/**
+	 * duplicate the borders if needed
+	 *
+	 * @access protected
+	 * @param  &array $val
+	 */
+	protected function _duplicateBorder(&$val)
+	{
+		// 1 value => L => RTB
+		if (count($val) == 1) {
+			$val[1] = $val[0];
+			$val[2] = $val[0];
+			$val[3] = $val[0];
+		// 2 values => L => R & T => B
+		} else if (count($val) == 2) {
+			$val[2] = $val[0];
+			$val[3] = $val[1];
+		// 3 values => T => B
+		} else if (count($val) == 3) {
+			$val[3] = $val[1];
+		}
+	}
+
+	/**
+	 * Analyse a background
+	 *
+	 * @access public
+	 * @param  string $css css background properties
+	 * @param  &array $value parsed values (by reference, because, ther is a legacy of the parent CSS properties)
+	 */
+	public function convertBackground($css, &$value)
+	{
+		// is there a image ?
+		$text = '/url\(([^)]*)\)/isU';
+		if (preg_match($text, $css, $match)) {
+			// get the image
+			$value['image'] = $this->convertBackgroundImage($match[0]);
+
+			// remove if from the css properties
+			$css = preg_replace($text, '', $css);
+			$css = preg_replace('/[\s]+/', ' ', $css);
+		}
+
+		// protect some spaces
+		$css = preg_replace('/,[\s]+/', ',', $css);
+
+		// explode the values
+		$css = explode(' ', $css);
+
+		// background position to parse
+		$pos = '';
+
+		// foreach value
+		foreach ($css as $val) {
+			// try to parse the value as a color
+			$ok = false;
+			$color = $this->convertToColor($val, $ok);
+
+			// if ok => it is a color
+			if ($ok) {
+				$value['color'] = $color;
+			// else if transparent => no coloàr
+			} else if ($val == 'transparent') {
+				$value['color'] = null;
+			// else
+			} else {
+				// try to parse the value as a repeat
+				$repeat = $this->convertBackgroundRepeat($val);
+
+				// if ok => it is repeat
+				if ($repeat) {
+					$value['repeat'] = $repeat;
+				// else => it could only be a position
+				} else {
+					$pos .= ($pos ? ' ' : '').$val;
+				}
+			}
+		}
+
+		// if we have a position to parse
+		if ($pos) {
+			// try to read it
+			$pos = $this->convertBackgroundPosition($pos, $ok);
+			if ($ok) {
+				$value['position'] = $pos;
+			}
+		}
+	}
+
+	/**
+	 * parse a background color
+	 *
+	 * @access public
+	 * @param  string $css
+	 * @return string $value
+	 */
+	public function convertBackgroundColor($css)
+	{
+		$res = null;
+		if ($css == 'transparent') return null;
+		else                     return $this->convertToColor($css, $res);
+	}
+
+	/**
+	 * parse a background image
+	 *
+	 * @access public
+	 * @param  string $css
+	 * @return string $value
+	 */
+	public function convertBackgroundImage($css)
+	{
+		if ($css == 'none')
+			return null;
+		else if (preg_match('/^url\(([^)]*)\)$/isU', $css, $match))
+			return $match[1];
+		else
+			return null;
+	}
+
+	/**
+	 * parse a background position
+	 *
+	 * @access public
+	 * @param  string $css
+	 * @param  &boolean $res flag if conver is ok or not
+	 * @return array ($x, $y)
+	 */
+	public function convertBackgroundPosition($css, &$res)
+	{
+		// init the res
+		$res = false;
+
+		// explode the value
+		$css = explode(' ', $css);
+
+		// 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;
+			$css[1] = 'center';
+		}
+		if (count($css) > 2) return null;
+
+		// prepare the values
+		$x = 0;
+		$y = 0;
+		$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;
+
+		// 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;
+
+		// return the values
+		return array($x, $y);
+	}
+
+	/**
+	 * parse a background repeat
+	 *
+	 * @access public
+	 * @param  string $css
+	 * @return string $value
+	 */
+	public function convertBackgroundRepeat($css)
+	{
+		switch ($css)
+		{
+			case 'repeat':
+				return array(true, true);
+			case 'repeat-x':
+				return array(true, false);
+			case 'repeat-y':
+				return array(false, true);
+			case 'no-repeat':
+				return array(false, false);
+		}
+		return null;
+	}
+
+	 /**
+	  * convert a distance to mm
+	  *
+	  * @access public
+	  * @param  string $css distance to convert
+	  * @param  float  $old parent distance
+	  * @return float  $value
+	  */
+	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;
+
+		return $css;
+	}
+
+	/**
+	 * convert a css radius
+	 *
+	 * @access public
+	 * @param  string $css
+	 * @return float  $value
+	 */
+	public function convertToRadius($css)
+	{
+		// explode the value
+		$css = explode(' ', $css);
+
+		foreach ($css as $k => $v) {
+			$v = trim($v);
+			if ($v) {
+				$v = $this->convertToMM($v, 0);
+				if ($v !== null) {
+					$css[$k] = $v;
+				} else {
+					unset($css[$k]);
+				}
+			} else {
+				unset($css[$k]);
+			}
+		}
+
+		return array_values($css);
+	}
+
+	/**
+	 * convert a css color
+	 *
+	 * @access public
+	 * @param  string $css
+	 * @param  &boolean $res
+	 * @return array (r,g, b)
+	 */
+	public function convertToColor($css, &$res)
+	{
+		// prepare the value
+		$css = trim($css);
+		$res = true;
+
+		// if transparent => return null
+		if (strtolower($css) == 'transparent') return array(null, null, null);
+
+		// HTML color
+		if (isset($this->_htmlColor[strtolower($css)])) {
+			$css = $this->_htmlColor[strtolower($css)];
+			$r = floatVal(hexdec(substr($css, 0, 2)));
+			$v = floatVal(hexdec(substr($css, 2, 2)));
+			$b = floatVal(hexdec(substr($css, 4, 2)));
+			return array($r, $v, $b);
+		}
+
+		// like #FFFFFF
+		if (preg_match('/^#[0-9A-Fa-f]{6}$/isU', $css)) {
+			$r = floatVal(hexdec(substr($css, 1, 2)));
+			$v = floatVal(hexdec(substr($css, 3, 2)));
+			$b = floatVal(hexdec(substr($css, 5, 2)));
+			return array($r, $v, $b);
+		}
+
+		// like #FFF
+		if (preg_match('/^#[0-9A-F]{3}$/isU', $css)) {
+			$r = floatVal(hexdec(substr($css, 1, 1).substr($css, 1, 1)));
+			$v = floatVal(hexdec(substr($css, 2, 1).substr($css, 2, 1)));
+			$b = floatVal(hexdec(substr($css, 3, 1).substr($css, 3, 1)));
+			return array($r, $v, $b);
+		}
+
+		// like rgb(100, 100, 100)
+		if (preg_match('/rgb\([\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*\)/isU', $css, $match)) {
+			$r = $this->_convertSubColor($match[1]);
+			$v = $this->_convertSubColor($match[2]);
+			$b = $this->_convertSubColor($match[3]);
+			return array($r * 255., $v * 255., $b * 255.);
+		}
+
+		// like cmyk(100, 100, 100, 100)
+		if (preg_match('/cmyk\([\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*,[\s]*([0-9%\.]+)[\s]*\)/isU', $css, $match)) {
+			$c = $this->_convertSubColor($match[1]);
+			$m = $this->_convertSubColor($match[2]);
+			$y = $this->_convertSubColor($match[3]);
+			$k = $this->_convertSubColor($match[4]);
+			return array($c * 100., $m * 100., $y * 100., $k * 100.);
+		}
+
+		$res = false;
+		return array(0., 0., 0.);
+	}
+
+	/**
+	 * color value to convert
+	 *
+	 * @access protected
+	 * @param  string $c
+	 * @return float $c 0.->1.
+	 */
+	protected function _convertSubColor($c)
+	{
+		if (substr($c, -1) == '%') {
+			$c = floatVal(substr($c, 0, -1)) / 100.;
+		} else {
+			$c = floatVal($c);
+			if ($c > 1) $c = $c / 255.;
+		}
+
+		return $c;
+	}
+
+	/**
+	 * read a css content
+	 *
+	 * @access protected
+	 * @param  string $code
+	 */
+	protected function _analyseStyle(&$code)
+	{
+		// clean the spaces
+		$code = preg_replace('/[\s]+/', ' ', $code);
+
+		// remove the comments
+		$code = preg_replace('/\/\*.*?\*\//s', '', $code);
+
+		// split each CSS code "selector { value }"
+		preg_match_all('/([^{}]+){([^}]*)}/isU', $code, $match);
+
+		// for each CSS code
+		for ($k = 0; $k < count($match[0]); $k++) {
+
+			// selectors
+			$names = strtolower(trim($match[1][$k]));
+
+			// css style
+			$styles = trim($match[2][$k]);
+
+			// explode each value
+			$styles = explode(';', $styles);
+
+			// parse each value
+			$css = array();
+			foreach ($styles as $style) {
+				$tmp = explode(':', $style);
+				if (count($tmp) > 1) {
+					$cod = $tmp[0]; unset($tmp[0]); $tmp = implode(':', $tmp);
+					$css[trim(strtolower($cod))] = trim($tmp);
+				}
+			}
+
+			// explode the names
+			$names = explode(',', $names);
+
+			// save the values for each names
+			foreach ($names as $name) {
+				// clean the name
+				$name = trim($name);
+
+				// if a selector with somethink lige :hover => 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);
+
+			}
+		}
+
+		// get he list of the keys
+		$this->cssKeys = array_flip(array_keys($this->css));
+	}
+
+	/**
+	 * Extract the css files from a html code
+	 *
+	 * @access public
+	 * @param  string   &$html
+	 * @param string $html
+	 */
+	public function readStyle(&$html)
+	{
+		// the CSS content
+		$style = ' ';
+
+		// extract the link tags, and remove them in the html code
+		preg_match_all('/<link([^>]*)>/isU', $html, $match);
+		$html = preg_replace('/<link[^>]*>/isU', '', $html);
+		$html = preg_replace('/<\/link[^>]*>/isU', '', $html);
+
+		// analyse each link tag
+		foreach ($match[1] as $code) {
+			$tmp = array();
+
+			// read the attributes name=value
+			$prop = '([a-zA-Z0-9_]+)=([^"\'\s>]+)';
+			preg_match_all('/'.$prop.'/is', $code, $match);
+			for ($k = 0; $k < count($match[0]); $k++) {
+				$tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+			}
+
+			// read the attributes name="value"
+			$prop = '([a-zA-Z0-9_]+)=["]([^"]*)["]';
+			preg_match_all('/'.$prop.'/is', $code, $match);
+			for ($k = 0; $k < count($match[0]); $k++) {
+				$tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+			}
+
+			// read the attributes name='value'
+			$prop = "([a-zA-Z0-9_]+)=[']([^']*)[']";
+			preg_match_all('/'.$prop.'/is', $code, $match);
+			for ($k = 0; $k < count($match[0]); $k++) {
+				$tmp[trim(strtolower($match[1][$k]))] = trim($match[2][$k]);
+			}
+
+			// if type text/css => we keep it
+			if (isset($tmp['type']) && strtolower($tmp['type']) == 'text/css' && isset($tmp['href'])) {
+
+				// get the href
+				$url = $tmp['href'];
+
+				// get the content of the css file
+				$content = @file_get_contents($url);
+
+				// if "http://" in the url
+				if (strpos($url, 'http://') !== false) {
+
+					// get the domain "http://xxx/"
+					$url = str_replace('http://', '', $url);
+					$url = explode('/', $url);
+					$urlMain = 'http://'.$url[0].'/';
+
+					// get the absolute url of the path
+					$urlSelf = $url; unset($urlSelf[count($urlSelf) - 1]); $urlSelf = 'http://'.implode('/', $urlSelf).'/';
+
+					// adapt the url in the css content
+					$content = preg_replace('/url\(([^\\\\][^)]*)\)/isU', 'url('.$urlSelf.'$1)', $content);
+					$content = preg_replace('/url\((\\\\[^)]*)\)/isU', 'url('.$urlMain.'$1)', $content);
+				} else {
 // @TODO correction on url in absolute on a local css content
-                    // $content = preg_replace('/url\(([^)]*)\)/isU', 'url('.dirname($url).'/$1)', $content);
-                }
-
-                // add to the CSS content
-                $style .= $content."\n";
-            }
-        }
-
-        // extract the style tags des tags style, and remove them in the html code
-        preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
-        $html = preg_replace('/<style[^>]*>(.*)<\/style[^>]*>/isU', '', $html);
-
-        // analyse each style tags
-        foreach ($match[1] as $code) {
-            // add to the CSS content
-            $code = str_replace('<!--', '', $code);
-            $code = str_replace('-->', '', $code);
-            $style .= $code."\n";
-        }
-
-        //analyse the css content
-        $this->_analyseStyle($style);
-    }
+					// $content = preg_replace('/url\(([^)]*)\)/isU', 'url('.dirname($url).'/$1)', $content);
+				}
+
+				// add to the CSS content
+				$style .= $content."\n";
+			}
+		}
+
+		// extract the style tags des tags style, and remove them in the html code
+		preg_match_all('/<style[^>]*>(.*)<\/style[^>]*>/isU', $html, $match);
+		$html = preg_replace('/<style[^>]*>(.*)<\/style[^>]*>/isU', '', $html);
+
+		// analyse each style tags
+		foreach ($match[1] as $code) {
+			// add to the CSS content
+			$code = str_replace('<!--', '', $code);
+			$code = str_replace('-->', '', $code);
+			$style .= $code."\n";
+		}
+
+		//analyse the css content
+		$this->_analyseStyle($style);
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -484,7 +484,7 @@ 
     {
         // prepare
         $tagName = strtolower($tagName);
-        $id   = isset($param['id']) ? strtolower(trim($param['id'])) : null; if ( ! $id)   $id   = 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
@@ -554,7 +554,7 @@ 
     {
         // prepare the informations
         $tagName = strtolower($tagName);
-        $id   = isset($param['id']) ? strtolower(trim($param['id'])) : null; if ( ! $id)   $id   = 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

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/_class/parsingHtml.class.php

Doc Comments +1 added lines

@@ -50,6 +50,7 @@
      * Define the HTML code to parse
      *
      * @param   string HTML code
+     * @param string $html
      * @access  public
      */
     public function setHTML($html)

Indentation +518 added lines, -518 removed lines

@@ -11,524 +11,524 @@
 
 class HTML2PDF_parsingHtml
 {
-    protected    $_html     = ''; // HTML code to parse
-    protected    $_num      = 0; // table number
-    protected    $_level    = 0; // table level
-    protected    $_encoding = ''; // encoding
-    public       $code      = array(); // parsed HTML codfe
-
-    const HTML_TAB = '        ';
-
-    /**
-     * main constructor
-     *
-     * @param   string encoding
-     * @access  public
-     */
-    public function __construct($encoding = 'UTF-8')
-    {
-        $this->_num   = 0;
-        $this->_level = array($this->_num);
-        $this->_html  = '';
-        $this->code = array();
-        $this->setEncoding($encoding);
-    }
-
-    /**
-     * change the encoding
-     *
-     * @param   string encoding
-     * @param string $encoding
-     * @access  public
-     */
-    public function setEncoding($encoding)
-    {
-        $this->_encoding = $encoding;
-    }
-
-    /**
-     * Define the HTML code to parse
-     *
-     * @param   string HTML code
-     * @access  public
-     */
-    public function setHTML($html)
-    {
-        // remove the HTML in comment
-        $html = preg_replace('/<!--(.*)-->/isU', '', $html);
-
-        // save the HTML code
-        $this->_html = $html;
-    }
-
-    /**
-     * parse the HTML code
-     *
-     * @access public
-     */
-    public function parse()
-    {
-        $parents = array();
-
-        // flag : are we in a <pre> Tag ?
-        $tagPreIn = false;
-
-        // action to use for each line of the content of a <pre> Tag
-        $tagPreBr = array(
-                    'name' => 'br',
-                    'close' => false,
-                    'param' => array(
-                        'style' => array(),
-                        'num'    => 0
-                    )
-                );
-
-        // tag that can be not closed
-        $tagsNotClosed = array(
-            'br', 'hr', 'img', 'col',
-            'input', 'link', 'option',
-            'circle', 'ellipse', 'path', 'rect', 'line', 'polygon', 'polyline'
-        );
-
-        // search the HTML tags
-        $tmp = array();
-        $this->_searchCode($tmp);
-
-        // all the actions to do
-        $actions = array();
-
-        // foreach part of the HTML code
-        foreach ($tmp as $part) {
-            // if it is a tag code
-            if ($part[0] == 'code') {
-                // analise the HTML code
-                $res = $this->_analiseCode($part[1]);
+	protected    $_html     = ''; // HTML code to parse
+	protected    $_num      = 0; // table number
+	protected    $_level    = 0; // table level
+	protected    $_encoding = ''; // encoding
+	public       $code      = array(); // parsed HTML codfe
+
+	const HTML_TAB = '        ';
+
+	/**
+	 * main constructor
+	 *
+	 * @param   string encoding
+	 * @access  public
+	 */
+	public function __construct($encoding = 'UTF-8')
+	{
+		$this->_num   = 0;
+		$this->_level = array($this->_num);
+		$this->_html  = '';
+		$this->code = array();
+		$this->setEncoding($encoding);
+	}
+
+	/**
+	 * change the encoding
+	 *
+	 * @param   string encoding
+	 * @param string $encoding
+	 * @access  public
+	 */
+	public function setEncoding($encoding)
+	{
+		$this->_encoding = $encoding;
+	}
+
+	/**
+	 * Define the HTML code to parse
+	 *
+	 * @param   string HTML code
+	 * @access  public
+	 */
+	public function setHTML($html)
+	{
+		// remove the HTML in comment
+		$html = preg_replace('/<!--(.*)-->/isU', '', $html);
+
+		// save the HTML code
+		$this->_html = $html;
+	}
+
+	/**
+	 * parse the HTML code
+	 *
+	 * @access public
+	 */
+	public function parse()
+	{
+		$parents = array();
+
+		// flag : are we in a <pre> Tag ?
+		$tagPreIn = false;
+
+		// action to use for each line of the content of a <pre> Tag
+		$tagPreBr = array(
+					'name' => 'br',
+					'close' => false,
+					'param' => array(
+						'style' => array(),
+						'num'    => 0
+					)
+				);
+
+		// tag that can be not closed
+		$tagsNotClosed = array(
+			'br', 'hr', 'img', 'col',
+			'input', 'link', 'option',
+			'circle', 'ellipse', 'path', 'rect', 'line', 'polygon', 'polyline'
+		);
+
+		// search the HTML tags
+		$tmp = array();
+		$this->_searchCode($tmp);
+
+		// all the actions to do
+		$actions = array();
+
+		// foreach part of the HTML code
+		foreach ($tmp as $part) {
+			// if it is a tag code
+			if ($part[0] == 'code') {
+				// analise the HTML code
+				$res = $this->_analiseCode($part[1]);
 
 //echo "<pre>"; print_r($tagsNotClosed); exit;                
-                // if it is a real HTML tag
-                if ($res) {
-                    // save the current posistion in the HTML code
-                    $res['html_pos'] = $part[2];
-
-                    // if the tag must be closed
-                    if ( ! in_array($res['name'], $tagsNotClosed)) {
-                        // 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]);
-                        } else {
-                            // if it is a autoclosed tag
-                            if ($res['autoclose']) {
-                                // save the opened tag
-                                $actions[] = $res;
-
-                                // prepare the closed tag
-                                $res['params'] = array();
-                                $res['close'] = true;
-                            }
-                            // else :add a child for validation
-                            else {
-                                                            $parents[count($parents)] = $res['name'];
-                            }
-                        }
-
-                        // if it is a <pre> tag (or <code> tag) not auclosed => update the flag
-                        if (($res['name'] == 'pre' || $res['name'] == 'code') && ! $res['autoclose']) {
-                            $tagPreIn = ! $res['close'];
-                        }
-                    }
-
-                    // save the actions to convert
-                    $actions[] = $res;
-                } else { // else (it is not a real HTML tag => we transform it in Texte
-                    $part[0] = 'txt';
-                }
-            }
-            // if it is text
-            if ($part[0] == 'txt') {
-                // if we are not in a <pre> tag
-                if ( ! $tagPreIn) {
-                    // save the action
-                    $actions[] = array(
-                        'name'    => 'write',
-                        'close'    => false,
-                        'param' => array('txt' => $this->_prepareTxt($part[1])),
-                    );
-                } else { // else (if we are in a <pre> tag)
-                    // prepare the text
-                    $part[1] = str_replace("\r", '', $part[1]);
-                    $part[1] = explode("\n", $part[1]);
-
-                    // foreach line of the text
-                    foreach ($part[1] as $k => $txt) {
-                        // transform the line
-                        $txt = str_replace("\t", self::HTML_TAB, $txt);
-                        $txt = str_replace(' ', '&nbsp;', $txt);
-
-                        // add a break line
-                        if ($k > 0) $actions[] = $tagPreBr;
-
-                        // save the action
-                        $actions[] = array(
-                            'name'    => 'write',
-                            'close'    => false,
-                            'param' => array('txt' => $this->_prepareTxt($txt, false)),
-                        );
-                    }
-                }
-            }
-        }
-
-        // for each indentified action, we have to clean up the begin and the end of the texte
-        // based on tags that surround it
-
-        // list of the tags to clean
-        $tagsToClean = array(
-            'page', 'page_header', 'page_footer', 'form',
-            'table', 'thead', 'tfoot', 'tr', 'td', 'th', 'br',
-            'div', 'hr', 'p', 'ul', 'ol', 'li',
-            'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
-            'bookmark', 'fieldset', 'legend',
-            'draw', 'circle', 'ellipse', 'path', 'rect', 'line', 'g', 'polygon', 'polyline',
-            'option'
-        );
-
-        // foreach action
-        $nb = count($actions);
-        for ($k = 0; $k < $nb; $k++) {
-            // 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 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 the text is empty => remove the action
-                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);
-
-        // save the actions to do
-        $this->code = array_values($actions);
-    }
-
-    /**
-     * prepare the text
-     *
-     * @param   string texte
-     * @param   boolean true => replace multiple space+\t+\r+\n by a single space
-     * @return  string texte
-     * @access  protected
-     */
-    protected function _prepareTxt($txt, $spaces = true)
-    {
-        if ($spaces) {
-        	$txt = preg_replace('/\s+/is', ' ', $txt);
-        }
-        $txt = str_replace('&euro;', '€', $txt);
-        $txt = html_entity_decode($txt, ENT_QUOTES, $this->_encoding);
-        return $txt;
-    }
-
-    /**
-     * parse the HTML code
-     *
-     * @param    &array    array's result
-     * @return   null
-     */
-    protected function _searchCode(&$tmp)
-    {
-        // initialise the array
-        $tmp = array();
-
-        // regexp to separate the tags from the texts
-        $reg = '/(<[^>]+>)|([^<]+)+/isU';
-
-        // last match found
-        $str = '';
-        $offset = 0;
-
-        // As it finds a match
-        while (preg_match($reg, $this->_html, $parse, PREG_OFFSET_CAPTURE, $offset)) {
-            // if it is a tag
-            if ($parse[1][0]) {
-                // save the previous text if it exists
-                if ($str !== '')    $tmp[] = array('txt', $str);
-
-                // save the tag, with the offset
-                $tmp[] = array('code', trim($parse[1][0]), $offset);
-
-                // init the current text
-                $str = '';
-            } else { // else (if it is a text)
-                // add the new text to the current text
-                $str .= $parse[2][0];
-            }
-
-            // Update offset to the end of the match
-            $offset = $parse[0][1] + strlen($parse[0][0]);
-            unset($parse);
-        }
-        // if a text is present in the end, we save it
-        if ($str != '') $tmp[] = array('txt', $str);
-        unset($str);
-    }
-
-    /**
-     * analise a HTML tag
-     *
-     * @param   string   HTML code to analise
-     * @return  array    corresponding action
-     */
-    protected function _analiseCode($code)
-    {
-        // name of the tag, opening, closure, autoclosure
-        $tag = '<([\/]{0,1})([_a-z0-9]+)([\/>\s]+)';
-        if ( ! preg_match('/'.$tag.'/isU', $code, $match)) return null;
-        $close     = ($match[1] == '/' ? true : false);
-        $autoclose = preg_match('/\/>$/isU', $code);
-        $name      = strtolower($match[2]);
-
-        // required parameters (depends on the tag name)
-        $param = array();
-        $param['style'] = '';
-        if ($name == 'img') {
-            $param['alt'] = '';
-            $param['src'] = '';
-        }
-        if ($name == 'a') {
-            $param['href'] = '';
-        }
-
-        // 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]);
-
-        // 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]);
-
-        // 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]);
-
-        // compliance of each parameter
-        $color  = "#000000";
-        $border = null;
-        foreach ($param as $key => $val) {
-            $key = strtolower($key);
-            switch ($key)
-            {
-                case 'width':
-                    unset($param[$key]);
-                    $param['style'] .= 'width: '.$val.'px; ';
-                    break;
-
-                case 'align':
-                    if ($name === 'img') {
-                        unset($param[$key]);
-                        $param['style'] .= 'float: '.$val.'; ';
-                    } elseif ($name !== 'table') {
-                        unset($param[$key]);
-                        $param['style'] .= 'text-align: '.$val.'; ';
-                    }
-                    break;
-
-                case 'valign':
-                    unset($param[$key]);
-                    $param['style'] .= 'vertical-align: '.$val.'; ';
-                    break;
-
-                case 'height':
-                    unset($param[$key]);
-                    $param['style'] .= 'height: '.$val.'px; ';
-                    break;
-
-                case 'bgcolor':
-                    unset($param[$key]);
-                    $param['style'] .= 'background: '.$val.'; ';
-                    break;
-
-                case 'bordercolor':
-                    unset($param[$key]);
-                    $color = $val;
-                    break;
-
-                case 'border':
-                    unset($param[$key]);
-                    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';
-                    break;
-
-                case 'colspan':
-                case 'rowspan':
-                    $val = preg_replace('/[^0-9]/isU', '', $val);
-                    if ( ! $val) $val = 1;
-                    $param[$key] = $val;
-                    break;
-            }
-        }
-
-        // compliance of the border
-        if ($border !== null) {
-            if ($border)    $border = 'border: solid '.$border.' '.$color;
-            else            $border = 'border: none';
-
-            $param['style'] .= $border.'; ';
-            $param['border'] = $border;
-        }
-
-        // reading styles: decomposition and standardization
-        $styles = explode(';', $param['style']);
-        $param['style'] = array();
-        foreach ($styles as $style) {
-            $tmp = explode(':', $style);
-            if (count($tmp) > 1) {
-                $cod = $tmp[0];
-                unset($tmp[0]);
-                $tmp = implode(':', $tmp);
-                $param['style'][trim(strtolower($cod))] = preg_replace('/[\s]+/isU', ' ', trim($tmp));
-            }
-        }
-
-        // determining the level of table opening, with an added level
-        if (in_array($name, array('ul', 'ol', 'table')) && ! $close) {
-            $this->_num++;
-            $this->_level[count($this->_level)] = $this->_num;
-        }
-
-        // get the level of the table containing the element
-        if ( ! isset($param['num'])) {
-            $param['num'] = $this->_level[count($this->_level) - 1];
-        }
-
-        // for closures table: remove a level
-        if (in_array($name, array('ul', 'ol', 'table')) && $close) {
-            unset($this->_level[count($this->_level) - 1]);
-        }
-
-        // prepare the parameters
-        if (isset($param['value'])) {
-        	$param['value']  = $this->_prepareTxt($param['value']);
-        }
-        if (isset($param['alt'])) {
-        	$param['alt']    = $this->_prepareTxt($param['alt']);
-        }
-        if (isset($param['title'])) {
-        	$param['title']  = $this->_prepareTxt($param['title']);
-        }
-        if (isset($param['class'])) {
-        	$param['class']  = $this->_prepareTxt($param['class']);
-        }
-
-        // return the new action to do
-        return array('name' => $name, 'close' => $close ? 1 : 0, 'autoclose' => $autoclose, 'param' => $param);
-    }
-
-    /**
-     * get a full level of HTML, between an opening and closing corresponding
-     *
-     * @param   integer key
-     * @param integer $k
-     * @return  array   actions
-     */
-    public function getLevel($k)
-    {
-        // if the code does not exist => return empty
-        if ( ! isset($this->code[$k])) return array();
-
-        // the tag to detect
-        $detect = $this->code[$k]['name'];
-
-        // if it is a text => return
-        if ($detect == 'write') {
-            return array($this->code[$k]);
-        }
-
-        //
-        $level = 0; // depth level
-        $end = false; // end of the search
-        $code = array(); // extract code
-
-        // while it's not ended
-        while ( ! $end) {
-            // current action
-            $row = $this->code[$k];
-
-            // if 'write' => we add the text
-            if ($row['name'] == 'write') {
-                $code[] = $row;
-            } else { // else, it is a html tag
-                $not = false; // flag for not taking into account the current tag
-
-                // if it is the searched tag
-                if ($row['name'] == $detect) {
-                    // if we are just at the root level => dont take it
-                    if ($level == 0) {
-                        $not = true;
-                    }
-
-                    // update the level
-                    $level += ($row['close'] ? -1 : 1);
-
-                    // if we are now at the root level => it is the end, and dont take it
-                    if ($level == 0) {
-                        $not = true;
-                        $end = true;
-                    }
-                }
-
-                // if we can takin into account the current tag => save it
-                if ( ! $not) {
-                    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;
-        }
-
-        // return the extract
-        return $code;
-    }
-
-    /**
-     * return a part of the HTML code, for error message
-     *
-     * @param   integer position
-     * @param   integer take before
-     * @param   integer take after
-     * @return  string  part of the html code
-     */
-    public function getHtmlErrorCode($pos, $before = 30, $after = 40)
-    {
-        return substr($this->_html, $pos - $before, $before + $after);
-    }
+				// if it is a real HTML tag
+				if ($res) {
+					// save the current posistion in the HTML code
+					$res['html_pos'] = $part[2];
+
+					// if the tag must be closed
+					if ( ! in_array($res['name'], $tagsNotClosed)) {
+						// 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]);
+						} else {
+							// if it is a autoclosed tag
+							if ($res['autoclose']) {
+								// save the opened tag
+								$actions[] = $res;
+
+								// prepare the closed tag
+								$res['params'] = array();
+								$res['close'] = true;
+							}
+							// else :add a child for validation
+							else {
+															$parents[count($parents)] = $res['name'];
+							}
+						}
+
+						// if it is a <pre> tag (or <code> tag) not auclosed => update the flag
+						if (($res['name'] == 'pre' || $res['name'] == 'code') && ! $res['autoclose']) {
+							$tagPreIn = ! $res['close'];
+						}
+					}
+
+					// save the actions to convert
+					$actions[] = $res;
+				} else { // else (it is not a real HTML tag => we transform it in Texte
+					$part[0] = 'txt';
+				}
+			}
+			// if it is text
+			if ($part[0] == 'txt') {
+				// if we are not in a <pre> tag
+				if ( ! $tagPreIn) {
+					// save the action
+					$actions[] = array(
+						'name'    => 'write',
+						'close'    => false,
+						'param' => array('txt' => $this->_prepareTxt($part[1])),
+					);
+				} else { // else (if we are in a <pre> tag)
+					// prepare the text
+					$part[1] = str_replace("\r", '', $part[1]);
+					$part[1] = explode("\n", $part[1]);
+
+					// foreach line of the text
+					foreach ($part[1] as $k => $txt) {
+						// transform the line
+						$txt = str_replace("\t", self::HTML_TAB, $txt);
+						$txt = str_replace(' ', '&nbsp;', $txt);
+
+						// add a break line
+						if ($k > 0) $actions[] = $tagPreBr;
+
+						// save the action
+						$actions[] = array(
+							'name'    => 'write',
+							'close'    => false,
+							'param' => array('txt' => $this->_prepareTxt($txt, false)),
+						);
+					}
+				}
+			}
+		}
+
+		// for each indentified action, we have to clean up the begin and the end of the texte
+		// based on tags that surround it
+
+		// list of the tags to clean
+		$tagsToClean = array(
+			'page', 'page_header', 'page_footer', 'form',
+			'table', 'thead', 'tfoot', 'tr', 'td', 'th', 'br',
+			'div', 'hr', 'p', 'ul', 'ol', 'li',
+			'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+			'bookmark', 'fieldset', 'legend',
+			'draw', 'circle', 'ellipse', 'path', 'rect', 'line', 'g', 'polygon', 'polyline',
+			'option'
+		);
+
+		// foreach action
+		$nb = count($actions);
+		for ($k = 0; $k < $nb; $k++) {
+			// 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 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 the text is empty => remove the action
+				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);
+
+		// save the actions to do
+		$this->code = array_values($actions);
+	}
+
+	/**
+	 * prepare the text
+	 *
+	 * @param   string texte
+	 * @param   boolean true => replace multiple space+\t+\r+\n by a single space
+	 * @return  string texte
+	 * @access  protected
+	 */
+	protected function _prepareTxt($txt, $spaces = true)
+	{
+		if ($spaces) {
+			$txt = preg_replace('/\s+/is', ' ', $txt);
+		}
+		$txt = str_replace('&euro;', '€', $txt);
+		$txt = html_entity_decode($txt, ENT_QUOTES, $this->_encoding);
+		return $txt;
+	}
+
+	/**
+	 * parse the HTML code
+	 *
+	 * @param    &array    array's result
+	 * @return   null
+	 */
+	protected function _searchCode(&$tmp)
+	{
+		// initialise the array
+		$tmp = array();
+
+		// regexp to separate the tags from the texts
+		$reg = '/(<[^>]+>)|([^<]+)+/isU';
+
+		// last match found
+		$str = '';
+		$offset = 0;
+
+		// As it finds a match
+		while (preg_match($reg, $this->_html, $parse, PREG_OFFSET_CAPTURE, $offset)) {
+			// if it is a tag
+			if ($parse[1][0]) {
+				// save the previous text if it exists
+				if ($str !== '')    $tmp[] = array('txt', $str);
+
+				// save the tag, with the offset
+				$tmp[] = array('code', trim($parse[1][0]), $offset);
+
+				// init the current text
+				$str = '';
+			} else { // else (if it is a text)
+				// add the new text to the current text
+				$str .= $parse[2][0];
+			}
+
+			// Update offset to the end of the match
+			$offset = $parse[0][1] + strlen($parse[0][0]);
+			unset($parse);
+		}
+		// if a text is present in the end, we save it
+		if ($str != '') $tmp[] = array('txt', $str);
+		unset($str);
+	}
+
+	/**
+	 * analise a HTML tag
+	 *
+	 * @param   string   HTML code to analise
+	 * @return  array    corresponding action
+	 */
+	protected function _analiseCode($code)
+	{
+		// name of the tag, opening, closure, autoclosure
+		$tag = '<([\/]{0,1})([_a-z0-9]+)([\/>\s]+)';
+		if ( ! preg_match('/'.$tag.'/isU', $code, $match)) return null;
+		$close     = ($match[1] == '/' ? true : false);
+		$autoclose = preg_match('/\/>$/isU', $code);
+		$name      = strtolower($match[2]);
+
+		// required parameters (depends on the tag name)
+		$param = array();
+		$param['style'] = '';
+		if ($name == 'img') {
+			$param['alt'] = '';
+			$param['src'] = '';
+		}
+		if ($name == 'a') {
+			$param['href'] = '';
+		}
+
+		// 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]);
+
+		// 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]);
+
+		// 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]);
+
+		// compliance of each parameter
+		$color  = "#000000";
+		$border = null;
+		foreach ($param as $key => $val) {
+			$key = strtolower($key);
+			switch ($key)
+			{
+				case 'width':
+					unset($param[$key]);
+					$param['style'] .= 'width: '.$val.'px; ';
+					break;
+
+				case 'align':
+					if ($name === 'img') {
+						unset($param[$key]);
+						$param['style'] .= 'float: '.$val.'; ';
+					} elseif ($name !== 'table') {
+						unset($param[$key]);
+						$param['style'] .= 'text-align: '.$val.'; ';
+					}
+					break;
+
+				case 'valign':
+					unset($param[$key]);
+					$param['style'] .= 'vertical-align: '.$val.'; ';
+					break;
+
+				case 'height':
+					unset($param[$key]);
+					$param['style'] .= 'height: '.$val.'px; ';
+					break;
+
+				case 'bgcolor':
+					unset($param[$key]);
+					$param['style'] .= 'background: '.$val.'; ';
+					break;
+
+				case 'bordercolor':
+					unset($param[$key]);
+					$color = $val;
+					break;
+
+				case 'border':
+					unset($param[$key]);
+					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';
+					break;
+
+				case 'colspan':
+				case 'rowspan':
+					$val = preg_replace('/[^0-9]/isU', '', $val);
+					if ( ! $val) $val = 1;
+					$param[$key] = $val;
+					break;
+			}
+		}
+
+		// compliance of the border
+		if ($border !== null) {
+			if ($border)    $border = 'border: solid '.$border.' '.$color;
+			else            $border = 'border: none';
+
+			$param['style'] .= $border.'; ';
+			$param['border'] = $border;
+		}
+
+		// reading styles: decomposition and standardization
+		$styles = explode(';', $param['style']);
+		$param['style'] = array();
+		foreach ($styles as $style) {
+			$tmp = explode(':', $style);
+			if (count($tmp) > 1) {
+				$cod = $tmp[0];
+				unset($tmp[0]);
+				$tmp = implode(':', $tmp);
+				$param['style'][trim(strtolower($cod))] = preg_replace('/[\s]+/isU', ' ', trim($tmp));
+			}
+		}
+
+		// determining the level of table opening, with an added level
+		if (in_array($name, array('ul', 'ol', 'table')) && ! $close) {
+			$this->_num++;
+			$this->_level[count($this->_level)] = $this->_num;
+		}
+
+		// get the level of the table containing the element
+		if ( ! isset($param['num'])) {
+			$param['num'] = $this->_level[count($this->_level) - 1];
+		}
+
+		// for closures table: remove a level
+		if (in_array($name, array('ul', 'ol', 'table')) && $close) {
+			unset($this->_level[count($this->_level) - 1]);
+		}
+
+		// prepare the parameters
+		if (isset($param['value'])) {
+			$param['value']  = $this->_prepareTxt($param['value']);
+		}
+		if (isset($param['alt'])) {
+			$param['alt']    = $this->_prepareTxt($param['alt']);
+		}
+		if (isset($param['title'])) {
+			$param['title']  = $this->_prepareTxt($param['title']);
+		}
+		if (isset($param['class'])) {
+			$param['class']  = $this->_prepareTxt($param['class']);
+		}
+
+		// return the new action to do
+		return array('name' => $name, 'close' => $close ? 1 : 0, 'autoclose' => $autoclose, 'param' => $param);
+	}
+
+	/**
+	 * get a full level of HTML, between an opening and closing corresponding
+	 *
+	 * @param   integer key
+	 * @param integer $k
+	 * @return  array   actions
+	 */
+	public function getLevel($k)
+	{
+		// if the code does not exist => return empty
+		if ( ! isset($this->code[$k])) return array();
+
+		// the tag to detect
+		$detect = $this->code[$k]['name'];
+
+		// if it is a text => return
+		if ($detect == 'write') {
+			return array($this->code[$k]);
+		}
+
+		//
+		$level = 0; // depth level
+		$end = false; // end of the search
+		$code = array(); // extract code
+
+		// while it's not ended
+		while ( ! $end) {
+			// current action
+			$row = $this->code[$k];
+
+			// if 'write' => we add the text
+			if ($row['name'] == 'write') {
+				$code[] = $row;
+			} else { // else, it is a html tag
+				$not = false; // flag for not taking into account the current tag
+
+				// if it is the searched tag
+				if ($row['name'] == $detect) {
+					// if we are just at the root level => dont take it
+					if ($level == 0) {
+						$not = true;
+					}
+
+					// update the level
+					$level += ($row['close'] ? -1 : 1);
+
+					// if we are now at the root level => it is the end, and dont take it
+					if ($level == 0) {
+						$not = true;
+						$end = true;
+					}
+				}
+
+				// if we can takin into account the current tag => save it
+				if ( ! $not) {
+					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;
+		}
+
+		// return the extract
+		return $code;
+	}
+
+	/**
+	 * return a part of the HTML code, for error message
+	 *
+	 * @param   integer position
+	 * @param   integer take before
+	 * @param   integer take after
+	 * @return  string  part of the html code
+	 */
+	public function getHtmlErrorCode($pos, $before = 30, $after = 40)
+	{
+		return substr($this->_html, $pos - $before, $before + $after);
+	}
 }

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/_tcpdf_5.0.002/qrcode.php

Doc Comments +4 added lines, -4 removed lines

@@ -1123,7 +1123,7 @@ 
 		 * @param array $frame
 		 * @param int $maskNo
 		 * @param int $level
-		 * @return array mask
+		 * @return integer mask
 		 */
 		 protected function makeMask($width, $frame, $maskNo, $level) {
 			$masked = array_fill(0, $width, str_repeat("\0", $width));
@@ -1165,7 +1165,7 @@ 
 		/**
 		 * evaluateSymbol
 		 * @param int $width
-		 * @param array $frame
+		 * @param integer $frame
 		 * @return int demerit
 		 */
 		 protected function evaluateSymbol($width, $frame) {
@@ -2035,7 +2035,7 @@ 
 
 		/**
 		 * convertData
-		 * @param array $items
+		 * @param integer $items
 		 * @return array items
 		 */
 		 protected function convertData($items) {
@@ -2490,7 +2490,7 @@ 
 
 		/**
 		 * Return BCH encoded format information pattern.
-		 * @param array $mask
+		 * @param integer $mask
 		 * @param int $level error correction level
 		 * @return BCH encoded format information pattern
 		 */

Indentation +6 added lines, -6 removed lines

@@ -264,12 +264,12 @@
 
 	// for compaibility with PHP4
 	if (!function_exists('str_split')) {
-    	/**
-    	 * Convert a string to an array (needed for PHP4 compatibility)
-    	 * @param string $string The input string.
-    	 * @param int $split_length Maximum length of the chunk.
-    	 * @return  string[] the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
-    	 */
+		/**
+		 * Convert a string to an array (needed for PHP4 compatibility)
+		 * @param string $string The input string.
+		 * @param int $split_length Maximum length of the chunk.
+		 * @return  string[] the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
+		 */
 		function str_split($string, $split_length=1) {
 			if ((strlen($string) > $split_length) OR (!$split_length)) {
 				do {

Spacing +10 added lines, -10 removed lines

@@ -180,12 +180,12 @@ 
 	/**
 	 * Matrix index to get width from $capacity array.
 	 */
-	define('QRCAP_WIDTH',    0);
+	define('QRCAP_WIDTH', 0);
 
 	/**
 	 * Matrix index to get number of words from $capacity array.
 	 */
-	define('QRCAP_WORDS',    1);
+	define('QRCAP_WORDS', 1);
 
 	/**
 	 * Matrix index to get remainder from $capacity array.
@@ -195,7 +195,7 @@ 
 	/**
 	 * Matrix index to get error correction level from $capacity array.
 	 */
-	define('QRCAP_EC',       3);
+	define('QRCAP_EC', 3);
 
 	// -----------------------------------------------------
 
@@ -204,7 +204,7 @@ 
 	/**
 	 * Number of header bits for structured mode
 	 */
-	define('STRUCTURE_HEADER_BITS',  20);
+	define('STRUCTURE_HEADER_BITS', 20);
 
 	/**
 	 * Max number of symbols for structured mode
@@ -218,12 +218,12 @@ 
 	/**
 	 * Down point base value for case 1 mask pattern (concatenation of same color in a line or a column)
 	 */
-	define('N1',  3);
+	define('N1', 3);
 
 	/**
 	 * Down point base value for case 2 mask pattern (module block of same color)
 	 */
-	define('N2',  3);
+	define('N2', 3);
 
 	/**
 	 * Down point base value for case 3 mask pattern (1:1:3:1:1(dark:bright:dark:bright:dark)pattern in a line or a column)
@@ -260,18 +260,18 @@ 
 
 // #*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#
 
-if (!class_exists('QRcode', false)) {
+if ( ! class_exists('QRcode', false)) {
 
 	// for compaibility with PHP4
-	if (!function_exists('str_split')) {
+	if ( ! function_exists('str_split')) {
     	/**
     	 * Convert a string to an array (needed for PHP4 compatibility)
     	 * @param string $string The input string.
     	 * @param int $split_length Maximum length of the chunk.
     	 * @return  string[] the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
     	 */
-		function str_split($string, $split_length=1) {
-			if ((strlen($string) > $split_length) OR (!$split_length)) {
+		function str_split($string, $split_length = 1) {
+			if ((strlen($string) > $split_length) OR ( ! $split_length)) {
 				do {
 					$c = strlen($string);
 					$parts[] = substr($string, 0, $split_length);

web_interface/astpp/system/database/DB_result.php

Doc Comments +1 added lines

@@ -64,6 +64,7 @@
 	 * Custom query result.
 	 *
 	 * @param class_name A string that represents the type of object you want back
+	 * @param string $class_name
 	 * @return array of objects
 	 */
 	public function custom_result_object($class_name)

web_interface/astpp/system/database/drivers/sqlsrv/sqlsrv_driver.php

Doc Comments +1 added lines

@@ -164,6 +164,7 @@
 	 *
 	 * @access	private called by execute()
 	 * @param	string	an SQL query
+	 * @param string $sql
 	 * @return	string
 	 */
 	function _prep_query($sql)

Indentation +9 added lines, -9 removed lines

@@ -295,15 +295,15 @@
 	// --------------------------------------------------------------------
 
 	/**
-	* Parse major version
-	*
-	* Grabs the major version number from the
-	* database server version string passed in.
-	*
-	* @access private
-	* @param string $version
-	* @return string major version number
-	*/
+	 * Parse major version
+	 *
+	 * Grabs the major version number from the
+	 * database server version string passed in.
+	 *
+	 * @access private
+	 * @param string $version
+	 * @return string major version number
+	 */
 	function _parse_major_version($version)
 	{
 		preg_match('/([0-9]+)\.([0-9]+)\.([0-9]+)/', $version, $ver_info);

Braces +6 added lines, -4 removed lines

@@ -338,13 +338,15 @@
 	 */
 	function count_all($table = '')
 	{
-		if ($table == '')
-			return '0';
+		if ($table == '') {
+					return '0';
+		}
 	
 		$query = $this->query("SELECT COUNT(*) AS numrows FROM ".$this->dbprefix.$table);
 		
-		if ($query->num_rows() == 0)
-			return '0';
+		if ($query->num_rows() == 0) {
+					return '0';
+		}
 
 		$row = $query->row();
 		$this->_reset_select();