iNextrix / ASTPP

freeswitch/fs/lib/astpp.cdr.php

Indentation +88 added lines, -88 removed lines

@@ -26,36 +26,36 @@ 
 {
 	//$logger->log(print_r($data,true));//exit;
 
-    //Initializing variables 
+	//Initializing variables 
 	$origination_rate = array();
 	$termination_rate = array();
 
-    //FS CDR variables 
+	//FS CDR variables 
 	$dataVariable = $data['variables'];
 
-    //FS CDR Call flow variables 
+	//FS CDR Call flow variables 
 	$dataCallflow = $data['callflow'];
 
-    //Get account id
+	//Get account id
 	$accountid = isset($dataVariable['account_id']) ? $dataVariable['account_id'] : '0';
 
-    //Get caller id name and number 
+	//Get caller id name and number 
 	$dataVariable['effective_caller_id_name'] = (isset($dataVariable['effective_caller_id_name'])) ? $dataVariable['effective_caller_id_name'] : $dataCallflow['caller_profile']['caller_id_name'];
 	$dataVariable['effective_caller_id_number'] = (isset($dataVariable['effective_caller_id_number'])) ? $dataVariable['effective_caller_id_number'] : $dataCallflow['caller_profile']['caller_id_number'];
 
 
-    if ($dataVariable['billsec'] == 0 && $dataVariable['hangup_cause'] == 'NORMAL_CLEARING')
-    {
-        $hangup_cause = isset($dataVariable['last_bridge_hangup_cause'])?$dataVariable['last_bridge_hangup_cause']:$dataVariable['hangup_cause'];
-    }else{
-        $hangup_cause = $dataVariable['hangup_cause'];
-    }   
+	if ($dataVariable['billsec'] == 0 && $dataVariable['hangup_cause'] == 'NORMAL_CLEARING')
+	{
+		$hangup_cause = isset($dataVariable['last_bridge_hangup_cause'])?$dataVariable['last_bridge_hangup_cause']:$dataVariable['hangup_cause'];
+	}else{
+		$hangup_cause = $dataVariable['hangup_cause'];
+	}   
 
-    if ($dataVariable['error_cdr'] == '1')
-    {
-        //Get actual hangup cause 
-        $hangup_cause= (isset($dataVariable['error_cdr'])) ? $dataVariable['last_bridge_hangup_cause'] : (isset($dataVariable['last_bridge_hangup_cause'])?$dataVariable['last_bridge_hangup_cause']:$dataVariable['hangup_cause']); 
-    }
+	if ($dataVariable['error_cdr'] == '1')
+	{
+		//Get actual hangup cause 
+		$hangup_cause= (isset($dataVariable['error_cdr'])) ? $dataVariable['last_bridge_hangup_cause'] : (isset($dataVariable['last_bridge_hangup_cause'])?$dataVariable['last_bridge_hangup_cause']:$dataVariable['hangup_cause']); 
+	}
 
 	/*#### PATCH FOR ONE WAY AUDIO ####*/
 	if ($hangup_cause == "NORMAL_UNSPECIFIED" && $dataVariable['billsec'] > 0)
@@ -64,13 +64,13 @@ 
 	}
 	/*#### ************* END *************####*/
 
-    //Don't thing this will be useful anytime. Need to remove it after testing. 
+	//Don't thing this will be useful anytime. Need to remove it after testing. 
 	if($hangup_cause == "NONE")
 	{
 		$hangup_cause = $dataVariable['current_application_data'];
 	}
 
