iNextrix / ASTPP

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

Spacing +4 added lines, -4 removed lines

@@ -327,14 +327,14 @@ 
             unset($_POST['advance_search']);
             $this->session->set_userdata('customersummary_reports_search', $this->input->post());
         }
-        redirect(base_url() . 'summary/customer/');
+        redirect(base_url().'summary/customer/');
     }
 
     function customer_clearsearchfilter() {
         $this->session->set_userdata('advance_search', 0);
         $this->session->set_userdata('customersummary_reports_search', "");
         $this->session->set_userdata('customersummary_reports_export', "");
-        redirect(base_url() . 'summary/customer/');
+        redirect(base_url().'summary/customer/');
     }
 
     /**
@@ -343,11 +343,11 @@ 
     function summary_search_info($entity) {
         $group_by_str = null;
         $select_str = null;
-        $group_by_time=null;
+        $group_by_time = null;
         $group_by_1 = null;
         $group_by_2 = null;
         $group_by_3 = null;
-        $order_str=null;
+        $order_str = null;
         $custom_total_array = array();
         $custom_search = array();
         $export_select_str = null;

web_interface/astpp/application/modules/summary/libraries/summary_form.php

Spacing +92 added lines, -92 removed lines

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

@@ -33,9 +33,9 @@ 
 		$form['Search'] = array(

 	array('From Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_from_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'start_date[start_date-date]'),

 			array('To Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_to_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'end_date[end_date-date]'),

-			array('Account', 'provider_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0","type"=>"3")),

+			array('Account', 'provider_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0", "type"=>"3")),

 			array('Trunk', 'trunk_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`status`=2, concat(name,"","^"),name) as name', 'trunks', 'build_dropdown_deleted', '', array("status" => "1")),

-			array('Code ', 'INPUT', array('name' => 'pattern[pattern]', 'value' => '', 'size' => '20',  'class' => "text field "), '', 'Tool tips info', '1', 'pattern[pattern-string]', '', '', '', 'search_string_type', ''),

+			array('Code ', 'INPUT', array('name' => 'pattern[pattern]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'pattern[pattern-string]', '', '', '', 'search_string_type', ''),

 			array(' Code Destination ', 'INPUT', array('name' => 'notes[notes]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'notes[notes-string]', '', '', '', 'search_string_type', ''), 

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

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

@@ -44,124 +44,124 @@ 
 

 		return $form;

 	}

-	function build_providersummary(){

+	function build_providersummary() {

 		

 $account_info = $accountinfo = $this->CI->session->userdata('accountinfo');

-$currency_id=$account_info['currency_id'];

-$currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);	

+$currency_id = $account_info['currency_id'];

+$currency = $this->CI->common->get_field_name('currency', 'currency', $currency_id);	

 		

-		$new_arr=array();

-	if($this->CI->session->userdata('advance_search')=='1'){

-		$search_array=$this->CI->session->userdata('providersummary_reports_search');

-				if(isset($search_array['time']) && !empty($search_array['time'])){

-				   $new_arr[]=array($search_array['time'], "151", $search_array['time']."(callstart)", "", "", "");

+		$new_arr = array();

+	if ($this->CI->session->userdata('advance_search') == '1') {

+		$search_array = $this->CI->session->userdata('providersummary_reports_search');

+				if (isset($search_array['time']) && ! empty($search_array['time'])) {

+				   $new_arr[] = array($search_array['time'], "151", $search_array['time']."(callstart)", "", "", "");

 				}

-		if(isset($search_array['groupby_1']) && !empty($search_array['groupby_1'])){

-					$first_column_groupby=$search_array['groupby_1'];

-					if($first_column_groupby == 'provider_id'){

-						$new_arr[]=array("Account", "151", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");    

-					} elseif ($first_column_groupby =='pattern'){

-						$new_arr[]=array("Code", "65", "pattern", "pattern", "", "get_only_numeric_val");

-						$new_arr[]=array("Destination", "85", "notes", "", "", "");    

-					} elseif($first_column_groupby =='trunk_id'){

-						$new_arr[]=array("Trunk", "151", "trunk_id", "name", "trunks", "get_field_name");

-					} elseif($first_column_groupby == 'package_id'){

-						$new_arr[]=array("Package", "151", "package_id", "first_name,last_name,number", "accounts", "build_concat_string");    

+		if (isset($search_array['groupby_1']) && ! empty($search_array['groupby_1'])) {

+					$first_column_groupby = $search_array['groupby_1'];

+					if ($first_column_groupby == 'provider_id') {

+						$new_arr[] = array("Account", "151", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");    

+					} elseif ($first_column_groupby == 'pattern') {

+						$new_arr[] = array("Code", "65", "pattern", "pattern", "", "get_only_numeric_val");

+						$new_arr[] = array("Destination", "85", "notes", "", "", "");    

+					} elseif ($first_column_groupby == 'trunk_id') {

+						$new_arr[] = array("Trunk", "151", "trunk_id", "name", "trunks", "get_field_name");

+					} elseif ($first_column_groupby == 'package_id') {

+						$new_arr[] = array("Package", "151", "package_id", "first_name,last_name,number", "accounts", "build_concat_string");    

 					}

 				}

-				if(isset($search_array['groupby_2']) && !empty($search_array['groupby_2'])){

-					$third_column_groupby=$search_array['groupby_2'];

-					if($third_column_groupby == 'provider_id'){

-						$new_arr[]=array("Account", "151", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");    

-					} elseif ($third_column_groupby =='pattern'){

-						$new_arr[]=array("Code", "65", "pattern", "pattern", "", "get_only_numeric_val");

-						$new_arr[]=array("Destination", "85", "notes", "", "", "");    

-					} elseif($third_column_groupby=='trunk_id'){

-						$new_arr[]=array("Trunk", "151", "trunk_id", "name", "trunks", "get_field_name");

-					} elseif($third_column_groupby == 'package_id'){

-						$new_arr[]=array("Package", "151", "package_id", "first_name,last_name,number", "accounts", "build_concat_string");    

+				if (isset($search_array['groupby_2']) && ! empty($search_array['groupby_2'])) {

+					$third_column_groupby = $search_array['groupby_2'];

+					if ($third_column_groupby == 'provider_id') {

+						$new_arr[] = array("Account", "151", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");    

+					} elseif ($third_column_groupby == 'pattern') {

+						$new_arr[] = array("Code", "65", "pattern", "pattern", "", "get_only_numeric_val");

+						$new_arr[] = array("Destination", "85", "notes", "", "", "");    

+					} elseif ($third_column_groupby == 'trunk_id') {

+						$new_arr[] = array("Trunk", "151", "trunk_id", "name", "trunks", "get_field_name");

+					} elseif ($third_column_groupby == 'package_id') {

+						$new_arr[] = array("Package", "151", "package_id", "first_name,last_name,number", "accounts", "build_concat_string");    

 					}

 				}

-				if(isset($search_array['groupby_3']) && !empty($search_array['groupby_3'])){

-					$fifth_column_groupby=$search_array['groupby_3'];

-					if($fifth_column_groupby == 'provider_id'){

-						$new_arr[]=array("Account", "151", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");    

-					} elseif ($fifth_column_groupby =='pattern'){

-						$new_arr[]=array("Code", "65", "pattern", "pattern", "", "get_only_numeric_val");

-						$new_arr[]=array("Destination", "85", "notes", "", "", "");    

-					} elseif($fifth_column_groupby == 'trunk_id'){

-						$new_arr[]=array("Trunk", "151", "trunk_id", "name", "trunks", "get_field_name");

-					} elseif($fifth_column_groupby == 'package_id'){

-						$new_arr[]=array("Package", "151", "package_id", "first_name,last_name,number", "accounts", "build_concat_string");    

+				if (isset($search_array['groupby_3']) && ! empty($search_array['groupby_3'])) {

+					$fifth_column_groupby = $search_array['groupby_3'];

+					if ($fifth_column_groupby == 'provider_id') {

+						$new_arr[] = array("Account", "151", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");    

+					} elseif ($fifth_column_groupby == 'pattern') {

+						$new_arr[] = array("Code", "65", "pattern", "pattern", "", "get_only_numeric_val");

+						$new_arr[] = array("Destination", "85", "notes", "", "", "");    

+					} elseif ($fifth_column_groupby == 'trunk_id') {

+						$new_arr[] = array("Trunk", "151", "trunk_id", "name", "trunks", "get_field_name");

+					} elseif ($fifth_column_groupby == 'package_id') {

+						$new_arr[] = array("Package", "151", "package_id", "first_name,last_name,number", "accounts", "build_concat_string");    

 					}

 				}

 	}

-		if(empty($new_arr))

-			$new_arr[]=array("Account", "453", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");

+		if (empty($new_arr))

+			$new_arr[] = array("Account", "453", "provider_id", "first_name,last_name,number", "accounts", "build_concat_string");

 		$fixed_arr = array(

 			array("Attempted Calls", "130", "attempted_calls", "", "", ""),

 			array("Completed Calls", "130", "description", "", "", ""),

-			array("Duration","85","billable",'','',''),

-			array("ASR","83","asr",'','',''),

-			array("ACD","83","acd  ",'','',''),

-			array("MCD","83","mcd",'','',''),

-			array("Billable","102","billable",'','',''),

-			array("Cost($currency)","117","cost",'','',''),

+			array("Duration", "85", "billable", '', '', ''),

+			array("ASR", "83", "asr", '', '', ''),

+			array("ACD", "83", "acd  ", '', '', ''),

+			array("MCD", "83", "mcd", '', '', ''),

+			array("Billable", "102", "billable", '', '', ''),

+			array("Cost($currency)", "117", "cost", '', '', ''),

 			);

-		$grid_field_arr = json_encode(array_merge($new_arr,$fixed_arr));

+		$grid_field_arr = json_encode(array_merge($new_arr, $fixed_arr));

 		return $grid_field_arr;

 	}

 	function build_grid_buttons_providersummary() {

-	   $buttons_json = json_encode(array(array("Export","btn btn-xing" ," fa fa-download fa-lg", "button_action", "/summary/provider_export_csv/", 'single')));

+	   $buttons_json = json_encode(array(array("Export", "btn btn-xing", " fa fa-download fa-lg", "button_action", "/summary/provider_export_csv/", 'single')));

 	   return $buttons_json;

 	}

 	function get_resellersummary_search_form() {

-		$form['forms'] = array("",array('id' => "resellersummary_search"));

+		$form['forms'] = array("", array('id' => "resellersummary_search"));

 		$form['Search'] = array(

 			array('From Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_from_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'start_date[start_date-date]'),

 			array('To Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_to_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'end_date[end_date-date]'),

-			array('Account', 'reseller_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0","type"=>"1")),

+			array('Account', 'reseller_id', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0", "type"=>"1")),

 			array('Code ', 'INPUT', array('name' => 'pattern[pattern]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'pattern[pattern-string]', '', '', '', 'search_string_type', ''),

 			array('Destination ', 'INPUT', array('name' => 'notes[notes]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'notes[notes-string]', '', '', '', 'search_string_type', ''), 

-			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''),array('', 'HIDDEN', 'advance_search', '1', '', '', ''));

+			array('', 'HIDDEN', 'ajax_search', '1', '', '', ''), array('', 'HIDDEN', 'advance_search', '1', '', '', ''));

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

 		$form['button_reset'] = array('name' => 'action', 'id' => "id_reset", 'content' => 'Clear', 'value' => 'cancel', 'type' => 'reset', 'class' => 'btn btn-line-sky pull-right margin-x-10');

 

 		return $form;

 	}

-	function build_resellersummary($new_column_arr){

+	function build_resellersummary($new_column_arr) {

 		

 $account_info = $accountinfo = $this->CI->session->userdata('accountinfo');

-$currency_id=$account_info['currency_id'];

-$currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);		

+$currency_id = $account_info['currency_id'];

+$currency = $this->CI->common->get_field_name('currency', 'currency', $currency_id);		

 		

-$column_arr=array(

-			array("Attempted Calls", "120", "attempted_calls", "", "", "","","true","center"),

-			array("Completed Calls", "120", "description", "", "", "","","true","center"),

-			array("Duration","91","billable",'','','',"","true","center"),

-			array("ASR","78","asr",'','','',"","true","center"),

-			array("ACD","78","acd  ",'','','',"","true","center"),

-			array("MCD","78","mcd",'','','',"","true","center"),

-			array("Billable","80","billable",'','','',"","true","center"),

-			array("Debit($currency)","100","cost",'','','',"","true","right"),

-			array("Cost($currency)","100","price",'','','',"","true","right"),            

-			array("Profit($currency)", "100", "profit", "", "", "","","true","right"),

+$column_arr = array(

+			array("Attempted Calls", "120", "attempted_calls", "", "", "", "", "true", "center"),

+			array("Completed Calls", "120", "description", "", "", "", "", "true", "center"),

+			array("Duration", "91", "billable", '', '', '', "", "true", "center"),

+			array("ASR", "78", "asr", '', '', '', "", "true", "center"),

+			array("ACD", "78", "acd  ", '', '', '', "", "true", "center"),

+			array("MCD", "78", "mcd", '', '', '', "", "true", "center"),

+			array("Billable", "80", "billable", '', '', '', "", "true", "center"),

+			array("Debit($currency)", "100", "cost", '', '', '', "", "true", "right"),

+			array("Cost($currency)", "100", "price", '', '', '', "", "true", "right"),            

+			array("Profit($currency)", "100", "profit", "", "", "", "", "true", "right"),

 			);

-		$grid_field_arr = json_encode(array_merge($new_column_arr,$column_arr));

+		$grid_field_arr = json_encode(array_merge($new_column_arr, $column_arr));

 		return $grid_field_arr;

 	}

 	function build_grid_buttons_resellersummary() {

-		 $buttons_json = json_encode(array(array("Export","btn btn-xing" ," fa fa-download fa-lg", "button_action", "/summary/reseller_export_csv/", 'single')));

+		 $buttons_json = json_encode(array(array("Export", "btn btn-xing", " fa fa-download fa-lg", "button_action", "/summary/reseller_export_csv/", 'single')));

 		return $buttons_json;

 	}

 	function get_customersummary_search_form() {

         

-		$form['forms'] = array(base_url() . 'summary/customer_search',array('id' => "customersummary_search","name"=>"customersummary_search"));

+		$form['forms'] = array(base_url().'summary/customer_search', array('id' => "customersummary_search", "name"=>"customersummary_search"));

 		$form['Search'] = array(

 			array('From Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_from_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'start_date[start_date-date]'),

 			array('To Date', 'INPUT', array('name' => 'callstart[]', 'id' => 'customer_to_date', 'size' => '20', 'class' => "text field "), '', 'tOOL TIP', '', 'end_date[end_date-date]'),

-		array('Accounts', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0","type"=>"GLOBAL")),

-			array('Code ', 'INPUT', array('name' => 'pattern[pattern]', 'value' => '', 'size' => '20',  'class' => "text field "), '', 'Tool tips info', '1', 'pattern[pattern-string]', '', '', '', 'search_string_type', ''),

+		array('Accounts', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'IF(`deleted`=1,concat( first_name, " ", last_name, " ", "(", number, ")^" ),concat( first_name, " ", last_name, " ", "(", number, ")" )) as number', 'accounts', 'build_dropdown_deleted', 'where_arr', array("reseller_id" => "0", "type"=>"GLOBAL")),

+			array('Code ', 'INPUT', array('name' => 'pattern[pattern]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'pattern[pattern-string]', '', '', '', 'search_string_type', ''),

 			array('Code Destination ', 'INPUT', array('name' => 'notes[notes]', 'value' => '', 'size' => '20', 'class' => "text field "), '', 'Tool tips info', '1', 'notes[notes-string]', '', '', '', 'search_string_type', ''),

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

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

@@ -176,29 +176,29 @@ 
 

 		return $form;

 	}

-	function build_customersummary($new_column_arr){

+	function build_customersummary($new_column_arr) {

 		

 $account_info = $accountinfo = $this->CI->session->userdata('accountinfo');

-$currency_id=$account_info['currency_id'];

-$currency=$this->CI->common->get_field_name('currency', 'currency', $currency_id);		

+$currency_id = $account_info['currency_id'];

+$currency = $this->CI->common->get_field_name('currency', 'currency', $currency_id);		

 		

-		$column_arr=array(

-			array("Attempted Calls", "120", "attempted_calls", "", "", "","","true","center"),

-			array("Completed Calls", "120", "description", "", "", "","","true","center"),

-			array("Duration","95","billable",'','','',"","true","center"),

-			array("ASR","85","asr",'','','',"","true","center"),

-			array("ACD","85","acd  ",'','','',"","true","center"),

-			array("MCD","85","mcd",'','','',"","true","center"),

-			array("Billable","90","billable",'','','',"","true","right"),

-			array("Debit($currency)","87","cost",'','','',"","true","right"),

-			array("Cost($currency)","85","price",'','','',"","true","right"),            

-			array("Profit($currency)", "93", "profit", "", "", "","","true","right"),

+		$column_arr = array(

+			array("Attempted Calls", "120", "attempted_calls", "", "", "", "", "true", "center"),

+			array("Completed Calls", "120", "description", "", "", "", "", "true", "center"),

+			array("Duration", "95", "billable", '', '', '', "", "true", "center"),

+			array("ASR", "85", "asr", '', '', '', "", "true", "center"),

+			array("ACD", "85", "acd  ", '', '', '', "", "true", "center"),

+			array("MCD", "85", "mcd", '', '', '', "", "true", "center"),

+			array("Billable", "90", "billable", '', '', '', "", "true", "right"),

+			array("Debit($currency)", "87", "cost", '', '', '', "", "true", "right"),

+			array("Cost($currency)", "85", "price", '', '', '', "", "true", "right"),            

+			array("Profit($currency)", "93", "profit", "", "", "", "", "true", "right"),

 			);

-		$grid_field_arr = json_encode(array_merge($new_column_arr,$column_arr));

+		$grid_field_arr = json_encode(array_merge($new_column_arr, $column_arr));

 		return $grid_field_arr;

 	}

 	function build_grid_buttons_customersummary() {

-		$buttons_json = json_encode(array(array("Export","btn btn-xing" ," fa fa-download fa-lg", "button_action", "/summary/customer_export_csv/", 'single')));

+		$buttons_json = json_encode(array(array("Export", "btn btn-xing", " fa fa-download fa-lg", "button_action", "/summary/customer_export_csv/", 'single')));

 		return $buttons_json;

 	}

 

web_interface/astpp/application/modules/summary/views/view_resellersummary_report.php

Spacing +19 added lines, -19 removed lines

@@ -38,18 +38,18 @@ 
                                 <legend><b>Search</b></legend>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">From Date</label>
-                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][0]) ? $session_info['callstart'][0] : date("Y-m-d") . " 00:00:00"; ?>" id="reseller_from_date" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][0]) ? $session_info['callstart'][0] : date("Y-m-d")." 00:00:00"; ?>" id="reseller_from_date" size="20" class="col-md-5 form-control text field "  />
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">To Date</label>
-                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][1]) ? $session_info['callstart'][1] : date("Y-m-d") . " 23:59:59"; ?>" id="reseller_to_date" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][1]) ? $session_info['callstart'][1] : date("Y-m-d")." 23:59:59"; ?>" id="reseller_to_date" size="20" class="col-md-5 form-control text field "  />
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Account</label>
 
                                     <select name="accountid" class='col-md-5 form-control selectpicker' data-live-search='true'>
                                         <option value=''>--Select--</option>
-                                        <?php if (!empty($accountlist)) {
+                                        <?php if ( ! empty($accountlist)) {
 											foreach ($accountlist as $key => $value) {
 												?>
                                                 <optgroup label="<?php echo $key ?>">
@@ -71,13 +71,13 @@ 
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Code </label>
-                                    <input type="text" name="pattern[pattern]" value="<?php echo (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && !empty($session_info['pattern']['pattern'])) ? $session_info['pattern']['pattern'] : ''; ?>" size="20" maxlength="15" class="col-md-5 form-control text field "/>
+                                    <input type="text" name="pattern[pattern]" value="<?php echo (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && ! empty($session_info['pattern']['pattern'])) ? $session_info['pattern']['pattern'] : ''; ?>" size="20" maxlength="15" class="col-md-5 form-control text field "/>
                                     <select name="pattern[pattern-string]" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($search_string_type)) {
+										if ( ! empty($search_string_type)) {
 											foreach ($search_string_type as $key => $value) {
 												$selected = null;
-												if (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && !empty($session_info['pattern']['pattern']) && $session_info['pattern']['pattern-string'] == $key) {
+												if (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && ! empty($session_info['pattern']['pattern']) && $session_info['pattern']['pattern-string'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -89,13 +89,13 @@ 
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Destination </label>
-                                    <input type="text" name="notes[notes]" value="<?php echo (isset($session_info['notes']) && isset($session_info['notes']['notes']) && !empty($session_info['notes']['notes'])) ? $session_info['notes']['notes'] : ''; ?>" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="notes[notes]" value="<?php echo (isset($session_info['notes']) && isset($session_info['notes']['notes']) && ! empty($session_info['notes']['notes'])) ? $session_info['notes']['notes'] : ''; ?>" size="20" class="col-md-5 form-control text field "  />
                                     <select name="notes[notes-string]" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($search_string_type)) {
+										if ( ! empty($search_string_type)) {
 											foreach ($search_string_type as $key => $value) {
 												$selected = null;
-												if (isset($session_info['notes']) && isset($session_info['notes']['notes']) && !empty($session_info['notes']['notes']) && $session_info['notes']['notes-string'] == $key) {
+												if (isset($session_info['notes']) && isset($session_info['notes']['notes']) && ! empty($session_info['notes']['notes']) && $session_info['notes']['notes-string'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -120,10 +120,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #time</label>
                                     <select name="time" class='col-md-5 form-control' style='margin-left:5px; selectpicker' data-live-search='true'>
                                         <?php
-										if (!empty($groupby_time)) {
+										if ( ! empty($groupby_time)) {
 											foreach ($groupby_time as $key => $value) {
 												$selected = null;
-												if (isset($session_info['time']) && !empty($session_info['time']) && $session_info['time'] == $key) {
+												if (isset($session_info['time']) && ! empty($session_info['time']) && $session_info['time'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -137,10 +137,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #1</label>
                                     <select name="groupby_1" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                     <?php
-									if (!empty($groupby_field)) {
+									if ( ! empty($groupby_field)) {
 										foreach ($groupby_field as $key => $value) {
 											$selected = null;
-											if (isset($session_info['groupby_1']) && !empty($session_info['groupby_1']) && $session_info['groupby_1'] == $key) {
+											if (isset($session_info['groupby_1']) && ! empty($session_info['groupby_1']) && $session_info['groupby_1'] == $key) {
 												$selected = "selected";
 											}
 											?>
@@ -154,10 +154,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #2</label>
                                     <select name="groupby_2" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($groupby_field)) {
+										if ( ! empty($groupby_field)) {
 											foreach ($groupby_field as $key => $value) {
 												$selected = null;
-												if (isset($session_info['groupby_2']) && !empty($session_info['groupby_2']) && $session_info['groupby_2'] == $key) {
+												if (isset($session_info['groupby_2']) && ! empty($session_info['groupby_2']) && $session_info['groupby_2'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -171,10 +171,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #3</label>
                                     <select name="groupby_3" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                     <?php
-									if (!empty($groupby_field)) {
+									if ( ! empty($groupby_field)) {
 										foreach ($groupby_field as $key => $value) {
 											$selected = null;
-											if (isset($session_info['groupby_3']) && !empty($session_info['groupby_3']) && $session_info['groupby_3'] == $key) {
+											if (isset($session_info['groupby_3']) && ! empty($session_info['groupby_3']) && $session_info['groupby_3'] == $key) {
 												$selected = "selected";
 											}
 											?>
@@ -193,10 +193,10 @@ 
                                     <label class="search_label col-md-6" style="font-size:17px;text-align:right;">Display records in </label>
                                     <select name="search_in" class='col-md-5 form-control selectpicker' style='background: #ddd; width: 23% !important;' data-live-search='true'>
 <?php
-if (!empty($search_report)) {
+if ( ! empty($search_report)) {
 	foreach ($search_report as $key => $value) {
 		$selected = null;
-		if (isset($session_info['search_in']) && isset($session_info['search_in']) && !empty($session_info['search_in']) && $session_info['search_in'] == $key) {
+		if (isset($session_info['search_in']) && isset($session_info['search_in']) && ! empty($session_info['search_in']) && $session_info['search_in'] == $key) {
 			//echo $key;exit;
 			$selected = "selected";
 		}

web_interface/astpp/application/modules/summary/views/view_customersummary_report.php

Spacing +19 added lines, -19 removed lines

@@ -38,18 +38,18 @@ 
                                 <legend><b>Search</b></legend>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">From Date</label>
-                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][0]) ? $session_info['callstart'][0] : date("Y-m-d") . " 00:00:00"; ?>" id="customer_from_date" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][0]) ? $session_info['callstart'][0] : date("Y-m-d")." 00:00:00"; ?>" id="customer_from_date" size="20" class="col-md-5 form-control text field "  />
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">To Date</label>
-                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][1]) ? $session_info['callstart'][1] : date("Y-m-d") . " 23:59:59"; ?>" id="customer_to_date" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][1]) ? $session_info['callstart'][1] : date("Y-m-d")." 23:59:59"; ?>" id="customer_to_date" size="20" class="col-md-5 form-control text field "  />
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Account</label>
 
                                     <select name="accountid" class='col-md-5 form-control selectpicker' data-live-search='true'>
                                         <option value=''>--Select--</option>
-                                        <?php if (!empty($accountlist)) {
+                                        <?php if ( ! empty($accountlist)) {
 											foreach ($accountlist as $key => $value) {
 												?>
                                                 <optgroup label="<?php echo $key ?>">
@@ -71,13 +71,13 @@ 
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Code </label>
-                                    <input type="text" name="pattern[pattern]" value="<?php echo (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && !empty($session_info['pattern']['pattern'])) ? $session_info['pattern']['pattern'] : ''; ?>" size="20" maxlength="15" class="col-md-5 form-control text field "/>
+                                    <input type="text" name="pattern[pattern]" value="<?php echo (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && ! empty($session_info['pattern']['pattern'])) ? $session_info['pattern']['pattern'] : ''; ?>" size="20" maxlength="15" class="col-md-5 form-control text field "/>
                                     <select name="pattern[pattern-string]" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($search_string_type)) {
+										if ( ! empty($search_string_type)) {
 											foreach ($search_string_type as $key => $value) {
 												$selected = null;
-												if (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && !empty($session_info['pattern']['pattern']) && $session_info['pattern']['pattern-string'] == $key) {
+												if (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && ! empty($session_info['pattern']['pattern']) && $session_info['pattern']['pattern-string'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -89,13 +89,13 @@ 
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Destination </label>
-                                    <input type="text" name="notes[notes]" value="<?php echo (isset($session_info['notes']) && isset($session_info['notes']['notes']) && !empty($session_info['notes']['notes'])) ? $session_info['notes']['notes'] : ''; ?>" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="notes[notes]" value="<?php echo (isset($session_info['notes']) && isset($session_info['notes']['notes']) && ! empty($session_info['notes']['notes'])) ? $session_info['notes']['notes'] : ''; ?>" size="20" class="col-md-5 form-control text field "  />
                                     <select name="notes[notes-string]" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($search_string_type)) {
+										if ( ! empty($search_string_type)) {
 											foreach ($search_string_type as $key => $value) {
 												$selected = null;
-												if (isset($session_info['notes']) && isset($session_info['notes']['notes']) && !empty($session_info['notes']['notes']) && $session_info['notes']['notes-string'] == $key) {
+												if (isset($session_info['notes']) && isset($session_info['notes']['notes']) && ! empty($session_info['notes']['notes']) && $session_info['notes']['notes-string'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -120,10 +120,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #Time</label>
                                     <select name="time" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($groupby_time)) {
+										if ( ! empty($groupby_time)) {
 											foreach ($groupby_time as $key => $value) {
 												$selected = null;
-												if (isset($session_info['time']) && !empty($session_info['time']) && $session_info['time'] == $key) {
+												if (isset($session_info['time']) && ! empty($session_info['time']) && $session_info['time'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -137,10 +137,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #1</label>
                                     <select name="groupby_1" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($groupby_field)) {
+										if ( ! empty($groupby_field)) {
 											foreach ($groupby_field as $key => $value) {
 												$selected = null;
-												if (isset($session_info['groupby_1']) && !empty($session_info['groupby_1']) && $session_info['groupby_1'] == $key) {
+												if (isset($session_info['groupby_1']) && ! empty($session_info['groupby_1']) && $session_info['groupby_1'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -154,10 +154,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #2</label>
                                     <select name="groupby_2" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                             <?php
-											if (!empty($groupby_field)) {
+											if ( ! empty($groupby_field)) {
 												foreach ($groupby_field as $key => $value) {
 													$selected = null;
-													if (isset($session_info['groupby_2']) && !empty($session_info['groupby_2']) && $session_info['groupby_2'] == $key) {
+													if (isset($session_info['groupby_2']) && ! empty($session_info['groupby_2']) && $session_info['groupby_2'] == $key) {
 														$selected = "selected";
 													}
 													?>
@@ -171,10 +171,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #3</label>
                                     <select name="groupby_3" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                             <?php
-											if (!empty($groupby_field)) {
+											if ( ! empty($groupby_field)) {
 												foreach ($groupby_field as $key => $value) {
 													$selected = null;
-													if (isset($session_info['groupby_3']) && !empty($session_info['groupby_3']) && $session_info['groupby_3'] == $key) {
+													if (isset($session_info['groupby_3']) && ! empty($session_info['groupby_3']) && $session_info['groupby_3'] == $key) {
 														$selected = "selected";
 													}
 													?>
@@ -193,10 +193,10 @@ 
                                     <label class="search_label col-md-6" style="font-size:17px;text-align:right;">Display records in </label>
                                     <select name="search_in" class='col-md-5 form-control selectpicker' style='background: #ddd; width: 23% !important;' data-live-search='true'>
 <?php
-if (!empty($search_report)) {
+if ( ! empty($search_report)) {
 	foreach ($search_report as $key => $value) {
 		$selected = null;
-		if (isset($session_info['search_in']) && isset($session_info['search_in']) && !empty($session_info['search_in']) && $session_info['search_in'] == $key) {
+		if (isset($session_info['search_in']) && isset($session_info['search_in']) && ! empty($session_info['search_in']) && $session_info['search_in'] == $key) {
 			//echo $key;exit;
 			$selected = "selected";
 		}

web_interface/astpp/application/modules/summary/views/view_providersummary_report.php

Spacing +20 added lines, -20 removed lines

@@ -38,18 +38,18 @@ 
                                 <legend><b>Search</b></legend>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">From Date</label>
-                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][0]) ? $session_info['callstart'][0] : date("Y-m-d") . " 00:00:00"; ?>" id="provider_from_date" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][0]) ? $session_info['callstart'][0] : date("Y-m-d")." 00:00:00"; ?>" id="provider_from_date" size="20" class="col-md-5 form-control text field "  />
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">To Date</label>
-                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][1]) ? $session_info['callstart'][1] : date("Y-m-d") . " 23:59:59"; ?>" id="provider_to_date" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="callstart[]" value="<?php echo isset($session_info['callstart'][1]) ? $session_info['callstart'][1] : date("Y-m-d")." 23:59:59"; ?>" id="provider_to_date" size="20" class="col-md-5 form-control text field "  />
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Account</label>
 
                                     <select name="provider_id" class='col-md-5 form-control selectpicker' data-live-search='true'>
                                         <option value=''>--Select--</option>
-                                        <?php if (!empty($accountlist)) {
+                                        <?php if ( ! empty($accountlist)) {
 											foreach ($accountlist as $key => $value) {
 												?>
                                                 <optgroup label="<?php echo $key ?>">
@@ -74,7 +74,7 @@ 
                                     <select name="trunk_id" class='col-md-5 form-control selectpicker' data-live-search='true'>
                                         <option value=''>--Select--</option>
                                         <?php
-										if (!empty($trunklist)) {
+										if ( ! empty($trunklist)) {
 											foreach ($trunklist as $key => $value) {
 												$selected = null;
 												if (isset($session_info['trunk_id']) && $session_info['trunk_id'] > 0 && $key == $session_info['trunk_id']) {
@@ -88,13 +88,13 @@ 
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Code </label>
-                                    <input type="text" name="pattern[pattern]" value="<?php echo (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && !empty($session_info['pattern']['pattern'])) ? $session_info['pattern']['pattern'] : ''; ?>" size="20" maxlength="15" class="col-md-5 form-control text field "/>
+                                    <input type="text" name="pattern[pattern]" value="<?php echo (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && ! empty($session_info['pattern']['pattern'])) ? $session_info['pattern']['pattern'] : ''; ?>" size="20" maxlength="15" class="col-md-5 form-control text field "/>
                                     <select name="pattern[pattern-string]" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($search_string_type)) {
+										if ( ! empty($search_string_type)) {
 											foreach ($search_string_type as $key => $value) {
 												$selected = null;
-												if (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && !empty($session_info['pattern']['pattern']) && $session_info['pattern']['pattern-string'] == $key) {
+												if (isset($session_info['pattern']) && isset($session_info['pattern']['pattern']) && ! empty($session_info['pattern']['pattern']) && $session_info['pattern']['pattern-string'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -106,13 +106,13 @@ 
                                 </div>
                                 <div class="col-md-4 no-padding">
                                     <label class="search_label col-md-12 no-padding">Destination </label>
-                                    <input type="text" name="notes[notes]" value="<?php echo (isset($session_info['notes']) && isset($session_info['notes']['notes']) && !empty($session_info['notes']['notes'])) ? $session_info['notes']['notes'] : ''; ?>" size="20" class="col-md-5 form-control text field "  />
+                                    <input type="text" name="notes[notes]" value="<?php echo (isset($session_info['notes']) && isset($session_info['notes']['notes']) && ! empty($session_info['notes']['notes'])) ? $session_info['notes']['notes'] : ''; ?>" size="20" class="col-md-5 form-control text field "  />
                                     <select name="notes[notes-string]" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                     <?php
-									   if (!empty($search_string_type)) {
+									   if ( ! empty($search_string_type)) {
 										foreach ($search_string_type as $key => $value) {
 											$selected = null;
-											if (isset($session_info['notes']) && isset($session_info['notes']['notes']) && !empty($session_info['notes']['notes']) && $session_info['notes']['notes-string'] == $key) {
+											if (isset($session_info['notes']) && isset($session_info['notes']['notes']) && ! empty($session_info['notes']['notes']) && $session_info['notes']['notes-string'] == $key) {
 												$selected = "selected";
 											}
 									?>
@@ -137,10 +137,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #time</label>
                                     <select name="time" class='col-md-5 form-control selectpicker' style='margin-left:5px;'data-live-search='true'>
                                         <?php
-										if (!empty($groupby_time)) {
+										if ( ! empty($groupby_time)) {
 											foreach ($groupby_time as $key => $value) {
 												$selected = null;
-												if (isset($session_info['time']) && !empty($session_info['time']) && $session_info['time'] == $key) {
+												if (isset($session_info['time']) && ! empty($session_info['time']) && $session_info['time'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -154,10 +154,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #1</label>
                                     <select name="groupby_1" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($groupby_field)) {
+										if ( ! empty($groupby_field)) {
 											foreach ($groupby_field as $key => $value) {
 												$selected = null;
-												if (isset($session_info['groupby_1']) && !empty($session_info['groupby_1']) && $session_info['groupby_1'] == $key) {
+												if (isset($session_info['groupby_1']) && ! empty($session_info['groupby_1']) && $session_info['groupby_1'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -171,10 +171,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #2</label>
                                     <select name="groupby_2" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($groupby_field)) {
+										if ( ! empty($groupby_field)) {
 											foreach ($groupby_field as $key => $value) {
 												$selected = null;
-												if (isset($session_info['groupby_2']) && !empty($session_info['groupby_2']) && $session_info['groupby_2'] == $key) {
+												if (isset($session_info['groupby_2']) && ! empty($session_info['groupby_2']) && $session_info['groupby_2'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -188,10 +188,10 @@ 
                                     <label class="search_label col-md-12 no-padding">Group By #3</label>
                                     <select name="groupby_3" class='col-md-5 form-control selectpicker' style='margin-left:5px;' data-live-search='true'>
                                         <?php
-										if (!empty($groupby_field)) {
+										if ( ! empty($groupby_field)) {
 											foreach ($groupby_field as $key => $value) {
 												$selected = null;
-												if (isset($session_info['groupby_3']) && !empty($session_info['groupby_3']) && $session_info['groupby_3'] == $key) {
+												if (isset($session_info['groupby_3']) && ! empty($session_info['groupby_3']) && $session_info['groupby_3'] == $key) {
 													$selected = "selected";
 												}
 												?>
@@ -210,10 +210,10 @@ 
                                     <label class="search_label col-md-6" style="font-size:17px;text-align:right;">Display records in </label>
                                     <select name="search_in" class='col-md-5 form-control selectpicker' style='background: #ddd; width: 23% !important;' data-live-search='true'>
 <?php
-if (!empty($search_report)) {
+if ( ! empty($search_report)) {
 	foreach ($search_report as $key => $value) {
 		$selected = null;
-		if (isset($session_info['search_in']) && isset($session_info['search_in']) && !empty($session_info['search_in']) && $session_info['search_in'] == $key) {
+		if (isset($session_info['search_in']) && isset($session_info['search_in']) && ! empty($session_info['search_in']) && $session_info['search_in'] == $key) {
 			//echo $key;exit;
 			$selected = "selected";
 		}

web_interface/astpp/application/modules/ipmap/models/ipmap_model.php

Spacing +10 added lines, -10 removed lines

@@ -51,9 +51,9 @@ 
 				$value[] = $value1['id'];
 			}
 			//$this->db->where_in('accountid', $value);
-			if(!empty($value)){
+			if ( ! empty($value)) {
 		 		$this->db->where_in('accountid', $value);	
-		 	} else{
+		 	} else {
 		 		$this->db->where_in('accountid', '0');
 		 	}            
 		}
@@ -62,10 +62,10 @@ 
          ASTPP  3.0 
 	 in customer login show ipmap (ACL) module
  	 *******/
