iNextrix / ASTPP

web_interface/astpp/system/helpers/inflector_helper.php

Doc Comments +3 added lines

@@ -41,6 +41,9 @@
  */
 if ( ! function_exists('singular'))
 {
+	/**
+	 * @param string $str
+	 */
 	function singular($str)
 	{
 		$result = strval($str);

freeswitch/fs/lib/astpp.db.php

Spacing +21 added lines, -21 removed lines

@@ -27,18 +27,18 @@ 
 	private $errorCallbackFunction;
 	private $errorMsgFormat;
 	public function __construct($dsn = "", $user = "", $passwd = "") {
-		$config = parse_ini_file ( "/var/lib/astpp/astpp-config.conf" );
+		$config = parse_ini_file("/var/lib/astpp/astpp-config.conf");
 		
-		$options = array (
+		$options = array(
 				PDO::ATTR_PERSISTENT => true,
 				PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION 
 		);
 		
 		try {
-			parent::__construct ( "mysql:host=" . $config ['dbhost'] . ";dbname=" . $config ['dbname'] . "", $config ['dbuser'], $config ['dbpass'], $options );
-		} catch ( PDOException $e ) {
+			parent::__construct("mysql:host=".$config ['dbhost'].";dbname=".$config ['dbname']."", $config ['dbuser'], $config ['dbpass'], $options);
+		} catch (PDOException $e) {
 			
-			$this->error = $e->getMessage ();
+			$this->error = $e->getMessage();
 		}
 		echo $this->error;
 	}
@@ -48,39 +48,39 @@ 
 	 * @param string $bind        	
 	 */
 	public function cleanup($bind) {
-		if (! is_array ( $bind )) {
-			if (! empty ( $bind ))
-				$bind = array (
+		if ( ! is_array($bind)) {
+			if ( ! empty ($bind))
+				$bind = array(
 						$bind 
 				);
 			else
-				$bind = array ();
+				$bind = array();
 		}
 		return $bind;
 	}
 	public function run($sql, $bind = "") {
-		$this->sql = trim ( $sql );
-		$this->bind = $this->cleanup ( $bind );
+		$this->sql = trim($sql);
+		$this->bind = $this->cleanup($bind);
 		$this->error = "";
 		
 		try {
-			$pdostmt = $this->prepare ( $this->sql );
-			if ($pdostmt->execute ( $this->bind ) !== false) {
-				if (preg_match ( "/^(" . implode ( "|", array (
+			$pdostmt = $this->prepare($this->sql);
+			if ($pdostmt->execute($this->bind) !== false) {
+				if (preg_match("/^(".implode("|", array(
 						"select",
 						"describe",
 						"pragma" 
-				) ) . ") /i", $this->sql ))
-					return $pdostmt->fetchAll ( PDO::FETCH_ASSOC );
-				elseif (preg_match ( "/^(" . implode ( "|", array (
+				)).") /i", $this->sql))
+					return $pdostmt->fetchAll(PDO::FETCH_ASSOC);
+				elseif (preg_match("/^(".implode("|", array(
 						"delete",
 						"insert",
 						"update" 
-				) ) . ") /i", $this->sql ))
-					return $pdostmt->rowCount ();
+				)).") /i", $this->sql))
+					return $pdostmt->rowCount();
 			}
-		} catch ( PDOException $e ) {
-			$this->error = $e->getMessage ();
+		} catch (PDOException $e) {
+			$this->error = $e->getMessage();
 			return $this->error;
 		}
 	}

Braces +11 added lines, -9 removed lines

@@ -49,12 +49,13 @@ 
 	 */
 	public function cleanup($bind) {
 		if (! is_array ( $bind )) {
-			if (! empty ( $bind ))
-				$bind = array (
+			if (! empty ( $bind )) {
+							$bind = array (
 						$bind 
 				);
-			else
-				$bind = array ();
+			} else {
+							$bind = array ();
+			}
 		}
 		return $bind;
 	}
@@ -70,14 +71,15 @@ 
 						"select",
 						"describe",
 						"pragma" 
-				) ) . ") /i", $this->sql ))
-					return $pdostmt->fetchAll ( PDO::FETCH_ASSOC );
-				elseif (preg_match ( "/^(" . implode ( "|", array (
+				) ) . ") /i", $this->sql )) {
+									return $pdostmt->fetchAll ( PDO::FETCH_ASSOC );
+				} elseif (preg_match ( "/^(" . implode ( "|", array (
 						"delete",
 						"insert",
 						"update" 
-				) ) . ") /i", $this->sql ))
-					return $pdostmt->rowCount ();
+				) ) . ") /i", $this->sql )) {
+									return $pdostmt->rowCount ();
+				}
 			}
 		} catch ( PDOException $e ) {
 			$this->error = $e->getMessage ();

freeswitch/fs/lib/astpp.xml.php

Spacing +61 added lines, -61 removed lines

@@ -23,7 +23,7 @@ 
 
 // If module/app not found
 function xml_not_found() {
-	header ( 'Content-Type: text/xml' );
+	header('Content-Type: text/xml');
 	
 	$xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n";
 	$xml .= "<document type=\"freeswitch/xml\">\n";
@@ -46,28 +46,28 @@ 
 	
 	// For customer and provider ips
 	$query = "SELECT ip FROM ip_map,accounts WHERE ip_map.accountid=accounts.id AND ip_map.status=0 AND accounts.status=0 AND accounts.deleted=0";
-	$logger->log ( "ACL Query : " . $query );
-	$res_acl = $db->run ( $query );
-	$logger->log ( $res_acl );
+	$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";
+	foreach ($res_acl as $res_acl_key => $res_acl_value) {
+		$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 );
-	$sp_gw = $db->run ( $query );
-	$logger->log ( $sp_gw );
+	$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 ) {
+	foreach ($sp_gw as $sp_gw_key => $sp_gw_value) {
 		
-		$sp_gw_settings = json_decode ( $sp_gw_value ['gateway_data'], true );
-		foreach ( $sp_gw_settings as $sp_gw_settings_key => $sp_gw_settings_value ) {
+		$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";
 				}
 			}
 		}
@@ -75,7 +75,7 @@ 
 	
 	// For opensips
 	if ($config ['opensips'] == '0') {
-		$xml .= "<node type=\"allow\" cidr=\"" . $config ['opensips_domain'] . "/32\"/>\n";
+		$xml .= "<node type=\"allow\" cidr=\"".$config ['opensips_domain']."/32\"/>\n";
 	}
 	
 	$xml .= "       </list>\n";
@@ -83,20 +83,20 @@ 
 	// For loopback
 	if ($config ['opensips'] == '0') {
 		$xml .= "<list name=\"loopback.auto\" default=\"allow\">\n";
-		$xml .= "<node type=\"allow\" cidr=\"" . $config ['opensips_domain'] . "/32\"/>\n";
+		$xml .= "<node type=\"allow\" cidr=\"".$config ['opensips_domain']."/32\"/>\n";
 		$xml .= "</list>\n";
 	}
 	
 	// 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";
 	$xml .= "       </configuration>\n";
 	$xml .= "   </section>\n";
 	$xml .= "</document>\n";
-	$logger->log ( $xml );
+	$logger->log($xml);
 	return $xml;
 }
 
