Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2391 from int2001/clublog_login_mail

Browse Source 
Clublog: Force User to enter mailadress instead of call
This commit is contained in:
Joerg (DJ7NT)
2025-10-07 08:41:53 +02:00
committed by GitHub
parent 5ded27bc08 189f1797c0
commit 68d1b98f80
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/controllers/User.php
View File

@@ -153,6 +153,7 @@ class User extends CI_Controller {
$this->form_validation->set_rules('user_name', 'Username', 'required');
$this->form_validation->set_rules('user_name', 'Username', 'required|callback_check_username');
$this->form_validation->set_rules('user_email', 'E-mail', 'required');
$this->form_validation->set_rules('user_clublog_name', 'Clublog Username', 'valid_email');
$this->form_validation->set_rules('user_password', 'Password', 'required');
$this->form_validation->set_rules('user_type', 'Type', 'required');
$this->form_validation->set_rules('user_callsign', 'Callsign', 'required');
@@ -386,6 +387,7 @@ class User extends CI_Controller {
$this->form_validation->set_rules('user_name', 'Username', 'required|xss_clean');
$this->form_validation->set_rules('user_name', 'Username', 'required|callback_check_username');
$this->form_validation->set_rules('user_email', 'E-mail', 'required|xss_clean');
$this->form_validation->set_rules('user_clublog_name', 'Clublog Username', 'valid_email');
if($this->session->userdata('user_type') == 99)
{
$this->form_validation->set_rules('user_type', 'Type', 'required|xss_clean');
@@ -396,6 +398,7 @@ class User extends CI_Controller {
$this->form_validation->set_rules('user_locator', 'Locator', 'callback_check_locator');
$this->form_validation->set_rules('user_email', 'EMail', 'required|callback_check_email');
$this->form_validation->set_rules('user_email', 'EMail', 'required|valid_email');
$this->form_validation->set_rules('user_clublog_name', 'Clublog Username', 'valid_email');
$this->form_validation->set_rules('user_timezone', 'Timezone', 'required');
$data['user_form_action'] = site_url('user/edit')."/".$this->uri->segment(3);

4
application/views/user/edit.php
View File

@@ -902,8 +902,8 @@
<div class="card-header"><?= __("Club Log"); ?></div>
<div class="card-body">
<div class="mb-3">
<label><?= __("Club Log Email/Callsign"); ?></label>
<input class="form-control" type="text" name="user_clublog_name" value="<?php if(isset($user_clublog_name)) { echo $user_clublog_name; } ?>" />
<label><?= __("Club Log Email"); ?></label>
<input class="form-control" type="email" name="user_clublog_name" value="<?php if(isset($user_clublog_name)) { echo $user_clublog_name; } ?>" />
<?php if(isset($userclublogname_error)) { echo "<small class=\"badge bg-danger\">".$userclublogname_error."</small>"; } ?>
</div>