Compare commits
4 Commits
11_0_0-117
...
11_0_0-121
| Author | SHA1 | Date | |
|---|---|---|---|
| de2f78a089 | |||
| b838d9252a | |||
| 9c9ab91869 | |||
| 022b85bd69 |
@@ -163,7 +163,7 @@ sub get_ftp_access {
|
||||
my $status = get_prop('', 'ftp', 'status') || 'disabled';
|
||||
return 'off' unless $status eq 'enabled';
|
||||
my $access = get_prop('', 'ftp', 'access') || 'private';
|
||||
return ($access eq 'public') ? 'normal' : 'private';
|
||||
return ($access eq 'public') ? 'public' : 'private';
|
||||
} ## end sub get_ftp_access
|
||||
|
||||
#sub get_pptp_sessions {
|
||||
@@ -320,7 +320,7 @@ sub change_settings {
|
||||
$rec->set_prop('status', 'disabled');
|
||||
$rec->set_prop('access', 'private');
|
||||
$rec->set_prop('LoginAccess', 'private');
|
||||
} elsif ($rma_datas{ftpAccess} eq "normal") {
|
||||
} elsif ($rma_datas{ftpAccess} eq "public") {
|
||||
$rec->set_prop('status', 'enabled');
|
||||
$rec->set_prop('access', 'public');
|
||||
$rec->set_prop('LoginAccess', $rma_datas{ftpPasswordAccess});
|
||||
@@ -438,4 +438,4 @@ sub remove_valid_from {
|
||||
$db->get('httpd-admin')->set_prop('ValidFrom', $prop);
|
||||
return 1;
|
||||
} ## end sub remove_valid_from
|
||||
1;
|
||||
1;
|
||||
@@ -0,0 +1,4 @@
|
||||
.legacy-embedded {
|
||||
width: 99%;
|
||||
height: 600px; /* fallback default, matches your $height default */
|
||||
}
|
||||
@@ -502,4 +502,20 @@ div.success, span.success {
|
||||
div.roundcube #roundcube{
|
||||
width:100%;
|
||||
height:600px;
|
||||
}
|
||||
|
||||
.center {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: 100%; /* adjust as needed */
|
||||
}
|
||||
|
||||
.left-btn {
|
||||
/* Left aligned */
|
||||
}
|
||||
|
||||
.center-btn {
|
||||
/* Center aligned */
|
||||
margin-left: auto!important;
|
||||
margin-right: auto;
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
var obj = document.getElementById('legacy-embedded');
|
||||
if (obj && obj.dataset.legacyHeight) {
|
||||
obj.style.height = obj.dataset.legacyHeight;
|
||||
}
|
||||
});
|
||||
@@ -30,14 +30,27 @@ $(document).ready(function() {
|
||||
});
|
||||
});
|
||||
|
||||
// and busy cursor
|
||||
$(document).ready(function() {
|
||||
// Handle form submission for any form
|
||||
$('form').on('submit', function(event) {
|
||||
// Disable all submit buttons and update their labels
|
||||
$(this).find('button[type="submit"]').prop('disabled', true).text('Please wait...');
|
||||
$(this).find('input[type="submit"]').prop('disabled', true).val('Please wait...');
|
||||
// Add busy cursor
|
||||
$('body').addClass('busy');
|
||||
});
|
||||
$('form').on('submit', function(event) {
|
||||
// Change submit buttons to look disabled and update their labels without disabling
|
||||
$(this).find('button[type="submit"]').each(function() {
|
||||
$(this).text('Please wait...').addClass('visually-disabled').css({
|
||||
'pointer-events': 'none',
|
||||
'opacity': '0.6',
|
||||
'cursor': 'not-allowed'
|
||||
});
|
||||
});
|
||||
$(this).find('input[type="submit"]').each(function() {
|
||||
$(this).val('Please wait...').addClass('visually-disabled').css({
|
||||
'pointer-events': 'none',
|
||||
'opacity': '0.6',
|
||||
'cursor': 'not-allowed'
|
||||
});
|
||||
});
|
||||
|
||||
// Add busy cursor to body
|
||||
$('body').addClass('busy');
|
||||
|
||||
// Allow form to submit normally without disabling the buttons
|
||||
});
|
||||
});
|
||||
@@ -14,10 +14,18 @@
|
||||
</div>
|
||||
% }
|
||||
<h1> Embedded - <%= $title %></h1><br>
|
||||
<p>If the legacy panel does not appear, then you may not be logged into the original Server manager.<br />You can log in by clicking <a href="/server-manager" target='_blank'>here</a>. Or by clicking on the "Legacy SM" button at the top of the window.</p>
|
||||
% my $height = $c->stash('height') | '600px';
|
||||
<p>If the legacy panel does not appear, then you may not be logged into the original Server manager.<br />You can log in by clicking <a href="/server-manager" target='_blank'>here</a>.</p>
|
||||
% my $height = $c->stash('height') || '600px';
|
||||
% if ( $height !~ /px$/ ) { $height = $height . 'px'; }
|
||||
<object id="legacy-embedded" class="legacy-embedded" data="<%= $c->stash('modul') %>" style="width:99%;height:<%= $height %>;" title="<%= $c->stash('title') %>" type="text/html" ><%= $c->stash('title') %> not found</object>
|
||||
% # Add the height as a data attribute
|
||||
<object id="legacy-embedded"
|
||||
class="legacy-embedded"
|
||||
data="<%= $c->stash('modul') %>"
|
||||
data-legacy-height="<%= $height %>"
|
||||
title="<%= $c->stash('title') %>"
|
||||
type="text/html">
|
||||
<%= $c->stash('title') %> not found
|
||||
</object>
|
||||
</div>
|
||||
|
||||
% end
|
||||
% end
|
||||
@@ -2,7 +2,7 @@ Summary: Sme Server Configuration : Manager 2
|
||||
%define name smeserver-manager
|
||||
Name: %{name}
|
||||
%define version 11.0.0
|
||||
%define release 117
|
||||
%define release 121
|
||||
Version: %{version}
|
||||
Release: %{release}%{?dist}
|
||||
License: GPL
|
||||
@@ -147,6 +147,18 @@ true
|
||||
%defattr(-,root,root)
|
||||
|
||||
%changelog
|
||||
* Sat Sep 27 2025 Brian Read <brianr@koozali.org> 11.0.0-121.sme
|
||||
- Sort out ftp public setting [SME: 13194]
|
||||
|
||||
* Thu Sep 25 2025 Brian Read <brianr@koozali.org> 11.0.0-120.sme
|
||||
- Add CSS for multiple result buttons on panel - used by wireguard[SME: 13185]
|
||||
|
||||
* Thu Sep 25 2025 Brian Read <brianr@koozali.org> 11.0.0-119.sme
|
||||
- Change submit button disable/message as method as current method does not send name back as parameter [SME: 13184]
|
||||
|
||||
* Thu Sep 25 2025 Brian Read <brianr@koozali.org> 11.0.0-118.sme
|
||||
- Remove inline style for legacy panel [SME: 13177]
|
||||
|
||||
* Wed Sep 24 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-117.sme
|
||||
- set correctly X-Forwarded-Proto for TKT auth [SME: 13175]
|
||||
updated CSP for smanager
|
||||
|
||||
Reference in New Issue
Block a user