-    $dataVariable['hangup_cause'] = $hangup_cause;
+	$dataVariable['hangup_cause'] = $hangup_cause;
 
 	if ( ($dataVariable['hangup_cause'] != 'NORMAL_CLEARING') && ($dataVariable['hangup_cause'] != 'ALLOTTED_TIMEOUT')) {
 	  	$dataVariable['billsec'] = 0;
@@ -85,22 +85,22 @@ 
 	$dataVariable['calltype'] = isset($dataVariable['calltype']) ? $dataVariable['calltype'] : "STANDARD";
 	$actual_calltype = $dataVariable['calltype'];
 	
-    //Normalize origination and termination rates array 		   
+	//Normalize origination and termination rates array 		   
 	if(isset($dataVariable['origination_rates']))
 	   $origination_rate = normalize_origination_rate($dataVariable['origination_rates']);
 	if(isset($dataVariable['termination_rates']))
 	   $termination_rate = normalize_rate($dataVariable['termination_rates']);
 
-    //If receiver account id found then explicitly set call direction and call type 
+	//If receiver account id found then explicitly set call direction and call type 
 	if(isset($dataVariable['receiver_accid']))
 	{
 		$dataVariable['call_direction'] = "outbound";
-        $dataVariable['calltype'] = "STANDARD";
+		$dataVariable['calltype'] = "STANDARD";
 	}
 
-    //Check if cusotmer have any package seconds left to use
+	//Check if cusotmer have any package seconds left to use
 	if ($actual_duration > 0)			
-    {
+	{
 			$package_array = package_calculation( $dataVariable['effective_destination_number'],$origination_rate[$accountid]['RATEGROUP'],$actual_duration,$dataVariable['call_direction'],$accountid,$db,$logger);
 			if(!empty($package_array))
 			{
@@ -109,20 +109,20 @@ 
 			}
 	}
 	
-    //Calculate debit of customer call 			
+	//Calculate debit of customer call 			
 	$debit = calc_cost($dataVariable,$origination_rate[$accountid],$logger,$decimal_points);
 
-    //Calculate cost for customer call for provider
+	//Calculate cost for customer call for provider
 	$provider_cost = calc_cost($dataVariable,$termination_rate,$logger,$decimal_points);
 
-    //Calculate parent cost if customer have any parent 
+	//Calculate parent cost if customer have any parent 
 	$parent_cost = ($parentid > 0) ? calc_cost($dataVariable,$origination_rate[$parentid],$logger,$decimal_points) : $provider_cost;
-    $logger->log("Debit :".$debit ." Cost : ".$cost ." Provider Cost : ".$parent_cost);
+	$logger->log("Debit :".$debit ." Cost : ".$cost ." Provider Cost : ".$parent_cost);
     
-    //Initialize final cost variable to use for billing
+	//Initialize final cost variable to use for billing
 	$cost = ($parent_cost > 0) ? $parent_cost : $provider_cost;    
 	
-    //Outbound call entry for all type of calls 
+	//Outbound call entry for all type of calls 
 	$logger->log("*********************** OUTBOUND CALL ENTRY START *************");
 
 	$cdr_string = get_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost,$logger);
@@ -131,60 +131,60 @@ 
 	$logger->log($query);
 	$db->run($query);
 	
-    //Update customer balance
+	//Update customer balance
 	if($debit > 0 && $dataVariable['calltype'] != "FREE")
 	{
 		update_balance($accountid, $debit, 0, $logger, $db);
 	}
 
-    //Update parent or provider balance
+	//Update parent or provider balance
 	if($parent_cost > 0){
 		update_balance($termination_rate['PROVIDER'], ($parent_cost * -1), 3, $logger, $db);
 	}
 
-    //Resellers CDR entry
-    $flag_parent = false;
-    insert_parent_data($dataVariable,$actual_calltype,$parentid,$origination_rate,$actual_duration,$provider_cost,$flag_parent,$logger,$db,$decimal_points);
+	//Resellers CDR entry
+	$flag_parent = false;
+	insert_parent_data($dataVariable,$actual_calltype,$parentid,$origination_rate,$actual_duration,$provider_cost,$flag_parent,$logger,$db,$decimal_points);
 
-    $logger->log("*********************** OUTBOUND CALL ENTRY END *************");
+	$logger->log("*********************** OUTBOUND CALL ENTRY END *************");
 
    
-    //************ ADDING EXTRA ENTRY For local/DID Inbound call ****************************
+	//************ ADDING EXTRA ENTRY For local/DID Inbound call ****************************
 	$receiver_parentid=0;
 	if(isset($dataVariable['receiver_accid']) && $dataVariable['receiver_accid'] != "")
 	{
-    	$logger->log("*********************** EXTRA ENTRY SECTION FOR BILLING START *************");            
+		$logger->log("*********************** EXTRA ENTRY SECTION FOR BILLING START *************");            
 
-        //Explicitly set call direction and call type 
+		//Explicitly set call direction and call type 
 		$dataVariable['call_direction'] = "inbound";
-        $dataVariable['calltype'] = "DID";
+		$dataVariable['calltype'] = "DID";
 
-        //Override variables if call for DID PSTN
-        if(isset($dataVariable['caller_did_account_id']))
-        {
-            $dataVariable['receiver_accid'] = $dataVariable['caller_did_account_id'];
-    		$dataVariable['call_direction'] = "outbound";
-            $dataVariable['calltype'] = "STANDARD";
-            unset($termination_rate);
-            unset($provider_cost);
-        }
+		//Override variables if call for DID PSTN
+		if(isset($dataVariable['caller_did_account_id']))
+		{
+			$dataVariable['receiver_accid'] = $dataVariable['caller_did_account_id'];
+			$dataVariable['call_direction'] = "outbound";
+			$dataVariable['calltype'] = "STANDARD";
+			unset($termination_rate);
+			unset($provider_cost);
+		}
         
 
-        //Get call receiver account information 
+		//Get call receiver account information 
 		$receiver_carddata = get_accounts($dataVariable['receiver_accid'],$logger,$db);
 		$receiver_parentid = $receiver_carddata['reseller_id'];
 
-        //For additional cdr entry of receiver
+		//For additional cdr entry of receiver
 		insert_extra_receiver_entry($dataVariable,$origination_rate,$termination_rate,$account_type,$actual_duration,$provider_cost,$receiver_parentid,$flag_parent,$dataVariable['receiver_accid'],$logger,$db,$decimal_points);
 
 		$flag_parent = true;
 		$dataVariable['uuid'] = $dataVariable['uuid'].$dataVariable['calltype']."_".$receiver_parentid;
 
-        //Insert parent reseller cdr
+		//Insert parent reseller cdr
 		insert_parent_data($dataVariable,$actual_calltype,$receiver_parentid,$origination_rate,$actual_duration,$provider_cost,$flag_parent,$logger,$db,$decimal_points);
-    	$logger->log("*********************** EXTRA ENTRY SECTION FOR BILLING END *************");            
+		$logger->log("*********************** EXTRA ENTRY SECTION FOR BILLING END *************");            
 	}
-    //*****************************************************************************************
+	//*****************************************************************************************
 	$logger->log("*************************** CDR ends ********************************");
 }
 
