iNextrix / ASTPP

freeswitch/fs/lib/astpp.db.php

Indentation +47 added lines, -47 removed lines

@@ -23,61 +23,61 @@
 
 class db extends PDO {
 
-    private $error;
-    private $sql;
-    private $bind;
-    private $errorCallbackFunction;
-    private $errorMsgFormat;
+	private $error;
+	private $sql;
+	private $bind;
+	private $errorCallbackFunction;
+	private $errorMsgFormat;
 
-    public function __construct($dsn = "", $user = "", $passwd = "") {
+	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(
-            PDO::ATTR_PERSISTENT => true,
-            PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
-        );
+		$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) {
+		try {
+			parent::__construct("mysql:host=".$config['dbhost'].";dbname=".$config['dbname']."", $config['dbuser'], $config['dbpass'], $options);
+		} catch (PDOException $e) {
 
-            $this->error = $e->getMessage();
-        }
-        echo $this->error;
-    }
+			$this->error = $e->getMessage();
+		}
+		echo $this->error;
+	}
 
-    /**
-     * @param string $bind
-     */
-    public function cleanup($bind) {
-        if ( ! is_array($bind)) {
-            if ( ! empty($bind))
-                $bind = array($bind);
-            else
-                $bind = array();
-        }
-        return $bind;
-    }
+	/**
+	 * @param string $bind
+	 */
+	public function cleanup($bind) {
+		if ( ! is_array($bind)) {
+			if ( ! empty($bind))
+				$bind = array($bind);
+			else
+				$bind = array();
+		}
+		return $bind;
+	}
 
-    public function run($sql, $bind = "") {
-        $this->sql = trim($sql);
-        $this->bind = $this->cleanup($bind);
-        $this->error = "";
+	public function run($sql, $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("select", "describe", "pragma")).") /i", $this->sql))
-                    return $pdostmt->fetchAll(PDO::FETCH_ASSOC);
-                elseif (preg_match("/^(".implode("|", array("delete", "insert", "update")).") /i", $this->sql))
-                    return $pdostmt->rowCount();
-            }
-        } catch (PDOException $e) {
-            $this->error = $e->getMessage();
-            return $this->error;
-        }
-    }
+		try {
+			$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("delete", "insert", "update")).") /i", $this->sql))
+					return $pdostmt->rowCount();
+			}
+		} catch (PDOException $e) {
+			$this->error = $e->getMessage();
+			return $this->error;
+		}
+	}
 
 }
 

Braces +10 added lines, -8 removed lines

@@ -52,10 +52,11 @@ 
      */
     public function cleanup($bind) {
         if ( ! is_array($bind)) {
-            if ( ! empty($bind))
-                $bind = array($bind);
-            else
-                $bind = array();
+            if ( ! empty($bind)) {
+                            $bind = array($bind);
+            } else {
+                            $bind = array();
+            }
         }
         return $bind;
     }
@@ -68,10 +69,11 @@ 
         try {
             $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("delete", "insert", "update")).") /i", $this->sql))
-                    return $pdostmt->rowCount();
+                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)) {
+                                    return $pdostmt->rowCount();
+                }
             }
         } catch (PDOException $e) {
             $this->error = $e->getMessage();

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";

Braces +3 added lines, -2 removed lines

@@ -154,8 +154,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 +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");
 		}
 	}
 

Braces +11 added lines, -8 removed lines

@@ -29,22 +29,25 @@
 	function logger($lib) {
 		$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');
+		if ($this->config['debug'] == '0') {
+					$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));
-			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/scripts/astpp.directory.php

Braces +4 added lines, -3 removed lines

@@ -28,10 +28,11 @@
 
 if (isset($_REQUEST['user']) && isset($_REQUEST['domain'])) {
 	$xml = load_directory($logger, $db);
-	if ($xml == "")
-		xml_not_found();
+	if ($xml == "") {
+			xml_not_found();
+	}
 	echo $xml;
-}else {
+} else {
 	xml_not_found();
 }
 $logger->log("*************************** Directory Ends **********************************");

freeswitch/fs/scripts/astpp.configuration.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	header('Content-Type: text/xml');
 	echo $xml;
 } elseif ($_REQUEST['key_value'] == 'acl.conf') {
-	$xml = load_acl($logger, $db,$config);
+	$xml = load_acl($logger, $db, $config);
 	header('Content-Type: text/xml');
 	echo $xml;
 } else {

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