@@ -109,18 +109,18 @@ 
 	$xml .= "   <profiles>\n";
 	
 	$query = "SELECT * FROM sip_profiles WHERE status=0";
-	$logger->log ( "Sofia Query : " . $query );
-	$res_sp = $db->run ( $query );
+	$logger->log("Sofia Query : ".$query);
+	$res_sp = $db->run($query);
 	// $logger->log($res_sp);
 	
-	foreach ( $res_sp as $sp_key => $sp_value ) {
+	foreach ($res_sp as $sp_key => $sp_value) {
 		
-		$settings = json_decode ( $sp_value ['profile_data'], true );
+		$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";
@@ -129,26 +129,26 @@ 
 		 */
 		
 		$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=\"" . $set_key . "\" value=\"" . $set_val . "\"/>\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=\"".$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 );
-		$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";
+		$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";
 			
-			$sp_gw_settings = json_decode ( $sp_gw_value ['gateway_data'], true );
-			foreach ( $sp_gw_settings as $sp_gw_settings_key => $sp_gw_settings_value ) {
+			$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";
 		}
@@ -162,47 +162,47 @@ 
 	$xml .= "   </configuration>\n";
 	$xml .= "   </section>\n";
 	$xml .= "</document>\n";
-	$logger->log ( $xml );
+	$logger->log($xml);
 	return $xml;
 }
 function update_vm_data($logger, $db, $password, $user) {
-	$query = "SELECT * FROM sip_devices where username='" . $_REQUEST ['user'] . "' limit 1";
-	$logger->log ( "Directory Query : " . $query );
-	$res_dir = $db->run ( $query );
-	$params = json_decode ( $res_dir [0] ['dir_params'], true );
+	$query = "SELECT * FROM sip_devices where username='".$_REQUEST ['user']."' limit 1";
+	$logger->log("Directory Query : ".$query);
+	$res_dir = $db->run($query);
+	$params = json_decode($res_dir [0] ['dir_params'], true);
 	$params ['vm-password'] = $password;
 	
-	$query = "update sip_devices set dir_params = '" . json_encode ( $params, true ) . "' where username='" . $_REQUEST ['user'] . "' limit 1";
-	$res_dir = $db->run ( $query );
+	$query = "update sip_devices set dir_params = '".json_encode($params, true)."' where username='".$_REQUEST ['user']."' limit 1";
+	$res_dir = $db->run($query);
 }
 
 // Build directory xml
 function load_directory($logger, $db) {
 	$xml = "";
 	
-	$query = "SELECT username,dir_params,dir_vars,number as accountcode,accountid FROM sip_devices,accounts WHERE sip_devices.status=0 AND 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 sip_devices.status=0 AND accounts.status=0 AND accounts.deleted=0 AND accounts.id=sip_devices.accountid AND username='".$_REQUEST ['user']."' limit 1";
 	
-	$logger->log ( "Directory Query : " . $query );
-	$res_dir = $db->run ( $query );
-	$logger->log ( $res_dir );
+	$logger->log("Directory Query : ".$query);
+	$res_dir = $db->run($query);
+	$logger->log($res_dir);
 	
-	foreach ( $res_dir as $res_dir_key => $res_dir_value ) {
+	foreach ($res_dir as $res_dir_key => $res_dir_value) {
 		$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 );
+		$params = json_decode($res_dir_value ['dir_params'], true);
 		
-		$vars = json_decode ( $res_dir_value ['dir_vars'], true );
+		$vars = json_decode($res_dir_value ['dir_vars'], true);
 		$param_xml = $var_xml = "";
-		foreach ( $params as $parms_key => $res_dir_params ) {
-			$param_xml .= "<param name=\"" . $parms_key . "\" value=\"" . $res_dir_params . "\"/>\n";
+		foreach ($params as $parms_key => $res_dir_params) {
+			$param_xml .= "<param name=\"".$parms_key."\" value=\"".$res_dir_params."\"/>\n";
 		}
 		
-		foreach ( $vars as $var_key => $res_dir_vars ) {
-			$var_xml .= "<variable name=\"" . $var_key . "\" value=\"" . $res_dir_vars . "\"/>\n";
+		foreach ($vars as $var_key => $res_dir_vars) {
+			$var_xml .= "<variable name=\"".$var_key."\" value=\"".$res_dir_vars."\"/>\n";
 		}
 		
 		$xml .= "               <params>\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";
@@ -224,7 +224,7 @@ 
 		$xml .= "</document>\n";
 	}
 	
-	$logger->log ( $xml );
+	$logger->log($xml);
 	return $xml;
 }
 

Braces +3 added lines, -2 removed lines

@@ -147,8 +147,9 @@
 			
 			$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";
+				if ($sp_gw_settings_value != "") {
+									$xml .= "           <param name=\"" . $sp_gw_settings_key . "\" value=\"" . $sp_gw_settings_value . "\"/>\n";
+				}
 			}
 			$xml .= "       </gateway>\n";
 		}