@@ -200,14 +200,14 @@ 
 
 		$debit = calc_cost($dataVariable,$origination_rate[$accountid],$logger,$decimal_points);
 
-        //If receiver account id found then explicitly set call direction and call type
-        /*if(isset($dataVariable['receiver_accid']))
+		//If receiver account id found then explicitly set call direction and call type
+		/*if(isset($dataVariable['receiver_accid']))
         {
             $dataVariable['call_direction'] = "outbound";
             $dataVariable['calltype'] = "STANDARD";
         }*/
 
-        //Check if reseller have any package seconds left to use        
+		//Check if reseller have any package seconds left to use        
 		if ($actual_duration > 0)		{
 			$package_array = package_calculation( $dataVariable['effective_destination_number'],$origination_rate[$accountid]['RATEGROUP'],$actual_duration,$dataVariable['call_direction'],$accountid,$db,$logger);
 			if(!empty($package_array))
@@ -217,7 +217,7 @@ 
 			}
 		}	
 
-        //Get parent id for cost calculation 
+		//Get parent id for cost calculation 
 		$parentid = $carddata['reseller_id'];
 		$parent_cost = ($parentid > 0) ? calc_cost($dataVariable,$origination_rate[$parentid],$logger,$decimal_points) : $provider_cost;
 		$cost = ($parent_cost > 0) ? $parent_cost : $provider_cost;
