iNextrix / ASTPP

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

Spacing +12 added lines, -12 removed lines

@@ -15,7 +15,7 @@ 
               <div class="col-md-12">
             	<div class="w-box">
                    <span  style="margin-left:10px; text-align: center;background-color: none;color:#DD191D;">
-                    <? if(isset($error) && !empty($error)) {
+                    <? if (isset($error) && ! empty($error)) {
 						echo $error;
 					}?>
                    </span>            	
@@ -31,19 +31,19 @@ 
                            <div class="col-md-12 no-padding">
                                <label class="col-md-3">Rate Group:</label>
                                <div>
-                               <? $pricelists = form_dropdown('pricelist_id', $this->db_model->build_dropdown("id,name", "pricelists","where_arr", array("reseller_id" => "0", "status" => "0")), '');
+                               <? $pricelists = form_dropdown('pricelist_id', $this->db_model->build_dropdown("id,name", "pricelists", "where_arr", array("reseller_id" => "0", "status" => "0")), '');
 									echo $pricelists;
 							   ?>
                                </div>
                            </div>
 				<?
-				 $logintype=$this->session->userdata('userlevel_logintype');
+				 $logintype = $this->session->userdata('userlevel_logintype');
 					   // $trunk=null;
-				 if($logintype !=1) { ?>
+				 if ($logintype != 1) { ?>
                            <div class="col-md-12 no-padding">
                                <label class="col-md-3">Force Trunk:</label>
                                <div>
-                               <? $trunklist = form_dropdown_all('trunk_id', $this->db_model->build_dropdown("id,name", "trunks","where_arr", array("status" => "0")), '');
+                               <? $trunklist = form_dropdown_all('trunk_id', $this->db_model->build_dropdown("id,name", "trunks", "where_arr", array("status" => "0")), '');
 									echo $trunklist;
 							   ?>
                                </div>
@@ -100,7 +100,7 @@ 
 <?}?>    
         
 <?php
-	if(isset($csv_tmp_data) && !empty($csv_tmp_data)){ ?>
+	if (isset($csv_tmp_data) && ! empty($csv_tmp_data)) { ?>
 
 <section class="slice color-three">
 	<div class="w-section inverse no-padding">
@@ -109,14 +109,14 @@ 
              <div class="col-md-12 margin-t-10">
             <form id="import_form" name="import_form" action="<?=base_url()?>rates/origination_rate_import_file/<?= $pricelistid?>/<?=$trunkid?><?=$check_header?>/" method="POST">
             <table width="100%" border="1"  class="details_table table">
-                <?  $cnt =7;
-					foreach($csv_tmp_data as $csv_key => $csv_value){
-						if($csv_key <  15){
+                <?  $cnt = 7;
+					foreach ($csv_tmp_data as $csv_key => $csv_value) {
+						if ($csv_key < 15) {
 							echo "<tr>";
-							foreach($csv_value as $field_name => $field_val){
-								if($csv_key == 0){
+							foreach ($csv_value as $field_name => $field_val) {
+								if ($csv_key == 0) {
 									echo "<th>".ucfirst($field_name)."</th>";
-								}else{
+								} else {
 									echo "<td class='portlet-content'>".$field_val."</td>";   
 								}
 							}

Braces +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 							foreach($csv_value as $field_name => $field_val){
 								if($csv_key == 0){
 									echo "<th>".ucfirst($field_name)."</th>";
-								}else{
+								} else{
 									echo "<td class='portlet-content'>".$field_val."</td>";   
 								}
 							}

web_interface/astpp/application/modules/signup/models/signup_model.php

Spacing +20 added lines, -20 removed lines

@@ -51,49 +51,49 @@
 		$data['reseller_id'] = $data['key_unique'];	
 		unset($data['agreeCheck']);
 		unset($data['key_unique']);
-		$data['creation']=gmdate('Y-m-d H:i:s');
+		$data['creation'] = gmdate('Y-m-d H:i:s');
 		$data['expiry'] = date('Y-m-d H:i:s', strtotime('+10 years'));
-		$this->db->insert("accounts",$data);
+		$this->db->insert("accounts", $data);
 		return   $this->db->insert_id();
 		}
 
-	function check_user($accno,$email,$balance)
+	function check_user($accno, $email, $balance)
 	{
-		$info = array("number"=>$accno,"email"=>$email,"status"=>1);
+		$info = array("number"=>$accno, "email"=>$email, "status"=>1);
 						$this->db->where($info);
 						$this->db->select('*');
-		$acc_res=$this->db->get('accounts');
-		if($acc_res->num_rows() > 0)	
+		$acc_res = $this->db->get('accounts');
+		if ($acc_res->num_rows() > 0)	
 		{         
-						$acc_res=$acc_res->result_array();
-						$acc_res=$acc_res[0];
-						$this->db->where('pricelist_id',$acc_res['pricelist_id']);
+						$acc_res = $acc_res->result_array();
+						$acc_res = $acc_res[0];
+						$this->db->where('pricelist_id', $acc_res['pricelist_id']);
 						$this->db->select("*");
-						$charge_res=$this->db->get('charges');
+						$charge_res = $this->db->get('charges');
                         
-			if($charge_res->num_rows() > 0){
-			$charge_res=$charge_res->result_array();
-						$charge_res=$charge_res[0];
-						$charge_acc_arr=array(
+			if ($charge_res->num_rows() > 0) {
+			$charge_res = $charge_res->result_array();
+						$charge_res = $charge_res[0];
+						$charge_acc_arr = array(
 						"charge_id"=>$charge_res['id'],
 						"accountid"=>$acc_res['id'],
 						"status"=>0,
 						"assign_date"=>date('Y-m-d H:i:s')
 						 );
-			}else{
-			$charge_res=$charge_res->result_array();
+			} else {
+			$charge_res = $charge_res->result_array();
 			//echo "<pre>"; print_r($charge_res); exit;
 			$charge_acc_arr = array("charge_id"=>'id',
 						"accountid"=>$acc_res['id'],
 						"assign_date"=>date('Y-m-d H:i:s'));
 			}
-						$result=$this->db->insert("charge_to_account",$charge_acc_arr);
-			$update = array("status" => 0,"balance" => $balance );
+						$result = $this->db->insert("charge_to_account", $charge_acc_arr);
+			$update = array("status" => 0, "balance" => $balance);
 			$this->db->where($info);
 			$result = $this->db->update('accounts', $update);
-			$sip_device_update = array('username'=>$accno,"status"=>1);
+			$sip_device_update = array('username'=>$accno, "status"=>1);
 			return 1;
-		} else{
+		} else {
 			return 0;
 		}
 	}

Braces +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 						"status"=>0,
 						"assign_date"=>date('Y-m-d H:i:s')
 						 );
-			}else{
+			} else{
 			$charge_res=$charge_res->result_array();
 			//echo "<pre>"; print_r($charge_res); exit;
 			$charge_acc_arr = array("charge_id"=>'id',

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

Indentation +426 added lines, -426 removed lines

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

web_interface/astpp/application/modules/signup/views/view_forgotpassword.php

Spacing +2 added lines, -2 removed lines

@@ -39,9 +39,9 @@
             <div class="row">
                 <div class="col-md-4 col-md-offset-4">&nbsp;
 					<span class="login_error">
-                        <?php if (isset($astpp_notification)){ ?>
+                        <?php if (isset($astpp_notification)) { ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-						<?php }else{
+						<?php } else {
 						 echo "&nbsp;";
 						} ?>
                     </span>

Braces +11 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 					<span class="login_error">
                         <?php if (isset($astpp_notification)){ ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-						<?php }else{
+						<?php } else{
 						 echo "&nbsp;";
 						} ?>
                     </span>
@@ -78,10 +78,18 @@ 
 										<div class="input-group col-md-12 margin-t-15 padding-r-32 padding-l-32">
 												<span class="input-group-addon"><i class="fa fa-envelope"></i></span>
 
-												<input type="text" class="form-control" id="email" name="email" placeholder="User Name OR Email" value = "<?php if (isset($value['email'])) echo  $value['email']; else ''; ?>" style="height:40px;">
+												<input type="text" class="form-control" id="email" name="email" placeholder="User Name OR Email" value = "<?php if (isset($value['email'])) {
+	echo  $value['email'];
+} else {
+	'';
+}
+?>" style="height:40px;">
 										</div> 
 
-												<?php if (isset($error['email'])) echo $error['email']; ?>              
+												<?php if (isset($error['email'])) {
+	echo $error['email'];
+}
+?>              
 											<div style="width: 97.67%; float: left;text-align: left; margin: 2% 22%;">
 													<span id="e_name" style="color:red;"> </span>
 											</div>

web_interface/astpp/application/modules/signup/views/view_confirmpassword.php

Braces +20 added lines, -4 removed lines

@@ -77,16 +77,32 @@
 <div class="col-md-12 margin-t-20 padding-r-32 padding-l-32">
 <label class="col-md-5 no-padding" style="text-align: left;">Password</label>
 <div class="col-md-7 no-padding">
-<input type="text" name="password" required value="<?php if (isset($value['password'])) echo  $value['password']; else ''; ?>" id="password" size="15" maxlength="40" class="form-control"  />
-<div class='error-style col-md-12 no-padding' style='color:red; font-size: 13px;' id="une"><?php if (isset($error['password'])) echo $error['password']; ?></div>
+<input type="text" name="password" required value="<?php if (isset($value['password'])) {
+	echo  $value['password'];
+} else {
+	'';
+}
+?>" id="password" size="15" maxlength="40" class="form-control"  />
+<div class='error-style col-md-12 no-padding' style='color:red; font-size: 13px;' id="une"><?php if (isset($error['password'])) {
+	echo $error['password'];
+}
+?></div>
 </div>
 </div>
 
 <div class="col-md-12 margin-t-10 padding-r-32 padding-l-32">
 <label class="col-md-5 no-padding" style="text-align: left;">Confirm Password</label>
 <div class="col-md-7 no-padding">
-<input type="text" name="confirmpassword" required value="<?php if (isset($value['confirm_password'])) echo  $value['confirm_password']; else ''; ?>" id="confirm_password" size="15" maxlength="40" class="form-control"  />
-<div class='error-style col-md-12' style='color:red; font-size: 13px;' id="conpas"><?php if (isset($error['confirm_password'])) echo $error['confirm_password']; ?></div>
+<input type="text" name="confirmpassword" required value="<?php if (isset($value['confirm_password'])) {
+	echo  $value['confirm_password'];
+} else {
+	'';
+}
+?>" id="confirm_password" size="15" maxlength="40" class="form-control"  />
+<div class='error-style col-md-12' style='color:red; font-size: 13px;' id="conpas"><?php if (isset($error['confirm_password'])) {
+	echo $error['confirm_password'];
+}
+?></div>
 </div>
 </div>
 

web_interface/astpp/application/modules/signup/views/view_signup_active.php

Spacing +2 added lines, -2 removed lines

@@ -35,9 +35,9 @@
             <div class="row">
 
 			<div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
-                        <?php if (isset($astpp_notification)){ ?>
+                        <?php if (isset($astpp_notification)) { ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-                    <?php }else{
+                    <?php } else {
 						 echo "&nbsp;";
 					} 
 			$astpp_err_msg = $this->session->flashdata('astpp_signupmsg');

Braces +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
                         <div class="col-md-4 col-md-offset-4">&nbsp;<span class="login_error">
                         <?php if (isset($astpp_notification)){ ?>
                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.
-                    <?php }else{
+                    <?php } else{
                          echo "&nbsp;";
                     } ?>
                     </span></div> <br/>

web_interface/astpp/application/modules/signup/views/view_signup.php

Spacing +2 added lines, -2 removed lines

@@ -95,9 +95,9 @@
             <div class="row">

                 <div class="col-md-4 col-md-offset-4">&nbsp;

 					<span class="login_error">

-                        <?php if (isset($astpp_notification)){ ?>

+                        <?php if (isset($astpp_notification)) { ?>

                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.

-						<?php }else{

+						<?php } else {

 						 echo "&nbsp;";

 						} ?>

                     </span>

Braces +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
 					<span class="login_error">

                         <?php if (isset($astpp_notification)){ ?>

                         Login unsuccessful. Please make sure you entered the correct username and password, and that your account is active.

-						<?php }else{

+						<?php } else{

 						 echo "&nbsp;";

 						} ?>

                     </span>

web_interface/astpp/application/modules/systems/models/system_model.php

Spacing +37 added lines, -37 removed lines

@@ -39,50 +39,50 @@ 
 		return $query;
 	}
 
-	function gettemplate_list($flag="", $start, $limit="") {
+	function gettemplate_list($flag = "", $start, $limit = "") {
 
          
 		if ($this->session->userdata('logintype') == 1 || $this->session->userdata('logintype') == 5) {
 			$account_data = $this->session->userdata("accountinfo");
 			$reseller = $account_data['id'];
-			$this->db->where('reseller_id',$reseller);
-			$query = $this->db_model->select("*", "default_templates","","","","","");
-
-			if($query->num_rows() >0){
-		$result =$query->result_array();
-		$match_array =array();
-		$unmatch_array= array();
-		$i=0;
-		$str=0;
-		foreach($result as $value)
+			$this->db->where('reseller_id', $reseller);
+			$query = $this->db_model->select("*", "default_templates", "", "", "", "", "");
+
+			if ($query->num_rows() > 0) {
+		$result = $query->result_array();
+		$match_array = array();
+		$unmatch_array = array();
+		$i = 0;
+		$str = 0;
+		foreach ($result as $value)
 		{
-			$this->db->where('name',$value['name']);
-			$this->db->where('reseller_id',0);
-			$query = $this->db_model->select("id", "default_templates","", "id", "ASC", $limit, $start);		
-			$innerresult =$query->result_array();
-			foreach($innerresult as $value)
+			$this->db->where('name', $value['name']);
+			$this->db->where('reseller_id', 0);
+			$query = $this->db_model->select("id", "default_templates", "", "id", "ASC", $limit, $start);		
+			$innerresult = $query->result_array();
+			foreach ($innerresult as $value)
 			{                   
-			  $str.=$value['id'].",";
+			  $str .= $value['id'].",";
 			}		
 		}            
-		$str= rtrim($str,',');
+		$str = rtrim($str, ',');
 		
 		$where = "id NOT IN ($str)";		
-		$this->db->where('reseller_id',$reseller);
-		$this->db->or_where('reseller_id',0);
+		$this->db->where('reseller_id', $reseller);
+		$this->db->or_where('reseller_id', 0);
 		$this->db->where($where);
 			}
 			else
 			{
-			   $this->db->where('reseller_id',0);
+			   $this->db->where('reseller_id', 0);
 			}
               
-			if($flag) {
+			if ($flag) {
 
-		$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
-		 }else {
+		$query = $this->db_model->select("*", "default_templates", "", "id", "ASC", $limit, $start);
+		 } else {
 
-		$query = $this->db_model->countQuery("*", "default_templates","");
+		$query = $this->db_model->countQuery("*", "default_templates", "");
 		
 		 }
 	  } 
@@ -92,9 +92,9 @@ 
 			$this->db->where($where);
 			$this->db_model->build_search('template_search');
 		if ($flag) {
-			$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
+			$query = $this->db_model->select("*", "default_templates", "", "id", "ASC", $limit, $start);
 		} else {
-			$query = $this->db_model->countQuery("*", "default_templates","");
+			$query = $this->db_model->countQuery("*", "default_templates", "");
 		}
 	  }
 
@@ -106,13 +106,13 @@ 
                         
 		$this->db->where("name", $name);
 		$this->db->update("system", $add_array);
-		if($name == 'base_currency'){
+		if ($name == 'base_currency') {
             
-			$screen_path = getcwd() . "/cron";
-			$screen_filename = "CurrencyUpdate" . strtotime('now');
-			$command = "cd " . $screen_path . " && /usr/bin/screen -d -m -S  $screen_filename php cron.php CurrencyUpdate";
+			$screen_path = getcwd()."/cron";
+			$screen_filename = "CurrencyUpdate".strtotime('now');
+			$command = "cd ".$screen_path." && /usr/bin/screen -d -m -S  $screen_filename php cron.php CurrencyUpdate";
 			exec($command);
-			$this->db->update("currency",array("currencyrate"=>'1'),array("currency"=>"INR"));
+			$this->db->update("currency", array("currencyrate"=>'1'), array("currency"=>"INR"));
 		}
 	}
 
@@ -179,7 +179,7 @@ 
 	function getcurrency_list($flag, $start = 0, $limit = 0) {
 		 $this->db_model->build_search('currency_list_search');
 	
-	$where=array('currency <>' =>Common_model::$global_config['system_config']['base_currency']);
+	$where = array('currency <>' =>Common_model::$global_config['system_config']['base_currency']);
 		if ($flag) {
 			$query = $this->db_model->select("*", "currency", $where, "id", "ASC", $limit, $start);
 		} else {
@@ -205,7 +205,7 @@ 
 		$this->db->delete("currency");
 		return true;
 	}
-	function backup_insert($add_array='')
+	function backup_insert($add_array = '')
 	{
 	 unset($add_array["action"]);
 		$this->db->insert("backup_database", $add_array);
@@ -222,13 +222,13 @@ 
 	}
 	function get_backup_data($id)
 	{
-	  $where=array('id'=>$id);
+	  $where = array('id'=>$id);
 	  $query = $this->db_model->getSelect("*", "backup_database", $where);
 	  return $query;
 	}
-   function import_database($filename,$target_path)
+   function import_database($filename, $target_path)
 	{
-		$this->db->insert("backup_database", array('backup_name'=>$filename , 'path'=>$target_path));
+		$this->db->insert("backup_database", array('backup_name'=>$filename, 'path'=>$target_path));
 			return true;
 	}
 }

Braces +3 added lines, -5 removed lines

@@ -71,8 +71,7 @@ 
 		$this->db->where('reseller_id',$reseller);
 		$this->db->or_where('reseller_id',0);
 		$this->db->where($where);
-			}
-			else
+			} else
 			{
 			   $this->db->where('reseller_id',0);
 			}
@@ -80,13 +79,12 @@ 
 			if($flag) {
 
 		$query = $this->db_model->select("*", "default_templates","", "id", "ASC", $limit, $start);
-		 }else {
+		 } else {
 
 		$query = $this->db_model->countQuery("*", "default_templates","");
 		
 		 }
-	  } 
-	  else {
+	  } else {
           
 			$where = array('reseller_id' => 0);
 			$this->db->where($where);

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/");            
 		}