iNextrix / ASTPP

web_interface/astpp/application/modules/package/models/package_model.php

Braces +14 added lines, -17 removed lines

@@ -50,11 +50,12 @@ 
 	 $this->db->select('pricelist_id');
 	 $account_info=(array)$this->db->get('accounts')->first_row();     
 	 $where=array('pricelist_id'=>$account_info['pricelist_id']);
-	  if(!empty($like_str))
-	  $this->db->where($like_str); 
+	  if(!empty($like_str)) {
+	  	  $this->db->where($like_str);
+	  }
 	 if ($flag) {
 	   $query = $this->db_model->select("*", "packages", $where, "id", "ASC", $limit, $start);
-	 }else {
+	 } else {
 	   $query = $this->db_model->countQuery("*", "packages", $where);
 	 }
 	  return $query;
@@ -120,8 +121,7 @@ 
 		$this->db->where_in('accountid',$acc_arr);
 		if($flag){
 		  $this->db->select('*');
-		}
-		else{
+		} else{
 		  $this->db->select('count(id) as count');
 		}
 		if($flag){
@@ -129,27 +129,26 @@ 
 		}
 			if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 				$this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-			}else{
+			} else{
 				$this->db->order_by('seconds','desc');
 			}
 		$result=$this->db->get('counters');
 // 	    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){
 		$acc_arr=array();
@@ -162,8 +161,7 @@ 
          
 		 if($flag){
 	  $this->db->select('*');
-		 }
-		 else{
+		 } else{
 		  $this->db->select('count(id) as count');
 		 }
 		 if($flag){
@@ -176,17 +174,16 @@ 
 		  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;
 		  }
 // 	echo $this->db->last_query();exit;    

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

Braces +19 added lines, -21 removed lines

@@ -34,8 +34,9 @@ 
 		$this->load->model('package_model');
 		$this->load->library('csvreader');
 
-		if ($this->session->userdata('user_login') == FALSE)
-			redirect(base_url() . '/astpp/login');
+		if ($this->session->userdata('user_login') == FALSE) {
+					redirect(base_url() . '/astpp/login');
+		}
 	}
 
    
@@ -190,7 +191,7 @@ 
 			$data['grid_buttons'] = $this->package_form->set_pattern_grid_buttons($package_id);
 			$data["edit_id"] = $package_id;
 			$this->load->view("view_package_pattern_list",$data);
-		}else{
+		} else{
 			redirect(base_url()."package/package_list/");
 		}    
 	}
@@ -198,14 +199,16 @@ 
 		$json_data = array();
 		$instant_search=$this->session->userdata('left_panel_search_package_pattern');
 		$like_str=!empty($instant_search) ? "(patterns like '%$instant_search%'  OR destination like '%$instant_search%' )" :null;
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$where = array('package_id' => $package_id);
 		$count_all = $this->db_model->countQuery("*", "package_patterns", $where);
 		$paging_data = $this->form->load_grid_config($count_all, $_GET['rp'], $_GET['page']);
 		$json_data = $paging_data["json_paging"];
-		if(!empty($like_str))
-		$this->db->where($like_str);
+		if(!empty($like_str)) {
+				$this->db->where($like_str);
+		}
 		$pattern_data = $this->db_model->select("*", "package_patterns", $where, "id", "ASC", $paging_data["paging"]["page_no"], $paging_data["paging"]["start"]);
         
 		$grid_fields = json_decode($this->package_form->build_pattern_list_for_customer($package_id));
@@ -383,19 +386,17 @@ 
 						$data['page_title'] = "Package Patterns Preview";
 						$data['check_header']=$check_header;
 						$this->session->set_userdata('import_package_code_csv',$actual_file_name);
-					}else{
+					} else{
 						$data['error'] = "File Uploading Fail Please Try Again";
 					}
 				}
-			 }   
-			else{
+			 } else{
 					$data['error']=="File Uploading Fail Please Try Again";
 				}
-		   }
-		   else {
+		   } else {
 				$data['error'] = "Invalid file format : Only CSV file allows to import records(Can't import empty file)";
 			}
-			}else{
+			} else{
 		$invalid_flag=true;
 			}
 		if ($invalid_flag) {
@@ -443,18 +444,17 @@ 
 			if($str != ""){
 			$invalid_array[$i]=$csv_data;
 			$invalid_array[$i]['error'] = $str;
-		}
-		else{
+		} else{
 		  $csv_data['patterns'] = "^" . $csv_data['patterns'] . ".*";
 		  $csv_data['package_id'] = $edit_id;
 		  $new_final_arr[$i]=$csv_data;
 		  $pattern_arr[$csv_data['patterns']]=$csv_data['patterns'];
 		}
-		}else{
+		} else{
 			$invalid_array[$i]=$csv_data;
 			$invalid_array[$i]['error'] = "Duplicate pattern found from  database.";
 		 }
