Compare commits
2 Commits
1_4-15_el8
...
master
Author | SHA1 | Date | |
---|---|---|---|
0ee3299f7e | |||
252ea1167e |
@@ -237,7 +237,7 @@ sub showInitial ($$)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
print $q->startform (-method => 'POST', -action => $q->url (-absolute => 1));
|
print $q->start_form (-method => 'POST', -action => $q->url (-absolute => 1));
|
||||||
|
|
||||||
my $mydom = @mydom;
|
my $mydom = @mydom;
|
||||||
if ($mydom == 0)
|
if ($mydom == 0)
|
||||||
@@ -548,7 +548,7 @@ sub confAWStats ($)
|
|||||||
|
|
||||||
esmith::cgi::genHeaderNonCacheable ($q, \%conf, 'Configure AWStats'.$version);
|
esmith::cgi::genHeaderNonCacheable ($q, \%conf, 'Configure AWStats'.$version);
|
||||||
|
|
||||||
print $q->startform (-method => 'POST',
|
print $q->start_form (-method => 'POST',
|
||||||
-action => $q->url (-absolute => 1));
|
-action => $q->url (-absolute => 1));
|
||||||
|
|
||||||
print $q->table ({border => 0, cellspacing => 0, cellpadding => 0},
|
print $q->table ({border => 0, cellspacing => 0, cellpadding => 0},
|
||||||
@@ -833,7 +833,7 @@ sub deleteStats ($)
|
|||||||
|
|
||||||
esmith::cgi::genHeaderNonCacheable ($q, \%conf, 'Delete statistics');
|
esmith::cgi::genHeaderNonCacheable ($q, \%conf, 'Delete statistics');
|
||||||
|
|
||||||
print $q->startform
|
print $q->start_form
|
||||||
(-method => 'POST', -action => $q->url (-absolute => 1));
|
(-method => 'POST', -action => $q->url (-absolute => 1));
|
||||||
|
|
||||||
my $domain = $q->param ('domain');
|
my $domain = $q->param ('domain');
|
||||||
@@ -850,7 +850,7 @@ sub deleteStats ($)
|
|||||||
-override => 1,
|
-override => 1,
|
||||||
-default => 'performDelete');
|
-default => 'performDelete');
|
||||||
|
|
||||||
print $q->endform;
|
print $q->end_form;
|
||||||
esmith::cgi::genFooter ($q);
|
esmith::cgi::genFooter ($q);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -922,7 +922,7 @@ sub modifyOptions ($$)
|
|||||||
print $q->hr;
|
print $q->hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
print $q->startform (-method => 'POST', -action => $q->url (-absolute => 1));
|
print $q->start_form (-method => 'POST', -action => $q->url (-absolute => 1));
|
||||||
|
|
||||||
# find system users
|
# find system users
|
||||||
my @userlist = ('admin','everyone');
|
my @userlist = ('admin','everyone');
|
||||||
|
@@ -26,12 +26,12 @@ use SrvMngr qw(theme_list init_session);
|
|||||||
|
|
||||||
use POSIX qw(strftime);
|
use POSIX qw(strftime);
|
||||||
|
|
||||||
use esmith::DomainsDB;
|
use esmith::DomainsDB::UTF8;
|
||||||
use esmith::ConfigDB;
|
use esmith::ConfigDB::UTF8;
|
||||||
|
|
||||||
|
|
||||||
our $ddb = esmith::DomainsDB->open || die "Couldn't open domains db";
|
my $ddb;
|
||||||
our $cdb = esmith::ConfigDB->open || die "Couldn't open configuration db";
|
my $cdb;
|
||||||
|
|
||||||
our $awsdirdata="/home/e-smith/files/users/admin/home/awstats";
|
our $awsdirdata="/home/e-smith/files/users/admin/home/awstats";
|
||||||
our $REGEXP_DOMAIN = qq([a-zA-Z0-9\-\.]+);
|
our $REGEXP_DOMAIN = qq([a-zA-Z0-9\-\.]+);
|
||||||
@@ -44,6 +44,9 @@ sub main {
|
|||||||
my %aws_datas = ();
|
my %aws_datas = ();
|
||||||
my $title = $c->l('aws_FORM_TITLE');
|
my $title = $c->l('aws_FORM_TITLE');
|
||||||
|
|
||||||
|
$ddb = esmith::DomainsDB::UTF8->open || die "Couldn't open domains db";
|
||||||
|
$cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open configuration db";
|
||||||
|
|
||||||
$aws_datas{trt} = 'LST';
|
$aws_datas{trt} = 'LST';
|
||||||
|
|
||||||
my $rec = $cdb->get('AWStats');
|
my $rec = $cdb->get('AWStats');
|
||||||
@@ -100,6 +103,9 @@ sub do_display {
|
|||||||
my $title = $c->l('aws_FORM_TITLE');
|
my $title = $c->l('aws_FORM_TITLE');
|
||||||
my $result;
|
my $result;
|
||||||
|
|
||||||
|
$ddb = esmith::DomainsDB::UTF8->open || die "Couldn't open domains db";
|
||||||
|
$cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open configuration db";
|
||||||
|
|
||||||
my $trt = $c->param('trt') || 'LST';
|
my $trt = $c->param('trt') || 'LST';
|
||||||
my $domain = $c->param('Domain');
|
my $domain = $c->param('Domain');
|
||||||
|
|
||||||
@@ -161,6 +167,9 @@ sub do_update {
|
|||||||
$aws_datas{trt} = $trt;
|
$aws_datas{trt} = $trt;
|
||||||
my ($res, $result) = '';
|
my ($res, $result) = '';
|
||||||
|
|
||||||
|
$ddb = esmith::DomainsDB::UTF8->open || die "Couldn't open domains db";
|
||||||
|
$cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open configuration db";
|
||||||
|
|
||||||
if ( $trt eq 'UPD' ) {
|
if ( $trt eq 'UPD' ) {
|
||||||
|
|
||||||
my $status = $c->param('Status');
|
my $status = $c->param('Status');
|
||||||
@@ -279,7 +288,7 @@ sub do_update {
|
|||||||
return $c->render( 'awstats' );
|
return $c->render( 'awstats' );
|
||||||
}
|
}
|
||||||
|
|
||||||
# $cdb = esmith::ConfigDB->open();
|
# $cdb = esmith::ConfigDB::UTF8->open();
|
||||||
|
|
||||||
my $message = "'AWStats configuration' update ($trt) DONE";
|
my $message = "'AWStats configuration' update ($trt) DONE";
|
||||||
$c->app->log->info($message);
|
$c->app->log->info($message);
|
||||||
@@ -352,4 +361,4 @@ sub language_options_list {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
1
|
1
|
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
%define realname smeserver-awstats
|
%define realname smeserver-awstats
|
||||||
%define version 1.4
|
%define version 1.4
|
||||||
%define release 15
|
%define release 17
|
||||||
|
|
||||||
Summary: SME Server integration rpm for awstats
|
Summary: SME Server integration rpm for awstats
|
||||||
Name: %{realname}
|
Name: %{realname}
|
||||||
@@ -26,6 +26,12 @@ AutoReqProv: no
|
|||||||
SME Server integration rpm for awstats.
|
SME Server integration rpm for awstats.
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 07 2025 Brian Read <brianr@koozali.org> 1.4-17.sme
|
||||||
|
- Apply change from startform to start_form and endform to end_form to CGI panels [SME: 12775-87]
|
||||||
|
|
||||||
|
* Fri Oct 03 2025 Brian Read <brianr@koozali.org> 1.4-16.sme
|
||||||
|
- Apply UTF8 to DomainDB and ConfigDB and fix potential caching problem [SME: 13209]
|
||||||
|
|
||||||
* Fri Oct 03 2025 Brian Read <brianr@koozali.org> 1.4-15.sme
|
* Fri Oct 03 2025 Brian Read <brianr@koozali.org> 1.4-15.sme
|
||||||
- Remove smanager-refresh from spec file [SME: 13212]
|
- Remove smanager-refresh from spec file [SME: 13212]
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user