diff --git a/application/controllers/app.php b/application/controllers/app.php
index a16b28f..e44a5c5 100644
--- a/application/controllers/app.php
+++ b/application/controllers/app.php
@@ -461,7 +461,10 @@ public function ajaxappusers() {
public function appusersimportcsv(){
if (!$this->acl->hasPermission('app_users', 'add')) {
- $this->session->set_flashdata('validate', array('message' => "You don't have enough permissions to do this task.", 'type' => 'warning'));
+ $this->session->set_flashdata('validate', array(
+ 'message' =>
+ "You don't have enough permissions to do this task.",
+ 'type' => 'warning'));
redirect('/');
}
$this->load->library('form_validation');
@@ -474,13 +477,21 @@ public function appusersimportcsv(){
}
if ($this->input->post()) {
if ($this->acl->hasSuperAdmin()) {
- $this->form_validation->set_rules('department_id_import', 'Department', 'trim|required|xss_clean');
+ $this->form_validation->set_rules(
+ 'department_id_import',
+ 'Department', 'trim|required|xss_clean');
}
- $this->form_validation->set_rules('app_id_import', 'App Id', 'trim|required|xss_clean');
+ $this->form_validation->set_rules(
+ 'app_id_import',
+ 'App Id', 'trim|required|xss_clean');
if ($this->form_validation->run() == FALSE) {
$batch = array($this->input->post('department_id_import'));
- $this->session->set_flashdata('validate', array('message' => "User must enter required field(s).", 'type' => 'warning'));
+ $this->session->set_flashdata('validate',
+ array(
+ 'message' =>
+ "User must enter required field(s).",
+ 'type' => 'warning'));
redirect(base_url() . 'applicatioin-users');
} else {
@@ -508,7 +519,15 @@ public function appusersimportcsv(){
if (!$this->upload->do_upload('user_import')) {
- $this->session->set_flashdata('validate', array('message' => 'File uploading issue, Check format of file or remove special character and spaces into file name', 'type' => 'error'));
+ $this->session->set_flashdata(
+ 'validate',
+ array(
+ 'message' =>
+ 'File uploading issue,
+ Check format of file or
+ remove special character
+ and spaces into file name',
+ 'type' => 'error'));
redirect(base_url() . 'applicatioin-users');
} else {
@@ -542,7 +561,11 @@ public function appusersimportcsv(){
}
else{
- $this->session->set_flashdata('validate', array('message' => "Select CSV file", 'type' => 'warning'));
+ $this->session->set_flashdata(
+ 'validate', array(
+ 'message' =>
+ "Select CSV file",
+ 'type' => 'warning'));
redirect(base_url() . 'applicatioin-users');
}
}
@@ -587,7 +610,9 @@ public function import_app_user_csv() {
$file_path = $this->input->post('upload_file_path');
$row = 1;
$total_insertion = 0;
- $query = $this->db->query("SELECT * FROM app_users WHERE is_deleted=0 AND app_id = '$app_id'");
+ $query = $this->db->query(
+ "SELECT * FROM
+ app_users WHERE is_deleted=0 AND app_id = '$app_id'");
$myimeidata = $query->result_array();
$already_exist = array();
foreach ($myimeidata as $key => $myimei) {
@@ -608,11 +633,20 @@ public function import_app_user_csv() {
if(!empty($data[$imei_no_index])){
$unique_identifi = $data[$imei_no_index];
- $query = $this->db->query("SELECT * FROM app_users WHERE is_deleted=0 AND app_id = '$app_id' AND imei_no='$unique_identifi'");
+ $query = $this->db->query(
+ "SELECT * FROM
+ app_users WHERE
+ is_deleted=0 AND
+ app_id = '$app_id'
+ AND imei_no='$unique_identifi'");
}
elseif(!empty($data[$login_user_index])){
$unique_identifi = $data[$login_user_index];
- $query = $this->db->query("SELECT * FROM app_users WHERE is_deleted=0 AND app_id = '$app_id' AND login_user='$unique_identifi'");
+ $query = $this->db->query(
+ "SELECT * FROM
+ app_users WHERE is_deleted=
+ AND app_id = '$app_id'
+ AND login_user='$unique_identifi'");
}
$current_rec = $query->row_array();
if (in_array($unique_identifi, $already_exist)) {
@@ -628,8 +662,21 @@ public function import_app_user_csv() {
'mobile_number' => $data[$mobile_number_index],
'is_deleted' => '0',
'login_user' => isset($data[$login_user_index])?$data[$login_user_index]:'',
- 'login_password' => isset($data[$login_password_index])?$data[$login_password_index]:'',
- 'mobile_network' => isset($data[$mobile_network_index])?$data[$mobile_network_index]:'',
+ 'login_password'
+ =>
+ isset(
+ $data[$login_password_index]
+ )
+ ?
+ $data[$login_password_index]
+ :'',
+ 'mobile_network' =>
+ isset(
+ $data[$mobile_network_index]
+ )
+ ?
+ $data[$mobile_network_index]
+ :'',
);
$this->db->where('id', $current_rec['id']);
@@ -650,15 +697,32 @@ public function import_app_user_csv() {
'mobile_number' => $data[$mobile_number_index],
'is_deleted' => '0',
'login_user' => isset($data[$login_user_index])?$data[$login_user_index]:'',
- 'login_password' => isset($data[$login_password_index])?$data[$login_password_index]:'',
- 'mobile_network' => isset($data[$mobile_network_index])?$data[$mobile_network_index]:'',
+ 'login_password'
+ =>
+ isset(
+ $data[$login_password_index]
+ )
+ ?
+ $data[$login_password_index]
+ :'',
+ 'mobile_network'
+ =>
+ isset(
+ $data[$mobile_network_index]
+ )?$data[$mobile_network_index]
+ :'',
);
$total_insertion++;
$this->db->insert('app_users', $record_imei);
}
- //array parameters : action, description, before, after, app_id, app_name, form_id, form_name
- $logary = array('action' => 'insert', 'description' => 'app users using import CSV', 'after' => json_encode($record_imei), 'app_id' => $app_id,);
+ //array parameters : action, description, before,
+ // after, app_id, app_name, form_id, form_name
+ $logary = array(
+ 'action' =>
+ 'insert', 'description' =>
+ 'app users using import CSV', 'after' =>
+ json_encode($record_imei), 'app_id' => $app_id,);
addlog($logary);
}
}
@@ -666,7 +730,9 @@ public function import_app_user_csv() {
$already_ex=", Already Registered Users but Updated : ".$already_ex;
}
- $this->session->set_flashdata('validate', array('message' => 'Application User imported successfully, Total Inserted Users = '.$total_insertion.$already_ex, 'type' => 'success'));
+ $this->session->set_flashdata('validate', array('message' =>
+ 'Application User imported successfully, Total Inserted Users = '
+ .$total_insertion.$already_ex, 'type' => 'success'));
fclose($handle);
}
@@ -683,7 +749,10 @@ public function import_app_user_csv() {
public function editAppUser($slug) {
$user_id = $slug;
if (!$this->acl->hasPermission('app_users', 'edit')) {
- $this->session->set_flashdata('validate', array('message' => "You don't have enough permissions to do this task.", 'type' => 'warning'));
+ $this->session->set_flashdata(
+ 'validate', array(
+ 'message' =>
+ "You don't have enough permissions to do this task.", 'type' => 'warning'));
redirect(base_url() . 'users');
}
$user_rec = $this->app_users_model->get_app_user_by_id($user_id);
@@ -710,11 +779,14 @@ public function editAppUser($slug) {
session_to_page($session_data, $data);
$department_id = $session_data['login_department_id'];
if ($this->input->post()) {
- $this->form_validation->set_rules('user_name', 'User', 'trim|required|xss_clean');
+ $this->form_validation->set_rules(
+ 'user_name', 'User', 'trim|required|xss_clean');
if($this->input->post('login_user') == '')
- $this->form_validation->set_rules('imei_no', 'IMEI NO', 'trim|required|xss_clean');
+ $this->form_validation->set_rules(
+ 'imei_no', 'IMEI NO', 'trim|required|xss_clean');
else
- $this->form_validation->set_rules('login_user', 'User Name', 'trim|required|callback_appuser_login_name_already_exist');
+ $this->form_validation->set_rules(
+ 'login_user', 'User Name', 'trim|required|callback_appuser_login_name_already_exist');
//$this->form_validation->set_rules('mobile_number', 'Mobile NO', 'trim|required|xss_clean');
//$this->form_validation->set_rules('town', 'Town Name', 'trim|required|min_length[1]|xss_clean');
if ($this->form_validation->run() == FALSE) {
@@ -748,9 +820,16 @@ public function editAppUser($slug) {
//array parameters : action, description, before, after, app_id, app_name, form_id, form_name
- $logary = array('action' => 'update', 'description' => 'Edit application user', 'after' => json_encode($data), 'before' => json_encode($user_rec));
+ $logary = array(
+ 'action' => 'update', 'description' =>
+ 'Edit application user', 'after' =>
+ json_encode($data), 'before' =>
+ json_encode($user_rec));
addlog($logary);
- $this->session->set_flashdata('validate', array('message' => 'Application User Updated Successfully.', 'type' => 'success'));
+ $this->session->set_flashdata(
+ 'validate', array(
+ 'message' =>
+ 'Application User Updated Successfully.', 'type' => 'success'));
redirect(base_url() . 'applicatioin-users');
}
}
@@ -778,7 +857,11 @@ public function editAppUser($slug) {
public function appusersview() {
if (!$this->acl->hasPermission('users', 'add')) {
- $this->session->set_flashdata('validate', array('message' => "You don't have enough permissions to do this task.", 'type' => 'warning'));
+ $this->session->set_flashdata(
+ 'validate', array(
+ 'message' =>
+ "You don't have enough permissions to do this task.",
+ 'type' => 'warning'));
redirect('/');
}
$this->load->library('form_validation');
@@ -796,10 +879,17 @@ public function appusersview() {
$app_id = $this->input->post('app_id');
if ($this->acl->hasSuperAdmin()) {
- $this->form_validation->set_rules('department_id', 'Department', 'trim|required|xss_clean');
- }
- $this->form_validation->set_rules('app_id', 'App Id', 'trim|required|xss_clean');
- $this->form_validation->set_rules('name', 'First Name', 'trim|required|min_length[1]|xss_clean');
+ $this->form_validation->set_rules(
+ 'department_id',
+ 'Department',
+ 'trim|required|xss_clean');
+ }
+ $this->form_validation->set_rules(
+ 'app_id', 'App Id',
+ 'trim|required|xss_clean');
+ $this->form_validation->set_rules(
+ 'name', 'First Name',
+ 'trim|required|min_length[1]|xss_clean');
if ($this->form_validation->run() == FALSE) {
$batch = array($this->input->post('department_id'));
@@ -813,7 +903,11 @@ public function appusersview() {
);
$this->db->insert('app_users_view', $appviewdata);
- $this->session->set_flashdata('validate', array('message' => 'User view added successfully', 'type' => 'success'));
+ $this->session->set_flashdata(
+ 'validate', array(
+ 'message' =>
+ 'User view added successfully',
+ 'type' => 'success'));
redirect(base_url() . 'app/appusersview');
}
}
@@ -845,7 +939,9 @@ public function appusersview() {
*/
function appuser_imei_already_exist($imei_no, $app_id) {
if ($this->app_model->appuser_imei_already_exist($imei_no, $app_id)) {
- $this->form_validation->set_message('appuser_imei_already_exist', 'The %s already registered for this app.');
+ $this->form_validation->set_message(
+ 'appuser_imei_already_exist',
+ 'The %s already registered for this app.');
return false;
} else {
return true;
@@ -859,7 +955,9 @@ function appuser_imei_already_exist($imei_no, $app_id) {
*/
function appuser_login_name_already_exist($login_user, $app_id) {
if ($this->app_model->appuser_login_name_already_exist($login_user, $app_id)) {
- $this->form_validation->set_message('appuser_login_name_already_exist', 'The %s not available.');
+ $this->form_validation->set_message(
+ 'appuser_login_name_already_exist',
+ 'The %s not available.');
return false;
} else {
return true;
@@ -878,7 +976,11 @@ public function add() {
$session_data = $this->session->userdata('logged_in');
if (!$this->acl->hasPermission('app', 'add')) {
- $this->session->set_flashdata('validate', array('message' => "You don't have enough permissions to do this task.", 'type' => 'warning'));
+ $this->session->set_flashdata(
+ 'validate', array(
+ 'message' =>
+ "You don't have enough permissions to do this task.",
+ 'type' => 'warning'));
redirect(base_url() . '');
}
@@ -904,17 +1006,26 @@ public function add() {
'name' => $this->input->post('department_name')
);
} else {
- $this->form_validation->set_rules('app_name', 'App', 'trim|required|xss_clean|callback_app_already_exist[' . $department_id . ']');
+ $this->form_validation->set_rules(
+ 'app_name', 'App',
+ 'trim|required|xss_clean|callback_app_already_exist[' . $department_id . ']');
}
$required_if = $this->input->post('department_id') == 'new' ? '|required' : '';
- $this->form_validation->set_rules('department_name', 'Department Name', 'trim' . $required_if . '|min_length[4]|xss_clean|callback_department_name_exists');
- $this->form_validation->set_rules('department_id', 'Department', 'trim|required|xss_clean');
+ $this->form_validation->set_rules('department_name',
+ 'Department Name',
+ 'trim' . $required_if .
+ '|min_length[4]|xss_clean|callback_department_name_exists');
+ $this->form_validation->set_rules(
+ 'department_id', 'Department', 'trim|required|xss_clean');
} else {
- $this->form_validation->set_rules('app_name', 'App', 'trim|required|xss_clean|callback_app_already_exist[' . $department_id . ']');
+ $this->form_validation->set_rules(
+ 'app_name', 'App',
+ 'trim|required|xss_clean|callback_app_already_exist[' . $department_id . ']');
}
if ($this->form_validation->run() == FALSE) {
- $this->session->set_flashdata('validate', array('message' => 'Please enter the Required Fields', 'type' => 'error'));
+ $this->session->set_flashdata('validate',
+ array('message' => 'Please enter the Required Fields', 'type' => 'error'));
redirect(base_url());
} else {
$new = false;
@@ -941,12 +1052,18 @@ public function add() {
$app_id = $this->db->insert_id();
if (!$this->acl->hasSuperAdmin()) {
- $asign_array = array('user_id' => $session_data['login_user_id'], 'app_id' => $app_id);
+ $asign_array = array(
+ 'user_id' =>
+ $session_data['login_user_id'], 'app_id' => $app_id);
$this->db->insert('users_app', $asign_array);
}
- //array parameters : action, description, before, after, app_id, app_name, form_id, form_name
- $logary = array('action' => 'insert', 'description' => 'add new application', 'after' => json_encode($appdata), 'app_id' => $app_id, 'app_name' => $appName);
+ //array parameters :
+ // action, description, before, after, app_id, app_name, form_id, form_name
+ $logary = array(
+ 'action' => 'insert', 'description' =>
+ 'add new application', 'after' =>
+ json_encode($appdata), 'app_id' => $app_id, 'app_name' => $appName);
addlog($logary);
//upload app icon
@@ -967,7 +1084,11 @@ public function add() {
if (!$this->upload->do_upload('userfile_addapp')) {
$this->data['error'] = $this->upload->display_errors();
- $this->session->set_flashdata('validate', array('message' => $this->upload->display_errors() . ', Default icon has been embeded with your app.', 'type' => 'warning'));
+ $this->session->set_flashdata(
+ 'validate', array(
+ 'message' => $this->upload->display_errors() .
+ ', Default icon has been embeded with your app.',
+ 'type' => 'warning'));
} else {
//success
$imageData=$this->upload->data();
@@ -1004,7 +1125,11 @@ public function add() {
//Old app setting
$general_settings = array(
- 'app_id' => $app_id,'latitude' => '31.58219141239757','longitude' => '73.7677001953125','zoom_level' => '7','map_type' => 'Pin','district_filter' => 'Off','uc_filter' => 'Off','app_language' => 'english',
+ 'app_id' => $app_id,'latitude' =>
+ '31.58219141239757','longitude' =>
+ '73.7677001953125','zoom_level' =>
+ '7','map_type' => 'Pin','district_filter' =>
+ 'Off','uc_filter' => 'Off','app_language' => 'english',
'setting_type'=>'GENERAL_SETTINGS',
'filters'=>GENERAL_SETTINGS
);
diff --git a/application/controllers/tracking.php b/application/controllers/tracking.php
index 3da9899..2db9786 100644
--- a/application/controllers/tracking.php
+++ b/application/controllers/tracking.php
@@ -188,9 +188,9 @@ public function savetrackingbulk() {
exit;
}
//exit;
- $newDistanceGeo=0;
- $lastDistanceGeo=0;
- $newDistance=0;
+ $new_distanceGeo=0;
+ $last_distance_geo=0;
+ $new_distance=0;
$lastDistance=0;
foreach($result as $r)
{
@@ -198,23 +198,23 @@ public function savetrackingbulk() {
$distance=(float)$r['distance'];
$d=$distance-$lastDistance;
if($d>0) {
- $newDistance+=$distance-$lastDistance;
+ $new_distance+=$distance-$lastDistance;
}
$lastDistance=$distance;
//print_r($r);
$distanceGeo=(float)$r['distanceGeo'];
- $dGeo=$distanceGeo-$lastDistanceGeo;
+ $dGeo=$distanceGeo-$last_distance_geo;
if($dGeo>0) {
- $newDistanceGeo+=$distanceGeo-$lastDistanceGeo;
+ $new_distanceGeo+=$distanceGeo-$last_distance_geo;
}
- $lastDistanceGeo=$distanceGeo;
+ $last_distance_geo=$distanceGeo;
}
$gps_time = $params ['gpsTime'];
$records = $tracking_records;
- $distanceCovered = $newDistance;
- $distanceCoveredGeo = $newDistanceGeo;
+ $distanceCovered = $new_distance;
+ $distanceCoveredGeo = $new_distanceGeo;
$gps_time = date('Y-m-d H:i:s', strtotime($gps_time));
@@ -223,7 +223,7 @@ public function savetrackingbulk() {
'route_id' => $route_id,
'imei_no' => $imei_no,
'gps_datetime' => $gps_time,
- 'distanceCovered' => round($newDistance,2),
+ 'distanceCovered' => round($new_distance,2),
'distanceCoveredGeo' => round($distanceCoveredGeo,2),
'records' => $records,
'created_datetime' => $created_datetime
@@ -319,9 +319,9 @@ public function testtrackingbulk1() {
$result=$tracking_result[0]['records'];
$result=json_decode($result,true);
//exit;
- $newDistanceGeo=0;
- $lastDistanceGeo=0;
- $newDistance=0;
+ $new_distanceGeo=0;
+ $last_distance_geo=0;
+ $new_distance=0;
$lastDistance=0;
foreach($result as $r)
{
@@ -329,25 +329,25 @@ public function testtrackingbulk1() {
$distance=(float)$r['distance'];
$d=$distance-$lastDistance;
if($d>0) {
- $newDistance+=$distance-$lastDistance;
+ $new_distance+=$distance-$lastDistance;
}
- echo $r['gpsTime']." =>> ".$newDistance." = ".$distance." - ".$lastDistance."
";
- echo $r['id']." -> ".$r['gpsTime']." : D:".$distance." LD:".$lastDistance." ND:".$newDistance."
";
+ echo $r['gpsTime']." =>> ".$new_distance." = ".$distance." - ".$lastDistance."
";
+ echo $r['id']." -> ".$r['gpsTime']." : D:".$distance." LD:".$lastDistance." ND:".$new_distance."
";
$lastDistance=$distance;
//print_r($r);
$distanceGeo=(float)$r['distanceGeo'];
- $dGeo=$distanceGeo-$lastDistanceGeo;
+ $dGeo=$distanceGeo-$last_distance_geo;
if($dGeo>0) {
- $newDistanceGeo+=$distanceGeo-$lastDistanceGeo;
+ $new_distanceGeo+=$distanceGeo-$last_distance_geo;
}
- $lastDistanceGeo=$distanceGeo;
+ $last_distance_geo=$distanceGeo;
}
// $gps_time = $params ['gpsTime'];
// $records = $tracking_records;
- $distanceCovered = $newDistance;
- $distanceCoveredGeo = $newDistanceGeo;
+ $distanceCovered = $new_distance;
+ $distanceCoveredGeo = $new_distanceGeo;
// $gps_time = date('Y-m-d H:i:s', strtotime($gps_time));
@@ -356,7 +356,7 @@ public function testtrackingbulk1() {
// 'route_id' => $route_id,
// 'imei_no' => $imei_no,
// 'gps_datetime' => $gps_time,
- // 'distanceCovered' => round($newDistance,2),
+ // 'distanceCovered' => round($new_distance,2),
// 'distanceCoveredGeo' => round($distanceCoveredGeo,2),
// 'created_datetime' => $created_datetime
// );