iNextrix / ASTPP

web_interface/astpp/application/modules/freeswitch/models/freeswitch_model.php

Spacing +33 added lines, -33 removed lines

@@ -32,14 +32,14 @@ 
 ASTPP  3.0 
 Voicemail data get
 ******/
-    function get_sipdevices_list($flag, $accountid = "",$entitytype='',$start = "", $limit = "") {
+    function get_sipdevices_list($flag, $accountid = "", $entitytype = '', $start = "", $limit = "") {
 	if ($accountid != "") {
 		$where = array("accountid" => $accountid);
 	}
 	$this->db_model->build_search('fssipdevices_list_search');
-        $instant_search=$this->session->userdata('left_panel_search_'.$entitytype.'_sipdevices');
-        if(!empty($instant_search)){
-            $like_str="(username like '%$instant_search%' OR creation_date like '%$instant_search%' OR last_modified_date like '%$instant_search%')";
+        $instant_search = $this->session->userdata('left_panel_search_'.$entitytype.'_sipdevices');
+        if ( ! empty($instant_search)) {
+            $like_str = "(username like '%$instant_search%' OR creation_date like '%$instant_search%' OR last_modified_date like '%$instant_search%')";
             $this->db->where($like_str);   
         }
 	$query = array();
@@ -49,7 +49,7 @@ 
 			$add_array = $deviceinfo->result_array();
 			foreach ($add_array as $key => $value) {
 				$vars = json_decode($value['dir_vars']);
-				$vars_new = json_decode($value['dir_params'],true);
+				$vars_new = json_decode($value['dir_params'], true);
 				$passowrds = json_decode($value['dir_params']);
 				$query[] = array('id' => $value['id'],
 						'username' => $value['username'],
@@ -88,13 +88,13 @@ 
         $where = array('id' => $add_array['accountcode']);
         $query = $this->db_model->getSelect("*", "accounts", $where);
         $query = $query->result_array();
-        $account_data=$query[0];
+        $account_data = $query[0];
        
         $log_type = $this->session->userdata("logintype");
         	
-        $reseller_id = $log_type==1 ? $account_data['reseller_id']:0;
+        $reseller_id = $log_type == 1 ? $account_data['reseller_id'] : 0;
         
-	    $sip_profile_id = isset($add_array['sip_profile_id'])?$add_array['sip_profile_id']:$this->common->get_field_name('id','sip_profiles',array('name'=>'default'));
+	    $sip_profile_id = isset($add_array['sip_profile_id']) ? $add_array['sip_profile_id'] : $this->common->get_field_name('id', 'sip_profiles', array('name'=>'default'));
 	
 	$parms_array = array('password' => $add_array['fs_password'],
 			'vm-enabled' => $add_array['voicemail_enabled'],
@@ -105,7 +105,7 @@ 
 			'vm-email-all-messages' => $add_array['vm_send_all_message']
 			);
 	
-	$add_array['status'] = isset($add_array['status'])?$add_array['status']:"0";
+	$add_array['status'] = isset($add_array['status']) ? $add_array['status'] : "0";
 	$parms_array_vars = array('effective_caller_id_name' => $add_array['effective_caller_id_name'],
  				  'effective_caller_id_number' => $add_array['effective_caller_id_number'],
 				  'user_context' => 'default');
@@ -128,16 +128,16 @@ 
 ASTPP  3.0 
 Email broadcast when Sip Device create
 ******/
-		$mail = (isset($add_array['voicemail_mail_to']) && $add_array['voicemail_mail_to'] != "")?$add_array['voicemail_mail_to']:$account_data['email'];
+		$mail = (isset($add_array['voicemail_mail_to']) && $add_array['voicemail_mail_to'] != "") ? $add_array['voicemail_mail_to'] : $account_data['email'];
     
-        $add_array['id']=$add_array['accountcode'];
-        $add_array['reseller_id']=$account_data['reseller_id'];
-        $add_array['email']=$mail;
-        $add_array['first_name']=$account_data['first_name'];
-        $add_array['last_name']=$account_data['last_name'];
-        $add_array['number']=$add_array['fs_username'];
+        $add_array['id'] = $add_array['accountcode'];
+        $add_array['reseller_id'] = $account_data['reseller_id'];
+        $add_array['email'] = $mail;
+        $add_array['first_name'] = $account_data['first_name'];
+        $add_array['last_name'] = $account_data['last_name'];
+        $add_array['number'] = $add_array['fs_username'];
         //$add_array['password']=$this->common->decode($add_array['fs_password']);
-		$add_array['password']=$add_array['fs_password'];
+		$add_array['password'] = $add_array['fs_password'];
 		//echo "<pre>"; print_r($add_array); exit;		
 		$this->common->mail_to_users('add_sip_device', $add_array);
 /****************************/
@@ -163,14 +163,14 @@ 
 	$parms_array_vars = array('effective_caller_id_name' => $add_array['effective_caller_id_name'],
 	'effective_caller_id_number' => $add_array['effective_caller_id_number'],);
 	$log_type = $this->session->userdata("logintype");
-	if($log_type == 0  || $log_type == 3 || $log_type == 1){
-		$add_array['sip_profile_id']=$this->common->get_field_name('id','sip_profiles',array('name'=>'default'));
+	if ($log_type == 0 || $log_type == 3 || $log_type == 1) {
+		$add_array['sip_profile_id'] = $this->common->get_field_name('id', 'sip_profiles', array('name'=>'default'));
 	}
-	$add_array['status'] = isset($add_array['status'])?$add_array['status']:"0";
+	$add_array['status'] = isset($add_array['status']) ? $add_array['status'] : "0";
 	/*
 	ASTPP  3.0  edit modified date
 	*/
-	$new_array = array('last_modified_date'=>gmdate('Y-m-d H:i:s'),'username' => $add_array['fs_username'], 'accountid' => $add_array['accountcode'],'status' => $add_array['status'],
+	$new_array = array('last_modified_date'=>gmdate('Y-m-d H:i:s'), 'username' => $add_array['fs_username'], 'accountid' => $add_array['accountcode'], 'status' => $add_array['status'],
 	 	 	   'dir_params' => json_encode($parms_array),
 			   'dir_vars' => json_encode($parms_array_vars), 'sip_profile_id' => $add_array['sip_profile_id']);
         /*******************************************/			   
@@ -191,9 +191,9 @@ 
         $add_array = $deviceinfo->result_array();
         foreach ($add_array as $key => $value) {
             $vars = json_decode($value['dir_vars']);
-            $vars_new = json_decode($value['dir_params'],true);
+            $vars_new = json_decode($value['dir_params'], true);
             $passowrds = json_decode($value['dir_params']);
-            $query = array('id' => $value['id'],'fs_username' => $value['username'],
+            $query = array('id' => $value['id'], 'fs_username' => $value['username'],
 						'accountcode' => $value['accountid'],
 						'status' => $value['status'],
 						'sip_profile_id' => $value['sip_profile_id'],
@@ -223,11 +223,11 @@ 
         $deviceinfo = array();
         $this->db_model->build_search('fssipdevices_list_search');
         $accountinfo = $this->session->userdata("accountinfo");
-        $reseller_id=$accountinfo['type']==1 ? $accountinfo['id'] : 0;
+        $reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
         $query = array();
         $logintype = $this->session->userdata("logintype");
         
-        $where['reseller_id']=$reseller_id;
+        $where['reseller_id'] = $reseller_id;
       
         if ($flag) {
             $deviceinfo = $this->db_model->select("*", "sip_devices", $where, "id", "ASC", $limit, $start);
@@ -235,7 +235,7 @@ 
                 $add_array = $deviceinfo->result_array();
                 foreach ($add_array as $key => $value) {
                     $vars = json_decode($value['dir_vars']);
-					$vars_new = json_decode($value['dir_params'],true);
+					$vars_new = json_decode($value['dir_params'], true);
                     $passowrds = json_decode($value['dir_params']);
                     /*
                     ASTPP  3.0 
@@ -309,7 +309,7 @@ 
         /*
         ASTPP  3.0  ADD creation date 
         */
-        $data['creation_date']=gmdate('Y-m-d H:i:s');
+        $data['creation_date'] = gmdate('Y-m-d H:i:s');
         /***********************************/
         unset($data['action']);
         $this->db->insert('freeswich_servers', $data);
@@ -321,7 +321,7 @@ 
         /*
         ASTPP  3.0  edit modified date add
         */
-        $data['last_modified_date']=gmdate('Y-m-d H:i:s');
+        $data['last_modified_date'] = gmdate('Y-m-d H:i:s');
         /***********************************************/
         $this->db->where('id', $id);
         $this->db->update('freeswich_servers', $data);
@@ -334,21 +334,21 @@ 
         return true;
     }
 
-    function reload_freeswitch($command,$server_host="") {
-	$response='';
+    function reload_freeswitch($command, $server_host = "") {
+	$response = '';
         $query = $this->db_model->getSelect("*", "freeswich_servers", "");
         $fs_data = $query->result_array();
        foreach ($fs_data as $fs_key => $fs_value) {
 	    $fp = $this->freeswitch_lib->event_socket_create($fs_value["freeswitch_host"], $fs_value["freeswitch_port"], $fs_value["freeswitch_password"]);
 	    if ($fp) {
-		$response.= $this->freeswitch_lib->event_socket_request($fp, $command);
+		$response .= $this->freeswitch_lib->event_socket_request($fp, $command);
 		fclose($fp);
 	    }
        }
         return $response;
     }
     function reload_live_freeswitch($command) {
-	$response='';
+	$response = '';
         $query = $this->db_model->getSelect("*", "freeswich_servers", "");
         $fs_data = $query->result_array();
         
@@ -359,7 +359,7 @@ 
 		fclose($fp);
 	    }
         }
-	$response = str_replace("0 total.","",$response);
+	$response = str_replace("0 total.", "", $response);
         return $response;
     }
 

freeswitch/fs/index.php

Spacing +2 added lines, -2 removed lines

@@ -59,8 +59,8 @@
 //set_error_handler('xml_not_found');
 
 //Define file name
-$file = "astpp." . $_REQUEST['section'] . ".php";
+$file = "astpp.".$_REQUEST['section'].".php";
 
 //Include file
-include_once("scripts/" . $file);
+include_once("scripts/".$file);
 ?>

freeswitch/fs/cdr.php

Spacing +6 added lines, -6 removed lines

@@ -28,7 +28,7 @@ 
 	{
 		case 'development':
 //			error_reporting(E_ALL);
-            error_reporting(E_ERROR|E_WARNING|E_PARSE);
+            error_reporting(E_ERROR | E_WARNING | E_PARSE);
 		break;
 	
 		case 'testing':
@@ -55,18 +55,18 @@ 
 $config = $lib->get_configurations($db);
 
 //Set default decimal points 
-$decimal_points = ($config['decimal_points'] <= 0)?4:$config['decimal_points'];
+$decimal_points = ($config['decimal_points'] <= 0) ? 4 : $config['decimal_points'];
 
 //Define logger object
 $logger = new logger($lib);
 
-if(isset($_SERVER["CONTENT_TYPE"]) && $_SERVER["CONTENT_TYPE"] == "application/json") {
+if (isset($_SERVER["CONTENT_TYPE"]) && $_SERVER["CONTENT_TYPE"] == "application/json") {
 
     $db->run("SET NAMES utf8");
-    $data = json_decode(file_get_contents("php://input"),true);
+    $data = json_decode(file_get_contents("php://input"), true);
     //error_log(print_r($data,true));
-    $logger->log(print_r($data,true));
-    process_cdr($data,$db,$logger,$decimal_points);
+    $logger->log(print_r($data, true));
+    process_cdr($data, $db, $logger, $decimal_points);
 }
 
 //$db->cleanup();

freeswitch/fs/lib/astpp.constants.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 ###############################################################################
 
 //Define user rates array for parsing
-$CONST_USER_RATE = array (
+$CONST_USER_RATE = array(
 'RID' => 'id',
 'RCD' => 'code',
 'RDS' => 'destination',
@@ -36,7 +36,7 @@ 
 );
 
 //Define carrier rates array for parsing
-$CONST_CARRIER_RATE = array (
+$CONST_CARRIER_RATE = array(
 'CID' => 'id',
 'CCD' => 'code',
 'CDS' => 'destination',

freeswitch/fs/lib/astpp.db.php

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.xml.php

Spacing +33 added lines, -33 removed lines

@@ -36,7 +36,7 @@ 
 }
 
 //Build acl xml
-function load_acl($logger, $db,$config) {
+function load_acl($logger, $db, $config) {
     $xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n";
     $xml .= "<document type=\"freeswitch/xml\">\n";
     $xml .= "   <section name=\"Configuration\" description=\"Configuration\">\n";
@@ -46,29 +46,29 @@ 
 	
     //For customer and provider ips
     $query = "SELECT ip FROM ip_map,accounts WHERE ip_map.accountid=accounts.id AND accounts.status=0 AND deleted=0";
-    $logger->log("ACL Query : " . $query);
+    $logger->log("ACL Query : ".$query);
     $res_acl = $db->run($query);
     $logger->log($res_acl);
 
 	foreach ($res_acl as $res_acl_key => $res_acl_value) {
-		$xml .= "       <node type=\"allow\" cidr=\"" . $res_acl_value['ip'] . "\"/>\n";
+		$xml .= "       <node type=\"allow\" cidr=\"".$res_acl_value['ip']."\"/>\n";
 	}
 
     //For gateways
 	$query = "SELECT * FROM gateways WHERE status=0";
-    $logger->log("Sofia Gateway Query : " . $query);
+    $logger->log("Sofia Gateway Query : ".$query);
     $sp_gw = $db->run($query);
     $logger->log($sp_gw);
 
     foreach ($sp_gw as $sp_gw_key => $sp_gw_value) {
 
-	        $sp_gw_settings  = json_decode($sp_gw_value['gateway_data'], true);
+	        $sp_gw_settings = json_decode($sp_gw_value['gateway_data'], true);
         	foreach ($sp_gw_settings as $sp_gw_settings_key => $sp_gw_settings_value) {
                 if ($sp_gw_settings_value != "" && $sp_gw_settings_key == "proxy")
 	            {
-                    $tmp_ip_arr = explode(":",$sp_gw_settings_value);
-                    if (!filter_var($tmp_ip_arr[0], FILTER_VALIDATE_IP) === false) {
-                        $xml .= "   <node type=\"allow\" cidr=\"" . $tmp_ip_arr[0] . "/32\"/>\n";
+                    $tmp_ip_arr = explode(":", $sp_gw_settings_value);
+                    if ( ! filter_var($tmp_ip_arr[0], FILTER_VALIDATE_IP) === false) {
+                        $xml .= "   <node type=\"allow\" cidr=\"".$tmp_ip_arr[0]."/32\"/>\n";
                     }
 	            }
        	}
@@ -77,7 +77,7 @@ 
 
 
     //For opensips
-    if($config['opensips'] == '0')
+    if ($config['opensips'] == '0')
     {
         $xml .= "<node type=\"allow\" cidr=\"".$config['opensips_domain']."/32\"/>\n";     
     }
@@ -85,7 +85,7 @@ 
     $xml .= "       </list>\n";
 
     //For loopback 
-    if($config['opensips'] == '0')
+    if ($config['opensips'] == '0')
     {
         $xml .= "<list name=\"loopback.auto\" default=\"allow\">\n";
             $xml .= "<node type=\"allow\" cidr=\"".$config['opensips_domain']."/32\"/>\n";
@@ -94,7 +94,7 @@ 
 
     //For event handing
     $xml .= "<list name=\"event\" default=\"deny\">\n";
-        $xml .= ($config['opensips'] == "0")?"<node type=\"allow\" cidr=\"".$config['opensips_domain']."/32\"/>\n":"\n";
+        $xml .= ($config['opensips'] == "0") ? "<node type=\"allow\" cidr=\"".$config['opensips_domain']."/32\"/>\n" : "\n";
         $xml .= "<node type=\"allow\" cidr=\"127.0.0.0/8\"/>\n";
     $xml .= "</list>\n";
     $xml .= "           </network-lists>\n";
@@ -114,7 +114,7 @@ 
     $xml .= "   <profiles>\n";
 
     $query = "SELECT * FROM sip_profiles WHERE status=0";
-    $logger->log("Sofia Query : " . $query);
+    $logger->log("Sofia Query : ".$query);
     $res_sp = $db->run($query);
     //$logger->log($res_sp);
 
@@ -122,40 +122,40 @@ 
 
 		$settings = json_decode($sp_value['profile_data'], true);
 		//$logger->log(print_r($settings,true));
-        $xml .= "   <profile name=\"" . $sp_value['name'] . "\">\n";
+        $xml .= "   <profile name=\"".$sp_value['name']."\">\n";
 
 	    $xml .= "   <domains>\n";
-            $xml .= "       <domain name=\"" . $sp_value['sip_ip'] . "\" alias=\"true\" parse=\"true\"/>\n";
+            $xml .= "       <domain name=\"".$sp_value['sip_ip']."\" alias=\"true\" parse=\"true\"/>\n";
         $xml .= "   </domains>\n";
         /*$xml .= "   <aliases>\n";
             $xml .= "       <alias name=\"" . $sp_value['sip_ip'] . "\"/>\n";
         $xml .= "   </aliases>\n";*/
 
 	$xml .= "   <settings>\n";
-    $xml .= "       <param name=\"sip-ip\" value=\"" . $sp_value['sip_ip'] . "\"/>\n";
-    $xml .= "       <param name=\"sip-port\" value=\"" . $sp_value['sip_port'] . "\"/>\n";    
-	foreach($settings as $set_key => $set_val)
+    $xml .= "       <param name=\"sip-ip\" value=\"".$sp_value['sip_ip']."\"/>\n";
+    $xml .= "       <param name=\"sip-port\" value=\"".$sp_value['sip_port']."\"/>\n";    
+	foreach ($settings as $set_key => $set_val)
 	{
-        	$xml .= "       <param name=\"" . $set_key . "\" value=\"" . $set_val . "\"/>\n";
+        	$xml .= "       <param name=\"".$set_key."\" value=\"".$set_val."\"/>\n";
 	}
         $xml .= "   </settings>\n";
 	
 
         //Gateway block start 
         $xml .= "   <gateways>\n";
-        $query = "SELECT * FROM gateways WHERE sip_profile_id=" . $sp_value['id'] . " AND status=0";
-        $logger->log("Sofia Gateway Query : " . $query);
+        $query = "SELECT * FROM gateways WHERE sip_profile_id=".$sp_value['id']." AND status=0";
+        $logger->log("Sofia Gateway Query : ".$query);
         $sp_gw = $db->run($query);
         $logger->log($sp_gw);
         foreach ($sp_gw as $sp_gw_key => $sp_gw_value) {
-            $xml .= "       <gateway name=\"" . $sp_gw_value['name'] . "\">\n";
+            $xml .= "       <gateway name=\"".$sp_gw_value['name']."\">\n";
 
 
 
-		$sp_gw_settings  = json_decode($sp_gw_value['gateway_data'], true);
+		$sp_gw_settings = json_decode($sp_gw_value['gateway_data'], true);
             foreach ($sp_gw_settings as $sp_gw_settings_key => $sp_gw_settings_value) {
                 if ($sp_gw_settings_value != "")
-                    $xml .= "           <param name=\"" . $sp_gw_settings_key . "\" value=\"" . $sp_gw_settings_value . "\"/>\n";
+                    $xml .= "           <param name=\"".$sp_gw_settings_key."\" value=\"".$sp_gw_settings_value."\"/>\n";
             }
             $xml .= "       </gateway>\n";
         }
@@ -177,9 +177,9 @@ 
 function load_directory($logger, $db) {
     $xml = "";
 
-    $query = "SELECT username,dir_params,dir_vars,number as accountcode,accountid FROM sip_devices,accounts WHERE accounts.status=0 AND accounts.deleted=0 AND accounts.id=sip_devices.accountid AND username='" . $_REQUEST['user']."' limit 1";
+    $query = "SELECT username,dir_params,dir_vars,number as accountcode,accountid FROM sip_devices,accounts WHERE accounts.status=0 AND accounts.deleted=0 AND accounts.id=sip_devices.accountid AND username='".$_REQUEST['user']."' limit 1";
 	
-    $logger->log("Directory Query : " . $query);
+    $logger->log("Directory Query : ".$query);
     $res_dir = $db->run($query);
     $logger->log($res_dir);
 
@@ -187,21 +187,21 @@ 
         $xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n";
         $xml .= "<document type=\"freeswitch/xml\">\n";
         $xml .= "   <section name=\"Directory\" description=\"Directory\">\n";
-        $xml .= "       <domain name=\"" . $_REQUEST['domain'] . "\" alias=\"true\">\n";
-        $xml .= "           <user id=\"" . $_REQUEST['user'] . "\">\n";
+        $xml .= "       <domain name=\"".$_REQUEST['domain']."\" alias=\"true\">\n";
+        $xml .= "           <user id=\"".$_REQUEST['user']."\">\n";
 
 	$params = json_decode($res_dir_value['dir_params'], true);
 
 	$vars   = json_decode($res_dir_value['dir_vars'], true);
 	$param_xml = $var_xml = "";
-	foreach($params as $parms_key => $res_dir_params)
+	foreach ($params as $parms_key => $res_dir_params)
 	{	
-		                $param_xml .= "<param name=\"" . $parms_key . "\" value=\"" . $res_dir_params . "\"/>\n";
+		                $param_xml .= "<param name=\"".$parms_key."\" value=\"".$res_dir_params."\"/>\n";
 	}
 
-	foreach($vars as $var_key => $res_dir_vars)
+	foreach ($vars as $var_key => $res_dir_vars)
 	{	
-		                $var_xml .= "<variable name=\"" . $var_key . "\" value=\"" . $res_dir_vars . "\"/>\n";
+		                $var_xml .= "<variable name=\"".$var_key."\" value=\"".$res_dir_vars."\"/>\n";
 	}		
 
 
@@ -214,8 +214,8 @@ 
         $xml .= "               <variables>\n";
         $xml .= $var_xml;
         $xml .= "<variable name=\"sipcall\" value=\"true\"/>\n";
-        $xml .= "<variable name=\"accountcode\" value=\"" . $res_dir_value['accountcode'] . "\"/>\n";
-        $xml .= "<variable name=\"domain_name\" value=\"" . $_REQUEST['domain'] . "\"/>\n";
+        $xml .= "<variable name=\"accountcode\" value=\"".$res_dir_value['accountcode']."\"/>\n";
+        $xml .= "<variable name=\"domain_name\" value=\"".$_REQUEST['domain']."\"/>\n";
         $xml .= "               </variables>\n";
 
         $xml .= "           </user>\n";

freeswitch/fs/lib/astpp.functions.php

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];
 }

freeswitch/fs/lib/astpp.cdr.php

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.logger.php

Spacing +3 added lines, -3 removed lines

@@ -30,15 +30,15 @@
         $this->config = $lib->config;
 	    $this->config['log_path'] = "/var/log/astpp/";
         if ($this->config['debug'] == '0')
-            $this->fp = fopen($this->config['log_path'] . 'astpp_' . date('Y-m-d') . '.txt', 'a');
+            $this->fp = fopen($this->config['log_path'].'astpp_'.date('Y-m-d').'.txt', 'a');
     }
 
     function log($log) {
         if ($this->config['debug'] == '0') {
             if (is_array($log))
-                fwrite($this->fp, "[" . date('Y-m-d H:i:s') . "] " . print_r($log, TRUE));
+                fwrite($this->fp, "[".date('Y-m-d H:i:s')."] ".print_r($log, TRUE));
             else
-                fwrite($this->fp, "[" . date('Y-m-d H:i:s') . "] " . $log . "\n");
+                fwrite($this->fp, "[".date('Y-m-d H:i:s')."] ".$log."\n");
         }
     }