From 5a2b22663294266fa657112e71fe2cd900dd1274 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 20 Jan 2021 11:51:51 +0500 Subject: [PATCH 1/2] line 2618 to 3200 are modified --- application/controllers/form.php | 146 +++++++++++++++++++++---------- 1 file changed, 99 insertions(+), 47 deletions(-) diff --git a/application/controllers/form.php b/application/controllers/form.php index 689e42a..140a3d4 100644 --- a/application/controllers/form.php +++ b/application/controllers/form.php @@ -2615,7 +2615,8 @@ public function mapviewframe($slug) { $forms_list = array(); $all_forms = $this->form_model->get_form_by_app($slug); foreach ($all_forms as $forms) { - $forms_list[] = array('form_id' => $forms['form_id'], 'table_name' => 'zform_' . $forms['form_id'], 'form_name' => $forms['form_name']); + $forms_list[] = array('form_id' => $forms['form_id'], + 'table_name' => 'zform_' . $forms['form_id'], 'form_name' => $forms['form_name']); } /** multi form ends herer.....* */ $heading_array = array(); @@ -2630,7 +2631,8 @@ public function mapviewframe($slug) { $data_per_filter = array(); $posted_filters = array(); $app_settings = $this->app_model->get_app_settings($app_id); - $app_filter_list = explode(',', (isset($app_settings['map_view_filters'])) ? $app_settings['map_view_filters'] : ''); + $app_filter_list = explode(',', + (isset($app_settings['map_view_filters'])) ? $app_settings['map_view_filters'] : ''); if (!empty($app_settings['map_view_filters'])) { foreach ($app_filter_list as $filters) { $data_per_filter[] = $this->input->post($filters); @@ -2653,7 +2655,8 @@ public function mapviewframe($slug) { $data['search_text'] = $search_text; if ($search_text) { $search_text = mysql_real_escape_string($search_text); - $search_text = str_replace(array('~', '<', '>', '$', '%', '|', '^', '*'), array(' '), $search_text); + $search_text = str_replace(array('~', '<', '>', '$', '%', '|', + '^', '*'), array(' '), $search_text); $search_text = str_replace('/', '\\\\/', $search_text); $search_text = trim($search_text); } @@ -2664,9 +2667,11 @@ public function mapviewframe($slug) { $final_send = array(); foreach ($forms_list as $final_view) { if (in_array($final_view['form_id'], $form_list_posted)) { - $final_send = array_merge($final_send, array($final_view['form_name'] => $final_view['form_id'])); + $final_send = array_merge($final_send, array($final_view['form_name'] + => $final_view['form_id'])); } - $view_list = array_merge($view_list, array($final_view['form_name'] => $final_view['form_id'])); + $view_list = array_merge($view_list, array($final_view['form_name'] + => $final_view['form_id'])); } $view_list = array_flip($view_list); $data['form_lists'] = $view_list; @@ -2692,14 +2697,18 @@ public function mapviewframe($slug) { $data['selected_date_from'] = ""; } if (strtotime($to_date) > strtotime($from_date)) { - $this->session->set_flashdata('validate', array('message' => 'Invalid Date selection. From Date should be greater than To Date.', 'type' => 'warning')); + $this->session->set_flashdata('validate', array('message' + => 'Invalid Date selection. From Date should be greater than To Date.', + 'type' => 'warning')); redirect(base_url() . 'form/mapviewframe/' . $slug); } $form_list_filter = array(); foreach ($form_list_posted as $form_entity) { - $form_list_filter[] = array('form_id' => $form_entity, 'table_name' => 'zform_' . $form_entity); + $form_list_filter[] = array('form_id' + => $form_entity, 'table_name' => 'zform_' . $form_entity); } - $total_result = $this->form_results_model->return_total_record_map_posted($form_list_filter, $to_date, $from_date); + $total_result = $this->form_results_model + ->return_total_record_map_posted($form_list_filter, $to_date, $from_date); $totalPages = ceil($total_result / $this->perMap); $data['totalPages'] = $totalPages; $filter_date_map = $this->input->post('filter_date_map'); @@ -2720,7 +2729,8 @@ public function mapviewframe($slug) { /** for categry listing * */ $record_array_final_filter = array(); - $results_filer_main = $this->form_results_model->get_form_results_filters($form_list_filter); + $results_filer_main = + $this->form_results_model->get_form_results_filters($form_list_filter); $app_filters_array = array(); $town_array = array(); $uc_array = array(); @@ -2778,7 +2788,8 @@ public function mapviewframe($slug) { if (in_array($key, $filter_attribute)) { $value = trim($value); $valueforarray = str_replace(' ', '_', $value); - if (isset($map_saved_pins[$key][$valueforarray]) && $map_saved_pins[$key][$valueforarray] != '') { + if (isset($map_saved_pins[$key][$valueforarray]) && + $map_saved_pins[$key][$valueforarray] != '') { $pin_name = $map_saved_pins[$key][$valueforarray]; } else if (!in_array($valueforarray, $filter_exist_array)) { @@ -2795,7 +2806,8 @@ public function mapviewframe($slug) { $exist_alpha[$first_char] = '1'; $pin_name = $first_char . '1.png'; } - $pin_exist_for_cat = array_merge($pin_exist_for_cat, array($valueforarray => $pin_name)); + $pin_exist_for_cat = array_merge($pin_exist_for_cat, + array($valueforarray => $pin_name)); } else { if (array_key_exists($valueforarray, $pin_exist_for_cat)) { $pin_name = $pin_exist_for_cat[$valueforarray]; @@ -2839,14 +2851,18 @@ public function mapviewframe($slug) { $data['uc'] = $uc_array; $form_list_filter = array(); foreach ($form_list_posted as $form_entity) { - $form_list_filter[] = array('form_id' => $form_entity, 'table_name' => 'zform_' . $form_entity); + $form_list_filter[] = array('form_id' => $form_entity, + 'table_name' => 'zform_' . $form_entity); } $results_comined_posted = array(); $record_array_final = array(); foreach ($form_list_filter as $form_entity) { $table_name = $form_entity['table_name']; - $results = $this->form_results_model->get_map_data_paginated_posted($table_name, $to_date, $from_date, $town_filter = null, $posted_filters, $search_text); - //$results = $this->form_results_model->get_form_results_for_map($forms_list, $to_date, $from_date, $town_filter = null, $posted_filters, $search_text, $login_district); + $results = $this->form_results_model->get_map_data_paginated_posted($table_name, + $to_date, $from_date, $town_filter = null, $posted_filters, $search_text); + //$results = $this->form_results_model->get_form_results_for_map($forms_list, + //$to_date, $from_date, $town_filter = null, $posted_filters, $search_text, + //$login_district); $results_comined_posted = array_merge($results_comined_posted, $results); } $filter_exist_array = array(); @@ -2871,7 +2887,8 @@ public function mapviewframe($slug) { if (in_array($key, $filter_attribute)) { $value = trim($value); $valueforarray = str_replace(' ', '_', $value); - if (isset($map_saved_pins[$key][$valueforarray]) && $map_saved_pins[$key][$valueforarray] != '') { + if (isset($map_saved_pins[$key][$valueforarray]) && + $map_saved_pins[$key][$valueforarray] != '') { $pin_name = $map_saved_pins[$key][$valueforarray]; } else if (!in_array($valueforarray, $filter_exist_array)) { @@ -2888,7 +2905,8 @@ public function mapviewframe($slug) { $exist_alpha[$first_char] = '1'; $pin_name = $first_char . '1.png'; } - $pin_exist_for_cat = array_merge($pin_exist_for_cat, array($valueforarray => $pin_name)); + $pin_exist_for_cat = array_merge($pin_exist_for_cat, + array($valueforarray => $pin_name)); } else { if (array_key_exists($valueforarray, $pin_exist_for_cat)) { $pin_name = $pin_exist_for_cat[$valueforarray]; @@ -2914,7 +2932,8 @@ public function mapviewframe($slug) { } } $all_visits_hidden = $this->input->post('all_visits_hidden'); - $data['locations'] = $this->getMapHtmlInfo($record_array_final, $heading_array, $filter_attribute); + $data['locations'] = $this->getMapHtmlInfo($record_array_final, + $heading_array, $filter_attribute); $data['all_visits_hidden'] = $all_visits_hidden; $data['headings'] = $heading_array; $data['form'] = $record_array_final; @@ -2924,7 +2943,8 @@ public function mapviewframe($slug) { * its call back function call */ foreach ($filter_attribute as $filter_attribute_value) { - uasort($record_array_final_filter, array(new SortAssociativeArray($filter_attribute_value), "call")); + uasort($record_array_final_filter, + array(new SortAssociativeArray($filter_attribute_value), "call")); } $data['filter'] = $changed_category; @@ -2932,14 +2952,24 @@ public function mapviewframe($slug) { $selected_app = $this->app_model->get_app($selected_form['app_id']); $app_settings = $this->app_model->get_app_settings($selected_form['app_id']); $map_view_settings = get_map_view_settings($selected_form['app_id']); - $data['district_filter'] = !empty($map_view_settings->district_filter) ? $map_view_settings->district_filter : ''; - $data['sent_by_filter'] = !empty($map_view_settings->sent_by_filter) ? $map_view_settings->sent_by_filter : ''; - $data['uc_filter'] = !empty($map_view_settings->uc_filter) ? $map_view_settings->uc_filter : ''; - $data['map_type_filter'] = (isset($map_view_settings->map_type_filter)) ? $map_view_settings->map_type_filter : ''; - $data['view_type'] = !empty($app_settings['map_type']) ? $app_settings['map_type'] : ''; - $data['zoom_level'] = (isset($map_view_settings->default_zoom_level)) ? $map_view_settings->default_zoom_level : ''; - $data['latitude'] = (isset($map_view_settings->default_latitude)) ? $map_view_settings->default_latitude : ''; - $data['longitude'] = (isset($map_view_settings->default_longitude)) ? $map_view_settings->default_longitude : ''; + $data['district_filter'] = + !empty($map_view_settings + ->district_filter) ? $map_view_settings->district_filter : ''; + $data['sent_by_filter'] = !empty($map_view_settings + ->sent_by_filter) ? $map_view_settings->sent_by_filter : ''; + $data['uc_filter'] = !empty($map_view_settings + ->uc_filter) ? $map_view_settings->uc_filter : ''; + $data['map_type_filter'] = (isset($map_view_settings + ->map_type_filter)) ? $map_view_settings->map_type_filter : ''; + $data['view_type'] = + !empty($app_settings['map_type']) ? $app_settings['map_type'] : ''; + $data['zoom_level'] = (isset($map_view_settings + ->default_zoom_level)) ? $map_view_settings->default_zoom_level : ''; + $data['latitude'] = + (isset($map_view_settings + ->default_latitude)) ? $map_view_settings->default_latitude : ''; + $data['longitude'] = (isset($map_view_settings + ->default_longitude)) ? $map_view_settings->default_longitude : ''; $data['app_name'] = $selected_app['name']; $data['form_for_filter'] = $record_array_final_filter; $data['active_tab'] = 'app'; @@ -2949,10 +2979,13 @@ public function mapviewframe($slug) { } else { $view_list = array(); foreach ($forms_list as $final_view) { - $view_list = array_merge($view_list, array($final_view['form_name'] => $final_view['form_id'])); + $view_list = array_merge($view_list, array($final_view['form_name'] + => $final_view['form_id'])); } $form_single_to_query = array(); - $form_single_to_query[] = array('form_id' => $forms_list[0]['form_id'], 'table_name' => 'zform_' . $forms_list[0]['form_id'], 'form_name' => $forms_list[0]['form_name']); + $form_single_to_query[] = array('form_id' => $forms_list[0]['form_id'], + 'table_name' => 'zform_' . $forms_list[0]['form_id'], + 'form_name' => $forms_list[0]['form_name']); $view_list = array_flip($view_list); $data['form_lists'] = $view_list; $data['form_list_selected'] = $form_single_to_query; @@ -2980,7 +3013,8 @@ public function mapviewframe($slug) { $login_district = ''; /** for categry listing* */ $record_array_final_filter = array(); - $results_filer_main = $this->form_results_model->get_form_results_filters($form_single_to_query, $login_district); + $results_filer_main = $this->form_results_model + ->get_form_results_filters($form_single_to_query, $login_district); $app_filters_array = array(); $town_array = array(); $uc_array = array(); @@ -3026,7 +3060,8 @@ public function mapviewframe($slug) { if (isset($v->$filters)) { $filter_entity = $v->$filters; if (!key_exists($filters, $app_filters_array)) { - $app_filters_array[$filters][$filter_entity] = $filter_entity; + $app_filters_array[$filters][$filter_entity] = + $filter_entity; } if (!in_array($filter_entity, $app_filters_array[$filters])) { $app_filters_array[$filters][$filter_entity] = $filter_entity; @@ -3037,7 +3072,8 @@ public function mapviewframe($slug) { if (in_array($key, $filter_attribute)) { $value = trim($value); $valueforarray = str_replace(' ', '_', $value); - if (isset($map_saved_pins[$key][$valueforarray]) && $map_saved_pins[$key][$valueforarray] != '') { + if (isset($map_saved_pins[$key][$valueforarray]) && + $map_saved_pins[$key][$valueforarray] != '') { $pin_name = $map_saved_pins[$key][$valueforarray]; } else if (!in_array($valueforarray, $filter_exist_array)) { @@ -3054,7 +3090,8 @@ public function mapviewframe($slug) { $exist_alpha[$first_char] = '1'; $pin_name = $first_char . '1.png'; } - $pin_exist_for_cat = array_merge($pin_exist_for_cat, array($valueforarray => $pin_name)); + $pin_exist_for_cat = array_merge($pin_exist_for_cat, + array($valueforarray => $pin_name)); } else { if (array_key_exists($valueforarray, $pin_exist_for_cat)) { $pin_name = $pin_exist_for_cat[$valueforarray]; @@ -3066,7 +3103,8 @@ public function mapviewframe($slug) { $value_attribute = str_replace('&', 'and', $value_attribute); $key = trim($key); $value_attribute = trim($value_attribute); - $record_array = array_merge($record_array, array($key => $value_attribute)); + $record_array = array_merge($record_array, array($key + => $value_attribute)); } $record_array = array_merge($record_array, array('location' => $location)); $record_array = array_merge($record_array, array('id' => $result_id)); @@ -3097,7 +3135,8 @@ public function mapviewframe($slug) { * its call back function call */ foreach ($filter_attribute as $filter_attribute_value) { - uasort($record_array_final_filter, array(new SortAssociativeArray($filter_attribute_value), "call")); + uasort($record_array_final_filter, + array(new SortAssociativeArray($filter_attribute_value), "call")); } $results_comined = array(); $record_array_final = array(); @@ -3128,7 +3167,8 @@ public function mapviewframe($slug) { if (in_array($key, $filter_attribute)) { $value = trim($value); $valueforarray = str_replace(' ', '_', $value); - if (isset($map_saved_pins[$key][$valueforarray]) && $map_saved_pins[$key][$valueforarray] != '') { + if (isset($map_saved_pins[$key][$valueforarray]) && + $map_saved_pins[$key][$valueforarray] != '') { $pin_name = $map_saved_pins[$key][$valueforarray]; } else if (!in_array($valueforarray, $filter_exist_array)) { @@ -3144,7 +3184,8 @@ public function mapviewframe($slug) { $exist_alpha[$first_char] = '1'; $pin_name = $first_char . '1.png'; } - $pin_exist_for_cat = array_merge($pin_exist_for_cat, array($valueforarray => $pin_name)); + $pin_exist_for_cat = array_merge($pin_exist_for_cat, + array($valueforarray => $pin_name)); } else { if (array_key_exists($valueforarray, $pin_exist_for_cat)) { $pin_name = $pin_exist_for_cat[$valueforarray]; @@ -3170,26 +3211,36 @@ public function mapviewframe($slug) { } } $data['selected_form'] = $first_form_id; - $data['locations'] = $this->getMapHtmlInfo($record_array_final, $heading_array, $filter_attribute); + $data['locations'] = $this->getMapHtmlInfo($record_array_final, + $heading_array, $filter_attribute); $town_lists = $this->app_users_model->get_towns($selected_form['app_id']); $town_list_array = array(); foreach ($town_lists as $towns) { if (!in_array($towns['town'], $town_list_array)) { - $town_list_array = array_merge($town_list_array, array($towns['town'] => $towns['town'])); + $town_list_array = array_merge($town_list_array, + array($towns['town'] => $towns['town'])); } } $data['filter'] = $selected_form['filter']; $data['app_id'] = $selected_form['app_id']; $selected_app = $this->app_model->get_app($selected_form['app_id']); $map_view_settings = get_map_view_settings($selected_form['app_id']); - $data['district_filter'] = !empty($map_view_settings->district_filter) ? $map_view_settings->district_filter : ''; - $data['sent_by_filter'] = !empty($map_view_settings->sent_by_filter) ? $map_view_settings->sent_by_filter : ''; - $data['uc_filter'] = !empty($map_view_settings->uc_filter) ? $map_view_settings->uc_filter : ''; - $data['map_type_filter'] = (isset($map_view_settings->map_type_filter)) ? $map_view_settings->map_type_filter : ''; - $data['view_type'] = !empty($app_settings['map_type']) ? $app_settings['map_type'] : ''; - $data['zoom_level'] = (isset($map_view_settings->default_zoom_level)) ? $map_view_settings->default_zoom_level : ''; - $data['latitude'] = (isset($map_view_settings->default_latitude)) ? $map_view_settings->default_latitude : ''; - $data['longitude'] = (isset($map_view_settings->default_longitude)) ? $map_view_settings->default_longitude : ''; + $data['district_filter'] = !empty($map_view_settings + ->district_filter) ? $map_view_settings->district_filter : ''; + $data['sent_by_filter'] = !empty($map_view_settings + ->sent_by_filter) ? $map_view_settings->sent_by_filter : ''; + $data['uc_filter'] = !empty($map_view_settings + ->uc_filter) ? $map_view_settings->uc_filter : ''; + $data['map_type_filter'] = (isset($map_view_settings + ->map_type_filter)) ? $map_view_settings->map_type_filter : ''; + $data['view_type'] = + !empty($app_settings['map_type']) ? $app_settings['map_type'] : ''; + $data['zoom_level'] = (isset($map_view_settings + ->default_zoom_level)) ? $map_view_settings->default_zoom_level : ''; + $data['latitude'] = (isset($map_view_settings + ->default_latitude)) ? $map_view_settings->default_latitude : ''; + $data['longitude'] = (isset($map_view_settings + ->default_longitude)) ? $map_view_settings->default_longitude : ''; $data['app_name'] = $selected_app['name']; $data['town_filter'] = $town_list_array; $data['headings'] = $heading_array; @@ -3211,7 +3262,8 @@ public function mapviewframe($slug) { * @access Inline * @author UbaidUllah Balti */ - private function getMapHtmlInfo($locations = array(), $headings = array(), $filter_attribute) { + private function getMapHtmlInfo($locations = array(), + $headings = array(), $filter_attribute) { if (isset($locations[0]['form_id'])) { $form_id = $locations[0]['form_id']; } else { From 8b45630354fdcef4987ab10f76d6bc99ea34109f Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 23 Jan 2021 22:17:44 +0500 Subject: [PATCH 2/2] line is modified --- application/controllers/form.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/controllers/form.php b/application/controllers/form.php index 140a3d4..cc611f1 100644 --- a/application/controllers/form.php +++ b/application/controllers/form.php @@ -3116,7 +3116,8 @@ public function mapviewframe($slug) { } $data['app_filters_array'] = $app_filters_array; $data['selected_filters'] = array(); - $total_result = $this->form_results_model->return_total_record($form_single_to_query); + $total_result = $this->form_results_model + ->return_total_record($form_single_to_query); $totalPages = ceil($total_result / $this->perMap); $data['totalPages'] = $totalPages; $town_array[] = asort($town_array);