-		if( $accountinfo['type'] == '0'){
-		$where=array('accountid'=>$accountinfo['id']);
-		}else{
-		$where='';
+		if ($accountinfo['type'] == '0') {
+		$where = array('accountid'=>$accountinfo['id']);
+		} else {
+		$where = '';
 		}
 		/**************************************************************************************************************/
 		if ($flag) {
@@ -93,11 +93,11 @@ 
     in customer login show ipmap (ACL) module
     *******/
 	$account_data = $this->session->userdata("accountinfo");
-	if($account_data['type'] == '0'){
+	if ($account_data['type'] == '0') {
 	$add_array['accountid'] = $account_data['id'];
 	 }
 	 /*******************************************************************/
-	$data = array('created_date'=>gmdate('Y-m-d H:i:s'),'name' => $add_array['name'], 'ip' => $add_array['ip'], 'prefix' => $add_array['prefix'], 'accountid' => $add_array['accountid'],'status' => $add_array['status'] ,'context' => 'default');
+	$data = array('created_date'=>gmdate('Y-m-d H:i:s'), 'name' => $add_array['name'], 'ip' => $add_array['ip'], 'prefix' => $add_array['prefix'], 'accountid' => $add_array['accountid'], 'status' => $add_array['status'], 'context' => 'default');
 	$this->db->insert("ip_map", $data);
 	return $this->db->insert_id();
 	}
@@ -108,11 +108,11 @@ 
     in customer login show ipmap (ACL) module
     *******/
 	 $account_data = $this->session->userdata("accountinfo");
-	   if($account_data['type'] == '0'){
+	   if ($account_data['type'] == '0') {
 	   $add_array['accountid'] = $account_data['id'];
 	   }
 	   /************************************************************************************************/
-		$data = array('last_modified_date'=>gmdate('Y-m-d H:i:s'),'name' => $add_array['name'], 'ip' => $add_array['ip'], 'prefix' => $add_array['prefix'], 'accountid' => $add_array['accountid'],'status' => $add_array['status'] , 'context' => 'default');
+		$data = array('last_modified_date'=>gmdate('Y-m-d H:i:s'), 'name' => $add_array['name'], 'ip' => $add_array['ip'], 'prefix' => $add_array['prefix'], 'accountid' => $add_array['accountid'], 'status' => $add_array['status'], 'context' => 'default');
 		$this->db->where("id", $id);
 		return $this->db->update("ip_map", $data);
        

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

Spacing +32 added lines, -32 removed lines

@@ -32,7 +32,7 @@ 
 		$this->load->library('astpp/form');
 		$this->load->model('ipmap_model');
 		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+			redirect(base_url().'/astpp/login');
 		 }
 	function ipmap_add() {
 		$data['username'] = $this->session->userdata('user_name');
@@ -52,9 +52,9 @@ 
      	ASTPP  3.0 
    	in customer login show ipmap (ACL) module
    	*****************************************/
-		 $ip=explode("/",$value['ip']);
+		 $ip = explode("/", $value['ip']);
 		 $edit_data = $value;
-		 $edit_data['ip']=$ip[0];
+		 $edit_data['ip'] = $ip[0];
 		}
 		/*************************************************************************************************/
 		$data['form'] = $this->form->build_form($this->ipmap_form->get_ipmap_form_fields(), $edit_data);
@@ -64,11 +64,11 @@ 
 	function ipmap_save() {
 		$add_array = $this->input->post();
 		$ip = $add_array['ip'];
-		if (strpos($ip,'/') !== false) {
-		   $add_array['ip']=$add_array['ip'];
+		if (strpos($ip, '/') !== false) {
+		   $add_array['ip'] = $add_array['ip'];
 		}
-		else{
-		   $add_array['ip']=$add_array['ip'].'/32';
+		else {
+		   $add_array['ip'] = $add_array['ip'].'/32';
 		}
 		$data['form'] = $this->form->build_form($this->ipmap_form->get_ipmap_form_fields(), $add_array);
 		if ($add_array['id'] != '') {
@@ -78,13 +78,13 @@ 
 				echo $data['validation_errors'];
 				exit;
 			} else {
-				 $ip_free= $this->ipmap_model->edit_ipmap($add_array, $add_array['id']);
+				 $ip_free = $this->ipmap_model->edit_ipmap($add_array, $add_array['id']);
 				 if ($ip_free) {
 					$this->load->library('freeswitch_lib');
 					$this->load->module('freeswitch/freeswitch');
 					$command = "api reloadacl";
 					$response = $this->freeswitch_model->reload_freeswitch($command);
-					$this->session->set_userdata('astpp_notification',$response);
+					$this->session->set_userdata('astpp_notification', $response);
 				}
 				echo json_encode(array("SUCCESS"=> " IP Map updated successfully!"));
 				exit;
@@ -102,7 +102,7 @@ 
 					$this->load->module('freeswitch/freeswitch');
 					$command = "api reloadacl";
 					$response = $this->freeswitch_model->reload_freeswitch($command);
-					$this->session->set_userdata('astpp_notification',$response);
+					$this->session->set_userdata('astpp_notification', $response);
 				}               
 				echo json_encode(array("SUCCESS"=> " IP Map added successfully!"));
 				exit;
@@ -110,24 +110,24 @@ 
 		}
 	}
 	  function ipmap_delete($id) {
-		$ip_free=$this->ipmap_model-> remove_ipmap($id);
+		$ip_free = $this->ipmap_model-> remove_ipmap($id);
 		 if ($ip_free) {
 					$this->load->library('freeswitch_lib');
 					$this->load->module('freeswitch/freeswitch');
 					$command = "api reloadacl";
 					$response = $this->freeswitch_model->reload_freeswitch($command);
-					$this->session->set_userdata('astpp_notification',$response);
+					$this->session->set_userdata('astpp_notification', $response);
 				}
 		$this->session->set_flashdata('astpp_notification', 'IP Map removed successfully!');
 		/*********************
      	ASTPP  3.0 
    	in customer login show ipmap (ACL) module
    	*****************************************/
-   	$accountdata=$this->session->userdata['accountinfo'];
-		if($accountdata['type'] == '0'){
-		redirect(base_url() . 'user/user_ipmap_detail/');
-		}else{
-		redirect(base_url() . 'ipmap/ipmap_detail/');
+   	$accountdata = $this->session->userdata['accountinfo'];
+		if ($accountdata['type'] == '0') {
+		redirect(base_url().'user/user_ipmap_detail/');
+		} else {
+		redirect(base_url().'ipmap/ipmap_detail/');
 		}
 		/*********************************************************************/
 	}
@@ -142,7 +142,7 @@ 
 			$this->session->set_userdata('ipmap_list_search', $action);
 		}
 		if (@$ajax_search != 1) {
-			redirect(base_url() . 'ipmap/ipmap_list/');
+			redirect(base_url().'ipmap/ipmap_list/');
 		}
 	}
 
@@ -173,35 +173,35 @@ 
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
 		$query = $this->ipmap_model->ipmap_list(true, $paging_data["paging"]["start"], $paging_data["paging"]["page_no"]);
-		$query =$query->result_array();
+		$query = $query->result_array();
 		foreach ($query as $key => $value) {
-		 $ipmap_checkbox='<input type="checkbox" name="chkAll" id="'.$value['id'].'" class="ace chkRefNos" onclick="clickchkbox('.$value['id'].')" value=' .$value['id'].'><lable class="lbl"></lable>';
-		 if($account_data['type'] == '0'){
-		 $ret_url = '<a href="'. base_url() .'user/user_ipmap_edit/'.$value['id'].'" class="btn btn-royelblue btn-sm"  rel="facebox" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;<a href="'. base_url() .'user/user_ipmap_delete/' . $value['id'].'" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>';
-		 $account_name='';
+		 $ipmap_checkbox = '<input type="checkbox" name="chkAll" id="'.$value['id'].'" class="ace chkRefNos" onclick="clickchkbox('.$value['id'].')" value='.$value['id'].'><lable class="lbl"></lable>';
+		 if ($account_data['type'] == '0') {
+		 $ret_url = '<a href="'.base_url().'user/user_ipmap_edit/'.$value['id'].'" class="btn btn-royelblue btn-sm"  rel="facebox" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;<a href="'.base_url().'user/user_ipmap_delete/'.$value['id'].'" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>';
+		 $account_name = '';
 		 $json_data['rows'][] = array('cell' => array(
 		 $ipmap_checkbox,
 		 $value['name'],
 		 $value['ip'],
 		 $value['prefix'],
-		 $this->common->get_status('status', 'ip_map',$value),
-		 $this->common->convert_GMT_to('','',$value['created_date']),
-		 $this->common->convert_GMT_to('','',$value['last_modified_date']),
+		 $this->common->get_status('status', 'ip_map', $value),
+		 $this->common->convert_GMT_to('', '', $value['created_date']),
+		 $this->common->convert_GMT_to('', '', $value['last_modified_date']),
 		 $ret_url,
          
 		  ));
-		 }else{
-		 $ret_url = '<a href="'. base_url() .'ipmap/ipmap_edit/'.$value['id'].'" class="btn btn-royelblue btn-sm"  rel="facebox" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;<a href="'. base_url() .'ipmap/ipmap_delete/' . $value['id'].'" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>';
-		 $account_name =$this->common->build_concat_string("first_name,last_name,number", "accounts",$value['accountid']);
+		 } else {
+		 $ret_url = '<a href="'.base_url().'ipmap/ipmap_edit/'.$value['id'].'" class="btn btn-royelblue btn-sm"  rel="facebox" title="Edit">&nbsp;<i class="fa fa-pencil-square-o fa-fw"></i></a>&nbsp;<a href="'.base_url().'ipmap/ipmap_delete/'.$value['id'].'" class="btn btn-royelblue btn-sm" title="Delete" onClick="return get_alert_msg();">&nbsp;<i class="fa fa-trash fa-fw"></i></a>';
+		 $account_name = $this->common->build_concat_string("first_name,last_name,number", "accounts", $value['accountid']);
 		 $json_data['rows'][] = array('cell' => array(
 		 $ipmap_checkbox,
 		 $account_name,
 		 $value['name'],
 		 $value['ip'],
 		 $value['prefix'],
-		 $this->common->get_status('status', 'ip_map',$value),
-		 $this->common->convert_GMT_to('','',$value['created_date']),
-		 $this->common->convert_GMT_to('','',$value['last_modified_date']),
+		 $this->common->get_status('status', 'ip_map', $value),
+		 $this->common->convert_GMT_to('', '', $value['created_date']),
+		 $this->common->convert_GMT_to('', '', $value['last_modified_date']),
 		 $ret_url,
          
 		  ));

web_interface/astpp/application/modules/ipmap/libraries/ipmap_form.php

Spacing +31 added lines, -31 removed lines

@@ -20,7 +20,7 @@ 
 # You should have received a copy of the GNU Affero General Public License

 # 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 Ipmap_form {

@@ -39,12 +39,12 @@ 
      in customer login show ipmap (ACL) module

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

 		$logintype = $this->CI->session->userdata('logintype');

-	   if($account_type == '0' || $logintype == '0'){

-		$account=null;

-		$form['forms'] = array(base_url() . 'user/user_ipmap_save/', array('id' => 'ipmap_form', 'method' => 'POST', 'name' => 'ipmap_form'));

-	   }else{

-	   $account=array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type" => "0,3", "deleted" => "0","status" => "0"));

-		$form['forms'] = array(base_url() . 'ipmap/ipmap_save/', array('id' => 'ipmap_form', 'method' => 'POST', 'name' => 'ipmap_form'));

+	   if ($account_type == '0' || $logintype == '0') {

+		$account = null;

+		$form['forms'] = array(base_url().'user/user_ipmap_save/', array('id' => 'ipmap_form', 'method' => 'POST', 'name' => 'ipmap_form'));

+	   } else {

+	   $account = array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => "0", "type" => "0,3", "deleted" => "0", "status" => "0"));

+		$form['forms'] = array(base_url().'ipmap/ipmap_save/', array('id' => 'ipmap_form', 'method' => 'POST', 'name' => 'ipmap_form'));

 	   }

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

 		$form['IP map'] = array(

@@ -55,7 +55,7 @@ 
    	    *****************************************/

 			$account,

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

-			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'),

 		   /*ASTPP  3.0 

    	    in customer login show ipmap (ACL) module

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

@@ -71,16 +71,16 @@ 
 	}

 

 	function get_ipmap_search_form($account_data = '') {

-		$accountinfo=$this->CI->session->userdata('accountinfo');

-		$reseller_id=$accountinfo['type']==1 ? $accountinfo['id']:0;

+		$accountinfo = $this->CI->session->userdata('accountinfo');

+		$reseller_id = $accountinfo['type'] == 1 ? $accountinfo['id'] : 0;

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

      	    ASTPP  3.0 

    	    in customer login show ipmap (ACL) module

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

-	 if($account_data =='0'){

-		   $account=null;

-		}else{

-		 $account=array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => $reseller_id,"type"=>"0", "deleted" => "0"));

+	 if ($account_data == '0') {

+		   $account = null;

+		} else {

+		 $account = array('Account', 'accountid', 'SELECT', '', '', 'tOOL TIP', 'Please Enter account number', 'id', 'first_name,last_name,number', 'accounts', 'build_concat_dropdown', 'where_arr', array("reseller_id" => $reseller_id, "type"=>"0", "deleted" => "0"));

 		}

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

 		$form['forms'] = array("", array('id' => "ipmap_search"));

@@ -110,16 +110,16 @@ 
     in customer Add/Edit show Ipmap (ACL) module.

     *******/

 	function build_ipmap_list_for_admin($account_data = '') {

-			if($account_data == '0'){

+			if ($account_data == '0') {

 			$grid_field_arr = json_encode(array(

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

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

 			array("Name", "100", "name", "", "", ""),

 			array("IP", "240", "ip", "", "", ""),

 			array("Prefix", "240", "prefix", "", "", ""),

 			 /*

             ASTPP  3.0  creation field show in grid

             */

-			array("Status", "180", "status", "status", "ip_map", "get_status","","true","center"),

+			array("Status", "180", "status", "status", "ip_map", "get_status", "", "true", "center"),

 			array("Created Date", "150", "creation_date", "creation_date", "creation_date", "convert_GMT_to"),

 			array("Modified Date Date", "170", "last_modified_date", "last_modified_date", "last_modified_date", "convert_GMT_to"),

             

@@ -127,19 +127,19 @@ 
 			array("Action", "205", "", "", "", array("EDIT" => array("url" => "ipmap/ipmap_edit/", "mode" => "popup", 'popup'),

 					"DELETE" => array("url" => "ipmap/ipmap_delete/", "mode" => "single")))

 				));

-			}else{

+			} else {

 		   $grid_field_arr = json_encode(array(

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

-		   array("Account", "200", "accountid", "first_name,last_name,number", "accounts", "get_field_name_coma_new","","true","center"),

-		   array("Name", "190", "name", "", "", "","","true","center"),

-		   array("IP", "170", "ip", "", "", "","","true","center"),

-		   array("Prefix", "100", "prefix", "", "", "","","true","center"),

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

+		   array("Account", "200", "accountid", "first_name,last_name,number", "accounts", "get_field_name_coma_new", "", "true", "center"),

+		   array("Name", "190", "name", "", "", "", "", "true", "center"),

+		   array("IP", "170", "ip", "", "", "", "", "true", "center"),

+		   array("Prefix", "100", "prefix", "", "", "", "", "true", "center"),

 			/*

             ASTPP  3.0  creation field show in grid

             */

-			array("Status", "160", "status", "status", "ip_map", "get_status","","true","center"),

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

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

+			array("Status", "160", "status", "status", "ip_map", "get_status", "", "true", "center"),

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

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

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

 		   array("Action", "100", "", "", "", array("EDIT" => array("url" => "ipmap/ipmap_edit/", "mode" => "popup", 'popup'),

 					"DELETE" => array("url" => "ipmap/ipmap_delete/", "mode" => "single")))

@@ -150,8 +150,8 @@ 
 	/**********************************************************************************************************/

 

 	function build_grid_buttons() {

-		$buttons_json = json_encode(array(array("Add" , "btn btn-line-warning btn" , "fa fa-plus-circle fa-lg", "button_action", "/ipmap/ipmap_add/", "popup"),

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

+		$buttons_json = json_encode(array(array("Add", "btn btn-line-warning btn", "fa fa-plus-circle fa-lg", "button_action", "/ipmap/ipmap_add/", "popup"),

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

 			));

 		return $buttons_json;

 	}

@@ -161,9 +161,9 @@ 
     in customer Add/Edit show Ipmap (ACL) module.

     *******/

     

-	function build_grid_buttons_user(){

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

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

+	function build_grid_buttons_user() {

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

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

 			));

 		return $buttons_json;

 	}

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

Spacing +75 added lines, -75 removed lines

@@ -31,23 +31,23 @@ 
 		$this->load->model('db_model');
 	}
     
-	function set_lang_global($post=false){ 
-	if(!is_array($post)){
-		$str=trim($post);
-		$new_arr[$str]=$str;
-		$post=$new_arr;
+	function set_lang_global($post = false) { 
+	if ( ! is_array($post)) {
+		$str = trim($post);
+		$new_arr[$str] = $str;
+		$post = $new_arr;
 	}
-	if(isset($post['fr_FR'])){
-	 $language=$post['fr_FR'];
+	if (isset($post['fr_FR'])) {
+	 $language = $post['fr_FR'];
 	 $this->session->set_userdata('user_language', $language);
 	}
-	if(isset($post['es_ES'])){
-	 $language=$post['es_ES'];
+	if (isset($post['es_ES'])) {
+	 $language = $post['es_ES'];
 	 $this->session->set_userdata('user_language', $language);         
 	}       
-	if(isset($post['en_EN'])){
-	 $language=$post['en_EN'];
-	 $this->session->unset_userdata('user_language',$language);
+	if (isset($post['en_EN'])) {
+	 $language = $post['en_EN'];
+	 $this->session->unset_userdata('user_language', $language);
 	} 
 	$this->locale->set_lang();
 	return true;
@@ -55,17 +55,17 @@ 
 
 	function index() {
 		if ($this->session->userdata('user_login') == FALSE) {
-			if (!empty($_POST) && trim($_POST['username']) != '' && trim($_POST['password']) != '') {
-			$_POST['password']=$this->common->encode($_POST['password']);
+			if ( ! empty($_POST) && trim($_POST['username']) != '' && trim($_POST['password']) != '') {
+			$_POST['password'] = $this->common->encode($_POST['password']);
 				$user_valid = $this->Auth_model->verify_login($_POST['username'], $_POST['password']);
                 
 				if ($user_valid == 1) {
 					$this->session->set_userdata('user_login', TRUE);
 			$where = "number = '".$this->db->escape_str($_POST['username'])."' OR email = '".$this->db->escape_str($_POST['username'])."'";
-					$result = $this->db_model->getSelect("*", "accounts",$where);
+					$result = $this->db_model->getSelect("*", "accounts", $where);
 					$result = $result->result_array();
 					$result = $result[0];
-					 $logintype=$result['type']== -1 ? 2: $result['type'];
+					 $logintype = $result['type'] == -1 ? 2 : $result['type'];
 					$this->session->set_userdata('logintype', $logintype);
 					$this->session->set_userdata('userlevel_logintype', $result['type']);
 					$this->session->set_userdata('username', $_POST['username']);
@@ -118,15 +118,15 @@ 
 					if ($result['type'] == 0 || $result['type'] == 1) {
 						$menu_list = $this->permission->get_module_access($result['type']);
 						$this->session->set_userdata('mode_cur', 'user');
-						if($result['type'] == 1){
-							redirect(base_url() . 'dashboard/');
-						}else{
-							redirect(base_url() . 'user/user/');
+						if ($result['type'] == 1) {
+							redirect(base_url().'dashboard/');
+						} else {
+							redirect(base_url().'user/user/');
 						}
 					} else {
 						$menu_list = $this->permission->get_module_access($result['type']);
 						$this->session->set_userdata('mode_cur', 'admin');
-						redirect(base_url() . 'dashboard/');
+						redirect(base_url().'dashboard/');
 					}
 				} else {
 		   
@@ -151,7 +151,7 @@ 
 			$this->session->set_userdata('user_login', FALSE);
 			$data['app_name'] = 'ASTPP - Open Source Billing Solution';
 			$this->load->view('view_login', $data);
-		}else {
+		} else {
 	/*
 	*
 	* Purpose : Display logo based on domain name
@@ -173,7 +173,7 @@ 
 	//              echo $data['user_logo'];exit;
 /***************************************************************************************/
 		if ($this->session->userdata('logintype') == '2') {
-		redirect(base_url() . 'dashboard/');
+		redirect(base_url().'dashboard/');
 		} else {
 		redirect(base_url().'user/user/');
 		}
@@ -184,25 +184,25 @@ 
 		$this->session->sess_destroy();
 		redirect(base_url());
 	}
-  function paypal_response(){
-	  if(count($_POST)>0)
+  function paypal_response() {
+	  if (count($_POST) > 0)
 	  {
-		$response_arr=$_POST;
-		$fp=fopen("/var/log/astpp/astpp_payment.log","w+");
+		$response_arr = $_POST;
+		$fp = fopen("/var/log/astpp/astpp_payment.log", "w+");
 		$date = date("Y-m-d H:i:s");
-		fwrite($fp,"====================".$date."===============================\n");
-		foreach($response_arr as $key => $value){	  
-			fwrite($fp,$key.":::>".$value."\n");
+		fwrite($fp, "====================".$date."===============================\n");
+		foreach ($response_arr as $key => $value) {	  
+			fwrite($fp, $key.":::>".$value."\n");
 		}
 		$payment_check = $this->db_model->countQuery("txn_id", "payments", array("txn_id" => $response_arr['txn_id']));
-		if( ($response_arr["payment_status"] == "Pending" || $response_arr["payment_status"] == "Complete" || $response_arr["payment_status"] == "Completed" ) && $payment_check == 0){
+		if (($response_arr["payment_status"] == "Pending" || $response_arr["payment_status"] == "Complete" || $response_arr["payment_status"] == "Completed") && $payment_check == 0) {
 
-			$paypal_tax = (array)$this->db->get_where("system", array("name" => "paypal_tax","group_title"=>"paypal"))->first_row();
-			$paypal_tax =$paypal_tax['value'];
+			$paypal_tax = (array)$this->db->get_where("system", array("name" => "paypal_tax", "group_title"=>"paypal"))->first_row();
+			$paypal_tax = $paypal_tax['value'];
 			$balance_amt = $actual_amount = $response_arr["custom"];
-			$paypal_fee = (array)$this->db->get_where("system", array("name" => "paypal_fee","group_title"=>"paypal"))->first_row();
+			$paypal_fee = (array)$this->db->get_where("system", array("name" => "paypal_fee", "group_title"=>"paypal"))->first_row();
 			$paypal_fee = $paypal_fee['value'];
-			$paypalfee = ($paypal_fee == 0)?'0':$response_arr["mc_gross"];
+			$paypalfee = ($paypal_fee == 0) ? '0' : $response_arr["mc_gross"];
 			$account_data = (array)$this->db->get_where("accounts", array("id" => $response_arr["item_number"]))->first_row();
 			$currency = (array)$this->db->get_where('currency', array("id"=>$account_data["currency_id"]))->first_row();
 			$date = date('Y-m-d H:i:s');
@@ -216,35 +216,35 @@ 
 							"currency_rate"=>$currency["currencyrate"],
 							"transaction_details"=>json_encode($response_arr),
 							"date"=>$date);
-			 $paymentid=$this->db->insert('payment_transaction',$payment_trans_array);
-			 $parent_id =$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : '-1';
+			 $paymentid = $this->db->insert('payment_transaction', $payment_trans_array);
+			 $parent_id = $account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : '-1';
 		 $payment_arr = array("accountid"=> $response_arr["item_number"],
-		 		"payment_mode"=>"1","credit"=>$balance_amt,
+		 		"payment_mode"=>"1", "credit"=>$balance_amt,
 				"type"=>"PAYPAL",
 				"payment_by"=>$parent_id,
 				"notes"=>"Payment Made by Paypal on date:-".$date,
 				"paypalid"=>$paymentid,
 				"txn_id"=>$response_arr["txn_id"],
-				'payment_date'=>gmdate('Y-m-d H:i:s',strtotime($response_arr['payment_date'])));
+				'payment_date'=>gmdate('Y-m-d H:i:s', strtotime($response_arr['payment_date'])));
 		 $this->db->insert('payments', $payment_arr);
 		 $this->db->select('invoiceid');
-		 $this->db->order_by('id','desc');
+		 $this->db->order_by('id', 'desc');
 		 $this->db->limit(1);
- 		 $last_invoice_result=(array)$this->db->get('invoices')->first_row();
- 		 $last_invoice_ID=isset($last_invoice_result['invoiceid'] ) && $last_invoice_result['invoiceid'] > 0 ?$last_invoice_result['invoiceid'] : 1;
- 		 $reseller_id=$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
-		 $where="accountid IN ('".$reseller_id."','1')";
+ 		 $last_invoice_result = (array)$this->db->get('invoices')->first_row();
+ 		 $last_invoice_ID = isset($last_invoice_result['invoiceid']) && $last_invoice_result['invoiceid'] > 0 ? $last_invoice_result['invoiceid'] : 1;
+ 		 $reseller_id = $account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
+		 $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();
-		 $invoice_prefix=$invoiceconf['invoice_prefix'];
+		 $invoice_prefix = $invoiceconf['invoice_prefix'];
 
-		 $due_date = gmdate("Y-m-d H:i:s",strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));  
-		 $invoice_id=$this->generate_receipt($account_data['id'],$balance_amt,$account_data,$last_invoice_ID+1,$invoice_prefix,$due_date);
-		 $details_insert=array(
+		 $due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));  
+		 $invoice_id = $this->generate_receipt($account_data['id'], $balance_amt, $account_data, $last_invoice_ID + 1, $invoice_prefix, $due_date);
+		 $details_insert = array(
 			'created_date'=>$date,
 			'credit'=>$balance_amt,
 			'debit'=>'-',
@@ -254,34 +254,34 @@ 
 			'description'=>"Payment Made by Paypal on date:-".$date,
 			'item_type'=>'PAYMENT',
 	  			'before_balance'=>$account_data['balance'],
-			'after_balance'=>$account_data['balance']+$balance_amt,
+			'after_balance'=>$account_data['balance'] + $balance_amt,
 			);
 		$this->db->insert("invoice_details", $details_insert); 
-		$this->db_model->update_balance($balance_amt,$account_data["id"],"credit");            
-		if($parent_id > 0){
-			  $reseller_ids=$this->common->get_parent_info($parent_id,0);
-			  $reseller_ids=rtrim($reseller_ids,",");
-			  $reseller_arr=explode(",",$reseller_ids);
-			  if(!empty($reseller_arr)){
-			foreach($reseller_arr as $key=>$reseller_id){
+		$this->db_model->update_balance($balance_amt, $account_data["id"], "credit");            
+		if ($parent_id > 0) {
+			  $reseller_ids = $this->common->get_parent_info($parent_id, 0);
+			  $reseller_ids = rtrim($reseller_ids, ",");
+			  $reseller_arr = explode(",", $reseller_ids);
+			  if ( ! empty($reseller_arr)) {
+			foreach ($reseller_arr as $key=>$reseller_id) {
 			  $account_data = (array)$this->db->get_where("accounts", array("id" => $reseller_id))->first_row();
 			  $this->db->select('invoiceid');
-				  $this->db->order_by('id','desc');
+				  $this->db->order_by('id', 'desc');
 				  $this->db->limit(1);
- 					  $last_invoice_result=(array)$this->db->get('invoices')->first_row();
- 					  $last_invoice_ID=$last_invoice_result['invoiceid'];
- 		 		  $reseller_id=$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
-					  $where="accountid IN ('".$reseller_id."','1')";
+ 					  $last_invoice_result = (array)$this->db->get('invoices')->first_row();
+ 					  $last_invoice_ID = $last_invoice_result['invoiceid'];
+ 		 		  $reseller_id = $account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : 0;
+					  $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();
-					  $invoice_prefix=$invoiceconf['invoice_prefix'];
-		 		  $due_date = gmdate("Y-m-d H:i:s",strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));
-		 		  $invoice_id=$this->generate_receipt($account_data['id'],$balance_amt,$account_data,$last_invoice_ID+1,$invoice_prefix,$due_date);
-			  $parent_id=$account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : -1;
+					  $invoice_prefix = $invoiceconf['invoice_prefix'];
+		 		  $due_date = gmdate("Y-m-d H:i:s", strtotime(gmdate("Y-m-d H:i:s")." +".$invoiceconf['interval']." days"));
+		 		  $invoice_id = $this->generate_receipt($account_data['id'], $balance_amt, $account_data, $last_invoice_ID + 1, $invoice_prefix, $due_date);
+			  $parent_id = $account_data['reseller_id'] > 0 ? $account_data['reseller_id'] : -1;
 			  $payment_arr = array("accountid"=> $account_data["id"],
 		 					"payment_mode"=>"1",
 		 					"credit"=>$balance_amt,
@@ -290,9 +290,9 @@ 
 							"notes"=>"Your account has been credited due to your customer account recharge done by paypal",
 							"paypalid"=>$paymentid,
 							"txn_id"=>$response_arr["txn_id"],
-							'payment_date'=>gmdate('Y-m-d H:i:s',strtotime($response_arr['payment_date'])));
+							'payment_date'=>gmdate('Y-m-d H:i:s', strtotime($response_arr['payment_date'])));
 	 			  $this->db->insert('payments', $payment_arr);
-			  $details_insert=array(
+			  $details_insert = array(
 				'created_date'=>$date,
 				'credit'=>$balance_amt,
 				'debit'=>'-',
@@ -302,31 +302,31 @@ 
 				'description'=>"Your account has been credited due to your customer account recharge done by paypal",
 				'item_type'=>'PAYMENT',
 		  	        'before_balance'=>$account_data['balance'],
-				'after_balance'=>$account_data['balance']+$balance_amt,
+				'after_balance'=>$account_data['balance'] + $balance_amt,
 			   );
 		          $this->db->insert("invoice_details", $details_insert); 
-	          	  $this->db_model->update_balance($balance_amt,$account_data["id"],"credit");  			         
+	          	  $this->db_model->update_balance($balance_amt, $account_data["id"], "credit");  			         
 			}
 		      }
 		}
-		redirect(base_url() . 'user/user/');
+		redirect(base_url().'user/user/');
         }
       }         
-	redirect(base_url() . 'user/user/');
+	redirect(base_url().'user/user/');
     }
 
     /**
      * @param integer $last_invoice_ID
      * @param string $due_date
      */
-    function generate_receipt($accountid,$amount,$accountinfo,$last_invoice_ID,$invoice_prefix,$due_date){
-		$invoice_data = array("accountid"=>$accountid,"invoice_prefix" =>$invoice_prefix,"invoiceid"=>'0000'.$last_invoice_ID,"reseller_id"=>$accountinfo['reseller_id'],"invoice_date"=>gmdate("Y-m-d H:i:s"),"from_date"=>  gmdate("Y-m-d H:i:s"),"to_date"=>gmdate("Y-m-d H:i:s"),"due_date"=>$due_date,"status"=>1,"balance"=>$accountinfo['balance'],"amount"=>$amount,"type"=>'R',"confirm"=>'1');            
-        $this->db->insert("invoices",$invoice_data);
+    function generate_receipt($accountid, $amount, $accountinfo, $last_invoice_ID, $invoice_prefix, $due_date) {
+		$invoice_data = array("accountid"=>$accountid, "invoice_prefix" =>$invoice_prefix, "invoiceid"=>'0000'.$last_invoice_ID, "reseller_id"=>$accountinfo['reseller_id'], "invoice_date"=>gmdate("Y-m-d H:i:s"), "from_date"=>  gmdate("Y-m-d H:i:s"), "to_date"=>gmdate("Y-m-d H:i:s"), "due_date"=>$due_date, "status"=>1, "balance"=>$accountinfo['balance'], "amount"=>$amount, "type"=>'R', "confirm"=>'1');            
+        $this->db->insert("invoices", $invoice_data);
         $invoiceid = $this->db->insert_id();    
         return  $invoiceid;  
     }
     
-    function get_language_text(){
+    function get_language_text() {
    // echo '<pre>'; print_r($_POST); exit;
       echo gettext($_POST['display']); 
  	}