Compare commits

..

2 Commits

Author SHA1 Message Date
b0c6bea0a2 * Mon Jul 07 2025 Brian Read <brianr@koozali.org> 11.0.0-104.sme
- Fix DB not open in Workgrouyp panel sometimes. [SME: 13070]
2025-07-07 06:22:13 +01:00
5a57ffaa34 * Thu Jul 03 2025 Brian Read <brianr@koozali.org> 11.0.0-103.sme
- Fix a couple of typos [SME: 13065]
2025-07-03 11:11:12 +01:00
4 changed files with 13 additions and 5 deletions

View File

@@ -102,7 +102,7 @@ sub do_display {
%ret = $c->remove_network($localnetwork, $delete_hosts);
} else {
$c->app->log->info("Local network: delete failed to find network in db: $localnetwork");
%ret = ();
%ret = (ret => "");
}
#$network_db = esmith::NetworksDB::UTF8->open() || die("Failed to open Networkdb-2"); #Refresh the network DB
my @localnetworks;
@@ -134,7 +134,7 @@ sub do_display {
$ln_datas{deletehosts} = $numhosts > 0 ? 1 : 0;
} else {
$c->app->log->info("Local network:Initial Failed to find network in Db: $localnetwork");
$c->flash('error',$c->l('ln_Failed to find network in Db'));
$c->flash('error',$c->l('ln_Failed to find network in Db'));
$trt = 'LIST';
}
} ## end if ($trt eq 'DEL')

View File

@@ -34,6 +34,7 @@ sub main {
sub do_update {
my $c = shift;
$c->app->log->info($c->log_req);
$db = esmith::ConfigDB::UTF8->open || die "Couldn't open config db";
my $result = "";
my $workgroup = ($c->param('Workgroup') || 'no');
my $servername = ($c->param('ServerName') || 'WS');
@@ -78,4 +79,4 @@ sub validate2_workgroup {
return $c->l('INVALID_WORKGROUP_MATCHES_SERVERNAME') if ($servername eq $workgroup);
return ('OK');
} ## end sub validate2_workgroup
1;
1;

View File

@@ -27,4 +27,5 @@
'ln_REMOVE_HOSTS_DESC' => 'Local hosts configured on the network you are about to remove have been detected. By default, they will also be removed. Uncheck this box if, for some reason, you do not wish this to happen. Note that they will not be treated as local, and may not even be reachable, after this network is removed. ',
'ln_REMOVE_HOSTS_LABEL' => 'Remove hosts on network',
'ln_extra' => '[_1]/[_2] via router $networkRouter}.',
'ln_SUCCESS_NONSTANDARD_RANGE' =>'<p>Successfully added network [_1]/[_2] via router [_3].</p><p> Your server will grant local access privileges to [_4] IP addresses in the range [_5] to [_6].</p><p> Warning: the ProFTPd FTP server cannot handle this nonstandard subnet mask. The simpler specification <b>[_7]</b> will be used instead.</p>',
'ln_SUCCESS_NONSTANDARD_RANGE' =>'<p>Successfully added network [_1]/[_2] via router [_3].</p><p> Your server will grant local access privileges to [_4] IP addresses in the range [_5] to [_6].</p><p> Warning: the ProFTPd FTP server cannot handle this nonstandard subnet mask. The simpler specification <b>[_7]</b> will be used instead.</p>',
'ln_Failed to find network in Db' => 'Failed to find network in Db',

View File

@@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2
%define name smeserver-manager
Name: %{name}
%define version 11.0.0
%define release 102
%define release 104
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@@ -146,6 +146,12 @@ true
%defattr(-,root,root)
%changelog
* Mon Jul 07 2025 Brian Read <brianr@koozali.org> 11.0.0-104.sme
- Fix DB not open in Workgrouyp panel sometimes. [SME: 13070]
* Thu Jul 03 2025 Brian Read <brianr@koozali.org> 11.0.0-103.sme
- Fix a couple of typos [SME: 13065]
* Thu Jul 03 2025 Brian Read <brianr@koozali.org> 11.0.0-102.sme
- Local Network panel: Make DEL and ADD robust even if called more than once by browser [SME: 13065]