iNextrix / ASTPP

web_interface/astpp/system/helpers/captcha_helper.php

Braces +1 added lines, -2 removed lines

@@ -207,8 +207,7 @@
 				$y = rand(0, $img_height / 2);
 				imagestring($im, $font_size, $x, $y, substr($word, $i, 1), $text_color);
 				$x += ($font_size * 2);
-			}
-			else
+			} else
 			{
 				$y = rand($img_height / 2, $img_height - 3);
 				imagettftext($im, $font_size, $angle, $x, $y, $text_color, $font_path, substr($word, $i, 1));

web_interface/astpp/system/helpers/template_inheritance_helper.php

Spacing +3 added lines, -3 removed lines

@@ -236,7 +236,7 @@ 
 
 That's it for now. If you have questions, ideas or problems, please write me at daniel AT dornhardt.com.
 */
-	if (! defined('TI_VIEWS_DIR') ) {
+	if ( ! defined('TI_VIEWS_DIR')) {
 		if (defined('APPPATH')) {
 			define('TI_VIEWS_DIR', APPPATH.'views/');
 		} else {
@@ -285,7 +285,7 @@ 
 			$GLOBALS['CI']->load->view($GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
 		}
 		else {
-			include realpath( TI_VIEWS_DIR . $GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
+			include realpath(TI_VIEWS_DIR.$GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
 		}
 	}
 
@@ -371,7 +371,7 @@ 
 	 */
 	function block_rendering_neccessary() {
 		// check if no child did override this block
-		if (!array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'] )) {
+		if ( ! array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'])) {
 			return true;
 		}
 		// check if there is an extension marker in the child blocks data. If so, the

Braces +1 added lines, -2 removed lines

@@ -283,8 +283,7 @@
 		//echo 'tttttttttttt';
 		if (isset($GLOBALS['CI'])) {
 			$GLOBALS['CI']->load->view($GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
-		}
-		else {
+		} else {
 			include realpath( TI_VIEWS_DIR . $GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
 		}
 	}

web_interface/astpp/system/helpers/form_helper.php

Spacing +47 added lines, -47 removed lines

@@ -80,11 +80,11 @@ 
 		return $form;

 	}

 }

-if(!function_exists('form_breadcrumb')){

-	function form_breadcrumb($info=''){

-	 $form=false;

-	 if(!empty($info))

- 	$form.="<div class='breadcrumb'>

+if ( ! function_exists('form_breadcrumb')) {

+	function form_breadcrumb($info = '') {

+	 $form = false;

+	 if ( ! empty($info))

+ 	$form .= "<div class='breadcrumb'>

 	        <a href='".$info['url']."'>".$info['name']."</a>

 		</div>";

 	return $form;

@@ -212,7 +212,7 @@ 
                    		</span>

                    </div>

                </div>';

-		}else{

+		} else {

 			return "<div class='col-md-5 no-padding'><image "._parse_form_attributes($data, $defaults).$extra." /></div>";

 		}	

 		

@@ -226,7 +226,7 @@ 
 	{

 				//  echo '<pre>'; print_r($data); exit;

 			//$data["class"] = "col-md-5 form-control";

-			$data['value']='Delete';

+			$data['value'] = 'Delete';

 		$defaults = array('type' => 'button', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => 'Delete');

 

 		return "<div class='col-md-5 no-padding'><input "._parse_form_attributes($data, $defaults).$extra." /></div>";

@@ -377,21 +377,21 @@ 
 

 		if ($extra != '') $extra = ' '.$extra;

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

-				if(is_array($name)){

-					 $str=null;

-					 foreach($name as $key=>$value){

-					  if($key !='class' && $key!='disabled')

-					  $str.=$key."='$value' ";

+				if (is_array($name)) {

+					 $str = null;

+					 foreach ($name as $key=>$value) {

+					  if ($key != 'class' && $key != 'disabled')

+					  $str .= $key."='$value' ";

 					 }

-					 if(isset($name['disabled']) && $name['disabled']== 'disabled'){

-					  $str.='disabled = "disabled"';

+					 if (isset($name['disabled']) && $name['disabled'] == 'disabled') {

+					  $str .= 'disabled = "disabled"';

 					 }

 							   $form = '<select '.$str." class='col-md-5 form-control selectpicker ".$name['class'].$extra."' data-live-search='true'>\n";

-				}else{

-					if(!empty($extra)){

-						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker ".$extra."' data-live-search='true'>\n";

-					}else{

-						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker' data-live-search='true'>\n";

+				} else {

+					if ( ! empty($extra)) {

+						$form = '<select  name="'.$name.'"'.$multiple." class='col-md-5 form-control selectpicker ".$extra."' data-live-search='true'>\n";

+					} else {

+						$form = '<select  name="'.$name.'"'.$multiple." class='col-md-5 form-control selectpicker' data-live-search='true'>\n";

 					}

 				}

 //                if($extra != '' ){

@@ -418,12 +418,12 @@ 
 			{

 				$sel = (in_array($key, $selected)) ? ' selected="selected"' : '';

 

-				$form .= '<option value="'.$key.'"'.$sel.'>'.(string) $val."</option>\n";

+				$form .= '<option value="'.$key.'"'.$sel.'>'.(string)$val."</option>\n";

 			}

 		}

-				if(isset($name['option_value']) && isset($name['option_text'])){

-		  $sel= isset($name['value']) && $name['value']==$name['option_value']?'selected ="selected"':'';

-		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string) $name['option_text']."</option>\n";

+				if (isset($name['option_value']) && isset($name['option_text'])) {

+		  $sel = isset($name['value']) && $name['value'] == $name['option_value'] ? 'selected ="selected"' : '';

+		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string)$name['option_text']."</option>\n";

 				}

 		$form .= '</select>';

 //echo $form; exit;

@@ -449,21 +449,21 @@ 
 			}

 		}

 		if ($extra != '') $extra = ' '.$extra;

-				$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

+				$class = isset($name['class']) && ! empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" : "col-md-5 form-control selectpicker";

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

-		if(is_array($name) && !isset($name["id"])){

+		if (is_array($name) && ! isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'"'." class='$class' data-live-search='true'>\n";

-				}else if(is_array($name) && isset($name["id"])){

+				} else if (is_array($name) && isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='$class' data-live-search='true'>\n";

 				}

-				else{

-					$form = '<select name="'.$name.'"' .$multiple." class='$class' data-live-search='true'>\n";

+				else {

+					$form = '<select name="'.$name.'"'.$multiple." class='$class' data-live-search='true'>\n";

 				}   

 

 		$form .= '<option value=""> --Select-- </option>';

 		foreach ($options as $key => $val)

 		{

-			$key = (string) $key;

+			$key = (string)$key;

 

 			if (is_array($val) && ! empty($val))

 			{

@@ -481,12 +481,12 @@ 
 			{

 				$sel = (in_array($key, $selected)) ? ' selected="selected"' : '';

 

-				$form .= '<option value="'.$key.'"'.$sel.'>'.(string) $val."</option>\n";

+				$form .= '<option value="'.$key.'"'.$sel.'>'.(string)$val."</option>\n";

 			}

 		}

-				if(isset($name['option_value']) && isset($name['option_text'])){

-		  $sel= isset($name['value']) && $name['value']==$name['option_value']?'selected ="selected"':'';

-		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string) $name['option_text']."</option>\n";

+				if (isset($name['option_value']) && isset($name['option_text'])) {

+		  $sel = isset($name['value']) && $name['value'] == $name['option_value'] ? 'selected ="selected"' : '';

+		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string)$name['option_text']."</option>\n";

 				}

 		$form .= '</select>';

 

@@ -517,35 +517,35 @@ 
 		/*

 		  ASTPP  3.0  For Search Display In

 		*/

-		if ($extra != '' && !is_array($extra)) $extra = ' '.$extra;

+		if ($extra != '' && ! is_array($extra)) $extra = ' '.$extra;

 			/**********************************************************/

 

-		$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

+		$class = isset($name['class']) && ! empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" : "col-md-5 form-control selectpicker";

 

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

 				/*

 		  ASTPP  3.0  For Search Display In

 		*/

-				if(empty($extra)){

+				if (empty($extra)) {

 				/*********************************/

-		if(is_array($name) && !isset($name["id"])){

+		if (is_array($name) && ! isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'"'." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

-				}else if(is_array($name) && isset($name["id"])){

+				} else if (is_array($name) && isset($name["id"])) {

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

-				}else{

-					$form = '<select name="'.$name.'"' .$multiple." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

+				} else {

+					$form = '<select name="'.$name.'"'.$multiple." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

 				}   

  /*

 		  ASTPP  3.0  For Search Display In

 		*/

-				}else{

+				} else {

 

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='".$extra['class']." $class' style='".$extra['style']."' data-live-search='true'>\n";

 				 }

 		//$form .= '<option value=""> --Select-- </option>';

 		foreach ($options as $key => $val)

 		{

-			$key = (string) $key;

+			$key = (string)$key;

 

 			if (is_array($val) && ! empty($val))

 			{

@@ -685,13 +685,13 @@ 
 		{

 			unset($defaults['checked']);

 		}

-		$class=NULL;

+		$class = NULL;

 

 //echo "<pre>".$value; print_r($extra); exit;

-		if(isset($extra[$value]) && !empty($extra) && $extra[$value] == '0'){

-		$class='onoffswitch-inner';

-		}else{

-		$class='onoffswitch-inner';

+		if (isset($extra[$value]) && ! empty($extra) && $extra[$value] == '0') {

+		$class = 'onoffswitch-inner';

+		} else {

+		$class = 'onoffswitch-inner';

  		}

 /*            if(isset($extra) && $extra != ''){

 	      if(isset($extra[0])){

Braces +25 added lines, -18 removed lines

@@ -83,10 +83,11 @@ 
 if(!function_exists('form_breadcrumb')){

 	function form_breadcrumb($info=''){

 	 $form=false;

-	 if(!empty($info))

- 	$form.="<div class='breadcrumb'>

+	 if(!empty($info)) {
+	  	$form.="<div class='breadcrumb'>

 	        <a href='".$info['url']."'>".$info['name']."</a>

-		</div>";

+		</div>";
+	 }
 	return $form;

 	}

 }

@@ -212,7 +213,7 @@ 
                    		</span>

                    </div>

                </div>';

-		}else{

+		} else{

 			return "<div class='col-md-5 no-padding'><image "._parse_form_attributes($data, $defaults).$extra." /></div>";

 		}	

 		

@@ -375,22 +376,25 @@ 
 			}

 		}

 

-		if ($extra != '') $extra = ' '.$extra;

+		if ($extra != '') {
+			$extra = ' '.$extra;
+		}
 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

 				if(is_array($name)){

 					 $str=null;

 					 foreach($name as $key=>$value){

-					  if($key !='class' && $key!='disabled')

-					  $str.=$key."='$value' ";

+					  if($key !='class' && $key!='disabled') {
+					  					  $str.=$key."='$value' ";
+					  }
 					 }

 					 if(isset($name['disabled']) && $name['disabled']== 'disabled'){

 					  $str.='disabled = "disabled"';

 					 }

 							   $form = '<select '.$str." class='col-md-5 form-control selectpicker ".$name['class'].$extra."' data-live-search='true'>\n";

-				}else{

+				} else{

 					if(!empty($extra)){

 						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker ".$extra."' data-live-search='true'>\n";

-					}else{

+					} else{

 						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker' data-live-search='true'>\n";

 					}

 				}

@@ -448,15 +452,16 @@ 
 				$selected = array($_POST[$name]);

 			}

 		}

-		if ($extra != '') $extra = ' '.$extra;

+		if ($extra != '') {
+			$extra = ' '.$extra;
+		}
 				$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

 		if(is_array($name) && !isset($name["id"])){

 					$form = '<select name="'.$name['name'].'"'." class='$class' data-live-search='true'>\n";

-				}else if(is_array($name) && isset($name["id"])){

+				} else if(is_array($name) && isset($name["id"])){

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='$class' data-live-search='true'>\n";

-				}

-				else{

+				} else{

 					$form = '<select name="'.$name.'"' .$multiple." class='$class' data-live-search='true'>\n";

 				}   

 

@@ -517,7 +522,9 @@ 
 		/*

 		  ASTPP  3.0  For Search Display In

 		*/

-		if ($extra != '' && !is_array($extra)) $extra = ' '.$extra;

+		if ($extra != '' && !is_array($extra)) {
+			$extra = ' '.$extra;
+		}
 			/**********************************************************/

 

 		$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

@@ -530,15 +537,15 @@ 
 				/*********************************/

 		if(is_array($name) && !isset($name["id"])){

 					$form = '<select name="'.$name['name'].'"'." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

-				}else if(is_array($name) && isset($name["id"])){

+				} else if(is_array($name) && isset($name["id"])){

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

-				}else{

+				} else{

 					$form = '<select name="'.$name.'"' .$multiple." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

 				}   

  /*

 		  ASTPP  3.0  For Search Display In

 		*/

-				}else{

+				} else{

 

 					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='".$extra['class']." $class' style='".$extra['style']."' data-live-search='true'>\n";

 				 }

@@ -690,7 +697,7 @@ 
 //echo "<pre>".$value; print_r($extra); exit;

 		if(isset($extra[$value]) && !empty($extra) && $extra[$value] == '0'){

 		$class='onoffswitch-inner';

-		}else{

+		} else{

 		$class='onoffswitch-inner';

  		}

 /*            if(isset($extra) && $extra != ''){

freeswitch/fs/lib/astpp.lib.php

Braces +3 added lines, -2 removed lines

@@ -28,8 +28,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

Indentation +80 added lines, -80 removed lines

@@ -24,97 +24,97 @@ 
 
 //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);
+	//decode string using urldecode
+	$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);
-        }
-    }
-    return $rates_array_info;
+		foreach ($rates_array as $key => $value) {
+			$rates_array_info[$user_id][$constant_array[substr($value, 0, 3)]] = substr($value, 3);
+		}
+	}
+	return $rates_array_info;
 }
 
 //Process package 
 function process_package($xml_cdr, $user_id, $rates_array, $logger, $db) {
-    $duration = $xml_cdr->variables->duration;
-    $xml_cdr->variables->package_id = 0;
-    $flag = false;
-    if ($duration > 0 && $xml_cdr->variables->call_direction == 'outbound') {
-        $destination_number = $xml_cdr->variables->effective_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 ";
-            $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);
-
-        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;
-
-                $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);
-                    }
-                    $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);
-
-                    break;
-                }
-            }
-        }
-    }
-    return array($duration, $flag);
+	$duration = $xml_cdr->variables->duration;
+	$xml_cdr->variables->package_id = 0;
+	$flag = false;
+	if ($duration > 0 && $xml_cdr->variables->call_direction == 'outbound') {
+		$destination_number = $xml_cdr->variables->effective_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 ";
+			$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);
+
+		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;
+
+				$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);
+					}
+					$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);
+
+					break;
+				}
+			}
+		}
+	}
+	return array($duration, $flag);
 }
 
 //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)";
+	$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)";
+	$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
@@ -122,19 +122,19 @@ 
  * @param integer $entity_id
  */
 function update_balance($user_id, $amount, $entity_id, $logger, $db) {
-    if ($amount > 0) {
-        $math_sign = ($entity_id == 0 || $entity_id == 1) ? '-' : '+';
-        $query = "UPDATE tbl_users SET credit=credit$math_sign".$amount." WHERE id=".$user_id;
-        $logger->log("Balance update : ".$query);
-        $db->run($query);
-    }
+	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);
+	}
 }
 
 //Get user info
 function get_user_info($parent_id, $db) {
-    $query = "SELECT * FROM tbl_users WHERE id=".$parent_id;
-    $res_user = $db->run($query);
-    return $res_user[0];
+	$query = "SELECT * FROM tbl_users WHERE id=".$parent_id;
+	$res_user = $db->run($query);
+	return $res_user[0];
 }
 
 ?>

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

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

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 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);
+	$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.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.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 {