Compare commits
3 Commits
11_0_0-72_
...
11_0_0-75_
| Author | SHA1 | Date | |
|---|---|---|---|
| cffbe53fb4 | |||
| aad1a458f4 | |||
| 252bf20410 |
3
clog
Normal file
3
clog
Normal file
@@ -0,0 +1,3 @@
|
||||
* Wed Apr 09 2025 Brian Read <brianr@koozali.org> 11.0.0-75.sme
|
||||
- Move review configuration to behind login [SME: 12984]
|
||||
- Fix crash in port forwarding [SME: 12985]
|
||||
@@ -142,6 +142,10 @@ sub do_display {
|
||||
if ($trt eq 'LIST') {
|
||||
|
||||
#List all the port forwards
|
||||
# Open them again as maybe written to above
|
||||
$tcp_db = esmith::ConfigDB->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
|
||||
$udp_db = esmith::ConfigDB->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
|
||||
|
||||
my @tcpforwards = $tcp_db->get_all;
|
||||
my @udpforwards = $udp_db->get_all;
|
||||
my $empty = 1 if not @tcpforwards and not @udpforwards;
|
||||
@@ -211,6 +215,7 @@ sub add_portforward {
|
||||
|
||||
sub get_destination_host {
|
||||
my $q = shift;
|
||||
$cdb = esmith::ConfigDB->open || die "Can't open configuration database: $!\n";
|
||||
my $dhost = $q->param("dhost");
|
||||
my $localip = $cdb->get_prop('InternalInterface', 'IPAddress');
|
||||
my $external_ip = $cdb->get_prop('ExternalInterface', 'IPAddress') || $localip;
|
||||
@@ -357,6 +362,7 @@ sub isValidPort() {
|
||||
|
||||
sub validate_destination_host {
|
||||
my $c = shift;
|
||||
$cdb = esmith::ConfigDB->open || die "Can't open configuration database: $!\n";
|
||||
my $dhost = $c->param('dhost');
|
||||
$dhost =~ s/^\s+|\s+$//g;
|
||||
my $localip = $cdb->get_prop('InternalInterface', 'IPAddress');
|
||||
@@ -395,4 +401,4 @@ sub validate_allowed_hosts {
|
||||
} ## end foreach (split(/[\s,]+/, $ahost...))
|
||||
return %valid_ahost_list;
|
||||
} ## end sub validate_allowed_hosts
|
||||
1;
|
||||
1;
|
||||
@@ -1,16 +1,11 @@
|
||||
package SrvMngr::Controller::Review;
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# heading : Support
|
||||
# heading : Investigation
|
||||
# description : Review configuration
|
||||
# navigation : 000 500
|
||||
# menu : N
|
||||
# navigation : 6000 6800
|
||||
# routes : end
|
||||
#----------------------------------------------------------------------
|
||||
# heading-o : Configuration
|
||||
# description-o : Review configuration
|
||||
# navigation-o : 6000 6800
|
||||
#----------------------------------------------------------------------
|
||||
use strict;
|
||||
use warnings;
|
||||
use Mojo::Base 'Mojolicious::Controller';
|
||||
@@ -313,4 +308,4 @@ sub get_public_ip_address
|
||||
}
|
||||
|
||||
|
||||
1;
|
||||
1;
|
||||
@@ -201,11 +201,13 @@ body.menu {
|
||||
|
||||
div.error, div.sme-error, span.error, span.sme-error {
|
||||
color: red;
|
||||
background-color: #fff;
|
||||
background-color: #f9f9f9;
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
border-color: red;
|
||||
padding: 2px;
|
||||
padding: 10px;
|
||||
border-radius: 10px;
|
||||
|
||||
}
|
||||
|
||||
form {
|
||||
@@ -493,5 +495,6 @@ div.success, span.success {
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
border-color: #006400 ;
|
||||
padding: 8px;
|
||||
padding: 10px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
@@ -125,7 +125,7 @@
|
||||
}
|
||||
|
||||
#header2 {
|
||||
width: 94.2%;
|
||||
width:96%;
|
||||
margin-left: 1px;
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
@@ -13,17 +13,18 @@
|
||||
% my $var5 = @vars[4];
|
||||
% my $var6 = @vars[5];
|
||||
|
||||
<br>
|
||||
%if ($ret{'ret'} eq "") {
|
||||
|
||||
%} elsif (index($ret{ret},"SUCCESS") != -1) {
|
||||
<div class='success'>
|
||||
<h2> Operation Status Report</h2>
|
||||
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
|
||||
<!--<h2> Operation Status Report</h2>-->
|
||||
%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6));
|
||||
</div>
|
||||
%} else {
|
||||
<div class='sme-error'>
|
||||
<h2> Operation Status Report - Error</h2>
|
||||
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
|
||||
<!--<h2> Operation Status Report - Error</h2>-->
|
||||
%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6));
|
||||
</div>
|
||||
%}
|
||||
<br />
|
||||
@@ -66,5 +67,4 @@
|
||||
</p>
|
||||
%end
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -26,13 +26,15 @@
|
||||
%if ($ret{ret} eq "") {
|
||||
%=l "ln_FIRSTPAGE_DESC"
|
||||
%} elsif (index($ret{ret},"SUCCESS") != -1) {
|
||||
<br>
|
||||
<div class='success'>
|
||||
<h2> Operation Status Report</h2>
|
||||
<!--<h2> Operation Status Report</h2>-->
|
||||
%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
|
||||
</div>
|
||||
%} else {
|
||||
<br>
|
||||
<div class='sme-error'>
|
||||
<h2> Operation Status Report - Error</h2>
|
||||
<!--<h2> Operation Status Report - Error</h2>-->
|
||||
%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
|
||||
</div>
|
||||
%}
|
||||
@@ -103,4 +105,4 @@
|
||||
</table>
|
||||
%= hidden_field 'trt' => $ln_datas->{trt}
|
||||
%}
|
||||
</div>
|
||||
</div>
|
||||
@@ -13,16 +13,17 @@
|
||||
% my $var5 = @vars[4];
|
||||
% my $var6 = @vars[5];
|
||||
|
||||
<br>
|
||||
%if ($ret{'ret'} eq "") {
|
||||
|
||||
%} elsif (index($ret{ret},"SUCCESS") != -1) {
|
||||
<div class='success'>
|
||||
<h2> Operation Status Report</h2>
|
||||
<!--<h2> Operation Status Report</h2>-->
|
||||
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
|
||||
</div>
|
||||
%} else {
|
||||
<div class='sme-error'>
|
||||
<h2> Operation Status Report - Error</h2>
|
||||
<!--<h2> Operation Status Report - Error</h2>-->
|
||||
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
|
||||
</div>
|
||||
%}
|
||||
@@ -84,4 +85,4 @@
|
||||
|
||||
%end
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@@ -21,13 +21,15 @@
|
||||
%if ($ret{ret} eq "") {
|
||||
%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION'));
|
||||
%} elsif (index($ret{ret},"SUCCESS") != -1) {
|
||||
<br>
|
||||
<div class='success'>
|
||||
<h2> Operation Status Report</h2>
|
||||
<!--<h2> Operation Status Report</h2>-->
|
||||
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
|
||||
</div>
|
||||
%} else {
|
||||
<br>
|
||||
<div class='sme-error'>
|
||||
<h2> Operation Status Report - Error</h2>
|
||||
<!--<h2> Operation Status Report - Error</h2>-->
|
||||
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
|
||||
</div>
|
||||
%}
|
||||
@@ -113,4 +115,4 @@
|
||||
</table>
|
||||
%= hidden_field 'trt' => $pf_datas->{trt}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2
|
||||
%define name smeserver-manager
|
||||
Name: %{name}
|
||||
%define version 11.0.0
|
||||
%define release 72
|
||||
%define release 75
|
||||
Version: %{version}
|
||||
Release: %{release}%{?dist}
|
||||
License: GPL
|
||||
@@ -143,6 +143,18 @@ true
|
||||
%defattr(-,root,root)
|
||||
|
||||
%changelog
|
||||
* Wed Apr 09 2025 Brian Read <brianr@koozali.org> 11.0.0-75.sme
|
||||
- Move review configuration to behind login [SME: 12984]
|
||||
- Fix crash in port forwarding [SME: 12985]
|
||||
|
||||
* Wed Mar 26 2025 Brian Read <brianr@koozali.org> 11.0.0-74.sme
|
||||
- Fix error message and success message format in Local Networking panel [SME: 12969]
|
||||
|
||||
* Tue Mar 25 2025 Brian Read <brianr@koozali.org> 11.0.0-73.sme
|
||||
- Some changes to error message format in css.
|
||||
- Fix DB Cache problem with port forwarding panel [SME: 12970]
|
||||
- Fix error and success message display for port forwarding panel [SME: 12969]
|
||||
|
||||
* Mon Mar 24 2025 Brian Read <brianr@koozali.org> 11.0.0-72.sme
|
||||
- Remove css files from template structure [SME: 12967]
|
||||
- Rationalise and merge css files
|
||||
|
||||
Reference in New Issue
Block a user