iNextrix / ASTPP

web_interface/astpp/application/third_party/MX/Loader.php

Braces +36 added lines, -16 removed lines

@@ -141,18 +141,23 @@ 
 	}

 	

 	public function languages($languages) {

-		foreach ($languages as $_language) $this->language($_language);

+		foreach ($languages as $_language) {
+			$this->language($_language);
+		}
 	}

 	

 	/** Load a module library **/

 	public function library($library = '', $params = NULL, $object_name = NULL) {

 		

-		if (is_array($library)) return $this->libraries($library);		

+		if (is_array($library)) {
+			return $this->libraries($library);
+		}
 		

 		$class = strtolower(basename($library));

 

-		if (isset($this->_ci_classes[$class]) AND $_alias = $this->_ci_classes[$class])

-			return CI::$APP->$_alias;

+		if (isset($this->_ci_classes[$class]) AND $_alias = $this->_ci_classes[$class]) {
+					return CI::$APP->$_alias;
+		}
 			

 		($_alias = strtolower($object_name)) OR $_alias = $class;

 		

@@ -234,13 +239,17 @@ 
 

 	/** Load an array of models **/

 	public function models($models) {

-		foreach ($models as $_model) $this->model($_model);	

+		foreach ($models as $_model) {
+			$this->model($_model);
+		}
 	}

 

 	/** Load a module controller **/

 	public function module($module, $params = NULL) {

 		

-		if (is_array($module)) return $this->modules($module);

+		if (is_array($module)) {
+			return $this->modules($module);
+		}
 

 		$_alias = strtolower(basename($module));

 		CI::$APP->$_alias = Modules::load(array($module => $params));

@@ -249,16 +258,21 @@ 
 

 	/** Load an array of controllers **/

 	public function modules($modules) {

-		foreach ($modules as $_module) $this->module($_module);	

+		foreach ($modules as $_module) {
+			$this->module($_module);
+		}
 	}

 

 	/** Load a module plugin **/

 	public function plugin($plugin) {

 		

-		if (is_array($plugin)) return $this->plugins($plugin);		

+		if (is_array($plugin)) {
+			return $this->plugins($plugin);
+		}
 		

-		if (isset($this->_ci_plugins[$plugin]))	

-			return;

+		if (isset($this->_ci_plugins[$plugin])) {
+					return;
+		}
 

 		list($path, $_plugin) = Modules::find($plugin.'_pi', $this->_module, 'plugins/');	

 		

@@ -314,20 +328,26 @@ 
 					break;

 				}

 				

-				if ( ! $cascade) break;

+				if ( ! $cascade) {
+					break;
+				}
 			}

 			

 		} elseif (isset($_ci_path)) {

 			

 			$_ci_file = basename($_ci_path);

-			if ( ! file_exists($_ci_path)) $_ci_path = '';

+			if ( ! file_exists($_ci_path)) {
+				$_ci_path = '';
+			}
 		}

 

-		if (empty($_ci_path)) 

-			show_error('Unable to load the requested file: '.$_ci_file);

+		if (empty($_ci_path)) {
+					show_error('Unable to load the requested file: '.$_ci_file);
+		}
 

-		if (isset($_ci_vars)) 

-			$this->_ci_cached_vars = array_merge($this->_ci_cached_vars, (array)$_ci_vars);

+		if (isset($_ci_vars)) {
+					$this->_ci_cached_vars = array_merge($this->_ci_cached_vars, (array)$_ci_vars);
+		}
 		

 		extract($this->_ci_cached_vars);

 

web_interface/astpp/application/controllers/getstatus.php

Spacing +4 added lines, -4 removed lines

@@ -31,11 +31,11 @@
 	}
 	
 	
