diff --git a/application/controllers/User.php b/application/controllers/User.php index cc1560b0..0956e018 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -208,12 +208,6 @@ class User extends CI_Controller { $data['user_clublog_password'] = $q->user_clublog_password; } - if($this->input->post('user_clublog_callsign')) { - $data['user_clublog_callsign'] = $this->input->post('user_clublog_callsign'); - } else { - $data['user_clublog_callsign'] = $q->user_clublog_callsign; - } - if($this->input->post('user_lotw_password')) { $data['user_lotw_password'] = $this->input->post('user_lotw_password'); } else { @@ -231,12 +225,7 @@ class User extends CI_Controller { } else { $data['user_eqsl_password'] = $q->user_eqsl_password; } - - if($this->input->post('user_eqsl_qth_nickname')) { - $data['user_eqsl_qth_nickname'] = $this->input->post('user_eqsl_qth_nickname'); - } else { - $data['user_eqsl_qth_nickname'] = $q->user_eqsl_qth_nickname; - } + $this->load->view('user/edit', $data); $this->load->view('interface_assets/footer'); diff --git a/application/models/User_model.php b/application/models/User_model.php index 7ea6ebe8..46dfb054 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -125,9 +125,7 @@ class User_Model extends CI_Model { 'user_timezone' => $fields['user_timezone'], 'user_lotw_name' => $fields['user_lotw_name'], 'user_eqsl_name' => $fields['user_eqsl_name'], - 'user_eqsl_qth_nickname' => $fields['user_eqsl_qth_nickname'], 'user_clublog_name' => $fields['user_clublog_name'], - 'user_clublog_callsign' => $fields['user_clublog_callsign'], ); // Check to see if the user is allowed to change user levels diff --git a/application/views/user/edit.php b/application/views/user/edit.php index e40d117a..9197187b 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -121,12 +121,6 @@ -
- - -
- -
@@ -143,12 +137,6 @@
-
- - - ".$userclublogcallsign_error."
"; } ?> - -