iNextrix / ASTPP

freeswitch/fs/lib/astpp.cdr.php

Doc Comments +16 added lines

@@ -189,6 +189,10 @@ 
 }
 
 //Insert parent resellers cdr
+/**
+ * @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)
 {
 	while($parentid > 0 )
@@ -250,6 +254,9 @@ 
 }
 
 //Insert callee cdr entry for DID calls
+/**
+ * @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)
 {
 		$localVariable = $dataVariable;
@@ -318,6 +325,9 @@ 
 }
 
 //Update user balance
+/**
+ * @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;
@@ -457,6 +467,9 @@ 
 }
 
 // String append prefix for checking rates
+/**
+ * @param string $field
+ */
 function number_loop($destination,$field,$db)
 {
 	$max_len_prefix  = strlen($destination);
@@ -471,6 +484,9 @@ 
 }
 
 //Convert current time to GMT
+/**
+ * @param string $date
+ */
 function convert_to_gmt($date)
 {
 	return gmdate('Y-m-d H:i:s', strtotime($date) );

Spacing +103 added lines, -103 removed lines

@@ -22,7 +22,7 @@ 
 ###############################################################################
 
 //Process CDR 
-function process_cdr($data,$db,$logger,$decimal_points)
+function process_cdr($data, $db, $logger, $decimal_points)
 {
 	//$logger->log(print_r($data,true));//exit;
 
@@ -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,14 +65,14 @@ 
 	/*#### ************* 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'];
 	}
 
     $dataVariable['hangup_cause'] = $hangup_cause;
 
-	if ( ($dataVariable['hangup_cause'] != 'NORMAL_CLEARING') && ($dataVariable['hangup_cause'] != 'ALLOTTED_TIMEOUT')) {
+	if (($dataVariable['hangup_cause'] != 'NORMAL_CLEARING') && ($dataVariable['hangup_cause'] != 'ALLOTTED_TIMEOUT')) {
 	  	$dataVariable['billsec'] = 0;
 	}
 
@@ -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,7 +160,7 @@ 
         $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";
@@ -171,17 +171,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 *************");            
 	}
     //*****************************************************************************************
@@ -189,16 +189,16 @@ 
 }
 
 //Insert parent resellers cdr
-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']))
@@ -208,31 +208,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)";
@@ -240,7 +240,7 @@ 
 			$db->run($query);
 
 			//Update reseller balance
-			if( $debit > 0 && $dataVariable['calltype'] != "FREE"){
+			if ($debit > 0 && $dataVariable['calltype'] != "FREE") {
 				update_balance($accountid, $debit, 0, $logger, $db);
 			}
 		}
@@ -250,40 +250,40 @@ 
 }
 
 //Insert callee cdr entry for DID calls
-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);
+			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 {
+				$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);
+				$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);
+			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)";
 		}
@@ -291,7 +291,7 @@ 
 		$logger->log($query);
 		$db->run($query);	
 
-		if($debit > 0 && ($dataVariable['calltype'] != "FREE" && $dataVariable['calltype'] != "LOCAL"))
+		if ($debit > 0 && ($dataVariable['calltype'] != "FREE" && $dataVariable['calltype'] != "LOCAL"))
 		{
 			update_balance($accountid, $debit, 0, $logger, $db);
 		}
@@ -299,29 +299,29 @@ 
 }
 
 //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'];
+        $dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER') ? "DID" : $dataVariable['calltype'];
 
-		return  $cdr_string = "'".($dataVariable['uuid'])."','".$accountid."','".$account_type."','".(urldecode($dataVariable['caller_id']))."','".($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']."'" : "'".''."'" ).",
+		return  $cdr_string = "'".($dataVariable['uuid'])."','".$accountid."','".$account_type."','".(urldecode($dataVariable['caller_id']))."','".($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'];
-	return $cdr_string = "'".($dataVariable['uuid'])."','".$accountid."','".(urldecode($dataVariable['caller_id']))."','".($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'])."'";
+        $dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER') ? "DID" : $dataVariable['calltype'];
+	return $cdr_string = "'".($dataVariable['uuid'])."','".$accountid."','".(urldecode($dataVariable['caller_id']))."','".($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
 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);
 }
 
@@ -329,13 +329,13 @@ 
 function normalize_rate($dataVariable)
 {
 	$rates = urldecode($dataVariable);
-    $data = explode("|",$rates);
+    $data = explode("|", $rates);
 
 	$newarray = array();
-    foreach($data as $key => $value)
+    foreach ($data as $key => $value)
     {
-            $data1 = explode(":",$value);
-            foreach($data1 as $newkey => $newvalue)
+            $data1 = explode(":", $value);
+            foreach ($data1 as $newkey => $newvalue)
             {
                     $newarray[$data1[0]] = $data1[$newkey];
             }
@@ -347,16 +347,16 @@ 
 function normalize_origination_rate($dataVariable)
 {
 	$rates = urldecode($dataVariable);
-	$data = explode("|",$rates);
+	$data = explode("|", $rates);
 	$newarray = array();
 	$newarray1 = array();	
-	foreach($data as $key => $value)
+	foreach ($data as $key => $value)
 	{
-		$data1 = explode(":",$value);
-		foreach($data1 as $newkey => $newvalue)
+		$data1 = explode(":", $value);
+		foreach ($data1 as $newkey => $newvalue)
 		{
 			$newarray[$data1[0]] = $data1[$newkey];
-			if($newvalue == "ACCID" ){
+			if ($newvalue == "ACCID") {
 				$newarray1[$data1[1]] = $newarray;
 			}
 		}
@@ -365,13 +365,13 @@ 
 }
 
 // Calculate cost for billing 
-function calc_cost($dataVariable, $rates, $logger,$decimal_points)
+function calc_cost($dataVariable, $rates, $logger, $decimal_points)
 {
 	//$logger->log(print_r($rates,true));
 	$duration = $dataVariable['billsec'];
-	$call_cost=0;  
+	$call_cost = 0;  
 	$duration -= $rates['INCLUDEDSECONDS'];
-	if ($duration > 0 && ($dataVariable['hangup_cause'] == 'NORMAL_CLEARING' || $dataVariable['hangup_cause']  == 'ALLOTTED_TIMEOUT')) {
+	if ($duration > 0 && ($dataVariable['hangup_cause'] == 'NORMAL_CLEARING' || $dataVariable['hangup_cause'] == 'ALLOTTED_TIMEOUT')) {
 
     		$rates['INC'] = ($rates['INC'] == 0) ? 1 : $rates['INC'];
             $call_cost = $rates['CONNECTIONCOST'];
@@ -380,46 +380,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";
 			}						
 		} 
@@ -428,21 +428,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];
 }
@@ -452,27 +452,27 @@ 
 {
 	$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];
 }
 
 // String append prefix for checking rates
-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;
 }
 
 //Convert current time to GMT
 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));
 }
 ?>

freeswitch/fs/lib/astpp.db.php

Doc Comments +3 added lines

@@ -47,6 +47,9 @@
         echo $this->error;
     }
 
+    /**
+     * @param string $bind
+     */
     public function cleanup($bind) {
         if (!is_array($bind)) {
             if (!empty($bind))

Spacing +4 added lines, -4 removed lines

@@ -48,8 +48,8 @@ 
     }
 
     public function cleanup($bind) {
-        if (!is_array($bind)) {
-            if (!empty($bind))
+        if ( ! is_array($bind)) {
+            if ( ! empty($bind))
                 $bind = array($bind);
             else
                 $bind = array();
@@ -65,9 +65,9 @@ 
         try {
             $pdostmt = $this->prepare($this->sql);
             if ($pdostmt->execute($this->bind) !== false) {
-                if (preg_match("/^(" . implode("|", array("select", "describe", "pragma")) . ") /i", $this->sql))
+                if (preg_match("/^(".implode("|", array("select", "describe", "pragma")).") /i", $this->sql))
                     return $pdostmt->fetchAll(PDO::FETCH_ASSOC);
-                elseif (preg_match("/^(" . implode("|", array("delete", "insert", "update")) . ") /i", $this->sql))
+                elseif (preg_match("/^(".implode("|", array("delete", "insert", "update")).") /i", $this->sql))
                     return $pdostmt->rowCount();
             }
         } catch (PDOException $e) {

freeswitch/fs/lib/astpp.functions.php

Doc Comments +3 added lines

@@ -118,6 +118,9 @@
 }
 
 //Update user balance
+/**
+ * @param integer $entity_id
+ */
 function update_balance($user_id, $amount, $entity_id, $logger, $db) {
     if ($amount > 0) {
         $math_sign = ($entity_id == 0 || $entity_id == 1) ? '-' : '+';

Spacing +15 added lines, -15 removed lines

@@ -54,25 +54,25 @@ 
         $number_len = strlen($destination_number);
         $number_loop_str = '(';
         while ($number_len > 0) {
-            $number_loop_str .= " code='" . substr($destination_number, 0, $number_len) . "' OR ";
+            $number_loop_str .= " code='".substr($destination_number, 0, $number_len)."' OR ";
             $number_len -= 1;
         }
         $number_loop_str .= " code='--')";
 
-        $query = "SELECT A.id as package_id,code,includedseconds FROM tbl_package AS A ,tbl_package_codes AS B WHERE " . $number_loop_str . " AND B.package_id = A.id AND A.ratecard_id=" . $rates_array['ratecard_id'] . " AND A.status=0 AND A.is_del=0 ORDER BY length(code) DESC";
-        $logger->log("Package Query : " . $query);
+        $query = "SELECT A.id as package_id,code,includedseconds FROM tbl_package AS A ,tbl_package_codes AS B WHERE ".$number_loop_str." AND B.package_id = A.id AND A.ratecard_id=".$rates_array['ratecard_id']." AND A.status=0 AND A.is_del=0 ORDER BY length(code) DESC";
+        $logger->log("Package Query : ".$query);
         $res_package = $db->run($query);
 
         foreach ($res_package as $res_package_key => $package_info) {
             if (isset($package_info['package_id'])) {
-                $query = "SELECT SUM(used_seconds) as used_seconds FROM tbl_package_usage WHERE code=" . $package_info['code'] . " AND package_id=" . $package_info['package_id'] . " AND user_id=" . $user_id;
-                $logger->log("Package usage Query : " . $query);
+                $query = "SELECT SUM(used_seconds) as used_seconds FROM tbl_package_usage WHERE code=".$package_info['code']." AND package_id=".$package_info['package_id']." AND user_id=".$user_id;
+                $logger->log("Package usage Query : ".$query);
                 $res_pkg_usg = $db->run($query);
                 $package_usage_info = $res_pkg_usg[0];
 
                 $used_seconds = (isset($package_usage_info['used_seconds'])) ? $package_usage_info['used_seconds'] : 0;
 
-                $logger->log("Included seconds : " . $package_info['includedseconds'] . ", Used seconds : " . $used_seconds);
+                $logger->log("Included seconds : ".$package_info['includedseconds'].", Used seconds : ".$used_seconds);
                 if ($package_info['includedseconds'] > $used_seconds) {
                     $remaining_seconds = $package_info['includedseconds'] - ($duration + $used_seconds);
                     if ($remaining_seconds > 0) {
@@ -85,8 +85,8 @@ 
                     $flag = true;
                     $xml_cdr->variables->package_id = $package_info['package_id'];
 
-                    $query = "INSERT INTO tbl_package_usage (package_id,user_id,code,used_seconds) VALUES (" . $package_info['package_id'] . "," . $user_id . ",'" . $package_info['code'] . "'," . $dud_sec . ") ON DUPLICATE KEY UPDATE used_seconds=used_seconds+" . $dud_sec;
-                    $logger->log("Package Usage Query : " . $query);
+                    $query = "INSERT INTO tbl_package_usage (package_id,user_id,code,used_seconds) VALUES (".$package_info['package_id'].",".$user_id.",'".$package_info['code']."',".$dud_sec.") ON DUPLICATE KEY UPDATE used_seconds=used_seconds+".$dud_sec;
+                    $logger->log("Package Usage Query : ".$query);
                     $db->run($query);
 
                     break;
@@ -99,21 +99,21 @@ 
 
 //Process user/vendor cdr
 function do_cdr_process($xml_cdr, $debit, $cost, $vendor_cost, $rates_array, $parent_id = 0, $parent_rates, $carrier_rates_array, $logger, $db) {
-    $query_string = "'" . $xml_cdr->variables->uuid . "','" . $xml_cdr->variables->user_id . "','" . $xml_cdr->variables->entity_id . "','" . urldecode($xml_cdr->variables->effective_caller_id_name) . "','" . $xml_cdr->variables->effective_caller_id_number . "','" . $xml_cdr->variables->effective_destination_number . "'," . $xml_cdr->variables->duration . ",'" . $xml_cdr->variables->carrier_id . "','" . $xml_cdr->callflow[0]->caller_profile->originatee->originatee_caller_profile->network_addr . "','" . $xml_cdr->variables->sip_contact_host . "','" . $xml_cdr->variables->hangup_cause . "','" . urldecode($xml_cdr->variables->start_stamp) . "'," . $debit . "," . $cost . ",'" . $xml_cdr->variables->vendor_id . "'," . $vendor_cost . "," . $rates_array['ratecard_id'] . "," . $xml_cdr->variables->package_id . ",'" . $rates_array['code'] . "','" . $rates_array['destination'] . "','" . $rates_array['cost'] . "','" . $parent_id . "','" . @$parent_rates['code'] . "','" . @$parent_rates['destination'] . "','" . @$parent_rates['cost'] . "','" . @$carrier_rates_array['code'] . "','" . @$carrier_rates_array['destination'] . "','" . @$carrier_rates_array['cost'] . "','" . $xml_cdr->variables->call_direction . "','" . urldecode($xml_cdr->variables->profile_start_stamp) . "','" . urldecode($xml_cdr->variables->answer_stamp) . "','" . urldecode($xml_cdr->variables->bridge_stamp) . "','" . urldecode($xml_cdr->variables->progress_stamp) . "','" . urldecode($xml_cdr->variables->progress_media_stamp) . "','" . urldecode($xml_cdr->variables->end_stamp) . "'," . $xml_cdr->variables->billmsec . "," . $xml_cdr->variables->answermsec . "," . $xml_cdr->variables->waitmsec . "," . $xml_cdr->variables->progress_mediamsec . "," . $xml_cdr->variables->flow_billmsec;
+    $query_string = "'".$xml_cdr->variables->uuid."','".$xml_cdr->variables->user_id."','".$xml_cdr->variables->entity_id."','".urldecode($xml_cdr->variables->effective_caller_id_name)."','".$xml_cdr->variables->effective_caller_id_number."','".$xml_cdr->variables->effective_destination_number."',".$xml_cdr->variables->duration.",'".$xml_cdr->variables->carrier_id."','".$xml_cdr->callflow[0]->caller_profile->originatee->originatee_caller_profile->network_addr."','".$xml_cdr->variables->sip_contact_host."','".$xml_cdr->variables->hangup_cause."','".urldecode($xml_cdr->variables->start_stamp)."',".$debit.",".$cost.",'".$xml_cdr->variables->vendor_id."',".$vendor_cost.",".$rates_array['ratecard_id'].",".$xml_cdr->variables->package_id.",'".$rates_array['code']."','".$rates_array['destination']."','".$rates_array['cost']."','".$parent_id."','".@$parent_rates['code']."','".@$parent_rates['destination']."','".@$parent_rates['cost']."','".@$carrier_rates_array['code']."','".@$carrier_rates_array['destination']."','".@$carrier_rates_array['cost']."','".$xml_cdr->variables->call_direction."','".urldecode($xml_cdr->variables->profile_start_stamp)."','".urldecode($xml_cdr->variables->answer_stamp)."','".urldecode($xml_cdr->variables->bridge_stamp)."','".urldecode($xml_cdr->variables->progress_stamp)."','".urldecode($xml_cdr->variables->progress_media_stamp)."','".urldecode($xml_cdr->variables->end_stamp)."',".$xml_cdr->variables->billmsec.",".$xml_cdr->variables->answermsec.",".$xml_cdr->variables->waitmsec.",".$xml_cdr->variables->progress_mediamsec.",".$xml_cdr->variables->flow_billmsec;
 
     $query = "INSERT INTO tbl_cdrs (uniqueid,user_id,entity_id,callerid_name,callerid_number,dstnum,duration,carrier_id,carrierip,callerip,disposition,start_stamp,debit,cost,vendor_id,vendor_cost,ratecard_id,package_id,rate_code,rate_code_destination,rate_cost,parent_id,parent_code,parent_code_destination,parent_cost,carrier_code,carrier_code_destination ,carrier_cost,call_direction,profile_start_stamp,answer_stamp,bridge_stamp,progress_stamp,progress_media_stamp,end_stamp,billmsec,answermsec,waitmsec,progress_mediamsec,flow_billmsec) values ($query_string)";
 
-    $logger->log("CDR Query : " . $query);
+    $logger->log("CDR Query : ".$query);
     $db->run($query);
 }
 
 //Process reseller cdr
 function do_reseller_cdr_process($xml_cdr, $debit, $cost, $rates_array, $parent_id = 0, $parent_rates, $logger, $db) {
-    $query_string = "'" . $xml_cdr->variables->uuid . "','" . $xml_cdr->variables->user_id . "','" . urldecode($xml_cdr->variables->effective_caller_id_name) . "','" . $xml_cdr->variables->effective_caller_id_number . "','" . $xml_cdr->variables->effective_destination_number . "'," . $xml_cdr->variables->duration . ",'" . $xml_cdr->variables->hangup_cause . "','" . urldecode($xml_cdr->variables->start_stamp) . "'," . $debit . "," . $cost . "," . $rates_array['ratecard_id'] . "," . $xml_cdr->variables->package_id . ",'" . $rates_array['code'] . "','" . $rates_array['destination'] . "','" . $rates_array['cost'] . "','" . $parent_id . "','" . @$parent_rates['code'] . "','" . @$parent_rates['destination'] . "','" . @$parent_rates['cost'] . "','" . $xml_cdr->variables->call_direction . "'";
+    $query_string = "'".$xml_cdr->variables->uuid."','".$xml_cdr->variables->user_id."','".urldecode($xml_cdr->variables->effective_caller_id_name)."','".$xml_cdr->variables->effective_caller_id_number."','".$xml_cdr->variables->effective_destination_number."',".$xml_cdr->variables->duration.",'".$xml_cdr->variables->hangup_cause."','".urldecode($xml_cdr->variables->start_stamp)."',".$debit.",".$cost.",".$rates_array['ratecard_id'].",".$xml_cdr->variables->package_id.",'".$rates_array['code']."','".$rates_array['destination']."','".$rates_array['cost']."','".$parent_id."','".@$parent_rates['code']."','".@$parent_rates['destination']."','".@$parent_rates['cost']."','".$xml_cdr->variables->call_direction."'";
 
     $query = "INSERT INTO tbl_cdrs_reseller (uniqueid,reseller_id,callerid_name,callerid_number,dstnum,duration,disposition,start_stamp,debit,cost,ratecard_id,package_id,rate_code,rate_code_destination,rate_cost,parent_id,parent_code,parent_code_destination,parent_cost,call_direction) values ($query_string)";
 
-    $logger->log("CDR Query : " . $query);
+    $logger->log("CDR Query : ".$query);
     $db->run($query);
 }
 
@@ -121,15 +121,15 @@ 
 function update_balance($user_id, $amount, $entity_id, $logger, $db) {
     if ($amount > 0) {
         $math_sign = ($entity_id == 0 || $entity_id == 1) ? '-' : '+';
-        $query = "UPDATE tbl_users SET credit=credit$math_sign" . $amount . " WHERE id=" . $user_id;
-        $logger->log("Balance update : " . $query);
+        $query = "UPDATE tbl_users SET credit=credit$math_sign".$amount." WHERE id=".$user_id;
+        $logger->log("Balance update : ".$query);
         $db->run($query);
     }
 }
 
 //Get user info
 function get_user_info($parent_id, $db) {
-    $query = "SELECT * FROM tbl_users WHERE id=" . $parent_id;
+    $query = "SELECT * FROM tbl_users WHERE id=".$parent_id;
     $res_user = $db->run($query);
     return $res_user[0];
 }

web_interface/astpp/application/controllers/currencyupdate.php

Doc Comments +4 added lines

@@ -64,6 +64,10 @@
 	      redirect(base_url()."/systems/currency_list/");
 	      exit;
 	}
+
+	/**
+	 * @param string $url
+	 */
 	function curl_response($url)
 	{
 		    $ch = curl_init();  // Initialising cURL

Spacing +18 added lines, -18 removed lines

@@ -29,30 +29,30 @@ 
         $this->load->model("db_model");
         $this->load->library("astpp/common");
     }
-    function update_currency(){
+    function update_currency() {
         $where = array("currency <>"=> Common_model::$global_config['system_config']['base_currency']);
         $query = $this->db_model->getSelect("*", "currency", $where);
 
-        if($query->num_rows >0){
-            $currency_data =$query->result_array();
+        if ($query->num_rows > 0) {
+            $currency_data = $query->result_array();
     		$url = "http://finance.yahoo.com/d/quotes.csv?e=.csv&f=sl1d1t1&s=";
 	    	foreach ($currency_data as $currency_value) {
 	    	    $url .= Common_model::$global_config['system_config']['base_currency'].$currency_value['currency'].'=X+';
 	    	}
 	    	$url .= '&f=l1';
 
-	    	$sql='';
+	    	$sql = '';
 	    	$response = $this->curl_response($url);
-	    	$content_data = explode(' ',$response);
+	    	$content_data = explode(' ', $response);
 
-	    	foreach ($content_data as $content_data1){
-	    	   $currency_arr= explode("\n", $content_data1);
-	    	    foreach($currency_arr as $final_val)
+	    	foreach ($content_data as $content_data1) {
+	    	   $currency_arr = explode("\n", $content_data1);
+	    	    foreach ($currency_arr as $final_val)
 	    	    {
 	    	        $currency_final = array();
-	    		    $currency_final= explode(',', $final_val);
-	    		    if(isset($currency_final[1]) && $currency_final[1] != "" && $currency_final[0]!='' && $currency_final[1] != 'N/A'){
-			      $sql = "UPDATE currency SET currencyRate = ".$currency_final[1]." WHERE currency = '".substr($currency_final[0],4,3)."'";
+	    		    $currency_final = explode(',', $final_val);
+	    		    if (isset($currency_final[1]) && $currency_final[1] != "" && $currency_final[0] != '' && $currency_final[1] != 'N/A') {
+			      $sql = "UPDATE currency SET currencyRate = ".$currency_final[1]." WHERE currency = '".substr($currency_final[0], 4, 3)."'";
 			      $this->db->query($sql);
 	    		    }
 	    	    }
@@ -66,14 +66,14 @@ 
 	}
 	function curl_response($url)
 	{
-		    $ch = curl_init();  // Initialising cURL
-		    curl_setopt ( $ch, CURLOPT_URL, $url );
-		    curl_setopt ( $ch, CURLOPT_FOLLOWLOCATION, 1 );
-		    curl_setopt ( $ch, CURLOPT_RETURNTRANSFER, 1 );
-		    curl_setopt ( $ch, CURLOPT_ENCODING, "" );
-		    curl_setopt ( $ch, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6 (.NET CLR 3.5.30729)" );
+		    $ch = curl_init(); // Initialising cURL
+		    curl_setopt($ch, CURLOPT_URL, $url);
+		    curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+		    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		    curl_setopt($ch, CURLOPT_ENCODING, "");
+		    curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6 (.NET CLR 3.5.30729)");
 		    $data = curl_exec($ch); // Executing the cURL request and assigning the returned data to the $data variable
-		    curl_close($ch);        // Closing cURL
+		    curl_close($ch); // Closing cURL
 		    return $data;
 	}
 }

web_interface/astpp/application/controllers/generateInvoice.php

Doc Comments +15 added lines

@@ -89,6 +89,10 @@ 
         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;
 
@@ -99,6 +103,10 @@ 
         $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();
@@ -181,6 +189,9 @@ 
         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) {
@@ -234,6 +245,10 @@ 
         }
     }
 
+    /**
+     * @param string $FilePath
+     * @param string $Filenm
+     */
     function send_email_notification($FilePath, $Filenm, $AccountData, $invoice_conf, $invData) {
         $TemplateData = array();
         $where = array('name' => 'email_new_invoice');

Spacing +32 added lines, -32 removed lines

@@ -52,15 +52,15 @@ 
         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'];
+                $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"));
+                        $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:
@@ -69,23 +69,23 @@ 
                             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"));
+                            $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";
+            $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 = $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)));
+        $last_invoice_date = gmdate("Y-m-d H:i:s", strtotime("+1 Second", strtotime($last_invoice_date)));
         return $last_invoice_date;
     }
 
@@ -111,7 +111,7 @@ 
         //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')";
+        $where = "accountid IN ('".$reseller_id."','1')";
         $this->db->select('*');
         $this->db->where($where);
         $this->db->order_by('accountid', 'desc');
@@ -119,7 +119,7 @@ 
         $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']);
+        $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 {
@@ -143,8 +143,8 @@ 
     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";
+        $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) {
@@ -153,11 +153,11 @@ 
             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);
+                    "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'";
+        $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) {
@@ -175,8 +175,8 @@ 
 
     //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'";
+        $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;
     }
@@ -184,24 +184,24 @@ 
     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"));
+            $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"));
+            $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){
+	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);
-	}else{
+	} 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);
 	}
         // echo "<pre>"; print_r($invoice_data); exit;
         $this->db->insert("invoices", $invoice_data);
         $invoiceid = $this->db->insert_id();
-	if($automatic_flag == 0){
+	if ($automatic_flag == 0) {
             $this->download_invoice($invoiceid, $account, $invoiceconf);
 	}
         return $invoiceid;
@@ -226,8 +226,8 @@ 
         $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";
+        $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);
@@ -240,21 +240,21 @@ 
         $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['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("#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;
+        $dir_path = getcwd()."/attachments/";
+        $path = $dir_path.$Filenm;
+        $command = "cp ".$FilePath." ".$path;
         exec($command);
         $email_array = array('accountid' => $AccountData['id'],
             'subject' => $TemplateData['subject'],

web_interface/astpp/application/controllers/updateBalance.php

Doc Comments +11 added lines

@@ -153,6 +153,10 @@ 
         }
     }
 
+    /**
+     * @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";
@@ -217,6 +221,9 @@ 
         return $lastdate;
     }
 
+    /**
+     * @param string $todate
+     */
     function Manage_invoice_item($AccountData, $description, $item_id, $charge, $type, $fromdate, $todate, $invoicedate) {
         $invoiceid = 0;
         $Bal = "0.00"; 
@@ -263,6 +270,10 @@ 
         $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) {

Spacing +28 added lines, -28 removed lines

@@ -50,7 +50,7 @@ 
         
         // 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") . "')";
+        $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('*');
@@ -61,13 +61,13 @@ 
             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)) {
+                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"]));
+                            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']) {
@@ -134,7 +134,7 @@ 
                                 $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 {
+                            } else {
                                 //Apply charges to Resellers.
                                 $lastdate = $this->calculate_charges($reseller_acc_data, $itemArr, $reseller_dids["monthlycost"], $fromdate, $todate, "1");
                                 if ($lastdate)
@@ -156,39 +156,39 @@ 
     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']);
+        $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) ? $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();
+        $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;
+        $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);
+        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);
+            $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)){
+        if ( ! empty($prorate_array)) {
          array_pop($Charges_date_range);
-         $Charges_date_range=array_merge($prorate_array,$Charges_date_range);
+         $Charges_date_range = array_merge($prorate_array, $Charges_date_range);
         }
-        if (!empty($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)) {
+                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'];
+                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)));
                 }
@@ -222,13 +222,13 @@ 
         $Bal = "0.00"; 
         if ($AccountData["posttoexternal"] == 0) {
 	    $reseller_id = $AccountData['type'] == 1 ? $AccountData['id'] : 0;
-	    $where = "accountid IN ('" . $reseller_id . "','1')";
+	    $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();
+	    $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);
@@ -237,10 +237,10 @@ 
 	    }
 	    $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"));