@@ -227,12 +227,12 @@ 
 			$logger->log("********* IN RESELLER FOR RECEIVER ENTRY START ******");
 			$flag_parent = true;
 			insert_extra_receiver_entry($dataVariable,$origination_rate,$termination_rate,$account_type,$actual_duration,$provider_cost,$parentid,$flag_parent,$accountid,$logger,$db,$decimal_points);
-    		$logger->log("********* IN RESELLER FOR RECEIVER ENTRY END ******");
+			$logger->log("********* IN RESELLER FOR RECEIVER ENTRY END ******");
 			return true;	
 
 		}else{
 
-		    $cdr_string = get_reseller_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost);	
+			$cdr_string = get_reseller_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost);	
 
  			$query = "INSERT INTO reseller_cdrs (uniqueid,accountid,callerid,callednum,billseconds,disposition,callstart,debit,cost,pricelist_id,package_id,pattern,notes,rate_cost,
 		reseller_id,reseller_code,reseller_code_destination,reseller_cost,call_direction,calltype) values ($cdr_string)";
@@ -302,7 +302,7 @@ 
 function get_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost,$logger)
 {
 
-        $dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER')?"DID":$dataVariable['calltype'];
+		$dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER')?"DID":$dataVariable['calltype'];
 
 		return  $cdr_string = "'".($dataVariable['uuid'])."','".$accountid."','".$account_type."','".(urldecode($dataVariable['caller_id']))."','".($dataVariable['effective_destination_number'])."','".$actual_duration."',".(($termination_rate['TRUNK']) ? $termination_rate['TRUNK'] : '0').",".(($dataVariable['sip_via_host']) ? "'".$dataVariable['sip_via_host']."'" : '').",".(($dataVariable['sip_contact_host']) ? "'".$dataVariable['sip_contact_host']."'" : '').",'".($dataVariable['hangup_cause'])."','".urldecode($dataVariable['callstart'])."','".$debit."','".$cost."',".(($termination_rate['PROVIDER']) ? $termination_rate['PROVIDER'] : '0').",'".$origination_rate[$accountid]['RATEGROUP']."','".$dataVariable['package_id']."','".($origination_rate[$accountid]['CODE'])."',".(($origination_rate[$accountid]['DESTINATION']) ? "'".htmlentities($origination_rate[$accountid]['DESTINATION'],ENT_COMPAT, 'UTF-8')."'" : "'".''."'").",".(($origination_rate[$accountid]['COST']) ? "'".$origination_rate[$accountid]['COST']."'" : "'".'0'."'").",
 '".$parentid."',".(($origination_rate[$parentid]['CODE'] ) ? "'".$origination_rate[$parentid]['CODE']."'" : "'".'0'."'").",".(($origination_rate[$parentid]['DESTINATION']) ?  "'".$origination_rate[$parentid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$parentid]['COST']) ?  "'".$origination_rate[$parentid]['COST']."'" :  '0').",".(($termination_rate['CODE']) ? "'".$termination_rate['CODE']."'" : "'".''."'" ).",
@@ -313,33 +313,33 @@ 
 //Generate CDR string for insert query for reseller
 function get_reseller_cdr_string($dataVariable,$accountid,$account_type,$actual_duration,$termination_rate,$origination_rate,$provider_cost,$parentid,$debit,$cost)
 {
-        $dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER')?"DID":$dataVariable['calltype'];
+		$dataVariable['calltype'] = ($dataVariable['calltype'] == 'DID-LOCAL' || $dataVariable['calltype'] == 'SIP-DID' || $dataVariable['calltype'] == 'OTHER')?"DID":$dataVariable['calltype'];
 	return $cdr_string = "'".($dataVariable['uuid'])."','".$accountid."','".(urldecode($dataVariable['caller_id']))."','".($dataVariable['effective_destination_number'])."','".$actual_duration."','".($dataVariable['hangup_cause'])."','".convert_to_gmt(urldecode($dataVariable['callstart']))."','".$debit."','".$cost."','".$origination_rate[$accountid]['RATEGROUP']."','".$dataVariable['package_id']."','".($origination_rate[$accountid]['CODE'])."',".(($origination_rate[$accountid]['DESTINATION']) ? "'".$origination_rate[$accountid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$accountid]['COST']) ? "'".$origination_rate[$accountid]['COST']."'" : "'".'0'."'").",'".$parentid."',".(($origination_rate[$parentid]['CODE'] ) ? "'".$origination_rate[$parentid]['CODE']."'" : "'".'0'."'").",".(($origination_rate[$parentid]['DESTINATION']) ?  "'".$origination_rate[$parentid]['DESTINATION']."'" : "'".''."'").",".(($origination_rate[$parentid]['COST']) ?  "'".$origination_rate[$parentid]['COST']."'" :  '0').",".(($dataVariable['call_direction']) ? "'".$dataVariable['call_direction']."'" : "'internal'").",'".($dataVariable['calltype'])."'";
 }
 
 //Update user balance
 function update_balance($user_id, $amount, $entity_id, $logger, $db) {
-    $math_sign = ($entity_id == 0 || $entity_id == 1) ? '-' : '+';
-    $query = "UPDATE accounts SET balance=balance-" . $amount . " WHERE id=" . $user_id;
-    $logger->log("Balance update : " . $query);
-    $db->run($query);
+	$math_sign = ($entity_id == 0 || $entity_id == 1) ? '-' : '+';
+	$query = "UPDATE accounts SET balance=balance-" . $amount . " WHERE id=" . $user_id;
+	$logger->log("Balance update : " . $query);
+	$db->run($query);
 }
 
 //Normalize rate string which we are getting from dialplan
 function normalize_rate($dataVariable)
 {
 	$rates = urldecode($dataVariable);
-    $data = explode("|",$rates);
+	$data = explode("|",$rates);
 
 	$newarray = array();
-    foreach($data as $key => $value)
-    {
-            $data1 = explode(":",$value);
-            foreach($data1 as $newkey => $newvalue)
-            {
-                    $newarray[$data1[0]] = $data1[$newkey];
-            }
-    }
+	foreach($data as $key => $value)
+	{
+			$data1 = explode(":",$value);
+			foreach($data1 as $newkey => $newvalue)
+			{
+					$newarray[$data1[0]] = $data1[$newkey];
+			}
+	}
 	return $newarray;
 }
 