freeswitch/fs/lib/astpp.logger.php

Spacing +5 added lines, -5 removed lines

@@ -28,20 +28,20 @@
 		// $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.log', 'a+' );
+			$this->fp = fopen($this->config ['log_path'].'astpp.log', '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 ) );
+			if (is_array($log))
+				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");
 		}
 	}
 	function close() {
 		if ($this->config ['debug'] == '0')
-			fclose ( $this->fp );
+			fclose($this->fp);
 	}
 }
 

Braces +8 added lines, -6 removed lines

@@ -33,15 +33,17 @@
 	}
 	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 ) );
-			else
-				fwrite ( $this->fp, "[" . date ( 'Y-m-d H:i:s' ) . "] " . $log . "\n" );
+			if (is_array ( $log )) {
+							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" );
+			}
 		}
 	}
 	function close() {
-		if ($this->config ['debug'] == '0')
-			fclose ( $this->fp );
+		if ($this->config ['debug'] == '0') {
+					fclose ( $this->fp );
+		}
 	}
 }
 

freeswitch/fs/lib/astpp.constants.php

Spacing +3 added lines, -3 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',
@@ -47,5 +47,5 @@ 
 		'CBB' => 'billing_block' 
 );
 
-define ( "tbl_configuration", "system" );
+define("tbl_configuration", "system");
 ?>