-	  }else{
+	  } else{
 		  $invalid_array[$i]=$csv_data;
 		  $invalid_array[$i]['error'] = "Duplicate pattern found from import file";
 		  }
@@ -514,12 +514,10 @@ 
 		$count = count($error_field);
 		$str.= $count > 1 ? ' are not valid' : ' is not Valid';
 		return $str;
-		  }
-		  else{
+		  } else{
 		  return false;
 		  }
-	  }
-	  else{
+	  } else{
 	  $str=rtrim($str,',');
 		$error_field=explode(',',$str);
 		$count = count($error_field);

web_interface/astpp/application/modules/package/libraries/package_form.php

Braces +3 added lines, -2 removed lines

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

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

 

-if (!defined('BASEPATH'))

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

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

 class Package_form {

 

web_interface/astpp/application/modules/package/views/view_import_package_code.php

Braces +1 added lines, -1 removed lines

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

web_interface/astpp/application/modules/user/models/user_model.php

Braces +13 added lines, -13 removed lines

@@ -93,7 +93,7 @@ 
 		if ($flag) {
 		   if (isset($_GET['sortname']) && $_GET['sortname'] != 'undefined'){
 			$this->db->order_by($_GET['sortname'], ($_GET['sortorder']=='undefined')?'desc':$_GET['sortorder']);
-		   }else{
+		   } else{
 			$this->db->order_by('invoice_date', 'desc');
 		   }
 		}
@@ -307,10 +307,11 @@ 
 		$this->db->where($where);
 		$this->db->order_by("callstart desc");
 		if ($flag) {
-			if (!$export)
-				$this->db->limit($limit, $start);
+			if (!$export) {
+							$this->db->limit($limit, $start);
+			}
 			$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,debit,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
-		}else {
+		} else {
 			$this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(debit) as total_debit,sum(cost) as total_cost,group_concat(distinct(pricelist_id)) as pricelist_ids,group_concat(distinct(trunk_id)) as trunk_ids');
 		}
 		$result = $this->db->get($table_name);
@@ -387,15 +388,13 @@ 
 		if($result->num_rows() > 0){
 	  if($flag){
 		return $result;
-	  }
-	  else{
+	  } else{
 		return $result->num_rows();
 	  }
-		}else{
+		} else{
 		 if($flag){
 		  $result=(object)array('num_rows'=>0);
-	  }
-	  else{
+	  } else{
 		  $result=0;
 	  }
 	  return $result;
@@ -452,7 +451,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);
@@ -475,10 +474,11 @@ 
 		$this->db->where($where);
 		$this->db->order_by("callstart","desc");
 		if ($flag) {
-			if (!$export)
-				$this->db->limit($limit, $start);
+			if (!$export) {
+							$this->db->limit($limit, $start);
+			}
 			$this->db->select('callstart,callerid,callednum,pattern,notes,billseconds,disposition,cost,accountid,pricelist_id,calltype,is_recording,trunk_id,uniqueid');
-		}else {
+		} else {
 			$this->db->select('count(*) as count,sum(billseconds) as billseconds,sum(cost) as total_cost,group_concat(distinct(trunk_id)) as trunk_ids');
 		}
 		$result = $this->db->get('cdrs');

web_interface/astpp/application/modules/user/controllers/payment.php

Braces +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	   if($system_config["paypal_mode"]==0){
 		   $data["paypal_url"] = $system_config["paypal_url"];
 		   $data["paypal_email_id"] = $system_config["paypal_id"];
-	   }else{
+	   } else{
 		   $data["paypal_url"] = $system_config["paypal_sandbox_url"];
 		   $data["paypal_email_id"] = $system_config["paypal_sandbox_id"];
 	   }

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

Braces +33 added lines, -41 removed lines

@@ -36,8 +36,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';
 		$this->load->view('view_user_dashboard', $data);
 	}
@@ -266,7 +267,7 @@ 
 					$this->session->set_flashdata('astpp_notification', 'Insuffiecient fund to purchase this did');
 					redirect(base_url() . "user/user_didlist/");
 				}
-		}else{
+		} else{
 				$this->session->set_flashdata('astpp_notification', 'This DID already purchased by someone.');
 				redirect(base_url() . "user/user_didlist/");
 		}
