Compare commits

..

7 Commits

70 changed files with 97 additions and 83 deletions

View File

@@ -80,6 +80,7 @@ a:active { color: #606060; text-decoration: none; }
.sme-error {
color: red;
display:block;
background-color: #ffffff;
border-width: 1px;
border-style: solid;
@@ -93,6 +94,7 @@ a:active { color: #606060; text-decoration: none; }
.sme-warning {
color: orange;
display:block;
background-color: #ffffff;
border-width: 1px;
border-style: solid;
@@ -276,4 +278,4 @@ a.menu-title {
/*end*/
EOF
}
}

View File

@@ -1,7 +1,7 @@
[Unit]
Description=Server Manager 2 Mojo
Requires=network.target httpd-e-smith.service ldap.service
After=network.target
Requires=network-online.target httpd-e-smith.service ldap.service
After=network-online.target
[Service]
Type=simple

View File

@@ -354,7 +354,7 @@ sub get_selected_LIST {
my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {};
return $ret;
return %ret;
} ## end sub get_selected_LIST
sub get_selected_PARAMS {
@@ -362,7 +362,7 @@ sub get_selected_PARAMS {
my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {};
return $ret;
return %ret;
} ## end sub get_selected_PARAMS
sub get_selected_CHECKALLDOMAINS {
@@ -370,7 +370,7 @@ sub get_selected_CHECKALLDOMAINS {
my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {};
return $ret;
return %ret;
} ## end sub get_selected_CHECKALLDOMAINS
sub get_selected_CHECKALLENABLEDDOMAINS {
@@ -378,7 +378,7 @@ sub get_selected_CHECKALLENABLEDDOMAINS {
my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {};
return $ret;
return %ret;
} ## end sub get_selected_CHECKALLENABLEDDOMAINS
sub get_selected_CHECKONEDOMAIN {
@@ -386,7 +386,7 @@ sub get_selected_CHECKONEDOMAIN {
my $selected = shift; #Parameter is name of selected row.
my $is_new_record = shift; #Indicates new record required (defaults)
my %ret = {};
return $ret;
return %ret;
} ## end sub get_selected_CHECKONEDOMAIN
#after sucessful modify or create or whatever and submit then perfom (if the params validate)
@@ -563,4 +563,4 @@ sub update_enabled_domains {
my $output = `/etc/e-smith/events/actions/letsencrypt-setdomains "" "" enabled `;
return $output || "-empty-";
} ## end sub update_enabled_domains
1;
1;

View File

@@ -305,10 +305,10 @@ sub do_display {
my $modul = "";
# Accessing all parameters
my %params = $c->req->params->to_hash;
my $params = $c->req->params->to_hash;
# Get number of parameters
my $num_params = keys %params;
my $num_params = scalar keys %$params;
#Tag as Post or Get (ie. create new entry or edit existing one
my $is_new_record = ($c->req->method() eq 'POST');
@@ -445,4 +445,4 @@ sub do_display {
);
$c->render(template => "letsencrypt");
} ## end sub do_display
1;
1;

View File

@@ -34,6 +34,7 @@ our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db";
sub main {
my $c = shift;
$c->app->log->info($c->log_req);
my $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
my $notif = '';
my %usr_datas = ();
my $title = $c->l('usr_FORM_TITLE');
@@ -394,10 +395,12 @@ sub remove_account {
sub reset_password {
my ($c, $user, $passw1) = @_;
unless (($user) = ($user =~ /^(\w[\-\w_\.]*)$/)) {
return $c->l('usr_TAINTED_USER');
}
$user = $1;
my $adb = esmith::AccountsDB->open || die "Couldn't open accounts db";
my $acct = $adb->get($user);
if ($acct->prop('type') eq "user") {
@@ -445,10 +448,9 @@ sub validate_password {
}
$reason ||= "Software error: password check failed";
return "OK" if ($reason eq "ok");
return
$c->l("Bad Password Choice") . ": "
return $c->l("Bad Password Choice") . ": "
. $c->l("The password you have chosen is not a good choice, because") . " "
. $c->($reason) . ".";
. $c->l($reason) . ".";
} ## end sub validate_password
sub emailForward_list {
@@ -817,4 +819,4 @@ sub system_change_password {
return $c->l("Error occurred while modifying password for admin.", 'First');
}
} ## end sub system_change_password
1
1

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module back_tape_configure-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $bac_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module back_tape_restore-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $bac_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module back_workstn_configure-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $bac_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module back_workstn_configure1-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $bac_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module back_workstn_restore-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $bac_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module back_workstn_restore1-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $bac_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module back_workstn_sel_restore-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $bac_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module back_workstn_sel_restore1-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $bac_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module back_workstn_sel_restore2-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $bac_datas

View File

@@ -2,7 +2,7 @@
% content_for 'module' => begin
<div id='module' class='module back_workstn_verify-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $bac_datas

View File

@@ -2,7 +2,7 @@
% content_for 'module' => begin
<div id='module' class='module back_workstn_verify1-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $bac_datas->{function}

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module backup-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $bac_datas

View File

@@ -4,7 +4,7 @@
<div id='module' class='module bugreport-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>
(DBG)trt: <%= $bugr_datas->{trt} %><br>

View File

@@ -4,7 +4,7 @@
<div id='module' class='module bugreport2-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>
(DBG)trt: <%= $bugr_datas->{trt} %><br>

View File

@@ -2,7 +2,7 @@
% content_for 'module' => begin
<div id='module' class='module clamav-panel'>
%if ($config->{debug} == 1) {
%if (config->{debug} == 1) {
<p>(DBG)route: <%= $c->current_route %><br>
(DBG)FsS stat: <%= $clm_datas->{FilesystemScan}%> <br>
(DBG)Quar stat: <%=$clm_datas->{Quarantine} %>

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module datetime-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $dat_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module directory-panel'>
%if ($config->{debug} == 1) {
%if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>
(DBG)dir. access: <%= $dir_datas->{access}%><br>

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module domains-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $dom_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module emailaccess-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $mai_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module emaildeliver-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $mai_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module emailfilter-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $mai_datas

View File

@@ -7,7 +7,7 @@
<div id='module' class='module emailreceive-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $mai_datas

View File

@@ -7,7 +7,7 @@
<div id='module' class='module emailsettings-panel'>
% if ($config->{debug} == TRUE) {
% if (config->{debug} == TRUE) {
<p>
%= dumper $c->current_route
%= dumper $mai_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module module-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
</p>

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module groups-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $grp_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module hostentries-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $hos_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module ibays-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $iba_datas

View File

@@ -2,7 +2,7 @@
% content_for 'module' => begin
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
</p>
@@ -25,4 +25,4 @@
</p>
</div>
% end
% end

View File

@@ -7,7 +7,7 @@
%= stylesheet '/css/letsencrypt.css'
<div id="module" class="module Letsencrypt-panel">
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<pre>
%= dumper $c->current_route
%= dumper $lets_data->{trt}

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module localnetworks-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $c->stash("ret")

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module module-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
</p>

View File

@@ -4,8 +4,9 @@
<font class="sme-copyright">
% if ( $c->is_logged_in ) {
SME Server <%= session 'releaseVersion' %>-<%= $c->app->VERSION %> Manager II
(Mojo:<%= Mojolicious->VERSION %>)
% }
<br>Copyright 1999-2006 Mitel Corporation<br>
%= session 'copyRight'
<br>Copyright (c) 2013-2024 Koozali Foundation Inc.<br>
</font>
</font>

View File

@@ -8,9 +8,9 @@
Warning: a reconfigure and reboot is required before proceeding! Failure to do so now
may leave your system in an unknown state!</h5></div>
<% } %>
<% if ( $c->session->{Access} eq 'public' && (($config->{debug} ne '0') || ($config->{mode} ne 'production')) ) { %>
<% if ( $c->session->{Access} eq 'public' && ((config->{debug} ne '0') || (config->{mode} ne 'production')) ) { %>
<div class="sme-error"><h5>
Warning: Development or debug mode enabled AND public access is offered !
</h5></div>
<% } %>
</div>
</div>

View File

@@ -7,7 +7,7 @@
SelectInput();
};
</script>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<pre>
%= dumper $lets_data
</pre>

View File

@@ -7,7 +7,7 @@
SelectInput();
};
</script>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<pre>
%= dumper $lets_data
</pre>

View File

@@ -7,7 +7,7 @@
SelectInput();
};
</script>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<pre>
%= dumper $lets_data
</pre>

View File

@@ -7,7 +7,7 @@
SelectInput();
};
</script>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<pre>
%= dumper $lets_data
</pre>

View File

@@ -7,7 +7,7 @@
SelectInput();
};
</script>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<pre>
%= dumper $lets_data
</pre>

View File

@@ -30,7 +30,7 @@
% my $btn = l('ADD');
% my $network_db = esmith::NetworksDB->open();
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $c->stash("ret")

View File

@@ -5,7 +5,7 @@
% my $subnet = $ln_datas->{subnet};
% my $router = $ln_datas->{router};
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $c->stash("ret")

View File

@@ -7,7 +7,7 @@
% unless (length($retref)) {%ret = (ret=>"");}
% else {%ret = %$retref;}
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper "Ret:".$ret{ret};
</p>

View File

@@ -29,7 +29,7 @@
<br />
% my $btn = l('ADD');
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $c->stash("ret")

View File

@@ -8,7 +8,7 @@
% my $cmmnt = $pf_datas->{cmmnt};
% my $allow = $pf_datas->{allow};
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $c->stash("ret")

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module portforwarding-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper "<pf>".$c->current_route
%= dumper $c->stash("ret")

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module printers-panel'>
%if ($config->{debug} == 1) {
%if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $prt_datas

View File

@@ -2,7 +2,7 @@
% content_for 'module' => begin
<div id='module' class='module proxy-panel'>
%if ($config->{debug} == 1) {
%if (config->{debug} == 1) {
<p>(DBG)route: <%= $c->current_route %><br>
(DBG)ht stat: <%= $prx_datas->{http_proxy_status}%> <br>
(DBG)sm stat: <%=$prx_datas->{smtp_proxy_status} %>

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module pseudonyms-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $pse_datas

View File

@@ -2,7 +2,7 @@
% content_for 'module' => begin
<div id='module' class='module qmailanalog-panel'>
%if ($config->{debug} == 1) {
%if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>
</p>

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module quota-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $quo_datas

View File

@@ -4,7 +4,7 @@
<div id='module' class='module reboot-panel'>
%if ($config->{debug} == 1) {
%if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>
</p>

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module remoteaccess-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $rma_datas

View File

@@ -4,7 +4,7 @@
<div id='roundcube' class='roundcube roundcube-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
</p>

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module useraccounts-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $usr_datas

View File

@@ -4,7 +4,7 @@
<div id='module' class='module userpassword-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $pwd_datas

View File

@@ -2,7 +2,7 @@
% content_for 'module' => begin
<div id='module' class='module viewlogfiles-panel'>
%if ($config->{debug} == 1) {
%if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>
</p>

View File

@@ -4,7 +4,7 @@
<div id='module' class='module viewlogfiles2-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>
(DBG)trt: <%= $log_datas->{trt} %><br>

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module workgroup-panel'>
%if ($config->{debug} == 1) {
%if (config->{debug} == 1) {
<p>
(DBG)route: <%= $c->current_route %><br>
(DBG)pdc: <%= $wkg_datas->{ServerRole}%><br>

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module yum-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $yum_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module yumconfig-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $yum_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module yuminstall-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $yum_datas

View File

@@ -7,7 +7,7 @@
% content_for 'module' => begin
<div id='module' class='module yumlogfile-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $yum_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module yumpostupg-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $yum_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module yumremove-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $yum_datas

View File

@@ -3,7 +3,7 @@
% content_for 'module' => begin
<div id='module' class='module yumupdate-panel'>
% if ($config->{debug} == 1) {
% if (config->{debug} == 1) {
<p>
%= dumper $c->current_route
%= dumper $yum_datas

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 42
%define release 44
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@@ -115,6 +115,15 @@ true
%defattr(-,root,root)
%changelog
* Fri Jan 24 2025 Brian Read <brianr@koozali.org> 11.0.0-44.sme
- Change to network-online for systemd startup to make sure network is up [SME: 12758]
* Thu Jan 23 2025 Brian Read <brianr@koozali.org> 11.0.0-43.sme
- fix access to config file though config plugin for mojo 9.39 [SME: 12885]
- Fix password setting for useraccounts and also adjust DB opens
- Add mojo version to footer for logged in [SME: 12886]
- Fix up css for red error message when multiline [SME: 12802]
* Fri Jan 17 2025 Brian Read <brianr@koozali.org> 11.0.0-42.sme
- Implement password visibility icon - [SME: 12803]