iNextrix / ASTPP

web_interface/astpp/application/modules/user/views/view_user_ipmap_list.php

Spacing +7 added lines, -7 removed lines

@@ -21,24 +21,24 @@
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                     <ul class="breadcrumb">
-                         <?php $accountinfo=$this->session->userdata('accountinfo');
-						  if($accountinfo['type']==1){ ?>
-                          <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
-                          <?php } else{ ?>
+                         <?php $accountinfo = $this->session->userdata('accountinfo');
+						  if ($accountinfo['type'] == 1) { ?>
+                          <li><a href="<?= base_url()."user/user_myprofile/"; ?>">My Profile</a></li>
+                          <?php } else { ?>
 			    <li><a href="#">Configuration</a></li>
                           <?php }
 					?>
                         
                         <li class='active'>
-                            <a href="<?= base_url() . "user/user_ipmap/"; ?>">IP Settings</a>
+                            <a href="<?= base_url()."user/user_ipmap/"; ?>">IP Settings</a>
                         </li>
                     </ul>
                 </div>
-                <?php if($accountinfo['type']==1) { ?>
+                <?php if ($accountinfo['type'] == 1) { ?>
                    <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                    </div>
                 <?php }?>

web_interface/astpp/application/modules/user/views/view_user_invoices_config.php

Spacing +6 added lines, -6 removed lines

@@ -198,13 +198,13 @@
 				</div>
 		</div>	
 <?php
-	if($account_data['logo']  != ''){
-		 $logo=$account_data['file'];
-	}else{
-		 $logo=$account_data['logo'];
+	if ($account_data['logo'] != '') {
+		 $logo = $account_data['file'];
+	} else {
+		 $logo = $account_data['logo'];
 	}
-		  if($logo != ''){        
-			 $file_name= base_url()."upload/$logo";
+		  if ($logo != '') {        
+			 $file_name = base_url()."upload/$logo";
 ?>
 
 		<div class='col-md-12 no-padding'>

web_interface/astpp/application/modules/user/views/view_user_animap.php

Spacing +7 added lines, -7 removed lines

@@ -43,24 +43,24 @@
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                     <ul class="breadcrumb">
-                         <?php $accountinfo=$this->session->userdata('accountinfo');
-						  if($accountinfo['type']==1){ ?>
-                          <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
-                          <?php } else{ ?>
+                         <?php $accountinfo = $this->session->userdata('accountinfo');
+						  if ($accountinfo['type'] == 1) { ?>
+                          <li><a href="<?= base_url()."user/user_myprofile/"; ?>">My Profile</a></li>
+                          <?php } else { ?>
 			    <li><a href="#">Configuration</a></li>
                           <?php }
 					?>
                         
                         <li class='active'>
-                           <a href="<?= base_url() . "user/user_animap_list/"; ?>">Caller ID</a>
+                           <a href="<?= base_url()."user/user_animap_list/"; ?>">Caller ID</a>
                         </li>
                     </ul>
                 </div>
-                <?php if($accountinfo['type']==1) { ?>
+                <?php if ($accountinfo['type'] == 1) { ?>
                    <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                    </div>
                 <?php }?>

web_interface/astpp/application/modules/user/views/view_user_invoices_list.php

Spacing +7 added lines, -7 removed lines

@@ -52,24 +52,24 @@
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                     <ul class="breadcrumb">
-                    <?php $accountinfo=$this->session->userdata('accountinfo');
-						  if($accountinfo['type']==1){ ?>
-                          <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
-                          <?php } else{ ?>
+                    <?php $accountinfo = $this->session->userdata('accountinfo');
+						  if ($accountinfo['type'] == 1) { ?>
+                          <li><a href="<?= base_url()."user/user_myprofile/"; ?>">My Profile</a></li>
+                          <?php } else { ?>
 			    <li><a href="#">Billing</a></li>
                           <?php }
 					?>
                         
                         <li class='active'>
-                            <a href="<?= base_url() . "user/user_invoices_list/"; ?>">Invoices </a>
+                            <a href="<?= base_url()."user/user_invoices_list/"; ?>">Invoices </a>
                         </li>
                     </ul>
                 </div>
-                <?php if($accountinfo['type']==1) { ?>
+                <?php if ($accountinfo['type'] == 1) { ?>
                    <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                    </div>
                 <?php }?>

web_interface/astpp/application/modules/user/views/view_user_charges_list.php

Spacing +7 added lines, -7 removed lines

@@ -42,22 +42,22 @@
             <div class="col-md-12 no-padding color-three border_box"> 
                 <div class="pull-left">
                     <ul class="breadcrumb">
-                    <?php $accountinfo=$this->session->userdata('accountinfo');
-						  if($accountinfo['type']==1){ ?>
-                          <li><a href="<?= base_url() . "user/user_myprofile/"; ?>">My Profile</a></li>
-                          <?php } else{ ?>
+                    <?php $accountinfo = $this->session->userdata('accountinfo');
+						  if ($accountinfo['type'] == 1) { ?>
+                          <li><a href="<?= base_url()."user/user_myprofile/"; ?>">My Profile</a></li>
+                          <?php } else { ?>
 			    <li><a href="#">Billing</a></li>
                           <?php } ?>
 			  <li class='active'>
-                            <a href="<?= base_url() . "user/user_charges_history/"; ?>">Charges History </a>
+                            <a href="<?= base_url()."user/user_charges_history/"; ?>">Charges History </a>
                           </li>
                     </ul>
                 </div>
-                <?php if($accountinfo['type']==1) { ?>
+                <?php if ($accountinfo['type'] == 1) { ?>
                    <div class="pull-right">
                     <ul class="breadcrumb">
 		      <li class="active pull-right">
-		      <a href="<?= base_url() . "user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
+		      <a href="<?= base_url()."user/user_myprofile/"; ?>"> <i class="fa fa-fast-backward" aria-hidden="true"></i> Back</a></li>
                     </ul>
                    </div>
                 <?php }?>

web_interface/astpp/application/modules/dashboard/models/dashboard_model.php

Spacing +34 added lines, -34 removed lines

@@ -31,23 +31,23 @@ 
 
 	function get_recent_recharge()
 	{
-	$accountinfo=$this->session->userdata('accountinfo');
-	$userlevel_logintype=$this->session->userdata('userlevel_logintype');
+	$accountinfo = $this->session->userdata('accountinfo');
+	$userlevel_logintype = $this->session->userdata('userlevel_logintype');
 	
-	$where_arr=array('payment_by'=>-1);
-	if($userlevel_logintype == 1){
-	  $where_arr=array('payment_by'=>$accountinfo['id']);
+	$where_arr = array('payment_by'=>-1);
+	if ($userlevel_logintype == 1) {
+	  $where_arr = array('payment_by'=>$accountinfo['id']);
 	}
-	if($userlevel_logintype == 0 || $userlevel_logintype == 3){
-	  $where_arr=array('accountid'=>$accountinfo['id']);
+	if ($userlevel_logintype == 0 || $userlevel_logintype == 3) {
+	  $where_arr = array('accountid'=>$accountinfo['id']);
 	}
 		$this->db->where($where_arr);
 		$this->db->select('id,accountid,credit,payment_date');
 		$this->db->limit(12);
-		$this->db->order_by('payment_date','desc');
+		$this->db->order_by('payment_date', 'desc');
 	return $this->db->get('payments');
 	}
-	 function get_call_statistics($table,$parent_id,$start_date='',$end_date='',$group_flag=true) 
+	 function get_call_statistics($table, $parent_id, $start_date = '', $end_date = '', $group_flag = true) 
 	{
 		$this->db->select("count(uniqueid) as sum,
                            count(CASE WHEN billseconds > 0 THEN 1 END) as answered,
@@ -59,46 +59,46 @@ 
                            sum(cost) as cost,
                            SUM(CASE WHEN billseconds > 0 THEN 1 ELSE 0 END) as completed,
                            DAY(callstart) as day",false);
-		$this->db->where('callstart >=',$start_date." 00:00:00");
-		$this->db->where('callstart <=',$end_date." 23:59:59");
-		$this->db->where('reseller_id',$parent_id);
-		if($group_flag)
+		$this->db->where('callstart >=', $start_date." 00:00:00");
+		$this->db->where('callstart <=', $end_date." 23:59:59");
+		$this->db->where('reseller_id', $parent_id);
+		if ($group_flag)
 		$this->db->group_by("DAY(callstart)");
-		$result=$this->db->get($table);
+		$result = $this->db->get($table);
 	return $result;
 	}
-	function get_customer_maximum_callminutes($start_date,$end_date)
+	function get_customer_maximum_callminutes($start_date, $end_date)
 	{
-	$start_date=$start_date." 00:00:00";
-	$end_date=$end_date." 23:59:59";
-	$accountinfo=$this->session->userdata('accountinfo');
-	$parent_id= ($accountinfo['type'] == 1) ? $accountinfo['id']:0;
-	if($this->session->userdata('userlevel_logintype')!= 0 && $this->session->userdata('userlevel_logintype')!= 3) {
-		 $where ="reseller_id ='$parent_id'";
+	$start_date = $start_date." 00:00:00";
+	$end_date = $end_date." 23:59:59";
+	$accountinfo = $this->session->userdata('accountinfo');
+	$parent_id = ($accountinfo['type'] == 1) ? $accountinfo['id'] : 0;
+	if ($this->session->userdata('userlevel_logintype') != 0 && $this->session->userdata('userlevel_logintype') != 3) {
+		 $where = "reseller_id ='$parent_id'";
 	} else {
-		 $where ="accountid ='$parent_id'";
+		 $where = "accountid ='$parent_id'";
 	}
-	$where= $where." AND callstart >= '".$start_date."' AND  callstart <= '".$end_date."'";
-	$select_query= "(SELECT sum( billseconds ) AS billseconds,accountid FROM (cdrs) WHERE $where group by accountid order by sum(billseconds) desc limit 10)
+	$where = $where." AND callstart >= '".$start_date."' AND  callstart <= '".$end_date."'";
+	$select_query = "(SELECT sum( billseconds ) AS billseconds,accountid FROM (cdrs) WHERE $where group by accountid order by sum(billseconds) desc limit 10)
 			union
 			(SELECT sum( billseconds ) AS billseconds,accountid FROM (reseller_cdrs) WHERE $where 
 			group by accountid order by sum(billseconds) desc limit 10 ) ORDER BY billseconds DESC LIMIT 10 ";
 	return $this->db->query($select_query);
 	}
 
-	function get_customer_maximum_callcount($start_date,$end_date)
+	function get_customer_maximum_callcount($start_date, $end_date)
 	{
-	$start_date=$start_date." 00:00:00";
-	$end_date=$end_date." 23:59:59";
-	$accountinfo=$this->session->userdata('accountinfo');
-	$parent_id= ($accountinfo['type'] == 1) ? $accountinfo['id']:0;
-	  if($this->session->userdata('userlevel_logintype')!= 0 && $this->session->userdata('userlevel_logintype')!= 3) {
-	  	  $where ="reseller_id ='$parent_id'";
+	$start_date = $start_date." 00:00:00";
+	$end_date = $end_date." 23:59:59";
+	$accountinfo = $this->session->userdata('accountinfo');
+	$parent_id = ($accountinfo['type'] == 1) ? $accountinfo['id'] : 0;
+	  if ($this->session->userdata('userlevel_logintype') != 0 && $this->session->userdata('userlevel_logintype') != 3) {
+	  	  $where = "reseller_id ='$parent_id'";
 	  } else {
-		  $where ="accountid ='$parent_id'";
+		  $where = "accountid ='$parent_id'";
 	}
-	  $where= $where." AND callstart >= '".$start_date."' AND  callstart <= '".$end_date."'";
-	  $select_query="(SELECT count(uniqueid) as call_count, `accountid` FROM (`cdrs`) WHERE $where GROUP BY `accountid` ORDER BY `call_count` desc LIMIT 10)
+	  $where = $where." AND callstart >= '".$start_date."' AND  callstart <= '".$end_date."'";
+	  $select_query = "(SELECT count(uniqueid) as call_count, `accountid` FROM (`cdrs`) WHERE $where GROUP BY `accountid` ORDER BY `call_count` desc LIMIT 10)
 	  UNION
 	  (SELECT count(uniqueid) as call_count,accountid FROM (reseller_cdrs) WHERE $where GROUP BY `accountid` ORDER BY `call_count` desc LIMIT 10)
 	  ORDER BY call_count desc limit 10";

Braces +3 added lines, -2 removed lines

@@ -62,8 +62,9 @@
 		$this->db->where('callstart >=',$start_date." 00:00:00");
 		$this->db->where('callstart <=',$end_date." 23:59:59");
 		$this->db->where('reseller_id',$parent_id);
-		if($group_flag)
-		$this->db->group_by("DAY(callstart)");
+		if($group_flag) {
+				$this->db->group_by("DAY(callstart)");
+		}
 		$result=$this->db->get($table);
 	return $result;
 	}

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

Spacing +141 added lines, -141 removed lines

@@ -38,215 +38,215 @@
 	function index() 
 	{
 		if ($this->session->userdata('user_login') == FALSE) 
-			redirect(base_url() . 'login/login');
+			redirect(base_url().'login/login');
 			$data['page_title'] = 'Dashboard';
 		if ($this->session->userdata('logintype') == 0) 
 	{
 			$this->load->view('view_user_dashboard', $data);
 		} else {
-		$gmtoffset=$this->common->get_timezone_offset();	    
+		$gmtoffset = $this->common->get_timezone_offset();	    
 			$this->load->view('view_dashboard', $data);
 		}
 	}
-	function user_recent_payments(){
+	function user_recent_payments() {
 	  $this->customerReport_recent_payments();
 	}     
 	function customerReport_recent_payments() 
 	{
-	$accountinfo=$this->session->userdata('accountinfo');
-	$currency=$this->common->get_field_name('currency','currency',array("id"=>$accountinfo['currency_id']));
+	$accountinfo = $this->session->userdata('accountinfo');
+	$currency = $this->common->get_field_name('currency', 'currency', array("id"=>$accountinfo['currency_id']));
 		$json_data = array();
-	$i=1;
+	$i = 1;
 	$result = $this->dashboard_model->get_recent_recharge();
-	$gmtoffset=$this->common->get_timezone_offset();
-		if($result->num_rows() > 0)
+	$gmtoffset = $this->common->get_timezone_offset();
+		if ($result->num_rows() > 0)
 	{
-		 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts','');
-		 $json_data[0]['accountid']='Accounts';
-		 $json_data[0]['credit']='Amount('.$currency.")";
-		 $json_data[0]['payment_date']='Date';
-		 foreach($result->result_array() as $key=>$data){
-			  $current_timestamp=strtotime($data['payment_date']);
-			  $modified_date=$current_timestamp+$gmtoffset;
-		  		  $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] :"Anonymous";
-			  $json_data[$i]['accountid']=$data['accountid'];
-			  $json_data[$i]['credit']=$this->common_model->calculate_currency($data['credit'],'','',true,false);
-			  $json_data[$i]['payment_date']=date('Y-m-d H:i:s',strtotime($data['payment_date'])+$gmtoffset);
+		 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', '');
+		 $json_data[0]['accountid'] = 'Accounts';
+		 $json_data[0]['credit'] = 'Amount('.$currency.")";
+		 $json_data[0]['payment_date'] = 'Date';
+		 foreach ($result->result_array() as $key=>$data) {
+			  $current_timestamp = strtotime($data['payment_date']);
+			  $modified_date = $current_timestamp + $gmtoffset;
+		  		  $data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] : "Anonymous";
+			  $json_data[$i]['accountid'] = $data['accountid'];
+			  $json_data[$i]['credit'] = $this->common_model->calculate_currency($data['credit'], '', '', true, false);
+			  $json_data[$i]['payment_date'] = date('Y-m-d H:i:s', strtotime($data['payment_date']) + $gmtoffset);
 			  $i++;
 		  	}
 		  }
 		 echo json_encode($json_data); 
 	}
-	function  user_call_statistics_with_profit(){
+	function  user_call_statistics_with_profit() {
 	  $this->customerReport_call_statistics_with_profit();
 	 }
 	function customerReport_call_statistics_with_profit() {
-		$post=$this->input->post();
-		$year=isset($post['year']) && $post['year'] >0 ? $post['year']:date("Y");
-		$month=isset($post['month'])&& $post['month'] >0 ? $post['month']:date("m");
+		$post = $this->input->post();
+		$year = isset($post['year']) && $post['year'] > 0 ? $post['year'] : date("Y");
+		$month = isset($post['month']) && $post['month'] > 0 ? $post['month'] : date("m");
 	$json_data = array();
-	$start_date=date($year.'-'.$month.'-01');
-		$end_day= $year==date("Y") && $month ==date("m") ? date("d") :cal_days_in_month(CAL_GREGORIAN, $month, $year);
-	$gmtoffset=$this->common->get_timezone_offset();
-	$end_date=date($year."-".$month."-".$end_day.' H:i:s');
-	$end_date=date('Y-m-d',strtotime($end_date)+$gmtoffset);
-	$current_date=(int)date("d");
-		$count=0;
-		$i=0;
+	$start_date = date($year.'-'.$month.'-01');
+		$end_day = $year == date("Y") && $month == date("m") ? date("d") : cal_days_in_month(CAL_GREGORIAN, $month, $year);
+	$gmtoffset = $this->common->get_timezone_offset();
+	$end_date = date($year."-".$month."-".$end_day.' H:i:s');
+	$end_date = date('Y-m-d', strtotime($end_date) + $gmtoffset);
+	$current_date = (int)date("d");
+		$count = 0;
+		$i = 0;
 		$begin = new DateTime($start_date);
 	$end = new DateTime($end_date);
-	$end=$end->modify('+1 day');
+	$end = $end->modify('+1 day');
 	$daterange = new DatePeriod($begin, new DateInterval('P1D'), $end);
-	$records_date=array();
-	$accountinfo=$this->session->userdata('accountinfo');
-	$parent_id= ($accountinfo['type'] == 1) ? $accountinfo['id'] : 0;
-		$customerresult = $this->dashboard_model->get_call_statistics('cdrs',$parent_id,$start_date,$end_date);
-		$resellerresult = $this->dashboard_model->get_call_statistics('reseller_cdrs',$parent_id,$start_date,$end_date);
+	$records_date = array();
+	$accountinfo = $this->session->userdata('accountinfo');
+	$parent_id = ($accountinfo['type'] == 1) ? $accountinfo['id'] : 0;
+		$customerresult = $this->dashboard_model->get_call_statistics('cdrs', $parent_id, $start_date, $end_date);
+		$resellerresult = $this->dashboard_model->get_call_statistics('reseller_cdrs', $parent_id, $start_date, $end_date);
 		$acc_arr = array();
 	foreach ($customerresult->result_array() as $data) {
 	  $acc_arr[$data['day']] = $data;
 	}
-	foreach($resellerresult->result_array() as $data){
-	  $reseller_arr[$data['day']]=$data;
-	  if(isset($acc_arr[$data['day']])){
-		$acc_arr[$data['day']]['sum']= $data['sum']+$acc_arr[$data['day']]['sum'];
-		$acc_arr[$data['day']]['answered']= $data['answered']+$acc_arr[$data['day']]['answered'];
-		$acc_arr[$data['day']]['failed']= $data['failed']+$acc_arr[$data['day']]['failed'];
-		$acc_arr[$data['day']]['profit']= $data['profit']+$acc_arr[$data['day']]['profit'];
-			$acc_arr[$data['day']]['completed']= $data['completed']+$acc_arr[$data['day']]['completed'];
-			$acc_arr[$data['day']]['duration'] = $data['duration']+$acc_arr[$data['day']]['duration'];
-			$acc_arr[$data['day']]['mcd'] =$data['mcd'] > $acc_arr[$data['day']]['mcd'] ? $data['mcd']: $acc_arr[$data['day']]['mcd'];
-	  }else{
-		$acc_arr[$data['day']]=$data;
+	foreach ($resellerresult->result_array() as $data) {
+	  $reseller_arr[$data['day']] = $data;
+	  if (isset($acc_arr[$data['day']])) {
+		$acc_arr[$data['day']]['sum'] = $data['sum'] + $acc_arr[$data['day']]['sum'];
+		$acc_arr[$data['day']]['answered'] = $data['answered'] + $acc_arr[$data['day']]['answered'];
+		$acc_arr[$data['day']]['failed'] = $data['failed'] + $acc_arr[$data['day']]['failed'];
+		$acc_arr[$data['day']]['profit'] = $data['profit'] + $acc_arr[$data['day']]['profit'];
+			$acc_arr[$data['day']]['completed'] = $data['completed'] + $acc_arr[$data['day']]['completed'];
+			$acc_arr[$data['day']]['duration'] = $data['duration'] + $acc_arr[$data['day']]['duration'];
+			$acc_arr[$data['day']]['mcd'] = $data['mcd'] > $acc_arr[$data['day']]['mcd'] ? $data['mcd'] : $acc_arr[$data['day']]['mcd'];
+	  } else {
+		$acc_arr[$data['day']] = $data;
 	  }
 	}
-	if(!empty($acc_arr)){
-		foreach($daterange as $date){
-		$json_data['date'][]=$date->format("d");
-		$day = (int) $date->format("d");
-		if(isset($acc_arr[$day])){
-				  $asr= ($acc_arr[$day]['sum'] > 0 ) ? (round(($acc_arr[$day]['completed'] / $acc_arr[$day]['sum']) * 100,2)) : 0;
-				  $acd= ($acc_arr[$day]['completed'] > 0 ) ? round($acc_arr[$day]['duration'] / $acc_arr[$day]['completed'],2) : 0;
-		  $json_data['total'][]=  array((string)$acc_arr[$day]['day'],(int) $acc_arr[$day]['sum']);
-		  $json_data['answered'][]=  array((string)$acc_arr[$day]['day'],(int) $acc_arr[$day]['answered']);
-		  $json_data['failed'][]=  array((string)$acc_arr[$day]['day'],(int) $acc_arr[$day]['failed']);
-		  $json_data['profit'][]=  array((string)$acc_arr[$day]['day'],(float)  str_replace(",", "", $this->common_model->calculate_currency($acc_arr[$day]['profit'])));
-				  $json_data['acd'][]=array((string)$acc_arr[$day]['day'],(float)$acd);
-				  $json_data['mcd'][]=array((string)$acc_arr[$day]['day'],(float)$acc_arr[$day]['mcd']);
-				  $json_data['asr'][]=array((string)$acc_arr[$day]['day'],(float)$asr);
-		}else{
-		  $json_data['total'][]=  array($date->format("d"), 0);
-		  $json_data['answered'][]=  array($date->format("d"), 0);
-		  $json_data['failed'][]=  array($date->format("d"), 0);
-		  $json_data['profit'][]=  array($date->format("d"), 0);
-				  $json_data['acd'][]=array($date->format("d"), 0);
-				  $json_data['mcd'][]=array($date->format("d"), 0);
-				  $json_data['asr'][]=array($date->format("d"),0);
+	if ( ! empty($acc_arr)) {
+		foreach ($daterange as $date) {
+		$json_data['date'][] = $date->format("d");
+		$day = (int)$date->format("d");
+		if (isset($acc_arr[$day])) {
+				  $asr = ($acc_arr[$day]['sum'] > 0) ? (round(($acc_arr[$day]['completed'] / $acc_arr[$day]['sum']) * 100, 2)) : 0;
+				  $acd = ($acc_arr[$day]['completed'] > 0) ? round($acc_arr[$day]['duration'] / $acc_arr[$day]['completed'], 2) : 0;
+		  $json_data['total'][] = array((string)$acc_arr[$day]['day'], (int)$acc_arr[$day]['sum']);
+		  $json_data['answered'][] = array((string)$acc_arr[$day]['day'], (int)$acc_arr[$day]['answered']);
+		  $json_data['failed'][] = array((string)$acc_arr[$day]['day'], (int)$acc_arr[$day]['failed']);
+		  $json_data['profit'][] = array((string)$acc_arr[$day]['day'], (float)str_replace(",", "", $this->common_model->calculate_currency($acc_arr[$day]['profit'])));
+				  $json_data['acd'][] = array((string)$acc_arr[$day]['day'], (float)$acd);
+				  $json_data['mcd'][] = array((string)$acc_arr[$day]['day'], (float)$acc_arr[$day]['mcd']);
+				  $json_data['asr'][] = array((string)$acc_arr[$day]['day'], (float)$asr);
+		} else {
+		  $json_data['total'][] = array($date->format("d"), 0);
+		  $json_data['answered'][] = array($date->format("d"), 0);
+		  $json_data['failed'][] = array($date->format("d"), 0);
+		  $json_data['profit'][] = array($date->format("d"), 0);
+				  $json_data['acd'][] = array($date->format("d"), 0);
+				  $json_data['mcd'][] = array($date->format("d"), 0);
+				  $json_data['asr'][] = array($date->format("d"), 0);
 		}
 		
 		}
 	}
-	else{
-	foreach($daterange as $date){
-		$json_data['date'][]=$date->format("d");
-		$day = (int) $date->format("d");
-		$json_data['total'][]=  array($date->format("d"), 0);
-		$json_data['answered'][]=  array($date->format("d"), 0);
-		$json_data['failed'][]=  array($date->format("d"), 0);
-		$json_data['profit'][]=  array($date->format("d"), 0);
-				$json_data['acd'][]=array($date->format("d"), 0);
-				$json_data['mcd'][]=array($date->format("d"), 0);
-				$json_data['asr'][]=array($date->format("d"), 0);
+	else {
+	foreach ($daterange as $date) {
+		$json_data['date'][] = $date->format("d");
+		$day = (int)$date->format("d");
+		$json_data['total'][] = array($date->format("d"), 0);
+		$json_data['answered'][] = array($date->format("d"), 0);
+		$json_data['failed'][] = array($date->format("d"), 0);
+		$json_data['profit'][] = array($date->format("d"), 0);
+				$json_data['acd'][] = array($date->format("d"), 0);
+				$json_data['mcd'][] = array($date->format("d"), 0);
+				$json_data['asr'][] = array($date->format("d"), 0);
 	}
 	}
-		$customer_total_result = $this->dashboard_model->get_call_statistics('cdrs',$parent_id,$start_date,$end_date,false);
-		$reseller_total_result = $this->dashboard_model->get_call_statistics('reseller_cdrs',$parent_id,$start_date,$end_date,false);
-		$customer_total_result=(array)$customer_total_result->first_row();
-		$reseller_total_result=(array)$reseller_total_result->first_row();
-	$json_data['total_count']['sum']=$reseller_total_result['sum']+$customer_total_result['sum'];
-		$json_data['total_count']['debit']=$this->common_model->to_calculate_currency($reseller_total_result['debit']+$customer_total_result['debit'],'','',true,true);
-		$json_data['total_count']['cost']=$this->common_model->to_calculate_currency($reseller_total_result['cost']+$customer_total_result['cost'],'','',true,true);
-		$json_data['total_count']['profit']=$this->common_model->to_calculate_currency($reseller_total_result['profit']+$customer_total_result['profit'],'','',true,true);
-		$json_data['total_count']['completed']=$reseller_total_result['completed']+$customer_total_result['completed'];
-		$json_data['total_count']['duration']=$reseller_total_result['duration']+$customer_total_result['duration'];
-		$json_data['total_count']['acd']=$json_data['total_count']['completed'] > 0 ? round($json_data['total_count']['duration']/$json_data['total_count']['completed'],2):0;
-		$json_data['total_count']['mcd']=($customer_total_result['mcd'] > 0 || $reseller_total_result['mcd'] > 0 ) ? ($customer_total_result['mcd'] > $reseller_total_result['mcd'] ? $customer_total_result['mcd']:$reseller_total_result['mcd']) : 0;
-		$json_data['total_count']['asr']=($json_data['total_count']['sum'] > 0 ) ? (round(($json_data['total_count']['completed'] / $json_data['total_count']['sum']) * 100,2)) : 0;
-		$json_data['total_count']['asr']=$this->common_model->format_currency($json_data['total_count']['asr']);
+		$customer_total_result = $this->dashboard_model->get_call_statistics('cdrs', $parent_id, $start_date, $end_date, false);
+		$reseller_total_result = $this->dashboard_model->get_call_statistics('reseller_cdrs', $parent_id, $start_date, $end_date, false);
+		$customer_total_result = (array)$customer_total_result->first_row();
+		$reseller_total_result = (array)$reseller_total_result->first_row();
+	$json_data['total_count']['sum'] = $reseller_total_result['sum'] + $customer_total_result['sum'];
+		$json_data['total_count']['debit'] = $this->common_model->to_calculate_currency($reseller_total_result['debit'] + $customer_total_result['debit'], '', '', true, true);
+		$json_data['total_count']['cost'] = $this->common_model->to_calculate_currency($reseller_total_result['cost'] + $customer_total_result['cost'], '', '', true, true);
+		$json_data['total_count']['profit'] = $this->common_model->to_calculate_currency($reseller_total_result['profit'] + $customer_total_result['profit'], '', '', true, true);
+		$json_data['total_count']['completed'] = $reseller_total_result['completed'] + $customer_total_result['completed'];
+		$json_data['total_count']['duration'] = $reseller_total_result['duration'] + $customer_total_result['duration'];
+		$json_data['total_count']['acd'] = $json_data['total_count']['completed'] > 0 ? round($json_data['total_count']['duration'] / $json_data['total_count']['completed'], 2) : 0;
+		$json_data['total_count']['mcd'] = ($customer_total_result['mcd'] > 0 || $reseller_total_result['mcd'] > 0) ? ($customer_total_result['mcd'] > $reseller_total_result['mcd'] ? $customer_total_result['mcd'] : $reseller_total_result['mcd']) : 0;
+		$json_data['total_count']['asr'] = ($json_data['total_count']['sum'] > 0) ? (round(($json_data['total_count']['completed'] / $json_data['total_count']['sum']) * 100, 2)) : 0;
+		$json_data['total_count']['asr'] = $this->common_model->format_currency($json_data['total_count']['asr']);
 	echo json_encode($json_data);
 }
 
-	 function user_maximum_callminutes(){
+	 function user_maximum_callminutes() {
 	  $this->customerReport_maximum_callminutes();
 	}
 	 function customerReport_maximum_callminutes()
 	 {
-		$post=$this->input->post();
-		$year=isset($post['year']) && $post['year'] >0 ? $post['year']:date("Y");
-		$month=isset($post['month'])&& $post['month'] >0 ? $post['month']:date("m");
-	$start_date=date($year.'-'.$month.'-01');
-		$end_day= $year==date("Y") && $month ==date("m") ? date("d") :cal_days_in_month(CAL_GREGORIAN, $month, $year);
-	$gmtoffset=$this->common->get_timezone_offset();
-	$end_date=date($year."-".$month."-".$end_day.' H:i:s');
-	$end_date=date('Y-m-d',strtotime($end_date)+$gmtoffset);
+		$post = $this->input->post();
+		$year = isset($post['year']) && $post['year'] > 0 ? $post['year'] : date("Y");
+		$month = isset($post['month']) && $post['month'] > 0 ? $post['month'] : date("m");
+	$start_date = date($year.'-'.$month.'-01');
+		$end_day = $year == date("Y") && $month == date("m") ? date("d") : cal_days_in_month(CAL_GREGORIAN, $month, $year);
+	$gmtoffset = $this->common->get_timezone_offset();
+	$end_date = date($year."-".$month."-".$end_day.' H:i:s');
+	$end_date = date('Y-m-d', strtotime($end_date) + $gmtoffset);
 	 	$json_data = array();
- 	$result = $this->dashboard_model->get_customer_maximum_callminutes($start_date,$end_date);
-	$i=0;
-	$accountinfo=$this->session->userdata('accountinfo');
-	$reseller_id=$accountinfo['type']== -1 ? 0 : $accountinfo['id'];
-	if($this->session->userdata('userlevel_logintype')!= 0 && $this->session->userdata('userlevel_logintype')!= 3){
-	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('reseller_id'=>$reseller_id));
-	} else{
-	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('id'=>$reseller_id));
+ 	$result = $this->dashboard_model->get_customer_maximum_callminutes($start_date, $end_date);
+	$i = 0;
+	$accountinfo = $this->session->userdata('accountinfo');
+	$reseller_id = $accountinfo['type'] == -1 ? 0 : $accountinfo['id'];
+	if ($this->session->userdata('userlevel_logintype') != 0 && $this->session->userdata('userlevel_logintype') != 3) {
+	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('reseller_id'=>$reseller_id));
+	} else {
+	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('id'=>$reseller_id));
 	}
-		if($result->num_rows() > 0 )
+		if ($result->num_rows() > 0)
 	{	
-		   foreach ($result->result_array() as $data){
-			$data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] :"Anonymous";
-			$json_data[$i][]= $data['accountid'];
-			$json_data[$i][]= round($data['billseconds']/60,0);
+		   foreach ($result->result_array() as $data) {
+			$data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] : "Anonymous";
+			$json_data[$i][] = $data['accountid'];
+			$json_data[$i][] = round($data['billseconds'] / 60, 0);
 			$i++;
 		   } 
-		}else{
+		} else {
 	  $json_data[] = array();
 	  	}
 	 	echo json_encode($json_data);
 	 }
 
-	 function user_maximum_callcount(){
+	 function user_maximum_callcount() {
 	   $this->customerReport_maximum_callcount();
 	 }
 	 function customerReport_maximum_callcount()
 	 {
-	 	$post=$this->input->post();
-		$year=isset($post['year']) && $post['year'] >0 ? $post['year']:date("Y");
-		$month=isset($post['month'])&& $post['month'] >0 ? $post['month']:date("m");
-	$start_date=date($year.'-'.$month.'-01');
-		$end_day= $year==date("Y") && $month ==date("m") ? date("d") :cal_days_in_month(CAL_GREGORIAN, $month, $year);
-	$gmtoffset=$this->common->get_timezone_offset();
-	$end_date=date($year."-".$month."-".$end_day.' H:i:s');
-	$end_date=date('Y-m-d',strtotime($end_date)+$gmtoffset);
+	 	$post = $this->input->post();
+		$year = isset($post['year']) && $post['year'] > 0 ? $post['year'] : date("Y");
+		$month = isset($post['month']) && $post['month'] > 0 ? $post['month'] : date("m");
+	$start_date = date($year.'-'.$month.'-01');
+		$end_day = $year == date("Y") && $month == date("m") ? date("d") : cal_days_in_month(CAL_GREGORIAN, $month, $year);
+	$gmtoffset = $this->common->get_timezone_offset();
+	$end_date = date($year."-".$month."-".$end_day.' H:i:s');
+	$end_date = date('Y-m-d', strtotime($end_date) + $gmtoffset);
 	 	$json_data = array();
-	$result = $this->dashboard_model->get_customer_maximum_callcount($start_date,$end_date);
-	$accountinfo=$this->session->userdata('accountinfo');
-	$reseller_id=$accountinfo['type']== -1 ? 0 : $accountinfo['id'];
-	if($this->session->userdata('userlevel_logintype')!= 0 && $this->session->userdata('userlevel_logintype')!= 3){
-	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('reseller_id'=>$reseller_id));
-	} else{
-	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts',array('id'=>$reseller_id));
+	$result = $this->dashboard_model->get_customer_maximum_callcount($start_date, $end_date);
+	$accountinfo = $this->session->userdata('accountinfo');
+	$reseller_id = $accountinfo['type'] == -1 ? 0 : $accountinfo['id'];
+	if ($this->session->userdata('userlevel_logintype') != 0 && $this->session->userdata('userlevel_logintype') != 3) {
+	  $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('reseller_id'=>$reseller_id));
+	} else {
+	 $account_arr = $this->common->get_array('id,number,first_name,last_name', 'accounts', array('id'=>$reseller_id));
 	}
-	$i=0;
-		if($result->num_rows() > 0 )
+	$i = 0;
+		if ($result->num_rows() > 0)
 	{
 		foreach ($result->result_array() as $data) 
 		{
-				$data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] :"Anonymous";
-				$json_data[$i][]= $data['accountid'];
-				$json_data[$i][]= (int)$data['call_count'];
+				$data['accountid'] = ($data['accountid'] != '' && isset($account_arr[$data['accountid']])) ? $account_arr[$data['accountid']] : "Anonymous";
+				$json_data[$i][] = $data['accountid'];
+				$json_data[$i][] = (int)$data['call_count'];
 				$i++;
 			}
     	    
-		}else{
+		} else {
 				$json_data[] = array();
 	 		 }
 	echo json_encode($json_data);

Braces +8 added lines, -8 removed lines

@@ -37,8 +37,9 @@ 
 
 	function index() 
 	{
-		if ($this->session->userdata('user_login') == FALSE) 
-			redirect(base_url() . 'login/login');
+		if ($this->session->userdata('user_login') == FALSE) {
+					redirect(base_url() . 'login/login');
+		}
 			$data['page_title'] = 'Dashboard';
 		if ($this->session->userdata('logintype') == 0) 
 	{
@@ -116,7 +117,7 @@ 
 			$acc_arr[$data['day']]['completed']= $data['completed']+$acc_arr[$data['day']]['completed'];
 			$acc_arr[$data['day']]['duration'] = $data['duration']+$acc_arr[$data['day']]['duration'];
 			$acc_arr[$data['day']]['mcd'] =$data['mcd'] > $acc_arr[$data['day']]['mcd'] ? $data['mcd']: $acc_arr[$data['day']]['mcd'];
-	  }else{
+	  } else{
 		$acc_arr[$data['day']]=$data;
 	  }
 	}
@@ -134,7 +135,7 @@ 
 				  $json_data['acd'][]=array((string)$acc_arr[$day]['day'],(float)$acd);
 				  $json_data['mcd'][]=array((string)$acc_arr[$day]['day'],(float)$acc_arr[$day]['mcd']);
 				  $json_data['asr'][]=array((string)$acc_arr[$day]['day'],(float)$asr);
-		}else{
+		} else{
 		  $json_data['total'][]=  array($date->format("d"), 0);
 		  $json_data['answered'][]=  array($date->format("d"), 0);
 		  $json_data['failed'][]=  array($date->format("d"), 0);
@@ -145,8 +146,7 @@ 
 		}
 		
 		}
-	}
-	else{
+	} else{
 	foreach($daterange as $date){
 		$json_data['date'][]=$date->format("d");
 		$day = (int) $date->format("d");
@@ -207,7 +207,7 @@ 
 			$json_data[$i][]= round($data['billseconds']/60,0);
 			$i++;
 		   } 
-		}else{
+		} else{
 	  $json_data[] = array();
 	  	}
 	 	echo json_encode($json_data);
@@ -246,7 +246,7 @@ 
 				$i++;
 			}
     	    
-		}else{
+		} else{
 				$json_data[] = array();
 	 		 }
 	echo json_encode($json_data);

web_interface/astpp/application/modules/dashboard/views/view_dashboard.php

Spacing +2 added lines, -2 removed lines

@@ -375,7 +375,7 @@ 
 											$yearArray = range($start_year, $end_year);

 											foreach ($yearArray as $year) {

 												$selected = ($year == $currentyear) ? 'selected' : '';

-												echo '<option ' . $selected . ' value="' . $year . '">' . $year . '</option>';

+												echo '<option '.$selected.' value="'.$year.'">'.$year.'</option>';

 											}

 											?>

                                         </select>

@@ -388,7 +388,7 @@ 
 												$monthPadding = str_pad($month, 2, "0", STR_PAD_LEFT);

 												$fdate = date("F", strtotime($monthPadding));

 												$selected = (date("m") == $monthPadding) ? 'selected' : null;

-												echo '<option value="' . $monthPadding . '" ' . $selected . '>' . date("F", mktime(null, null, null, $monthPadding, 1)) . '</option>';

+												echo '<option value="'.$monthPadding.'" '.$selected.'>'.date("F", mktime(null, null, null, $monthPadding, 1)).'</option>';

 											}

 											?>

                                         </select>

web_interface/astpp/application/modules/invoices/models/invoices_model.php

Spacing +59 added lines, -59 removed lines

@@ -40,86 +40,86 @@ 
 Invoice manually
 **/
 
-	if($this->session->userdata('advance_search')!= 1){
-	  if($result->num_rows() >0){
-	  $acc_arr=array();
-	  $result=$result->result_array();
-		foreach($result as $data){
-		  $acc_arr[]=$data['id'];
+	if ($this->session->userdata('advance_search') != 1) {
+	  if ($result->num_rows() > 0) {
+	  $acc_arr = array();
+	  $result = $result->result_array();
+		foreach ($result as $data) {
+		  $acc_arr[] = $data['id'];
 		}
-		$this->db->where_in('accountid',$acc_arr);
-		if($flag){
+		$this->db->where_in('accountid', $acc_arr);
+		if ($flag) {
 		  $this->db->select('*');
 		}
-		else{
+		else {
 		  $this->db->select('count(id) as count');
 		}
-		if($flag){
-		  $this->db->where('deleted',0);
-		  $this->db->order_by('invoice_date','desc');
+		if ($flag) {
+		  $this->db->where('deleted', 0);
+		  $this->db->order_by('invoice_date', 'desc');
 		  $this->db->limit($limit, $start);
 		}
-		$result=$this->db->get('invoices');
+		$result = $this->db->get('invoices');
  		//echo $this->db->last_query();exit;    
-		if($flag){
+		if ($flag) {
 		  return $result;
-		}else{
-		  $result=$result->result_array();
+		} else {
+		  $result = $result->result_array();
 		  return $result[0]['count'];
 		}
-	  }else{
-		  if($flag){
-		  $query=(object)array('num_rows'=>0);
+	  } else {
+		  if ($flag) {
+		  $query = (object)array('num_rows'=>0);
 	  }
-	  else{
-		  $query=0;
+	  else {
+		  $query = 0;
 	  }
  	  
 	  return $query;
 		}
-	}else{
+	} else {
           
-		 if($result->num_rows() >0){
+		 if ($result->num_rows() > 0) {
 /****
 Invoice manually
 **/
-		$acc_arr=array();
-		$result=$result->result_array();
-		foreach($result as $data){
-		  $acc_arr[]=$data['id'];
+		$acc_arr = array();
+		$result = $result->result_array();
+		foreach ($result as $data) {
+		  $acc_arr[] = $data['id'];
 		}
-		$this->db->where_in('accountid',$acc_arr);
+		$this->db->where_in('accountid', $acc_arr);
 	}
          
-		 if($flag){
+		 if ($flag) {
 	  $this->db->select('*');
 		 }
-		 else{
+		 else {
 		  $this->db->select('count(id) as count');
 		 }
-		 if($flag){
-	  $this->db->order_by('invoice_date','desc');
+		 if ($flag) {
+	  $this->db->order_by('invoice_date', 'desc');
 	  $this->db->limit($limit, $start);
 		 }
-		 $result=$this->db->get('invoices');
+		 $result = $this->db->get('invoices');
   //	echo $this->db->last_query();exit;              
-		 if($result->num_rows() > 0){
-		  if($flag){
+		 if ($result->num_rows() > 0) {
+		  if ($flag) {
 	        
 		return $result;
-		  }else{
-		$result=$result->result_array();
+		  } else {
+		$result = $result->result_array();
 		
 		return $result[0]['count'];
 		  }
-		 }else{
-		  if($flag){
+		 } else {
+		  if ($flag) {
 	          
-		  $query=(object)array('num_rows'=>0);
+		  $query = (object)array('num_rows'=>0);
 		 // echo '<pre>'; print_r($query); 	
 		  }
-		  else{
-		  $query=0;
+		  else {
+		  $query = 0;
 		  }
 	return $query;
 	}
@@ -152,13 +152,13 @@ 
 
 		return NULL;
 	}
-	function get_user_invoice_list($flag, $start = 0, $limit = 0){
+	function get_user_invoice_list($flag, $start = 0, $limit = 0) {
 	$this->db_model->build_search('invoice_list_search');
-	$accountinfo=$this->session->userdata('accountinfo');
+	$accountinfo = $this->session->userdata('accountinfo');
 /****
 Invoice manually
 **/
-		$where = array("accountid" => $accountinfo['id'],'confirm'=>1);
+		$where = array("accountid" => $accountinfo['id'], 'confirm'=>1);
 		if ($flag) {
 			$query = $this->db_model->select("*", "invoices", $where, "invoice_date", "desc", $limit, $start);
             
@@ -188,42 +188,42 @@ 
 		return $query;
 	}
 	function get_invoiceconf($accountid) {
-		$return_array=array();
+		$return_array = array();
  	$logintype = $this->session->userdata('logintype');
 		if ($logintype == 1 || $logintype == 5) {
           
 		$where = array("accountid" => $this->session->userdata["accountinfo"]['id']);
-		}else{
-	   		 $where=array('id'=> $accountid);
+		} else {
+	   		 $where = array('id'=> $accountid);
 	}      
-		$query = $this->db_model->getSelect("*","invoice_conf",$where);
-		foreach($query->result_array() as $key => $value)
+		$query = $this->db_model->getSelect("*", "invoice_conf", $where);
+		foreach ($query->result_array() as $key => $value)
 		{
-			$return_array=$value;
+			$return_array = $value;
 		}       
 		 return $return_array;
 	} 
 
 
-	function save_invoiceconf($post_array){
-	$where_arr=array('id'=>$post_array['id']);
+	function save_invoiceconf($post_array) {
+	$where_arr = array('id'=>$post_array['id']);
 	unset($post_array['action']);
-	if($post_array['id'] != "" ){
+	if ($post_array['id'] != "") {
 		$this->db->where($where_arr);
 		unset($post_array['accountid']);
 		unset($post_array['logo_main']);
-		$this->db->update('invoice_conf',$post_array);
-	} else{
+		$this->db->update('invoice_conf', $post_array);
+	} else {
 		unset($post_array['logo_main']);
 		$logintype = $this->session->userdata('logintype');
 		if ($logintype == 1 || $logintype == 5) {
 			$accountdata = $this->session->userdata('accountinfo');
 			$post_array['accountid'] = $accountdata['id'];
 		}
-		if($post_array['accountid'] == 0){
-			$post_array['accountid']=1;
+		if ($post_array['accountid'] == 0) {
+			$post_array['accountid'] = 1;
 		}
-		$this->db->insert('invoice_conf',$post_array);
+		$this->db->insert('invoice_conf', $post_array);
 	}
 	return true;
 	}

Braces +10 added lines, -14 removed lines

@@ -50,8 +50,7 @@ 
 		$this->db->where_in('accountid',$acc_arr);
 		if($flag){
 		  $this->db->select('*');
-		}
-		else{
+		} else{
 		  $this->db->select('count(id) as count');
 		}
 		if($flag){
@@ -63,21 +62,20 @@ 
  		//echo $this->db->last_query();exit;    
 		if($flag){
 		  return $result;
-		}else{
+		} else{
 		  $result=$result->result_array();
 		  return $result[0]['count'];
 		}
-	  }else{
+	  } else{
 		  if($flag){
 		  $query=(object)array('num_rows'=>0);
-	  }
-	  else{
+	  } else{
 		  $query=0;
 	  }
  	  
 	  return $query;
 		}
-	}else{
+	} else{
           
 		 if($result->num_rows() >0){
 /****
@@ -93,8 +91,7 @@ 
          
 		 if($flag){
 	  $this->db->select('*');
-		 }
-		 else{
+		 } else{
 		  $this->db->select('count(id) as count');
 		 }
 		 if($flag){
@@ -107,18 +104,17 @@ 
 		  if($flag){
 	        
 		return $result;
-		  }else{
+		  } else{
 		$result=$result->result_array();
 		
 		return $result[0]['count'];
 		  }
-		 }else{
+		 } else{
 		  if($flag){
 	          
 		  $query=(object)array('num_rows'=>0);
 		 // echo '<pre>'; print_r($query); 	
-		  }
-		  else{
+		  } else{
 		  $query=0;
 		  }
 	return $query;
@@ -193,7 +189,7 @@ 
 		if ($logintype == 1 || $logintype == 5) {
           
 		$where = array("accountid" => $this->session->userdata["accountinfo"]['id']);
-		}else{
+		} else{
 	   		 $where=array('id'=> $accountid);
 	}      
 		$query = $this->db_model->getSelect("*","invoice_conf",$where);