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)
 {

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();

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;

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)

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)

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

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)

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
 		 */

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)