@@ -298,7 +299,7 @@ 
 			$this->session->set_flashdata('astpp_notification', 'DID Removed Successfully.');
 			redirect(base_url() . "user/user_didlist/");
 		}
-		}else{
+		} else{
 	  $this->session->set_flashdata('astpp_notification', 'DID not found.');
 	  redirect(base_url() . "user/user_didlist/");
 		}
@@ -355,8 +356,9 @@ 
 				$markup = $this->common->get_field_name('markup', 'pricelists', array('id'=>$account_data["pricelist_id"]));
 				$markup = ($markup > 0)?$markup:1;
 				$action['cost']['cost'] = $this->common_model->add_calculate_currency($action['cost']['cost'], "", '', true, false);
-				if($account_data['type']!=3)
-					$action['cost']['cost']=($action['cost']['cost'] - ($action['cost']['cost']*$markup)/100);
+				if($account_data['type']!=3) {
+									$action['cost']['cost']=($action['cost']['cost'] - ($action['cost']['cost']*$markup)/100);
+				}
 			}
 			$this->session->set_userdata('user_rates_list_search', $action);
 		}
@@ -695,7 +697,7 @@ 
 					$this->session->set_userdata('accountinfo', $result[0]);
 					$this->session->set_flashdata('astpp_errormsg',' Your profile updated successfully!');
 					redirect(base_url() . 'user/user_myprofile/');
-				}else{
+				} else{
 					$this->session->set_flashdata('astpp_notification', 'Something wrong.Please contact to administrator.');
 				}
 			}
@@ -729,7 +731,7 @@ 
 				$this->session->set_flashdata('astpp_errormsg', 'Password updated successfully!');
 				redirect(base_url() . 'user/user_change_password/');
 			}
-		}else{
+		} else{
 			$data_array['id']=$accountinfo['id'];
 			$data['form'] = $this->form->build_form($this->user_form->get_userprofile_change_password(),$data_array);
 		}
@@ -745,7 +747,7 @@ 
 		$data['form_search'] = $this->form->build_serach_form($this->user_form->build_user_refill_report_search());
 		if($accountinfo['type'] == 1){
 			$this->load->view('view_reseller_refill_report', $data);
-		}else{
+		} else{
 			$this->load->view('view_user_refill_report', $data);
 		}
 	}
@@ -829,19 +831,18 @@ 
 			} else {
 				$payment = ' <button style="padding: 0 8px;" class="btn btn-success" type="button">Paid</button>';
 			}
-	   }else{
+	   } else{
 				$payment = '';
 	   }
 			if($value['generate_type'] == 1){
 		$invoice_type='Manually';
-	   }else{
+	   } else{
 		$invoice_type='Automatically';
 	   } 
 	   
 	   if($value['type'] == 'R'){
 		$icon = '<div class="flx_font flx_magenta">R</div>';
-		}
-		else
+		} else
 		{		
 			$icon = '<div class="flx_font flx_drk_pink">I</div>';
 			
@@ -904,7 +905,7 @@ 
 			$amount = $this->input->post("value",true);
 	   $amount = $this->common_model->add_calculate_currency($amount,"","",true,false);
 	   echo number_format($amount,2);
-		}else{
+		} else{
 			$this->payment->index();
 		}
 	}
@@ -1092,7 +1093,7 @@ 
 	  $this->db->where('reseller_pricing.note','dids.number',false);
 	  $this->db->where('reseller_pricing.reseller_id',$accountinfo['reseller_id']);
 	  $this->db->from('dids,reseller_pricing');
-		}else{
+		} else{
 	  $this->db->where('parent_id',0);
 	  $this->db->where('accountid',0);
 	  $this->db->select('id,number,setup,monthlycost');
@@ -1393,7 +1394,7 @@ 
 									);
 				$this->db->insert("ani_map", $insert_arr);
 				$this->session->set_flashdata('astpp_errormsg', 'Add Caller ID Sucessfully!');
-				}else{
+				} else{
 					 $this->session->set_flashdata('astpp_notification', 'Please Enter Caller ID value.');
 				}
 			} else {
@@ -1538,7 +1539,7 @@ 
 		if($action=="GET_AMT"){
 			$amount = $this->input->post("value",true);
 			$this->payment->convert_amount($amount);
-		}else{
+		} else{
 			$this->payment->index();
 		}
 	}
