iNextrix / ASTPP

web_interface/astpp/system/database/drivers/mssql/mssql_driver.php

Indentation +9 added lines, -9 removed lines

@@ -314,15 +314,15 @@
 	// --------------------------------------------------------------------
 
 	/**
-	* Parse major version
-	*
-	* Grabs the major version number from the
-	* database server version string passed in.
-	*
-	* @access private
-	* @param string $version
-	* @return string major version number
-	*/
+	 * Parse major version
+	 *
+	 * Grabs the major version number from the
+	 * database server version string passed in.
+	 *
+	 * @access private
+	 * @param string $version
+	 * @return string major version number
+	 */
 	function _parse_major_version($version)
 	{
 		preg_match('/([0-9]+)\.([0-9]+)\.([0-9]+)/', $version, $ver_info);

freeswitch/fs/lib/astpp.cdr.php

Indentation +14 added lines, -14 removed lines

@@ -318,7 +318,7 @@ 
 //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'])."'";
 }
 
@@ -327,27 +327,27 @@ 
  * @param integer $entity_id
  */
 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;
 }
 

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

web_interface/astpp/system/database/drivers/sqlsrv/sqlsrv_driver.php

Indentation +9 added lines, -9 removed lines

@@ -314,15 +314,15 @@
 	// --------------------------------------------------------------------
 
 	/**
-	* Parse major version
-	*
-	* Grabs the major version number from the
-	* database server version string passed in.
-	*
-	* @access private
-	* @param string $version
-	* @return string major version number
-	*/
+	 * Parse major version
+	 *
+	 * Grabs the major version number from the
+	 * database server version string passed in.
+	 *
+	 * @access private
+	 * @param string $version
+	 * @return string major version number
+	 */
 	function _parse_major_version($version)
 	{
 		preg_match('/([0-9]+)\.([0-9]+)\.([0-9]+)/', $version, $ver_info);

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

Indentation +5 added lines, -5 removed lines

@@ -1429,7 +1429,7 @@ 
 					// $csv_data = $this->csvreader->parse_file($uploadedFile, $new_final_arr_key, $check_header);
 
 					$csv_data = $this->utf8_converter($this->csvreader->parse_file($uploadedFile, $field_select, $check_header));
-        			if (!empty($csv_data))
+					if (!empty($csv_data))
 					{
 						$full_path = $this->config->item('rates-file-path');
 						$actual_file_name = "ASTPP-TERMINATION-RATES-" . date("Y-m-d H:i:s") . "." . $ext;
@@ -1566,11 +1566,11 @@ 
 		{
 			$result = $this->rates_model->bulk_insert_termination_rate($new_final_arr);
 		}
-        		else
-        {
+				else
+		{
 
-           $this->session->set_flashdata('astpp_errormsg', 'Error - Nothing selected to import/process!');
-           redirect(base_url() . 'rates/termination_rates_list/');
+		   $this->session->set_flashdata('astpp_errormsg', 'Error - Nothing selected to import/process!');
+		   redirect(base_url() . 'rates/termination_rates_list/');
 		}
 
 		unlink($full_path . $terminationrate_file_name);

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

Indentation +53 added lines, -53 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
@@ -51,9 +51,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>
@@ -67,10 +67,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>
 
@@ -135,28 +135,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 ?>" />
@@ -174,25 +174,25 @@ 
                            <form id="import_form" name="import_form" action="<?=base_url()?>rates/termination_rate_rates_import/<?= $trunkid?>/<?=$check_header?>/" method="POST">
                            <table width="100%" border="1"  class="details_table table">
                                <?  $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>";
-               								}else{
-               									echo "<td class='portlet-content'>".$field_val."</td>";
-               									$cnt++;
-               								}
-               							}
-               							echo "</tr>";
-               						}
-               					}
+			   					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>";
+			   								}else{
+			   									echo "<td class='portlet-content'>".$field_val."</td>";
+			   									$cnt++;
+			   								}
+			   							}
+			   							echo "</tr>";
+			   						}
+			   					}
 
-               					echo "<tr><td colspan='".$cnt."'>
+			   					echo "<tr><td colspan='".$cnt."'>
                                        <a href='".base_url()."rates/termination_rates_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'/></td></tr>";
-               		?> </table></form>
+			   		?> </table></form>
                     </div>
                            </div>
                        </div>