@@ -373,19 +373,19 @@ 
 	$duration -= $rates['INCLUDEDSECONDS'];
 	if ($duration > 0 && ($dataVariable['hangup_cause'] == 'NORMAL_CLEARING' || $dataVariable['hangup_cause']  == 'ALLOTTED_TIMEOUT')) {
 
-    		$rates['INC'] = ($rates['INC'] == 0) ? 1 : $rates['INC'];
-            $call_cost = $rates['CONNECTIONCOST'];
-	    	$call_cost += ($rates['INITIALBLOCK'] * $rates['COST']) / 60;
-            $billseconds = $duration - $rates['INITIALBLOCK'];
+			$rates['INC'] = ($rates['INC'] == 0) ? 1 : $rates['INC'];
+			$call_cost = $rates['CONNECTIONCOST'];
+			$call_cost += ($rates['INITIALBLOCK'] * $rates['COST']) / 60;
+			$billseconds = $duration - $rates['INITIALBLOCK'];
     
-            if ($billseconds > 0)
-            {
-                $call_cost += (ceil($billseconds/$rates['INC'])*$rates['INC'])*($rates['COST']/60);
-            }
-    }
-    $call_cost = number_format($call_cost,$decimal_points);
-    $logger->log("Return cost ".$call_cost);
-    return $call_cost;
+			if ($billseconds > 0)
+			{
+				$call_cost += (ceil($billseconds/$rates['INC'])*$rates['INC'])*($rates['COST']/60);
+			}
+	}
+	$call_cost = number_format($call_cost,$decimal_points);
+	$logger->log("Return cost ".$call_cost);
+	return $call_cost;
 }
 
 // get intial package information
@@ -434,9 +434,9 @@ 
 	$counter = $db->run($query_counter);
 	$logger->log("GET Counters  : " . $query_counter);
 	if($counter)