-	function customer_list_status($id){
+	function customer_list_status($id) {
 			 $post_data = $this->input->post();
-			 $post_data['table']=$this->common->decode($post_data['table']);
-			 $data['status']=$post_data['status'] =='true'? 0:1;
-			 $result=$post_data['table'] =='accounts' && $post_data['id'] == 1 ? null:$this->db->update($post_data['table'],$data,array("id"=>$post_data['id']));
+			 $post_data['table'] = $this->common->decode($post_data['table']);
+			 $data['status'] = $post_data['status'] == 'true' ? 0 : 1;
+			 $result = $post_data['table'] == 'accounts' && $post_data['id'] == 1 ? null : $this->db->update($post_data['table'], $data, array("id"=>$post_data['id']));
 			 echo TRUE;
 	}
 		

web_interface/astpp/application/controllers/run_cron.php

Braces +9 added lines, -6 removed lines

@@ -41,8 +41,9 @@ 
 	function __construct()
 	{
 		parent::__construct();
-		if ( ! defined('CRON'))  
-		  exit();
+		if ( ! defined('CRON')) {
+				  exit();
+		}
 	}
 
 
@@ -76,8 +77,9 @@ 
 	function generate_sitemap()
 	{	
 		// Live Mode:
-		if ( ! CRON_BETA_MODE)
-			$cron_id = $this->cron->create('Sitemap (Google|Bing|Ask|Yahoo!)');
+		if ( ! CRON_BETA_MODE) {
+					$cron_id = $this->cron->create('Sitemap (Google|Bing|Ask|Yahoo!)');
+		}
 		
 		// Example Code
 		
@@ -89,8 +91,9 @@ 
 		// ...
 
 		// Sandbox Mode:
-		if (CRON_BETA_MODE)
-			$this->sitemap->generate_xml(null, false);
+		if (CRON_BETA_MODE) {
+					$this->sitemap->generate_xml(null, false);
+		}
 			
 		// Live Mode:
 		else {

web_interface/astpp/application/controllers/getbalance.php

Spacing +52 added lines, -52 removed lines

@@ -31,83 +31,83 @@
 		$this->load->model('db_model');
 		$this->load->model('Astpp_common');
 	}
-	function index($sipnumber=''){
-	$opensips_flag=common_model::$global_config['system_config']['opensips'];
-	$accountid_arr=0;
- 	if($opensips_flag == '1'){
-			$where=array('username'=>$sipnumber);
-			$accountid_arr=$this->db_model->getSelect('accountid','sip_devices',$where);
+	function index($sipnumber = '') {
+	$opensips_flag = common_model::$global_config['system_config']['opensips'];
+	$accountid_arr = 0;
+ 	if ($opensips_flag == '1') {
+			$where = array('username'=>$sipnumber);
+			$accountid_arr = $this->db_model->getSelect('accountid', 'sip_devices', $where);
 		}
-	else{
+	else {
 		  $db_config = Common_model::$global_config['system_config'];
-		  $opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
+		  $opensipdsn = "mysql://".$db_config['opensips_dbuser'].":".$db_config['opensips_dbpass']."@".$db_config['opensips_dbhost']."/".$db_config['opensips_dbname']."?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
 		$this->opensips_db = $this->load->database($opensipdsn, true);
 		$this->opensips_db->where(array("username"=>$sipnumber));
-		$accountnum_arr=$this->opensips_db->get("subscriber");
-			$accountnum_arr=$accountnum_arr->result_array();
-		foreach($accountnum_arr as $value_num){
-		$accountid_arr = $this->db_model->getSelect('id','accounts',array('number'=>$value_num['accountcode']));
+		$accountnum_arr = $this->opensips_db->get("subscriber");
+			$accountnum_arr = $accountnum_arr->result_array();
+		foreach ($accountnum_arr as $value_num) {
+		$accountid_arr = $this->db_model->getSelect('id', 'accounts', array('number'=>$value_num['accountcode']));
 		}
 	}
-	if($accountid_arr == ''){
+	if ($accountid_arr == '') {
 		echo "Please enter proper username of SIP Account";
 	}
-	if($accountid_arr->num_rows()==0 ){
-		$where=array('number'=>$sipnumber);
-		$accountid_arr=$this->db_model->getSelect('id','accounts',$where);
+	if ($accountid_arr->num_rows() == 0) {
+		$where = array('number'=>$sipnumber);
+		$accountid_arr = $this->db_model->getSelect('id', 'accounts', $where);
 	}
-	if($accountid_arr->num_rows()>0){
-		$accountid_arr=$accountid_arr->result_array();
-		if($opensips_flag == '1'){
-		   foreach($accountid_arr[0] as $key=>$value){
+	if ($accountid_arr->num_rows() > 0) {
+		$accountid_arr = $accountid_arr->result_array();
+		if ($opensips_flag == '1') {
+		   foreach ($accountid_arr[0] as $key=>$value) {
 		   }
-		  if($key== 'id'){
-			$accountid=$accountid_arr[0]['id'];
-		  } else{
-			$accountid=$accountid_arr[0]['accountid'];
+		  if ($key == 'id') {
+			$accountid = $accountid_arr[0]['id'];
+		  } else {
+			$accountid = $accountid_arr[0]['accountid'];
 		 }
-		} else{
-			$accountid=$accountid_arr[0]['id'];
+		} else {
+			$accountid = $accountid_arr[0]['id'];
 		}
 		$to_currency = common_model::$global_config['system_config']['base_currency'];
-		if($accountid > 0){
-		$where=array('id'=>$accountid);
-		$balance=$this->db_model->getSelect('balance,currency_id','accounts',$where);
-			if($balance->num_rows() > 0){
+		if ($accountid > 0) {
+		$where = array('id'=>$accountid);
+		$balance = $this->db_model->getSelect('balance,currency_id', 'accounts', $where);
+			if ($balance->num_rows() > 0) {
 				//get balance,currency using by user from account number.
 				$balance_arr = $balance->result_array();
-				$balance=$balance_arr['0']['balance'];
-				$currency=$balance_arr['0']['currency_id'];
+				$balance = $balance_arr['0']['balance'];
+				$currency = $balance_arr['0']['currency_id'];
 				//Get Base Currency From System which is main currency of system.
-				$base_currency_arr=$this->db_model->getSelect('value','system',array('name'=>'base_currency'));
-				$base_currency_arr=$base_currency_arr->result_array();
-				$base_currency=$base_currency_arr['0']['value'];
+				$base_currency_arr = $this->db_model->getSelect('value', 'system', array('name'=>'base_currency'));
+				$base_currency_arr = $base_currency_arr->result_array();
+				$base_currency = $base_currency_arr['0']['value'];
 				//Get basse Currency rate from Currency Name.
-				$base_currency_info=$this->db_model->getSelect('*','currency',array('currency'=>$base_currency));
-				$base_currency_info=$base_currency_info->result_array();
-				$base_currency_rate=$base_currency_info['0']['currencyrate'];
-				$base_currency_name=$base_currency_info['0']['currency'];
+				$base_currency_info = $this->db_model->getSelect('*', 'currency', array('currency'=>$base_currency));
+				$base_currency_info = $base_currency_info->result_array();
+				$base_currency_rate = $base_currency_info['0']['currencyrate'];
+				$base_currency_name = $base_currency_info['0']['currency'];
 				//Find Currency Rate of user Currency from its currency_id
-				$where= array('id'=>$currency);
-				$user_currency_info=$this->db_model->getSelect("*",'currency',$where);
+				$where = array('id'=>$currency);
+				$user_currency_info = $this->db_model->getSelect("*", 'currency', $where);
 				//user Currency Is deleted or Not
-				if($user_currency_info->num_rows() > 0){
-					$user_currency_info=$user_currency_info->result_array();
-					$user_currency=$user_currency_info['0']['currencyrate'];
-					$user_currency_name=$user_currency_info['0']['currency'];
-				} else{
-					$user_currency=$base_currency_rate;
-					$user_currency_name=$base_currency_name;
+				if ($user_currency_info->num_rows() > 0) {
+					$user_currency_info = $user_currency_info->result_array();
+					$user_currency = $user_currency_info['0']['currencyrate'];
+					$user_currency_name = $user_currency_info['0']['currency'];
+				} else {
+					$user_currency = $base_currency_rate;
+					$user_currency_name = $base_currency_name;
 				}
 				// Convert Balance of user in user currency
-				$convert_balance=round(($balance * $user_currency)/$base_currency_rate,2);
-				$convert_balance=sprintf("%.2f", $convert_balance).' '.$user_currency_name;
+				$convert_balance = round(($balance * $user_currency) / $base_currency_rate, 2);
+				$convert_balance = sprintf("%.2f", $convert_balance).' '.$user_currency_name;
 				echo "Balance : ".$convert_balance;
 			}
-		} else{
+		} else {
 			echo "0.00 ".$to_currency;
 		}
-	} else{
+	} else {
 		echo "Please enter proper username of SIP Account";
 	}
   }

Braces +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
  	if($opensips_flag == '1'){
 			$where=array('username'=>$sipnumber);
 			$accountid_arr=$this->db_model->getSelect('accountid','sip_devices',$where);
-		}
-	else{
+		} else{
 		  $db_config = Common_model::$global_config['system_config'];
 		  $opensipdsn = "mysql://" . $db_config['opensips_dbuser'] . ":" . $db_config['opensips_dbpass'] . "@" . $db_config['opensips_dbhost'] . "/" . $db_config['opensips_dbname'] . "?char_set=utf8&dbcollat=utf8_general_ci&cache_on=true&cachedir=";
 		$this->opensips_db = $this->load->database($opensipdsn, true);

web_interface/astpp/application/controllers/feedback.php

Spacing +38 added lines, -38 removed lines

@@ -28,59 +28,59 @@ 
 		parent::__construct();
 	}
 	
-	function index(){
+	function index() {
 		$data['account_info'] = $this->session->userdata['accountinfo'];
 		$data['username'] = $this->session->userdata('user_name');
 		$data['page_title'] = "Feedback";
-		$this->load->view('view_feedback',$data);
+		$this->load->view('view_feedback', $data);
 	}
-	function customer_feedback_result($flag=FALSE){
-		if($flag){
+	function customer_feedback_result($flag = FALSE) {
+		if ($flag) {
 			$account_info = array();
-			$this->db->where("accountid","1");
+			$this->db->where("accountid", "1");
 			$res = $this->db->get('invoice_conf');
-			if($res->num_rows > 0){
+			if ($res->num_rows > 0) {
 				$masterdata = $res->result_array();
 				$account_info = $masterdata['0'];
 
-				$company_name=$account_info['company_name'];
-				$address=$account_info['address'];
-				$city=$account_info['city'];
-				$province=$account_info['province'];
-				$country=$account_info['country'];
-				$zipcode=$account_info['zipcode'];
-				$telephone=$account_info['telephone'];
-				$fax=$account_info['fax'];
-				$emailaddress=$account_info['emailaddress'];
-				$website=$account_info['website'];
+				$company_name = $account_info['company_name'];
+				$address = $account_info['address'];
+				$city = $account_info['city'];
+				$province = $account_info['province'];
+				$country = $account_info['country'];
+				$zipcode = $account_info['zipcode'];
+				$telephone = $account_info['telephone'];
+				$fax = $account_info['fax'];
+				$emailaddress = $account_info['emailaddress'];
+				$website = $account_info['website'];
 
-				$data=array("name"=>"Admin","company_name"=>$company_name,"address"=>$address,"city"=>$city,"province"=>$province,"country"=>$country,"zipcode"=>$zipcode,"telephone"=>$telephone,"fax"=>$fax,"emailaddress"=>$emailaddress,"website"=>$website,"serverip"=>$_SERVER['SERVER_NAME'],"FLAG"=>"TRUE");				
+				$data = array("name"=>"Admin", "company_name"=>$company_name, "address"=>$address, "city"=>$city, "province"=>$province, "country"=>$country, "zipcode"=>$zipcode, "telephone"=>$telephone, "fax"=>$fax, "emailaddress"=>$emailaddress, "website"=>$website, "serverip"=>$_SERVER['SERVER_NAME'], "FLAG"=>"TRUE");				
 			}
-		} else{
+		} else {
 			$account_info = array();
-			$this->db->where("type","-1");
+			$this->db->where("type", "-1");
 			$res = $this->db->get('accounts');
-			if($res->num_rows > 0){
+			if ($res->num_rows > 0) {
 				$masterdata = $res->result_array();
 				$account_info = $masterdata['0'];
 
-			$name=$_REQUEST['name']="Admin";
-			$email=$_REQUEST['email']=$account_info['email'];
-			$feedback=$_REQUEST['feedback'];
-			$first_name=$account_info['first_name'];
-			$last_name=$account_info['last_name'];
-			$city=$account_info['city'];
-			$telephone_1=$account_info['telephone_1'];
-			$account_email=$account_info['email'];
-			$company_name=$account_info['company_name'];
-			$address_1=$account_info['address_1'];
-			$address_2=$account_info['address_2'];
-			$telephone_2=$account_info['telephone_2'];
-			$province=$account_info['province'];
+			$name = $_REQUEST['name'] = "Admin";
+			$email = $_REQUEST['email'] = $account_info['email'];
+			$feedback = $_REQUEST['feedback'];
+			$first_name = $account_info['first_name'];
+			$last_name = $account_info['last_name'];
+			$city = $account_info['city'];
+			$telephone_1 = $account_info['telephone_1'];
+			$account_email = $account_info['email'];
+			$company_name = $account_info['company_name'];
+			$address_1 = $account_info['address_1'];
+			$address_2 = $account_info['address_2'];
+			$telephone_2 = $account_info['telephone_2'];
+			$province = $account_info['province'];
 
-			$data=array("name"=>$name,"email"=>$email,"feedback"=>$feedback,"first_name"=>$first_name,"last_name"=>$last_name,"city"=>$city,"telephone_1"=>$telephone_1,"account_email"=>$account_email,"company_name"=>$company_name,"address_1"=>$address_1,"address_2"=>$address_2,"telephone_2"=>$telephone_2,"province"=>$province,"serverip"=>$_SERVER['SERVER_ADDR'],"FLAG"=>"FALSE");
+			$data = array("name"=>$name, "email"=>$email, "feedback"=>$feedback, "first_name"=>$first_name, "last_name"=>$last_name, "city"=>$city, "telephone_1"=>$telephone_1, "account_email"=>$account_email, "company_name"=>$company_name, "address_1"=>$address_1, "address_2"=>$address_2, "telephone_2"=>$telephone_2, "province"=>$province, "serverip"=>$_SERVER['SERVER_ADDR'], "FLAG"=>"FALSE");
 
-				$data_new= json_encode($data);
+				$data_new = json_encode($data);
 			}
 		}
 		$ch = curl_init();
@@ -96,12 +96,12 @@ 
 		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
 
 		$response = curl_exec($ch);
-		if(!$flag)
-		 redirect(base_url() . 'feedback/thanks');
+		if ( ! $flag)
+		 redirect(base_url().'feedback/thanks');
 	    
 
 	}
-	function thanks(){
+	function thanks() {
 			$this->load->view('view_feedback_response');
 	}	
 

Braces +3 added lines, -2 removed lines

@@ -96,8 +96,9 @@
 		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
 
 		$response = curl_exec($ch);
-		if(!$flag)
-		 redirect(base_url() . 'feedback/thanks');
+		if(!$flag) {
+				 redirect(base_url() . 'feedback/thanks');
+		}
 	    
 
 	}

web_interface/astpp/application/controllers/currencyupdate.php

Indentation +48 added lines, -48 removed lines

@@ -21,48 +21,48 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 class Currencyupdate extends CI_Controller {
-    function __construct()
-    {
-        parent::__construct();
-     //   if(!defined( 'CRON' ) )
-       //   exit();
-        $this->load->model("db_model");
-        $this->load->library("astpp/common");
-    }
-    function update_currency() {
-        $where = array("currency <>"=> Common_model::$global_config['system_config']['base_currency']);
-        $query = $this->db_model->getSelect("*", "currency", $where);
+	function __construct()
+	{
+		parent::__construct();
+	 //   if(!defined( 'CRON' ) )
+	   //   exit();
+		$this->load->model("db_model");
+		$this->load->library("astpp/common");
+	}
+	function update_currency() {
+		$where = array("currency <>"=> Common_model::$global_config['system_config']['base_currency']);
+		$query = $this->db_model->getSelect("*", "currency", $where);
 
-        if ($query->num_rows > 0) {
-            $currency_data = $query->result_array();
-    		$url = "http://finance.yahoo.com/d/quotes.csv?e=.csv&f=sl1d1t1&s=";
-	    	foreach ($currency_data as $currency_value) {
-	    	    $url .= Common_model::$global_config['system_config']['base_currency'].$currency_value['currency'].'=X+';
-	    	}
-	    	$url .= '&f=l1';
+		if ($query->num_rows > 0) {
+			$currency_data = $query->result_array();
+			$url = "http://finance.yahoo.com/d/quotes.csv?e=.csv&f=sl1d1t1&s=";
+			foreach ($currency_data as $currency_value) {
+				$url .= Common_model::$global_config['system_config']['base_currency'].$currency_value['currency'].'=X+';
+			}
+			$url .= '&f=l1';
 
-	    	$sql = '';
-	    	$response = $this->curl_response($url);
-	    	$content_data = explode(' ', $response);
+			$sql = '';
+			$response = $this->curl_response($url);
+			$content_data = explode(' ', $response);
 
-	    	foreach ($content_data as $content_data1) {
-	    	   $currency_arr = explode("\n", $content_data1);
-	    	    foreach ($currency_arr as $final_val)
-	    	    {
-	    	        $currency_final = array();
-	    		    $currency_final = explode(',', $final_val);
-	    		    if (isset($currency_final[1]) && $currency_final[1] != "" && $currency_final[0] != '' && $currency_final[1] != 'N/A') {
-			      $sql = "UPDATE currency SET currencyRate = ".$currency_final[1]." WHERE currency = '".substr($currency_final[0], 4, 3)."'";
-			      $this->db->query($sql);
-	    		    }
-	    	    }
-	    	}
-	    	$sql = "UPDATE currency SET currencyRate = '1' WHERE currency = '".Common_model::$global_config['system_config']['base_currency']."'";
-                $this->db->query($sql);
-      }
-	      $this->session->set_flashdata("astpp_errormsg", "Currency exchange rates successfully updated.");
-	      redirect(base_url()."/systems/currency_list/");
-	      exit;
+			foreach ($content_data as $content_data1) {
+			   $currency_arr = explode("\n", $content_data1);
+				foreach ($currency_arr as $final_val)
+				{
+					$currency_final = array();
+					$currency_final = explode(',', $final_val);
+					if (isset($currency_final[1]) && $currency_final[1] != "" && $currency_final[0] != '' && $currency_final[1] != 'N/A') {
+				  $sql = "UPDATE currency SET currencyRate = ".$currency_final[1]." WHERE currency = '".substr($currency_final[0], 4, 3)."'";
+				  $this->db->query($sql);
+					}
+				}
+			}
+			$sql = "UPDATE currency SET currencyRate = '1' WHERE currency = '".Common_model::$global_config['system_config']['base_currency']."'";
+				$this->db->query($sql);
+	  }
+		  $this->session->set_flashdata("astpp_errormsg", "Currency exchange rates successfully updated.");
+		  redirect(base_url()."/systems/currency_list/");
+		  exit;
 	}
 
 	/**
@@ -70,15 +70,15 @@ 
 	 */
 	function curl_response($url)
 	{
-		    $ch = curl_init(); // Initialising cURL
-		    curl_setopt($ch, CURLOPT_URL, $url);
-		    curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-		    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		    curl_setopt($ch, CURLOPT_ENCODING, "");
-		    curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6 (.NET CLR 3.5.30729)");
-		    $data = curl_exec($ch); // Executing the cURL request and assigning the returned data to the $data variable
-		    curl_close($ch); // Closing cURL
-		    return $data;
+			$ch = curl_init(); // Initialising cURL
+			curl_setopt($ch, CURLOPT_URL, $url);
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+			curl_setopt($ch, CURLOPT_ENCODING, "");
+			curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6 (.NET CLR 3.5.30729)");
+			$data = curl_exec($ch); // Executing the cURL request and assigning the returned data to the $data variable
+			curl_close($ch); // Closing cURL
+			return $data;
 	}
 }
 ?>

web_interface/astpp/application/libraries/csvreader.php

Spacing +33 added lines, -33 removed lines

@@ -12,8 +12,8 @@ 
 */
 class CSVReader {
 
-	var $fields;        /** columns names retrieved after parsing */
-	var $separator = ',';    /** separator used to explode each line */
+	var $fields; /** columns names retrieved after parsing */
+	var $separator = ','; /** separator used to explode each line */
 
 	/**
 	 * Parse a text containing CSV formatted data.
@@ -34,23 +34,23 @@ 
 	 * @param    string
 	 * @return    array
 	 */
-	function parse_file($p_Filepath,$config_variable,$check_header_flag=false) {
+	function parse_file($p_Filepath, $config_variable, $check_header_flag = false) {
 		$lines = file($p_Filepath);
 		//Giving line numbers
-		for($i=0;$i<sizeof($lines);$i++)
+		for ($i = 0; $i < sizeof($lines); $i++)
 		{
         
-			if(trim($lines[$i]) != "")
+			if (trim($lines[$i]) != "")
 			{
 				$columnname = explode($this->separator, $lines[$i]);
-				for($i=0;$i<sizeof($columnname);$i++)
+				for ($i = 0; $i < sizeof($columnname); $i++)
 				{
-					$columnname[$i]=$columnname[$i];
+					$columnname[$i] = $columnname[$i];
 				}
 				 break;                    
 			}
 		}
-	return $this->parse_lines($lines,$config_variable,$check_header_flag);
+	return $this->parse_lines($lines, $config_variable, $check_header_flag);
 	}
 	/**
 	 * Parse an array of text lines containing CSV formatted data.
@@ -59,47 +59,47 @@ 
 	 * @param    array
 	 * @return    array
 	 */
-	function parse_lines($p_CSVLines,$config_variable,$check_header_flag=false) {
+	function parse_lines($p_CSVLines, $config_variable, $check_header_flag = false) {
 //     echo "<pre>";
-		 $t=0;    
-		 $content=array();
-		 $custom_array=array();
-		 $i=0;
-		 $flag_data=false;
-		 $data_arr[0]=$config_variable;
-		 $field_name_arr=array_keys($config_variable);
-	foreach( $p_CSVLines as $line_num => $line )
+		 $t = 0;    
+		 $content = array();
+		 $custom_array = array();
+		 $i = 0;
+		 $flag_data = false;
+		 $data_arr[0] = $config_variable;
+		 $field_name_arr = array_keys($config_variable);
+	foreach ($p_CSVLines as $line_num => $line)
 		{
-	  $line=trim($line);
-		  if(!empty($line)){
+	  $line = trim($line);
+		  if ( ! empty($line)) {
 		  // skip empty lines
 		  $elements = explode($this->separator, $line);
 	      
-		  if(array_filter($elements,'trim')) {
-		$custom_array[]=$elements;
+		  if (array_filter($elements, 'trim')) {
+		$custom_array[] = $elements;
 		  }
 		  $i++;
 	   }
 		}
         
-		if($check_header_flag == 'on'){
+		if ($check_header_flag == 'on') {
 		 unset($custom_array[0]);
 		}
-	 foreach($custom_array as $data){
-	  $j=0;
-	  foreach($data as $key=>$value){
-		$value=str_replace('"', '', $value);
-		$value=str_replace("'", '', $value);
-		if(isset($field_name_arr[$j])){
-			$field_key_value =$config_variable[$field_name_arr[$j]];
-		$value= strip_slashes(trim($value));
+	 foreach ($custom_array as $data) {
+	  $j = 0;
+	  foreach ($data as $key=>$value) {
+		$value = str_replace('"', '', $value);
+		$value = str_replace("'", '', $value);
+		if (isset($field_name_arr[$j])) {
+			$field_key_value = $config_variable[$field_name_arr[$j]];
+		$value = strip_slashes(trim($value));
 				$value = preg_replace('#<script.*</script>#is', '', $value);
-				if(isset($field_key_value) && !empty($field_key_value))
-		  $content[$field_key_value] =  strip_tags(filter_var($value, FILTER_SANITIZE_STRING));                  
+				if (isset($field_key_value) && ! empty($field_key_value))
+		  $content[$field_key_value] = strip_tags(filter_var($value, FILTER_SANITIZE_STRING));                  
 		$j++;
 		}  
 	  }
-	  $data_arr[]=$content;
+	  $data_arr[] = $content;
 		}
 		return $data_arr;
 	}

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
 * CSVReader Class
 *
@@ -94,8 +96,9 @@ 
 			$field_key_value =$config_variable[$field_name_arr[$j]];
 		$value= strip_slashes(trim($value));
 				$value = preg_replace('#<script.*</script>#is', '', $value);
-				if(isset($field_key_value) && !empty($field_key_value))
-		  $content[$field_key_value] =  strip_tags(filter_var($value, FILTER_SANITIZE_STRING));                  
+				if(isset($field_key_value) && !empty($field_key_value)) {
+						  $content[$field_key_value] =  strip_tags(filter_var($value, FILTER_SANITIZE_STRING));
+				}
 		$j++;
 		}  
 	  }

web_interface/astpp/application/libraries/Timezone.php

Spacing +11 added lines, -11 removed lines

@@ -24,22 +24,22 @@ 
 	exit('No direct script access allowed');
 }
 class Timezone {
-  function __construct(){
-	$this->CI =& get_instance();
+  function __construct() {
+	$this->CI = & get_instance();
 	$this->CI->load->library('session');
 	$this->CI->load->database();
   }
 
-  function uset_timezone(){
+  function uset_timezone() {
 		$account_data = $this->CI->session->userdata('accountinfo');
-		return $account_data['timezone_id'] ;
+		return $account_data['timezone_id'];
   }
-  function display_GMT($currDate,$fulldate = 1)
+  function display_GMT($currDate, $fulldate = 1)
   {	
 	  $number = $this->uset_timezone();
-	  $SERVER_GMT='0';
+	  $SERVER_GMT = '0';
 
-	  $result=$this->CI->db->query("select gmtoffset from timezone where id =".$number);
+	  $result = $this->CI->db->query("select gmtoffset from timezone where id =".$number);
 	  $timezone_offset = $result->result();
 
 	  $USER_GMT = $timezone_offset['0']->gmtoffset;
@@ -54,7 +54,7 @@ 
 	  $year = $date_time_array['year'];
 	  $timestamp = mktime($hours, $minutes, $seconds, $month, $day, $year);
 
-	  $timestamp = $timestamp+($USER_GMT-$SERVER_GMT);
+	  $timestamp = $timestamp + ($USER_GMT - $SERVER_GMT);
 	  if ($fulldate == 1) {
 		$date = date("Y-m-d H:i:s", $timestamp);
 	  } else {
@@ -64,11 +64,11 @@ 
 	  return $date;
   }
 
-  function convert_to_GMT($currDate,$fulldate = 1){
+  function convert_to_GMT($currDate, $fulldate = 1) {
 	  $number = $this->uset_timezone();
-	  $SERVER_GMT='0';
+	  $SERVER_GMT = '0';
 
-	  $result=$this->CI->db->query("select gmtoffset from timezone where id =".$number);
+	  $result = $this->CI->db->query("select gmtoffset from timezone where id =".$number);
 	  $timezone_offset = $result->result();
 
 	  $USER_GMT = $timezone_offset['0']->gmtoffset;

web_interface/astpp/application/libraries/astpp/form.php

Indentation +161 added lines, -161 removed lines

@@ -22,180 +22,180 @@
 ###############################################################################
 
 if ( ! defined('BASEPATH'))
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 
 /**
  * Dynamically build forms for display
  */
 class Form {
 
-    protected $CI; // codeigniter
-    protected $fields = array(); // array of fields
-    protected $form_title = 'Form';
-    protected $form_id = 'form';
-    protected $form_action = '';
-    protected $form_class = '';
-    protected $hidden = array();
-    protected $multipart = FALSE; // default to standard form
-    protected $submit_button = 'Submit';
-    protected $after_button = '';
-    protected $rules = array(); // storage for validation rules
-
-    function __construct() {
-        $this->CI = & get_instance();
-        $this->CI->load->library('form_validation');
-        $this->CI->load->library('astpp/common');
-        $this->CI->load->model('db_model');
-        $this->check_permissions();
-    }
+	protected $CI; // codeigniter
+	protected $fields = array(); // array of fields
+	protected $form_title = 'Form';
+	protected $form_id = 'form';
+	protected $form_action = '';
+	protected $form_class = '';
+	protected $hidden = array();
+	protected $multipart = FALSE; // default to standard form
+	protected $submit_button = 'Submit';
+	protected $after_button = '';
+	protected $rules = array(); // storage for validation rules
+
+	function __construct() {
+		$this->CI = & get_instance();
+		$this->CI->load->library('form_validation');
+		$this->CI->load->library('astpp/common');
+		$this->CI->load->model('db_model');
+		$this->check_permissions();
+	}
 
 // __construct
-    /**
-     * adds raw html to the field array
-     */
-    function check_permissions() {
-        if ($this->CI->session->userdata('user_login') == TRUE) {
-            $module_info = unserialize($this->CI->session->userdata("permited_modules"));
-            if ($this->CI->session->userdata('userlevel_logintype') != 0 && $this->CI->session->userdata('userlevel_logintype') != 3) {
-	    $module_info[] = 'dashboard';
-            }
-            $url = $this->CI->uri->uri_string;
-            $file_name = explode("/", $url);
-            if (isset($file_name['1'])) {
-	      $module = explode('_', $file_name['1']);
-            } else {
-              $module = $file_name;
-            }
-            if ($this->CI->session->userdata('userlevel_logintype') == 1) {
+	/**
+	 * adds raw html to the field array
+	 */
+	function check_permissions() {
+		if ($this->CI->session->userdata('user_login') == TRUE) {
+			$module_info = unserialize($this->CI->session->userdata("permited_modules"));
+			if ($this->CI->session->userdata('userlevel_logintype') != 0 && $this->CI->session->userdata('userlevel_logintype') != 3) {
+		$module_info[] = 'dashboard';
+			}
+			$url = $this->CI->uri->uri_string;
+			$file_name = explode("/", $url);
+			if (isset($file_name['1'])) {
+		  $module = explode('_', $file_name['1']);
+			} else {
+			  $module = $file_name;
+			}
+			if ($this->CI->session->userdata('userlevel_logintype') == 1) {
 				$module_info[] = 'user';
 			}
-            if (in_array($module[0], $module_info)) {
-                if ($this->CI->session->userdata('userlevel_logintype') == 0 && $module[0] == 'customer' && isset($file_name[1]) && $file_name[1] != 'customer_transfer') {
-                     redirect(base_url().'user/user/');
-                } else {
-                   return true;
-                }
-            } else {
-                $this->CI->session->set_userdata('astpp_errormsg', 'You do not have permission to access this module..!');
-                if ($this->CI->session->userdata('userlevel_logintype') == '-1' || $this->CI->session->userdata('logintype') == '1') {
-                    redirect(base_url().'dashboard/');
-                } else {
-                    redirect(base_url().'user/user/');
-                }
-            }
-        } else {
-            redirect(base_url());
-        }
-    }
-
-    function build_form($fields_array, $values) {
-        $form_contents = '';
-        $form_contents .= '<div class="pop_md col-md-12 margin-t-10 padding-x-8">';
-        if (isset($fields_array['breadcrumb'])) {
-            $form_contents .= form_breadcrumb($fields_array['breadcrumb']);
-            unset($fields_array['breadcrumb']);
-        }
-        $form_contents .= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
-        unset($fields_array['forms']);
-        $button_array = array();
-        if (isset($fields_array['button_save']) || isset($fields_array['button_cancel']) || isset($fields_array['additional_button'])) {
-            $save = $fields_array['button_save'];
-            unset($fields_array['button_save']);
-            if (isset($fields_array['button_cancel'])) {
-                $cancel = $fields_array['button_cancel'];
-                unset($fields_array['button_cancel']);
-            }
-            if (isset($fields_array['additional_button'])) {
-                $additiopnal_button = $fields_array['additional_button'];
-                unset($fields_array['additional_button']);
-            }
-        }
-        if (isset($additiopnal_button)) {
-            $form_contents .= form_button(gettext($additiopnal_button));
-        }
-        $i = 0;
-        foreach ($fields_array as $fieldset_key => $form_fileds) {
-            if (count($fields_array) > 1) {
-                if ($i == 1 || $i == 3) {
-                    $form_contents .= '<div class="col-md-6 no-padding pull-right">';
-                    $form_contents .= '<div class="col-md-12 padding-x-4">';
-                } else {
-                    $form_contents .= '<div class="col-md-6 no-padding">';
-                    $form_contents .= '<div class="col-md-12 padding-x-4">';
-                }
-            } else {
-               $form_contents .= '<div class="col-md-12 no-padding">';
-                $form_contents .= '<div class="col-md-12 no-padding">';
-            }
-            $form_contents .= '<ul class="no-padding">';
-                $form_contents .= '<div class="col-md-12 no-padding">';
-            if ($i == 1 || $i == 3) {
-                $form_contents .= form_fieldset(gettext($fieldset_key));
-            } else {
-                $form_contents .= form_fieldset(gettext($fieldset_key));
-            }
-            foreach ($form_fileds as $fieldkey => $fieldvalue) {
-                $form_contents .= '<li class="col-md-12">';
-                if ($fieldvalue[1] == 'HIDDEN') {
-                    if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-                    else
-                        $fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : '') : (isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] : '');
-                    $form_contents .= form_hidden($fieldvalue[2]['name'], $fieldvalue[2]['value']);
-                } else {
-		      $validation_arr = array();
-		      if ($fieldvalue[1] == 'INPUT') {
-		        if ( ! empty($fieldvalue[3])) {
-		          $validation_arr = explode("|", $fieldvalue[3]);
-		        }
-		      }
-		      elseif ($fieldvalue[2] == 'SELECT') {
-
-		        if (is_array($fieldvalue[4])) {
-		          $validation_arr = explode("|", $fieldvalue[4]['rules']);
-		        } else {
-		        $validation_arr = explode("|", $fieldvalue[4]);
-		        }
-		      }
-		      if ( ! empty($validation_arr)) {
-		      $fieldvalue[0] = in_array('required', $validation_arr) ? $fieldvalue[0]."<span style='color:black;'> *</span>" : $fieldvalue[0];
-		      $fieldvalue[0] = in_array('dropdown', $validation_arr) ? $fieldvalue[0]."<span style='color:black;'> *</span>" : $fieldvalue[0];
-		      }
+			if (in_array($module[0], $module_info)) {
+				if ($this->CI->session->userdata('userlevel_logintype') == 0 && $module[0] == 'customer' && isset($file_name[1]) && $file_name[1] != 'customer_transfer') {
+					 redirect(base_url().'user/user/');
+				} else {
+				   return true;
+				}
+			} else {
+				$this->CI->session->set_userdata('astpp_errormsg', 'You do not have permission to access this module..!');
+				if ($this->CI->session->userdata('userlevel_logintype') == '-1' || $this->CI->session->userdata('logintype') == '1') {
+					redirect(base_url().'dashboard/');
+				} else {
+					redirect(base_url().'user/user/');
+				}
+			}
+		} else {
+			redirect(base_url());
+		}
+	}
+
+	function build_form($fields_array, $values) {
+		$form_contents = '';
+		$form_contents .= '<div class="pop_md col-md-12 margin-t-10 padding-x-8">';
+		if (isset($fields_array['breadcrumb'])) {
+			$form_contents .= form_breadcrumb($fields_array['breadcrumb']);
+			unset($fields_array['breadcrumb']);
+		}
+		$form_contents .= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
+		unset($fields_array['forms']);
+		$button_array = array();
+		if (isset($fields_array['button_save']) || isset($fields_array['button_cancel']) || isset($fields_array['additional_button'])) {
+			$save = $fields_array['button_save'];
+			unset($fields_array['button_save']);
+			if (isset($fields_array['button_cancel'])) {
+				$cancel = $fields_array['button_cancel'];
+				unset($fields_array['button_cancel']);
+			}
+			if (isset($fields_array['additional_button'])) {
+				$additiopnal_button = $fields_array['additional_button'];
+				unset($fields_array['additional_button']);
+			}
+		}
+		if (isset($additiopnal_button)) {
+			$form_contents .= form_button(gettext($additiopnal_button));
+		}
+		$i = 0;
+		foreach ($fields_array as $fieldset_key => $form_fileds) {
+			if (count($fields_array) > 1) {
+				if ($i == 1 || $i == 3) {
+					$form_contents .= '<div class="col-md-6 no-padding pull-right">';
+					$form_contents .= '<div class="col-md-12 padding-x-4">';
+				} else {
+					$form_contents .= '<div class="col-md-6 no-padding">';
+					$form_contents .= '<div class="col-md-12 padding-x-4">';
+				}
+			} else {
+			   $form_contents .= '<div class="col-md-12 no-padding">';
+				$form_contents .= '<div class="col-md-12 no-padding">';
+			}
+			$form_contents .= '<ul class="no-padding">';
+				$form_contents .= '<div class="col-md-12 no-padding">';
+			if ($i == 1 || $i == 3) {
+				$form_contents .= form_fieldset(gettext($fieldset_key));
+			} else {
+				$form_contents .= form_fieldset(gettext($fieldset_key));
+			}
+			foreach ($form_fileds as $fieldkey => $fieldvalue) {
+				$form_contents .= '<li class="col-md-12">';
+				if ($fieldvalue[1] == 'HIDDEN') {
+					if (isset($this->CI->input->post))
+						$fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+					else
+						$fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : '') : (isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] : '');
+					$form_contents .= form_hidden($fieldvalue[2]['name'], $fieldvalue[2]['value']);
+				} else {
+			  $validation_arr = array();
+			  if ($fieldvalue[1] == 'INPUT') {
+				if ( ! empty($fieldvalue[3])) {
+				  $validation_arr = explode("|", $fieldvalue[3]);
+				}
+			  }
+			  elseif ($fieldvalue[2] == 'SELECT') {
+
+				if (is_array($fieldvalue[4])) {
+				  $validation_arr = explode("|", $fieldvalue[4]['rules']);
+				} else {
+				$validation_arr = explode("|", $fieldvalue[4]);
+				}
+			  }
+			  if ( ! empty($validation_arr)) {
+			  $fieldvalue[0] = in_array('required', $validation_arr) ? $fieldvalue[0]."<span style='color:black;'> *</span>" : $fieldvalue[0];
+			  $fieldvalue[0] = in_array('dropdown', $validation_arr) ? $fieldvalue[0]."<span style='color:black;'> *</span>" : $fieldvalue[0];
+			  }
  
-                    if (is_array($fieldvalue[1]) || (is_array($fieldvalue[2]) && isset($fieldvalue[2]['hidden']))) {
-                        $form_contents .= form_label(gettext($fieldvalue[0]), $fieldvalue[0], array('class' => 'col-md-3 no-padding add_settings'));
-                    } else {
-                        $form_contents .= form_label(gettext($fieldvalue[0]), "", array("class" => "col-md-3 no-padding"));
-                    }
-                }
-                if ($fieldvalue[2] == 'SELECT' && ! isset($fieldvalue[13])) {
-
-                /*
+					if (is_array($fieldvalue[1]) || (is_array($fieldvalue[2]) && isset($fieldvalue[2]['hidden']))) {
+						$form_contents .= form_label(gettext($fieldvalue[0]), $fieldvalue[0], array('class' => 'col-md-3 no-padding add_settings'));
+					} else {
+						$form_contents .= form_label(gettext($fieldvalue[0]), "", array("class" => "col-md-3 no-padding"));
+					}
+				}
+				if ($fieldvalue[2] == 'SELECT' && ! isset($fieldvalue[13])) {
+
+				/*
                  To make Drop down enabled disabled
                 */
-                 $extra = isset($fieldvalue[1]['extra']) ? $fieldvalue[1]['extra'] : '';
-                 /***************************/
-                    if ($fieldvalue[7] != '' && $fieldvalue[8] != '') {
-                        $str = $fieldvalue[7].",".$fieldvalue[8];
-
-                        if (isset($this->CI->input->post)) {
-                            $fieldvalue['value'] = ( ! $this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
-                        } else {
-                            if (is_array($fieldvalue[1])) {
-                                $fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]['name']] : @$fieldvalue[1];
-                            } else {
-                                $fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]] : @$fieldvalue[1];
-                            }
-                        }
-                        $drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
-
-                        if ($fieldset_key ==  gettext('System Configuration Information') || ($fieldset_key == 'Billing Information'  && $fieldvalue[0] == 'Force Trunk') || ($fieldset_key == 'Card Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Account') || $fieldset_key == 'Freeswitch Devices' && $fieldvalue[0] == 'Rate Group' || ($fieldset_key== 'Origination Rate Add/Edit' && $fieldvalue[0] == 'Trunks' )||$fieldset_key== 'Billing Information' && $fieldvalue[0] == 'Rate Group'  || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Failover GW Name #1') || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Failover GW Name #2') || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key== 'Sip Devices' && $fieldvalue[0] == 'Sip Profile') || ($fieldset_key== 'Sip Devices' && $fieldvalue[0] == 'Account')) {
-                            $form_contents.=form_dropdown_all($fieldvalue[1], $drp_array, $fieldvalue['value'],$extra);
-                        } else {
-                            $form_contents.=form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
-                        }
-			            if(isset($fieldvalue[4]) && $fieldvalue[4] != ''){
-                        	if(is_array($fieldvalue[4])){
+				 $extra = isset($fieldvalue[1]['extra']) ? $fieldvalue[1]['extra'] : '';
+				 /***************************/
+					if ($fieldvalue[7] != '' && $fieldvalue[8] != '') {
+						$str = $fieldvalue[7].",".$fieldvalue[8];
+
+						if (isset($this->CI->input->post)) {
+							$fieldvalue['value'] = ( ! $this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
+						} else {
+							if (is_array($fieldvalue[1])) {
+								$fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]['name']] : @$fieldvalue[1];
+							} else {
+								$fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]] : @$fieldvalue[1];
+							}
+						}
+						$drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
+
+						if ($fieldset_key ==  gettext('System Configuration Information') || ($fieldset_key == 'Billing Information'  && $fieldvalue[0] == 'Force Trunk') || ($fieldset_key == 'Card Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Account') || $fieldset_key == 'Freeswitch Devices' && $fieldvalue[0] == 'Rate Group' || ($fieldset_key== 'Origination Rate Add/Edit' && $fieldvalue[0] == 'Trunks' )||$fieldset_key== 'Billing Information' && $fieldvalue[0] == 'Rate Group'  || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Failover GW Name #1') || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Failover GW Name #2') || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key== 'Sip Devices' && $fieldvalue[0] == 'Sip Profile') || ($fieldset_key== 'Sip Devices' && $fieldvalue[0] == 'Account')) {
+							$form_contents.=form_dropdown_all($fieldvalue[1], $drp_array, $fieldvalue['value'],$extra);
+						} else {
+							$form_contents.=form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
+						}
+						if(isset($fieldvalue[4]) && $fieldvalue[4] != ''){
+							if(is_array($fieldvalue[4])){
 								
 								if(isset($fieldvalue[1]['name'])){
 									$fieldvalue_pass=$fieldvalue[1]['name'];

Spacing +191 added lines, -191 removed lines

@@ -189,38 +189,38 @@ 
                         }
                         $drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
 
-                        if ($fieldset_key ==  gettext('System Configuration Information') || ($fieldset_key == 'Billing Information'  && $fieldvalue[0] == 'Force Trunk') || ($fieldset_key == 'Card Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Account') || $fieldset_key == 'Freeswitch Devices' && $fieldvalue[0] == 'Rate Group' || ($fieldset_key== 'Origination Rate Add/Edit' && $fieldvalue[0] == 'Trunks' )||$fieldset_key== 'Billing Information' && $fieldvalue[0] == 'Rate Group'  || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Failover GW Name #1') || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Failover GW Name #2') || ($fieldset_key== 'Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key== 'Sip Devices' && $fieldvalue[0] == 'Sip Profile') || ($fieldset_key== 'Sip Devices' && $fieldvalue[0] == 'Account')) {
-                            $form_contents.=form_dropdown_all($fieldvalue[1], $drp_array, $fieldvalue['value'],$extra);
+                        if ($fieldset_key == gettext('System Configuration Information') || ($fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Force Trunk') || ($fieldset_key == 'Card Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Account') || $fieldset_key == 'Freeswitch Devices' && $fieldvalue[0] == 'Rate Group' || ($fieldset_key == 'Origination Rate Add/Edit' && $fieldvalue[0] == 'Trunks') || $fieldset_key == 'Billing Information' && $fieldvalue[0] == 'Rate Group' || ($fieldset_key == 'Information' && $fieldvalue[0] == 'Failover GW Name #1') || ($fieldset_key == 'Information' && $fieldvalue[0] == 'Failover GW Name #2') || ($fieldset_key == 'Information' && $fieldvalue[0] == 'Rate Group') || ($fieldset_key == 'Sip Devices' && $fieldvalue[0] == 'Sip Profile') || ($fieldset_key == 'Sip Devices' && $fieldvalue[0] == 'Account')) {
+                            $form_contents .= form_dropdown_all($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
                         } else {
-                            $form_contents.=form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
+                            $form_contents .= form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
                         }
-			            if(isset($fieldvalue[4]) && $fieldvalue[4] != ''){
-                        	if(is_array($fieldvalue[4])){
+			            if (isset($fieldvalue[4]) && $fieldvalue[4] != '') {
+                        	if (is_array($fieldvalue[4])) {
 								
-								if(isset($fieldvalue[1]['name'])){
-									$fieldvalue_pass=$fieldvalue[1]['name'];
-								}else{
-									$fieldvalue_pass=$fieldvalue[1];
+								if (isset($fieldvalue[1]['name'])) {
+									$fieldvalue_pass = $fieldvalue[1]['name'];
+								} else {
+									$fieldvalue_pass = $fieldvalue[1];
 								}
 								
 								$this->CI->form_validation->set_rules($fieldvalue_pass, $fieldvalue[0], $fieldvalue[4]['rules']);
-							}else{
+							} else {
 								
-								if(isset($fieldvalue[1]['name'])){
-									$fieldvalue_pass=$fieldvalue[1]['name'];
-								}else{
-									$fieldvalue_pass=$fieldvalue[1];
+								if (isset($fieldvalue[1]['name'])) {
+									$fieldvalue_pass = $fieldvalue[1]['name'];
+								} else {
+									$fieldvalue_pass = $fieldvalue[1];
 								}
 								
 							   $this->CI->form_validation->set_rules($fieldvalue_pass, $fieldvalue[0], $fieldvalue[4]);
 							}   
 						}
-						$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.(is_array($fieldvalue[1])?$fieldvalue[1]['name']:$fieldvalue[1]).'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-						$form_contents.= '<span class="popup_error error  no-padding" id="'.(gettext(is_array($fieldvalue[1])?$fieldvalue[1]['name']:$fieldvalue[1])).'_error">
+						$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.(is_array($fieldvalue[1]) ? $fieldvalue[1]['name'] : $fieldvalue[1]).'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+						$form_contents .= '<span class="popup_error error  no-padding" id="'.(gettext(is_array($fieldvalue[1]) ? $fieldvalue[1]['name'] : $fieldvalue[1])).'_error">
                         </span></div>';                         
 					} else {
 						if (isset($this->CI->input->post)) {
-							$fieldvalue['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
+							$fieldvalue['value'] = ( ! $this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
 						} else {
 							if (is_array($fieldvalue[1])) {
 								$fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]['name']] : @$fieldvalue[1];
@@ -229,53 +229,53 @@ 
 							}
 						}
 
-						$str = $fieldvalue[7] . "," . $fieldvalue[8];
+						$str = $fieldvalue[7].",".$fieldvalue[8];
 						$drp_array = call_user_func_array(array($this->CI->common, $fieldvalue[10]), array($fieldvalue[9]));
-						$form_contents.=form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'],$extra);
-						if(isset($fieldvalue[4]) && $fieldvalue[4] != ''){
+						$form_contents .= form_dropdown($fieldvalue[1], $drp_array, $fieldvalue['value'], $extra);
+						if (isset($fieldvalue[4]) && $fieldvalue[4] != '') {
 			  $this->CI->form_validation->set_rules($fieldvalue[1], $fieldvalue[0], $fieldvalue[4]);
 						}
-						$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.(is_array($fieldvalue[1])?$fieldvalue[1]['name']:$fieldvalue[1]).'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-						$form_contents.= '<span class="popup_error error  no-padding" id="'.(is_array($fieldvalue[1])?$fieldvalue[1]['name']:$fieldvalue[1]).'_error">
+						$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.(is_array($fieldvalue[1]) ? $fieldvalue[1]['name'] : $fieldvalue[1]).'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+						$form_contents .= '<span class="popup_error error  no-padding" id="'.(is_array($fieldvalue[1]) ? $fieldvalue[1]['name'] : $fieldvalue[1]).'_error">
                         </span></div>';                        
 					}
 				} else if (isset($fieldvalue[13]) && $fieldvalue[13] != '') {
 
 					/* For multi select code */
-					$str = $fieldvalue[7] . "," . $fieldvalue[8];
+					$str = $fieldvalue[7].",".$fieldvalue[8];
 
 					if (isset($this->CI->input->post))
-						$fieldvalue['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
+						$fieldvalue['value'] = ( ! $this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
 					else
 						$fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]] : @$fieldvalue[1];
 
 					$drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
 					if ($fieldset_key === 'System Configuration Information') {
-						$form_contents.=form_dropdown_multiselect($fieldvalue[1], $drp_array, '');
+						$form_contents .= form_dropdown_multiselect($fieldvalue[1], $drp_array, '');
 					} else {
-						$form_contents.=form_dropdown_multiselect($fieldvalue[1] . "[]", $drp_array, $fieldvalue['value']);
+						$form_contents .= form_dropdown_multiselect($fieldvalue[1]."[]", $drp_array, $fieldvalue['value']);
 					}
-					if(isset($fieldvalue[4]) && $fieldvalue[4] != ''){
+					if (isset($fieldvalue[4]) && $fieldvalue[4] != '') {
 			$this->CI->form_validation->set_rules($fieldvalue[1], $fieldvalue[0], $fieldvalue[4]);
 					}
-					$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[1].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-					$form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[1].'_error"></span></div>';                   
+					$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[1].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+					$form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue[1].'_error"></span></div>';                   
 					/* End---------------------   For multi select code */
 				} else if ($fieldvalue[1] == 'INPUT') {
 
 
 					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? $fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-					else{
-						$fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : ''):(isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] :'');
+						$fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? $fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+					else {
+						$fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : '') : (isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] : '');
 					}    
-					$form_contents.= form_input($fieldvalue[2], 'readonly');
-					if(isset($fieldvalue[6]) && !empty($fieldvalue[6])){
-						$form_contents.=$fieldvalue[6];
+					$form_contents .= form_input($fieldvalue[2], 'readonly');
+					if (isset($fieldvalue[6]) && ! empty($fieldvalue[6])) {
+						$form_contents .= $fieldvalue[6];
 					}    
 					$this->CI->form_validation->set_rules($fieldvalue[2]['name'], $fieldvalue[0], $fieldvalue[3]);
-					$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-					$form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
+					$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+					$form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
                     </span></div>';
 				}
 				/* 
@@ -283,98 +283,98 @@ 
                  */
 				else if ($fieldvalue[1] == 'IMAGE') {
 					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+						$fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
                        
 					else
 						$fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
 						$fieldvalue[2]['style'] = isset($fieldvalue[2]['style']) ? $fieldvalue[2]['style'] : "";
-					$form_contents.= form_image($fieldvalue[2], 'readonly',$fieldvalue[2]['style']);
-						 $form_contents.=@$fieldvalue[6];
+					$form_contents .= form_image($fieldvalue[2], 'readonly', $fieldvalue[2]['style']);
+						 $form_contents .= @$fieldvalue[6];
 					$this->CI->form_validation->set_rules($fieldvalue[2]['name'], $fieldvalue[0], $fieldvalue[3]);
-					$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-					$form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
+					$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+					$form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
                     </span></div>';
 				}
 				else if ($fieldvalue[1] == 'DEL_BUTTON') {
 					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+						$fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
                        
 					else
 						$fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
 						$fieldvalue[2]['style'] = isset($fieldvalue[2]['style']) ? $fieldvalue[2]['style'] : "";
-					$form_contents.= form_img_delete($fieldvalue[2], 'readonly',$fieldvalue[2]['style']);
-						 $form_contents.=@$fieldvalue[6];
+					$form_contents .= form_img_delete($fieldvalue[2], 'readonly', $fieldvalue[2]['style']);
+						 $form_contents .= @$fieldvalue[6];
 					$this->CI->form_validation->set_rules($fieldvalue[2]['name'], $fieldvalue[0], $fieldvalue[3]);
-					$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-					$form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
+					$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+					$form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
                     </span></div>';
 				}
 				/**********************************************************************************/
 				else if ($fieldvalue[1] == 'PASSWORD') {
 					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+						$fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
 					else
-						$fieldvalue[2]['value'] = ($values) ?@$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
-					$form_contents.= form_password($fieldvalue[2]);
+						$fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					$form_contents .= form_password($fieldvalue[2]);
 					$this->CI->form_validation->set_rules($fieldvalue[2]['name'], $fieldvalue[0], $fieldvalue[3]);
-					$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
-					$form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
+					$form_contents .= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
+					$form_contents .= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
                     </span></div>';
 				} else if ($fieldvalue[2] == 'CHECKBOX') {
 					$OptionArray = array();
 
-					if(isset($fieldvalue[7]) && $fieldvalue[7] != '')
+					if (isset($fieldvalue[7]) && $fieldvalue[7] != '')
 					$OptionArray = call_user_func_array(array($this->CI->common, $fieldvalue[7]), array($fieldvalue[6]));
-					if (isset($this->CI->input->post)){
-						$fieldvalue[3]['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[3]['value'] : $this->CI->input->post($fieldvalue[1]);
+					if (isset($this->CI->input->post)) {
+						$fieldvalue[3]['value'] = ( ! $this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[3]['value'] : $this->CI->input->post($fieldvalue[1]);
 					}    
 					else
 					{
-						$fieldvalue[3]['value'] = ($values) ? (isset($values[$fieldvalue[1]]) && $values[$fieldvalue[1]] ? 1: 0) : @$fieldvalue[3]['value'];
+						$fieldvalue[3]['value'] = ($values) ? (isset($values[$fieldvalue[1]]) && $values[$fieldvalue[1]] ? 1 : 0) : @$fieldvalue[3]['value'];
 					}
 					if ($fieldvalue[3]['value'] == "1") {
 						$checked = true;
 					} else {
 						$checked = false;
 					};
-					if(isset($fieldvalue[3]['table_name']) && $fieldvalue[3]['table_name'] != ""){
+					if (isset($fieldvalue[3]['table_name']) && $fieldvalue[3]['table_name'] != "") {
 							
-						 $form_contents.= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'],$checked , $OptionArray);
-					}else{
-						 $form_contents.= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'],$checked ,$OptionArray);
+						 $form_contents .= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'], $checked, $OptionArray);
+					} else {
+						 $form_contents .= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'], $checked, $OptionArray);
 					}
 				} else if ($fieldvalue[1] == 'TEXTAREA') {
 
 					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+						$fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
 					else
 						$fieldvalue[2]['value'] = ($values) ? $values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
-					$form_contents.= form_textarea($fieldvalue[2]);
+					$form_contents .= form_textarea($fieldvalue[2]);
 				}
 				else if ($fieldvalue[2] == 'RADIO') {
 
-					$form_contents.= form_radio($fieldvalue[1], $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
+					$form_contents .= form_radio($fieldvalue[1], $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
 				}
-				$form_contents.= '</li>';
+				$form_contents .= '</li>';
 			}
 
-			$form_contents.= '</ul>';
-			$form_contents.= '</div>';
-			$form_contents.= '</div>';
+			$form_contents .= '</ul>';
+			$form_contents .= '</div>';
+			$form_contents .= '</div>';
 			$i++;
 		}
 
-		$form_contents.= '<center><div class="col-md-12 margin-t-20 margin-b-20">';
+		$form_contents .= '<center><div class="col-md-12 margin-t-20 margin-b-20">';
 
-		$form_contents.= form_button($save);
+		$form_contents .= form_button($save);
 
 	if (isset($cancel)) {
-			$form_contents.= form_button($cancel);
+			$form_contents .= form_button($cancel);
 		}
-		$form_contents.= '</center></div>';
-		$form_contents.= form_fieldset_close();
-		$form_contents.= form_close();
-		$form_contents.= '</div>';
+		$form_contents .= '</center></div>';
+		$form_contents .= form_fieldset_close();
+		$form_contents .= form_close();
+		$form_contents .= '</div>';
 
 
 		return $form_contents;
@@ -382,8 +382,8 @@ 
 
 	function build_serach_form($fields_array) {
 		$form_contents = '';
-		$form_contents.= '<div>';
-		$form_contents.= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
+		$form_contents .= '<div>';
+		$form_contents .= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
 		unset($fields_array['forms']);
 		$button_array = array();
 	/*******
@@ -396,13 +396,13 @@ 
 				$cancel = $fields_array['button_reset'];
 				unset($fields_array['button_reset']);
 			}
-		$button_search_delete='';
+		$button_search_delete = '';
 			if (isset($fields_array['button_search_delete'])) {
 				$button_search_delete = $fields_array['button_search_delete'];
 				unset($fields_array['button_search_delete']);
 			}
-			if(isset($fields_array['display_in'])){
-		  $display_in=$fields_array['display_in'];
+			if (isset($fields_array['display_in'])) {
+		  $display_in = $fields_array['display_in'];
 		  unset($fields_array['display_in']);
 		}
 		}
@@ -410,31 +410,31 @@ 
 		$i = 1;
 		foreach ($fields_array as $fieldset_key => $form_fileds) {
 
-			$form_contents.= '<ul class="padding-15">';
-			$form_contents.= form_fieldset(gettext($fieldset_key),array('style' => 'font-weight:bold;'),"search");
+			$form_contents .= '<ul class="padding-15">';
+			$form_contents .= form_fieldset(gettext($fieldset_key), array('style' => 'font-weight:bold;'), "search");
 
 			foreach ($form_fileds as $fieldkey => $fieldvalue) {
 				if ($i == 0) {
-					$form_contents.= '<li class="col-md-12">';
+					$form_contents .= '<li class="col-md-12">';
 				}
-				$form_contents.= '<div class="col-md-3 no-padding">';
+				$form_contents .= '<div class="col-md-3 no-padding">';
 				if ($fieldvalue[1] == 'HIDDEN') {
-					$form_contents.= form_hidden($fieldvalue[2], $fieldvalue[3]);
+					$form_contents .= form_hidden($fieldvalue[2], $fieldvalue[3]);
 				} else {
-					$form_contents.= form_label(gettext($fieldvalue[0]), "", array("class" => "search_label col-md-12 no-padding"));
+					$form_contents .= form_label(gettext($fieldvalue[0]), "", array("class" => "search_label col-md-12 no-padding"));
 				}
 				if ($fieldvalue[1] == 'INPUT') {
-					$form_contents.= form_input($fieldvalue[2]);
+					$form_contents .= form_input($fieldvalue[2]);
 				}
 
 
 				if ($fieldvalue[2] == 'SELECT' || $fieldvalue[5] == '1') {
 			  
 					if ($fieldvalue[7] != '' && $fieldvalue[8] != '') {
-						$str = $fieldvalue[7] . "," . $fieldvalue[8];
+						$str = $fieldvalue[7].",".$fieldvalue[8];
 
 						$drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
-						$form_contents.=form_dropdown_all(gettext($fieldvalue[1]), $drp_array, '');
+						$form_contents .= form_dropdown_all(gettext($fieldvalue[1]), $drp_array, '');
 					} else {
 
 						if ($fieldvalue[1] == 'INPUT') {
@@ -442,54 +442,54 @@ 
 						}
 			
 						$drp_array = call_user_func_array(array($this->CI->common, $fieldvalue[10]), array($fieldvalue[9]));
-						$form_contents.=form_dropdown_all_search(gettext($fieldvalue[1]), $drp_array, '');
+						$form_contents .= form_dropdown_all_search(gettext($fieldvalue[1]), $drp_array, '');
 					}
 				} else if ($fieldvalue[1] == 'PASSWORD') {
-					$form_contents.= form_password($fieldvalue[2]);
+					$form_contents .= form_password($fieldvalue[2]);
 				} else if ($fieldvalue[2] == 'CHECKBOX') {
-					$form_contents.= form_checkbox(gettext($fieldvalue[1]), $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
+					$form_contents .= form_checkbox(gettext($fieldvalue[1]), $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
 				}
-				$form_contents.= '</div>';
+				$form_contents .= '</div>';
 				if ($i % 5 == 0) {
-					$form_contents.= '</li>';
+					$form_contents .= '</li>';
 					$i = 0;
 				}
 				$i++;
 			}
 		}
-		$form_contents.= '<div class="col-md-12 margin-t-20 margin-b-20">';
-		$form_contents.= form_button($cancel);
-		$form_contents.= form_button($save);
-		if(!empty($display_in)){
-			$form_contents.="<div class='col-md-5 pull-right'>";
-			$form_contents.="<div class='col-md-3'></div>";
-			$extra_parameters['class']=$display_in['label_class'];
-			$extra_parameters['style']=$display_in['label_style'];
-			$form_contents.=form_label($display_in['content'], "",$extra_parameters);
-			$drp_array = call_user_func_array(array($this->CI->common,$display_in['function']),array());
-			$extra_parameters['class']=$display_in['dropdown_class'];
-			$extra_parameters['style']=$display_in['dropdown_style'];
-			$form_contents.=form_dropdown_all_search($display_in, $drp_array, '',$extra_parameters);
-			$form_contents.="</div>";
+		$form_contents .= '<div class="col-md-12 margin-t-20 margin-b-20">';
+		$form_contents .= form_button($cancel);
+		$form_contents .= form_button($save);
+		if ( ! empty($display_in)) {
+			$form_contents .= "<div class='col-md-5 pull-right'>";
+			$form_contents .= "<div class='col-md-3'></div>";
+			$extra_parameters['class'] = $display_in['label_class'];
+			$extra_parameters['style'] = $display_in['label_style'];
+			$form_contents .= form_label($display_in['content'], "", $extra_parameters);
+			$drp_array = call_user_func_array(array($this->CI->common, $display_in['function']), array());
+			$extra_parameters['class'] = $display_in['dropdown_class'];
+			$extra_parameters['style'] = $display_in['dropdown_style'];
+			$form_contents .= form_dropdown_all_search($display_in, $drp_array, '', $extra_parameters);
+			$form_contents .= "</div>";
 		}
-		if(isset($button_search_delete) && $button_search_delete != ''){
-	  $form_contents.= form_button($button_search_delete);
+		if (isset($button_search_delete) && $button_search_delete != '') {
+	  $form_contents .= form_button($button_search_delete);
 		}
-		$form_contents.='<div class="col-md-12 no-padding margin-t-15" style="">
+		$form_contents .= '<div class="col-md-12 no-padding margin-t-15" style="">
 		<div class="pull-right btn-close" id="global_clearsearch_filter">Close</div> 
 	</div>';
-		$form_contents.= '</ul>';        
-		$form_contents.= '</div>';
-		$form_contents.= form_fieldset_close();
-		$form_contents.= form_close();
-		$form_contents.= '</div>';
+		$form_contents .= '</ul>';        
+		$form_contents .= '</div>';
+		$form_contents .= form_fieldset_close();
+		$form_contents .= form_close();
+		$form_contents .= '</div>';
 
 		return $form_contents;
 	}
 	function build_batchupdate_form($fields_array) {
 		$form_contents = '';
-		$form_contents.= '<div >';
-		$form_contents.= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
+		$form_contents .= '<div >';
+		$form_contents .= form_open($fields_array['forms'][0], $fields_array['forms'][1]);
 		unset($fields_array['forms']);
 		$button_array = array();
 		if (isset($fields_array['button_search']) || isset($fields_array['button_reset'])) {
@@ -503,69 +503,69 @@ 
 		$i = 1;
 		foreach ($fields_array as $fieldset_key => $form_fileds) {
 
-			$form_contents.= '<ul>';
-			$form_contents.= form_fieldset(gettext($fieldset_key), array('style' => 'margin-left:-22px;font-weight:bold;'));
+			$form_contents .= '<ul>';
+			$form_contents .= form_fieldset(gettext($fieldset_key), array('style' => 'margin-left:-22px;font-weight:bold;'));
 			foreach ($form_fileds as $fieldkey => $fieldvalue) {
 				if ($i == 0) {
-					$form_contents.= '<li>';
+					$form_contents .= '<li>';
 				}
-				$form_contents.= '<div class="col-md-4 no-padding">';
+				$form_contents .= '<div class="col-md-4 no-padding">';
 				if ($fieldvalue[1] == 'HIDDEN') {
-					$form_contents.= form_hidden($fieldvalue[2], $fieldvalue[3]);
+					$form_contents .= form_hidden($fieldvalue[2], $fieldvalue[3]);
 				} else {
-					$form_contents.= form_label(gettext($fieldvalue[0]), "", array("class" => "search_label col-md-12 no-padding"));
+					$form_contents .= form_label(gettext($fieldvalue[0]), "", array("class" => "search_label col-md-12 no-padding"));
 				}
 				if ($fieldvalue[2] == 'SELECT' || $fieldvalue[5] == '1') {
 					if ($fieldvalue[7] != '' && $fieldvalue[8] != '') {
-						$str = $fieldvalue[7] . "," . $fieldvalue[8];
-						if(is_array($fieldvalue[13])){
+						$str = $fieldvalue[7].",".$fieldvalue[8];
+						if (is_array($fieldvalue[13])) {
 							$drp_array = call_user_func_array(array($this->CI->common, $fieldvalue[14]), array($fieldvalue[13]));
-							$form_contents.=form_dropdown($fieldvalue[13], $drp_array, '');
+							$form_contents .= form_dropdown($fieldvalue[13], $drp_array, '');
 						}
 						/**
   		        ASTPP  3.0 
    		        Reseller Batch Update
 						 **/ 
-						if($fieldvalue[10] == 'set_status'){
-			$drp_array =array('0'=>'Active','1'=>'Inactive');
+						if ($fieldvalue[10] == 'set_status') {
+			$drp_array = array('0'=>'Active', '1'=>'Inactive');
 			}
 			/************************************************************/
-			else{
-						$drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));}
-						$form_contents.=form_dropdown_all($fieldvalue[1], $drp_array, '');
+			else {
+						$drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12])); }
+						$form_contents .= form_dropdown_all($fieldvalue[1], $drp_array, '');
 					} else {
 						if ($fieldvalue[1] == 'INPUT') {
 							$drp_name = $fieldvalue[6];
 						}
 						$drp_array = call_user_func_array(array($this->CI->common, $fieldvalue[10]), array($fieldvalue[9]));
-						$form_contents.=form_dropdown($drp_name, $drp_array, '');
+						$form_contents .= form_dropdown($drp_name, $drp_array, '');
 					}
 				}
 				if ($fieldvalue[1] == 'INPUT') {
-					$form_contents.= form_input($fieldvalue[2]);
+					$form_contents .= form_input($fieldvalue[2]);
 				} else if ($fieldvalue[2] == 'CHECKBOX') {
-					$form_contents.= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
+					$form_contents .= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
 				}
-				$form_contents.= '</div>';
+				$form_contents .= '</div>';
 				if ($i % 5 == 0) {
-					$form_contents.= '</li>';
+					$form_contents .= '</li>';
 					$i = 0;
 				}
 				$i++;
 			}
 		}
 
-		$form_contents.= '</ul>';
-		$form_contents.= '<div class="col-md-12 margin-t-20 margin-b-20">';
+		$form_contents .= '</ul>';
+		$form_contents .= '<div class="col-md-12 margin-t-20 margin-b-20">';
 
-		$form_contents.= form_button($cancel);
-		$form_contents.= form_button($save);
-		$form_contents.='<div class="col-md-12 no-padding margin-t-15" style="margin-bottom:10px; !important">
+		$form_contents .= form_button($cancel);
+		$form_contents .= form_button($save);
+		$form_contents .= '<div class="col-md-12 no-padding margin-t-15" style="margin-bottom:10px; !important">
 						<div class="pull-right btn-close" id="global_clearbatchupdate_filter">Close</div></div>';
-		$form_contents.= form_fieldset_close();
-		$form_contents.= form_close();
-		$form_contents.= '</div>';
-		$form_contents.= '</div>';
+		$form_contents .= form_fieldset_close();
+		$form_contents .= form_close();
+		$form_contents .= '</div>';
+		$form_contents .= '</div>';
 
 		return $form_contents;
 	}
@@ -597,21 +597,21 @@ 
                 ASTPP  3.0 
                 For Edit on Account number or name
             */
-		$row_id = isset($row['id']) ? $row["id"]: '';
+		$row_id = isset($row['id']) ? $row["id"] : '';
 /*****************************/
 				foreach ($grid_fields as $field_key => $field_arr) {
 /**
 ASTPP  3.0 
 For Edit on Account number or name
 **/
-			 $Actionkey = array_search(gettext('Action'), $this->CI->common->array_column($grid_fields,0));
+			 $Actionkey = array_search(gettext('Action'), $this->CI->common->array_column($grid_fields, 0));
 /*********************************/
 					if ($field_arr[2] != "") {
 						if ($field_arr[3] != "") {
-						   if($field_arr[2]=="status"){
+						   if ($field_arr[2] == "status") {
 							$row['id'] = $row_id;
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row));
-			   }else{
+			   } else {
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row[$field_arr[2]]));
 			   }
 
@@ -620,53 +620,53 @@ 
 For Edit on Account number or name
 **/
 				$row[$field_arr[2]] = $jsn_tmp[$field_key];
-			} if(array_search("EDITABLE", $field_arr)){
+			} if (array_search("EDITABLE", $field_arr)) {
 				$ActionArr = $grid_fields[$Actionkey];
-				if($ActionArr[5]->EDIT->url =="accounts/customer_edit/" || $ActionArr[5]->EDIT->url =="accounts/provider_edit/"){
-				   $ActionArr[5]->EDIT->url=$row['type']==0 ?  "accounts/customer_edit/"  : "accounts/provider_edit/";
+				if ($ActionArr[5]->EDIT->url == "accounts/customer_edit/" || $ActionArr[5]->EDIT->url == "accounts/provider_edit/") {
+				   $ActionArr[5]->EDIT->url = $row['type'] == 0 ? "accounts/customer_edit/" : "accounts/provider_edit/";
 				}
-				if($ActionArr[5]->EDIT->url =="accounts/admin_edit/" || $ActionArr[5]->EDIT->url =="accounts/subadmin_edit/"){
-				   $ActionArr[5]->EDIT->url=$row['type']==4 ?  "accounts/subadmin_edit/"  : "accounts/admin_edit/";
+				if ($ActionArr[5]->EDIT->url == "accounts/admin_edit/" || $ActionArr[5]->EDIT->url == "accounts/subadmin_edit/") {
+				   $ActionArr[5]->EDIT->url = $row['type'] == 4 ? "accounts/subadmin_edit/" : "accounts/admin_edit/";
 				}
 				$acctype = "";
-				if(isset($row["type"]) && ($row["type"] == '0' || $row["type"] == '1' || $row["type"] == '3')){
-					$acctype = (isset($row["posttoexternal"]) && $row["posttoexternal"] != '')? "<span class='label label-default pull-right'>".$this->CI->common->get_account_type("","",$row["posttoexternal"])."</span>":"";
+				if (isset($row["type"]) && ($row["type"] == '0' || $row["type"] == '1' || $row["type"] == '3')) {
+					$acctype = (isset($row["posttoexternal"]) && $row["posttoexternal"] != '') ? "<span class='label label-default pull-right'>".$this->CI->common->get_account_type("", "", $row["posttoexternal"])."</span>" : "";
 				}
 
-				$fieldstr = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT,$row[$field_arr[2]],$row["id"]);
-				if($acctype != ''){
+				$fieldstr = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT, $row[$field_arr[2]], $row["id"]);
+				if ($acctype != '') {
 					$jsn_tmp[$field_key] = $fieldstr."<br/>".$acctype;
-				}else{
+				} else {
 					$jsn_tmp[$field_key] = $fieldstr;
 				}
 			    
 
 /*********************************/
-			  }else {
+			  } else {
 							$jsn_tmp[$field_key] = $row[$field_arr[2]];
 				  }                  				
 			} else {
 				if ($field_arr[0] == gettext("Action")) {
-				if(isset($field_arr[5]) && isset($field_arr[5]->EDIT) && isset($field_arr[5]->DELETE)){
+				if (isset($field_arr[5]) && isset($field_arr[5]->EDIT) && isset($field_arr[5]->DELETE)) {
 		             
-					  if($field_arr[5]->EDIT->url == 'accounts/customer_edit/' || $field_arr[5]->EDIT->url == 'accounts/provider_edit/' || $field_arr[5]->DELETE->url == 'accounts/provider_delete/' ||$field_arr[5]->DELETE->url == 'accounts/customer_delete/'){
-					   if( $row['type'] == '0'|| strtolower($row['type']) == 'customer'){
-						$field_arr[5]->EDIT->url ='accounts/customer_edit/';
-						$field_arr[5]->DELETE->url ='accounts/customer_delete/';
+					  if ($field_arr[5]->EDIT->url == 'accounts/customer_edit/' || $field_arr[5]->EDIT->url == 'accounts/provider_edit/' || $field_arr[5]->DELETE->url == 'accounts/provider_delete/' || $field_arr[5]->DELETE->url == 'accounts/customer_delete/') {
+					   if ($row['type'] == '0' || strtolower($row['type']) == 'customer') {
+						$field_arr[5]->EDIT->url = 'accounts/customer_edit/';
+						$field_arr[5]->DELETE->url = 'accounts/customer_delete/';
 					   }
-					   if($row['type'] == 3 || strtolower($row['type']) == 'provider'){
-						$field_arr[5]->EDIT->url ='accounts/provider_edit/';
-						$field_arr[5]->DELETE->url ='accounts/provider_delete/';
+					   if ($row['type'] == 3 || strtolower($row['type']) == 'provider') {
+						$field_arr[5]->EDIT->url = 'accounts/provider_edit/';
+						$field_arr[5]->DELETE->url = 'accounts/provider_delete/';
 					   }
 					  }
-					  if($field_arr[5]->EDIT->url == 'accounts/admin_edit/' || $field_arr[5]->EDIT->url == 'accounts/subadmin_edit/' || $field_arr[5]->DELETE->url == 'accounts/admin_delete/' ||$field_arr[5]->DELETE->url == 'accounts/subadmin_delete/'){
-					   if($row['type'] == 2 || strtolower($row['type']) == 'administrator'){
-						$field_arr[5]->EDIT->url ='accounts/admin_edit/';
-						$field_arr[5]->DELETE->url ='accounts/admin_delete/';
+					  if ($field_arr[5]->EDIT->url == 'accounts/admin_edit/' || $field_arr[5]->EDIT->url == 'accounts/subadmin_edit/' || $field_arr[5]->DELETE->url == 'accounts/admin_delete/' || $field_arr[5]->DELETE->url == 'accounts/subadmin_delete/') {
+					   if ($row['type'] == 2 || strtolower($row['type']) == 'administrator') {
+						$field_arr[5]->EDIT->url = 'accounts/admin_edit/';
+						$field_arr[5]->DELETE->url = 'accounts/admin_delete/';
 					   }
-					   if($row['type'] == 4 || strtolower($row['type']) == 'sub admin'){
-						$field_arr[5]->EDIT->url ='accounts/subadmin_edit/';
-						$field_arr[5]->DELETE->url ='accounts/subadmin_delete/';
+					   if ($row['type'] == 4 || strtolower($row['type']) == 'sub admin') {
+						$field_arr[5]->EDIT->url = 'accounts/subadmin_edit/';
+						$field_arr[5]->DELETE->url = 'accounts/subadmin_delete/';
 					   }
 					}
 			   }
@@ -677,16 +677,16 @@ 
 							$jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row_id);
 							/****************************************************************************/
 						}
-						elseif($field_arr[0] == gettext("Profile Action"))
+						elseif ($field_arr[0] == gettext("Profile Action"))
 						{
-						   if(isset($field_arr[5]) && isset($field_arr[5]->START) && isset($field_arr[5]->STOP) && isset($field_arr[5]->RELOAD) && isset($field_arr[5]->RESCAN)){
+						   if (isset($field_arr[5]) && isset($field_arr[5]->START) && isset($field_arr[5]->STOP) && isset($field_arr[5]->RELOAD) && isset($field_arr[5]->RESCAN)) {
 							}
 						   $jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row["id"]);
                         
 						}
 						else {
-							$className = (isset($field_arr['9']) && $field_arr['9'] != '')?$field_arr['9']:"chkRefNos";
-							$jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id=' . $row['id'] . ' class="ace '.$className.'" onclick="clickchkbox(' . $row['id'] . ')" value=' . $row['id'] . '><lable class="lbl"></lable>';                        }
+							$className = (isset($field_arr['9']) && $field_arr['9'] != '') ? $field_arr['9'] : "chkRefNos";
+							$jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id='.$row['id'].' class="ace '.$className.'" onclick="clickchkbox('.$row['id'].')" value='.$row['id'].'><lable class="lbl"></lable>'; }
 					}
 				}
 				$json_data[] = array('cell' => $jsn_tmp);
@@ -700,20 +700,20 @@ 
 		$json_data = array();
 		foreach ($query as $row) {
 			foreach ($grid_fields as $field_key => $field_arr) {
-				$row_id = isset($row['id']) ? $row["id"]: '';
+				$row_id = isset($row['id']) ? $row["id"] : '';
 /**
 ASTPP  3.0 
 For Edit on Account number or name
 **/
-		$Actionkey = array_search('Action',$this->CI->common->array_column($grid_fields,0)); 
+		$Actionkey = array_search('Action', $this->CI->common->array_column($grid_fields, 0)); 
 /*******************************/
 
 				if ($field_arr[2] != "") {
 					if ($field_arr[3] != "") {
-						 if($field_arr[2]=="status"){
+						 if ($field_arr[2] == "status") {
 							$row['id'] = $row_id;
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row));
-						 }else{
+						 } else {
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row[$field_arr[2]]));
 						 }
 /**
@@ -721,17 +721,17 @@ 
 For Edit on Account number or name
 **/
  			$row[$field_arr[2]] = $jsn_tmp[$field_key];
-					  } if(array_search("EDITABLE", $field_arr)){
+					  } if (array_search("EDITABLE", $field_arr)) {
 				$ActionArr = $grid_fields[$Actionkey];
-				if($ActionArr[5]->EDIT->url =="accounts/customer_edit/" || $ActionArr[5]->EDIT->url =="accounts/provider_edit/"){
-				   $ActionArr[5]->EDIT->url=$row['type']==0 ?  "accounts/customer_edit/"  : "accounts/provider_edit/";
+				if ($ActionArr[5]->EDIT->url == "accounts/customer_edit/" || $ActionArr[5]->EDIT->url == "accounts/provider_edit/") {
+				   $ActionArr[5]->EDIT->url = $row['type'] == 0 ? "accounts/customer_edit/" : "accounts/provider_edit/";
 				}
-				if($ActionArr[5]->EDIT->url =="accounts/admin_edit/" || $ActionArr[5]->EDIT->url =="accounts/subadmin_edit/"){
-				   $ActionArr[5]->EDIT->url=$row['type']==4 ?  "accounts/subadmin_edit/"  : "accounts/admin_edit/";
+				if ($ActionArr[5]->EDIT->url == "accounts/admin_edit/" || $ActionArr[5]->EDIT->url == "accounts/subadmin_edit/") {
+				   $ActionArr[5]->EDIT->url = $row['type'] == 4 ? "accounts/subadmin_edit/" : "accounts/admin_edit/";
 				}
-				$jsn_tmp[$field_key] = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT,$row[$field_arr[2]],$row["id"]);
+				$jsn_tmp[$field_key] = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT, $row[$field_arr[2]], $row["id"]);
 /*******************************/
-			}else {
+			} else {
 						$jsn_tmp[$field_key] = isset($row[$field_arr[2]]) ? $row[$field_arr[2]] : "";
 					}
 				} else {
@@ -739,7 +739,7 @@ 
 						$jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row["id"]);
 					}
 			  else {
-							$jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id=' . $row['id'] . ' class="ace chkRefNos" onclick="clickchkbox(' . $row['id'] . ')" value=' . $row['id'] . '><lable class="lbl"></lable>';
+							$jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id='.$row['id'].' class="ace chkRefNos" onclick="clickchkbox('.$row['id'].')" value='.$row['id'].'><lable class="lbl"></lable>';
 						}
 				}
 			}

Braces +57 added lines, -57 removed lines

@@ -21,8 +21,9 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-if ( ! defined('BASEPATH'))
+if ( ! defined('BASEPATH')) {
     exit('No direct script access allowed');
+}
 
 /**
  * Dynamically build forms for display
@@ -137,10 +138,11 @@ 
             foreach ($form_fileds as $fieldkey => $fieldvalue) {
                 $form_contents .= '<li class="col-md-12">';
                 if ($fieldvalue[1] == 'HIDDEN') {
-                    if (isset($this->CI->input->post))
-                        $fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-                    else
-                        $fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : '') : (isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] : '');
+                    if (isset($this->CI->input->post)) {
+                                            $fieldvalue[2]['value'] = ( ! $this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+                    } else {
+                                            $fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : '') : (isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] : '');
+                    }
                     $form_contents .= form_hidden($fieldvalue[2]['name'], $fieldvalue[2]['value']);
                 } else {
 		      $validation_arr = array();
@@ -148,8 +150,7 @@ 
 		        if ( ! empty($fieldvalue[3])) {
 		          $validation_arr = explode("|", $fieldvalue[3]);
 		        }
-		      }
-		      elseif ($fieldvalue[2] == 'SELECT') {
+		      } elseif ($fieldvalue[2] == 'SELECT') {
 
 		        if (is_array($fieldvalue[4])) {
 		          $validation_arr = explode("|", $fieldvalue[4]['rules']);
@@ -199,16 +200,16 @@ 
 								
 								if(isset($fieldvalue[1]['name'])){
 									$fieldvalue_pass=$fieldvalue[1]['name'];
-								}else{
+								} else{
 									$fieldvalue_pass=$fieldvalue[1];
 								}
 								
 								$this->CI->form_validation->set_rules($fieldvalue_pass, $fieldvalue[0], $fieldvalue[4]['rules']);
-							}else{
+							} else{
 								
 								if(isset($fieldvalue[1]['name'])){
 									$fieldvalue_pass=$fieldvalue[1]['name'];
-								}else{
+								} else{
 									$fieldvalue_pass=$fieldvalue[1];
 								}
 								
@@ -244,10 +245,11 @@ 
 					/* For multi select code */
 					$str = $fieldvalue[7] . "," . $fieldvalue[8];
 
-					if (isset($this->CI->input->post))
-						$fieldvalue['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
-					else
-						$fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]] : @$fieldvalue[1];
+					if (isset($this->CI->input->post)) {
+											$fieldvalue['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[1] : $this->CI->input->post($fieldvalue[1]);
+					} else {
+											$fieldvalue['value'] = ($values) ? @$values[$fieldvalue[1]] : @$fieldvalue[1];
+					}
 
 					$drp_array = call_user_func_array(array($this->CI->db_model, $fieldvalue[10]), array($str, $fieldvalue[9], $fieldvalue[11], $fieldvalue[12]));
 					if ($fieldset_key === 'System Configuration Information') {
@@ -264,9 +266,9 @@ 
 				} else if ($fieldvalue[1] == 'INPUT') {
 
 
-					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? $fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-					else{
+					if (isset($this->CI->input->post)) {
+											$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? $fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+					} else{
 						$fieldvalue[2]['value'] = ($values) ? (isset($values[$fieldvalue[2]['name']]) ? $values[$fieldvalue[2]['name']] : ''):(isset($fieldvalue[2]['value']) ? $fieldvalue[2]['value'] :'');
 					}    
 					$form_contents.= form_input($fieldvalue[2], 'readonly');
@@ -282,11 +284,11 @@ 
                  * Image upload from invoice configuration code.
                  */
 				else if ($fieldvalue[1] == 'IMAGE') {
-					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-                       
-					else
-						$fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					if (isset($this->CI->input->post)) {
+											$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+					} else {
+											$fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					}
 						$fieldvalue[2]['style'] = isset($fieldvalue[2]['style']) ? $fieldvalue[2]['style'] : "";
 					$form_contents.= form_image($fieldvalue[2], 'readonly',$fieldvalue[2]['style']);
 						 $form_contents.=@$fieldvalue[6];
@@ -294,13 +296,12 @@ 
 					$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
 					$form_contents.= '<span class="popup_error error  no-padding" id="'.$fieldvalue[2]['name'].'_error">
                     </span></div>';
-				}
-				else if ($fieldvalue[1] == 'DEL_BUTTON') {
-					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-                       
-					else
-						$fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+				} else if ($fieldvalue[1] == 'DEL_BUTTON') {
+					if (isset($this->CI->input->post)) {
+											$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+					} else {
+											$fieldvalue[2]['value'] = ($values) ? @$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					}
 						$fieldvalue[2]['style'] = isset($fieldvalue[2]['style']) ? $fieldvalue[2]['style'] : "";
 					$form_contents.= form_img_delete($fieldvalue[2], 'readonly',$fieldvalue[2]['style']);
 						 $form_contents.=@$fieldvalue[6];
@@ -311,10 +312,11 @@ 
 				}
 				/**********************************************************************************/
 				else if ($fieldvalue[1] == 'PASSWORD') {
-					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-					else
-						$fieldvalue[2]['value'] = ($values) ?@$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					if (isset($this->CI->input->post)) {
+											$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+					} else {
+											$fieldvalue[2]['value'] = ($values) ?@$values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					}
 					$form_contents.= form_password($fieldvalue[2]);
 					$this->CI->form_validation->set_rules($fieldvalue[2]['name'], $fieldvalue[0], $fieldvalue[3]);
 					$form_contents.= '<div class="tooltips error_div pull-left no-padding" id="'.$fieldvalue[2]['name'].'_error_div" ><i style="color:#D95C5C; padding-left: 3px; padding-top: 10px;" class="fa fa-exclamation-triangle"></i>';
@@ -323,12 +325,12 @@ 
 				} else if ($fieldvalue[2] == 'CHECKBOX') {
 					$OptionArray = array();
 
-					if(isset($fieldvalue[7]) && $fieldvalue[7] != '')
-					$OptionArray = call_user_func_array(array($this->CI->common, $fieldvalue[7]), array($fieldvalue[6]));
+					if(isset($fieldvalue[7]) && $fieldvalue[7] != '') {
+										$OptionArray = call_user_func_array(array($this->CI->common, $fieldvalue[7]), array($fieldvalue[6]));
+					}
 					if (isset($this->CI->input->post)){
 						$fieldvalue[3]['value'] = (!$this->CI->input->post($fieldvalue[1])) ? @$fieldvalue[3]['value'] : $this->CI->input->post($fieldvalue[1]);
-					}    
-					else
+					} else
 					{
 						$fieldvalue[3]['value'] = ($values) ? (isset($values[$fieldvalue[1]]) && $values[$fieldvalue[1]] ? 1: 0) : @$fieldvalue[3]['value'];
 					}
@@ -340,18 +342,18 @@ 
 					if(isset($fieldvalue[3]['table_name']) && $fieldvalue[3]['table_name'] != ""){
 							
 						 $form_contents.= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'],$checked , $OptionArray);
-					}else{
+					} else{
 						 $form_contents.= form_checkbox($fieldvalue[1], $fieldvalue[3]['value'],$checked ,$OptionArray);
 					}
 				} else if ($fieldvalue[1] == 'TEXTAREA') {
 
-					if (isset($this->CI->input->post))
-						$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
-					else
-						$fieldvalue[2]['value'] = ($values) ? $values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					if (isset($this->CI->input->post)) {
+											$fieldvalue[2]['value'] = (!$this->CI->input->post($fieldvalue[2]['name'])) ? @$fieldvalue[2]['value'] : $this->CI->input->post($fieldvalue[2]['name']);
+					} else {
+											$fieldvalue[2]['value'] = ($values) ? $values[$fieldvalue[2]['name']] : @$fieldvalue[2]['value'];
+					}
 					$form_contents.= form_textarea($fieldvalue[2]);
-				}
-				else if ($fieldvalue[2] == 'RADIO') {
+				} else if ($fieldvalue[2] == 'RADIO') {
 
 					$form_contents.= form_radio($fieldvalue[1], $fieldvalue[3]['value'], $fieldvalue[3]['checked']);
 				}
@@ -581,8 +583,9 @@ 
 		$json_data["json_paging"]['total'] = $config['total_rows'];
 		$perpage = $config['per_page'];
 		$start = ($page_no - 1) * $perpage;
-		if ($start < 0)
-			$start = 0;
+		if ($start < 0) {
+					$start = 0;
+		}
 		$json_data["paging"]['start'] = $start;
 		$json_data["paging"]['page_no'] = $perpage;
 		return $json_data;
@@ -611,7 +614,7 @@ 
 						   if($field_arr[2]=="status"){
 							$row['id'] = $row_id;
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row));
-			   }else{
+			   } else{
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row[$field_arr[2]]));
 			   }
 
@@ -636,13 +639,13 @@ 
 				$fieldstr = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT,$row[$field_arr[2]],$row["id"]);
 				if($acctype != ''){
 					$jsn_tmp[$field_key] = $fieldstr."<br/>".$acctype;
-				}else{
+				} else{
 					$jsn_tmp[$field_key] = $fieldstr;
 				}
 			    
 
 /*********************************/
-			  }else {
+			  } else {
 							$jsn_tmp[$field_key] = $row[$field_arr[2]];
 				  }                  				
 			} else {
@@ -676,15 +679,13 @@ 
 */			   
 							$jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row_id);
 							/****************************************************************************/
-						}
-						elseif($field_arr[0] == gettext("Profile Action"))
+						} elseif($field_arr[0] == gettext("Profile Action"))
 						{
 						   if(isset($field_arr[5]) && isset($field_arr[5]->START) && isset($field_arr[5]->STOP) && isset($field_arr[5]->RELOAD) && isset($field_arr[5]->RESCAN)){
 							}
 						   $jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row["id"]);
                         
-						}
-						else {
+						} else {
 							$className = (isset($field_arr['9']) && $field_arr['9'] != '')?$field_arr['9']:"chkRefNos";
 							$jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id=' . $row['id'] . ' class="ace '.$className.'" onclick="clickchkbox(' . $row['id'] . ')" value=' . $row['id'] . '><lable class="lbl"></lable>';                        }
 					}
@@ -713,7 +714,7 @@ 
 						 if($field_arr[2]=="status"){
 							$row['id'] = $row_id;
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row));
-						 }else{
+						 } else{
 							$jsn_tmp[$field_key] = call_user_func_array(array($this->CI->common, $field_arr[5]), array($field_arr[3], $field_arr[4], $row[$field_arr[2]]));
 						 }
 /**
@@ -731,14 +732,13 @@ 
 				}
 				$jsn_tmp[$field_key] = $this->CI->common->build_custome_edit_button($ActionArr[5]->EDIT,$row[$field_arr[2]],$row["id"]);
 /*******************************/
-			}else {
+			} else {
 						$jsn_tmp[$field_key] = isset($row[$field_arr[2]]) ? $row[$field_arr[2]] : "";
 					}
 				} else {
 					if ($field_arr[0] == "Action") {
 						$jsn_tmp[$field_key] = $this->CI->common->get_action_buttons($field_arr[5], $row["id"]);
-					}
-			  else {
+					} else {
 							$jsn_tmp[$field_key] = '<input type="checkbox" name="chkAll" id=' . $row['id'] . ' class="ace chkRefNos" onclick="clickchkbox(' . $row['id'] . ')" value=' . $row['id'] . '><lable class="lbl"></lable>';
 						}
 				}