freeswitch/fs/lib/astpp.lib.php

Spacing +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
 	var $config;
 	function get_configurations($db) {
 		$query = "SELECT * FROM system WHERE group_title IN ('global','opensips')";
-		$res_conf = $db->run ( $query );
-		foreach ( $res_conf as $res_conf_key => $res_conf_value )
+		$res_conf = $db->run($query);
+		foreach ($res_conf as $res_conf_key => $res_conf_value)
 			$this->config [$res_conf_value ['name']] = $res_conf_value ['value'];
 		
 		return $this->config;

Braces +3 added lines, -2 removed lines

@@ -25,8 +25,9 @@
 	function get_configurations($db) {
 		$query = "SELECT * FROM system WHERE group_title IN ('global','opensips')";
 		$res_conf = $db->run ( $query );
-		foreach ( $res_conf as $res_conf_key => $res_conf_value )
-			$this->config [$res_conf_value ['name']] = $res_conf_value ['value'];
+		foreach ( $res_conf as $res_conf_key => $res_conf_value ) {
+					$this->config [$res_conf_value ['name']] = $res_conf_value ['value'];
+		}
 		
 		return $this->config;
 	}

freeswitch/fs/lib/astpp.functions.php

Spacing +39 added lines, -39 removed lines

@@ -23,20 +23,20 @@ 
 
 // Parse user and rates array which we got in cdr xml
 function parse_rates_array($xml_rate, $constant_array, $logger) {
-	$rates_array = array ();
+	$rates_array = array();
 	
 	// decode string using urldecode
-	$xml_rate = urldecode ( $xml_rate );
-	$xml_rate_array = explode ( "||", $xml_rate );
+	$xml_rate = urldecode($xml_rate);
+	$xml_rate_array = explode("||", $xml_rate);
 	
-	foreach ( $xml_rate_array as $rate_key => $rate_value ) {
-		$rates_array = explode ( "|", $rate_value );
+	foreach ($xml_rate_array as $rate_key => $rate_value) {
+		$rates_array = explode("|", $rate_value);
 		
-		$user_id_param = $rates_array [count ( $rates_array ) - 1];
-		$user_id = (substr ( $user_id_param, 0, 3 ) == 'UID') ? substr ( $user_id_param, 3 ) : 0;
+		$user_id_param = $rates_array [count($rates_array) - 1];
+		$user_id = (substr($user_id_param, 0, 3) == 'UID') ? substr ($user_id_param, 3) : 0;
 		
-		foreach ( $rates_array as $key => $value ) {
-			$rates_array_info [$user_id] [$constant_array [substr ( $value, 0, 3 )]] = substr ( $value, 3 );
+		foreach ($rates_array as $key => $value) {
+			$rates_array_info [$user_id] [$constant_array [substr($value, 0, 3)]] = substr($value, 3);
 		}
 	}
 	return $rates_array_info;
@@ -50,50 +50,50 @@ 
 	if ($duration > 0 && $xml_cdr->variables->call_direction == 'outbound') {
 		$destination_number = $xml_cdr->variables->effective_destination_number;
 		
-		$number_len = strlen ( $destination_number );
+		$number_len = strlen($destination_number);
 		$number_loop_str = '(';
-		while ( $number_len > 0 ) {
-			$number_loop_str .= " code='" . substr ( $destination_number, 0, $number_len ) . "' OR ";
+		while ($number_len > 0) {
+			$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 );
-		$res_package = $db->run ( $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 );
-				$res_pkg_usg = $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);
+				$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;
+				$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) {
 						$dud_sec = $duration;
 						$duration = 0;
 					} else {
-						$dud_sec = $duration - abs ( $remaining_seconds );
-						$duration = abs ( $remaining_seconds );
+						$dud_sec = $duration - abs($remaining_seconds);
+						$duration = abs($remaining_seconds);
 					}
 					$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 );
-					$db->run ( $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;
 				}
 			}
 		}
 	}
