Compare commits
4 Commits
1_4-28_el8
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 1a1f9d6bfe | |||
| 6fdbdbc1e8 | |||
| e702f5d2bc | |||
| 37a7f220f9 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,3 +2,4 @@
|
|||||||
*.log
|
*.log
|
||||||
*spec-20*
|
*spec-20*
|
||||||
*.tgz
|
*.tgz
|
||||||
|
*.tar.xz
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
contribs10
|
|
||||||
@@ -125,7 +125,7 @@ sub showInitial
|
|||||||
|
|
||||||
my $default_action = 'list-queues';
|
my $default_action = 'list-queues';
|
||||||
|
|
||||||
print $q->startform(
|
print $q->start_form(
|
||||||
-method => 'POST',
|
-method => 'POST',
|
||||||
-action => $q->url (-absolute => 1)
|
-action => $q->url (-absolute => 1)
|
||||||
),"\n";
|
),"\n";
|
||||||
@@ -165,7 +165,7 @@ sub showInitial
|
|||||||
-default => 'perform'
|
-default => 'perform'
|
||||||
),"\n";
|
),"\n";
|
||||||
|
|
||||||
print $q->endform,"\n";
|
print $q->end_form,"\n";
|
||||||
|
|
||||||
esmith::cgi::genFooter($fm);
|
esmith::cgi::genFooter($fm);
|
||||||
|
|
||||||
@@ -520,7 +520,7 @@ sub showDeleteMessageNumber ($)
|
|||||||
print $q->hidden (-name => 'msgid', -override => 1, -default => "$msgid");
|
print $q->hidden (-name => 'msgid', -override => 1, -default => "$msgid");
|
||||||
print $q->hidden (-name => 'function', -override => 1, -default => 'delete-message-number');
|
print $q->hidden (-name => 'function', -override => 1, -default => 'delete-message-number');
|
||||||
print $q->hidden (-name => 'queue', -override => 1, -default => "$queuetype");
|
print $q->hidden (-name => 'queue', -override => 1, -default => "$queuetype");
|
||||||
print $q->endform;
|
print $q->end_form;
|
||||||
|
|
||||||
esmith::cgi::genFooter ($q);
|
esmith::cgi::genFooter ($q);
|
||||||
return;
|
return;
|
||||||
@@ -555,7 +555,7 @@ sub showDeleteAltMessageNumber ($)
|
|||||||
print $q->hidden (-name => 'msgid', -override => 1, -default => "$msgid");
|
print $q->hidden (-name => 'msgid', -override => 1, -default => "$msgid");
|
||||||
print $q->hidden (-name => 'function', -override => 1, -default => 'delete-message-number');
|
print $q->hidden (-name => 'function', -override => 1, -default => 'delete-message-number');
|
||||||
print $q->hidden (-name => 'queue', -override => 1, -default => "$queuetype");
|
print $q->hidden (-name => 'queue', -override => 1, -default => "$queuetype");
|
||||||
print $q->endform;
|
print $q->end_form;
|
||||||
|
|
||||||
esmith::cgi::genFooter ($q);
|
esmith::cgi::genFooter ($q);
|
||||||
return;
|
return;
|
||||||
@@ -591,7 +591,7 @@ sub deleteMessageNumber ($)
|
|||||||
|
|
||||||
print $q->hidden (-name => 'state', -override => 1, -default => 'perform');
|
print $q->hidden (-name => 'state', -override => 1, -default => 'perform');
|
||||||
print $q->hidden (-name => 'function', -override => 1, -default => "$queuetype");
|
print $q->hidden (-name => 'function', -override => 1, -default => "$queuetype");
|
||||||
print $q->endform;
|
print $q->end_form;
|
||||||
|
|
||||||
esmith::cgi::genFooter ($q);
|
esmith::cgi::genFooter ($q);
|
||||||
return;
|
return;
|
||||||
@@ -626,7 +626,7 @@ sub deleteAltMessageNumber ($)
|
|||||||
|
|
||||||
print $q->hidden (-name => 'state', -override => 1, -default => 'perform');
|
print $q->hidden (-name => 'state', -override => 1, -default => 'perform');
|
||||||
print $q->hidden (-name => 'function', -override => 1, -default => "$queuetype");
|
print $q->hidden (-name => 'function', -override => 1, -default => "$queuetype");
|
||||||
print $q->endform;
|
print $q->end_form;
|
||||||
|
|
||||||
esmith::cgi::genFooter ($q);
|
esmith::cgi::genFooter ($q);
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -18,19 +18,20 @@ use warnings;
|
|||||||
use Mojo::Base 'Mojolicious::Controller';
|
use Mojo::Base 'Mojolicious::Controller';
|
||||||
|
|
||||||
use esmith::FormMagick qw(gen_locale_date_string);
|
use esmith::FormMagick qw(gen_locale_date_string);
|
||||||
use esmith::ConfigDB;
|
use esmith::ConfigDB::UTF8;
|
||||||
|
|
||||||
use Locale::gettext;
|
use Locale::gettext;
|
||||||
use SrvMngr::I18N;
|
use SrvMngr::I18N;
|
||||||
|
|
||||||
use SrvMngr qw(theme_list init_session);
|
use SrvMngr qw(theme_list init_session);
|
||||||
|
|
||||||
our $cdb = esmith::ConfigDB->open() || die 'Cannot open configuration base';
|
my $cdb;
|
||||||
|
|
||||||
sub main {
|
sub main {
|
||||||
|
|
||||||
my $c = shift;
|
my $c = shift;
|
||||||
$c->app->log->info($c->log_req);
|
$c->app->log->info($c->log_req);
|
||||||
|
$cdb = esmith::ConfigDB::UTF8->open() || die 'Cannot open configuration base';
|
||||||
|
|
||||||
my %qmh_datas = ();
|
my %qmh_datas = ();
|
||||||
my $title = $c->l('qmh_QMH_TITLE');
|
my $title = $c->l('qmh_QMH_TITLE');
|
||||||
@@ -47,6 +48,7 @@ sub do_update {
|
|||||||
|
|
||||||
my $c = shift;
|
my $c = shift;
|
||||||
$c->app->log->info($c->log_req);
|
$c->app->log->info($c->log_req);
|
||||||
|
$cdb = esmith::ConfigDB::UTF8->open() || die 'Cannot open configuration base';
|
||||||
|
|
||||||
my %qmh_datas = ();
|
my %qmh_datas = ();
|
||||||
my $result = "";
|
my $result = "";
|
||||||
@@ -118,6 +120,7 @@ sub do_update {
|
|||||||
sub reportType_list {
|
sub reportType_list {
|
||||||
|
|
||||||
my $c = shift;
|
my $c = shift;
|
||||||
|
$cdb = esmith::ConfigDB::UTF8->open() || die 'Cannot open configuration base';
|
||||||
|
|
||||||
my $rec = $cdb->get('altqmail');
|
my $rec = $cdb->get('altqmail');
|
||||||
my $altqmail = ($cdb->get('altqmail')->value || 0) if $rec;
|
my $altqmail = ($cdb->get('altqmail')->value || 0) if $rec;
|
||||||
@@ -145,6 +148,7 @@ sub reportType_list {
|
|||||||
sub showListQueues {
|
sub showListQueues {
|
||||||
|
|
||||||
my ($c, $altq) = @_;
|
my ($c, $altq) = @_;
|
||||||
|
$cdb = esmith::ConfigDB::UTF8->open() || die 'Cannot open configuration base';
|
||||||
|
|
||||||
my $out = '';
|
my $out = '';
|
||||||
my $reporttype = 'list-queues';
|
my $reporttype = 'list-queues';
|
||||||
@@ -174,6 +178,7 @@ sub showListQueues {
|
|||||||
sub showListLocalQueue {
|
sub showListLocalQueue {
|
||||||
|
|
||||||
my ($c, $altq) = @_;
|
my ($c, $altq) = @_;
|
||||||
|
$cdb = esmith::ConfigDB::UTF8->open() || die 'Cannot open configuration base';
|
||||||
|
|
||||||
my $out = '';
|
my $out = '';
|
||||||
my $reporttype = 'list-local-queue';
|
my $reporttype = 'list-local-queue';
|
||||||
@@ -203,6 +208,7 @@ sub showListLocalQueue {
|
|||||||
sub showListRemoteQueue {
|
sub showListRemoteQueue {
|
||||||
|
|
||||||
my ($c, $altq) = @_;
|
my ($c, $altq) = @_;
|
||||||
|
$cdb = esmith::ConfigDB::UTF8->open() || die 'Cannot open configuration base';
|
||||||
|
|
||||||
my $out = '';
|
my $out = '';
|
||||||
my $reporttype = 'list-remote-queue';
|
my $reporttype = 'list-remote-queue';
|
||||||
@@ -232,6 +238,7 @@ sub showListRemoteQueue {
|
|||||||
sub resend {
|
sub resend {
|
||||||
|
|
||||||
my ($c, $altq) = @_;
|
my ($c, $altq) = @_;
|
||||||
|
$cdb = esmith::ConfigDB::UTF8->open() || die 'Cannot open configuration base';
|
||||||
|
|
||||||
my $out = '';
|
my $out = '';
|
||||||
my $reporttype = 'resend';
|
my $reporttype = 'resend';
|
||||||
@@ -279,6 +286,7 @@ sub AddLinks {
|
|||||||
sub showDeleteMessageNumber {
|
sub showDeleteMessageNumber {
|
||||||
|
|
||||||
my ($c, $msgid, $altq, $reporttype) = @_;
|
my ($c, $msgid, $altq, $reporttype) = @_;
|
||||||
|
$cdb = esmith::ConfigDB::UTF8->open() || die 'Cannot open configuration base';
|
||||||
|
|
||||||
if ($msgid =~ /^(\d+)$/) {
|
if ($msgid =~ /^(\d+)$/) {
|
||||||
$msgid = $1;
|
$msgid = $1;
|
||||||
@@ -326,4 +334,4 @@ sub deleteMessageNumber {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
1;
|
1;
|
||||||
Binary file not shown.
@@ -1,7 +1,7 @@
|
|||||||
%define name smeserver-qmHandle
|
%define name smeserver-qmHandle
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
%define version 1.4
|
%define version 1.4
|
||||||
%define release 28
|
%define release 32
|
||||||
Version: %{version}
|
Version: %{version}
|
||||||
Release: %{release}%{?dist}
|
Release: %{release}%{?dist}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
@@ -29,7 +29,16 @@ A panel for managing the Qmail queues using qmHandle
|
|||||||
(http://sourceforge.net/projects/qmhandle)
|
(http://sourceforge.net/projects/qmhandle)
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Sep 23 2025 Brian Read <brianr@koozali.org> 1.4-28.sme
|
* Tue Oct 07 2025 Brian Read <brianr@koozali.org> 1.4-32.sme
|
||||||
|
- Apply change from startform to start_form and endform to end_form to CGI panels [SME: 12775-87]
|
||||||
|
|
||||||
|
* Mon Oct 06 2025 Brian Read <brianr@koozali.org> 1.4-31.sme
|
||||||
|
- Add UTF8 and avoid potential DB caching problems [SME: 13209]
|
||||||
|
|
||||||
|
* Sat Oct 04 2025 Brian Read <brianr@koozali.org> 1.4-30.sme
|
||||||
|
- Remove smanager-refresh from spec file [SME: 13212]
|
||||||
|
|
||||||
|
* Tue Sep 23 2025 Brian Read <brianr@koozali.org> 1.4-29.sme
|
||||||
- Change $config to config in layout file(s) [SME: 13171]
|
- Change $config to config in layout file(s) [SME: 13171]
|
||||||
|
|
||||||
* Sun Sep 08 2024 fix-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 1.4-27.sme
|
* Sun Sep 08 2024 fix-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 1.4-27.sme
|
||||||
@@ -143,10 +152,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
#/etc/e-smith/events/actions/navigation-conf >/dev/null 2>&1
|
#/etc/e-smith/events/actions/navigation-conf >/dev/null 2>&1
|
||||||
|
|
||||||
if (systemctl list-unit-files |grep smanager) then
|
|
||||||
echo "Smanager restart in spec file"
|
|
||||||
/sbin/e-smith/signal-event smanager-refresh;
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
|
|||||||
Reference in New Issue
Block a user