From bca73b12950e89aa066fdc3afbc7fc240e8caf88 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Wed, 2 Aug 2023 07:06:34 +0000
Subject: [PATCH] Commented migscript, Added lang-choser to Useradd

---
 application/controllers/User.php                 | 16 ++++++++--------
 application/migrations/133_add_user_language.php |  3 +--
 application/views/user/add.php                   | 12 ++++++++++++
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/application/controllers/User.php b/application/controllers/User.php
index d279da46..3c417c5f 100644
--- a/application/controllers/User.php
+++ b/application/controllers/User.php
@@ -32,6 +32,8 @@ class User extends CI_Controller {
 		$this->load->model('user_model');
 		if(!$this->user_model->authorize(99)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
 
+		$data['existing_languages'] = $this->find();
+
 		$this->load->model('bands');
 		$this->load->library('form_validation');
 
@@ -53,15 +55,14 @@ class User extends CI_Controller {
 
 		// Get timezones
 		$data['timezones'] = $this->user_model->timezones();
+		$data['language'] = 'english';
 
-		if ($this->form_validation->run() == FALSE)
-		{
+		if ($this->form_validation->run() == FALSE) {
 			$data['page_title'] = "Add User";
             $data['measurement_base'] = $this->config->item('measurement_base');
 
 			$this->load->view('interface_assets/header', $data);
-			if($this->input->post('user_name'))
-			{
+			if($this->input->post('user_name')) {
 				$data['user_name'] = $this->input->post('user_name');
 				$data['user_email'] = $this->input->post('user_email');
 				$data['user_password'] = $this->input->post('user_password');
@@ -95,9 +96,7 @@ class User extends CI_Controller {
 				$this->load->view('user/add', $data);
 			}
 			$this->load->view('interface_assets/footer');
-		}
-		else
-		{
+		} else {
 			switch($this->user_model->add($this->input->post('user_name'),
 				$this->input->post('user_password'),
 				$this->input->post('user_email'),
@@ -125,8 +124,9 @@ class User extends CI_Controller {
 				$this->input->post('user_amsat_status_upload'),
 				$this->input->post('user_mastodon_url'),
 				$this->input->post('user_gridmap_default_band'),
+				($this->input->post('user_gridmap_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_gridmap_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_gridmap_confirmation_eqsl') !== null ? 'E' : ''),
 				$this->input->post('language'),
-				($this->input->post('user_gridmap_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_gridmap_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_gridmap_confirmation_eqsl') !== null ? 'E' : ''))) {
+				)) {
 				// Check for errors
 				case EUSERNAMEEXISTS:
 					$data['username_error'] = 'Username <b>'.$this->input->post('user_name').'</b> already in use!';
diff --git a/application/migrations/133_add_user_language.php b/application/migrations/133_add_user_language.php
index 2e5c7609..b6222b7f 100644
--- a/application/migrations/133_add_user_language.php
+++ b/application/migrations/133_add_user_language.php
@@ -3,8 +3,7 @@
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 /*
- *   This adds an option to enable grid and name lookup
- *   for WWFF references
+ *   This adds a field to user-table to hold/persist language-setting per user
 */
 
 class Migration_add_user_language extends CI_Migration {
diff --git a/application/views/user/add.php b/application/views/user/add.php
index a7bd8897..c71104d9 100644
--- a/application/views/user/add.php
+++ b/application/views/user/add.php
@@ -190,6 +190,18 @@
                             </select>
                             <small id="user_measurement_base_Help" class="form-text text-muted"><?php echo lang('account_choose_which_unit_distances_will_be_shown_in'); ?></small>
                         </div>
+				<?php if ($this->config->item('cl_multilanguage')) { ?>
+		 	    <div class="form-group">
+		                <label for="language">Cloudlog Language</label>
+						<?php
+						foreach($existing_languages as $lang){
+							$options[$lang] = ucfirst($lang);
+						}
+						echo form_dropdown('language', $options, $language);
+						?>
+		                <small id="language_Help" class="form-text text-muted">Choose Cloudlog language.</small>
+		            </div>
+				<?php } ?>
 
                     </div>
                 </div>