-	return array (
+	return array(
 			$duration,
 			$flag 
 	);
@@ -101,22 +101,22 @@ 
 
 // 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 );
-	$db->run ( $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 );
-	$db->run ( $query );
+	$logger->log("CDR Query : ".$query);
+	$db->run($query);
 }
 
 // Update user balance
@@ -127,16 +127,16 @@ 
 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 );
-		$db->run ( $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;
-	$res_user = $db->run ( $query );
+	$query = "SELECT * FROM tbl_users WHERE id=".$parent_id;
+	$res_user = $db->run($query);
 	return $res_user [0];
 }
 

freeswitch/fs/cdr.php

Indentation +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	$db->run ( "SET NAMES utf8" );
 	//$data = json_decode ( file_get_contents ( "php://input" ), true );
 	$data = file_get_contents("php://input");
-        $data = utf8_encode($data);
+		$data = utf8_encode($data);
 	$data = json_decode($data,true);
 
 	// error_log(print_r($data,true));

Spacing +16 added lines, -16 removed lines

@@ -20,21 +20,21 @@ 
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 // ##############################################################################
-define ( 'ENVIRONMENT', 'production' );
-if (defined ( 'ENVIRONMENT' )) {
+define('ENVIRONMENT', 'production');
+if (defined('ENVIRONMENT')) {
 	switch (ENVIRONMENT) {
 		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' :
 		case 'production' :
-			error_reporting ( 0 );
+			error_reporting(0);
 			break;
 		
 		default :
-			exit ( 'The application environment is not set correctly.' );
+			exit ('The application environment is not set correctly.');
 	}
 }
 
@@ -45,35 +45,35 @@ 
 include ("lib/astpp.cdr.php");
 
 // Define db object
-$db = new db ();
+$db = new db();
 
 // Get default configuration
-$lib = new lib ();
-$config = $lib->get_configurations ( $db );
+$lib = new lib();
+$config = $lib->get_configurations($db);
 
 // Set default decimal points
 $decimal_points = ($config ['decimal_points'] <= 0) ? 4 : $config ['decimal_points'];
 
 // Define logger object
-$logger = new logger ( $lib );
+$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" );
+	$db->run("SET NAMES utf8");
 	//$data = json_decode ( file_get_contents ( "php://input" ), true );
 	$data = file_get_contents("php://input");
         $data = utf8_encode($data);
-	$data = json_decode($data,true);
+	$data = json_decode($data, true);
 
 	// error_log(print_r($data,true));
-	$logger->log ( print_r ( $data, true ) );
+	$logger->log(print_r($data, true));
 	// process_cdr($data,$db,$logger,$decimal_points);
 	if ($data ['variables'] ['calltype'] == "CALLINGCARD") {
-		if (isset ( $data ['variables'] ['originating_leg_uuid'] )) {
-			process_cdr ( $data, $db, $logger, $decimal_points );
+		if (isset ($data ['variables'] ['originating_leg_uuid'])) {
+			process_cdr($data, $db, $logger, $decimal_points);
 		}
 	} else {
-		process_cdr ( $data, $db, $logger, $decimal_points );
+		process_cdr($data, $db, $logger, $decimal_points);
 	}
 }
 

freeswitch/fs/scripts/astpp.configuration.php

Spacing +7 added lines, -7 removed lines

@@ -20,20 +20,20 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 // ##############################################################################
-$logger->log ( "*************************** Configuration Starts ********************************" );
+$logger->log("*************************** Configuration Starts ********************************");
 
 $xml = "";
 if ($_REQUEST ['key_value'] == 'sofia.conf') {
-	$xml = load_sofia ( $logger, $db );
-	header ( 'Content-Type: text/xml' );
+	$xml = load_sofia($logger, $db);
+	header('Content-Type: text/xml');
 	echo $xml;
 } elseif ($_REQUEST ['key_value'] == 'acl.conf') {
-	$xml = load_acl ( $logger, $db, $config );
-	header ( 'Content-Type: text/xml' );
+	$xml = load_acl($logger, $db, $config);
+	header('Content-Type: text/xml');
 	echo $xml;
 } else {
-	xml_not_found ();
+	xml_not_found();
 }
-$logger->log ( "*************************** Configuration Ends **********************************" );
+$logger->log("*************************** Configuration Ends **********************************");
 exit ();
 ?>