@@ -1573,34 +1574,25 @@ 
 				$minimum_fund=(array)$this->db->get_where('system',array("name"=>"minimum_fund_transfer"),1)->first_row();
 				if ($post_array['toaccountid'] == $account_info['number']) {
 					$this->session->set_flashdata('astpp_notification', 'You can not transfer fund in same account.');
-				}
-				elseif ($reseller_id != $account_info['reseller_id']) {
+				} elseif ($reseller_id != $account_info['reseller_id']) {
 					$this->session->set_flashdata('astpp_notification', 'You can only transfer fund in same level account.');
-				}
-				elseif ($post_array['toaccountid'] == '') {
+				} elseif ($post_array['toaccountid'] == '') {
 					$this->session->set_flashdata('astpp_notification', 'Please enter To account number.');
-				}
-				elseif (empty($post_array['credit'])) {
+				} elseif (empty($post_array['credit'])) {
 					$this->session->set_flashdata('astpp_notification', 'Please enter a amount.');
-				}
-				elseif ($post_array['credit'] > $balance) {
+				} elseif ($post_array['credit'] > $balance) {
 					$this->session->set_flashdata('astpp_notification', 'You have insufficient balance.');
-				}
-				elseif ($toid <= 0 || !isset($post_array['toaccountid'])) {
+				} elseif ($toid <= 0 || !isset($post_array['toaccountid'])) {
 					$this->session->set_flashdata('astpp_notification', 'Please enter valid account number.');
-				}
-				elseif ($post_array['credit'] < 0) {
+				} elseif ($post_array['credit'] < 0) {
 					$this->session->set_flashdata('astpp_notification', 'Please enter amount greater then 0.');
-				}
-				elseif ($minimum_fund['value'] >= $post_array['credit']) {
+				} elseif ($minimum_fund['value'] >= $post_array['credit']) {
 					$this->session->set_flashdata('astpp_notification', 'You need to enter minimum amount of fund transfer ' . $minimum_fund['value'] . ' .');
-				}
-				elseif (!isset($toid) || !isset($post_array['toaccountid'])) {
+				} elseif (!isset($toid) || !isset($post_array['toaccountid'])) {
 					$this->session->set_flashdata('astpp_notification', 'Please enter valid account number!');
-				}
-				elseif ($post_array['credit'] < 0 || $post_array['credit'] > $balance) {
+				} elseif ($post_array['credit'] < 0 || $post_array['credit'] > $balance) {
 					$this->session->set_flashdata('astpp_notification', 'Insuffiecient amount !');
-				}else{
+				} else{
 					$from['id'] = $post_array['id'];
 					$from['account_currency'] = $post_array['account_currency'];
 					$from['accountid'] = $post_array['fromaccountid'];
@@ -1635,7 +1627,7 @@ 
 						$this->session->set_flashdata('astpp_notification', 'Sorry We are not able to process this request.');
 					}
 				}
-			}else{
+			} else{
 		$this->session->set_flashdata('astpp_notification', 'Account number not found.');
 			}
 			} else {
@@ -1727,7 +1719,7 @@ 
 						$this->user_model->user_opensips_edit($add_array, $add_array['id']);
 						echo json_encode(array("SUCCESS"=> " OpenSips updated successfully!"));
 						exit;
-				}else{
+				} else{
 					   echo json_encode($auth_flag);
 					   exit;
 				}
@@ -1744,7 +1736,7 @@ 
 						$this->user_model->user_opensips_add($add_array);
 						echo json_encode(array("SUCCESS"=> "OpenSips added successfully!"));
 						exit;
-				}else{
+				} else{
 					   echo json_encode($auth_flag);
 						exit;
 				}
@@ -1765,10 +1757,10 @@ 
 				$auth_flag = $auth_flag->num_rows();
 				if($auth_flag == 0){
 					return "TRUE";
-				}else{
+				} else{
 					return array("username_error"=>"Duplicate Username Found.Username Must be Unique");
 				}
-		}else{
+		} else{
 		  return array("username_error"=>"User name is required field.");
 		}
 		return "0";

web_interface/astpp/application/modules/user/libraries/user_form.php

Braces +5 added lines, -4 removed lines

@@ -78,10 +78,11 @@
 	}
    
 	function get_userprofile_form_fields($dataArr = false) {
-		if ($dataArr['id'] > 0)
-			$val = 'accounts.email.' . $dataArr['id'];
-		else
-			$val = 'accounts.email';
+		if ($dataArr['id'] > 0) {
+					$val = 'accounts.email.' . $dataArr['id'];
+		} else {
+					$val = 'accounts.email';
+		}
 			$uname = $this->CI->common->find_uniq_rendno(common_model::$global_config['system_config']['cardlength'], 'number', 'accounts');
 			$password = $this->CI->common->generate_password();
 			$logintype=$this->CI->session->userdata('logintype');

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

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;
 	}