iNextrix / ASTPP

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

Spacing +79 added lines, -79 removed lines

@@ -34,7 +34,7 @@ 
 		$this->load->dbutil();
 
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
 	function configuration_edit($edit_id = '') {
@@ -58,7 +58,7 @@ 
 			$this->session->set_userdata('configuration_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'systems/configuration/');
+			redirect(base_url().'systems/configuration/');
 		}
 	}
 
@@ -84,29 +84,29 @@ 
 		}
 	}
 
-	function configuration($group_title='') {
-	if($group_title==""){
-		redirect(base_url() . '/dashboard');
+	function configuration($group_title = '') {
+	if ($group_title == "") {
+		redirect(base_url().'/dashboard');
 	}
-	if($group_title=="email"){
+	if ($group_title == "email") {
 		  $data['test_email_flag'] = true;
 	}
 		$data['username'] = $this->session->userdata('user_name');
 		$data['page_title'] = ucfirst($group_title);
-	$data['group_title']=$group_title;
-	$where=array("group_title"=>$group_title);
+	$data['group_title'] = $group_title;
+	$where = array("group_title"=>$group_title);
 	$details = $this->db_model->getSelect("*", "system", $where);
-	$data['details']=$details->result_array();
+	$data['details'] = $details->result_array();
 	$add_array = $this->input->post();
- 	if (!empty($add_array)) {
+ 	if ( ! empty($add_array)) {
 
-		foreach($add_array as $key=>$val){
-			$update_array=array('value'=>$val);
+		foreach ($add_array as $key=>$val) {
+			$update_array = array('value'=>$val);
 			$this->system_model->edit_configuration($update_array, $key);
 		}
 				$this->session->set_flashdata('astpp_errormsg', ucfirst($group_title).' Settings updated sucessfully!');
-			redirect(base_url() . 'systems/configuration/'.$group_title);
-		}else{
+			redirect(base_url().'systems/configuration/'.$group_title);
+		} else {
 	 	$this->load->view('view_systemconf', $data);
 	}
 	}
@@ -166,7 +166,7 @@ 
 		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
 			 $account_data = $this->session->userdata("accountinfo");
 			 $reseller = $account_data['id'];
-			 $this->resellertemplate_save($add_array,$reseller);
+			 $this->resellertemplate_save($add_array, $reseller);
 		}
 		else
 		{
@@ -174,12 +174,12 @@ 
 		}
 	}
     
-	function resellertemplate_save($data,$resellerid)
+	function resellertemplate_save($data, $resellerid)
 	{
-		$where = array('name' => $data['name'],'reseller_id'=>$resellerid);
+		$where = array('name' => $data['name'], 'reseller_id'=>$resellerid);
 		$count = $this->db_model->countQuery("*", "default_templates", $where);
 		$data['form'] = $this->form->build_form($this->system_form->get_template_form_fields(), $data);
-		if($count >0)
+		if ($count > 0)
 		{
 			$data['page_title'] = 'Edit Template';
 			if ($this->form_validation->run() == FALSE) {
@@ -188,7 +188,7 @@ 
                 
 				$this->system_model->edit_resellertemplate($data, $data['id']);
 				$this->session->set_flashdata('astpp_errormsg', 'Template updated successfully!');
-				redirect(base_url() . 'systems/template/');
+				redirect(base_url().'systems/template/');
 				exit;
 			}
 		} else {
@@ -199,7 +199,7 @@ 
 				 $data['reseller_id'] = $resellerid;
 				$this->system_model->add_resellertemplate($data);
 				$this->session->set_flashdata('astpp_errormsg', 'Template added successfully!');
-				redirect(base_url() . 'systems/template/');
+				redirect(base_url().'systems/template/');
 				exit;
 			}
 		}
@@ -217,7 +217,7 @@ 
 				 unset($data['page_title']);
 				$this->system_model->edit_template($data, $data['id']);
 				$this->session->set_flashdata('astpp_errormsg', 'Template updated successfully!');
-				redirect(base_url() . 'systems/template/');
+				redirect(base_url().'systems/template/');
 				exit;
 			}
 		} else {
@@ -228,7 +228,7 @@ 
 				 unset($data['form']);
 				$this->system_model->add_template($data);
 				$this->session->set_flashdata('astpp_errormsg', 'Template added successfully!');
-				redirect(base_url() . 'systems/template/');
+				redirect(base_url().'systems/template/');
 				exit;
 			}
 		}
@@ -245,7 +245,7 @@ 
 			$this->session->set_userdata('template_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'systems/template/');
+			redirect(base_url().'systems/template/');
 		}
 	}
 
@@ -293,7 +293,7 @@ 
 			$this->session->set_userdata('country_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'systems/country_list/');
+			redirect(base_url().'systems/country_list/');
 		}
 	}
 
@@ -352,9 +352,9 @@ 
     
 	function country_remove($id) {
 		$this->system_model->remove_country($id);
-		$country=$this->common->get_field_name('country','countrycode',$id);
+		$country = $this->common->get_field_name('country', 'countrycode', $id);
 		$this->session->set_flashdata('astpp_notification', $country.'Country removed successfully!');
-		redirect(base_url() . 'systems/country_list/');
+		redirect(base_url().'systems/country_list/');
 	}
 
 	function country_delete_multiple() {
@@ -405,7 +405,7 @@ 
 			$this->session->set_userdata('currency_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'systems/currency_list/');
+			redirect(base_url().'systems/currency_list/');
 		}
 	}
 
@@ -464,10 +464,10 @@ 
 	}
     
 	 function currency_remove($id) {
-		$currencyname=$this->common->get_field_name('currencyname','currency',$id);
+		$currencyname = $this->common->get_field_name('currencyname', 'currency', $id);
 		$this->system_model->remove_currency($id);
-		$this->session->set_flashdata('astpp_notification',$currencyname. ' Currency removed successfully!');
-		redirect(base_url() . 'systems/currency_list/');
+		$this->session->set_flashdata('astpp_notification', $currencyname.' Currency removed successfully!');
+		redirect(base_url().'systems/currency_list/');
 	}
 
 	function currency_delete_multiple() {
@@ -478,53 +478,53 @@ 
 	}
 	function database_backup()
 	{
-		$data=array();
+		$data = array();
 		$data['username'] = $this->session->userdata('user_name');
 		$data['page_title'] = 'Database Backup';
-		$filename=$this->db->database."_".date("YmdHms").".sql.gz";
+		$filename = $this->db->database."_".date("YmdHms").".sql.gz";
 		$data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($filename), '');
 		$this->load->view('view_database_backup', $data);
 	}
 	function database_backup_save()
 	{ 
 
-	  $add_array=$this->input->post();
+	  $add_array = $this->input->post();
       
-	  $data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($add_array['path'],$add_array['id']),$add_array);
+	  $data['form'] = $this->form->build_form($this->system_form->get_backup_database_form_fields($add_array['path'], $add_array['id']), $add_array);
 	  $data['page_title'] = 'Database Backup';