+	    $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->set('balance', 'balance-'.$charge, FALSE);
             $this->db->where('id', $AccountData["id"]);
             $this->db->update("accounts");
             $AccountData['balance'] = ($AccountData['balance'] - $charge);
@@ -255,7 +255,7 @@ 
         }
         $invoice_item_arr = array("accountid" => $AccountData["id"],
             "reseller_id" => $AccountData["reseller_id"],
-            "description" => trim($description . "-" . $fromdate . " to " . $todate),
+            "description" => trim($description."-".$fromdate." to ".$todate),
             "item_id" => $item_id, "debit" => $charge, "invoiceid" => $invoiceid,
             "created_date" => trim($invoicedate),
             "item_type" => $type

web_interface/astpp/application/libraries/astpp/common.php

Doc Comments +39 added lines, -2 removed lines

@@ -44,8 +44,6 @@ 
 // __construct
     /**
      * adds raw html to the field array
-     * @param type $label
-     * @param type $field add
      */
     function generate_password() {
         $pass = substr(md5(rand(0, 1000000000)), 0, common_model::$global_config['system_config']['pinlength']);
@@ -93,6 +91,9 @@ 
         return $uname;
     }
 
+    /**
+     * @param string $length
+     */
     function random_string($length) {
         $chars = "1234567890"; //length:36
         $final_rand = '';
@@ -132,6 +133,10 @@ 
         return $number;
     }
 
+    /**
+     * @param string $select
+     * @param string $table
+     */
     function get_field_count($select, $table, $where) {
 //        echo $select."=====".$table."===".$where;
         if (is_array($where)) {
@@ -147,6 +152,10 @@ 
         }
     }
 
+    /**
+     * @param string $select
+     * @param string $table
+     */
     function get_field_name($select, $table, $where) {
         if (is_array($where)) {
             $where = $where;
@@ -162,6 +171,10 @@ 
         }
     }
 
+    /**
+     * @param string $select
+     * @param string $table
+     */
     function get_field_name_coma_new($select, $table, $where) {
         $value = '';
         if (is_array($where)) {
@@ -504,6 +517,9 @@ 
     }
    
 
+    /**
+     * @param string $select
+     */
     function get_invoice_date($select, $accountid = 0, $reseller_id, $order_by = 'id') {
         $where = array("reseller_id" => $reseller_id);
         if ($accountid > 0) {
@@ -1175,6 +1191,9 @@ 
 
     }
 
+    /**
+     * @param string $message
+     */
     function emailFunction($from, $to, $subject, $message, $company_name = "", $attachment = "", $account_id, $reseller_id) {
         $send_mail_details = array('from' => $from,
             'to' => $to,
@@ -1373,12 +1392,18 @@ 
       Password encode decode
      * ******* */
 
+    /**
+     * @param string $string
+     */
     function encode_params($string) {
         $data = base64_encode($string);
         $data = str_replace(array('+', '/', '='), array('-', '$', ''), $data);
         return $data;
     }
 
+    /**
+     * @param string $value
+     */
     function encode($value) {
         $text = $value;
         $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
@@ -1830,14 +1855,26 @@ 
         }
     }
     
+    /**
+     * @param string $table_name
+     */
     function delete_data($table_name,$where_arr){
         $this->CI->db->where($where_arr);
         $this->CI->db->delete($table_name);
     }
+
+    /**
+     * @param string $table_name
+     */
     function update_data($table_name,$where_arr,$update_arr){
         $this->CI->db->where($where_arr);
         $this->CI->db->update($table_name,$update_arr);
     }
+
+    /**
+     * @param string $table_name
+     * @param string $select
+     */
     function select_data($table_name,$where_arr,$select){
         $this->CI->db->where($where_arr);
         $this->CI->db->select($select);

Spacing +425 added lines, -425 removed lines

@@ -22,7 +22,7 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-if (!defined('BASEPATH'))
+if ( ! defined('BASEPATH'))
     exit('No direct script access allowed');
 
 /**
@@ -88,7 +88,7 @@ 
         if ($tablename == 'accounts' && $start_prifix_value != 0) {
             $length = strlen($start_prifix_value);
             $uname = substr($uname, $length);
-            $uname = $start_prifix_value . $uname;
+            $uname = $start_prifix_value.$uname;
         }
         return $uname;
     }
@@ -113,12 +113,12 @@ 
             $uname = $this->random_string($length);
             $uname = strtolower($uname);
             if (isset($default))
-                $uname = $default . $uname;
-            if (!in_array($uname, $number)) {
+                $uname = $default.$uname;
+            if ( ! in_array($uname, $number)) {
                 $where = array($field => $uname);
                 $acc_result = $this->CI->db_model->getSelect('Count(id) as count', $tablename, $where);
                 $acc_result = $acc_result->result_array();
-                if ($acc_result[0]['count'] == 0 && !in_array($uname, $number)) {
+                if ($acc_result[0]['count'] == 0 && ! in_array($uname, $number)) {
                     $number[] = $uname;
                     $j++;
                 }
@@ -140,7 +140,7 @@ 
             $where = array($select => $where);
         }
         $field_name = $this->CI->db_model->countQuery($select, $table, $where);
-        if (isset($field_name) && !empty($field_name)) {
+        if (isset($field_name) && ! empty($field_name)) {
             return $field_name;
         } else {
             return "0";
@@ -155,7 +155,7 @@ 
         }
         $field_name = $this->CI->db_model->getSelect($select, $table, $where);
         $field_name = $field_name->result();
-        if (isset($field_name) && !empty($field_name)) {
+        if (isset($field_name) && ! empty($field_name)) {
             return $field_name[0]->$select;
         } else {
             return "";
@@ -175,12 +175,12 @@ 
 
             $field_name = $this->CI->db_model->getSelect($select, $table, $where_in);
             $field_name = $field_name->result();
-            if (isset($field_name) && !empty($field_name)) {
+            if (isset($field_name) && ! empty($field_name)) {
                 foreach ($select1 as $sel) {
                     if ($sel == 'number') {
-                        $value.="(" . $field_name[0]->$sel . ")";
+                        $value .= "(".$field_name[0]->$sel.")";
                     } else {
-                        $value.= $field_name[0]->$sel . " ";
+                        $value .= $field_name[0]->$sel." ";
                     }
                 }
             } else {
@@ -196,12 +196,12 @@ 
         $where = array("number" => $where);
         $field_name = $this->CI->db_model->getSelect("id,accountid,parent_id", 'dids', $where);
         $field_name = $field_name->result();
-        if (isset($field_name) && !empty($field_name)) {
+        if (isset($field_name) && ! empty($field_name)) {
             if (isset($field_name[0]) && $accountinfo['type'] != 1) {
-                if ($field_name[0]->accountid != 0 && $field_name[0]->parent_id ==0) {
-                    $flag_status = "<a href='../did_list_release/" . $field_name[0]->id . "' title='Release' onClick='return get_reliase_msg();'><span class=' label label-sm label-inverse_blue arrowed_blue-in' title='release'>Release(C)<span></a>";
+                if ($field_name[0]->accountid != 0 && $field_name[0]->parent_id == 0) {
+                    $flag_status = "<a href='../did_list_release/".$field_name[0]->id."' title='Release' onClick='return get_reliase_msg();'><span class=' label label-sm label-inverse_blue arrowed_blue-in' title='release'>Release(C)<span></a>";
                 } else if ($field_name[0]->parent_id != 0) {
-                    $flag_status = "<a href='../did_list_release/" . $field_name[0]->id . "' title='Release' onClick='return get_reliase_msg();'><span class=' label label-sm label-inverse_blue arrowed_blue-in' title='release'>Release(R)</span></a>";
+                    $flag_status = "<a href='../did_list_release/".$field_name[0]->id."' title='Release' onClick='return get_reliase_msg();'><span class=' label label-sm label-inverse_blue arrowed_blue-in' title='release'>Release(R)</span></a>";
                 } else {
                     $flag_status = "<span class=' label label-sm label-inverse arrowed-in' title='Not in use'>Not in use</span>";
                 }
@@ -211,8 +211,8 @@ 
                 $field_name_re = $this->CI->db_model->getSelect("reseller_id", 'reseller_pricing', $where);
                 $field_name_re = $field_name_re->result();
 
-                if (isset($field_name_re) && !empty($field_name_re)) {
-                    $flag_status = "<a href='../did_list_release/" . $field_name[0]->id . "' title='Release' onClick='return get_reliase_msg();'><span class=' label label-sm label-inverse_blue arrowed_blue-in' title='release'>Release(R)</span></a>";
+                if (isset($field_name_re) && ! empty($field_name_re)) {
+                    $flag_status = "<a href='../did_list_release/".$field_name[0]->id."' title='Release' onClick='return get_reliase_msg();'><span class=' label label-sm label-inverse_blue arrowed_blue-in' title='release'>Release(R)</span></a>";
                 } else {
                     $flag_status = "<span class=' label label-sm label-inverse arrowed-in' title='Not in use'>Not in use</span>";
                 }
@@ -222,32 +222,32 @@ 
         }
         return $flag_status;
     }
-    function check_did_avl_export($number){
-      $this->CI->db->where('number',$number);
+    function check_did_avl_export($number) {
+      $this->CI->db->where('number', $number);
       $this->CI->db->select('id,accountid,parent_id');
-      $status=null;
-      $did_info=(array)$this->CI->db->get('dids')->first_row();
-      $accountinfo=$this->CI->session->userdata('accountinfo');
-      if($did_info['accountid'] ==0 && $did_info['parent_id']==0){
-	$status='Not in use';
+      $status = null;
+      $did_info = (array)$this->CI->db->get('dids')->first_row();
+      $accountinfo = $this->CI->session->userdata('accountinfo');
+      if ($did_info['accountid'] == 0 && $did_info['parent_id'] == 0) {
+	$status = 'Not in use';
       }
-      elseif($accountinfo['type'] !=1){
-	if($did_info['accountid'] ==0 && $did_info['parent_id'] > 0){
-	  $status='Purchase by Reseller';
+      elseif ($accountinfo['type'] != 1) {
+	if ($did_info['accountid'] == 0 && $did_info['parent_id'] > 0) {
+	  $status = 'Purchase by Reseller';
 	}
-	if($did_info['accountid'] > 0 && $did_info['parent_id'] == 0){
-	  $status='Purchase by Customer';
+	if ($did_info['accountid'] > 0 && $did_info['parent_id'] == 0) {
+	  $status = 'Purchase by Customer';
 	}
-      }else{
-       $where_arr=array('note'=>$did_info['number'],"parent_id"=>$accountinfo['id']);
+      } else {
+       $where_arr = array('note'=>$did_info['number'], "parent_id"=>$accountinfo['id']);
        $this->db->where($where);
        $this->CI->db->select('reseller_id,parent_id');
        $reseller_pricing = (array)$this->db->get('reseller_pricing')->first_row();
-       if($reseller_pricing['reseller_id']==0 && $did_info['accountid']==0 && $did_info['parent_id']==$accountinfo['id']){
-        $status='Not in use';
+       if ($reseller_pricing['reseller_id'] == 0 && $did_info['accountid'] == 0 && $did_info['parent_id'] == $accountinfo['id']) {
+        $status = 'Not in use';
        }
-       if($reseller_pricing['reseller_id']==0 && $did_info['accountid']==0){
-       $status='Not in use';
+       if ($reseller_pricing['reseller_id'] == 0 && $did_info['accountid'] == 0) {
+       $status = 'Not in use';
        }
       }
       return $status;
@@ -256,24 +256,24 @@ 
     function check_did_avl_reseller($select, $table, $where) {
         $accountinfo = $this->CI->session->userdata('accountinfo');
         $flag_status = "<span class=' label label-sm label-inverse arrowed-in' title='Not in use'>Not in use</span>";
-        $this->CI->db->where('number',$where);
+        $this->CI->db->where('number', $where);
         $this->CI->db->select('id,accountid,parent_id,number');
-        $did_info=(array)$this->CI->db->get('dids')->first_row();
-        if($did_info['accountid'] > 0 && $did_info['parent_id'] == $accountinfo['id']){
-	    $flag_status = "<a href='../did_list_release/" . $did_info['id'] . "' title='Release' onClick='return get_reliase_msg();'><span class=' label label-sm label-inverse_blue arrowed_blue-in' title='release'>Release(C)<span></a>";
+        $did_info = (array)$this->CI->db->get('dids')->first_row();
+        if ($did_info['accountid'] > 0 && $did_info['parent_id'] == $accountinfo['id']) {
+	    $flag_status = "<a href='../did_list_release/".$did_info['id']."' title='Release' onClick='return get_reliase_msg();'><span class=' label label-sm label-inverse_blue arrowed_blue-in' title='release'>Release(C)<span></a>";
 	}
-        else if($accountinfo['type']!=1 && $did_info['parent_id'] != $accountinfo['id']){
-	    $flag_status = "<a href='../did_list_release/" . $did_info['id'] . "' title='Release' onClick='return get_reliase_msg();'><span class=' label label-sm label-inverse_blue arrowed_blue-in' title='release'>Release(R)</span></a>";
-        }else{
-	    $reseller_id= $accountinfo['type'] != 1 ? 0 : $accountinfo['id'];
-	    $where = array("note" => $did_info['number'],'parent_id'=>$reseller_id);
+        else if ($accountinfo['type'] != 1 && $did_info['parent_id'] != $accountinfo['id']) {
+	    $flag_status = "<a href='../did_list_release/".$did_info['id']."' title='Release' onClick='return get_reliase_msg();'><span class=' label label-sm label-inverse_blue arrowed_blue-in' title='release'>Release(R)</span></a>";
+        } else {
+	    $reseller_id = $accountinfo['type'] != 1 ? 0 : $accountinfo['id'];
+	    $where = array("note" => $did_info['number'], 'parent_id'=>$reseller_id);
             $this->CI->db->where($where);
 	    $this->CI->db->select('reseller_id,id');
-	    $reseller_pricing_info=(array)$this->CI->db->get('reseller_pricing')->first_row();
-	    if (isset($reseller_pricing_info) && !empty($reseller_pricing_info)) {
-		  $flag_status="<a href='../did/did_reseller_edit/delete/".$reseller_pricing_info['id']."' title='Reliase' onClick='return get_reliase_msg();'><span class=' label label-sm label-inverse_blue arrowed_blue-in' title='release'>Release(R)</span></a>";
-	    }else{
-	      $flag_status="<span class=' label label-sm label-inverse arrowed-in' title='Not in use'>Not in use</span>";
+	    $reseller_pricing_info = (array)$this->CI->db->get('reseller_pricing')->first_row();
+	    if (isset($reseller_pricing_info) && ! empty($reseller_pricing_info)) {
+		  $flag_status = "<a href='../did/did_reseller_edit/delete/".$reseller_pricing_info['id']."' title='Reliase' onClick='return get_reliase_msg();'><span class=' label label-sm label-inverse_blue arrowed_blue-in' title='release'>Release(R)</span></a>";
+	    } else {
+	      $flag_status = "<span class=' label label-sm label-inverse arrowed-in' title='Not in use'>Not in use</span>";
 	    }
         }
         return $flag_status;
@@ -292,8 +292,8 @@ 
 
             $field_name = $this->CI->db_model->getSelect($select, $table, $where_in);
             $field_name = $field_name->result();
-            if (isset($field_name) && !empty($field_name)) {
-                $value.= $field_name[0]->$select . ",";
+            if (isset($field_name) && ! empty($field_name)) {
+                $value .= $field_name[0]->$select.",";
             } else {
                 $value = "";
             }
@@ -325,7 +325,7 @@ 
             if (isset($uri_segment[3])) {
                 return $week_arr;
             } else {
-                $week_drp = form_dropdown(array("name" => 'invoice_day','style'=>"width: 100% !important;" , "class" => "invoice_day"), $week_arr, $day);
+                $week_drp = form_dropdown(array("name" => 'invoice_day', 'style'=>"width: 100% !important;", "class" => "invoice_day"), $week_arr, $day);
                 return $week_drp;
             }
         }
@@ -337,7 +337,7 @@ 
                 return $mon_arr;
             } else {
                 $day = $invoice_date > 0 ? $invoice_date : date('d');
-                $month_drp = form_dropdown(array("name" => 'invoice_day',"class" => "width_dropdown invoice_day"), $mon_arr, $day);
+                $month_drp = form_dropdown(array("name" => 'invoice_day', "class" => "width_dropdown invoice_day"), $mon_arr, $day);
                 return $month_drp;
             }
         }
@@ -349,7 +349,7 @@ 
     }
 
     function set_routetype($status = '') {
-        $status_array = array( '0' => 'LCR','1' => 'COST',);
+        $status_array = array('0' => 'LCR', '1' => 'COST',);
         return $status_array;
     }
 
@@ -378,12 +378,12 @@ 
         $status_array = array('1' => 'Yes', '0' => 'No');
         return $status_array;
     }
-    function set_pin_allow($status=''){
-        $status_array = array('0' => 'Disable','1' => 'Enable');
+    function set_pin_allow($status = '') {
+        $status_array = array('0' => 'Disable', '1' => 'Enable');
         return $status_array;
     }
-    function set_pin_allow_customer($status=''){
-        $status_array = array('0' => 'No','1' => 'Yes');
+    function set_pin_allow_customer($status = '') {
+        $status_array = array('0' => 'No', '1' => 'Yes');
         return $status_array;
     }
     function get_allow($select = "", $table = "", $status) {
@@ -391,20 +391,20 @@ 
     }
 
     function set_call_type($call_type = "") {
-        $call_type_array = array("-1" => "--Select--",'1' => 'DID-Local',"3"=>"SIP-DID", '0' => 'PSTN',  '2' => 'Other',);
+        $call_type_array = array("-1" => "--Select--", '1' => 'DID-Local', "3"=>"SIP-DID", '0' => 'PSTN', '2' => 'Other',);
         return $call_type_array;
     }
-    function set_call_type_search(){
-	$call_type_array = array("" => "--Select--",'1' => 'DID-Local',"3"=>"SIP-DID", '0' => 'PSTN',  '2' => 'Other',);
+    function set_call_type_search() {
+	$call_type_array = array("" => "--Select--", '1' => 'DID-Local', "3"=>"SIP-DID", '0' => 'PSTN', '2' => 'Other',);
         return $call_type_array;
     }
     function get_call_type($select = "", $table = "", $call_type) {
-        $call_type_array = array('1' => 'DID-Local',"3"=>"SIP-DID",'0' => 'PSTN',  '2' => 'Other','-1'=>"");
+        $call_type_array = array('1' => 'DID-Local', "3"=>"SIP-DID", '0' => 'PSTN', '2' => 'Other', '-1'=>"");
         return $call_type_array[$call_type];
     }
 
     function get_custom_call_type($call_type) {
-        $call_type_array = array('DID-Local' => '1',"SIP-DID"=>"3",'PSTN' => '0','Other' => '2',""=>"-1");
+        $call_type_array = array('DID-Local' => '1', "SIP-DID"=>"3", 'PSTN' => '0', 'Other' => '2', ""=>"-1");
         return $call_type_array[$call_type];
     }
 
@@ -429,7 +429,7 @@ 
     }
 
 	function set_entity_type_email_mass($entity_type = "") {
-        $entity_array = array('' => "--Select--", '0' => 'Customer','1'=>'Reseller','3' => "Provider");
+        $entity_array = array('' => "--Select--", '0' => 'Customer', '1'=>'Reseller', '3' => "Provider");
         return $entity_array;
     }
 
@@ -466,21 +466,21 @@ 
    show status on all grid
    */
    function get_status($select = "", $table = "", $status) {
-       if($select !='export'){
-        $status_tab=$this->encode($table);
-        $status['table']="'".$status_tab."'";
-        if($status['status'] == 0){
+       if ($select != 'export') {
+        $status_tab = $this->encode($table);
+        $status['table'] = "'".$status_tab."'";
+        if ($status['status'] == 0) {
 	$status_array = '<div style="width: 100%; text-align: -moz-center; padding: 0;"><input type="checkbox" name="onoffswitch" class="onoffswitch-checkbox" id=switch'.$status['id'].' value='.$status['status'].' onclick="javascript:processForm('.$status['id'].','.$status['table'].')" checked>
 	<label class="onoffswitch-label" for=switch'.$status["id"].'>
      	<span class="onoffswitch-inner"></span>
 	</label></div>';
-	}else{
+	} else {
 	$status_array = '<div style="width: 100%; text-align: -moz-center; padding: 0;"><input type="checkbox" name="onoffswitch" class="onoffswitch-checkbox" id=switch'.$status['id'].' value='.$status['status'].' onclick="javascript:processForm('.$status['id'].','.$status['table'].')">
 	<label class="onoffswitch-label" for=switch'.$status["id"].'>
      	<span class="onoffswitch-inner"></span>
 	</label></div>';
 	}
-	}else{
+	} else {
 		return ($status == 0) ? "Active" : "Inactive";
 	}
 	return $status_array;
@@ -494,13 +494,13 @@ 
         return ($status == 0) ? "Yes" : "No";
     }
     
-    function get_import_status($status){
+    function get_import_status($status) {
      return strtolower(trim($status)) == 'active' ? 0 : 1;
      
     }
-    function get_did_status($select,$table,$status){
+    function get_did_status($select, $table, $status) {
     
-      return ($status['status']==0) ? "<span class='label label-sm label-inverse arrowed-in' title='release'>Active<span>" : "<span class='label label-sm' title='release'>Inactive<span>";
+      return ($status['status'] == 0) ? "<span class='label label-sm label-inverse arrowed-in' title='release'>Active<span>" : "<span class='label label-sm' title='release'>Inactive<span>";
     }
    
 
@@ -511,7 +511,7 @@ 
         }
         $invoice_res = $this->CI->db_model->select($select, "invoices", $where, $order_by, "DESC", "1", "0");
         if ($invoice_res->num_rows > 0) {
-            $invoice_info = (array) $invoice_res->first_row();
+            $invoice_info = (array)$invoice_res->first_row();
             return $invoice_info[$select];
         }
         return false;
@@ -537,23 +537,23 @@ 
 
     function convert_to_currency($select = "", $table = "", $amount) {
         $this->CI->load->model('common_model');
-        return $this->CI->common_model->calculate_currency($amount,'','',true,false);
+        return $this->CI->common_model->calculate_currency($amount, '', '', true, false);
     }
-    function account_number_icon($select = "", $table = "", $number){
-    $return_value='';
-    $where=array('number'=>$number);
-    $account_res = (array)$this->CI->db->get_where("accounts",$where)->first_row();
-    if($account_res['type'] == 0){
-    $return_value= '<div class="flx_font flx_magenta" title="Customer">C</div>'." <span title='Edit'>". $account_res['number']." </span>";    
+    function account_number_icon($select = "", $table = "", $number) {
+    $return_value = '';
+    $where = array('number'=>$number);
+    $account_res = (array)$this->CI->db->get_where("accounts", $where)->first_row();
+    if ($account_res['type'] == 0) {
+    $return_value = '<div class="flx_font flx_magenta" title="Customer">C</div>'." <span title='Edit'>".$account_res['number']." </span>";    
     }
-    if($account_res['type']==3){
-    $return_value='<div class="flx_font flx_blue" title="Provider">P</div>'." <span title='Edit'>".$account_res['number']." </span>";
+    if ($account_res['type'] == 3) {
+    $return_value = '<div class="flx_font flx_blue" title="Provider">P</div>'." <span title='Edit'>".$account_res['number']." </span>";
     }
-    if($account_res['type']== -1 || $account_res['type']==2){
-      $return_value='<div class="flx_font flx_pink" title="Admin">A</div>'." <span title='Edit'>".$account_res['number']." </span>";
+    if ($account_res['type'] == -1 || $account_res['type'] == 2) {
+      $return_value = '<div class="flx_font flx_pink" title="Admin">A</div>'." <span title='Edit'>".$account_res['number']." </span>";
     }
-    if($account_res['type']== 4){
-      $return_value='<div class="flx_font flx_purple" title="Subadmin">S</div>'." <span title='Edit'>".$account_res['number']." </span>";
+    if ($account_res['type'] == 4) {
+      $return_value = '<div class="flx_font flx_purple" title="Subadmin">S</div>'." <span title='Edit'>".$account_res['number']." </span>";
     }
     return $return_value;
     }
@@ -628,7 +628,7 @@ 
     }
 
     function search_string_type($status = '') {
-        $status_array = array('5'=>"Begins With",'1' => 'Contains', '2' => 'Doesnt Contain', '3' => 'Is Equal To', '4' => 'Is Not Equal To',"6"=>"Ends With");
+        $status_array = array('5'=>"Begins With", '1' => 'Contains', '2' => 'Doesnt Contain', '3' => 'Is Equal To', '4' => 'Is Not Equal To', "6"=>"Ends With");
         return $status_array;
     }
 
@@ -649,7 +649,7 @@ 
     }
 
     function convert_to_percentage($select = "", $table = "", $amount) {
-        return round($amount, 2) . " %";
+        return round($amount, 2)." %";
     }
 
     function convert_to_minutes($select = "", $table = "", $amount) {
@@ -661,7 +661,7 @@ 
         return $status_array;
     }
     
-    	function set_routetype_status($select= ''){
+    	function set_routetype_status($select = '') {
         $status_array = array("" => "--Select--",
             "0" => "LCR",
             "1" => "COST"
@@ -676,8 +676,8 @@ 
             $array = explode(",", $attachement);
             $str = '';	
             foreach ($array as $key => $val) {
-                $link = base_url() . "email/email_history_list_attachment/" . $val;
-                $str.="<a href='" . $link . "' title='" . $val . "' class='btn btn-royelblue btn-sm'><i class='fa fa-paperclip fa-fw'></i></a>&nbsp;&nbsp;";
+                $link = base_url()."email/email_history_list_attachment/".$val;
+                $str .= "<a href='".$link."' title='".$val."' class='btn btn-royelblue btn-sm'><i class='fa fa-paperclip fa-fw'></i></a>&nbsp;&nbsp;";
             }
             return $str;
         } else {
@@ -764,7 +764,7 @@ 
 
     function get_action_buttons($buttons_arr, $linkid) {
         $ret_url = '';
-        if (!empty($buttons_arr) && $buttons_arr != '') {
+        if ( ! empty($buttons_arr) && $buttons_arr != '') {
             foreach ($buttons_arr as $button_key => $buttons_params) {
                 if (strtoupper($button_key) == "EDIT") {
                     $ret_url .= $this->build_edit_button($buttons_params, $linkid);
@@ -833,31 +833,31 @@ 
     }
 
     function build_delete_button_animap($url, $linkid) {
-        $link = base_url() . $url . "" . $linkid;
-        return '<a href="javascript:void(0)" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg_destination(' . $linkid . ');"><i class="fa fa-trash fa-fw"></i></a>';
+        $link = base_url().$url."".$linkid;
+        return '<a href="javascript:void(0)" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg_destination('.$linkid.');"><i class="fa fa-trash fa-fw"></i></a>';
     }
 
     function build_edit_button_animap($button_params, $linkid) {
-        $link = base_url() . $button_params->url . "" . $linkid;
-        return '<a href="javascript:void(0);" id="destination_new" class="btn btn-royelblue btn-sm" onclick="return get_destination(' . $linkid . ');" title="Update"><i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
+        $link = base_url().$button_params->url."".$linkid;
+        return '<a href="javascript:void(0);" id="destination_new" class="btn btn-royelblue btn-sm" onclick="return get_destination('.$linkid.');" title="Update"><i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
     }
 
     function build_animap_button($button_params, $linkid) {
-        $link = base_url() . $button_params->url . "" . $linkid;
-        return '<a href="' . $link . '" class="btn btn-royelblue btn-sm animap_image" rel="facebox" title="ANI Map"><i class="fa fa-reorder fa-fw"></i></a>&nbsp;';
+        $link = base_url().$button_params->url."".$linkid;
+        return '<a href="'.$link.'" class="btn btn-royelblue btn-sm animap_image" rel="facebox" title="ANI Map"><i class="fa fa-reorder fa-fw"></i></a>&nbsp;';
     }
 
     function build_edit_button($button_params, $linkid) {
-        $link = base_url() . $button_params->url . "" . $linkid;
+        $link = base_url().$button_params->url."".$linkid;
        
         if ($button_params->mode == 'popup') {
-            $rel = (isset($button_params->layout) && $button_params->layout != '')?"facebox_".$button_params->layout:"facebox";
-            return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" rel="'.$rel.'" title="Edit" ="small"><i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
+            $rel = (isset($button_params->layout) && $button_params->layout != '') ? "facebox_".$button_params->layout : "facebox";
+            return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" rel="'.$rel.'" title="Edit" ="small"><i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
             
-        }else if(strpos($link,'customer_edit') !== false){
-        return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Edit"><i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
-        }else {
-            return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Edit"><i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
+        } else if (strpos($link, 'customer_edit') !== false) {
+        return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" title="Edit"><i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
+        } else {
+            return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" title="Edit"><i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;';
         }
     }
 
@@ -865,18 +865,18 @@ 
       For Edit on Account number or name
      **/
     function build_custome_edit_button($button_params, $field, $linkid) {
-        $link = base_url() . $button_params->url . "" . $linkid;
-        if(isset($button_params->layout)){
+        $link = base_url().$button_params->url."".$linkid;
+        if (isset($button_params->layout)) {
 			if ($button_params->mode == 'popup') {
-				return '<a href="' . $link . '" style="cursor:pointer;color:#005298;" rel="facebox_medium" title="Update">' . $field . '</a>&nbsp;';
+				return '<a href="'.$link.'" style="cursor:pointer;color:#005298;" rel="facebox_medium" title="Update">'.$field.'</a>&nbsp;';
 			} else {
-				return '<a href="' . $link . '" style="cursor:pointer;color:#005298;" title="Edit">' . $field . '</a>&nbsp;';
+				return '<a href="'.$link.'" style="cursor:pointer;color:#005298;" title="Edit">'.$field.'</a>&nbsp;';
 			}
-		}else{ 
+		} else { 
 			if ($button_params->mode == 'popup') {
-				return '<a href="' . $link . '" style="cursor:pointer;color:#005298;" rel="facebox" title="Update">' . $field . '</a>&nbsp;';
+				return '<a href="'.$link.'" style="cursor:pointer;color:#005298;" rel="facebox" title="Update">'.$field.'</a>&nbsp;';
 			} else {
-				return '<a href="' . $link . '" style="cursor:pointer;color:#005298;" title="Edit">' . $field . '</a>&nbsp;';
+				return '<a href="'.$link.'" style="cursor:pointer;color:#005298;" title="Edit">'.$field.'</a>&nbsp;';
 			}
 		}
     }
@@ -884,126 +884,126 @@ 
     /************************************ */
 
     function build_edit_button_restore($button_params, $linkid) {
-        $link = base_url() . $button_params->url . "" . $linkid;
+        $link = base_url().$button_params->url."".$linkid;
         if ($button_params->mode == 'popup') {
-            return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" rel="facebox" title="Restore" onClick="return get_alert_msg();"><i class="fa fa-reorder fa-fw"></i></a>&nbsp;';
+            return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" rel="facebox" title="Restore" onClick="return get_alert_msg();"><i class="fa fa-reorder fa-fw"></i></a>&nbsp;';
         } else {
-            return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Restore" onClick="return get_alert_msg_restore();"><i class="fa fa-reorder fa-fw"></i></a>&nbsp;';
+            return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" title="Restore" onClick="return get_alert_msg_restore();"><i class="fa fa-reorder fa-fw"></i></a>&nbsp;';
         }
     }
 
     function build_delete_button($url, $linkid) {
-        $flag='0';
-        $data=  explode("/",$url);
-        $link = base_url() . $url . "" . $linkid;
-        foreach($data as $key=>$value){
-            if($value == 'price_delete')
+        $flag = '0';
+        $data = explode("/", $url);
+        $link = base_url().$url."".$linkid;
+        foreach ($data as $key=>$value) {
+            if ($value == 'price_delete')
                 $flag = '1';
-            if($value == 'trunk_remove')
-                $flag='2';
-            if($value == 'customer_delete' ||$value =='provider_delete')
-                $flag='3';
-            if($value == 'reseller_delete')
-                $flag='4';
+            if ($value == 'trunk_remove')
+                $flag = '2';
+            if ($value == 'customer_delete' || $value == 'provider_delete')
+                $flag = '3';
+            if ($value == 'reseller_delete')
+                $flag = '4';
             }    
-            if($flag=='1'){
-                $where=array('pricelist_id'=>$linkid,'deleted !=' =>'1');
-                $customer_cnt=$this->get_field_count('id','accounts',$where);
-                    $where=array('pricelist_id'=>$linkid);
-                    $rategroup_cnt=$this->get_field_count('id','routes',$where);
-                    if($rategroup_cnt > 0 || $customer_cnt > 0 ){
+            if ($flag == '1') {
+                $where = array('pricelist_id'=>$linkid, 'deleted !=' =>'1');
+                $customer_cnt = $this->get_field_count('id', 'accounts', $where);
+                    $where = array('pricelist_id'=>$linkid);
+                    $rategroup_cnt = $this->get_field_count('id', 'routes', $where);
+                    if ($rategroup_cnt > 0 || $customer_cnt > 0) {
                         
-                        return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_message('.$rategroup_cnt.','.$customer_cnt.','.$linkid.',1);"><i class="fa fa-trash fa-fw"></i></a>';
+                        return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_message('.$rategroup_cnt.','.$customer_cnt.','.$linkid.',1);"><i class="fa fa-trash fa-fw"></i></a>';
                     }
-                    else{
-                        return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();"><i class="fa fa-trash fa-fw"></i></a>';
+                    else {
+                        return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();"><i class="fa fa-trash fa-fw"></i></a>';
                     }
             }
-            if($flag=='2'){
-                $where=array('trunk_id'=>$linkid);
-                $trunk_cnt=$this->get_field_count('id','outbound_routes',$where);
-                if($trunk_cnt > 0){
-                    return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_message('.$trunk_cnt.',null,'.$linkid.',2);"><i class="fa fa-trash fa-fw"></i></a>';
+            if ($flag == '2') {
+                $where = array('trunk_id'=>$linkid);
+                $trunk_cnt = $this->get_field_count('id', 'outbound_routes', $where);
+                if ($trunk_cnt > 0) {
+                    return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_message('.$trunk_cnt.',null,'.$linkid.',2);"><i class="fa fa-trash fa-fw"></i></a>';
                 }
-                else{
-                    return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();"><i class="fa fa-trash fa-fw"></i></a>';
+                else {
+                    return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();"><i class="fa fa-trash fa-fw"></i></a>';
                 }
             }
-            if($flag == '3'){
-		return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_message(0,null,'.$linkid.',3);">
+            if ($flag == '3') {
+		return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_message(0,null,'.$linkid.',3);">
 		<i class="fa fa-trash fa-fw"></i></a>';
             }
-            if($flag == '4'){
-		return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_message(0,null,'.$linkid.',4);">
+            if ($flag == '4') {
+		return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_message(0,null,'.$linkid.',4);">
 		<i class="fa fa-trash fa-fw"></i></a>';
             }
-            if($flag=='0' && $url.$linkid !='accounts/admin_delete/1' ){
-                return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();"><i class="fa fa-trash fa-fw"></i></a>';
+            if ($flag == '0' && $url.$linkid != 'accounts/admin_delete/1') {
+                return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();"><i class="fa fa-trash fa-fw"></i></a>';
             }  
     }
 
     function build_view_button($button_params, $linkid) {
-        $link = base_url() . $button_params->url . "" . $linkid;
+        $link = base_url().$button_params->url."".$linkid;
         if ($button_params->mode == 'popup') {
-			$rel = (isset($button_params->layout) && $button_params->layout != '')?"facebox_".$button_params->layout:"facebox";
-            return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" rel="'.$rel.'" title="View Details"><i class="fa fa-reorder fa-fw"></i></a>&nbsp;';
+			$rel = (isset($button_params->layout) && $button_params->layout != '') ? "facebox_".$button_params->layout : "facebox";
+            return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" rel="'.$rel.'" title="View Details"><i class="fa fa-reorder fa-fw"></i></a>&nbsp;';
         } else {
-            return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="View Details"><i class="fa fa-reorder fa-fw"></i></a>&nbsp;';
+            return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" title="View Details"><i class="fa fa-reorder fa-fw"></i></a>&nbsp;';
         }
     }
 
     function build_add_taxes_button($button_params, $linkid) {
-        $link = base_url() . $button_params->url . "" . $linkid;
+        $link = base_url().$button_params->url."".$linkid;
         if ($button_params->mode == 'popup') {
-            return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" rel="facebox" title="Add Account Taxes"><i class="fa fa-reorder fa-fw"></i></a>&nbsp;';
+            return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" rel="facebox" title="Add Account Taxes"><i class="fa fa-reorder fa-fw"></i></a>&nbsp;';
         } else {
-            return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Add Account Taxes"><i class="fa fa-reorder fa-fw"></i></a>&nbsp;';
+            return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" title="Add Account Taxes"><i class="fa fa-reorder fa-fw"></i></a>&nbsp;';
         }
     }
 
     function build_add_download_database_button($url, $linkid) {
-        $link = base_url() . $url . "" . $linkid;
-        return '<a href="' . $link . '" class="btn btn-royelblue btn-sm "  title="Download Database" ><i class="fa-fw fa fa-file-archive-o"></i></a>&nbsp;';
+        $link = base_url().$url."".$linkid;
+        return '<a href="'.$link.'" class="btn btn-royelblue btn-sm "  title="Download Database" ><i class="fa-fw fa fa-file-archive-o"></i></a>&nbsp;';
     }
 
     function build_add_callerid_button($button_params, $linkid) {
-        $link = base_url() . $button_params->url . "" . $linkid;
+        $link = base_url().$button_params->url."".$linkid;
         if ($button_params->mode == 'popup') {
-            return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" rel="facebox" title="Force Caller Id"><i class="fa fa-mobile-phone fa-fw"></i></a>&nbsp;';
+            return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" rel="facebox" title="Force Caller Id"><i class="fa fa-mobile-phone fa-fw"></i></a>&nbsp;';
         } else {
-            return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="CallerID"><i class="fa fa-mobile-phone fa-fw"></i></a>&nbsp;';
+            return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" title="CallerID"><i class="fa fa-mobile-phone fa-fw"></i></a>&nbsp;';
         }
     }
 
     function build_start_button($url, $linkid) {
-        $link = base_url() . $url . "" . $linkid;
+        $link = base_url().$url."".$linkid;
 
-        return '<a href="' . $link . '" class=""  title="Start" style="text-decoration:none;color: #428BCA;"><b>Start |</b></a>&nbsp;';
+        return '<a href="'.$link.'" class=""  title="Start" style="text-decoration:none;color: #428BCA;"><b>Start |</b></a>&nbsp;';
     }
 
     function build_stop_button($url, $linkid) {
-        $link = base_url() . $url . "" . $linkid;
-        return '<a href="' . $link . '" class=""  title="Stop" style="text-decoration:none;color: #428BCA;" ><b>Stop |</b></a>&nbsp;';
+        $link = base_url().$url."".$linkid;
+        return '<a href="'.$link.'" class=""  title="Stop" style="text-decoration:none;color: #428BCA;" ><b>Stop |</b></a>&nbsp;';
     }
 
     function build_reload_button($url, $linkid) {
-        $link = base_url() . $url . "" . $linkid;
-        return '<a href="' . $link . '" class=""  title="reload" style="text-decoration:none;color: #428BCA;"><b>Reload |</b></a>&nbsp;';
+        $link = base_url().$url."".$linkid;
+        return '<a href="'.$link.'" class=""  title="reload" style="text-decoration:none;color: #428BCA;"><b>Reload |</b></a>&nbsp;';
     }
 
     function build_rescan_button($url, $linkid) {
-        $link = base_url() . $url . "" . $linkid;
-        return '<a href="' . $link . '" class=""  title="rescan" style="text-decoration:none;color: #428BCA;"><b>Rescan</b></a>&nbsp;';
+        $link = base_url().$url."".$linkid;
+        return '<a href="'.$link.'" class=""  title="rescan" style="text-decoration:none;color: #428BCA;"><b>Rescan</b></a>&nbsp;';
     }
 
     function build_add_payment_button($url, $linkid) {
-        $link = base_url() . $url . "" . $linkid;
-        return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" rel="facebox" title="Refill" ><i class="fa fa-usd fa-fw"></i></a>&nbsp;';
+        $link = base_url().$url."".$linkid;
+        return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" rel="facebox" title="Refill" ><i class="fa fa-usd fa-fw"></i></a>&nbsp;';
     }
 
     function build_add_download_button($url, $linkid) {
-        $link = base_url() . $url . "" . $linkid;
-        return '<a href="' . $link . '" class="btn btn-royelblue btn-sm"  title="Download Invoice" ><i class="fa fa-cloud-download fa-fw"></i></a>&nbsp;';
+        $link = base_url().$url."".$linkid;
+        return '<a href="'.$link.'" class="btn btn-royelblue btn-sm"  title="Download Invoice" ><i class="fa fa-cloud-download fa-fw"></i></a>&nbsp;';
     }
 
     /*
@@ -1012,11 +1012,11 @@ 
      */
 
     function build_edit_button_resend($button_params, $linkid) {
-        $link = base_url() . $button_params->url . "" . $linkid;
+        $link = base_url().$button_params->url."".$linkid;
         if ($button_params->mode == 'popup') {
-            return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" rel="facebox" title="Resend Mail"><i class="fa fa-repeat"></i></a>&nbsp;';
+            return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" rel="facebox" title="Resend Mail"><i class="fa fa-repeat"></i></a>&nbsp;';
         } else {
-            return '<a href="' . $link . '" class="btn btn-royelblue btn-sm" title="Resend Mail"><i class="fa fa-repeat"></i></a>&nbsp;';
+            return '<a href="'.$link.'" class="btn btn-royelblue btn-sm" title="Resend Mail"><i class="fa fa-repeat"></i></a>&nbsp;';
         }
     }
 
@@ -1031,17 +1031,17 @@ 
     function mail_to_users($type, $accountinfo, $attachment = "", $amount = "") {
 		$subject = "";
         $settings_reply_email = 'astpp@astpp.com';
-        $reseller_id=$accountinfo['reseller_id'] > 0 ? $accountinfo['reseller_id'] : 0;
-		$where="accountid IN ('".$reseller_id."','1')";
+        $reseller_id = $accountinfo['reseller_id'] > 0 ? $accountinfo['reseller_id'] : 0;
+		$where = "accountid IN ('".$reseller_id."','1')";
         $this->CI->db->where($where);
         $this->CI->db->select('emailaddress');
         $this->CI->db->order_by('accountid', 'desc');
         $this->CI->db->limit(1);
         $invoiceconf = $this->CI->db->get('invoice_conf');
         $invoiceconf = (array)$invoiceconf->first_row();
-        $settings_reply_email=$invoiceconf['emailaddress'];
-        $company_name=Common_model::$global_config['system_config']['company_name'];
-        $company_website=Common_model::$global_config['system_config']['company_website'];
+        $settings_reply_email = $invoiceconf['emailaddress'];
+        $company_name = Common_model::$global_config['system_config']['company_name'];
+        $company_website = Common_model::$global_config['system_config']['company_website'];
         $where = array('name' => $type);
         $query = $this->CI->db_model->getSelect("*", "default_templates", $where);
         $query = $query->result();
@@ -1052,106 +1052,106 @@ 
         $message = str_replace("#COMPANY_NAME#", $company_name, $message);
         $message = str_replace("#COMPANY_WEBSITE#", $company_website, $message);
         $message = str_replace("</p>", "", $message);
-		if(isset($accountinfo['refill_amount']) && $accountinfo['refill_amount']!= ""){
+		if (isset($accountinfo['refill_amount']) && $accountinfo['refill_amount'] != "") {
 			$refillamount = $accountinfo['refill_amount'];
-		}else{
+		} else {
 			$refillamount = "0";
 		}
 		
         switch ($type) {
             case 'email_add_user':
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
                 $message = str_replace('#NUMBER#', $accountinfo['number'], $message);
                 $message = str_replace('#PASSWORD#', $accountinfo['password'], $message);
                 $message = str_replace('#LINK#', $accountinfo['confirm'], $message);
                 break;
             case 'email_forgot_user':
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
                 $message = str_replace('#NUMBER#', $accountinfo['number'], $message);
                 $message = str_replace('#PASSWORD#', $accountinfo['password'], $message);
                 $message = str_replace('#LINK#', $accountinfo['link'], $message);
                 break;
 
             case 'email_forgot_confirmation':
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
                 $message = str_replace('#CONFIRM#', $accountinfo['confirm'], $message);
                 break;
 
             case 'email_signup_confirmation':
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
                 $message = str_replace('#CONFIRM#', $accountinfo['confirm'], $message);
                 break;
             case 'add_sip_device':
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
                 $message = str_replace('#USERNAME#', $accountinfo['number'], $message);
                 $message = str_replace('#PASSWORD#', $accountinfo['password'], $message);
                 break;
                               
             case 'voip_account_refilled':
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
                 $message = str_replace('#REFILLBALANCE#', $accountinfo['refill_amount'], $message);
                 $message = str_replace('#BALANCE#', $accountinfo['refill_amount'] + $accountinfo['balance'], $message);
                 break;
             case 'voip_child_account_refilled':
-                $reseller_number= $this->CI->common->get_field_name('number', 'accounts', $accountinfo['reseller_id']);
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
+                $reseller_number = $this->CI->common->get_field_name('number', 'accounts', $accountinfo['reseller_id']);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
                 $message = str_replace('#REFILLBALANCE#', $accountinfo['refill_amount'], $message);
                 $message = str_replace('#BALANCE#', $accountinfo['balance'], $message);
-                $message = str_replace('#ACCOUNTNUMBER#',$reseller_number, $message);
+                $message = str_replace('#ACCOUNTNUMBER#', $reseller_number, $message);
                 break;
             case 'add_subscription':
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
                 break;
             case 'remove_subscription':
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
                 break;
             case 'add_package':
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
                 break;
             case 'remove_package':
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
                 break;
             case 'email_calling_card':
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
                 $message = str_replace('#CARDNUMBER#', $accountinfo['cardnumber'], $message);
                 $message = str_replace('#PIN#', $accountinfo['pin'], $message);
                 $message = str_replace('#BALANCE#', $accountinfo['balance'], $message);
                 break;
             case 'email_low_balance';
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
                 $to_currency = $this->CI->common->get_field_name('currency', 'currency', $accountinfo['currency_id']);
                 $balance = $this->CI->common_model->calculate_currency($accountinfo['balance'], "", $to_currency, true, true);
                 $message = str_replace('#BALANCE#', $accountinfo['balance'], $message);
                 break;
             case 'email_new_invoice';
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
                 $message = str_replace('#AMOUNT#', $amount, $message);
                 $message = str_replace('#INVOICE_NUMBER#', $amount, $message);
                 $subject = $query[0]->subject;
                 $subject = str_replace("#INVOICE_NUMBER#", $amount, $subject);
                 break;
              case 'email_add_did';
-				if(isset($accountinfo['did_maxchannels']) && $accountinfo['did_maxchannels']!= ""){
+				if (isset($accountinfo['did_maxchannels']) && $accountinfo['did_maxchannels'] != "") {
 					$accountinfo['did_maxchannels'] = $accountinfo['did_maxchannels'];
-				}else if($accountinfo['did_maxchannels'] == "0"){
+				} else if ($accountinfo['did_maxchannels'] == "0") {
 							$accountinfo['did_maxchannels'] = "Unlimited";
-				}else{
+				} else {
 					$accountinfo['did_maxchannels'] = "Unlimited";
 				}
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
-                $message = str_replace('#DIDNUMBER#', $accountinfo['did_number'] , $message);
-                $message = str_replace('#COUNTRYNAME#',$accountinfo['did_country_id'], $message);
-                $message = str_replace('#SETUPFEE#',$accountinfo['did_setup'], $message);
-                $message = str_replace('#MONTHLYFEE#',$accountinfo['did_monthlycost'], $message);
-                $message = str_replace('#MAXCHANNEL#',$accountinfo['did_maxchannels'], $message);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
+                $message = str_replace('#DIDNUMBER#', $accountinfo['did_number'], $message);
+                $message = str_replace('#COUNTRYNAME#', $accountinfo['did_country_id'], $message);
+                $message = str_replace('#SETUPFEE#', $accountinfo['did_setup'], $message);
+                $message = str_replace('#MONTHLYFEE#', $accountinfo['did_monthlycost'], $message);
+                $message = str_replace('#MAXCHANNEL#', $accountinfo['did_maxchannels'], $message);
                 $message = str_replace('#NUMBER#', $accountinfo['number'], $message);	
 				$subject = $query[0]->subject;
 				$subject = str_replace("#NUMBER#", $accountinfo['number'], $subject);
 				$subject = str_replace("#DIDNUMBER#", $accountinfo['did_number'], $subject);
                 break;
             case 'email_remove_did';
-                $message = str_replace('#NAME#', $accountinfo['first_name'] . " " . $accountinfo['last_name'], $message);
-                $message = str_replace('#DIDNUMBER#', $accountinfo['did_number'],$message);
+                $message = str_replace('#NAME#', $accountinfo['first_name']." ".$accountinfo['last_name'], $message);
+                $message = str_replace('#DIDNUMBER#', $accountinfo['did_number'], $message);
                 $message = str_replace('#NUMBER#', $accountinfo['number'], $message);	
 				$subject = $query[0]->subject;
 				$subject = str_replace("#NUMBER#", $accountinfo['number'], $subject);
@@ -1159,9 +1159,9 @@ 
                 break;
         }
         
-        if($subject == ""){
+        if ($subject == "") {
 			$subject = $query[0]->subject;
-			$subject = str_replace("#NAME#", $accountinfo['first_name'] . " " . $accountinfo['last_name'], $subject);
+			$subject = str_replace("#NAME#", $accountinfo['first_name']." ".$accountinfo['last_name'], $subject);
 			$subject = str_replace("#COMPANY_NAME#", $company_name, $subject);	
 		}
         $account_id = (isset($accountinfo['last_id']) && $accountinfo['last_id'] != "") ? $accountinfo['last_id'] : $accountinfo['id'];
@@ -1245,13 +1245,13 @@ 
         $result = $this->CI->db->get('invoice_details');
         if ($result->num_rows() > 0) {
             $result = $result->result_array();
-	    if($select == 'debit'){
-		if($result[0]['item_type'] == 'POSTCHARG'){
+	    if ($select == 'debit') {
+		if ($result[0]['item_type'] == 'POSTCHARG') {
 	            return $this->convert_to_currency('', '', $result[0]['debit']);
-		}else{
+		} else {
 	            return $this->convert_to_currency('', '', $result[0]['credit']);
 		}
-	    }else{
+	    } else {
 		   return $result[0][$select];
 	    }
         } else {
@@ -1302,7 +1302,7 @@ 
 
             $timezone_result = $timezone_result->result_array();
             foreach ($timezone_result as $data) {
-                $gmtoffset+=$data['gmtoffset'];
+                $gmtoffset += $data['gmtoffset'];
             }
         }
 // 	  echo $gmtoffset;exit;
@@ -1366,7 +1366,7 @@ 
     }
 
     function get_refill_coupon_used($select = '', $table = '', $status) {
-        return $status['status'] == 2 ? '<img src= "'.base_url().'assets/images/true.png" style="height:20px;width:20px;" title="Yes">' : '<img src= "'. base_url().'/assets/images/false.png" style="height:20px;width:20px;" title="No">';
+        return $status['status'] == 2 ? '<img src= "'.base_url().'assets/images/true.png" style="height:20px;width:20px;" title="Yes">' : '<img src= "'.base_url().'/assets/images/false.png" style="height:20px;width:20px;" title="No">';
     }
 
     /*     * *******
@@ -1444,20 +1444,20 @@ 
         $status_array = array('0' => 'Enable', '1' => 'Disable');
         return $status_array;
     }
-    function custom_status($status){
+    function custom_status($status) {
 		$status_array = array('0' => 'Yes', '1' => 'No');
         return $status_array;
     }
     
-    function custom_status_active($status){
+    function custom_status_active($status) {
       $status_array = array('0' => 'Active', '1' => 'InActive');
       return $status_array;
     }
-    function custom_status_true($status){
+    function custom_status_true($status) {
       $status_array = array('0' => 'TRUE', '1' => 'FALSE');
       return $status_array;
     }
-    function custom_status_voicemail($status){
+    function custom_status_voicemail($status) {
       $status_array = array('true' => 'True', 'false' => 'False');
       return $status_array;
     }
@@ -1484,7 +1484,7 @@ 
         return $status_array;
     }
 	
-    function enable_disable_option(){
+    function enable_disable_option() {
         $option_array = array('0' => 'Enable', '1' => 'Disable');
         return $option_array;
     }
@@ -1512,14 +1512,14 @@ 
         $status_array = array('1' => 'Enable', '0' => 'Disable',);
         return $status_array;
     }
-    function default_signup_rategroup(){
+    function default_signup_rategroup() {
         $this->CI->db->select("id,name");
-        $this->CI->db->where("status",0);
-        $this->CI->db->where("reseller_id",0);
-        $pricelist_result=$this->CI->db->get("pricelists")->result_array();
-        $pricelist_arr=array();
-        foreach($pricelist_result as $result){
-            $pricelist_arr[$result['id']]=$result['name'];
+        $this->CI->db->where("status", 0);
+        $this->CI->db->where("reseller_id", 0);
+        $pricelist_result = $this->CI->db->get("pricelists")->result_array();
+        $pricelist_arr = array();
+        foreach ($pricelist_result as $result) {
+            $pricelist_arr[$result['id']] = $result['name'];
         }
         return $pricelist_arr;
         
@@ -1593,17 +1593,17 @@ 
       Calculate Currency manually.
      */
 
-    function calculate_currency_manually($currency_info, $amount, $show_currency_flag = true,$number_format=true) {
+    function calculate_currency_manually($currency_info, $amount, $show_currency_flag = true, $number_format = true) {
         $decimal_points = $currency_info['decimalpoints'];
         $system_currency_rate = $currency_info['base_currency']['currencyrate'];
         $user_currency_rate = $currency_info['user_currency']['currencyrate'];
-        $calculated_amount=(float)(($amount * $currency_info['user_currency']['currencyrate']) / $currency_info['base_currency']['currencyrate']); 
-        if($number_format){
-         $calculated_amount = number_format($calculated_amount,$currency_info['decimalpoints']);
+        $calculated_amount = (float)(($amount * $currency_info['user_currency']['currencyrate']) / $currency_info['base_currency']['currencyrate']); 
+        if ($number_format) {
+         $calculated_amount = number_format($calculated_amount, $currency_info['decimalpoints']);
         }
-        if ($show_currency_flag){
+        if ($show_currency_flag) {
           return $calculated_amount." ".$currency_info['user_currency']['currency'];
-        }else{
+        } else {
           return $calculated_amount;
         }
     }
@@ -1618,7 +1618,7 @@ 
     }
 
     function set_summarycustomer_groupby($status = '') {
-        $status_array = array('' => "--Select--", 'accountid' => 'Account', 'pattern' => 'Code','package_id'=>"Package");
+        $status_array = array('' => "--Select--", 'accountid' => 'Account', 'pattern' => 'Code', 'package_id'=>"Package");
         return $status_array;
     }
 
@@ -1634,7 +1634,7 @@ 
         $accountinfo = $this->CI->session->userdata('accountinfo');
         //Get User Currency id 
         $user_currency_id = $accountinfo['currency_id'] > 0 ? $accountinfo['currency_id'] : $base_currency;
-        $where = "currency = '" . $base_currency . "' OR id= " . $user_currency_id;
+        $where = "currency = '".$base_currency."' OR id= ".$user_currency_id;
         $this->CI->db->where($where);
         $this->CI->db->select('*');
         $currency_result = $this->CI->db->get('currency');
@@ -1652,7 +1652,7 @@ 
                 }
             }
         } else if ($currency_result->num_rows() == 1) {
-            $currency_info['user_currency'] = $currency_info['base_currency'] = (array) $currency_result->first_row();
+            $currency_info['user_currency'] = $currency_info['base_currency'] = (array)$currency_result->first_row();
         }
         //Get Decimal points as per defined from system.
         $currency_info['decimalpoints'] = Common_model::$global_config['system_config']['decimalpoints'];
@@ -1661,15 +1661,15 @@ 
 
     function convert_to_show_in($search_name = "", $table = "", $second) {
         $search_arr = $this->CI->session->userdata($search_name);
-        $show_seconds = (!empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
-        return ($show_seconds === 'minutes') ? ($second > 0 ) ?
-                        sprintf('%02d',$second / 60) . ":" . sprintf('%02d', ($second % 60)) : "00:00"  : sprintf('%02d', $second);
+        $show_seconds = ( ! empty($search_arr['search_in'])) ? $search_arr['search_in'] : 'minutes';
+        return ($show_seconds === 'minutes') ? ($second > 0) ?
+                        sprintf('%02d', $second / 60).":".sprintf('%02d', ($second % 60)) : "00:00" : sprintf('%02d', $second);
     }
 
     function array_column($input, $columnKey, $indexKey = null) {
         $array = array();
         foreach ($input as $value) {
-            if (!isset($value[$columnKey])) {
+            if ( ! isset($value[$columnKey])) {
                 trigger_error("Key \"$columnKey\" does not exist in array");
                 return false;
             }
@@ -1677,11 +1677,11 @@ 
             if (is_null($indexKey)) {
                 $array[] = $value[$columnKey];
             } else {
-                if (!isset($value[$indexKey])) {
+                if ( ! isset($value[$indexKey])) {
                     trigger_error("Key \"$indexKey\" does not exist in array");
                     return false;
                 }
-                if (!is_scalar($value[$indexKey])) {
+                if ( ! is_scalar($value[$indexKey])) {
                     trigger_error("Key \"$indexKey\" does not contain scalar value");
                     return false;
                 }
@@ -1698,22 +1698,22 @@ 
     }
 
     function currency_decimal($amount) {
-		$amount = str_replace( ',', '', $amount );
+		$amount = str_replace(',', '', $amount);
         $decimal_amount = Common_model::$global_config['system_config']['decimalpoints'];
-        $number_convert = number_format((float) $amount, $decimal_amount, '.', '');
+        $number_convert = number_format((float)$amount, $decimal_amount, '.', '');
         return $number_convert;
     }
 
-    function add_invoice_details($account_arr, $charge_type, $amount,$description) {
+    function add_invoice_details($account_arr, $charge_type, $amount, $description) {
         $accountinfo = $this->CI->session->userdata('accountinfo');
         $reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
-        $where = "accountid IN ('" . $reseller_id . "','1')";
+        $where = "accountid IN ('".$reseller_id."','1')";
         $this->CI->db->where($where);
         $this->CI->db->select('*');
         $this->CI->db->order_by('accountid', 'desc');
         $this->CI->db->limit(1);
         $invoiceconf = $this->CI->db->get('invoice_conf');
-        $invoice_conf = (array) $invoiceconf->first_row();
+        $invoice_conf = (array)$invoiceconf->first_row();
         $last_invoiceid = $this->get_invoice_date('invoiceid', '', $account_arr['reseller_id']);
         if ($last_invoiceid && $last_invoiceid > 0) {
             $last_invoiceid = ($last_invoiceid + 1);
@@ -1722,7 +1722,7 @@ 
         }
         $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"));
+        $due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoice_conf['interval']." days"));
         $invoiceid = $account_arr['posttoexternal'] == 0 ? $this->CI->common_model->generate_receipt($account_arr['id'], $amount, $account_arr, $last_invoiceid, $invoice_prefix, $due_date) : 0;
         
         $insert_arr = array("accountid" => $account_arr['id'],
@@ -1740,111 +1740,111 @@ 
     }
     /* ASTPP  3.0  Remove all information related to going to delete customer.
      */
-    function customer_delete_dependencies($id){
-          $this->delete_data('ani_map',array('accountid'=>$id));
-          $this->delete_data('block_patterns',array('accountid'=>$id));
-          $this->delete_data('charge_to_account',array('accountid'=>$id));
-          $this->delete_data('counters',array('accountid'=>$id));
-          $this->delete_data('ip_map',array('accountid'=>$id));
-          $this->delete_data('sip_devices',array('accountid'=>$id));
-          $this->delete_data('speed_dial',array('accountid'=>$id));
-          $this->delete_data('taxes_to_accounts',array('accountid'=>$id));
-          $this->delete_data('mail_details',array('accountid'=>$id));
-          $this->update_data('dids',array("accountid"=>$id),array('accountid'=>0));
-          $this->update_data("accounts",array("id"=>$id),array("deleted"=>1));
+    function customer_delete_dependencies($id) {
+          $this->delete_data('ani_map', array('accountid'=>$id));
+          $this->delete_data('block_patterns', array('accountid'=>$id));
+          $this->delete_data('charge_to_account', array('accountid'=>$id));
+          $this->delete_data('counters', array('accountid'=>$id));
+          $this->delete_data('ip_map', array('accountid'=>$id));
+          $this->delete_data('sip_devices', array('accountid'=>$id));
+          $this->delete_data('speed_dial', array('accountid'=>$id));
+          $this->delete_data('taxes_to_accounts', array('accountid'=>$id));
+          $this->delete_data('mail_details', array('accountid'=>$id));
+          $this->update_data('dids', array("accountid"=>$id), array('accountid'=>0));
+          $this->update_data("accounts", array("id"=>$id), array("deleted"=>1));
     }
     /*
      *  ASTPP  3.0 
      *  Remove all information related to going to delete reseller.
      */
-    function reseller_delete_dependencies($id){
-        $accountinfo=$this->CI->session->userdata('accountinfo');
-        $child_arr=$this->select_data("accounts",array("reseller_id"=>$id,"type"=>0),'id,reseller_id');
-        if($child_arr){
-            foreach($child_arr as $value){
+    function reseller_delete_dependencies($id) {
+        $accountinfo = $this->CI->session->userdata('accountinfo');
+        $child_arr = $this->select_data("accounts", array("reseller_id"=>$id, "type"=>0), 'id,reseller_id');
+        if ($child_arr) {
+            foreach ($child_arr as $value) {
                 $this->customer_delete_dependencies($value['id']);
             }
         }
-        $package_arr=$this->select_data("packages",array("reseller_id"=>$id),'id');
-        if($package_arr){
-            foreach($package_arr as $value){
-                $this->delete_data('package_patterns',array("id"=>$value['id']));
+        $package_arr = $this->select_data("packages", array("reseller_id"=>$id), 'id');
+        if ($package_arr) {
+            foreach ($package_arr as $value) {
+                $this->delete_data('package_patterns', array("id"=>$value['id']));
             }
         }
-        $acc_arr=$this->select_data('accounts',array("id"=>$id),'id,reseller_id');
-        $parent_id=0;
-        if($acc_arr){
-            $parent_id=$acc_arr[0]['reseller_id'];
+        $acc_arr = $this->select_data('accounts', array("id"=>$id), 'id,reseller_id');
+        $parent_id = 0;
+        if ($acc_arr) {
+            $parent_id = $acc_arr[0]['reseller_id'];
         }
-        $pricelist_arr=$this->select_data('pricelists',array('reseller_id'=>$id),'id');
-        if($pricelist_arr){
-             foreach($pricelist_arr as $value){
-                $this->delete_data("routing",array("pricelist_id"=>$value['id']));
-                $this->delete_data("routes",array("pricelist_id"=>$value['id']));
-                $this->update_data('pricelists',array('id'=>$value['id']),array('status'=>2));         
+        $pricelist_arr = $this->select_data('pricelists', array('reseller_id'=>$id), 'id');
+        if ($pricelist_arr) {
+             foreach ($pricelist_arr as $value) {
+                $this->delete_data("routing", array("pricelist_id"=>$value['id']));
+                $this->delete_data("routes", array("pricelist_id"=>$value['id']));
+                $this->update_data('pricelists', array('id'=>$value['id']), array('status'=>2));         
              }
         }
-        $charge_arr=$this->select_data('charges',array('reseller_id'=>$id),'id');
-        if($charge_arr){
-             foreach($charge_arr as $value){
-                $this->delete_data("charge_to_account",array("charge_id"=>$value['id']));
+        $charge_arr = $this->select_data('charges', array('reseller_id'=>$id), 'id');
+        if ($charge_arr) {
+             foreach ($charge_arr as $value) {
+                $this->delete_data("charge_to_account", array("charge_id"=>$value['id']));
              }
         }
-        $this->delete_data('charges',array('reseller_id'=>$id));
-        $this->update_data('dids',array('parent_id'=>$id),array("parent_id"=>$parent_id));
-        $this->delete_data('reseller_pricing',array("reseller_id"=>$id));
-        $this->delete_data('refill_coupon',array("reseller_id"=>$id));
-        $this->delete_data('mail_details',array('accountid'=>$id));
-        $taxes_arr=$this->select_data('taxes',array("reseller_id"=>$id),'id');
-        if($taxes_arr){
-             foreach($taxes_arr as $value){
-                $this->delete_data("taxes_to_accounts",array("taxes_id"=>$value['id']));
+        $this->delete_data('charges', array('reseller_id'=>$id));
+        $this->update_data('dids', array('parent_id'=>$id), array("parent_id"=>$parent_id));
+        $this->delete_data('reseller_pricing', array("reseller_id"=>$id));
+        $this->delete_data('refill_coupon', array("reseller_id"=>$id));
+        $this->delete_data('mail_details', array('accountid'=>$id));
+        $taxes_arr = $this->select_data('taxes', array("reseller_id"=>$id), 'id');
+        if ($taxes_arr) {
+             foreach ($taxes_arr as $value) {
+                $this->delete_data("taxes_to_accounts", array("taxes_id"=>$value['id']));
              }
         }
-        $this->delete_data('taxes',array("reseller_id"=>$id));
-        $this->delete_data('default_templates',array("reseller_id"=>$id));
-        $package_arr=$this->select_data('packages',array('reseller_id'=>$id),'id');
-        if($package_arr){
-            $this->delete_data("counters",array("package_id"=>$value['id']));
-            $this->delete_data("package_patterns",array("package_id"=>$value['id']));
+        $this->delete_data('taxes', array("reseller_id"=>$id));
+        $this->delete_data('default_templates', array("reseller_id"=>$id));
+        $package_arr = $this->select_data('packages', array('reseller_id'=>$id), 'id');
+        if ($package_arr) {
+            $this->delete_data("counters", array("package_id"=>$value['id']));
+            $this->delete_data("package_patterns", array("package_id"=>$value['id']));
         }
-        $this->delete_data('invoice_conf',array('accountid'=>$id));
-        $this->delete_data('packages',array("reseller_id"=>$id));
-        $this->update_data('accounts',array("id"=>$id),array("deleted"=>1));
+        $this->delete_data('invoice_conf', array('accountid'=>$id));
+        $this->delete_data('packages', array("reseller_id"=>$id));
+        $this->update_data('accounts', array("id"=>$id), array("deleted"=>1));
     }
     function subreseller_list($parent_id = '') {
         $customer_id = $parent_id;
         $this->reseller_delete_dependencies($parent_id);
-        $query = 'select id,type from accounts where reseller_id = ' . $parent_id .' AND deleted =0';
+        $query = 'select id,type from accounts where reseller_id = '.$parent_id.' AND deleted =0';
         $result = $this->CI->db->query($query);
         if ($result->num_rows() > 0) {
             $result = $result->result_array();
             foreach ($result as $data) {
-	      if($data['type']==1){
+	      if ($data['type'] == 1) {
 		  $this->reseller_delete_dependencies($data['id']);
 		  $this->subreseller_list($data['id']);
-	      }else{
+	      } else {
 		  $this->customer_delete_dependencies($data['id']);
 	      }
             }
         }
     }
     
-    function delete_data($table_name,$where_arr){
+    function delete_data($table_name, $where_arr) {
         $this->CI->db->where($where_arr);
         $this->CI->db->delete($table_name);
     }
-    function update_data($table_name,$where_arr,$update_arr){
+    function update_data($table_name, $where_arr, $update_arr) {
         $this->CI->db->where($where_arr);
-        $this->CI->db->update($table_name,$update_arr);
+        $this->CI->db->update($table_name, $update_arr);
     }
-    function select_data($table_name,$where_arr,$select){
+    function select_data($table_name, $where_arr, $select) {
         $this->CI->db->where($where_arr);
         $this->CI->db->select($select);
-        $result=$this->CI->db->get($table_name);
-        if($result->num_rows() > 0){
+        $result = $this->CI->db->get($table_name);
+        if ($result->num_rows() > 0) {
             return $result->result_array();
-        }else{
+        } else {
             return false;
         }
     }
@@ -1856,82 +1856,82 @@ 
     function get_call_waiting($select = "", $table = "", $status) {
         return ($status == 0) ? "Enable" : "Disable";
 	}
-  function set_invoice_details($select= ''){
+  function set_invoice_details($select = '') {
         $status_array = array("invoice_select" => "--Select--",
             "invoice_inactive" => "Deleted Invoices",
             "invoice_active" => "All Invoices",
         );
         return $status_array;
 }
-function get_invoice_template($invoicedata,$accountdata,$flag){
+function get_invoice_template($invoicedata, $accountdata, $flag) {
       $login_info = $this->CI->session->userdata('accountinfo');
 
       $invoice_config = $this->CI->db_model->getSelect("*", "invoice_conf", array('accountid'=>$login_info['id']));
-      $invoice_config= $invoice_config->result_array();
-      $invoice_config_res= $invoice_config[0];
+      $invoice_config = $invoice_config->result_array();
+      $invoice_config_res = $invoice_config[0];
 
       $accountdata["currency_id"] = $this->get_field_name('currency', 'currency', $accountdata["currency_id"]);
       $accountdata["country"] = $this->get_field_name('country', 'countrycode', $accountdata["country_id"]);
       $data["to_currency"] = Common_model::$global_config['system_config']['base_currency'];
-      if($login_info['type'] == -1){
+      if ($login_info['type'] == -1) {
           $currency = $data["to_currency"];
-      }elseif($login_info['type'] == 1){
+      }elseif ($login_info['type'] == 1) {
 	  $accountdata["currency_id"] = $this->get_field_name('currency', 'currency', $login_info["currency_id"]);
           $currency = $accountdata["currency_id"];
-      }else{
+      } else {
           $currency = $accountdata["currency_id"];
       }
-      $decimal_amount=Common_model::$global_config['system_config']['decimalpoints'];
+      $decimal_amount = Common_model::$global_config['system_config']['decimalpoints'];
       ob_start();
       $this->CI->load->library('/html2pdf/html2pdf');
-      $this->CI->html2pdf = new HTML2PDF('P','A4','en');
+      $this->CI->html2pdf = new HTML2PDF('P', 'A4', 'en');
       $this->CI->html2pdf->pdf->SetDisplayMode('fullpage');
-      $template_config=$this->CI->config->item('invoice_template');
+      $template_config = $this->CI->config->item('invoice_template');
       include($template_config.'invoice_template.php');
       $content = ob_get_clean();
       ob_clean();
 
 	$ACCOUNTADD = '';
-	$ACCOUNTADD_CUSTOMER ='';
+	$ACCOUNTADD_CUSTOMER = '';
 	$ACCOUNTADD_RIGHT = '';
 	$ACCOUNT_DESCRIPTION = '';
 	$ACCOUNT_CDRS = '';
-	$ACCOUNT_TOTAL= '';
+	$ACCOUNT_TOTAL = '';
 	$ACCOUNT_TOTAL_FINAL = '';
 	$ACCOUNT_FINAL = '';
-	$CHARGE_ACCOUNT ='';
+	$CHARGE_ACCOUNT = '';
 	$service_info = '';
 	$TotalChrg = "0.00";
 	$NETAMT = "0.00";
 	$TAXAMT = "0.00";
-	$total_sum=0;
-	$total_vat=0;
+	$total_sum = 0;
+	$total_vat = 0;
 	$fromdate = strtotime($invoicedata['from_date']);
-	$from_date =date("Y-m-d",$fromdate);
+	$from_date = date("Y-m-d", $fromdate);
 	$duedate = strtotime($invoicedata['due_date']);
-	$due_date =date("Y-m-d",$duedate);
+	$due_date = date("Y-m-d", $duedate);
 
 /*************************** Company Address Code START ***************************************************/
         $ACCOUNTADD .= '<tr>';
         $ACCOUNTADD .= '<td style="width:100%;font-size: 12px;color:#525252;font-family:arial; line-height: 22px;"><b>'.$invoice_config_res['company_name'].'</b></td>';
         $ACCOUNTADD .= '</tr>';
-	if ( $invoice_config_res['address'] != ""){
+	if ($invoice_config_res['address'] != "") {
 
         $ACCOUNTADD .= '<tr><td style="width:100%;font-size: 12px;color:#525252;font-family:arial; line-height: 22px;">'.$invoice_config_res['address'].'</td></tr>';
     }
-	if ( $invoice_config_res['city'] != ""){
+	if ($invoice_config_res['city'] != "") {
 
         $ACCOUNTADD .= '<tr><td style="width:100%;font-size: 12px;color:#525252;font-family:arial; line-height: 22px;">'.$invoice_config_res['city'].'</td></tr>';
     }
-	if ( $invoice_config_res['province'] != ""){
+	if ($invoice_config_res['province'] != "") {
 
         $ACCOUNTADD .= '<tr><td style="width:100%;font-size: 12px;color:#525252;font-family:arial; line-height: 22px;">'.$invoice_config_res['province'].'</td></tr>';
     }
-	if ( $invoice_config_res['country'] != ""){
+	if ($invoice_config_res['country'] != "") {
 
         $ACCOUNTADD .= '<tr><td style="width:100%;font-size: 12px;color:#525252;font-family:arial; line-height: 22px;">'.$invoice_config_res['country'].'</td></tr>';
     }
-	if ( $invoice_config_res['zipcode'] != ""){
+	if ($invoice_config_res['zipcode'] != "") {
 
         $ACCOUNTADD .= '<tr><td style="width:100%;font-size: 12px;color:#525252;font-family:arial; line-height: 22px;">'.$invoice_config_res['zipcode'].'</td></tr>';
     }
@@ -1942,27 +1942,27 @@ 
         $ACCOUNTADD_CUSTOMER .= '<table><tr>';
         $ACCOUNTADD_CUSTOMER .= '<td style="width:100%;font-size: 12px;color:#525252;font-family:arial; line-height: 22px;"><b>'.$accountdata['company_name'].'</b></td></tr>';
 
-	if ( $accountdata['address_1'] != ""){
+	if ($accountdata['address_1'] != "") {
 
         $ACCOUNTADD_CUSTOMER .= '<tr><td style="width:100%;font-size: 12px;color:#525252;font-family:arial; line-height: 22px;">'.$accountdata['address_1'].'</td></tr>';
     }
-	if ( $accountdata['city'] != ""){
+	if ($accountdata['city'] != "") {
 
         $ACCOUNTADD_CUSTOMER .= '<tr><td style="width:100%;font-size: 12px;color:#525252;font-family:arial; line-height: 22px;">'.$accountdata['city'].'</td></tr>';
     }
-	if ( $accountdata['province'] != ""){
+	if ($accountdata['province'] != "") {
 
         $ACCOUNTADD_CUSTOMER .= '<tr><td style="width:100%;font-size: 12px;color:#525252;font-family:arial; line-height: 22px;">'.$accountdata['province'].'</td></tr>';
     }
-	if ( $accountdata['country'] != ""){
+	if ($accountdata['country'] != "") {
 
         $ACCOUNTADD_CUSTOMER .= '<tr><td style="width:100%;font-size: 12px;color:#525252;font-family:arial; line-height: 22px;">'.$accountdata['country'].'</td></tr>';
     }
-	if ( $accountdata['postal_code'] != ""){
+	if ($accountdata['postal_code'] != "") {
 
         $ACCOUNTADD_CUSTOMER .= '<tr><td style="width:100%;font-size: 12px;color:#525252;font-family:arial; line-height: 22px;">'.$accountdata['postal_code'].'</td></tr>';
     }
-    $ACCOUNTADD_CUSTOMER .="</table>"; 
+    $ACCOUNTADD_CUSTOMER .= "</table>"; 
 /*************************** Customer Address Code END ***************************************************/
 
 
@@ -1972,7 +1972,7 @@ 
 	$ACCOUNT_DESCRIPTION .= '<td style="width:20%;font-size: 12px;color:#fff;font-family:arial; line-height: 22px;">Date</td>';
         $ACCOUNT_DESCRIPTION .= '<td  style="width:40%;font-size: 12px;color:#fff;font-family:arial; line-height: 22px;">Description</td>';
         $ACCOUNT_DESCRIPTION .= '<td  style="width:20%;font-size: 12px;color:#fff;font-family:arial; line-height: 22px;">Charge Type</td>';
-	$ACCOUNT_DESCRIPTION .= '<td style="width:20%;font-size: 12px;color:#fff;font-family:arial; line-height: 22px;text-align:right;">Amount ('.$currency .')</td>';
+	$ACCOUNT_DESCRIPTION .= '<td style="width:20%;font-size: 12px;color:#fff;font-family:arial; line-height: 22px;text-align:right;">Amount ('.$currency.')</td>';
         $ACCOUNT_DESCRIPTION .= '</tr>';
 
 
@@ -1980,23 +1980,23 @@ 
 	$ACCOUNT_CDRS .= '<td style="width:40%;font-size: 12px;color:#fff;font-family:arial; line-height: 22px;">Description</td>';
 	$ACCOUNT_CDRS .= '<td style="width:20%;font-size: 12px;color:#fff;font-family:arial; line-height: 22px;">Duration (Seconds)</td>';
         $ACCOUNT_CDRS .= '<td style="width:20%;font-size: 12px;color:#fff;font-family:arial; line-height: 22px;">Total Calls</td>';
-	$ACCOUNT_CDRS .= '<td style="width:20%;font-size: 12px;color:#fff;font-family:arial; line-height: 22px;text-align:right;">Amount ('.$currency .')</td>';
+	$ACCOUNT_CDRS .= '<td style="width:20%;font-size: 12px;color:#fff;font-family:arial; line-height: 22px;text-align:right;">Amount ('.$currency.')</td>';
         $ACCOUNT_CDRS .= '</tr>';
 
 	/*** manual invoice **/
-	$this->CI->db->where('item_type <>','INVPAY');
-        $invoice_details = $this->CI->db_model->getSelect('*', 'invoice_details',array("invoiceid"=> $invoicedata['id'],'item_type <>'=> 'TAX' ));
-	$invoice_details= $invoice_details->result_array();
-	$total_sum=0;
-	foreach($invoice_details as $charge_res){
-	    if($charge_res['item_type'] == 'DIDCHRG' || $charge_res['item_type'] == 'SUBCHRG' || $charge_res['item_type'] == 'manual_inv' ){
-		if($charge_res['item_type'] == 'manual_inv'){
+	$this->CI->db->where('item_type <>', 'INVPAY');
+        $invoice_details = $this->CI->db_model->getSelect('*', 'invoice_details', array("invoiceid"=> $invoicedata['id'], 'item_type <>'=> 'TAX'));
+	$invoice_details = $invoice_details->result_array();
+	$total_sum = 0;
+	foreach ($invoice_details as $charge_res) {
+	    if ($charge_res['item_type'] == 'DIDCHRG' || $charge_res['item_type'] == 'SUBCHRG' || $charge_res['item_type'] == 'manual_inv') {
+		if ($charge_res['item_type'] == 'manual_inv') {
 			$charge_res['item_type'] = 'Manual Invoice';
 		}
-		if($charge_res['item_type'] == 'DIDCHRG'){
+		if ($charge_res['item_type'] == 'DIDCHRG') {
 			$charge_res['item_type'] = 'DID Charge';
 		}
-		if($charge_res['item_type'] == 'SUBCHRG'){
+		if ($charge_res['item_type'] == 'SUBCHRG') {
 			$charge_res['item_type'] = 'Subscription Charge';
 		}
 
@@ -2007,12 +2007,12 @@ 
 
 		$ACCOUNT_DESCRIPTION .= '<td style="width:20%;font-size: 12px;color:#525252;font-family:arial; line-height: 22px;text-align:right;">'.$this->currency_decimal($this->CI->common_model->calculate_currency($charge_res['debit'])).'</td>';
 		$ACCOUNT_DESCRIPTION .= '</tr>';
-	     }else{
-            $cdrs_data = $this->CI->db_model->getSelect("sum(billseconds) as billseconds,count(*) as count", "cdrs", array("accountid" => $charge_res['accountid'],"calltype" => $charge_res['item_type']));
+	     } else {
+            $cdrs_data = $this->CI->db_model->getSelect("sum(billseconds) as billseconds,count(*) as count", "cdrs", array("accountid" => $charge_res['accountid'], "calltype" => $charge_res['item_type']));
             $cdrs_result = $cdrs_data->result_array();
-	    if($cdrs_result[0]['count'] > 0 ){
-		$cdrs_record_count=$cdrs_result[0]['count'] ;
-		$cdrs_record_billseconds=$cdrs_result[0]['billseconds'] ;
+	    if ($cdrs_result[0]['count'] > 0) {
+		$cdrs_record_count = $cdrs_result[0]['count'];
+		$cdrs_record_billseconds = $cdrs_result[0]['billseconds'];
 /*echo '<pre>'.$cdrs_record_count;
 print_r($cdrs_result);
 exit;*/
@@ -2030,8 +2030,8 @@ 
 
 /**********************************Tax Apply Start********************************************************************/
 	$total_sum = $total_sum;
-	$total_sum=$this->currency_decimal($this->CI->common_model->calculate_currency($total_sum));
-        $invoice_tax = $this->CI->db_model->getSelect('*', 'invoice_details',array("invoiceid"=> $invoicedata['id'],'item_type '=> 'TAX'));
+	$total_sum = $this->currency_decimal($this->CI->common_model->calculate_currency($total_sum));
+        $invoice_tax = $this->CI->db_model->getSelect('*', 'invoice_details', array("invoiceid"=> $invoicedata['id'], 'item_type '=> 'TAX'));
  	//$ACCOUNT_TOTAL .= '<td><table style="width:100%;margin-left:360px;">';
 
 	$ACCOUNT_TOTAL .= '<tr>';
@@ -2041,35 +2041,35 @@ 
 //	$ACCOUNT_TOTAL .= '<td style="width:20%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;text-align:right;">'.$total_sum .'</td>';
         $ACCOUNT_TOTAL .= '</tr>';
 
-	if($invoice_tax->num_rows() > 0 ){
-	   foreach($invoice_tax->result_array() as $invoice_tax){
+	if ($invoice_tax->num_rows() > 0) {
+	   foreach ($invoice_tax->result_array() as $invoice_tax) {
 
-		$total_vat +=$invoice_tax['debit'];
+		$total_vat += $invoice_tax['debit'];
 		$ACCOUNT_TOTAL .= '<tr>';
 		$ACCOUNT_TOTAL .= '<td style="width:20%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;text-align:right;"></td>';
 		$ACCOUNT_TOTAL .= '<td style="width:40%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;text-align:right;"></td>';
 		$ACCOUNT_TOTAL .= '<td style="width:20%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;"><b>'.$invoice_tax["description"].':</b></td>';
-		$ACCOUNT_TOTAL .= '<td style="width:20%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;text-align:right;">'.$this->currency_decimal($this->CI->common_model->calculate_currency($total_vat)) .'</td>';
+		$ACCOUNT_TOTAL .= '<td style="width:20%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;text-align:right;">'.$this->currency_decimal($this->CI->common_model->calculate_currency($total_vat)).'</td>';
 		$ACCOUNT_TOTAL .= '</tr>';
 
 	   }
-		$total_vat=$this->currency_decimal($this->CI->common_model->calculate_currency($total_vat));	
-	}else{
+		$total_vat = $this->currency_decimal($this->CI->common_model->calculate_currency($total_vat));	
+	} else {
 /********harsh_308***********/
 		$ACCOUNT_TOTAL .= '<tr>';
 		$ACCOUNT_TOTAL .= '<td style="width:20%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;"></td>';
 		$ACCOUNT_TOTAL .= '<td style="width:40%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;"></td>';
 		$ACCOUNT_TOTAL .= '<td style="width:20%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;"><b>Total TAX:</b></td>';
-		$ACCOUNT_TOTAL .= '<td style="width:20%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;text-align:right;">'.$this->currency_decimal($total_vat) .'</td>';
+		$ACCOUNT_TOTAL .= '<td style="width:20%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;text-align:right;">'.$this->currency_decimal($total_vat).'</td>';
 		$ACCOUNT_TOTAL .= '</tr>';
 
 	}
-	$sub_total=$total_sum+$total_vat;
+	$sub_total = $total_sum + $total_vat;
 	$ACCOUNT_TOTAL .= '<tr>';
 	$ACCOUNT_TOTAL .= '<td style="width:20%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;"></td>';
 	$ACCOUNT_TOTAL .= '<td style="width:40%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;"></td>';
 	$ACCOUNT_TOTAL .= '<td style="width:20%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;"><b>Sub Total:</b></td>';
-	$ACCOUNT_TOTAL .= '<td style="width:20%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;text-align:right;">'.$this->currency_decimal($sub_total) .'</td>';
+	$ACCOUNT_TOTAL .= '<td style="width:20%;font-size: 12px;color:#000;font-family:arial; line-height: 22px;text-align:right;">'.$this->currency_decimal($sub_total).'</td>';
 	$ACCOUNT_TOTAL .= '</tr>';
 
 
@@ -2098,26 +2098,26 @@ 
 
 /*************************** Invoice Note Code END ***************************************************/
         $invoice_notes = $this->CI->db_model->getSelect('*', 'invoices', array('id'=>$invoicedata['id']));
-        $invoice_notes=$invoice_notes->result_array();
-	if(isset($invoice_notes[0]['notes'])){
-		$invoice_notes=$invoice_notes[0]['notes'];
-	}else{
-		if($invoice_notes[0]['invoice_note'] == '0' ){
-			$invoice_notes='THIS IS A 30 DAY ACCOUNT, SO PLEASE MAKE PAYMENT WITHIN THESE TERMS';
-		}else{
-			$invoice_notes=$invoice_notes[0]['invoice_note'];
+        $invoice_notes = $invoice_notes->result_array();
+	if (isset($invoice_notes[0]['notes'])) {
+		$invoice_notes = $invoice_notes[0]['notes'];
+	} else {
+		if ($invoice_notes[0]['invoice_note'] == '0') {
+			$invoice_notes = 'THIS IS A 30 DAY ACCOUNT, SO PLEASE MAKE PAYMENT WITHIN THESE TERMS';
+		} else {
+			$invoice_notes = $invoice_notes[0]['invoice_note'];
 		}
 	}
 /*************************** Invoice Note Code END ***************************************************/
 
 	if (file_exists(getcwd()."/upload/".$invoice_config[0]['accountid']."_".$invoice_config[0]['logo'])) {
-		if($invoice_config[0]['logo'] != ''){
-			$content = str_replace("<LOGO>",base_url()."upload/".$invoice_config[0]['accountid']."_".$invoice_config[0]['logo'],$content);
-		}else{
-			$content = str_replace("<LOGO>",base_url().'/assets/images/logo.png',$content);
+		if ($invoice_config[0]['logo'] != '') {
+			$content = str_replace("<LOGO>", base_url()."upload/".$invoice_config[0]['accountid']."_".$invoice_config[0]['logo'], $content);
+		} else {
+			$content = str_replace("<LOGO>", base_url().'/assets/images/logo.png', $content);
 		}
-	}else{
-		$content = str_replace("<LOGO>",base_url().'/assets/images/logo.png',$content);
+	} else {
+		$content = str_replace("<LOGO>", base_url().'/assets/images/logo.png', $content);
 	}
 
 	$ACCOUNT_TOTAL_FINAL .= '<tr>';
@@ -2126,37 +2126,37 @@ 
 	$ACCOUNT_TOTAL_FINAL .= '</tr>';
 
       //  $content = str_replace("<LOGO>",$image_logo,$content);   
-        $content = str_replace("<ACCOUNTADD>",$ACCOUNTADD,$content);
-        $content = str_replace("<ACCOUNTADD_CUSTOMER>",$ACCOUNTADD_CUSTOMER,$content);
-        $content = str_replace("<ACCOUNTADD_RIGHT>",$ACCOUNTADD_RIGHT,$content);
-	$content = str_replace("<ACCOUNT_DESCRIPTION>",$ACCOUNT_DESCRIPTION,$content);
-	$content = str_replace("<ACCOUNT_CDRS>",$ACCOUNT_CDRS,$content);
-	$content = str_replace("<ACCOUNT_TOTAL>",$ACCOUNT_TOTAL,$content);
-	$content = str_replace("<ACCOUNT_TOTAL_FINAL>",$ACCOUNT_TOTAL_FINAL,$content);
-        $content = str_replace("<NOTES>",$invoice_notes,$content);
+        $content = str_replace("<ACCOUNTADD>", $ACCOUNTADD, $content);
+        $content = str_replace("<ACCOUNTADD_CUSTOMER>", $ACCOUNTADD_CUSTOMER, $content);
+        $content = str_replace("<ACCOUNTADD_RIGHT>", $ACCOUNTADD_RIGHT, $content);
+	$content = str_replace("<ACCOUNT_DESCRIPTION>", $ACCOUNT_DESCRIPTION, $content);
+	$content = str_replace("<ACCOUNT_CDRS>", $ACCOUNT_CDRS, $content);
+	$content = str_replace("<ACCOUNT_TOTAL>", $ACCOUNT_TOTAL, $content);
+	$content = str_replace("<ACCOUNT_TOTAL_FINAL>", $ACCOUNT_TOTAL_FINAL, $content);
+        $content = str_replace("<NOTES>", $invoice_notes, $content);
 
 //echo $content; exit;
 
-	$invoice_path=$this->CI->config->item('invoices_path');
+	$invoice_path = $this->CI->config->item('invoices_path');
 	$download_path = $invoice_path.$accountdata["id"].'/'.$invoicedata['invoice_prefix'].$invoicedata['invoiceid']."_invoice.pdf"; 
        //echo  $download_path; exit;
        $this->CI->html2pdf->pdf->SetDisplayMode('fullpage');
        $this->CI->html2pdf->writeHTML($content);
        
-       if($flag== 'TRUE'){
+       if ($flag == 'TRUE') {
         $download_path = $invoicedata['invoice_prefix'].$invoicedata['invoiceid'].".pdf";
        
-        $this->CI->html2pdf->Output($download_path,"D");        
-       }else{
+        $this->CI->html2pdf->Output($download_path, "D");        
+       } else {
         $current_dir = getcwd()."/invoices/";
         $dir_name = $accountdata["id"];
-        if(!is_dir($current_dir.$dir_name)){
-                mkdir($current_dir.$dir_name,0777, true);
+        if ( ! is_dir($current_dir.$dir_name)) {
+                mkdir($current_dir.$dir_name, 0777, true);
                 chmod($current_dir.$dir_name, 0777);        
         }        
-        $invoice_path=$this->CI->config->item('invoices_path');
+        $invoice_path = $this->CI->config->item('invoices_path');
         $download_path = $invoice_path.$accountdata["id"].'/'.$invoicedata['invoice_prefix'].$invoicedata['invoiceid']."_invoice.pdf"; 
-        $this->CI->html2pdf->Output($download_path,"F");         
+        $this->CI->html2pdf->Output($download_path, "F");         
        }
 }
     function reseller_select_value($select, $table, $id_where = '') {
@@ -2176,55 +2176,55 @@ 
 	   return 'Admin';
     }
     
-    function get_subreseller_info($parent_id){
-        if(!empty($parent_id)){
-	  $str=$parent_id.",";
-        }else{
-          $str=null;
+    function get_subreseller_info($parent_id) {
+        if ( ! empty($parent_id)) {
+	  $str = $parent_id.",";
+        } else {
+          $str = null;
         }
         $query = "select id from accounts where reseller_id = '$parent_id' AND deleted =0 AND type=1";
         $result = $this->CI->db->query($query);
-        if($result->num_rows() > 0){
+        if ($result->num_rows() > 0) {
         $result = $result->result_array();
-	  foreach ($result as $data){
-	    if(!empty($data['id'])){
-	      $str.=$this->get_subreseller_info($data['id']);
+	  foreach ($result as $data) {
+	    if ( ! empty($data['id'])) {
+	      $str .= $this->get_subreseller_info($data['id']);
 	    }
 	  }
 	}
 	return $str;
     }
-    function get_parent_info($child_id,$parent_id){
-        if(!empty($child_id)){
-	  $str=$child_id.",";
-        }else{
-          $str=null;
+    function get_parent_info($child_id, $parent_id) {
+        if ( ! empty($child_id)) {
+	  $str = $child_id.",";
+        } else {
+          $str = null;
         }
-        if($child_id > 0){
+        if ($child_id > 0) {
         $query = "select reseller_id from accounts where id = '$child_id'";
         $result = $this->CI->db->query($query);
-        if($result->num_rows() > 0){
+        if ($result->num_rows() > 0) {
         $parent_info = (array)$result->first_row();
-	  if($parent_info['reseller_id'] != $parent_id){
-	    $str.=$this->get_parent_info($parent_info['reseller_id'],$parent_id);
+	  if ($parent_info['reseller_id'] != $parent_id) {
+	    $str .= $this->get_parent_info($parent_info['reseller_id'], $parent_id);
 	  }
 	}
 	}
 	return $str;
     }
-    function get_did_accountid($select,$table,$where){
-      $accountinfo=$this->CI->session->userdata('accountinfo');
-      $this->CI->db->where('note',$where);
-      $this->CI->db->where('parent_id',$accountinfo['id']);
+    function get_did_accountid($select, $table, $where) {
+      $accountinfo = $this->CI->session->userdata('accountinfo');
+      $this->CI->db->where('note', $where);
+      $this->CI->db->where('parent_id', $accountinfo['id']);
       $this->CI->db->select('reseller_id');
-      $reseller_pricing_result=$this->CI->db->get('reseller_pricing');
-      $account_info=(array)$reseller_pricing_result->first_row();
-      $account_name=$this->get_field_name_coma_new('first_name,last_name,number','accounts',$account_info['reseller_id']);
+      $reseller_pricing_result = $this->CI->db->get('reseller_pricing');
+      $account_info = (array)$reseller_pricing_result->first_row();
+      $account_name = $this->get_field_name_coma_new('first_name,last_name,number', 'accounts', $account_info['reseller_id']);
       return $account_name;     
     }
 
-    function get_status_new($select = "",$table = "",$status = "") {
-      return ($status['status']==0) ? "<span class='label label-sm label-inverse arrowed-in' title='release'>Active<span>" : "<span class='label label-sm' title='release'>Inactive<span>";
+    function get_status_new($select = "", $table = "", $status = "") {
+      return ($status['status'] == 0) ? "<span class='label label-sm label-inverse arrowed-in' title='release'>Active<span>" : "<span class='label label-sm' title='release'>Inactive<span>";
     }
     
 }

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

Doc Comments +7 added lines

@@ -91,6 +91,9 @@ 
         return false;
     }
 
+    /**
+     * @param string $detail_type
+     */
     function get_info($id,$detail_type)
     {
 	$where = array('id' => $id);
@@ -183,6 +186,10 @@ 
 		}
 	}
     }
+
+    /**
+     * @param string $attachment
+     */
     function mail_history($attachment)
     {
 		$send_mail_details = array('from'=>$this->from,

Spacing +81 added lines, -81 removed lines

@@ -21,7 +21,7 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-if (!defined('BASEPATH'))
+if ( ! defined('BASEPATH'))
     exit('No direct script access allowed');
 
 /**
@@ -30,19 +30,19 @@ 
 class email_lib {
 
     protected $CI; // codeigniter
-    public $email='';
-    public $smtp='';
-    public $smtp_host='';
-    public $smtp_user='';
-    public $smtp_pass='';
-    public $smtp_port='';
-    public $message='';
-    public $from='';
-    public $to='';
-    public $subject='';
-    public $company_name='';
-    public $company_website='';
-    public $account_id='';
+    public $email = '';
+    public $smtp = '';
+    public $smtp_host = '';
+    public $smtp_user = '';
+    public $smtp_pass = '';
+    public $smtp_port = '';
+    public $message = '';
+    public $from = '';
+    public $to = '';
+    public $subject = '';
+    public $company_name = '';
+    public $company_website = '';
+    public $account_id = '';
 
     function __construct($library_name = '') {
 
@@ -57,13 +57,13 @@ 
 		$where = array('group_title' =>'email');
 	        $query = $this->CI->db_model->getSelect("*", "system", $where);
 	        $query = $query->result_array();
-		foreach($query as $key=>$val){
+		foreach ($query as $key=>$val) {
 			$tempvar = strtolower($val['name']);
-			$this->$tempvar=$val['value'];
+			$this->$tempvar = $val['value'];
 		}
     }
 
-    function get_template( $type)
+    function get_template($type)
     {
 	$where = array('name' => $type);
         $query = $this->CI->db_model->getSelect("*", "default_templates", $where);
@@ -77,27 +77,27 @@ 
 	$where = array('id' => $accountid);
         $query = $this->CI->db_model->getSelect("*", "accounts", $where);
         $query = $query->result_array();
-	if(isset($query[0]['email']) && $query[0]['email']!=''){
-		$query[0]['currency_name']=$this->CI->common->get_field_name('currency', 'currency', $query[0]['currency_id']);
-		$query[0]['timezone_name']=$this->CI->common->get_field_name('gmtzone', 'timezone', $query[0]['timezone_id']);
-		$query[0]['country_name']=$this->CI->common->get_field_name('country', 'countrycode', $query[0]['country_id']);
-		$this->to=$query[0]['email'];
+	if (isset($query[0]['email']) && $query[0]['email'] != '') {
+		$query[0]['currency_name'] = $this->CI->common->get_field_name('currency', 'currency', $query[0]['currency_id']);
+		$query[0]['timezone_name'] = $this->CI->common->get_field_name('gmtzone', 'timezone', $query[0]['timezone_id']);
+		$query[0]['country_name'] = $this->CI->common->get_field_name('country', 'countrycode', $query[0]['country_id']);
+		$this->to = $query[0]['email'];
 		$this->account_id = $query[0]['id'];
 		unset($query[0]['id']);
-		$query[0]['username']=$query[0]['number'];
+		$query[0]['username'] = $query[0]['number'];
 		unset($query[0]['number']);
 		return $query[0];
 	}
         return false;
     }
 
-    function get_info($id,$detail_type)
+    function get_info($id, $detail_type)
     {
 	$where = array('id' => $id);
         $query = $this->CI->db_model->getSelect("*", $detail_type, $where);
         $query = $query->result_array();
-	if(isset($query[0]['accountid'])){
-		$query=$this->get_account_info($query [0]['accountid']);
+	if (isset($query[0]['accountid'])) {
+		$query = $this->get_account_info($query [0]['accountid']);
 		return $query[0];
 	}
 	return false;
@@ -108,47 +108,47 @@ 
 	$where = array();
         $query = $this->CI->db_model->getSelect("*", "invoice_conf", $where);
         $query = $query->result();
-	if(isset($query[0]->emailaddress) && $query[0]->emailaddress!=''){
-		$this->company_website=$query[0]->website;
-		$this->from=$query[0]->emailaddress;
-		$this->company_name=$query[0]->company_name;
+	if (isset($query[0]->emailaddress) && $query[0]->emailaddress != '') {
+		$this->company_website = $query[0]->website;
+		$this->from = $query[0]->emailaddress;
+		$this->company_name = $query[0]->company_name;
 		return true;
 	}
 	return false;
     }
 
-    function build_template($template_type,$detail,$detail_type='') {
-	if(!is_array($template_type))
+    function build_template($template_type, $detail, $detail_type = '') {
+	if ( ! is_array($template_type))
 		$this->get_template($template_type);
-	else{
-		$this->message=$template_type['message'];
-		$this->subject=$template_type['subject'];
-		$template_type='';
+	else {
+		$this->message = $template_type['message'];
+		$this->subject = $template_type['subject'];
+		$template_type = '';
 	}
-	if(is_array($detail))
+	if (is_array($detail))
 	{
-		$templateinfo=$detail;
-		if(isset($detail['email'])){
-			$this->to=$detail['email'];
+		$templateinfo = $detail;
+		if (isset($detail['email'])) {
+			$this->to = $detail['email'];
 		}
 /*****
 ASTPP  3.0 
 Email test
 ****/
-		if(isset($templateinfo['number'])){	
-			$templateinfo['username']=$templateinfo['number'];
+		if (isset($templateinfo['number'])) {	
+			$templateinfo['username'] = $templateinfo['number'];
 		}
 
 /*************/
-		$this->account_id=$templateinfo['accountid'];
+		$this->account_id = $templateinfo['accountid'];
 		unset($templateinfo['number']);
 	}
-	else if(!is_array($detail) && $detail_type=='')
-		$templateinfo=$this->get_account_info($detail);
+	else if ( ! is_array($detail) && $detail_type == '')
+		$templateinfo = $this->get_account_info($detail);
 	else
-		$templateinfo=$this->get_info($detail,$detail_type);
+		$templateinfo = $this->get_info($detail, $detail_type);
 
-	if($this->get_admin_details() && is_array($templateinfo) && isset($templateinfo['first_name']) && $templateinfo['first_name']!=''){
+	if ($this->get_admin_details() && is_array($templateinfo) && isset($templateinfo['first_name']) && $templateinfo['first_name'] != '') {
 		$this->message = html_entity_decode($this->message);
 		$this->message = str_replace("#COMPANY_EMAIL#", $this->from, $this->message);
 		$this->message = str_replace("#COMPANY_NAME#", $this->company_name, $this->message);
@@ -193,33 +193,33 @@ 
 			   'status'=>'1',
 			   'attachment'=>$attachment
 			  );
-		$this->CI->db->insert('mail_details',$send_mail_details);
+		$this->CI->db->insert('mail_details', $send_mail_details);
 		return $this->CI->db->insert_id();
     }
     function update_mail_history($id)
     {
 		$this->CI->db->where(array('id' => $id));
 		$send_mail_details = array('status'=>'0');
-		$this->CI->db->update('mail_details',$send_mail_details);
+		$this->CI->db->update('mail_details', $send_mail_details);
     }
     function set_email_paramenters($details)
     {
-		if(!is_array($details)){
+		if ( ! is_array($details)) {
 			$this->get_admin_details();
 			$where = array('id'=>$details);
 			$query = $this->CI->db_model->getSelect("*", "mail_details", $where);
 			$query = $query->result_array();
-			$details=$query[0];
+			$details = $query[0];
 		}
-		$this->message=$details['body'];
-		$this->from=$details['from'];
-		$this->to=$details['to'];
-		$this->subject=$details['subject'];
-		$this->account_id=$details['accountid'];
+		$this->message = $details['body'];
+		$this->from = $details['from'];
+		$this->to = $details['to'];
+		$this->subject = $details['subject'];
+		$this->account_id = $details['accountid'];
     }
     function get_smtp_details()
     {
-	if($this->smtp_port=='' || $this->smtp_host=='' || $this->smtp_user=='' || $this->smtp_pass=='')exit;
+	if ($this->smtp_port == '' || $this->smtp_host == '' || $this->smtp_user == '' || $this->smtp_pass == '')exit;
 		$config['protocol'] = "smtp";
 		$config['smtp_host'] = $this->smtp_host;
 		$config['smtp_port'] = $this->smtp_port;
@@ -231,21 +231,21 @@ 
 		$this->CI->email->initialize($config);
     }
 
-    function send_email($template_type,$details,$detail_type='',$attachment='',$resend=0,$mass_mail=0,$brodcast=0) {
+    function send_email($template_type, $details, $detail_type = '', $attachment = '', $resend = 0, $mass_mail = 0, $brodcast = 0) {
 	$this->get_email_settings();
-	if(!$this->email){
-		if(!$resend){
-			$this->build_template($template_type,$details,$detail_type);
-		}else{
+	if ( ! $this->email) {
+		if ( ! $resend) {
+			$this->build_template($template_type, $details, $detail_type);
+		} else {
 			$this->set_email_paramenters($details);
 		}
 
-		if(!$brodcast)
-	        	$history_id=$this->mail_history($attachment);
+		if ( ! $brodcast)
+	        	$history_id = $this->mail_history($attachment);
 		else	
-			$history_id=$details['history_id'];
-		if(isset($this->from) && $this->from!='' && isset($this->to) && $this->to!='' && !$mass_mail){
-			if(!$this->smtp){
+			$history_id = $details['history_id'];
+		if (isset($this->from) && $this->from != '' && isset($this->to) && $this->to != '' && ! $mass_mail) {
+			if ( ! $this->smtp) {
 				$this->get_smtp_details();
 			}			
 			$this->CI->email->from($this->from, $this->company_name);
@@ -255,11 +255,11 @@ 
 			eval("\$message = \"".$this->message."\";");
 			$this->CI->email->message($this->message);
 
-			if($attachment!="")
+			if ($attachment != "")
 			{
-			        $attac_exp=explode(",",$attachment);
-		       	  	foreach($attac_exp as $key=>$value){
-			   		if($value != ''){
+			        $attac_exp = explode(",", $attachment);
+		       	  	foreach ($attac_exp as $key=>$value) {
+			   		if ($value != '') {
 			       	$this->CI->email->attach(getcwd()."/attachments/".$value);       	  	
 				   	}
 				}
@@ -274,22 +274,22 @@ 
 ASTPP  3.0 
 Add For Signup Module
 **/
-    function send_mail($template_type,$details,$detail_type='',$attachment='',$resend=0,$mass_mail=0,$brodcast=0) {
+    function send_mail($template_type, $details, $detail_type = '', $attachment = '', $resend = 0, $mass_mail = 0, $brodcast = 0) {
 	$this->get_email_settings();
-	if(!$this->email){
+	if ( ! $this->email) {
 		
-		if(!$resend){
-			$this->build_template($template_type,$details,$detail_type);
-		}else{
+		if ( ! $resend) {
+			$this->build_template($template_type, $details, $detail_type);
+		} else {
 			$this->set_email_paramenters($details);
 		}
 
-		if(!$brodcast)
-	        	$history_id=$this->mail_history($attachment);
+		if ( ! $brodcast)
+	        	$history_id = $this->mail_history($attachment);
 		else	
-			$history_id=$details['history_id'];
-		if(isset($this->from) && $this->from!='' && isset($this->to) && $this->to!='' && !$mass_mail){
-			if(!$this->smtp){
+			$history_id = $details['history_id'];
+		if (isset($this->from) && $this->from != '' && isset($this->to) && $this->to != '' && ! $mass_mail) {
+			if ( ! $this->smtp) {
 				$this->get_smtp_details();
 			}			
 			$this->CI->email->from($this->from, $this->company_name);

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

Doc Comments -2 removed lines

@@ -52,8 +52,6 @@
 // __construct
     /**
      * adds raw html to the field array
-     * @param type $label
-     * @param type $field add
      */
     function check_permissions() {
         if ($this->CI->session->userdata('user_login') == TRUE) {

Spacing +245 added lines, -245 removed lines

@@ -21,7 +21,7 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-if (!defined('BASEPATH'))
+if ( ! defined('BASEPATH'))
     exit('No direct script access allowed');
 
 /**
@@ -30,7 +30,7 @@ 
 class Form {
 
     protected $CI; // codeigniter
-    protected $fields = array();  // array of fields
+    protected $fields = array(); // array of fields
     protected $form_title = 'Form';
     protected $form_id = 'form';
     protected $form_action = '';
@@ -58,31 +58,31 @@ 
     function check_permissions() {
         if ($this->CI->session->userdata('user_login') == TRUE) {
             $module_info = unserialize($this->CI->session->userdata("permited_modules"));
-            if($this->CI->session->userdata('userlevel_logintype')!= 0 && $this->CI->session->userdata('userlevel_logintype')!= 3){
-	    $module_info[]='dashboard';
+            if ($this->CI->session->userdata('userlevel_logintype') != 0 && $this->CI->session->userdata('userlevel_logintype') != 3) {
+	    $module_info[] = 'dashboard';
             }
             $url = $this->CI->uri->uri_string;
             $file_name = explode("/", $url);
-            if(isset($file_name['1']) ){
+            if (isset($file_name['1'])) {
 	      $module = explode('_', $file_name['1']);
-            }else{
-              $module=$file_name;
+            } else {
+              $module = $file_name;
             }
-            if($this->CI->session->userdata('userlevel_logintype')==1 ){
-				$module_info[]='user';
+            if ($this->CI->session->userdata('userlevel_logintype') == 1) {
+				$module_info[] = 'user';
 			}
             if (in_array($module[0], $module_info)) {
-                if($this->CI->session->userdata('userlevel_logintype')== 0 && $module[0] == 'customer' && isset($file_name[1]) && $file_name[1] !='customer_transfer'){
-                     redirect(base_url() . 'user/user/');
-                }else{
+                if ($this->CI->session->userdata('userlevel_logintype') == 0 && $module[0] == 'customer' && isset($file_name[1]) && $file_name[1] != 'customer_transfer') {
+                     redirect(base_url().'user/user/');
+                } else {
                    return true;
                 }
             } else {
                 $this->CI->session->set_userdata('astpp_errormsg', 'You do not have permission to access this module..!');
                 if ($this->CI->session->userdata('userlevel_logintype') == '-1' || $this->CI->session->userdata('logintype') == '1') {
-                    redirect(base_url() . 'dashboard/');
+                    redirect(base_url().'dashboard/');
                 } else {
-                    redirect(base_url() . 'user/user/');
+                    redirect(base_url().'user/user/');
                 }
             }
         } else {
@@ -92,12 +92,12 @@ 
 
     function build_form($fields_array, $values) {
         $form_contents = '';
-        $form_contents.= '<div class="pop_md col-md-12 margin-t-10 padding-x-8">';
-        if(isset($fields_array['breadcrumb'])){
-            $form_contents.=form_breadcrumb($fields_array['breadcrumb']);
+        $form_contents .= '<div class="pop_md col-md-12 margin-t-10 padding-x-8">';
+        if (isset($fields_array['breadcrumb'])) {
+            $form_contents .= form_breadcrumb($fields_array['breadcrumb']);
             unset($fields_array['breadcrumb']);
         }
-        $form_contents.= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
+        $form_contents .= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
         unset($fields_array['forms']);
         $button_array = array();
         if (isset($fields_array['button_save']) || isset($fields_array['button_cancel']) || isset($fields_array['additional_button'])) {
@@ -113,76 +113,76 @@ 
             }
         }
         if (isset($additiopnal_button)) {
-            $form_contents.= form_button(gettext($additiopnal_button));
+            $form_contents .= form_button(gettext($additiopnal_button));
         }
         $i = 0;
         foreach ($fields_array as $fieldset_key => $form_fileds) {
             if (count($fields_array) > 1) {
                 if ($i == 1 || $i == 3) {
-                    $form_contents.= '<div class="col-md-6 no-padding pull-right">';
-                    $form_contents.= '<div class="col-md-12 padding-x-4">';
+                    $form_contents .= '<div class="col-md-6 no-padding pull-right">';
+                    $form_contents .= '<div class="col-md-12 padding-x-4">';
                 } else {
-                    $form_contents.= '<div class="col-md-6 no-padding">';
-                    $form_contents.= '<div class="col-md-12 padding-x-4">';
+                    $form_contents .= '<div class="col-md-6 no-padding">';
+                    $form_contents .= '<div class="col-md-12 padding-x-4">';
                 }
             } else {
-               $form_contents.= '<div class="col-md-12 no-padding">';
-                $form_contents.= '<div class="col-md-12 no-padding">';
+               $form_contents .= '<div class="col-md-12 no-padding">';
+                $form_contents .= '<div class="col-md-12 no-padding">';
             }
-            $form_contents.= '<ul class="no-padding">';
-                $form_contents.= '<div class="col-md-12 no-padding">';
+            $form_contents .= '<ul class="no-padding">';
+                $form_contents .= '<div class="col-md-12 no-padding">';
             if ($i == 1 || $i == 3) {
-                $form_contents.= form_fieldset(gettext($fieldset_key));
+                $form_contents .= form_fieldset(gettext($fieldset_key));
             } else {
-                $form_contents.= form_fieldset(gettext($fieldset_key));
+                $form_contents .= form_fieldset(gettext($fieldset_key));
             }
             foreach ($form_fileds as $fieldkey => $fieldvalue) {
-                $form_contents.= '<li class="col-md-12">';
+                $form_contents .= '<li class="col-md-12">';
                 if ($fieldvalue[1] == 'HIDDEN') {
                     if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+                        $fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
                     else
-                        $fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : ''):(isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] :'');
-                    $form_contents.= form_hidden($fieldvalue[2]['name'], $fieldvalue[2]['value']);
-                }else {
-		      $validation_arr=array();
-		      if($fieldvalue[1]=='INPUT'){
-		        if(!empty($fieldvalue[3])){
-		          $validation_arr=explode("|",$fieldvalue[3]);
+                        $fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : '') : (isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] : '');
+                    $form_contents .= form_hidden($fieldvalue[2]['name'], $fieldvalue[2]['value']);
+                } else {
+		      $validation_arr = array();
+		      if ($fieldvalue[1] == 'INPUT') {
+		        if ( ! empty($fieldvalue[3])) {
+		          $validation_arr = explode("|", $fieldvalue[3]);
 		        }
 		      }
-		      elseif($fieldvalue[2]=='SELECT'){
+		      elseif ($fieldvalue[2] == 'SELECT') {
 
-		        if(is_array($fieldvalue[4])){
-		          $validation_arr=explode("|",$fieldvalue[4]['rules']);
-		        }else{
-		        $validation_arr=explode("|",$fieldvalue[4]);
+		        if (is_array($fieldvalue[4])) {
+		          $validation_arr = explode("|", $fieldvalue[4]['rules']);
+		        } else {
+		        $validation_arr = explode("|", $fieldvalue[4]);
 		        }
 		      }
-		      if(!empty($validation_arr)){
-		      $fieldvalue[0] = in_array('required',$validation_arr) ? $fieldvalue[0]."<span style='color:black;'> *</span>" : $fieldvalue[0];
-		      $fieldvalue[0] = in_array('dropdown',$validation_arr) ? $fieldvalue[0]."<span style='color:black;'> *</span>" : $fieldvalue[0];
+		      if ( ! empty($validation_arr)) {
+		      $fieldvalue[0] = in_array('required', $validation_arr) ? $fieldvalue[0]."<span style='color:black;'> *</span>" : $fieldvalue[0];
+		      $fieldvalue[0] = in_array('dropdown', $validation_arr) ? $fieldvalue[0]."<span style='color:black;'> *</span>" : $fieldvalue[0];
 		      }
  
                     if (is_array($fieldvalue[1]) || (is_array($fieldvalue[2]) && isset($fieldvalue[2]['hidden']))) {
-                        $form_contents.= form_label(gettext($fieldvalue[0]), $fieldvalue[0], array('class' => 'col-md-3 no-padding add_settings'));
+                        $form_contents .= form_label(gettext($fieldvalue[0]), $fieldvalue[0], array('class' => 'col-md-3 no-padding add_settings'));
                     } else {
-                        $form_contents.= form_label(gettext($fieldvalue[0]), "", array("class" => "col-md-3 no-padding"));
+                        $form_contents .= form_label(gettext($fieldvalue[0]), "", array("class" => "col-md-3 no-padding"));
                     }
                 }
-                if ($fieldvalue[2] == 'SELECT' && !isset($fieldvalue[13])) {
+                if ($fieldvalue[2] == 'SELECT' && ! isset($fieldvalue[13])) {
 
                 /*
                  To make Drop down enabled disabled
                 */
-                 $extra =isset($fieldvalue[1]['extra']) ? $fieldvalue[1]['extra'] :'';
+                 $extra = isset($fieldvalue[1]['extra']) ? $fieldvalue[1]['extra'] : '';
                  /***************************/
                     if ($fieldvalue[7] != '' && $fieldvalue[8] != '') {
-                        $str = $fieldvalue[7] . "," . $fieldvalue[8];
+                        $str = $fieldvalue[7].",".$fieldvalue[8];
 
-                        if (isset($this->CI->input->post)){
-                            $fieldvalue['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
-                        }else{
+                        if (isset($this->CI->input->post)) {
+                            $fieldvalue['value'] = ( ! $this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
+                        } else {
                             if (is_array($fieldvalue[1])) {
                                 $fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]['name']] : @$fieldvalue[1];
                             } else {
@@ -191,38 +191,38 @@ 
                         }
                         $drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
 
-                        if ($fieldset_key ==  gettext('System Configuration Information') || ($fieldset_key == 'Billing Information'  && $fieldvalue[0] == 'Force Trunk') || ($fieldset_key == 'Card Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Account') || $fieldset_key == 'Freeswitch Devices' && $fieldvalue[0] == 'Rate Group' || ($fieldset_key== 'Origination Rate Add/Edit' && $fieldvalue[0] == 'Trunks' )||$fieldset_key== 'Billing Information' && $fieldvalue[0] == 'Rate Group'  || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Failover GW Name #1') || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Failover GW Name #2') || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key== 'Sip Devices' && $fieldvalue[0] == 'Sip Profile') || ($fieldset_key== 'Sip Devices' && $fieldvalue[0] == 'Account')) {
-                            $form_contents.=form_dropdown_all($fieldvalue[1], $drp_array, $fieldvalue['value'],$extra);
+                        if ($fieldset_key == gettext('System Configuration Information') || ($fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Force Trunk') || ($fieldset_key == 'Card Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Account') || $fieldset_key == 'Freeswitch Devices' && $fieldvalue[0] == 'Rate Group' || ($fieldset_key == 'Origination Rate Add/Edit' && $fieldvalue[0] == 'Trunks') || $fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Rate Group' || ($fieldset_key == 'Information' && $fieldvalue[0] == 'Failover GW Name #1') || ($fieldset_key == 'Information' && $fieldvalue[0] == 'Failover GW Name #2') || ($fieldset_key == 'Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key == 'Sip Devices' && $fieldvalue[0] == 'Sip Profile') || ($fieldset_key == 'Sip Devices' && $fieldvalue[0] == 'Account')) {
+                            $form_contents .= form_dropdown_all($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
                         } else {
-                            $form_contents.=form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
+                            $form_contents .= form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
                         }
-			            if(isset($fieldvalue[4]) && $fieldvalue[4] != ''){
-                        	if(is_array($fieldvalue[4])){
+			            if (isset($fieldvalue[4]) && $fieldvalue[4] != '') {
+                        	if (is_array($fieldvalue[4])) {
 								
-								if(isset($fieldvalue[1]['name'])){
-									$fieldvalue_pass=$fieldvalue[1]['name'];
-								}else{
-									$fieldvalue_pass=$fieldvalue[1];
+								if (isset($fieldvalue[1]['name'])) {
+									$fieldvalue_pass = $fieldvalue[1]['name'];
+								} else {
+									$fieldvalue_pass = $fieldvalue[1];
 								}
 								
         				        $this->CI->form_validation->set_rules($fieldvalue_pass, $fieldvalue[0], $fieldvalue[4]['rules']);
-        				    }else{
+        				    } else {
 								
-								if(isset($fieldvalue[1]['name'])){
-									$fieldvalue_pass=$fieldvalue[1]['name'];
-								}else{
-									$fieldvalue_pass=$fieldvalue[1];
+								if (isset($fieldvalue[1]['name'])) {
+									$fieldvalue_pass = $fieldvalue[1]['name'];
+								} else {
+									$fieldvalue_pass = $fieldvalue[1];
 								}
 								
         				       $this->CI->form_validation->set_rules($fieldvalue_pass, $fieldvalue[0], $fieldvalue[4]);
         				    }   
                         }
-                        $form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.(is_array($fieldvalue[1])?$fieldvalue[1]['name']:$fieldvalue[1]).'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-                        $form_contents.= '<span class="popup_error error  no-padding" id="'.(gettext(is_array($fieldvalue[1])?$fieldvalue[1]['name']:$fieldvalue[1])).'_error">
+                        $form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.(is_array($fieldvalue[1]) ? $fieldvalue[1]['name'] : $fieldvalue[1]).'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+                        $form_contents .= '<span class="popup_error error  no-padding" id="'.(gettext(is_array($fieldvalue[1]) ? $fieldvalue[1]['name'] : $fieldvalue[1])).'_error">
                         </span></div>';                         
                     } else {
                         if (isset($this->CI->input->post)) {
-                            $fieldvalue['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
+                            $fieldvalue['value'] = ( ! $this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
                         } else {
                             if (is_array($fieldvalue[1])) {
                                 $fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]['name']] : @$fieldvalue[1];
@@ -231,53 +231,53 @@ 
                             }
                         }
 
-                        $str = $fieldvalue[7] . "," . $fieldvalue[8];
+                        $str = $fieldvalue[7].",".$fieldvalue[8];
                         $drp_array = call_user_func_array(array($this->CI->common, $fieldvalue[10]), array($fieldvalue[9]));
-                        $form_contents.=form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'],$extra);
-                        if(isset($fieldvalue[4]) && $fieldvalue[4] != ''){
+                        $form_contents .= form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
+                        if (isset($fieldvalue[4]) && $fieldvalue[4] != '') {
 			  $this->CI->form_validation->set_rules($fieldvalue[1], $fieldvalue[0], $fieldvalue[4]);
                         }
-                        $form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.(is_array($fieldvalue[1])?$fieldvalue[1]['name']:$fieldvalue[1]).'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-                        $form_contents.= '<span class="popup_error error  no-padding" id="'.(is_array($fieldvalue[1])?$fieldvalue[1]['name']:$fieldvalue[1]).'_error">
+                        $form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.(is_array($fieldvalue[1]) ? $fieldvalue[1]['name'] : $fieldvalue[1]).'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+                        $form_contents .= '<span class="popup_error error  no-padding" id="'.(is_array($fieldvalue[1]) ? $fieldvalue[1]['name'] : $fieldvalue[1]).'_error">
                         </span></div>';                        
                     }
                 } else if (isset($fieldvalue[13]) && $fieldvalue[13] != '') {
 
                     /* For multi select code */
-                    $str = $fieldvalue[7] . "," . $fieldvalue[8];
+                    $str = $fieldvalue[7].",".$fieldvalue[8];
 
                     if (isset($this->CI->input->post))
-                        $fieldvalue['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
+                        $fieldvalue['value'] = ( ! $this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
                     else
                         $fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]] : @$fieldvalue[1];
 
                     $drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
                     if ($fieldset_key === 'System Configuration Information') {
-                        $form_contents.=form_dropdown_multiselect($fieldvalue[1], $drp_array, '');
+                        $form_contents .= form_dropdown_multiselect($fieldvalue[1], $drp_array, '');
                     } else {
-                        $form_contents.=form_dropdown_multiselect($fieldvalue[1] . "[]", $drp_array, $fieldvalue['value']);
+                        $form_contents .= form_dropdown_multiselect($fieldvalue[1]."[]", $drp_array, $fieldvalue['value']);
                     }
-                    if(isset($fieldvalue[4]) && $fieldvalue[4] != ''){
+                    if (isset($fieldvalue[4]) && $fieldvalue[4] != '') {
 			$this->CI->form_validation->set_rules($fieldvalue[1], $fieldvalue[0], $fieldvalue[4]);
                     }
-                    $form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[1].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-                    $form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[1].'_error"></span></div>';                   
+                    $form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[1].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+                    $form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue[1].'_error"></span></div>';                   
                     /* End---------------------   For multi select code */
                 } else if ($fieldvalue[1] == 'INPUT') {
 
 
                     if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? $fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-                    else{
-                        $fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : ''):(isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] :'');
+                        $fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? $fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+                    else {
+                        $fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : '') : (isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] : '');
                     }    
-                    $form_contents.= form_input($fieldvalue[2], 'readonly');
-                    if(isset($fieldvalue[6]) && !empty($fieldvalue[6])){
-                        $form_contents.=$fieldvalue[6];
+                    $form_contents .= form_input($fieldvalue[2], 'readonly');
+                    if (isset($fieldvalue[6]) && ! empty($fieldvalue[6])) {
+                        $form_contents .= $fieldvalue[6];
                     }    
                     $this->CI->form_validation->set_rules($fieldvalue[2]['name'], $fieldvalue[0], $fieldvalue[3]);
-                    $form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-                    $form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
+                    $form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+                    $form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
                     </span></div>';
                 }
                 /* 
@@ -285,98 +285,98 @@ 
                  */
                 else if ($fieldvalue[1] == 'IMAGE') {
                     if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+                        $fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
                        
                     else
                         $fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
                         $fieldvalue[2]['style'] = isset($fieldvalue[2]['style']) ? $fieldvalue[2]['style'] : "";
-                    $form_contents.= form_image($fieldvalue[2], 'readonly',$fieldvalue[2]['style']);
-                    	 $form_contents.=@$fieldvalue[6];
+                    $form_contents .= form_image($fieldvalue[2], 'readonly', $fieldvalue[2]['style']);
+                    	 $form_contents .= @$fieldvalue[6];
                     $this->CI->form_validation->set_rules($fieldvalue[2]['name'], $fieldvalue[0], $fieldvalue[3]);
-                    $form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-                    $form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
+                    $form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+                    $form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
                     </span></div>';
                 }
                 else if ($fieldvalue[1] == 'DEL_BUTTON') {
                     if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+                        $fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
                        
                     else
                         $fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
                         $fieldvalue[2]['style'] = isset($fieldvalue[2]['style']) ? $fieldvalue[2]['style'] : "";
-                    $form_contents.= form_img_delete($fieldvalue[2], 'readonly',$fieldvalue[2]['style']);
-                    	 $form_contents.=@$fieldvalue[6];
+                    $form_contents .= form_img_delete($fieldvalue[2], 'readonly', $fieldvalue[2]['style']);
+                    	 $form_contents .= @$fieldvalue[6];
                     $this->CI->form_validation->set_rules($fieldvalue[2]['name'], $fieldvalue[0], $fieldvalue[3]);
-                    $form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-                    $form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
+                    $form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+                    $form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
                     </span></div>';
                 }
                 /**********************************************************************************/
                 else if ($fieldvalue[1] == 'PASSWORD') {
                     if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+                        $fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
                     else
-                        $fieldvalue[2]['value'] = ($values) ?@$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
-                    $form_contents.= form_password($fieldvalue[2]);
+                        $fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+                    $form_contents .= form_password($fieldvalue[2]);
                     $this->CI->form_validation->set_rules($fieldvalue[2]['name'], $fieldvalue[0], $fieldvalue[3]);
-                    $form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-                    $form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
+                    $form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+                    $form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
                     </span></div>';
                 } else if ($fieldvalue[2] == 'CHECKBOX') {
                     $OptionArray = array();
 
-					if(isset($fieldvalue[7]) && $fieldvalue[7] != '')
+					if (isset($fieldvalue[7]) && $fieldvalue[7] != '')
 					$OptionArray = call_user_func_array(array($this->CI->common, $fieldvalue[7]), array($fieldvalue[6]));
-                    if (isset($this->CI->input->post)){
-                        $fieldvalue[3]['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[3]['value'] : $this->CI->input->post($fieldvalue[1]);
+                    if (isset($this->CI->input->post)) {
+                        $fieldvalue[3]['value'] = ( ! $this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[3]['value'] : $this->CI->input->post($fieldvalue[1]);
                     }    
                     else
                     {
-                        $fieldvalue[3]['value'] = ($values) ? (isset($values[$fieldvalue[1]]) && $values[$fieldvalue[1]] ? 1: 0) : @$fieldvalue[3]['value'];
+                        $fieldvalue[3]['value'] = ($values) ? (isset($values[$fieldvalue[1]]) && $values[$fieldvalue[1]] ? 1 : 0) : @$fieldvalue[3]['value'];
 					}
                     if ($fieldvalue[3]['value'] == "1") {
                         $checked = true;
                     } else {
                         $checked = false;
                     };
-                    if(isset($fieldvalue[3]['table_name']) && $fieldvalue[3]['table_name'] != ""){
+                    if (isset($fieldvalue[3]['table_name']) && $fieldvalue[3]['table_name'] != "") {
 							
-						 $form_contents.= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'],$checked , $OptionArray);
-					}else{
-						 $form_contents.= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'],$checked ,$OptionArray);
+						 $form_contents .= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'], $checked, $OptionArray);
+					} else {
+						 $form_contents .= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'], $checked, $OptionArray);
 					}
                 } else if ($fieldvalue[1] == 'TEXTAREA') {
 
                     if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+                        $fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
                     else
                         $fieldvalue[2]['value'] = ($values) ? $values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
-                    $form_contents.= form_textarea($fieldvalue[2]);
+                    $form_contents .= form_textarea($fieldvalue[2]);
                 }
                 else if ($fieldvalue[2] == 'RADIO') {
 
-                    $form_contents.= form_radio($fieldvalue[1], $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
+                    $form_contents .= form_radio($fieldvalue[1], $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
                 }
-                $form_contents.= '</li>';
+                $form_contents .= '</li>';
             }
 
-            $form_contents.= '</ul>';
-            $form_contents.= '</div>';
-            $form_contents.= '</div>';
+            $form_contents .= '</ul>';
+            $form_contents .= '</div>';
+            $form_contents .= '</div>';
             $i++;
         }
 
-        $form_contents.= '<center><div class="col-md-12 margin-t-20 margin-b-20">';
+        $form_contents .= '<center><div class="col-md-12 margin-t-20 margin-b-20">';
 
-        $form_contents.= form_button($save);
+        $form_contents .= form_button($save);
 
 	if (isset($cancel)) {
-            $form_contents.= form_button($cancel);
+            $form_contents .= form_button($cancel);
         }
-        $form_contents.= '</center></div>';
-        $form_contents.= form_fieldset_close();
-        $form_contents.= form_close();
-        $form_contents.= '</div>';
+        $form_contents .= '</center></div>';
+        $form_contents .= form_fieldset_close();
+        $form_contents .= form_close();
+        $form_contents .= '</div>';
 
 
         return $form_contents;
@@ -384,8 +384,8 @@ 
 
     function build_serach_form($fields_array) {
         $form_contents = '';
-        $form_contents.= '<div>';
-        $form_contents.= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
+        $form_contents .= '<div>';
+        $form_contents .= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
         unset($fields_array['forms']);
         $button_array = array();
 	/*******
@@ -398,13 +398,13 @@ 
                 $cancel = $fields_array['button_reset'];
                 unset($fields_array['button_reset']);
             }
-	    $button_search_delete='';
+	    $button_search_delete = '';
             if (isset($fields_array['button_search_delete'])) {
                 $button_search_delete = $fields_array['button_search_delete'];
                 unset($fields_array['button_search_delete']);
             }
-            if(isset($fields_array['display_in'])){
-	      $display_in=$fields_array['display_in'];
+            if (isset($fields_array['display_in'])) {
+	      $display_in = $fields_array['display_in'];
 	      unset($fields_array['display_in']);
 	    }
         }
@@ -412,31 +412,31 @@ 
         $i = 1;
         foreach ($fields_array as $fieldset_key => $form_fileds) {
 
-            $form_contents.= '<ul class="padding-15">';
-            $form_contents.= form_fieldset(gettext($fieldset_key),array('style' => 'font-weight:bold;'),"search");
+            $form_contents .= '<ul class="padding-15">';
+            $form_contents .= form_fieldset(gettext($fieldset_key), array('style' => 'font-weight:bold;'), "search");
 
             foreach ($form_fileds as $fieldkey => $fieldvalue) {
                 if ($i == 0) {
-                    $form_contents.= '<li class="col-md-12">';
+                    $form_contents .= '<li class="col-md-12">';
                 }
-                $form_contents.= '<div class="col-md-3 no-padding">';
+                $form_contents .= '<div class="col-md-3 no-padding">';
                 if ($fieldvalue[1] == 'HIDDEN') {
-                    $form_contents.= form_hidden($fieldvalue[2], $fieldvalue[3]);
+                    $form_contents .= form_hidden($fieldvalue[2], $fieldvalue[3]);
                 } else {
-                    $form_contents.= form_label(gettext($fieldvalue[0]), "", array("class" => "search_label col-md-12 no-padding"));
+                    $form_contents .= form_label(gettext($fieldvalue[0]), "", array("class" => "search_label col-md-12 no-padding"));
                 }
                 if ($fieldvalue[1] == 'INPUT') {
-                    $form_contents.= form_input($fieldvalue[2]);
+                    $form_contents .= form_input($fieldvalue[2]);
                 }
 
 
                 if ($fieldvalue[2] == 'SELECT' || $fieldvalue[5] == '1') {
 			  
                     if ($fieldvalue[7] != '' && $fieldvalue[8] != '') {
-                        $str = $fieldvalue[7] . "," . $fieldvalue[8];
+                        $str = $fieldvalue[7].",".$fieldvalue[8];
 
                         $drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
-                        $form_contents.=form_dropdown_all(gettext($fieldvalue[1]), $drp_array, '');
+                        $form_contents .= form_dropdown_all(gettext($fieldvalue[1]), $drp_array, '');
                     } else {
 
                         if ($fieldvalue[1] == 'INPUT') {
@@ -444,54 +444,54 @@ 
                         }
 			
                         $drp_array = call_user_func_array(array($this->CI->common, $fieldvalue[10]), array($fieldvalue[9]));
-                        $form_contents.=form_dropdown_all_search(gettext($fieldvalue[1]), $drp_array, '');
+                        $form_contents .= form_dropdown_all_search(gettext($fieldvalue[1]), $drp_array, '');
                     }
                 } else if ($fieldvalue[1] == 'PASSWORD') {
-                    $form_contents.= form_password($fieldvalue[2]);
+                    $form_contents .= form_password($fieldvalue[2]);
                 } else if ($fieldvalue[2] == 'CHECKBOX') {
-                    $form_contents.= form_checkbox(gettext($fieldvalue[1]), $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
+                    $form_contents .= form_checkbox(gettext($fieldvalue[1]), $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
                 }
-                $form_contents.= '</div>';
+                $form_contents .= '</div>';
                 if ($i % 5 == 0) {
-                    $form_contents.= '</li>';
+                    $form_contents .= '</li>';
                     $i = 0;
                 }
                 $i++;
             }
         }
-        $form_contents.= '<div class="col-md-12 margin-t-20 margin-b-20">';
-        $form_contents.= form_button($cancel);
-        $form_contents.= form_button($save);
-        if(!empty($display_in)){
-            $form_contents.="<div class='col-md-5 pull-right'>";
-            $form_contents.="<div class='col-md-3'></div>";
-            $extra_parameters['class']=$display_in['label_class'];
-            $extra_parameters['style']=$display_in['label_style'];
-            $form_contents.=form_label($display_in['content'], "",$extra_parameters);
-            $drp_array = call_user_func_array(array($this->CI->common,$display_in['function']),array());
-            $extra_parameters['class']=$display_in['dropdown_class'];
-            $extra_parameters['style']=$display_in['dropdown_style'];
-            $form_contents.=form_dropdown_all_search($display_in, $drp_array, '',$extra_parameters);
-            $form_contents.="</div>";
+        $form_contents .= '<div class="col-md-12 margin-t-20 margin-b-20">';
+        $form_contents .= form_button($cancel);
+        $form_contents .= form_button($save);
+        if ( ! empty($display_in)) {
+            $form_contents .= "<div class='col-md-5 pull-right'>";
+            $form_contents .= "<div class='col-md-3'></div>";
+            $extra_parameters['class'] = $display_in['label_class'];
+            $extra_parameters['style'] = $display_in['label_style'];
+            $form_contents .= form_label($display_in['content'], "", $extra_parameters);
+            $drp_array = call_user_func_array(array($this->CI->common, $display_in['function']), array());
+            $extra_parameters['class'] = $display_in['dropdown_class'];
+            $extra_parameters['style'] = $display_in['dropdown_style'];
+            $form_contents .= form_dropdown_all_search($display_in, $drp_array, '', $extra_parameters);
+            $form_contents .= "</div>";
         }
-        if(isset($button_search_delete) && $button_search_delete != ''){
-	  $form_contents.= form_button($button_search_delete);
+        if (isset($button_search_delete) && $button_search_delete != '') {
+	  $form_contents .= form_button($button_search_delete);
         }
-        $form_contents.='<div class="col-md-12 no-padding margin-t-15" style="">
+        $form_contents .= '<div class="col-md-12 no-padding margin-t-15" style="">
 		<div class="pull-right btn-close" id="global_clearsearch_filter">Close</div> 
 	</div>';
-        $form_contents.= '</ul>';        
-        $form_contents.= '</div>';
-        $form_contents.= form_fieldset_close();
-        $form_contents.= form_close();
-        $form_contents.= '</div>';
+        $form_contents .= '</ul>';        
+        $form_contents .= '</div>';
+        $form_contents .= form_fieldset_close();
+        $form_contents .= form_close();
+        $form_contents .= '</div>';
 
         return $form_contents;
     }
     function build_batchupdate_form($fields_array) {
         $form_contents = '';
-        $form_contents.= '<div >';
-        $form_contents.= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
+        $form_contents .= '<div >';
+        $form_contents .= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
         unset($fields_array['forms']);
         $button_array = array();
         if (isset($fields_array['button_search']) || isset($fields_array['button_reset'])) {
@@ -505,69 +505,69 @@ 
         $i = 1;
         foreach ($fields_array as $fieldset_key => $form_fileds) {
 
-            $form_contents.= '<ul>';
-            $form_contents.= form_fieldset(gettext($fieldset_key), array('style' => 'margin-left:-22px;font-weight:bold;'));
+            $form_contents .= '<ul>';
+            $form_contents .= form_fieldset(gettext($fieldset_key), array('style' => 'margin-left:-22px;font-weight:bold;'));
             foreach ($form_fileds as $fieldkey => $fieldvalue) {
                 if ($i == 0) {
-                    $form_contents.= '<li>';
+                    $form_contents .= '<li>';
                 }
-                $form_contents.= '<div class="col-md-4 no-padding">';
+                $form_contents .= '<div class="col-md-4 no-padding">';
                 if ($fieldvalue[1] == 'HIDDEN') {
-                    $form_contents.= form_hidden($fieldvalue[2], $fieldvalue[3]);
+                    $form_contents .= form_hidden($fieldvalue[2], $fieldvalue[3]);
                 } else {
-                    $form_contents.= form_label(gettext($fieldvalue[0]), "", array("class" => "search_label col-md-12 no-padding"));
+                    $form_contents .= form_label(gettext($fieldvalue[0]), "", array("class" => "search_label col-md-12 no-padding"));
                 }
                 if ($fieldvalue[2] == 'SELECT' || $fieldvalue[5] == '1') {
                     if ($fieldvalue[7] != '' && $fieldvalue[8] != '') {
-                        $str = $fieldvalue[7] . "," . $fieldvalue[8];
-                        if(is_array($fieldvalue[13])){
+                        $str = $fieldvalue[7].",".$fieldvalue[8];
+                        if (is_array($fieldvalue[13])) {
                             $drp_array = call_user_func_array(array($this->CI->common, $fieldvalue[14]), array($fieldvalue[13]));
-                            $form_contents.=form_dropdown($fieldvalue[13], $drp_array, '');
+                            $form_contents .= form_dropdown($fieldvalue[13], $drp_array, '');
                         }
                         /**
   		        ASTPP  3.0 
    		        Reseller Batch Update
                         **/ 
-                        if($fieldvalue[10] == 'set_status'){
-			$drp_array =array('0'=>'Active','1'=>'Inactive');
+                        if ($fieldvalue[10] == 'set_status') {
+			$drp_array = array('0'=>'Active', '1'=>'Inactive');
 			}
 			/************************************************************/
-			else{
-                        $drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));}
-                        $form_contents.=form_dropdown_all($fieldvalue[1], $drp_array, '');
+			else {
+                        $drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12])); }
+                        $form_contents .= form_dropdown_all($fieldvalue[1], $drp_array, '');
                     } else {
                         if ($fieldvalue[1] == 'INPUT') {
                             $drp_name = $fieldvalue[6];
                         }
                         $drp_array = call_user_func_array(array($this->CI->common, $fieldvalue[10]), array($fieldvalue[9]));
-                        $form_contents.=form_dropdown($drp_name, $drp_array, '');
+                        $form_contents .= form_dropdown($drp_name, $drp_array, '');
                     }
                 }
                 if ($fieldvalue[1] == 'INPUT') {
-                    $form_contents.= form_input($fieldvalue[2]);
+                    $form_contents .= form_input($fieldvalue[2]);
                 } else if ($fieldvalue[2] == 'CHECKBOX') {
-                    $form_contents.= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
+                    $form_contents .= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
                 }
-                $form_contents.= '</div>';
+                $form_contents .= '</div>';
                 if ($i % 5 == 0) {
-                    $form_contents.= '</li>';
+                    $form_contents .= '</li>';
                     $i = 0;
                 }
                 $i++;
             }
         }
 
-        $form_contents.= '</ul>';
-        $form_contents.= '<div class="col-md-12 margin-t-20 margin-b-20">';
+        $form_contents .= '</ul>';
+        $form_contents .= '<div class="col-md-12 margin-t-20 margin-b-20">';
 
-        $form_contents.= form_button($cancel);
-        $form_contents.= form_button($save);
-        $form_contents.='<div class="col-md-12 no-padding margin-t-15" style="margin-bottom:10px; !important">
+        $form_contents .= form_button($cancel);
+        $form_contents .= form_button($save);
+        $form_contents .= '<div class="col-md-12 no-padding margin-t-15" style="margin-bottom:10px; !important">
 						<div class="pull-right btn-close" id="global_clearbatchupdate_filter">Close</div></div>';
-        $form_contents.= form_fieldset_close();
-        $form_contents.= form_close();
-        $form_contents.= '</div>';
-        $form_contents.= '</div>';
+        $form_contents .= form_fieldset_close();
+        $form_contents .= form_close();
+        $form_contents .= '</div>';
+        $form_contents .= '</div>';
 
         return $form_contents;
     }
@@ -599,21 +599,21 @@ 
                 ASTPP  3.0 
                 For Edit on Account number or name
             */
-		$row_id = isset($row['id']) ? $row["id"]: '';
+		$row_id = isset($row['id']) ? $row["id"] : '';
 /*****************************/
                 foreach ($grid_fields as $field_key => $field_arr) {
 /**
 ASTPP  3.0 
 For Edit on Account number or name
 **/
-		     $Actionkey = array_search(gettext('Action'), $this->CI->common->array_column($grid_fields,0));
+		     $Actionkey = array_search(gettext('Action'), $this->CI->common->array_column($grid_fields, 0));
 /*********************************/
                     if ($field_arr[2] != "") {
                         if ($field_arr[3] != "") {
-                           if($field_arr[2]=="status"){
+                           if ($field_arr[2] == "status") {
                             $row['id'] = $row_id;
                             $jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row));
-			   }else{
+			   } else {
                             $jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row[$field_arr[2]]));
 			   }
 
@@ -622,53 +622,53 @@ 
 For Edit on Account number or name
 **/
 			    $row[$field_arr[2]] = $jsn_tmp[$field_key];
-            } if(array_search("EDITABLE", $field_arr)){
+            } if (array_search("EDITABLE", $field_arr)) {
 			    $ActionArr = $grid_fields[$Actionkey];
-                if($ActionArr[5]->EDIT->url =="accounts/customer_edit/" || $ActionArr[5]->EDIT->url =="accounts/provider_edit/"){
-                   $ActionArr[5]->EDIT->url=$row['type']==0 ?  "accounts/customer_edit/"  : "accounts/provider_edit/";
+                if ($ActionArr[5]->EDIT->url == "accounts/customer_edit/" || $ActionArr[5]->EDIT->url == "accounts/provider_edit/") {
+                   $ActionArr[5]->EDIT->url = $row['type'] == 0 ? "accounts/customer_edit/" : "accounts/provider_edit/";
                 }
-                if($ActionArr[5]->EDIT->url =="accounts/admin_edit/" || $ActionArr[5]->EDIT->url =="accounts/subadmin_edit/"){
-                   $ActionArr[5]->EDIT->url=$row['type']==4 ?  "accounts/subadmin_edit/"  : "accounts/admin_edit/";
+                if ($ActionArr[5]->EDIT->url == "accounts/admin_edit/" || $ActionArr[5]->EDIT->url == "accounts/subadmin_edit/") {
+                   $ActionArr[5]->EDIT->url = $row['type'] == 4 ? "accounts/subadmin_edit/" : "accounts/admin_edit/";
                 }
                 $acctype = "";
-                if(isset($row["type"]) && ($row["type"] == '0' || $row["type"] == '1' || $row["type"] == '3')){
-                    $acctype = (isset($row["posttoexternal"]) && $row["posttoexternal"] != '')? "<span class='label label-default pull-right'>".$this->CI->common->get_account_type("","",$row["posttoexternal"])."</span>":"";
+                if (isset($row["type"]) && ($row["type"] == '0' || $row["type"] == '1' || $row["type"] == '3')) {
+                    $acctype = (isset($row["posttoexternal"]) && $row["posttoexternal"] != '') ? "<span class='label label-default pull-right'>".$this->CI->common->get_account_type("", "", $row["posttoexternal"])."</span>" : "";
                 }
 
-                $fieldstr = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT,$row[$field_arr[2]],$row["id"]);
-                if($acctype != ''){
+                $fieldstr = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT, $row[$field_arr[2]], $row["id"]);
+                if ($acctype != '') {
                     $jsn_tmp[$field_key] = $fieldstr."<br/>".$acctype;
-                }else{
+                } else {
                     $jsn_tmp[$field_key] = $fieldstr;
                 }
 			    
 
 /*********************************/
-		      }else {
+		      } else {
                             $jsn_tmp[$field_key] = $row[$field_arr[2]];
                   }                  				
             } else {
                 if ($field_arr[0] == gettext("Action")) {
-			    if(isset($field_arr[5]) && isset($field_arr[5]->EDIT) && isset($field_arr[5]->DELETE)){
+			    if (isset($field_arr[5]) && isset($field_arr[5]->EDIT) && isset($field_arr[5]->DELETE)) {
 		             
-		              if($field_arr[5]->EDIT->url == 'accounts/customer_edit/' || $field_arr[5]->EDIT->url == 'accounts/provider_edit/' || $field_arr[5]->DELETE->url == 'accounts/provider_delete/' ||$field_arr[5]->DELETE->url == 'accounts/customer_delete/'){
-		               if( $row['type'] == '0'|| strtolower($row['type']) == 'customer'){
-		                $field_arr[5]->EDIT->url ='accounts/customer_edit/';
-		                $field_arr[5]->DELETE->url ='accounts/customer_delete/';
+		              if ($field_arr[5]->EDIT->url == 'accounts/customer_edit/' || $field_arr[5]->EDIT->url == 'accounts/provider_edit/' || $field_arr[5]->DELETE->url == 'accounts/provider_delete/' || $field_arr[5]->DELETE->url == 'accounts/customer_delete/') {
+		               if ($row['type'] == '0' || strtolower($row['type']) == 'customer') {
+		                $field_arr[5]->EDIT->url = 'accounts/customer_edit/';
+		                $field_arr[5]->DELETE->url = 'accounts/customer_delete/';
 		               }
-		               if($row['type'] == 3 || strtolower($row['type']) == 'provider'){
-		                $field_arr[5]->EDIT->url ='accounts/provider_edit/';
-		                $field_arr[5]->DELETE->url ='accounts/provider_delete/';
+		               if ($row['type'] == 3 || strtolower($row['type']) == 'provider') {
+		                $field_arr[5]->EDIT->url = 'accounts/provider_edit/';
+		                $field_arr[5]->DELETE->url = 'accounts/provider_delete/';
 		               }
 		              }
-		              if($field_arr[5]->EDIT->url == 'accounts/admin_edit/' || $field_arr[5]->EDIT->url == 'accounts/subadmin_edit/' || $field_arr[5]->DELETE->url == 'accounts/admin_delete/' ||$field_arr[5]->DELETE->url == 'accounts/subadmin_delete/'){
-		               if($row['type'] == 2 || strtolower($row['type']) == 'administrator'){
-		                $field_arr[5]->EDIT->url ='accounts/admin_edit/';
-		                $field_arr[5]->DELETE->url ='accounts/admin_delete/';
+		              if ($field_arr[5]->EDIT->url == 'accounts/admin_edit/' || $field_arr[5]->EDIT->url == 'accounts/subadmin_edit/' || $field_arr[5]->DELETE->url == 'accounts/admin_delete/' || $field_arr[5]->DELETE->url == 'accounts/subadmin_delete/') {
+		               if ($row['type'] == 2 || strtolower($row['type']) == 'administrator') {
+		                $field_arr[5]->EDIT->url = 'accounts/admin_edit/';
+		                $field_arr[5]->DELETE->url = 'accounts/admin_delete/';
 		               }
-		               if($row['type'] == 4 || strtolower($row['type']) == 'sub admin'){
-		                $field_arr[5]->EDIT->url ='accounts/subadmin_edit/';
-		                $field_arr[5]->DELETE->url ='accounts/subadmin_delete/';
+		               if ($row['type'] == 4 || strtolower($row['type']) == 'sub admin') {
+		                $field_arr[5]->EDIT->url = 'accounts/subadmin_edit/';
+		                $field_arr[5]->DELETE->url = 'accounts/subadmin_delete/';
 		               }
 		            }
 			   }
@@ -679,16 +679,16 @@ 
                             $jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row_id);
                             /****************************************************************************/
                         }
-                        elseif($field_arr[0] == gettext("Profile Action"))
+                        elseif ($field_arr[0] == gettext("Profile Action"))
                         {
-                           if(isset($field_arr[5]) && isset($field_arr[5]->START) && isset($field_arr[5]->STOP) && isset($field_arr[5]->RELOAD) && isset($field_arr[5]->RESCAN)){
+                           if (isset($field_arr[5]) && isset($field_arr[5]->START) && isset($field_arr[5]->STOP) && isset($field_arr[5]->RELOAD) && isset($field_arr[5]->RESCAN)) {
                             }
                            $jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row["id"]);
                         
                         }
                         else {
-                            $className = (isset($field_arr['9']) && $field_arr['9'] != '')?$field_arr['9']:"chkRefNos";
-                            $jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id=' . $row['id'] . ' class="ace '.$className.'" onclick="clickchkbox(' . $row['id'] . ')" value=' . $row['id'] . '><lable class="lbl"></lable>';                        }
+                            $className = (isset($field_arr['9']) && $field_arr['9'] != '') ? $field_arr['9'] : "chkRefNos";
+                            $jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id='.$row['id'].' class="ace '.$className.'" onclick="clickchkbox('.$row['id'].')" value='.$row['id'].'><lable class="lbl"></lable>'; }
                     }
                 }
                 $json_data[] = array('cell' => $jsn_tmp);
@@ -702,20 +702,20 @@ 
         $json_data = array();
         foreach ($query as $row) {
             foreach ($grid_fields as $field_key => $field_arr) {
-                $row_id = isset($row['id']) ? $row["id"]: '';
+                $row_id = isset($row['id']) ? $row["id"] : '';
 /**
 ASTPP  3.0 
 For Edit on Account number or name
 **/
-		$Actionkey = array_search('Action',$this->CI->common->array_column($grid_fields,0)); 
+		$Actionkey = array_search('Action', $this->CI->common->array_column($grid_fields, 0)); 
 /*******************************/
 
                 if ($field_arr[2] != "") {
                     if ($field_arr[3] != "") {
-                         if($field_arr[2]=="status"){
+                         if ($field_arr[2] == "status") {
                             $row['id'] = $row_id;
                             $jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row));
-						 }else{
+						 } else {
                             $jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row[$field_arr[2]]));
 						 }
 /**
@@ -723,17 +723,17 @@ 
 For Edit on Account number or name
 **/
  			$row[$field_arr[2]] = $jsn_tmp[$field_key];
-                      } if(array_search("EDITABLE", $field_arr)){
+                      } if (array_search("EDITABLE", $field_arr)) {
 			    $ActionArr = $grid_fields[$Actionkey];
-                if($ActionArr[5]->EDIT->url =="accounts/customer_edit/" || $ActionArr[5]->EDIT->url =="accounts/provider_edit/"){
-                   $ActionArr[5]->EDIT->url=$row['type']==0 ?  "accounts/customer_edit/"  : "accounts/provider_edit/";
+                if ($ActionArr[5]->EDIT->url == "accounts/customer_edit/" || $ActionArr[5]->EDIT->url == "accounts/provider_edit/") {
+                   $ActionArr[5]->EDIT->url = $row['type'] == 0 ? "accounts/customer_edit/" : "accounts/provider_edit/";
                 }
-                if($ActionArr[5]->EDIT->url =="accounts/admin_edit/" || $ActionArr[5]->EDIT->url =="accounts/subadmin_edit/"){
-                   $ActionArr[5]->EDIT->url=$row['type']==4 ?  "accounts/subadmin_edit/"  : "accounts/admin_edit/";
+                if ($ActionArr[5]->EDIT->url == "accounts/admin_edit/" || $ActionArr[5]->EDIT->url == "accounts/subadmin_edit/") {
+                   $ActionArr[5]->EDIT->url = $row['type'] == 4 ? "accounts/subadmin_edit/" : "accounts/admin_edit/";
                 }
-			    $jsn_tmp[$field_key] = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT,$row[$field_arr[2]],$row["id"]);
+			    $jsn_tmp[$field_key] = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT, $row[$field_arr[2]], $row["id"]);
 /*******************************/
-		    }else {
+		    } else {
                         $jsn_tmp[$field_key] = isset($row[$field_arr[2]]) ? $row[$field_arr[2]] : "";
                     }
                 } else {
@@ -741,7 +741,7 @@ 
                         $jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row["id"]);
                     }
 		      else {
-                            $jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id=' . $row['id'] . ' class="ace chkRefNos" onclick="clickchkbox(' . $row['id'] . ')" value=' . $row['id'] . '><lable class="lbl"></lable>';
+                            $jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id='.$row['id'].' class="ace chkRefNos" onclick="clickchkbox('.$row['id'].')" value='.$row['id'].'><lable class="lbl"></lable>';
                         }
                 }
             }