iNextrix / ASTPP

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.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 **********************************");

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	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 {

web_interface/astpp/application/modules/rates/views/view_import_termination_rate_mapper.php

Indentation +55 added lines, -55 removed lines

@@ -7,19 +7,19 @@ 
    });
 </script> <script type="text/javascript" language="javascript"><?
    if (isset($mapto_fields) && !empty($mapto_fields)) {
-    foreach($mapto_fields as $csv_key => $csv_value) {
-    echo '$("#'.$csv_value .'-prefix").live("change", function () {';
-    echo 'var select = document.getElementById("'.$csv_value .'-select");';
-    echo 'var answer = select.options[select.selectedIndex].value;';
-    echo 'document.getElementById("'.$csv_value .'-display").value =  (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
-    echo '});';
-    echo '$("#'.$csv_value .'-select").live("change", function () {';
-    echo 'var select = document.getElementById("'.$csv_value .'-select");';
-    echo 'var answer = select.options[select.selectedIndex].value;';
-    echo 'document.getElementById("'.$csv_value .'-display").value = (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
-    echo '});';
-    }
-    }
+	foreach($mapto_fields as $csv_key => $csv_value) {
+	echo '$("#'.$csv_value .'-prefix").live("change", function () {';
+	echo 'var select = document.getElementById("'.$csv_value .'-select");';
+	echo 'var answer = select.options[select.selectedIndex].value;';
+	echo 'document.getElementById("'.$csv_value .'-display").value =  (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
+	echo '});';
+	echo '$("#'.$csv_value .'-select").live("change", function () {';
+	echo 'var select = document.getElementById("'.$csv_value .'-select");';
+	echo 'var answer = select.options[select.selectedIndex].value;';
+	echo 'document.getElementById("'.$csv_value .'-display").value = (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
+	echo '});';
+	}
+	}
    ?></script>
 <?
    if (isset($csv_tmp_data) && !empty($csv_tmp_data)) {
@@ -27,7 +27,7 @@ 
    echo 'var csv_tmp_data = ' . json_encode($csv_tmp_data) . ';';
    echo '</script>';
    }
-    ?>
+	?>
 <?php
    endblock() ?>
 <?php
@@ -50,9 +50,9 @@ 
                   <div class="w-box">
                      <span  style="margin-left:10px; text-align: center;background-color: none;color:#DD191D;">
                      <?php
-                        if (isset($error) && !empty($error)) {
-                        	echo $error;
-                        } ?>
+						if (isset($error) && !empty($error)) {
+							echo $error;
+						} ?>
                      </span>
                      <h3 class="padding-t-10 padding-l-16">You must either select a field from your file OR provide a default value for the following fields:</h3>
                      <p>Code,Destination,Connect Cost,Included Seconds,Per Minute Cost,Increment,Precedence,Strip,Prepend.</p>
@@ -66,10 +66,10 @@ 
                            <label class="col-md-3">Trunk List:</label>
                            <div class="col-md-8">
                               <?php
-                                 $trunklist = form_dropdown('trunk_id', $this->db_model->build_dropdown("id,name", "trunks", "where_arr", array(
-                                 	"status " => "0"
-                                 )) , '');
-                                 echo $trunklist; ?>
+								 $trunklist = form_dropdown('trunk_id', $this->db_model->build_dropdown("id,name", "trunks", "where_arr", array(
+								 	"status " => "0"
+								 )) , '');
+								 echo $trunklist; ?>
                            </div>
                         </div>
 
@@ -134,28 +134,28 @@ 
                   </thead>
                   <tbody>
                      <?php
-                        foreach($mapto_fields as $csv_key => $csv_value) {
+						foreach($mapto_fields as $csv_key => $csv_value) {
 
-                        		echo "<tr>";
-                        		echo "<td>" . $csv_key . '(' . $csv_value . ")</td>";
-                        		echo "<td><input type='text' name='".$csv_value ."-prefix' id='".$csv_value ."-prefix'></td>";
-                        		echo "<td>";
-                        		echo "<select name='".$csv_value ."-select' id='".$csv_value ."-select'>";
-                        		?>
+								echo "<tr>";
+								echo "<td>" . $csv_key . '(' . $csv_value . ")</td>";
+								echo "<td><input type='text' name='".$csv_value ."-prefix' id='".$csv_value ."-prefix'></td>";
+								echo "<td>";
+								echo "<select name='".$csv_value ."-select' id='".$csv_value ."-select'>";
+								?>
                      <option value=""></option>
                      <?php
-                        $keys = array_keys($file_data);
-                        for ($i = 0; $i < count($file_data); $i++) { ?>
+						$keys = array_keys($file_data);
+						for ($i = 0; $i < count($file_data); $i++) { ?>
                      <option value="<?php
-                        echo $file_data[$i]; ?>"><?php
-                        echo $file_data[$i]; ?></option>
+						echo $file_data[$i]; ?>"><?php
+						echo $file_data[$i]; ?></option>
                      <?php
-                        }
-                        echo "</td>";
-                        echo "<td><input type='text' name='".$csv_value ."-display' id='".$csv_value ."-display'></td>";
-                        echo "</tr>";
+						}
+						echo "</td>";
+						echo "<td><input type='text' name='".$csv_value ."-display' id='".$csv_value ."-display'></td>";
+						echo "</tr>";
 
-                        } ?>
+						} ?>
                   </tbody>
                </table>
                <input type="hidden" name="trunkid" value="<?php echo $trunkid ?>" />
@@ -167,30 +167,30 @@ 
                <H2> Import File Data..</H2>
                <table width="100%" border="1"  class="details_table">
                   <?php
-                     $cnt = 1;
-                     foreach($csv_tmp_data as $csv_key => $csv_value) {
-                     	if ($csv_key < 15) {
-                     		echo "<tr>";
-                     		foreach($csv_value as $field_name => $field_val) {
-                     			if ($csv_key == 0) {
+					 $cnt = 1;
+					 foreach($csv_tmp_data as $csv_key => $csv_value) {
+					 	if ($csv_key < 15) {
+					 		echo "<tr>";
+					 		foreach($csv_value as $field_name => $field_val) {
+					 			if ($csv_key == 0) {
 
-                     				 echo "<th>".ucfirst($field_val)."</th>";
+					 				 echo "<th>".ucfirst($field_val)."</th>";
 
-                     			}
-                     			else {
-                     				echo "<td class='portlet-content'>" . $field_val . "</td>";
-                     				$cnt++;
-                     			}
-                     		}
+					 			}
+					 			else {
+					 				echo "<td class='portlet-content'>" . $field_val . "</td>";
+					 				$cnt++;
+					 			}
+					 		}
 
-                     		echo "</tr>";
-                     	}
-                     }
+					 		echo "</tr>";
+					 	}
+					 }
 
-                     echo "<tr><td colspan='" . $cnt . "'>
+					 echo "<tr><td colspan='" . $cnt . "'>
                                             <a href='" . base_url() . "rates/termination_rate_list/'><input type='button' class='btn btn-line-sky pull-right  margin-x-10' value='Back'/></a>
                                             <input type='submit' class='btn btn-line-parrot pull-right'' id='Process' value='Process Records'/></td></tr>";
