From 5849bf6d4de2596f0c288020d2b605cc71cf51cf Mon Sep 17 00:00:00 2001 From: irtza-javaid <73637344+irtza-javaid@users.noreply.github.com> Date: Mon, 18 Jan 2021 18:59:11 +0500 Subject: [PATCH 1/3] reduced line 123 in /controllers/api.php from 80 characters --- application/controllers/api.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/controllers/api.php b/application/controllers/api.php index f0fbf17..5ca3c35 100644 --- a/application/controllers/api.php +++ b/application/controllers/api.php @@ -120,7 +120,8 @@ function get_forms($app_id, $imei_no) { } $html_file = ''; if (file_exists('./assets/images/data/form_icons/' . $app_id . '/' . $file_name_html)) { - $html_file = FORM_IMG_DISPLAY_PATH . '../form_icons/' . $app_id . '/' . $file_name_html; + $html_file = FORM_IMG_DISPLAY_PATH . '../form_icons/' . + $app_id . '/' . $file_name_html; } $released = $this->app_released_model->get_latest_released($app_id); From f1fba507012a8c12e0a8efcfefe3b611d850577e Mon Sep 17 00:00:00 2001 From: irtza-javaid <73637344+irtza-javaid@users.noreply.github.com> Date: Tue, 19 Jan 2021 12:55:40 +0500 Subject: [PATCH 2/3] reduced lines 123,180,228,264-276,283,288,300 in /controllers/api.php from 80 characters --- application/controllers/api.php | 72 ++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 20 deletions(-) diff --git a/application/controllers/api.php b/application/controllers/api.php index 5ca3c35..10d5ffe 100644 --- a/application/controllers/api.php +++ b/application/controllers/api.php @@ -178,7 +178,8 @@ function get_forms($app_id, $imei_no) { $file_array [] = array( 'form_id' => '0', 'form_name' => 'noname', - 'file_url' => base_url() . 'assets/android/app_resources/jquery-ui-autocomplete.js', + 'file_url' => base_url() + . 'assets/android/app_resources/jquery-ui-autocomplete.js', 'file_name' => 'jquery-ui-autocomplete.js' ); @@ -226,7 +227,8 @@ function get_forms($app_id, $imei_no) { $file_array [] = array( 'form_id' => '0', 'form_name' => 'noname', - 'file_url' => base_url() . 'assets/android/app_resources/jquery.select-to-autocomplete.min.js', + 'file_url' => base_url() . 'assets/android/ + app_resources/jquery.select-to-autocomplete.min.js', 'file_name' => 'jquery.select-to-autocomplete.min.js' ); @@ -262,17 +264,28 @@ function get_forms($app_id, $imei_no) { if(isset($app_general_setting->has_geo_fencing)){ $prefrences['IS_SECURE_APP']=($app_general_setting->secured_apk==1)?'YES':'NO'; - $prefrences['showHighResOption']=($app_general_setting->high_resolution_image==1)?'YES':'NO'; - $prefrences['PersistImagesOnDevice']=($app_general_setting->persist_images_on_device==1)?'YES':'NO'; - $prefrences['BackgroundUpdate']=($app_general_setting->background_update==1)?'YES':'NO'; - $prefrences['ForceUpdate']=($app_general_setting->force_update==1)?'YES':'NO'; - $prefrences['EnableAutoTime']=($app_general_setting->enable_auto_time==1)?'YES':'NO'; - $prefrences['TrackingStatus']=($app_general_setting->tracking_status==1)?'YES':'NO'; - $prefrences['TrackingInterval']=(isset($app_general_setting->tracking_interval))?$app_general_setting->tracking_interval:'5'; - $prefrences['TrackingDistance']=(isset($app_general_setting->tracking_distance))?$app_general_setting->tracking_distance:'100'; - $prefrences['DebugTracking']=(isset($app_general_setting->debug_tracking) && $app_general_setting->debug_tracking == 1)?'YES':'NO'; - $prefrences['hasGeoFencing']=(isset($app_general_setting->has_geo_fencing) && $app_general_setting->has_geo_fencing == 1)?'YES':'NO'; - $prefrences['DebugGeoFencing']=(isset($app_general_setting->debug_geo_fencing) && $app_general_setting->debug_geo_fencing == 1)?'YES':'NO'; + $prefrences['showHighResOption']=($app_general_setting-> + high_resolution_image==1)?'YES':'NO'; + $prefrences['PersistImagesOnDevice']=($app_general_setting-> + persist_images_on_device==1)?'YES':'NO'; + $prefrences['BackgroundUpdate']=($app_general_setting-> + background_update==1)?'YES':'NO'; + $prefrences['ForceUpdate']=($app_general_setting-> + force_update==1)?'YES':'NO'; + $prefrences['EnableAutoTime']=($app_general_setting-> + enable_auto_time==1)?'YES':'NO'; + $prefrences['TrackingStatus']=($app_general_setting-> + tracking_status==1)?'YES':'NO'; + $prefrences['TrackingInterval']=(isset($app_general_setting-> + tracking_interval))?$app_general_setting->tracking_interval:'5'; + $prefrences['TrackingDistance']=(isset($app_general_setting-> + tracking_distance))?$app_general_setting->tracking_distance:'100'; + $prefrences['DebugTracking']=(isset($app_general_setting-> + debug_tracking) && $app_general_setting->debug_tracking == 1)?'YES':'NO'; + $prefrences['hasGeoFencing']=(isset($app_general_setting-> + has_geo_fencing) && $app_general_setting->has_geo_fencing == 1)?'YES':'NO'; + $prefrences['DebugGeoFencing']=(isset($app_general_setting-> + debug_geo_fencing) && $app_general_setting->debug_geo_fencing == 1)?'YES':'NO'; //Get geoFence from App user table $prefrences['geoFence']="[{'lng':74.33375,'lat':31.50282},{'lng':72.32271,'lat':31.49976},{'lng':74.3286,'lat':31.48541},{'lng':74.3474,'lat':30.48577},{'lng':74.33764,'lat':34.5049}]"; @@ -286,7 +299,8 @@ function get_forms($app_id, $imei_no) { } /** - * This function is also used for updating the android application when user click on refresh button that available on android application title bar. + * This function is also used for updating the android application when user + * click on refresh button that available on android application title bar. * * @return json * @author Zahid Nadeem @@ -296,11 +310,14 @@ public function syncdevice() { $app_id = $_REQUEST ['app_id']; $imei_no = $_REQUEST ['imei_no']; $jsone_array = array(); - $latest_release = $this->app_released_model->get_latest_released($app_id); + $latest_release = $this->app_released_model-> + get_latest_released($app_id); - $version_installed = $this->app_released_model->get_version_against_version_code($app_id,$version_code); + $version_installed = $this->app_released_model-> + get_version_against_version_code($app_id,$version_code); - $already_installed = $this->app_installed_model->get_app_installed($app_id, $imei_no); + $already_installed = $this->app_installed_model-> + get_app_installed($app_id, $imei_no); if ($already_installed) { @@ -339,7 +356,18 @@ public function syncdevice() { // Temp code for evaccs - Start //new version for evacc only update the specific imei -// $imei_array = array('865281025760638','863963024004108','357943061037149','357944061037147','354435054188099','862120024354527','863963020962283','863963020941048','863963020962481','863963020956806','863963020970708','863963020962275','866356021218457','862866027099515','862866027109728','355794061492707','356222070208939','863963020985607','863963020962747','863963020942285','860557023831363','863963020962671','863963020971144','863963024006137','864532028186531','863963023610939','863963023610954','863963024022092','863963024028115','863963024008117','353861060451976','353861060451976','863963023555621','863963023616316','863963023586709','863963023571420','863963023586972','863963023579407','863963023587822','863963023587145','863963023586170','863963023586279','863963023555050','863963023579563','863963023633345','869358028906693','863963023557213','863963023556579','863963023555860','352328071131675','863963023612133','863963023257905','865281025813742','863963023579449','355451509524845','863963024014362','359154050754672'); +// $imei_array = array('865281025760638','863963024004108','357943061037149', +//'357944061037147','354435054188099','862120024354527','863963020962283','863963020941048', +//'863963020962481','863963020956806','863963020970708','863963020962275','866356021218457', +//'862866027099515','862866027109728','355794061492707','356222070208939','863963020985607', +//'863963020962747','863963020942285','860557023831363','863963020962671','863963020971144', +//'863963024006137','864532028186531','863963023610939','863963023610954','863963024022092', +//'863963024028115','863963024008117','353861060451976','353861060451976','863963023555621', +//'863963023616316','863963023586709','863963023571420','863963023586972','863963023579407', +//'863963023587822','863963023587145','863963023586170','863963023586279','863963023555050', +//'863963023579563','863963023633345','869358028906693','863963023557213','863963023556579', +//'863963023555860','352328071131675','863963023612133','863963023257905','865281025813742', +//'863963023579449','355451509524845','863963024014362','359154050754672'); ////$imei_array = array('863963024004108','354435054188099'); // if($app_id == '9'){ // if(in_array($imei_no, $imei_array)){ @@ -441,7 +469,9 @@ public function saverecords() { //Stop activity saving if already saved -// $activity_aready_exist = $this->db->get_where('mobile_activity_log', array('form_id' => $form_id, 'imei_no' => $imei_no,'form_data' => $_REQUEST['form_data']))->row_array(); +// $activity_aready_exist = $this->db->get_where('mobile_activity_log', +// array('form_id' => $form_id, 'imei_no' => $imei_no,'form_data' => +// $_REQUEST['form_data']))->row_array(); // if ($activity_aready_exist) { // $jsone_array = array( // 'success' => 'This activity already submitted.' @@ -449,7 +479,9 @@ public function saverecords() { // echo json_encode($jsone_array); // exit(); // } -// $activity_aready_exist = $this->db->get_where('zform_'.$form_id, array('form_id' => $form_id, 'imei_no' => $imei_no,'activity_datetime' => $activity_datetime))->row_array(); +// $activity_aready_exist = $this->db-> +// get_where('zform_'.$form_id, array('form_id' => $form_id, 'imei_no' => +// $imei_no,'activity_datetime' => $activity_datetime))->row_array(); // if ($activity_aready_exist) { // $jsone_array = array( // 'success' => 'This activity already submitted.' From e876f37e6822af4a60bf273da951a471da888e0d Mon Sep 17 00:00:00 2001 From: irtza-javaid <73637344+irtza-javaid@users.noreply.github.com> Date: Wed, 20 Jan 2021 22:17:55 +0500 Subject: [PATCH 3/3] updated the lines according to coding standards by reducing character in a line from 80 --- application/controllers/api.php | 55 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/application/controllers/api.php b/application/controllers/api.php index 3f015ee..fb751f4 100644 --- a/application/controllers/api.php +++ b/application/controllers/api.php @@ -441,7 +441,8 @@ public function saverecords() { $activity_datetime = preg_replace($pattern, $replacement, $dateTime_device); $activity_datetime = date('Y-m-d H:i:s', strtotime($activity_datetime)); } else { - $activity_datetime = date('Y-m-d H:i:s', strtotime($_REQUEST ['dateTime'])); + $activity_datetime = date('Y-m-d H:i:s', + strtotime($_REQUEST ['dateTime'])); } $time_source = ''; @@ -554,7 +555,8 @@ public function saverecords() { if($imei_no!==''){ $authorized = $this->app_model->appuser_imei_already_exist($imei_no, $app_id); - if (isset($app_general_setting->only_authorized) && $app_general_setting->only_authorized == 1 && !$authorized) { + if (isset($app_general_setting->only_authorized) && $app_general_setting-> + only_authorized == 1 && !$authorized) { $jsone_array = array( 'error' => 'You are not authorized' ); @@ -613,7 +615,9 @@ public function saverecords() { $captions_images[$key] = $v; } else if ($key == 'caption_sequence') { $caption_sequence = urldecode($v); - } elseif ($key == 'form_id' || $key == 'row_key' || $key == 'security_key' || $key == "dateTime" || $key == "landing_page" || $key == "is_take_picture" || $key == 'form_icon_name') { + } elseif ($key == 'form_id' || $key == 'row_key' || $key == 'security_key' + || $key == "dateTime" || $key == "landing_page" || $key == "is_take_picture" + || $key == 'form_icon_name') { } else { @@ -636,7 +640,8 @@ public function saverecords() { if($form_id == '10601'){ $match_exist_field_value = $record['cardnumber']; - //$activity_aready_exist = $this->db->get_where('zform_10601', array('cardnumber' => $match_exist_field_value))->row_array(); + //$activity_aready_exist = $this->db->get_where('zform_10601', array('cardnumber' => + // $match_exist_field_value))->row_array(); $query=$this->db->query("select * from zform_10601 where cardnumber ='$match_exist_field_value' and is_deleted='0'"); @@ -645,7 +650,8 @@ public function saverecords() { //echo $this->db->last_query().'======='; //echo count($activity_aready_exist); if(!empty($activity_aready_exist)) { - $this->form_results_model->update_mobile_activity($activity_inserted_id,array('error'=> 'This card number already entered.')); + $this->form_results_model->update_mobile_activity($activity_inserted_id,array('error'=> + 'This card number already entered.')); $jsone_array = array( 'success' => 'This card number already uploaded and entered.' ); @@ -656,7 +662,8 @@ public function saverecords() { $warning_message = ''; $app_map_view_setting = get_map_view_settings($app_id); - if(isset($app_map_view_setting->map_distance_mapping) && $app_map_view_setting->map_distance_mapping)//if Distance maping on then call this block + if(isset($app_map_view_setting->map_distance_mapping) && $app_map_view_setting-> + map_distance_mapping)//if Distance maping on then call this block { $rectemp = $record; @@ -930,7 +937,8 @@ public function saverecords() { $fields_count = $this->db->list_fields('zform_' . $form_id); $fields_count = array_map('strtolower', $fields_count); if(count($fields_count) < 90){ - $field = array($element => array('type' => 'VARCHAR', 'constraint' => 200, 'NULL' => TRUE)); + $field = array($element => array('type' => 'VARCHAR', 'constraint' => + 200, 'NULL' => TRUE)); $this->dbforge->add_column('zform_' . $form_id, $field, $after_field); }else { @@ -2024,8 +2032,7 @@ public function saverecordsweb() { // this code is used for sending record to other domain if ($post_url) { - if ($form_id == '4575' && - strpos($_SERVER ['SERVER_NAME'], 'dataplug.itu') !== false) { + if ($form_id == '4575' && strpos($_SERVER ['SERVER_NAME'], 'dataplug.itu') !== false) { $tempary = array( 'imei_no' => $imei_no, 'image_url' => $add_images ['image'], @@ -2103,8 +2110,7 @@ public function getUcName($location) { $lat = trim($loc [0]); $long = trim($loc [1]); - $url = "http://ucfinder.herokuapp.com/" - $url .= "ajax/region_finder.json?lat=$lat&long=$long"; + $url = "http://ucfinder.herokuapp.com/ajax/region_finder.json?lat=$lat&long=$long"; $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); @@ -2131,8 +2137,7 @@ public function getTownName($location = null) { $loc = explode(',', $location); $lat = trim($loc [0]); $long = trim($loc [1]); - $url = "http://ucfinder.herokuapp.com/" - $url .= "ajax/town_finder.json?lat=$lat&long=$long"; + $url = "http://ucfinder.herokuapp.com/ajax/town_finder.json?lat=$lat&long=$long"; $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); @@ -2159,8 +2164,7 @@ public function getDistrictName($location = null) { $loc = explode(',', $location); $lat = trim($loc [0]); $long = trim($loc [1]); - $url = "http://ucfinder.herokuapp.com/"; - $url .= "ajax/distict_finder.json?lat=$lat&long=$long"; + $url = "http://ucfinder.herokuapp.com/ajax/distict_finder.json?lat=$lat&long=$long"; $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); @@ -2202,8 +2206,7 @@ public function getOptions() { public function getoptionapi() { $api = $this->input->get('api'); $secret = $this->input->get('secret'); - $query = $this->db->query("SELECT * FROM api WHERE id = - '$api' AND secret_key='$secret'"); + $query = $this->db->query("SELECT * FROM api WHERE id = '$api' AND secret_key='$secret'"); $api_data = $query->row_array(); if ($api_data) { $csv_file_name = $api_data ['file_name']; @@ -2232,17 +2235,14 @@ public function getoptionapi() { if (!isset($existArray [$parent_optional_name])) { $existArray [$parent_optional_name] = array(); } - if (!in_array(strtolower(trim($data [$child_index])), - $existArray [$parent_optional_name])) { - array_push($existArray [$parent_optional_name], - strtolower(trim($data [$child_index]))); + if (!in_array(strtolower(trim($data [$child_index])), $existArray [$parent_optional_name])) { + array_push($existArray [$parent_optional_name], strtolower(trim($data [$child_index]))); $option_parent_value = ''; if ($parent_name != '') { $option_parent_value = trim($data [$parent_index]); } $option_display_value = $option_value = trim($data [$child_index]); - if(isset($heading_row[$child_index+1]) && - $heading_row[$child_index+1]=='display_value_'.$heading_row[$child_index]){ + if(isset($heading_row[$child_index+1]) && $heading_row[$child_index+1]=='display_value_'.$heading_row[$child_index]){ $option_display_value = trim($data[$child_index+1]); } $record = array( @@ -2281,8 +2281,7 @@ function cmpBySort($a, $b) { // URL : http://www.dataplug.itu.edu.pk/api/syncDataRemotely?app_id=1293&security_token=1ae473a61dbe13cb9ec199e9c2361956&last_date_stamp= public function syncDataRemotely() { - if (isset($_REQUEST ['app_id']) && isset($_REQUEST ['last_date_stamp']) - && isset($_REQUEST ['security_token'])) { + if (isset($_REQUEST ['app_id']) && isset($_REQUEST ['last_date_stamp']) && isset($_REQUEST ['security_token'])) { $app_id = $_REQUEST ['app_id']; $last_date_stamp = $_REQUEST ['last_date_stamp']; $security_token = $_REQUEST ['security_token']; // 1ae473a61dbe13cb9ec199e9c2361956 @@ -2333,8 +2332,7 @@ public function syncDataRemotely() { */ public function importDataFormBased() { - if (isset($_REQUEST ['local_form_id']) - && isset($_REQUEST ['remote_form_id'])) { + if (isset($_REQUEST ['local_form_id']) && isset($_REQUEST ['remote_form_id'])) { $local_form_id = $_REQUEST ['local_form_id']; $table_name = 'zform_' . $local_form_id; $remote_form_id = $_REQUEST ['remote_form_id']; @@ -2345,8 +2343,7 @@ public function importDataFormBased() { $last_id = 0; } - $url = "http://godk.itu.edu.pk/api/exportDataFormBased?"; - $url .= "form_id=$remote_form_id&last_id=$last_id"; + $url = "http://godk.itu.edu.pk/api/exportDataFormBased?form_id=$remote_form_id&last_id=$last_id"; $ch = curl_init() or die("Cannot init"); curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);