-	    return $counter[0];	
+		return $counter[0];	
 	else
-	    return "";
+		return "";
 }
 
 //Get user info

freeswitch/fs/lib/astpp.logger.php

Indentation +20 added lines, -20 removed lines

@@ -23,29 +23,29 @@
 
 class logger {
 
-    var $fp;
-    var $config;
+	var $fp;
+	var $config;
 
-    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');
-    }
+	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');
+	}
 
-    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");
-        }
-    }
+	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");
+		}
+	}
 
-    function close() {
-        if ($this->config['debug'] == '0')
-            fclose($this->fp);
-    }
+	function close() {
+		if ($this->config['debug'] == '0')
+			fclose($this->fp);
+	}
 
 }
 

freeswitch/fs/lib/astpp.lib.php

Indentation +8 added lines, -8 removed lines

@@ -23,16 +23,16 @@
 
 class lib {
 
-    var $config;
+	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)
-            $this->config[$res_conf_value['name']] = $res_conf_value['value'];
+	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'];
 
-        return $this->config;
-    }
+		return $this->config;
+	}
 
 }
 

freeswitch/fs/scripts/astpp.configuration.php

Indentation +7 added lines, -7 removed lines

@@ -25,15 +25,15 @@
 
 $xml = "";
 if ($_REQUEST['key_value'] == 'sofia.conf') {
-    $xml = load_sofia($logger, $db);
-    header('Content-Type: text/xml');
-    echo $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');
-    echo $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 **********************************");
 exit();

freeswitch/fs/scripts/astpp.directory.php

Indentation +5 added lines, -5 removed lines

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

web_interface/astpp/application/modules/user/views/view_user_subscriptions_list.php

Indentation +2 added lines, -2 removed lines

@@ -22,12 +22,12 @@
                 <div class="pull-left">
                     <ul class="breadcrumb">
                          <?php $accountinfo=$this->session->userdata('accountinfo');
-                          if($accountinfo['type']==1){ ?>
+						  if($accountinfo['type']==1){ ?>
                           <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
                           <?php }else{ ?>
 			    <li><a href="#">Configuration</a></li>
                           <?php }
-                    ?>
+					?>
                         
                         <li class='active'>
                             <a href="<?= base_url() . "user/user_ipmap/"; ?>">IP Settings</a>

web_interface/astpp/application/modules/user/views/view_user_animap.php

Indentation +2 added lines, -2 removed lines

@@ -22,12 +22,12 @@
                 <div class="pull-left">
                     <ul class="breadcrumb">
                          <?php $accountinfo=$this->session->userdata('accountinfo');
-                          if($accountinfo['type']==1){ ?>
+						  if($accountinfo['type']==1){ ?>
                           <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
                           <?php }else{ ?>
 			    <li><a href="#">Configuration</a></li>
                           <?php }
-                    ?>
+					?>
                         
                         <li class='active'>
                             <a href="<?= base_url() . "user/user_ipmap/"; ?>">IP Settings</a>

web_interface/astpp/application/modules/user/views/view_user_fund_transfer.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
         <div class="w-section inverse no-padding">

             <?php echo $form; ?>

             <?php

-            if(isset($validation_errors) && $validation_errors != ''){ ?>

+			if(isset($validation_errors) && $validation_errors != ''){ ?>

                 <script>

                 var ERR_STR = '<?php echo $validation_errors; ?>';

                 print_error(ERR_STR);

web_interface/astpp/application/modules/user/views/view_user_sipdevices_list.php

Indentation +2 added lines, -2 removed lines

@@ -22,12 +22,12 @@
                 <div class="pull-left">
                     <ul class="breadcrumb">
                          <?php $accountinfo=$this->session->userdata('accountinfo');
-                          if($accountinfo['type']==1){ ?>
+						  if($accountinfo['type']==1){ ?>
                           <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
                           <?php }else{ ?>
 			    <li><a href="#">Configuration</a></li>
                           <?php }
-                    ?>
+					?>
                         
                         <li class='active'>
                             <a href="<?= base_url() . "user/user_ipmap/"; ?>">IP Settings</a>