Compare commits

...

3 Commits

Author SHA1 Message Date
99dc0a15da * Tue Nov 04 2025 Brian Read <brianr@koozali.org> 11.0.0-131.sme
- Add fix for IE browser local/language detect [SME: 13039]
2025-11-04 16:12:44 +00:00
0dfbdf3d36 * Tue Nov 04 2025 Brian Read <brianr@koozali.org> 11.0.0-130.sme
- Adjust heading so that no white line under theme selector and move theme button in [SME: 13057]
2025-11-04 13:27:51 +00:00
820551b076 * Tue Nov 04 2025 Brian Read <brianr@koozali.org> 11.0.0-129.sme
- Useraccounts: Clean up forward email sub and make sure blank is errored  [SME: 13056]
2025-11-04 13:00:26 +00:00
4 changed files with 41 additions and 19 deletions

View File

@@ -179,7 +179,7 @@ sub do_update {
$res = $c->pseudonym_clash($first);
$result .= $res unless $res eq 'OK';
if ($mail) {
if (defined $mail) {
$res = $c->emailforward($mail);
$result .= $res unless $res eq 'OK';
}
@@ -217,7 +217,7 @@ sub do_update {
$res = $c->pseudonym_clash($first);
$result .= $res unless $res eq 'OK';
if ($mail) {
if (defined $mail) {
$res = $c->emailforward($mail);
$result .= $res unless $res eq 'OK';
}
@@ -554,27 +554,31 @@ sub pseudonym_clash {
sub emailforward {
my ($c, $data) = @_;
my $response = $c->email_simple($data);
#$c->app->log->info("emailformward called with $data!");
if ($response eq "OK") {
return "OK";
} elsif ($data eq "") {
# Trim whitespace from $data
$data =~ s/^\s+|\s+$//g if defined $data;
# Blank is ok, only if we're not forwarding, which means that the
# EmailForward param must be set to 'local'.
# Check simple email validation first
return "OK" if $c->email_simple($data) eq "OK";
# If trimmed data is empty
if ($data eq "") {
my $email_forward = $c->param('EmailForward') || '';
$email_forward =~ s/^\s+|\s+$//g;
return 'OK' if $email_forward eq 'local';
return $c->l('usr_CANNOT_CONTAIN_WHITESPACE');
} else {
return $c->l('usr_CANNOT_CONTAIN_WHITESPACE')
if ($data =~ /\s+/);
}
# Permit a local address.
return "OK" if $data =~ /^[a-zA-Z][a-zA-Z0-9\._\-]*$/;
return $c->l('usr_UNACCEPTABLE_CHARS');
} ## end else [ if ($response eq "OK")]
} ## end sub emailforward
# Reject if $data contains any whitespace inside
return $c->l('usr_CANNOT_CONTAIN_WHITESPACE') if $data =~ /\s/;
# Allow local address pattern
return "OK" if $data =~ /^[a-zA-Z][a-zA-Z0-9._-]*$/;
# Otherwise reject for unacceptable chars
return $c->l('usr_UNACCEPTABLE_CHARS');
}
sub get_groups {
my ($c) = shift;

View File

@@ -122,6 +122,7 @@
max-width: 100%;
position: relative;
margin: auto;
margin-top:-20px;
}
#header2 {
@@ -290,4 +291,8 @@ background-color: #e8f3e1;
}
.busy {
cursor: wait; /* Change the cursor to a 'wait' cursor */
}
#swt_theme {
margin-left:10px;
}

View File

@@ -263,8 +263,12 @@ document.addEventListener('DOMContentLoaded', () => {
function displayLocaleAndFlag() {
// Get the browser locale
const userLocale = navigator.language || navigator.userLanguage;
const userLocale = navigator.languages && navigator.languages.length
? navigator.languages[0]
: navigator.language;
//alert(`User Locale: ${userLocale}`); // Alert the detected locale
console.log(navigator.languages); // Log language to console
const { flag, isUnknown, countryCode } = getFlagEmoji(userLocale);

View File

@@ -2,7 +2,7 @@ Summary: Sme Server Configuration : Manager 2
%define name smeserver-manager
Name: %{name}
%define version 11.0.0
%define release 128
%define release 131
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@@ -147,11 +147,20 @@ true
%defattr(-,root,root)
%changelog
* Tue Nov 04 2025 Brian Read <brianr@koozali.org> 11.0.0-131.sme
- Add fix for IE browser local/language detect [SME: 13039]
* Tue Nov 04 2025 Brian Read <brianr@koozali.org> 11.0.0-130.sme
- Adjust heading so that no white line under theme selector and move theme button in [SME: 13057]
* Tue Nov 04 2025 Brian Read <brianr@koozali.org> 11.0.0-129.sme
- Useraccounts: Clean up forward email sub and make sure blank is errored [SME: 13056]
* Tue Nov 04 2025 Brian Read <brianr@koozali.org> 11.0.0-128.sme
- Move group table to under others in User accounts setup panel [SME: 13068]
* Tue Nov 04 2025 Brian Read <brianr@koozali.org> 11.0.0-127.sme
- Move same var declations to outside innner scope [SME: 13073]
- Group panel: Move same var declations to outside innner scope [SME: 13073]
* Tue Nov 04 2025 Brian Read <brianr@koozali.org> 11.0.0-126.sme
- Remove debugging dump in portforwarding which crashes if no data [SME: 13243]