-	  if($add_array['id'] != ''){
+	  if ($add_array['id'] != '') {
       
-	  }else{
-		   if($this->form_validation->run() == FALSE) {
+	  } else {
+		   if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 				echo $data['validation_errors'];
 				exit;
-		  }else{
+		  } else {
 			 $db_name     = $this->db->database;
 			 $db_username = $this->db->username;
 			 $db_password = $this->db->password;
 			 $db_hostname = $this->db->hostname;
 			 $filename = $add_array['path'];
-			 $backup_file=DATABASE_DIRECTORY.$filename;
-			if (substr($backup_file,-3)=='.gz'){
-				  $backup_file = substr($backup_file,0,-3);
-				  $do_gzip=1;
+			 $backup_file = DATABASE_DIRECTORY.$filename;
+			if (substr($backup_file, -3) == '.gz') {
+				  $backup_file = substr($backup_file, 0, -3);
+				  $do_gzip = 1;
 			}
 
-		   $run_backup="/usr/bin/mysqldump -all --databases ".$db_name." -u'".$db_username."' -p'".$db_password."' > '$backup_file'";
-		   $error_zip=0;
-		   exec($run_backup,$output,$error);
-		   if ($do_gzip){
+		   $run_backup = "/usr/bin/mysqldump -all --databases ".$db_name." -u'".$db_username."' -p'".$db_password."' > '$backup_file'";
+		   $error_zip = 0;
+		   exec($run_backup, $output, $error);
+		   if ($do_gzip) {
 			  $gzip = $this->config->item('gzip-path');
 			  $run_gzip = $gzip." ".$backup_file;
-			  exec($run_gzip,$output,$error_zip);
+			  exec($run_gzip, $output, $error_zip);
 		   }
           
-		   if($error == 0 && $error_zip == 0 ){      
+		   if ($error == 0 && $error_zip == 0) {      
 			  $this->system_model->backup_insert($add_array);
 			  echo json_encode(array("SUCCESS"=> $add_array['backup_name']." backup exported successfully!"));
 			  exit;
-		   }else{
+		   } else {
 				echo 'An error occur when the system tried to backup of the database. Please check yours system settings for the backup section';
 				exit;
 		   }
@@ -541,7 +541,7 @@ 
 	{
 	$json_data = array();
 		$count_all = $this->system_model->getbackup_list(false, "", "");
-		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'],$_GET['page']);
+		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
 
 		$query = $this->system_model->getbackup_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
@@ -551,56 +551,56 @@ 
 		echo json_encode($json_data);
 	exit;
 	}
-	function database_restore_one($id='')
+	function database_restore_one($id = '')
 	{
 	   $result = $this->system_model->get_backup_data($id);
-	   $result_array=$result->result_array();
-	   if($result->num_rows() > 0)
+	   $result_array = $result->result_array();
+	   if ($result->num_rows() > 0)
 	   {
 			$db_name     = $this->db->database;
 			$db_username = $this->db->username;
 			$db_password = $this->db->password;
 			$db_hostname = $this->db->hostname;            
-			$path=DATABASE_DIRECTORY.$result_array[0]['path'];
-			if(file_exists($path)){
-			  if (substr($path,-3)=='.gz') {
+			$path = DATABASE_DIRECTORY.$result_array[0]['path'];
+			if (file_exists($path)) {
+			  if (substr($path, -3) == '.gz') {
 							$GUNZIP_EXE = $this->config->item('gunzip-path');
 							$run_gzip = $GUNZIP_EXE." < ".$path." | ";
 			  }
-			  $MYSQL="/usr/bin/mysql";
+			  $MYSQL = "/usr/bin/mysql";
 			  $run_restore = $run_gzip.$MYSQL." -h".$db_hostname." -u".$db_username." -p".$db_password." ".$db_name;
 			  exec($run_restore);
 			  $this->session->set_flashdata('astpp_errormsg', 'Database Restore successfully.');
-			  redirect(base_url() . 'systems/database_restore/');
-			}else{
+			  redirect(base_url().'systems/database_restore/');
+			} else {
 			  $this->session->set_flashdata('astpp_notification', 'File not exists!');
-			  redirect(base_url() . 'systems/database_restore/');
+			  redirect(base_url().'systems/database_restore/');
 			}
 	  }
-	  redirect(base_url() . 'systems/database_restore/');
+	  redirect(base_url().'systems/database_restore/');
 	}
 
- function database_download($id=''){
+ function database_download($id = '') {
     
 	$result = $this->system_model->get_backup_data($id);
-	$result_array=$result->result_array();
-	if($result->num_rows() > 0)
+	$result_array = $result->result_array();
+	if ($result->num_rows() > 0)
 	{
-	  $path=$result_array[0]['path'];
+	  $path = $result_array[0]['path'];
 	  $filename = basename($path);
 	  $len = filesize($path);
       
 	  header("Content-Encoding: binary");
 	  header("Content-Type: application/octet-stream");
-	  header( "content-length: " . $len );
-	  header( "content-disposition: attachment; filename=" . $filename );
+	  header("content-length: ".$len);
+	  header("content-disposition: attachment; filename=".$filename);
 	  header("Expires: 0");
 	  header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
 	  header("Cache-Control: private");
 	  header("Pragma: public");
 	  ob_clean();
-	  $fp=fopen( $path, "r" );
-	  fpassthru( $fp );
+	  $fp = fopen($path, "r");
+	  fpassthru($fp);
 	  exit;
 	}
 	}
@@ -614,17 +614,17 @@ 
    function database_import_file()
 	{
 		$filename = $_POST['fname'];
-		$upload_greeting_file= $_FILES['userfile']['name'];
-		$db_file = explode(".",$upload_greeting_file); 
-		if( $db_file[1] == 'csv' || $db_file[1] == 'tar' || $db_file[1] == 'sql'){
-			$target_path = basename( $_FILES['userfile']['name']);
-			move_uploaded_file($_FILES["userfile"]["tmp_name"], $target_path );
+		$upload_greeting_file = $_FILES['userfile']['name'];
+		$db_file = explode(".", $upload_greeting_file); 
+		if ($db_file[1] == 'csv' || $db_file[1] == 'tar' || $db_file[1] == 'sql') {
+			$target_path = basename($_FILES['userfile']['name']);
+			move_uploaded_file($_FILES["userfile"]["tmp_name"], $target_path);
           
-			$query = $this->system_model->import_database($filename,$_FILES['userfile']['name']);
-			$this->session->set_flashdata('astpp_errormsg',"The file ".  basename( $_FILES['userfile']['name'])." has been uploaded");
+			$query = $this->system_model->import_database($filename, $_FILES['userfile']['name']);
+			$this->session->set_flashdata('astpp_errormsg', "The file ".basename($_FILES['userfile']['name'])." has been uploaded");
 			redirect(base_url()."systems/database_restore/");            
-		}else{
-			$this->session->set_flashdata('astpp_notification',"There is a some issue or invalid file format.");
+		} else {
+			$this->session->set_flashdata('astpp_notification', "There is a some issue or invalid file format.");
 			redirect(base_url()."systems/database_restore/");            
 		}
 	}
@@ -634,7 +634,7 @@ 
 	  $this->db->where($where);
 	  $this->db->delete("backup_database");
 	  $this->session->set_flashdata('astpp_errormsg', 'Database backup deleted successfully.');      
-	  redirect(base_url() . 'systems/database_restore/');
+	  redirect(base_url().'systems/database_restore/');
 	  return true;
 	}
 	function database_backup_delete_multiple() {

Braces +10 added lines, -10 removed lines

@@ -33,8 +33,9 @@ 
 		$this->load->model('system_model');
 		$this->load->dbutil();
 
-		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+		if ($this->session->userdata('user_login') == FALSE) {
+					redirect(base_url() . '/astpp/login');
+		}
 	}
 
 	function configuration_edit($edit_id = '') {
@@ -106,7 +107,7 @@ 
 		}
 				$this->session->set_flashdata('astpp_errormsg', ucfirst($group_title).' Settings updated sucessfully!');
 			redirect(base_url() . 'systems/configuration/'.$group_title);
-		}else{
+		} else{
 	 	$this->load->view('view_systemconf', $data);
 	}
 	}
@@ -167,8 +168,7 @@ 
 			 $account_data = $this->session->userdata("accountinfo");
 			 $reseller = $account_data['id'];
 			 $this->resellertemplate_save($add_array,$reseller);
-		}
-		else
+		} else
 		{
 			$this->admintemplate_save($add_array);
 		}
@@ -494,12 +494,12 @@ 
 	  $data['page_title'] = 'Database Backup';
 	  if($add_array['id'] != ''){
       
-	  }else{
+	  } else{
 		   if($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 				echo $data['validation_errors'];
 				exit;
-		  }else{
+		  } else{
 			 $db_name     = $this->db->database;
 			 $db_username = $this->db->username;
 			 $db_password = $this->db->password;
@@ -524,7 +524,7 @@ 
 			  $this->system_model->backup_insert($add_array);
 			  echo json_encode(array("SUCCESS"=> $add_array['backup_name']." backup exported successfully!"));
 			  exit;
-		   }else{
+		   } else{
 				echo 'An error occur when the system tried to backup of the database. Please check yours system settings for the backup section';
 				exit;
 		   }
@@ -572,7 +572,7 @@ 
 			  exec($run_restore);
 			  $this->session->set_flashdata('astpp_errormsg', 'Database Restore successfully.');
 			  redirect(base_url() . 'systems/database_restore/');
-			}else{
+			} else{
 			  $this->session->set_flashdata('astpp_notification', 'File not exists!');
 			  redirect(base_url() . 'systems/database_restore/');
 			}
@@ -623,7 +623,7 @@ 
 			$query = $this->system_model->import_database($filename,$_FILES['userfile']['name']);
 			$this->session->set_flashdata('astpp_errormsg',"The file ".  basename( $_FILES['userfile']['name'])." has been uploaded");
 			redirect(base_url()."systems/database_restore/");            
-		}else{
+		} else{
 			$this->session->set_flashdata('astpp_notification',"There is a some issue or invalid file format.");
 			redirect(base_url()."systems/database_restore/");            
 		}

web_interface/astpp/application/modules/systems/libraries/system_form.php

Spacing +43 added lines, -43 removed lines

@@ -21,19 +21,19 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 ###############################################################################

 

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

 	exit('No direct script access allowed');

 

 class System_form {

 

 	function get_template_form_fields() {

 

-		$form['forms'] = array(base_url() . 'systems/template_save/', array("template_form", "name" => "template_form"));

+		$form['forms'] = array(base_url().'systems/template_save/', array("template_form", "name" => "template_form"));

 		$form['Email Template'] = array(

 			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

-			array(' Name', 'INPUT', array('name' => 'name', 'size' => '20',  'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

-			array('Subject', 'INPUT', array('name' => 'subject', 'size' => '20',  'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

-			array('Body', 'TEXTAREA', array('name' => 'template', 'id' => 'template', 'size' => '20',  'class' => "textarea medium"), 'trim|required', 'tOOL TIP', ''),

+			array(' Name', 'INPUT', array('name' => 'name', 'size' => '20', 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('Subject', 'INPUT', array('name' => 'subject', 'size' => '20', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('Body', 'TEXTAREA', array('name' => 'template', 'id' => 'template', 'size' => '20', 'class' => "textarea medium"), 'trim|required', 'tOOL TIP', ''),

 		);

 		$form['button_cancel'] = array('name' => 'action', 'content' => 'Cancel', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'systems/template/\')');

 		$form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'type' => 'submit', 'class' => 'btn btn-line-parrot');

@@ -46,7 +46,7 @@ 
 		$form['Search'] = array(

             

 			array(' Name', 'INPUT', array('name' => 'name[name]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'name[name-string]', '', '', '', 'search_string_type', ''),

-			array('Subject', 'INPUT', array('name' => 'subject[subject]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'subject[subject-string]', '', '', '', 'search_string_type', ''),array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

+			array('Subject', 'INPUT', array('name' => 'subject[subject]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'subject[subject-string]', '', '', '', 'search_string_type', ''), array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

 			array('', 'HIDDEN', 'advance_search', '1', '', '', '')

 		);

 		$form['button_search'] = array('name' => 'action', 'id' => "template_search_btn", 'content' => 'Search', 'value' => 'save', 'type' => 'button', 'class' => 'btn btn-line-parrot pull-right');

@@ -56,12 +56,12 @@ 
 

 	function get_configuration_form_fields() {

 

-		$form['forms'] = array(base_url() . 'systems/configuration_save/', array("id" => "config_form", "name" => "config_form"));

+		$form['forms'] = array(base_url().'systems/configuration_save/', array("id" => "config_form", "name" => "config_form"));

 		$form['Edit Settings '] = array(

 			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

-			array('Name', 'INPUT', array('name' => 'name', 'size' => '20',  'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

+			array('Name', 'INPUT', array('name' => 'name', 'size' => '20', 'readonly' => true, 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', ''),

 			array('Value', 'INPUT', array('name' => 'value', 'size' => '20', 'class' => "text field medium"), 'trim|required', 'tOOL TIP', ''),

-			array('Comment', 'INPUT', array('name' => 'comment', 'size' => '20',  'class' => "text field medium"), '', 'tOOL TIP', ''),

+			array('Comment', 'INPUT', array('name' => 'comment', 'size' => '20', 'class' => "text field medium"), '', 'tOOL TIP', ''),

 		);

 

 		$form['button_cancel'] = array('name' => 'action', 'content' => 'Cancel', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

@@ -77,7 +77,7 @@ 
 			array('Name', 'INPUT', array('name' => 'name[name]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'name[name-string]', '', '', '', 'search_string_type', ''),

 			array('Value', 'INPUT', array('name' => 'value[value]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'value[value-string]', '', '', '', 'search_string_type', ''),

 			array('Description', 'INPUT', array('name' => 'comment[comment]', '', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '1', 'comment[comment-string]', '', '', '', 'search_string_type', ''),

-			array('Group', 'group_title', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'group_title', 'group_title', 'system', 'build_dropdown','where_arr',"group_title NOT IN ('asterisk','osc','freepbx')", 'group_by', 'group_title'),

+			array('Group', 'group_title', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'group_title', 'group_title', 'system', 'build_dropdown', 'where_arr', "group_title NOT IN ('asterisk','osc','freepbx')", 'group_by', 'group_title'),

 			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),

 			array('', 'HIDDEN', 'advance_search', '1', '', '', '')

 		);

@@ -92,7 +92,7 @@ 
 			array("Value", "190", "value", "", "", ""),

 			array("Description", "320", "comment", "", "", ""),

 			array("Group", "120", "group_title", "", "", ""),

-			array("Action", "442", "", "", "",array("EDIT" => array("url" => "systems/configuration_edit/", "mode" => "popup"),

+			array("Action", "442", "", "", "", array("EDIT" => array("url" => "systems/configuration_edit/", "mode" => "popup"),

 			))

 				));

 		return $grid_field_arr;

@@ -105,9 +105,9 @@ 
 	}

 

 	function build_template_list_for_admin() {

-		$grid_field_arr = json_encode(array(array("Name", "425", "name", "", "", "","","true","center"),

-			array("Subject", "650", "subject", "", "", "","","true","center"),

-			array("Action", "200", "", "", "",array("EDIT" => array("url" => "systems/template_edit/", "mode" => "single"),

+		$grid_field_arr = json_encode(array(array("Name", "425", "name", "", "", "", "", "true", "center"),

+			array("Subject", "650", "subject", "", "", "", "", "true", "center"),

+			array("Action", "200", "", "", "", array("EDIT" => array("url" => "systems/template_edit/", "mode" => "single"),

 			))

 				));

 		return $grid_field_arr;

@@ -116,10 +116,10 @@ 
 	function build_country_list_for_admin() {     

 			$action = 'systems/country_list_edit/';

 			$action_remove = 'systems/country_remove/';

-			$mode="popup";

+			$mode = "popup";

 		$grid_field_arr = json_encode(array(

-		array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "50", "", "", "", "","","false","center"),

-			array("Name", "705", "country", "", "", "","","true","center"),

+		array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "50", "", "", "", "", "", "false", "center"),

+			array("Name", "705", "country", "", "", "", "", "true", "center"),

 			   array("Action", "100", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),

 					"DELETE" => array("url" => "$action_remove", "mode" => "single")

 				))

@@ -128,8 +128,8 @@ 
 	 }

     

 	 function build_admin_grid_buttons() {

-		$buttons_json = json_encode(array(array("Create","btn btn-line-warning btn","fa fa-plus-circle fa-lg", "button_action", "systems/country_add/", "popup"),

-			array("Delete",  "btn btn-line-danger","fa fa-times-circle fa-lg", "button_action", "systems/country_delete_multiple"),

+		$buttons_json = json_encode(array(array("Create", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "systems/country_add/", "popup"),

+			array("Delete", "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "systems/country_delete_multiple"),

 		   ));

 		return $buttons_json;

 	}

@@ -153,10 +153,10 @@ 
 	 function get_country_form_fields() {

      

         

-		$form['forms'] = array(base_url() . 'systems/country_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

+		$form['forms'] = array(base_url().'systems/country_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

 		$form['Country List'] = array(

 			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

-			array('Name', 'INPUT', array('name' => 'country', 'size' => '20',  'class' => "text field medium"), 'trim|required|char|min_length[2]|max_length[20]|xss_clean', 'tOOL TIP', 'Please Enter country'),

+			array('Name', 'INPUT', array('name' => 'country', 'size' => '20', 'class' => "text field medium"), 'trim|required|char|min_length[2]|max_length[20]|xss_clean', 'tOOL TIP', 'Please Enter country'),

 

 		);

 		$form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'button', 'class' => 'btn btn-line-parrot');

@@ -167,13 +167,13 @@ 
 	  function build_currency_list_for_admin() {        

 			$action = 'systems/currency_list_edit/';

 			$action_remove = 'systems/currency_remove/';

-			$mode="popup";

+			$mode = "popup";

         

 		$grid_field_arr = json_encode(array(

-		array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "70", "", "", "", "","","false","center"),

-			array("Name", "320", "currencyname", "", "", "","","true","center"),

-		array("Code", "290", "currency", "", "", "","","true","center"),

-		array(" Rate", "330", "currencyrate", "", "", "","","true","right"),

+		array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "70", "", "", "", "", "", "false", "center"),

+			array("Name", "320", "currencyname", "", "", "", "", "true", "center"),

+		array("Code", "290", "currency", "", "", "", "", "true", "center"),

+		array(" Rate", "330", "currencyrate", "", "", "", "", "true", "right"),

 			   array("Action", "265", "", "", "", array("EDIT" => array("url" => "$action", "mode" => "$mode"),

 					"DELETE" => array("url" => "$action_remove", "mode" => "single")

 				))

@@ -201,12 +201,12 @@ 
 	function get_currency_form_fields() {

      

         

-		$form['forms'] = array(base_url() . 'systems/currency_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

+		$form['forms'] = array(base_url().'systems/currency_save/', array('id' => 'system_form', 'method' => 'POST', 'name' => 'system_form'));

 		$form['Currency List'] = array(

 			array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

-			array('Name', 'INPUT', array('name' => 'currencyname', 'size' => '20','maxlength' => '40',  'class' => "text field medium"), 'trim|required|char|xss_clean', 'tOOL TIP', 'Please Enter country'),

-			array('Code', 'INPUT', array('name' => 'currency', 'size' => '20','maxlength' => '3', 'class' => "text field medium"), 'trim|required|char|xss_clean', 'tOOL TIP', 'Please Enter country'),

-			array('Rate', 'INPUT', array('name' => 'currencyrate', 'size' => '20','maxlength' => '7', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter country'),

+			array('Name', 'INPUT', array('name' => 'currencyname', 'size' => '20', 'maxlength' => '40', 'class' => "text field medium"), 'trim|required|char|xss_clean', 'tOOL TIP', 'Please Enter country'),

+			array('Code', 'INPUT', array('name' => 'currency', 'size' => '20', 'maxlength' => '3', 'class' => "text field medium"), 'trim|required|char|xss_clean', 'tOOL TIP', 'Please Enter country'),

+			array('Rate', 'INPUT', array('name' => 'currencyrate', 'size' => '20', 'maxlength' => '7', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter country'),

 

 		);

 		$form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'button', 'class' => 'btn btn-line-parrot');

@@ -215,21 +215,21 @@ 
 	}

 

 	 function build_admin_currency_grid_buttons() {

-		$buttons_json = json_encode(array(array("Create","btn btn-line-warning btn","fa fa-plus-circle fa-lg", "button_action", "systems/currency_add/", "popup"),

-			array("Update Currencies","btn btn-line-blue" ,"fa fa-upload fa-lg", "button_action", "currencyupdate/update_currency/", 'single'),

-			array("Delete","btn btn-line-danger","fa fa-times-circle fa-lg", "button_action", "systems/currency_delete_multiple"),

+		$buttons_json = json_encode(array(array("Create", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "systems/currency_add/", "popup"),

+			array("Update Currencies", "btn btn-line-blue", "fa fa-upload fa-lg", "button_action", "currencyupdate/update_currency/", 'single'),

+			array("Delete", "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "systems/currency_delete_multiple"),

 		   ));

 		return $buttons_json;

 	}

  

   

-  function get_backup_database_form_fields($file_name,$id='') {

+  function get_backup_database_form_fields($file_name, $id = '') {

    $val = $id > 0 ? "backup_database.path.$id" : 'backup_database.path';

-	  $form['forms'] = array(base_url() . 'systems/database_backup_save/',array('id' => 'backup_form', 'method' => 'POST', 'name' => 'backup_form'));

+	  $form['forms'] = array(base_url().'systems/database_backup_save/', array('id' => 'backup_form', 'method' => 'POST', 'name' => 'backup_form'));

 	  $form['Database Information'] = array(

 	  array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

 	  array('Name', 'INPUT', array('name' => 'backup_name', 'size' => '20', 'class' => "text field medium"), 'required', 'tOOL TIP', ''),

-	  array('File Name', 'INPUT', array('name' => 'path', 'size' => '20', 'value'=>$file_name,'class' => "text field medium"), 'trim|required|is_unique[' . $val . ']', 'tOOL TIP', ''),

+	  array('File Name', 'INPUT', array('name' => 'path', 'size' => '20', 'value'=>$file_name, 'class' => "text field medium"), 'trim|required|is_unique['.$val.']', 'tOOL TIP', ''),

 	  );

 	  $form['button_cancel'] = array('name' => 'action', 'content' => 'Close', 'value' => 'cancel', 'type' => 'button', 'class' => 'btn btn-line-sky  margin-x-10', 'onclick' => 'return redirect_page(\'NULL\')');

 	  $form['button_save'] = array('name' => 'action', 'content' => 'Save', 'value' => 'save', 'id' => 'submit', 'type' => 'button', 'class' => 'btn btn-line-parrot');

@@ -237,10 +237,10 @@ 
   }

   function build_backupdastabase_list() {

 		$grid_field_arr = json_encode(array(

-			array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "50", "", "", "", "","","false","center"),

-			array("Date", "260", "date", "date", "date", "convert_GMT_to","","true","center"),

-			array("Name", "295", "backup_name", "", "", "","","true","center"),

-			array("File Name", "480", "path", "", "", "","","true","center"),

+			array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "50", "", "", "", "", "", "false", "center"),

+			array("Date", "260", "date", "date", "date", "convert_GMT_to", "", "true", "center"),

+			array("Name", "295", "backup_name", "", "", "", "", "true", "center"),

+			array("File Name", "480", "path", "", "", "", "", "true", "center"),

 			array("Action", "185", "", "", "",

 			array("EDIT_RESTORE" => array("url" => "systems/database_restore_one/", "mode" => ""),

 			"DOWNLOAD_DATABASE" => array("url" => "systems/database_download/", "mode" => ""),

@@ -249,9 +249,9 @@ 
 		return $grid_field_arr;

 	}

 	function build_backupdastabase_buttons() {

-		$buttons_json = json_encode(array(array("Create","btn btn-line-warning btn","fa fa-plus-circle fa-lg", "button_action", "systems/database_backup/", "popup"),

-		  array("import","btn btn-line-blue" ,"fa fa-upload fa-lg", "button_action", "systems/database_import/", "popup"),	

-		array("Delete","btn btn-line-danger","fa fa-times-circle fa-lg", "button_action", "systems/database_backup_delete_multiple")

+		$buttons_json = json_encode(array(array("Create", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "systems/database_backup/", "popup"),

+		  array("import", "btn btn-line-blue", "fa fa-upload fa-lg", "button_action", "systems/database_import/", "popup"),	

+		array("Delete", "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "systems/database_backup_delete_multiple")

 						));

 		  return $buttons_json;

 	}

Braces +3 added lines, -2 removed lines

@@ -22,8 +22,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 ###############################################################################

 

-if (!defined('BASEPATH'))

-	exit('No direct script access allowed');

+if (!defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 

 class Package_form {

 

web_interface/astpp/application/modules/systems/views/view_systemconf.php

Spacing +13 added lines, -13 removed lines

@@ -176,35 +176,35 @@
               <fieldset>

                <legend> <?=ucfirst($group_title)?></legend>

                   <div style="width:50%;float:left;">

-                    <?php $currency = Common_model::$global_config['system_config']['base_currency'];?>

-                    <?php $count=ceil(sizeof($details)/2); $i=0; $class="tleft";?>

-                    <?php foreach($details as$key=>$val){ ?>

-                          <?php if($count==$i){

+                    <?php $currency = Common_model::$global_config['system_config']['base_currency']; ?>

+                    <?php $count = ceil(sizeof($details) / 2); $i = 0; $class = "tleft"; ?>

+                    <?php foreach ($details as$key=>$val) { ?>

+                          <?php if ($count == $i) {

 							  echo '</div><div style="width:50%;float:left;">';

-							  $class="tright";

+							  $class = "tright";

 						  } ?>

                           <div class="col-md-12">

                             <div class="<?=$class?>" href='#'>

-                            <label class="col-md-5 no-padding"><?php echo $val['display_name'];?> * </label>

-                            <?php if(method_exists($this->common,$val['field_type'])){

-								$option_array =  $this->common->$val['field_type'](); 

+                            <label class="col-md-5 no-padding"><?php echo $val['display_name']; ?> * </label>

+                            <?php if (method_exists($this->common, $val['field_type'])) {

+								$option_array = $this->common->$val['field_type'](); 

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

-									  foreach($option_array as $option_key=>$option_val){

-										$selected = ($val['value'] == $option_key)? "selected='selected'":"";

+									  foreach ($option_array as $option_key=>$option_val) {

+										$selected = ($val['value'] == $option_key) ? "selected='selected'" : "";

 										$drpstr .= '<option value="'.$option_key.'"'.$selected.'>'.$option_val.'</option>';

 									  }

 								$drpstr .= '</select>';

 								echo $drpstr;

 								unset($drpstr);

-							} else{

+							} else {

 								echo '<input name="'.$val["name"].'" value="'.$val['value'].'" size="20" maxlength="100" class="col-md-5 form-control" type="text">'; 

 							}?>

-                              <span class="demo"><?php echo str_replace('smtp',"SMTP",$val['comment']);?></span>

+                              <span class="demo"><?php echo str_replace('smtp', "SMTP", $val['comment']); ?></span>

 

                             </div>

                           </div>  

 

-                      <?php $i++;?>

+                      <?php $i++; ?>

                     <?php }?>

                   </div>

               </fieldset>

web_interface/astpp/application/modules/pricing/models/pricing_model.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 		/*
         ASTPP  3.0  Add Rategroup add creation date.
         */
-		$add_array['creation_date']=gmdate("Y-m-d H:i:s");
+		$add_array['creation_date'] = gmdate("Y-m-d H:i:s");
 		/************************************/
 		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
 			$account_data = $this->session->userdata("accountinfo");
@@ -67,7 +67,7 @@ 
 		/*
         ASTPP  3.0  Edit Rategroup time update last mofied date.
         */
-		$data['last_modified_date']=gmdate("Y-m-d H:i:s");
+		$data['last_modified_date'] = gmdate("Y-m-d H:i:s");
 		/*********************************************************/
 		$this->db->where("id", $id);
 		$this->db->update("pricelists", $data);

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

Spacing +45 added lines, -45 removed lines

@@ -33,7 +33,7 @@ 
 		$this->load->model('pricing_model');
 
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 	}
 
 	function price_add($type = "") {
@@ -52,9 +52,9 @@ 
 		foreach ($account->result_array() as $key => $value) {
 			$edit_data = $value;
 		}
-	$routing_data = $this->db_model->getSelect("trunk_id", "routing",array("pricelist_id"=>$edit_id));
-	if($routing_data->num_rows > 0){
-	  foreach($routing_data->result_array() as $trunkid){
+	$routing_data = $this->db_model->getSelect("trunk_id", "routing", array("pricelist_id"=>$edit_id));
+	if ($routing_data->num_rows > 0) {
+	  foreach ($routing_data->result_array() as $trunkid) {
 		$edit_data["trunk_id"][] = $trunkid["trunk_id"];
 	  }
 	}
@@ -84,30 +84,30 @@ 
 				exit;
 			}
 			$this->load->view('view_price_add_edit', $data);
-	   }else {
+	   } else {
 			$data['page_title'] = 'Create Price Details';
 			if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 				echo $data['validation_errors'];
 				exit;
 			} else {
-		if(isset($add_array['trunk_id']) && !empty($add_array['trunk_id']))
-				$trunk_id=$add_array['trunk_id'];
+		if (isset($add_array['trunk_id']) && ! empty($add_array['trunk_id']))
+				$trunk_id = $add_array['trunk_id'];
 				unset($add_array['trunk_id']);
-				$priceid=$this->pricing_model->add_price($add_array);
-		if(isset($trunk_id) && $trunk_id != ''){
-		  $this->set_force_routing($priceid,$trunk_id);
+				$priceid = $this->pricing_model->add_price($add_array);
+		if (isset($trunk_id) && $trunk_id != '') {
+		  $this->set_force_routing($priceid, $trunk_id);
 		}
 				echo json_encode(array("SUCCESS"=> $add_array["name"]." rate group added successfully!"));
 				exit;
 			}
 		}
 	}
-	function set_force_routing($priceid,$trunkid){
+	function set_force_routing($priceid, $trunkid) {
 // 	echo "<pre>".$priceid; print_r($trunkid);
-	foreach($trunkid as $id){
+	foreach ($trunkid as $id) {
 	  $routing_arr = array("trunk_id" => $id, "pricelist_id"=>$priceid);
-	  $this->db->insert("routing",$routing_arr);
+	  $this->db->insert("routing", $routing_arr);
 	}
 	}
 	function price_list_search() {
@@ -121,7 +121,7 @@ 
 			$this->session->set_userdata('price_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'accounts/customer_list/');
+			redirect(base_url().'accounts/customer_list/');
 		}
 	}
 
@@ -161,9 +161,9 @@ 
 	function price_delete($pricelist_id) {
 		$where = array("id" => $pricelist_id);
 		$this->db_model->update("pricelists", array("status" => "2"), $where);
-	$this->db->delete("routing",array("pricelist_id"=>$pricelist_id));
+	$this->db->delete("routing", array("pricelist_id"=>$pricelist_id));
 		$this->session->set_flashdata('astpp_notification', 'Rate group removed successfully!');
-		redirect(base_url() . 'pricing/price_list/');
+		redirect(base_url().'pricing/price_list/');
 	}
 
  function price_delete_multiple() {
@@ -173,59 +173,59 @@ 
 			$update_data = array('status' => '2');
 			$this->db->where('pricelist_id '.$where);
 			$this->db->delete('routes');            
-			$this->db->delete("routing",array("pricelist_id"=>$where));
+			$this->db->delete("routing", array("pricelist_id"=>$where));
 			$this->db->where('id '.$where);
 			echo $this->db->update('pricelists', $update_data);
 		} else {
-			$pricelist_arr=array();
+			$pricelist_arr = array();
 			//Get selected Rategroup Name from database.
 			$this->db->select('id,name');
 			$this->db->where('id '.$where);
-			$pricelist_res=$this->db->get('pricelists');
-			$pricelist_res=$pricelist_res->result_array();
-			foreach($pricelist_res as $value){
-				$pricelist_arr[$value['id']]['name']=$value['name'];
+			$pricelist_res = $this->db->get('pricelists');
+			$pricelist_res = $pricelist_res->result_array();
+			foreach ($pricelist_res as $value) {
+				$pricelist_arr[$value['id']]['name'] = $value['name'];
 			}
 			//Get count of accounts which are using selected rategroups.
 			$this->db->where('pricelist_id '.$where);
-			$this->db->where('deleted',0);
+			$this->db->where('deleted', 0);
 			$this->db->select('count(id) as cnt,pricelist_id');
 			$this->db->group_by('pricelist_id');
-			$account_res=$this->db->get('accounts');
-			if($account_res->num_rows() > 0){
-			 $account_res=$account_res->result_array();
-			 foreach($account_res as $key=>$value){
-				$pricelist_arr[$value['pricelist_id']]['account']=$value['cnt'];
+			$account_res = $this->db->get('accounts');
+			if ($account_res->num_rows() > 0) {
+			 $account_res = $account_res->result_array();
+			 foreach ($account_res as $key=>$value) {
+				$pricelist_arr[$value['pricelist_id']]['account'] = $value['cnt'];
 			 }
 			}
 			//Get count of routes which are using selected rategroups.
 			$this->db->where('pricelist_id '.$where);
 			$this->db->select('count(id) as cnt,pricelist_id');
 			$this->db->group_by('pricelist_id');
-			$routes_res=$this->db->get('routes');
-			if($routes_res->num_rows() > 0){
-			 $routes_res=$routes_res->result_array();
-			 foreach($routes_res as $key=>$value){
-				$pricelist_arr[$value['pricelist_id']]['routes']=$value['cnt'];
+			$routes_res = $this->db->get('routes');
+			if ($routes_res->num_rows() > 0) {
+			 $routes_res = $routes_res->result_array();
+			 foreach ($routes_res as $key=>$value) {
+				$pricelist_arr[$value['pricelist_id']]['routes'] = $value['cnt'];
 			 }
 			}
-			$str=null;
-			foreach($pricelist_arr as $key=>$value){
-			   $custom_str=null;
-			   if(isset($value['account']) || isset($value['routes'])){
-				 if(isset($value['account'])){
-					 $custom_str.= $value['account']." accounts and ";
+			$str = null;
+			foreach ($pricelist_arr as $key=>$value) {
+			   $custom_str = null;
+			   if (isset($value['account']) || isset($value['routes'])) {
+				 if (isset($value['account'])) {
+					 $custom_str .= $value['account']." accounts and ";
 				 }
-				 if(isset($value['routes'])){
-					 $custom_str.= $value['routes']." origination rates and ";
+				 if (isset($value['routes'])) {
+					 $custom_str .= $value['routes']." origination rates and ";
 				 }
-				 $str.=" Rate group Name : ".$value['name']." using by ".rtrim($custom_str," and ")."\n";
+				 $str .= " Rate group Name : ".$value['name']." using by ".rtrim($custom_str, " and ")."\n";
 			   }
 			}
-			if(!empty($str)){
-				$data['str']=$str;
+			if ( ! empty($str)) {
+				$data['str'] = $str;
 			}    
-			$data['selected_ids']=$add_array['selected_ids'];
+			$data['selected_ids'] = $add_array['selected_ids'];
 			echo json_encode($data);
 		}
 	}

Braces +7 added lines, -5 removed lines

@@ -32,8 +32,9 @@ 
 		$this->load->library('astpp/form');
 		$this->load->model('pricing_model');
 
-		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+		if ($this->session->userdata('user_login') == FALSE) {
+					redirect(base_url() . '/astpp/login');
+		}
 	}
 
 	function price_add($type = "") {
@@ -84,15 +85,16 @@ 
 				exit;
 			}
 			$this->load->view('view_price_add_edit', $data);
-	   }else {
+	   } else {
 			$data['page_title'] = 'Create Price Details';
 			if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
 				echo $data['validation_errors'];
 				exit;
 			} else {
-		if(isset($add_array['trunk_id']) && !empty($add_array['trunk_id']))
-				$trunk_id=$add_array['trunk_id'];
+		if(isset($add_array['trunk_id']) && !empty($add_array['trunk_id'])) {
+						$trunk_id=$add_array['trunk_id'];
+		}
 				unset($add_array['trunk_id']);
 				$priceid=$this->pricing_model->add_price($add_array);
 		if(isset($trunk_id) && $trunk_id != ''){

web_interface/astpp/application/modules/pricing/libraries/pricing_form.php

Spacing +17 added lines, -17 removed lines

@@ -21,7 +21,7 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 ###############################################################################

 

-if (!defined('BASEPATH'))

+if ( ! defined('BASEPATH'))

 	exit('No direct script access allowed');

 

 class pricing_form {

@@ -29,20 +29,20 @@ 
 		$this->CI = & get_instance();

 	}

 	function get_pricing_form_fields() {

-	$form['forms'] = array(base_url() . 'pricing/price_save/', array('id' => 'pricing_form', 'method' => 'POST', 'name' => 'pricing_form'));

+	$form['forms'] = array(base_url().'pricing/price_save/', array('id' => 'pricing_form', 'method' => 'POST', 'name' => 'pricing_form'));

 		if ($this->CI->session->userdata('logintype') == 1 || $this->CI->session->userdata('logintype') == 5) {

 		$form['Rate Group Information'] = array(

 		array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

 		array('', 'HIDDEN', array('name' => 'status', 'value' => '1'), '', '', ''),

-		array('Name', 'INPUT', array('name' => 'name', 'size' => '20',  'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number'),

+		array('Name', 'INPUT', array('name' => 'name', 'size' => '20', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number'),

 		array('Routing Type', 'routing_type', 'SELECT', '', '', 'tOOL TIP', 'Please Select Status', '', '', '', 'set_routetype'),

 		array('Initial Increment', 'INPUT', array('name' => 'initially_increment', 'size' => '20', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number'),

-		array('Default Increment', 'INPUT', array('name' => 'inc', 'size' => '20',  'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number'),

-		array('Markup(%)', 'INPUT', array('name' => 'markup', 'value' => "0" ,  'size' => '20',  'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number'),

+		array('Default Increment', 'INPUT', array('name' => 'inc', 'size' => '20', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number'),

+		array('Markup(%)', 'INPUT', array('name' => 'markup', 'value' => "0", 'size' => '20', 'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number'),

 		array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Select Status', '', '', '', 'set_status'),

 		);

 	}

-	else{

+	else {

 	  $form['Rate Group Information'] = array(

 		array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

 		array('', 'HIDDEN', array('name' => 'status', 'value' => '1'), '', '', ''),

@@ -87,21 +87,21 @@ 
             */

 	function build_pricing_list_for_admin() {

 		// array(display name, width, db_field_parent_table,feidname, db_field_child_table,function name);

-		$grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "","","false","center"),

+		$grid_field_arr = json_encode(array(array("<input type='checkbox' name='chkAll' class='ace checkall'/><label class='lbl'></label>", "30", "", "", "", "", "", "false", "center"),

 /**

 ASTPP  3.0 

 For Rategroup edit on Name

 **/

-			array(gettext("Name"), "110", "name", "", "", "","EDITABLE","true","center"),

+			array(gettext("Name"), "110", "name", "", "", "", "EDITABLE", "true", "center"),

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

 			array(gettext("Routing Type"), "120", "routing_type", "routing_type", "routing_type", "get_routetype"),

-		array(gettext("Initial Increment"), "140", "initially_increment", "", "", "","","true","center"),

-			array("Default Increment", "140", "inc", "", "", "","","true","center"),

-			array(gettext("Markup(%)"), "100", "markup", "", "", "","","true","center"),

-		array(gettext("Rate Count"), "100", "id", "pricelist_id", "routes", "get_field_count","","true","center"),

-			array(gettext("Status"), "110", "status", "id", "pricelists", "get_status","","true","center"),

-			array(gettext("Created Date"), "120", "creation_date", "creation_date", "creation_date", "convert_GMT_to","","true","center"),

-			array(gettext("Modified Date"), "140", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to","","true","center"),

+		array(gettext("Initial Increment"), "140", "initially_increment", "", "", "", "", "true", "center"),

+			array("Default Increment", "140", "inc", "", "", "", "", "true", "center"),

+			array(gettext("Markup(%)"), "100", "markup", "", "", "", "", "true", "center"),

+		array(gettext("Rate Count"), "100", "id", "pricelist_id", "routes", "get_field_count", "", "true", "center"),

+			array(gettext("Status"), "110", "status", "id", "pricelists", "get_status", "", "true", "center"),

+			array(gettext("Created Date"), "120", "creation_date", "creation_date", "creation_date", "convert_GMT_to", "", "true", "center"),

+			array(gettext("Modified Date"), "140", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to", "", "true", "center"),

 			array("Action", "150", "", "", "", array("EDIT" => array("url" => "pricing/price_edit/", "mode" => "popup"),

 

 					"DELETE" => array("url" => "pricing/price_delete/", "mode" => "single")))

@@ -110,8 +110,8 @@ 
 	}

 

 	function build_grid_buttons() {

-		$buttons_json = json_encode(array(array("Create", "btn btn-line-warning btn" ,"fa fa-plus-circle fa-lg", "button_action", "/pricing/price_add/", "popup"),

-			array("Delete", "btn btn-line-danger","fa fa-times-circle fa-lg", "button_action", "/pricing/price_delete_multiple/")

+		$buttons_json = json_encode(array(array("Create", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/pricing/price_add/", "popup"),

+			array("Delete", "btn btn-line-danger", "fa fa-times-circle fa-lg", "button_action", "/pricing/price_delete_multiple/")

 			));

 		return $buttons_json;

 	}

Braces +4 added lines, -4 removed lines

@@ -21,8 +21,9 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 ###############################################################################

 

-if (!defined('BASEPATH'))

-	exit('No direct script access allowed');

+if (!defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 

 class pricing_form {

 	function __construct($library_name = '') {

@@ -41,8 +42,7 @@ 
 		array('Markup(%)', 'INPUT', array('name' => 'markup', 'value' => "0" ,  'size' => '20',  'class' => "text field medium"), 'trim|required|xss_clean', 'tOOL TIP', 'Please Enter account number'),

 		array('Status', 'status', 'SELECT', '', '', 'tOOL TIP', 'Please Select Status', '', '', '', 'set_status'),

 		);

-	}

-	else{

+	} else{

 	  $form['Rate Group Information'] = array(

 		array('', 'HIDDEN', array('name' => 'id'), '', '', '', ''),

 		array('', 'HIDDEN', array('name' => 'status', 'value' => '1'), '', '', ''),

web_interface/astpp/application/modules/refill_coupon/models/refill_coupon_model.php

Spacing +41 added lines, -41 removed lines

@@ -27,80 +27,80 @@
 	function refill_coupon_model() {
 		parent::__construct();
 	}
-	function get_refill_coupon_list($flag,$start = 0, $limit = 0,$export=false){
+	function get_refill_coupon_list($flag, $start = 0, $limit = 0, $export = false) {
 		$this->db_model->build_search('refill_coupon_list_search');
-		$accountinfo=$this->session->userdata('accountinfo');
-		$reseller_id=$accountinfo['type']==1 ? $accountinfo['id'] : 0;
-		$where=array('reseller_id'=>$reseller_id);
+		$accountinfo = $this->session->userdata('accountinfo');
+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
+		$where = array('reseller_id'=>$reseller_id);
 		if ($flag) {
-		if($export)
-		  $query = $this->db_model->select("*", "refill_coupon",$where, "id", "ASC",'','');
+		if ($export)
+		  $query = $this->db_model->select("*", "refill_coupon", $where, "id", "ASC", '', '');
 		else
-		$query = $this->db_model->select("*", "refill_coupon",$where, "id", "ASC", $limit, $start);
+		$query = $this->db_model->select("*", "refill_coupon", $where, "id", "ASC", $limit, $start);
 		} else {
-			$query = $this->db_model->countQuery("*", "refill_coupon",$where);
+			$query = $this->db_model->countQuery("*", "refill_coupon", $where);
 		}
 		return $query;
 	}
-	function get_customer_refill_coupon_list($flag,$start = 0, $limit = 0,$accountid){
+	function get_customer_refill_coupon_list($flag, $start = 0, $limit = 0, $accountid) {
 		$this->db_model->build_search('refill_coupon_list_search');
-		$accountinfo=$this->session->userdata('accountinfo');
-		$reseller_id=$accountinfo['type']==1 ? $accountinfo['id'] : ($accountinfo['type']== 0 ? $accountinfo['reseller_id']: 0 );
-		$where=array('reseller_id'=>$reseller_id,"account_id"=>$accountid);
+		$accountinfo = $this->session->userdata('accountinfo');
+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : ($accountinfo['type'] == 0 ? $accountinfo['reseller_id'] : 0);
+		$where = array('reseller_id'=>$reseller_id, "account_id"=>$accountid);
 		if ($flag) {
-		$query = $this->db_model->select("*", "refill_coupon",$where, "id", "ASC", $limit, $start);
+		$query = $this->db_model->select("*", "refill_coupon", $where, "id", "ASC", $limit, $start);
 		} else {
-			$query = $this->db_model->countQuery("*", "refill_coupon",$where);
+			$query = $this->db_model->countQuery("*", "refill_coupon", $where);
 		}
 		return $query;
 	}
-	function add_refill_coupon($add_array){
+	function add_refill_coupon($add_array) {
 	  $count = $add_array['count'];
 		unset($add_array['action']);
 		unset($add_array['count']);
-		$prefix=$add_array['prefix'];
+		$prefix = $add_array['prefix'];
 		unset($add_array['prefix']);
-		$accountinfo=$this->session->userdata('accountinfo');
-		$reseller_id=$accountinfo['type']==1 ? $accountinfo['id']:0;
-		$insert_arr=array();
-		$account_length=Common_model::$global_config['system_config']['refill_coupon_length'];
-		$length=strlen($prefix);
-		if($length !=0){
-	  $number_length=$account_length-$length;
-	} else{
-	  $number_length=$account_length;
+		$accountinfo = $this->session->userdata('accountinfo');
+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;
+		$insert_arr = array();
+		$account_length = Common_model::$global_config['system_config']['refill_coupon_length'];
+		$length = strlen($prefix);
+		if ($length != 0) {
+	  $number_length = $account_length - $length;
+	} else {
+	  $number_length = $account_length;
 	}
 	$add_array['amount'] = $this->common_model->add_calculate_currency($add_array['amount'], '', '', false, false);
-	$number=$this->common->find_uniq_rendno_accno($number_length, 'number', 'refill_coupon',$prefix,$count);
-	$date=gmdate('Y-m-d H:i:s');
+	$number = $this->common->find_uniq_rendno_accno($number_length, 'number', 'refill_coupon', $prefix, $count);
+	$date = gmdate('Y-m-d H:i:s');
 		for ($i = 0; $i < $count; $i++) {
 			$add_array['number'] = trim($number[$i]);
-		$add_array['currency_id']=$accountinfo['currency_id'];
-		$add_array['reseller_id']=$reseller_id;
-		$add_array['creation_date']=$date;
-		$insert_arr[$i]=$add_array;
+		$add_array['currency_id'] = $accountinfo['currency_id'];
+		$add_array['reseller_id'] = $reseller_id;
+		$add_array['creation_date'] = $date;
+		$insert_arr[$i] = $add_array;
 		}
-		$this->db->insert_batch("refill_coupon",$insert_arr);
+		$this->db->insert_batch("refill_coupon", $insert_arr);
 		return true;
 	}
-	function remove_refill_coupon($id){
+	function remove_refill_coupon($id) {
 		$this->db->where("id", $id);
 		$this->db->delete("refill_coupon");
 		return true;
 	}
-	function get_refill_coupon_details($id){
+	function get_refill_coupon_details($id) {
 	   $this->db->where("id", $id);
-	   $result=$this->db->get('refill_coupon');
+	   $result = $this->db->get('refill_coupon');
 	   return $result;
 	}
-	function refill_coupon_count($add_array){
-		$account_length=Common_model::$global_config['system_config']['refill_coupon_length'];
-		$this->db->where("length(number)",$account_length);
-		$this->db->like('number',$add_array['prefix'],'after');
+	function refill_coupon_count($add_array) {
+		$account_length = Common_model::$global_config['system_config']['refill_coupon_length'];
+		$this->db->where("length(number)", $account_length);
+		$this->db->like('number', $add_array['prefix'], 'after');
 		$this->db->select("count(id) as count");
 		$this->db->from('refill_coupon');
-		$result=$this->db->get();
-		$result=$result->result_array();
+		$result = $this->db->get();
+		$result = $result->result_array();
 	return $result;
 	}
 }

Braces +5 added lines, -4 removed lines

@@ -33,10 +33,11 @@
 		$reseller_id=$accountinfo['type']==1 ? $accountinfo['id'] : 0;
 		$where=array('reseller_id'=>$reseller_id);
 		if ($flag) {
-		if($export)
-		  $query = $this->db_model->select("*", "refill_coupon",$where, "id", "ASC",'','');
-		else
-		$query = $this->db_model->select("*", "refill_coupon",$where, "id", "ASC", $limit, $start);
+		if($export) {
+				  $query = $this->db_model->select("*", "refill_coupon",$where, "id", "ASC",'','');
+		} else {
+				$query = $this->db_model->select("*", "refill_coupon",$where, "id", "ASC", $limit, $start);
+		}
 		} else {
 			$query = $this->db_model->countQuery("*", "refill_coupon",$where);
 		}

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

Spacing +40 added lines, -40 removed lines

@@ -24,7 +24,7 @@ 
 
 class Refill_coupon extends MX_Controller {
     
-	function Refill_coupon(){
+	function Refill_coupon() {
 		  parent::__construct();
 		  $this->load->helper('template_inheritance');
 		  $this->load->helper('form');
@@ -33,11 +33,11 @@ 
 		  $this->load->library("astpp/form");
 		  $this->load->library("session");
 		  if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . 'login/login');
+			redirect(base_url().'login/login');
 	  }
-	function refill_coupon_list(){
-	if($this->session->userdata('logintype') == 0 || $this->session->userdata('logintype') == 3){
-			redirect(base_url() . 'user/user/');
+	function refill_coupon_list() {
+	if ($this->session->userdata('logintype') == 0 || $this->session->userdata('logintype') == 3) {
+			redirect(base_url().'user/user/');
 	}
 		$data['username'] = $this->session->userdata('user_name');
 		$data['page_title'] = gettext('Refill Coupon');
@@ -49,7 +49,7 @@ 
 		$data['form_search'] = $this->form->build_serach_form($this->refill_coupon_form->get_refill_coupon_search_form());
 		$this->load->view('view_refill_coupon_list', $data);
 	}
-	function refill_coupon_list_json(){
+	function refill_coupon_list_json() {
 	$json_data = array();
 		$count_all = $this->refill_coupon_model->get_refill_coupon_list(false, "", "");
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
@@ -59,7 +59,7 @@ 
 		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
 		echo json_encode($json_data);
 	}   
-	function refill_coupon_list_search(){
+	function refill_coupon_list_search() {
 		$ajax_search = $this->input->post('ajax_search', 0);
 		if ($this->input->post('advance_search', TRUE) == 1) {
 			$this->session->set_userdata('advance_search', $this->input->post('advance_search'));
@@ -72,21 +72,21 @@ 
 			$this->session->set_userdata('refill_coupon_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'refill_coupon/refill_coupon_list/');
+			redirect(base_url().'refill_coupon/refill_coupon_list/');
 		}
 	}
-	function refill_coupon_clearsearchfilter(){
+	function refill_coupon_clearsearchfilter() {
 	$this->session->set_userdata('advance_search', 0);
 		$this->session->set_userdata('refill_coupon_list_search', "");
 	}
-	function refill_coupon_list_view($id){
+	function refill_coupon_list_view($id) {
 	$data['username'] = $this->session->userdata('user_name');
 		$data['page_title'] = 'View Refill Coupon';
 		if ($cc = $this->refill_coupon_model->get_refill_coupon_details($id)) {
-		$refill_coupon_details=$cc->result_array();
-		$data['refill_coupon_details']=$refill_coupon_details[0];
-			$data['refill_coupon_details']['callingcard']= $this->common->get_field_name('cardnumber', 'callingcards', $refill_coupon_details[0]['callingcard_id']);
-			$data['refill_coupon_details']['currency']= $this->common->build_concat_string('currencyname,currency', 'currency', $refill_coupon_details[0]['currency_id']);
+		$refill_coupon_details = $cc->result_array();
+		$data['refill_coupon_details'] = $refill_coupon_details[0];
+			$data['refill_coupon_details']['callingcard'] = $this->common->get_field_name('cardnumber', 'callingcards', $refill_coupon_details[0]['callingcard_id']);
+			$data['refill_coupon_details']['currency'] = $this->common->build_concat_string('currencyname,currency', 'currency', $refill_coupon_details[0]['currency_id']);
 		} else {
 			echo "This card is not available.";
 			return;
@@ -95,8 +95,8 @@ 
     
 	}
 	function refill_coupon_add() {
-	if($this->session->userdata('logintype') == 0 || $this->session->userdata('logintype') == 3){
-			redirect(base_url() . 'user/user/');
+	if ($this->session->userdata('logintype') == 0 || $this->session->userdata('logintype') == 3) {
+			redirect(base_url().'user/user/');
 	}
 		$data['username'] = $this->session->userdata('user_name');
 		$data['flag'] = 'create';
@@ -105,16 +105,16 @@ 
 		$this->load->view('view_refill_coupon_add', $data);
 	}
 	function refill_coupon_save() {
-		$account_length=Common_model::$global_config['system_config']['refill_coupon_length'];
+		$account_length = Common_model::$global_config['system_config']['refill_coupon_length'];
 		$add_array = $this->input->post();
-		$add_array['status']=0;
+		$add_array['status'] = 0;
 		$data['form'] = $this->form->build_form($this->refill_coupon_form->get_refill_coupon_form_fields(), $add_array);
-	$result=$this->refill_coupon_model->refill_coupon_count($add_array);
-		$count=$result[0]['count'];
-		$remaining_length =0;
-		$remaining_length=$account_length - strlen($add_array['prefix']);
-		$currentlength =pow(5,$remaining_length);
-		$currentlength=$currentlength-$count;
+	$result = $this->refill_coupon_model->refill_coupon_count($add_array);
+		$count = $result[0]['count'];
+		$remaining_length = 0;
+		$remaining_length = $account_length - strlen($add_array['prefix']);
+		$currentlength = pow(5, $remaining_length);
+		$currentlength = $currentlength - $count;
 		$data['page_title'] = 'Add Refill Coupon';
 		if ($this->form_validation->run() == FALSE) {
 				$data['validation_errors'] = validation_errors();
@@ -122,18 +122,18 @@ 
 				exit;
 		}
 		else {    
-		  if($account_length<=strlen($add_array['prefix'])){
+		  if ($account_length <= strlen($add_array['prefix'])) {
 			  echo json_encode(array("count_error"=>"You Can Not Create ".$add_array['count']." Accounts with ".$add_array['prefix']." prefix."));
 			  exit;      
 		  }
-		  if($currentlength <= 0){
+		  if ($currentlength <= 0) {
 			echo json_encode(array("count_error"=>"You Can Not Create ".$add_array['count']." Accounts with ".$add_array['prefix']." prefix"));
 			exit;  
 		  }
-		  if($currentlength > 0 && $add_array['count'] > $currentlength){
+		  if ($currentlength > 0 && $add_array['count'] > $currentlength) {
 			echo json_encode(array("count_error"=>"You Can Create Maximum ".$currentlength." accounts with ".$add_array['prefix']." prefix"));
 			exit;      
-		  }else{
+		  } else {
 			$this->refill_coupon_model->add_refill_coupon($add_array);
 			echo json_encode(array("SUCCESS"=> "Refill coupon created successfully!"));
 			exit;
@@ -143,26 +143,26 @@ 
 	function refill_coupon_list_delete($id) {
 		$this->refill_coupon_model->remove_refill_coupon($id);
 		$this->session->set_flashdata('astpp_notification', 'Refill coupon removed successfully!');
-		redirect(base_url() . 'refill_coupon/refill_coupon_list/');
+		redirect(base_url().'refill_coupon/refill_coupon_list/');
 	}
-	function refill_coupon_export(){
+	function refill_coupon_export() {
 	 $account_info = $accountinfo = $this->session->userdata('accountinfo');
-		$currency_id=$account_info['currency_id'];
-		$currency=$this->common->get_field_name('currency', 'currency', $currency_id);
-	$query = $this->refill_coupon_model->get_refill_coupon_list(true,'','',true);
+		$currency_id = $account_info['currency_id'];
+		$currency = $this->common->get_field_name('currency', 'currency', $currency_id);
+	$query = $this->refill_coupon_model->get_refill_coupon_list(true, '', '', true);
 		$cc_array = array();
 		ob_clean();
-		$cc_array[] = array('Coupon No.','Description', 'Account','Amount('.$currency.')','Created Date',"Used?",'Used Date');
+		$cc_array[] = array('Coupon No.', 'Description', 'Account', 'Amount('.$currency.')', 'Created Date', "Used?", 'Used Date');
 		if ($query->num_rows() > 0) {
 			foreach ($query->result_array() as $row) {
 				$row['currency'] = $this->common->build_concat_string('currencyname,currency', 'currency', $row['currency_id']);
 				$row['acc_name'] = $row['account_id'] > 0 ? $this->common->get_field_name('number', 'accounts', $row['account_id']) : "";
-				$row['status']=$this->common->get_refill_coupon_status('','',$row['status']);
+				$row['status'] = $this->common->get_refill_coupon_status('', '', $row['status']);
 				$cc_array[] = array(
 					$row['number'],
 					$row['description'],
 					$row['acc_name'],
-					$this->common->convert_to_currency('','',$row['amount']),
+					$this->common->convert_to_currency('', '', $row['amount']),
 					$row['creation_date'],
 					$row['status'],
 					$row['firstused']
@@ -170,14 +170,14 @@ 
 			}
 		}
 		$this->load->helper('csv');
-		array_to_csv($cc_array, 'refill_coupon_' . date("Y-m-d") . '.csv');
+		array_to_csv($cc_array, 'refill_coupon_'.date("Y-m-d").'.csv');
 	}
-	function refill_coupon_customer_json($accountid){
+	function refill_coupon_customer_json($accountid) {
 	$json_data = array();
-		$count_all = $this->refill_coupon_model->get_customer_refill_coupon_list(false, "", "",$accountid);
+		$count_all = $this->refill_coupon_model->get_customer_refill_coupon_list(false, "", "", $accountid);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		$query = $this->refill_coupon_model->get_customer_refill_coupon_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"],$accountid);
+		$query = $this->refill_coupon_model->get_customer_refill_coupon_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"], $accountid);
 		$grid_fields = json_decode($this->refill_coupon_form->build_user_refill_coupon_grid());
 		$json_data['rows'] = $this->form->build_grid($query, $grid_fields);
 		echo json_encode($json_data);

Braces +5 added lines, -5 removed lines

@@ -32,8 +32,9 @@ 
 		  $this->load->library("refill_coupon_form");
 		  $this->load->library("astpp/form");
 		  $this->load->library("session");
-		  if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . 'login/login');
+		  if ($this->session->userdata('user_login') == FALSE) {
+		  			redirect(base_url() . 'login/login');
+		  }
 	  }
 	function refill_coupon_list(){
 	if($this->session->userdata('logintype') == 0 || $this->session->userdata('logintype') == 3){
@@ -120,8 +121,7 @@ 
 				$data['validation_errors'] = validation_errors();
 				echo $data['validation_errors'];
 				exit;
-		}
-		else {    
+		} else {    
 		  if($account_length<=strlen($add_array['prefix'])){
 			  echo json_encode(array("count_error"=>"You Can Not Create ".$add_array['count']." Accounts with ".$add_array['prefix']." prefix."));
 			  exit;      
@@ -133,7 +133,7 @@ 
 		  if($currentlength > 0 && $add_array['count'] > $currentlength){
 			echo json_encode(array("count_error"=>"You Can Create Maximum ".$currentlength." accounts with ".$add_array['prefix']." prefix"));
 			exit;      
-		  }else{
+		  } else{
 			$this->refill_coupon_model->add_refill_coupon($add_array);
 			echo json_encode(array("SUCCESS"=> "Refill coupon created successfully!"));
 			exit;

web_interface/astpp/application/modules/refill_coupon/views/view_refill_coupon_details.php

Spacing +4 added lines, -4 removed lines

@@ -48,10 +48,10 @@
           <th>Length in Seconds</th>
           <th>Cost(CAD)</th>
         </tr>
-        <?php foreach($cdrs as $cdr){
-		$debit= '';
-		$debit =($cdr['debit']/10000);
-		$debit=$debit+0;
+        <?php foreach ($cdrs as $cdr) {
+		$debit = '';
+		$debit = ($cdr['debit'] / 10000);
+		$debit = $debit + 0;
 		?>
         <tr>
           <td><?=$cdr['destination']?></td>