-                     ?>
+					 ?>
                </table>
             </form>
          </div>

Spacing +25 added lines, -25 removed lines

@@ -6,25 +6,25 @@ 
    $(document).ready(function() {
    });
 </script> <script type="text/javascript" language="javascript"><?
-   if (isset($mapto_fields) && !empty($mapto_fields)) {
-    foreach($mapto_fields as $csv_key => $csv_value) {
-    echo '$("#'.$csv_value .'-prefix").live("change", function () {';
-    echo 'var select = document.getElementById("'.$csv_value .'-select");';
+   if (isset($mapto_fields) && ! empty($mapto_fields)) {
+    foreach ($mapto_fields as $csv_key => $csv_value) {
+    echo '$("#'.$csv_value.'-prefix").live("change", function () {';
+    echo 'var select = document.getElementById("'.$csv_value.'-select");';
     echo 'var answer = select.options[select.selectedIndex].value;';
-    echo 'document.getElementById("'.$csv_value .'-display").value =  (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
+    echo 'document.getElementById("'.$csv_value.'-display").value =  (!answer) ? document.getElementById("'.$csv_value.'-prefix").value : document.getElementById("'.$csv_value.'-prefix").value + csv_tmp_data[2][answer];';
     echo '});';
-    echo '$("#'.$csv_value .'-select").live("change", function () {';
-    echo 'var select = document.getElementById("'.$csv_value .'-select");';
+    echo '$("#'.$csv_value.'-select").live("change", function () {';
+    echo 'var select = document.getElementById("'.$csv_value.'-select");';
     echo 'var answer = select.options[select.selectedIndex].value;';
-    echo 'document.getElementById("'.$csv_value .'-display").value = (!answer) ? document.getElementById("'.$csv_value .'-prefix").value : document.getElementById("'.$csv_value .'-prefix").value + csv_tmp_data[2][answer];';
+    echo 'document.getElementById("'.$csv_value.'-display").value = (!answer) ? document.getElementById("'.$csv_value.'-prefix").value : document.getElementById("'.$csv_value.'-prefix").value + csv_tmp_data[2][answer];';
     echo '});';
     }
     }
    ?></script>
 <?
-   if (isset($csv_tmp_data) && !empty($csv_tmp_data)) {
+   if (isset($csv_tmp_data) && ! empty($csv_tmp_data)) {
    echo '<script>';
-   echo 'var csv_tmp_data = ' . json_encode($csv_tmp_data) . ';';
+   echo 'var csv_tmp_data = '.json_encode($csv_tmp_data).';';
    echo '</script>';
    }
     ?>
@@ -40,7 +40,7 @@ 
 <?php
    startblock('content') ?>
 <?php
-   if (!isset($csv_tmp_data)) { ?>
+   if ( ! isset($csv_tmp_data)) { ?>
 <section class="slice color-three padding-t-20">
    <div class="w-section inverse no-padding">
       <div class="container">
@@ -50,7 +50,7 @@ 
                   <div class="w-box">
                      <span  style="margin-left:10px; text-align: center;background-color: none;color:#DD191D;">
                      <?php
-                        if (isset($error) && !empty($error)) {
+                        if (isset($error) && ! empty($error)) {
                         	echo $error;
                         } ?>
                      </span>
@@ -68,7 +68,7 @@ 
                               <?php
                                  $trunklist = form_dropdown('trunk_id', $this->db_model->build_dropdown("id,name", "trunks", "where_arr", array(
                                  	"status " => "0"
-                                 )) , '');
+                                 )), '');
                                  echo $trunklist; ?>
                            </div>
                         </div>
@@ -100,7 +100,7 @@ 
             <div class="col-md-12 padding-b-10">
                <div class="pull-right">
                   <input class="btn btn-line-parrot" id="import_terminationrate" type="submit" name="action" value="Import" />
-                  <a href="<?php echo base_url() . 'rates/termination_rate_list/' ?>" >
+                  <a href="<?php echo base_url().'rates/termination_rate_list/' ?>" >
                   <input class="btn btn-line-sky margin-x-10" id="ok" type="button" name="action" value="Cancel"/>
                   </a>
                </div>
@@ -113,7 +113,7 @@ 
 <?php
    } ?>
 <?php
-   if (isset($csv_tmp_data) && !empty($csv_tmp_data)) { ?>
+   if (isset($csv_tmp_data) && ! empty($csv_tmp_data)) { ?>
 <section class="slice color-three padding-b-20">
    <div class="w-section inverse no-padding">
       <div class="container">
@@ -134,13 +134,13 @@ 
                   </thead>
                   <tbody>
                      <?php
-                        foreach($mapto_fields as $csv_key => $csv_value) {
+                        foreach ($mapto_fields as $csv_key => $csv_value) {
 
                         		echo "<tr>";
-                        		echo "<td>" . $csv_key . '(' . $csv_value . ")</td>";
-                        		echo "<td><input type='text' name='".$csv_value ."-prefix' id='".$csv_value ."-prefix'></td>";
+                        		echo "<td>".$csv_key.'('.$csv_value.")</td>";
+                        		echo "<td><input type='text' name='".$csv_value."-prefix' id='".$csv_value."-prefix'></td>";
                         		echo "<td>";
-                        		echo "<select name='".$csv_value ."-select' id='".$csv_value ."-select'>";
+                        		echo "<select name='".$csv_value."-select' id='".$csv_value."-select'>";
                         		?>
                      <option value=""></option>
                      <?php
@@ -152,7 +152,7 @@ 
                      <?php
                         }
                         echo "</td>";
-                        echo "<td><input type='text' name='".$csv_value ."-display' id='".$csv_value ."-display'></td>";
+                        echo "<td><input type='text' name='".$csv_value."-display' id='".$csv_value."-display'></td>";
                         echo "</tr>";
 
                         } ?>
@@ -168,17 +168,17 @@ 
                <table width="100%" border="1"  class="details_table">
                   <?php
                      $cnt = 1;
-                     foreach($csv_tmp_data as $csv_key => $csv_value) {
+                     foreach ($csv_tmp_data as $csv_key => $csv_value) {
                      	if ($csv_key < 15) {
                      		echo "<tr>";
-                     		foreach($csv_value as $field_name => $field_val) {
+                     		foreach ($csv_value as $field_name => $field_val) {
                      			if ($csv_key == 0) {
 
                      				 echo "<th>".ucfirst($field_val)."</th>";
 
                      			}
                      			else {
-                     				echo "<td class='portlet-content'>" . $field_val . "</td>";
+                     				echo "<td class='portlet-content'>".$field_val."</td>";
                      				$cnt++;
                      			}
                      		}
@@ -187,8 +187,8 @@ 
                      	}
                      }
 
-                     echo "<tr><td colspan='" . $cnt . "'>
-                                            <a href='" . base_url() . "rates/termination_rate_list/'><input type='button' class='btn btn-line-sky pull-right  margin-x-10' value='Back'/></a>
+                     echo "<tr><td colspan='".$cnt."'>
+                                            <a href='" . base_url()."rates/termination_rate_list/'><input type='button' class='btn btn-line-sky pull-right  margin-x-10' value='Back'/></a>
                                             <input type='submit' class='btn btn-line-parrot pull-right'' id='Process' value='Process Records'/></td></tr>";
                      ?>
                </table>

Braces +1 added lines, -2 removed lines

@@ -176,8 +176,7 @@
 
                      				 echo "<th>".ucfirst($field_val)."</th>";
 
-                     			}
-                     			else {
+                     			} else {
                      				echo "<td class='portlet-content'>" . $field_val . "</td>";
                      				$cnt++;
                      			}

web_interface/astpp/application/modules/login/views/view_login.php

Indentation +6 added lines, -6 removed lines

@@ -6,12 +6,12 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
-        $this->db->select('*');
-        $this->db->order_by('accountid', 'desc');
-        $this->db->limit(1);
-        $invoiceconf = $this->db->get('invoice_conf');
-        $invoiceconf = (array)$invoiceconf->first_row();
+		$this->db->where('domain',$_SERVER['HTTP_HOST']);
+		$this->db->select('*');
+		$this->db->order_by('accountid', 'desc');
+		$this->db->limit(1);
+		$invoiceconf = $this->db->get('invoice_conf');
+		$invoiceconf = (array)$invoiceconf->first_row();
 	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
 	?>
 	Log In | <?php echo $invoiceconf['website_title']; ?>

Spacing +9 added lines, -9 removed lines

@@ -6,17 +6,17 @@ 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>
 	<?php       
-        $this->db->where('domain',$_SERVER['HTTP_HOST']);
+        $this->db->where('domain', $_SERVER['HTTP_HOST']);
         $this->db->select('*');
         $this->db->order_by('accountid', 'desc');
         $this->db->limit(1);
         $invoiceconf = $this->db->get('invoice_conf');
         $invoiceconf = (array)$invoiceconf->first_row();
-	if(isset($invoiceconf['website_title']) && $invoiceconf['website_title']!='') {
+	if (isset($invoiceconf['website_title']) && $invoiceconf['website_title'] != '') {
 	?>
 	Log In | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else { 
 	?>
 	Log In | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -54,9 +54,9 @@ 
             <div class="row">
                    
                         <div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
-                        <?php if (isset($astpp_notification)){ ?>
+                        <?php if (isset($astpp_notification)) { ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-                    <?php }else{
+                    <?php } else {
 						 echo "&nbsp;";
 					} ?>
                     </span></div> <br/>
@@ -70,16 +70,16 @@ 
                         	<h2 class="text-center">
                           
 							<?php
-							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
+							if (isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != "") {
 								$logo = $this->session->userdata['user_logo'];
-							}else{
+							} else {
 								$logo = 'logo.png';
 							}
 
 							if ($this->session->userdata('userlevel_logintype') != '0') {?>
-									<img style="height:53px;width:216px;" id="logo" alt="login" src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+									<img style="height:53px;width:216px;" id="logo" alt="login" src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 							<? } else {?> 
-									<img style="height:53px;width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='login' src="<?php echo base_url(); ?>upload/<?php echo$logo;?>">
+									<img style="height:53px;width:216px;" id="logo" title='ASTPP - Open Source Voip Billing Solution' alt='login' src="<?php echo base_url(); ?>upload/<?php echo$logo; ?>">
 							<? }?>
                             	<div class="clear"></div>
                             

Braces +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 	?>
 	Log In | <?php echo $invoiceconf['website_title']; ?>
 	<?php
-		}else{ 
+		} else{ 
 	?>
 	Log In | ASTPP - Open Source Voip Billing Solution
 	<?php
@@ -56,7 +56,7 @@ 
                         <div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
                         <?php if (isset($astpp_notification)){ ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-                    <?php }else{
+                    <?php } else{
 						 echo "&nbsp;";
 					} ?>
                     </span></div> <br/>
@@ -72,7 +72,7 @@ 
 							<?php
 							if(isset($this->session->userdata['user_logo']) && $this->session->userdata['user_logo'] != ""){
 								$logo = $this->session->userdata['user_logo'];
-							}else{
+							} else{
 								$logo = 'logo.png';
 							}
 

web_interface/astpp/application/modules/signup/controllers/signup.php

Indentation +427 added lines, -427 removed lines

@@ -24,77 +24,77 @@ 
 
 class Signup extends MX_Controller {
 
-    function signup() {
-        parent::__construct();
-        $this->load->model('signup_model');
-        $this->load->helper('captcha');
-        $this->load->helper('template_inheritance');
-        //$this->load->library('form_validation');
-        $this->load->library('astpp/common');
-        $this->load->library('astpp/email_lib');
-        $this->load->model('db_model');
-        $this->load->model('common_model');
-        $this->load->library('session');
-        $this->load->library('encrypt');
-        $this->load->model('Astpp_common');
-
-        error_reporting(-1);
-        ini_set('display_errors', 'On');
-
-        $data['row'] = $this->signup_model->get_rate();
-    }
-
-    function index($key = "") {
-
-        if (Common_model::$global_config['system_config']['enable_signup'] == 1)
+	function signup() {
+		parent::__construct();
+		$this->load->model('signup_model');
+		$this->load->helper('captcha');
+		$this->load->helper('template_inheritance');
+		//$this->load->library('form_validation');
+		$this->load->library('astpp/common');
+		$this->load->library('astpp/email_lib');
+		$this->load->model('db_model');
+		$this->load->model('common_model');
+		$this->load->library('session');
+		$this->load->library('encrypt');
+		$this->load->model('Astpp_common');
+
+		error_reporting(-1);
+		ini_set('display_errors', 'On');
+
+		$data['row'] = $this->signup_model->get_rate();
+	}
+
+	function index($key = "") {
+
+		if (Common_model::$global_config['system_config']['enable_signup'] == 1)
 		{
-    		redirect(base_url());
+			redirect(base_url());
 		}
 
-        $userCaptcha = $this->input->post('userCaptcha');
-        $random_number = substr(number_format(time() * rand(), 0, '', ''), 0, 6);
-        $accountinfo = (array)$this->db->get_where('accounts', array('type'=>-1))->first_row();
-        $data['timezone_id'] = ( ! $accountinfo['timezone_id']) ? 1 : $accountinfo['timezone_id'];
-        $data['currency_id'] = ( ! $accountinfo['currency_id']) ? 1 : $accountinfo['currency_id'];
-        $data['country_id'] = ( ! $accountinfo['country_id']) ? 1 : $accountinfo['country_id'];
-
-        $vals = array(
-            'word' => $random_number,
-            'img_path' => getcwd().'/assets/captcha/',
-            'img_url' => base_url().'assets/captcha/',
-            //'font_path' => './fonts/impact.ttf',
-            'img_width' => '243',
-            'img_height' => '50',
-            'expiration' => '3600'
-        );
-
-        if (isset($key) && $key != '') {
-            $data['key_unique'] = $key;
-        } else {
-            $data['key_unique'] = "admin";
-        }
-        $unique = $data['key_unique'];
-
-        if ($unique != "admin") {
-            $unique = $this->common->decode_params(trim($unique));
-            $decoded_str = $this->common->decode($unique);
-            $unique = $decoded_str;
-            $query = $this->db_model->getSelect("*", 'accounts', array('id' => $unique, "deleted" => "0"));
-            if ($query->num_rows() == 0) {
-                redirect(base_url()."signup/signup_inactive");
-            }
-            if ($query->num_rows() > 0) {
-                $query = $query->result_array();
-                $query = $query[0];
-
-                if ($query['status'] != 0) {
-                    redirect(base_url()."signup/signup_inactive");
-                }
-            }
-        }
-        $data['captcha'] = create_captcha($vals);
-        $this->session->set_userdata('captchaWord', $data['captcha']['word']);
-        $this->db->select("*");
+		$userCaptcha = $this->input->post('userCaptcha');
+		$random_number = substr(number_format(time() * rand(), 0, '', ''), 0, 6);
+		$accountinfo = (array)$this->db->get_where('accounts', array('type'=>-1))->first_row();
+		$data['timezone_id'] = ( ! $accountinfo['timezone_id']) ? 1 : $accountinfo['timezone_id'];
+		$data['currency_id'] = ( ! $accountinfo['currency_id']) ? 1 : $accountinfo['currency_id'];
+		$data['country_id'] = ( ! $accountinfo['country_id']) ? 1 : $accountinfo['country_id'];
+
+		$vals = array(
+			'word' => $random_number,
+			'img_path' => getcwd().'/assets/captcha/',
+			'img_url' => base_url().'assets/captcha/',
+			//'font_path' => './fonts/impact.ttf',
+			'img_width' => '243',
+			'img_height' => '50',
+			'expiration' => '3600'
+		);
+
+		if (isset($key) && $key != '') {
+			$data['key_unique'] = $key;
+		} else {
+			$data['key_unique'] = "admin";
+		}
+		$unique = $data['key_unique'];
+
+		if ($unique != "admin") {
+			$unique = $this->common->decode_params(trim($unique));
+			$decoded_str = $this->common->decode($unique);
+			$unique = $decoded_str;
+			$query = $this->db_model->getSelect("*", 'accounts', array('id' => $unique, "deleted" => "0"));
+			if ($query->num_rows() == 0) {
+				redirect(base_url()."signup/signup_inactive");
+			}
+			if ($query->num_rows() > 0) {
+				$query = $query->result_array();
+				$query = $query[0];
+
+				if ($query['status'] != 0) {
+					redirect(base_url()."signup/signup_inactive");
+				}
+			}
+		}
+		$data['captcha'] = create_captcha($vals);
+		$this->session->set_userdata('captchaWord', $data['captcha']['word']);
+		$this->db->select("*");
 		$this->db->where(array("domain"=>$_SERVER["HTTP_HOST"]));
 		$res = $this->db->get("invoice_conf");
 		$logo_arr = $res->result();
@@ -105,398 +105,398 @@ 
 		$this->session->set_userdata('user_logo', $data['user_logo']);
 		$this->session->set_userdata('user_header', $data['website_header']);
 		$this->session->set_userdata('user_footer', $data['website_footer']);
-        $this->load->view('view_signup', $data);
-    }
-
-    public function check_captcha($str) {
-        $word = $this->session->userdata('captchaWord');
-        if (strcmp(strtoupper($str), strtoupper($word)) == 0) {
-            return true;
-        } else {
-            $this->form_validation->set_message('check_captcha', 'Please enter correct words!');
-            return false;
-        }
-    }
-
-    function terms_check() {
-        if (isset($_POST['agreeCheck'])) {
-                    return true;
-        }
-        $this->form_validation->set_message('terms_check', 'THIS IS SOOOOO REQUIRED, DUDE!');
-        return false;
-    }
-
-     function signup_save($id = "") {
-        if (empty($_POST)) {
-            redirect(base_url()."signup/");
-        } else {
-            $post_values = $this->input->post();
-            $userCaptcha = $this->input->post('userCaptcha');
-            $cnt_result = $this->db_model->countQuery("*", 'accounts', array('email' => $post_values['email']));
-
-            if ($userCaptcha != $this->session->userdata('captchaWord') || ! filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL) || $cnt_result > 0) {
-                if ( ! filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL)) {
-                    $data['error']['email'] = "<div style='color: red;'> Please enter proper email </div>";
-                }
-                if ($userCaptcha != $this->session->userdata('captchaWord')) {
-                    $data['error']['userCaptcha'] = "<div style='color: red;'>Please enter valid Captcha code</div>";
-                }
-                if ($cnt_result > 0) {
-                    $data['error']['email'] = "<div style='color: red;'>Email Address already exists</div>";
-                }
-                $random_number = substr(number_format(time() * rand(), 0, '', ''), 0, 6);
-                $vals = array(
-                    'word' => $random_number,
-                    'img_path' => getcwd().'/assets/captcha/',
-                    'img_url' => base_url().'assets/captcha/',
-                    //'font_path' => './fonts/impact.ttf',
-                    'img_width' => '243',
-                    'img_height' => '50',
-                    'expiration' => '3600'
-                );
-                //echo "<pre>"; print_r($_POST); exit;
-                if (isset($_POST['key_unique']) && $_POST['key_unique'] == "admin") {
-                    $data['key_unique'] = $_POST['key_unique'];
-                }
+		$this->load->view('view_signup', $data);
+	}
+
+	public function check_captcha($str) {
+		$word = $this->session->userdata('captchaWord');
+		if (strcmp(strtoupper($str), strtoupper($word)) == 0) {
+			return true;
+		} else {
+			$this->form_validation->set_message('check_captcha', 'Please enter correct words!');
+			return false;
+		}
+	}
+
+	function terms_check() {
+		if (isset($_POST['agreeCheck'])) {
+					return true;
+		}
+		$this->form_validation->set_message('terms_check', 'THIS IS SOOOOO REQUIRED, DUDE!');
+		return false;
+	}
+
+	 function signup_save($id = "") {
+		if (empty($_POST)) {
+			redirect(base_url()."signup/");
+		} else {
+			$post_values = $this->input->post();
+			$userCaptcha = $this->input->post('userCaptcha');
+			$cnt_result = $this->db_model->countQuery("*", 'accounts', array('email' => $post_values['email']));
+
+			if ($userCaptcha != $this->session->userdata('captchaWord') || ! filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL) || $cnt_result > 0) {
+				if ( ! filter_var($this->input->post('email'), FILTER_VALIDATE_EMAIL)) {
+					$data['error']['email'] = "<div style='color: red;'> Please enter proper email </div>";
+				}
+				if ($userCaptcha != $this->session->userdata('captchaWord')) {
+					$data['error']['userCaptcha'] = "<div style='color: red;'>Please enter valid Captcha code</div>";
+				}
+				if ($cnt_result > 0) {
+					$data['error']['email'] = "<div style='color: red;'>Email Address already exists</div>";
+				}
+				$random_number = substr(number_format(time() * rand(), 0, '', ''), 0, 6);
+				$vals = array(
+					'word' => $random_number,
+					'img_path' => getcwd().'/assets/captcha/',
+					'img_url' => base_url().'assets/captcha/',
+					//'font_path' => './fonts/impact.ttf',
+					'img_width' => '243',
+					'img_height' => '50',
+					'expiration' => '3600'
+				);
+				//echo "<pre>"; print_r($_POST); exit;
+				if (isset($_POST['key_unique']) && $_POST['key_unique'] == "admin") {
+					$data['key_unique'] = $_POST['key_unique'];
+				}
 
 				$accountinfo = (array)$this->db->get_where('accounts', array('type'=>-1))->first_row();
 				$data['timezone_id'] = ( ! $accountinfo['timezone_id']) ? 1 : $accountinfo['timezone_id'];
 				$data['currency_id'] = ( ! $accountinfo['currency_id']) ? 1 : $accountinfo['currency_id'];
 				$data['country_id'] = ( ! $accountinfo['country_id']) ? 1 : $accountinfo['country_id'];
 
-                $data['timezone_id'] = ( ! $data['timezone_id']) ? 1 : $data['timezone_id'];
-                $data['currency_id'] = ( ! $data['currency_id']) ? 1 : $data['currency_id'];
-                $data['country_id'] = ( ! $data['country_id']) ? 1 : $data['country_id'];
+				$data['timezone_id'] = ( ! $data['timezone_id']) ? 1 : $data['timezone_id'];
+				$data['currency_id'] = ( ! $data['currency_id']) ? 1 : $data['currency_id'];
+				$data['country_id'] = ( ! $data['country_id']) ? 1 : $data['country_id'];
 
-                $data['value'] = $post_values;
-                $data['captcha'] = create_captcha($vals);
+				$data['value'] = $post_values;
+				$data['captcha'] = create_captcha($vals);
 
-                $this->session->set_userdata('captchaWord', $data['captcha']['word']);
-                $data['key_unique'] = $_POST['key_unique'];
-                $this->load->view('view_signup', $data);
-            } else {
-                //AVTLATP		
-                $user_data = $this->input->post();
+				$this->session->set_userdata('captchaWord', $data['captcha']['word']);
+				$data['key_unique'] = $_POST['key_unique'];
+				$this->load->view('view_signup', $data);
+			} else {
+				//AVTLATP		
+				$user_data = $this->input->post();
                
-                if ( ! isset($_POST['key_unique']) || ! isset($_POST['email'])) {
-                    redirect(base_url()."signup/");
-                }
-                $reseller_id = 0;
-                if (isset($_POST['key_unique']) && $_POST['key_unique'] != "admin") {
-                    $_POST['key_unique'] = $this->common->decode_params(trim($_POST['key_unique']));
-                    $decoded_str = $this->common->decode($_POST['key_unique']);
-                    $_POST['key_unique'] = $decoded_str;
-                    $user_data['key_unique'] = $_POST['key_unique'];
-                    $reseller_id = $user_data['key_unique'];
-                }
-                //echo "<pre>"; print_r($_POST); exit;
-                //AVTLATP
-                //Data want to insert or update
-                $user_data['status'] = "1";
-                $user_data['number'] = $this->common->find_uniq_rendno_customer(common_model::$global_config['system_config']['cardlength'], 'number', 'accounts');
-
-                $user_data['password'] = $this->common->encode($this->common->generate_password());
-                $user_data['pin'] = $this->common->generate_password();
-                $user_data['reseller_id'] = $reseller_id;
-                $user_data['posttoexternal'] = "0";
-
-                unset($user_data['userCaptcha']);
-                unset($user_data['action']);
-
-                $system_config = common_model::$global_config['system_config'];
-                $balance = $system_config["balance"];
-
-                /* $query = $this->db_model->getSelect("*", 'invoice_conf ', array('id' => $unique ,"deleted" => "0"));
+				if ( ! isset($_POST['key_unique']) || ! isset($_POST['email'])) {
+					redirect(base_url()."signup/");
+				}
+				$reseller_id = 0;
+				if (isset($_POST['key_unique']) && $_POST['key_unique'] != "admin") {
+					$_POST['key_unique'] = $this->common->decode_params(trim($_POST['key_unique']));
+					$decoded_str = $this->common->decode($_POST['key_unique']);
+					$_POST['key_unique'] = $decoded_str;
+					$user_data['key_unique'] = $_POST['key_unique'];
+					$reseller_id = $user_data['key_unique'];
+				}
+				//echo "<pre>"; print_r($_POST); exit;
+				//AVTLATP
+				//Data want to insert or update
+				$user_data['status'] = "1";
+				$user_data['number'] = $this->common->find_uniq_rendno_customer(common_model::$global_config['system_config']['cardlength'], 'number', 'accounts');
+
+				$user_data['password'] = $this->common->encode($this->common->generate_password());
+				$user_data['pin'] = $this->common->generate_password();
+				$user_data['reseller_id'] = $reseller_id;
+				$user_data['posttoexternal'] = "0";
+
+				unset($user_data['userCaptcha']);
+				unset($user_data['action']);
+
+				$system_config = common_model::$global_config['system_config'];
+				$balance = $system_config["balance"];
+
+				/* $query = $this->db_model->getSelect("*", 'invoice_conf ', array('id' => $unique ,"deleted" => "0"));
                   $query = $query->result_array(); */
 
-                $company_website = $system_config["company_website"];
-                $company_name = $system_config["company_name"];
+				$company_website = $system_config["company_website"];
+				$company_name = $system_config["company_name"];
 
-                //echo $company_name; exit;
-                $selection_rategroup_signup = $system_config["default_signup_rategroup"];
+				//echo $company_name; exit;
+				$selection_rategroup_signup = $system_config["default_signup_rategroup"];
 
-                if ($reseller_id != 0) {
-                    $result = $this->db_model->getSelect("*", "pricelists", array("reseller_id" => $reseller_id), "ASC");
-                    $result_arr = $result->result_array();
-                    $selection_rategroup_signup = $result_arr[0]['id'];
-                    $user_data['pricelist_id'] = (isset($selection_rategroup_signup) && $selection_rategroup_signup > 0) ? $selection_rategroup_signup : 0;
-                } else {
-                    $pricelist_id = $this->common->get_field_name('id', 'pricelists', array('name' => $selection_rategroup_signup));
-                    /* if($pricelis_id != "")
+				if ($reseller_id != 0) {
+					$result = $this->db_model->getSelect("*", "pricelists", array("reseller_id" => $reseller_id), "ASC");
+					$result_arr = $result->result_array();
+					$selection_rategroup_signup = $result_arr[0]['id'];
+					$user_data['pricelist_id'] = (isset($selection_rategroup_signup) && $selection_rategroup_signup > 0) ? $selection_rategroup_signup : 0;
+				} else {
+					$pricelist_id = $this->common->get_field_name('id', 'pricelists', array('name' => $selection_rategroup_signup));
+					/* if($pricelis_id != "")
                       $user_data['pricelist_id'] = $pricelis_id;
                       else
                       $user_data['pricelist_id'] = 0; */
-                    $user_data['pricelist_id'] = ($pricelist_id != "") ? $pricelist_id : 0;
-                }
-                $last_id = '0';
-                //Insert or Update record
-                $signup_sipdevice_flag = $system_config['create_sipdevice'];
-                $last_id = $this->signup_model->add_user($user_data);
-                if ($last_id == "") {
-                    redirect(base_url()."signup/signup_inactive");
-                }
-                if ($signup_sipdevice_flag == '0') {
-                    $query = $this->db_model->select("*", "sip_profiles", array('name' => "default"), "id", "ASC", '1', '0');
-                    $sip_id = $query->result_array();
-                    if ($reseller_id > 0) {
+					$user_data['pricelist_id'] = ($pricelist_id != "") ? $pricelist_id : 0;
+				}
+				$last_id = '0';
+				//Insert or Update record
+				$signup_sipdevice_flag = $system_config['create_sipdevice'];
+				$last_id = $this->signup_model->add_user($user_data);
+				if ($last_id == "") {
+					redirect(base_url()."signup/signup_inactive");
+				}
+				if ($signup_sipdevice_flag == '0') {
+					$query = $this->db_model->select("*", "sip_profiles", array('name' => "default"), "id", "ASC", '1', '0');
+					$sip_id = $query->result_array();
+					if ($reseller_id > 0) {
 						$reseller_id = $reseller_id;
 					} else {
 						$reseller_id = '0';
 					}
-                    $free_switch_array = array('fs_username' => $user_data['number'],
-                        'fs_password' => $user_data['password'],
-                        'context' => 'default',
-                        'effective_caller_id_name' => $user_data['number'],
-                        'effective_caller_id_number' => $user_data['number'],
-                        'sip_profile_id' => $sip_id[0]['id'],
-                        'reseller_id' => $reseller_id,
-                        'pricelist_id' => $user_data['pricelist_id'],
-                        'accountcode' => $last_id,
-                        'status' => $user_data['status'],
-                        'voicemail_enabled'=>true,
-                        'voicemail_password'=>'',
-                        'voicemail_mail_to'=>'',
-                        'voicemail_attach_file'=>true,
-                        'vm_keep_local_after_email'=>true,
-                        'vm_send_all_message'=>true,
-                        );
-                    $user_custom_array = array_merge($user_data, $free_switch_array);
-                    $user_custom_array['id'] = $last_id;
-                    $user_custom_array['email'] = $user_data['email'];
+					$free_switch_array = array('fs_username' => $user_data['number'],
+						'fs_password' => $user_data['password'],
+						'context' => 'default',
+						'effective_caller_id_name' => $user_data['number'],
+						'effective_caller_id_number' => $user_data['number'],
+						'sip_profile_id' => $sip_id[0]['id'],
+						'reseller_id' => $reseller_id,
+						'pricelist_id' => $user_data['pricelist_id'],
+						'accountcode' => $last_id,
+						'status' => $user_data['status'],
+						'voicemail_enabled'=>true,
+						'voicemail_password'=>'',
+						'voicemail_mail_to'=>'',
+						'voicemail_attach_file'=>true,
+						'vm_keep_local_after_email'=>true,
+						'vm_send_all_message'=>true,
+						);
+					$user_custom_array = array_merge($user_data, $free_switch_array);
+					$user_custom_array['id'] = $last_id;
+					$user_custom_array['email'] = $user_data['email'];
                    
-                    $this->load->model('freeswitch/freeswitch_model');
-                    $this->freeswitch_model->add_freeswith($user_custom_array);
-                }
-             // echo "<pre>"; print_r ($user_data); exit;
-                $activation = $this->encrypt->encode($user_data['number']);
-                $message = base_url().'signup/signup_confirm?email='.urlencode($user_data['email'])."&key=".urlencode($activation);
-                $user_data['confirm'] = $message;
-
-                $this->send_mail($last_id, 'email_signup_confirmation', $user_data);
-                redirect(base_url()."signup/signup_success");
-            }
-        }
-    }
-
-    function signup_confirm() {
-        if ( ! empty($_GET)) {
-
-            $system_config = common_model::$global_config['system_config'];
-            $balance = $system_config["balance"];
-            $accno = $this->encrypt->decode($_GET['key']);
-            $email = $_GET['email'];
-            $success = $this->signup_model->check_user($accno, $email, $balance);
-            $query = $this->db_model->getSelect("*", "accounts", array('number' => $accno));
-            $data = $query->result_array();
-            $user_data = $data[0];
-            $user_data['accountid'] = $user_data['id'];
-            $user_data['success'] = $success;
-            $user_data['balance'] = $balance;
-            $user_data['confirm'] = base_url();
-            $this->active($user_data, $success);
-        } else {
-            redirect(base_url());
-        }
-    }
-
-    function signup_success() {
-        $this->load->view('view_signup_success');
-    }
-
-    function signup_inactive() {
-        $this->load->view('view_signup_inactive');
-    }
-
-    function active($user_data, $success) {
-        $data['user_data'] = $user_data;
-        $data['user_data']['success'] = $success;
-
-        if ($user_data['success']) {
+					$this->load->model('freeswitch/freeswitch_model');
+					$this->freeswitch_model->add_freeswith($user_custom_array);
+				}
+			 // echo "<pre>"; print_r ($user_data); exit;
+				$activation = $this->encrypt->encode($user_data['number']);
+				$message = base_url().'signup/signup_confirm?email='.urlencode($user_data['email'])."&key=".urlencode($activation);
+				$user_data['confirm'] = $message;
+
+				$this->send_mail($last_id, 'email_signup_confirmation', $user_data);
+				redirect(base_url()."signup/signup_success");
+			}
+		}
+	}
+
+	function signup_confirm() {
+		if ( ! empty($_GET)) {
+
+			$system_config = common_model::$global_config['system_config'];
+			$balance = $system_config["balance"];
+			$accno = $this->encrypt->decode($_GET['key']);
+			$email = $_GET['email'];
+			$success = $this->signup_model->check_user($accno, $email, $balance);
+			$query = $this->db_model->getSelect("*", "accounts", array('number' => $accno));
+			$data = $query->result_array();
+			$user_data = $data[0];
+			$user_data['accountid'] = $user_data['id'];
+			$user_data['success'] = $success;
+			$user_data['balance'] = $balance;
+			$user_data['confirm'] = base_url();
+			$this->active($user_data, $success);
+		} else {
+			redirect(base_url());
+		}
+	}
+
+	function signup_success() {
+		$this->load->view('view_signup_success');
+	}
+
+	function signup_inactive() {
+		$this->load->view('view_signup_inactive');
+	}
+
+	function active($user_data, $success) {
+		$data['user_data'] = $user_data;
+		$data['user_data']['success'] = $success;
+
+		if ($user_data['success']) {
 			$user_data['password'] = $this->common->decode($user_data['password']);
-            $this->send_mail($user_data['id'], 'email_add_user', $user_data);
-        }
-        $this->load->view('view_signup_active', $data);
-    }
-
-    function forgotpassword() {
-        $this->load->view('view_forgotpassword');
-    }
-
-    function confirmpassword() {
-        $email = $_POST['email'];       
-        unset($_POST['action']);        
-        $where = array('email' => $email);
-        $this->db->where($where);
-        $this->db->or_where('number', $email);
-        $cnt_result = $this->db_model->countQuery("*", 'accounts', "");
-        if ( ! empty($email)) {
-            $names = array('0', '1', '3');
-            $this->db->where_in('type', $names);
-            $where_arr = array("email" => $email);
-            $this->db->where($where_arr);
+			$this->send_mail($user_data['id'], 'email_add_user', $user_data);
+		}
+		$this->load->view('view_signup_active', $data);
+	}
+
+	function forgotpassword() {
+		$this->load->view('view_forgotpassword');
+	}
+
+	function confirmpassword() {
+		$email = $_POST['email'];       
+		unset($_POST['action']);        
+		$where = array('email' => $email);
+		$this->db->where($where);
+		$this->db->or_where('number', $email);
+		$cnt_result = $this->db_model->countQuery("*", 'accounts', "");
+		if ( ! empty($email)) {
+			$names = array('0', '1', '3');
+			$this->db->where_in('type', $names);
+			$where_arr = array("email" => $email);
+			$this->db->where($where_arr);
 			$this->db->or_where('number', $email);
-            $acountdata = $this->db_model->getSelect("*", "accounts", "");
-            if ($acountdata->num_rows() > 0) {
-                $user_data = $acountdata->result_array();
-                $user_data = $user_data[0];
-                if ($user_data['status'] > 0) {
-                    $data['error']['email'] = "<div id='error_mail' style='color:red; margin: 1% 22%; float: left;'>This account is not Active.</div>";
-                    $this->load->view('view_forgotpassword', $data);
-                    exit;
-                }
-            }            
-            if ($acountdata->num_rows() == 0 && ! filter_var($email, FILTER_VALIDATE_EMAIL)) {
-                if ( ! filter_var($email, FILTER_VALIDATE_EMAIL)) {
-                    $data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left; width:100%;'>Please enter proper Username or Email.</div>";
-
-                    $this->load->view('view_forgotpassword', $data);
-                } else {
-                    $data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left;width:100%;'>This Username or Email is not valid</div>";
-
-                    $this->load->view('view_forgotpassword', $data);
-                }
-            } else if ($acountdata->num_rows() == 0) {
-                    $data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left; width:100%;'>Please enter proper Username or Email.</div>";
-                    $this->load->view('view_forgotpassword', $data);
-            } else {
-                $acountdata = $acountdata->result_array();
-                $user_data = $acountdata[0];
+			$acountdata = $this->db_model->getSelect("*", "accounts", "");
+			if ($acountdata->num_rows() > 0) {
+				$user_data = $acountdata->result_array();
+				$user_data = $user_data[0];
+				if ($user_data['status'] > 0) {
+					$data['error']['email'] = "<div id='error_mail' style='color:red; margin: 1% 22%; float: left;'>This account is not Active.</div>";
+					$this->load->view('view_forgotpassword', $data);
+					exit;
+				}
+			}            
+			if ($acountdata->num_rows() == 0 && ! filter_var($email, FILTER_VALIDATE_EMAIL)) {
+				if ( ! filter_var($email, FILTER_VALIDATE_EMAIL)) {
+					$data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left; width:100%;'>Please enter proper Username or Email.</div>";
+
+					$this->load->view('view_forgotpassword', $data);
+				} else {
+					$data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left;width:100%;'>This Username or Email is not valid</div>";
+
+					$this->load->view('view_forgotpassword', $data);
+				}
+			} else if ($acountdata->num_rows() == 0) {
+					$data['error']['email'] = "<div id='error_mail' style='color: red; margin: 2% 22%; float: left; width:100%;'>Please enter proper Username or Email.</div>";
+					$this->load->view('view_forgotpassword', $data);
+			} else {
+				$acountdata = $acountdata->result_array();
+				$user_data = $acountdata[0];
                 
-                $email = $this->encrypt->encode($user_data['email']);
-                $activation = $this->encrypt->encode($user_data['number']);
-                $message = base_url().'confirm_pass?email='.urlencode($email)."&key=".urlencode($activation);
-                $user_data['confirm'] = $message;
-                $where = array("email" => $user_data['email']);
-                $data = array("pass_link_status" => 1);
-                $this->db->where($where);
-                $this->db->update('accounts', $data);
-                $system_config = common_model::$global_config['system_config'];
-                $balance = $system_config["balance"];
-                $this->send_mail($user_data['id'], 'email_forgot_confirmation', $user_data);
-                $this->load->view('view_forgot_success');
-            }
-        } else {
-            redirect(base_url());
-        }
-    }
-
-    function confirm_pass() {
-        $confirm_pass = $_GET;
-        $accno = '';
-        $balance = '';
-        $email1 = $this->encrypt->decode($confirm_pass['email']);
-        $success = $this->signup_model->check_user($accno, $email1, $balance);
-        if ( ! empty($confirm_pass)) {
-            $where_arr = array("email" => $email1, "status" => 0);
-            $acountdata = $this->db_model->getSelect("*", "accounts", $where_arr);
-            if ($acountdata->num_rows() > 0) {
-                $acountdata = $acountdata->result_array();
-                $user_data = $acountdata[0];
-                $updateArr = array("pass_link_status" => 0);
-                $this->db->where(array("email" => $email1));
-                $this->db->update("accounts", $updateArr);
-                if ($user_data['pass_link_status'] == '0') {
-                    $user_data['success'] = $success;
-                    $data['user_data'] = $user_data;
-                    $this->active($user_data, $success);
-                } else {
-                    $data['email'] = $_GET['email'];
-                    $this->load->view('view_confirmpassword', $data);
-                }
-            }
-        }
-    }
-
-    function confirmpass() {
-        $passwordconf = $_POST;
-        $email1 = $this->encrypt->decode($passwordconf['email']);
-        if ( ! empty($passwordconf)) {
-            $acountdata = $this->db_model->getSelect("*", "accounts", array("email" => $email1));
-            //echo $this->db->last_query();exit;
-            if ($acountdata->num_rows() > 0) {
-                $acountdata = $acountdata->result_array();
-                $user_data = $acountdata[0];
-            }
-            $user_data['password'] = $this->common->encode($passwordconf['password']);
-            $updateArr = array("password" => $user_data['password']);
-            $where_arr = array("email" => $email1, "status" => 0);
-            $this->db->where($where_arr);
-            $this->db->update("accounts", $updateArr);
-            //$activation = $this->encrypt->encode($user_data['number']);
-            $message = base_url();
-            $user_data['confirm'] = $message;
-            $user_data['password'] = $passwordconf['password'];
-
-
-
-            $system_config = common_model::$global_config['system_config'];
-            $balance = $system_config["balance"];
-
-            $this->send_mail($user_data['id'], 'email_forgot_user', $user_data);
-
-            $this->successpassword();
-        }
-    }
-
-    /**
-     * @param string $temp_name
-     */
-    function send_mail($account_id, $temp_name, $user_data) {
+				$email = $this->encrypt->encode($user_data['email']);
+				$activation = $this->encrypt->encode($user_data['number']);
+				$message = base_url().'confirm_pass?email='.urlencode($email)."&key=".urlencode($activation);
+				$user_data['confirm'] = $message;
+				$where = array("email" => $user_data['email']);
+				$data = array("pass_link_status" => 1);
+				$this->db->where($where);
+				$this->db->update('accounts', $data);
+				$system_config = common_model::$global_config['system_config'];
+				$balance = $system_config["balance"];
+				$this->send_mail($user_data['id'], 'email_forgot_confirmation', $user_data);
+				$this->load->view('view_forgot_success');
+			}
+		} else {
+			redirect(base_url());
+		}
+	}
+
+	function confirm_pass() {
+		$confirm_pass = $_GET;
+		$accno = '';
+		$balance = '';
+		$email1 = $this->encrypt->decode($confirm_pass['email']);
+		$success = $this->signup_model->check_user($accno, $email1, $balance);
+		if ( ! empty($confirm_pass)) {
+			$where_arr = array("email" => $email1, "status" => 0);
+			$acountdata = $this->db_model->getSelect("*", "accounts", $where_arr);
+			if ($acountdata->num_rows() > 0) {
+				$acountdata = $acountdata->result_array();
+				$user_data = $acountdata[0];
+				$updateArr = array("pass_link_status" => 0);
+				$this->db->where(array("email" => $email1));
+				$this->db->update("accounts", $updateArr);
+				if ($user_data['pass_link_status'] == '0') {
+					$user_data['success'] = $success;
+					$data['user_data'] = $user_data;
+					$this->active($user_data, $success);
+				} else {
+					$data['email'] = $_GET['email'];
+					$this->load->view('view_confirmpassword', $data);
+				}
+			}
+		}
+	}
+
+	function confirmpass() {
+		$passwordconf = $_POST;
+		$email1 = $this->encrypt->decode($passwordconf['email']);
+		if ( ! empty($passwordconf)) {
+			$acountdata = $this->db_model->getSelect("*", "accounts", array("email" => $email1));
+			//echo $this->db->last_query();exit;
+			if ($acountdata->num_rows() > 0) {
+				$acountdata = $acountdata->result_array();
+				$user_data = $acountdata[0];
+			}
+			$user_data['password'] = $this->common->encode($passwordconf['password']);
+			$updateArr = array("password" => $user_data['password']);
+			$where_arr = array("email" => $email1, "status" => 0);
+			$this->db->where($where_arr);
+			$this->db->update("accounts", $updateArr);
+			//$activation = $this->encrypt->encode($user_data['number']);
+			$message = base_url();
+			$user_data['confirm'] = $message;
+			$user_data['password'] = $passwordconf['password'];
+
+
+
+			$system_config = common_model::$global_config['system_config'];
+			$balance = $system_config["balance"];
+
+			$this->send_mail($user_data['id'], 'email_forgot_user', $user_data);
+
+			$this->successpassword();
+		}
+	}
+
+	/**
+	 * @param string $temp_name
+	 */
+	function send_mail($account_id, $temp_name, $user_data) {
 		
 		
-        $system_config = common_model::$global_config['system_config'];
-        //$screen_path = getcwd()."/cron";
-        //$screen_filename = "Email_Broadcast_".strtotime('now');
-        //$command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php BroadcastEmail";
-        //exec($command);
+		$system_config = common_model::$global_config['system_config'];
+		//$screen_path = getcwd()."/cron";
+		//$screen_filename = "Email_Broadcast_".strtotime('now');
+		//$command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php BroadcastEmail";
+		//exec($command);
         
         
      
         
-        $where = array('name' => $temp_name);
-        $EmailTemplate = $this->db_model->getSelect("*", "default_templates", $where);
-        $reseller_id = ($user_data['reseller_id'] > 0) ? $user_data['reseller_id'] : 1;
-        $where = "accountid IN ('".$reseller_id."','1')";
-        $this->db->where($where);
-        $this->db->select('*');
-        $this->db->order_by('accountid', 'desc');
-        $this->db->limit(1);
-        $invoiceconf = $this->db->get('invoice_conf');
-        $invoiceconf = (array)$invoiceconf->first_row();
-        $company_email = $invoiceconf['emailaddress'];
-        $company_website = $invoiceconf["website"];
-        $company_name = $invoiceconf["company_name"];
+		$where = array('name' => $temp_name);
+		$EmailTemplate = $this->db_model->getSelect("*", "default_templates", $where);
+		$reseller_id = ($user_data['reseller_id'] > 0) ? $user_data['reseller_id'] : 1;
+		$where = "accountid IN ('".$reseller_id."','1')";
+		$this->db->where($where);
+		$this->db->select('*');
+		$this->db->order_by('accountid', 'desc');
+		$this->db->limit(1);
+		$invoiceconf = $this->db->get('invoice_conf');
+		$invoiceconf = (array)$invoiceconf->first_row();
+		$company_email = $invoiceconf['emailaddress'];
+		$company_website = $invoiceconf["website"];
+		$company_name = $invoiceconf["company_name"];
         
-        $TemplateData = array();
+		$TemplateData = array();
         
         
-        foreach ($EmailTemplate->result_array() as $value) {
-            $TemplateData = $value;
-            $TemplateData['subject'] = str_replace('#NAME#', $user_data['first_name']." ".$user_data['last_name'], $TemplateData['subject']);
-            $TemplateData['template'] = str_replace('#NAME#', $user_data['first_name']." ".$user_data['last_name'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#NUMBER#', $user_data['number'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#PASSWORD#', $user_data['password'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#COMPANY_WEBSITE#', $company_website, $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#LINK#', $user_data['confirm'], $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#COMPANY_EMAIL#', $company_email, $TemplateData['template']);
-            $TemplateData['template'] = str_replace('#COMPANY_NAME#', $company_name, $TemplateData['template']);
-        }
-        $email_array = array('accountid' => $account_id,
-            'subject' => $TemplateData['subject'],
-            'body' => $TemplateData['template'],
-            'from' => $invoiceconf['emailaddress'],
-            'to' => $user_data['email'],
-            'status' => "1",
-            //'attachment'=> $Filenm,
-            'template' => '');
-        //echo "<pre>"; print_r($TemplateData); exit;
-        $this->db->insert("mail_details", $email_array);
-        return true;
-    }
-
-    function successpassword() {
-        $this->load->view('view_successpassword');
-    }
+		foreach ($EmailTemplate->result_array() as $value) {
+			$TemplateData = $value;
+			$TemplateData['subject'] = str_replace('#NAME#', $user_data['first_name']." ".$user_data['last_name'], $TemplateData['subject']);
+			$TemplateData['template'] = str_replace('#NAME#', $user_data['first_name']." ".$user_data['last_name'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#NUMBER#', $user_data['number'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#PASSWORD#', $user_data['password'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#COMPANY_WEBSITE#', $company_website, $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#LINK#', $user_data['confirm'], $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#COMPANY_EMAIL#', $company_email, $TemplateData['template']);
+			$TemplateData['template'] = str_replace('#COMPANY_NAME#', $company_name, $TemplateData['template']);
+		}
+		$email_array = array('accountid' => $account_id,
+			'subject' => $TemplateData['subject'],
+			'body' => $TemplateData['template'],
+			'from' => $invoiceconf['emailaddress'],
+			'to' => $user_data['email'],
+			'status' => "1",
+			//'attachment'=> $Filenm,
+			'template' => '');
+		//echo "<pre>"; print_r($TemplateData); exit;
+		$this->db->insert("mail_details", $email_array);
+		return true;
+	}
+
+	function successpassword() {
+		$this->load->view('view_successpassword');
+	}
 
 }
 ?>