6 Commits

Author SHA1 Message Date
252ea1167e * 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]
2025-10-03 15:52:35 +01:00
6062ddd8c8 * Fri Oct 03 2025 Brian Read <brianr@koozali.org> 1.4-15.sme
- Remove smanager-refresh from spec file [SME: 13212]
2025-10-03 13:27:53 +01:00
28c248e0f8 * Wed Sep 24 2025 Brian Read <brianr@koozali.org> 1.4-14.sme
- Sort out archive on git stopping local archive update [SME: 13171]
2025-09-24 14:05:20 +01:00
b736c47e3f * Tue Sep 23 2025 Brian Read <brianr@koozali.org> 1.4-13.sme
- Change $config to config in layout file(s) [SME: 13171]
2025-09-23 13:05:58 +01:00
3643affbfe Update README with specific Bugzilla links 2024-10-27 15:41:06 +00:00
Trevor Batley
2cd246017d fix-e-smith-pkg script (#12732) 2024-09-08 17:41:43 +10:00
5 changed files with 43 additions and 16 deletions

2
.gitignore vendored
View File

@@ -1,4 +1,4 @@
*.rpm
*.log
*spec-20*
*.tar.gz
*.tar.xz

View File

@@ -7,7 +7,14 @@ SMEServer Koozali developed git repo for smeserver-awstats smecontribs
<br />https://wiki.koozali.org/Qmail_Statistics_(AWStats)
## Bugzilla
Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-awstats&product=SME%20Contribs&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
Show list of outstanding bugs:
[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&classification=Contribs&component=smeserver-awstats&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&classification=Contribs&component=smeserver-awstats&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&classification=Contribs&component=smeserver-awstats&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[Need Info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&classification=Contribs&component=smeserver-awstats&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[In Progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&classification=Contribs&component=smeserver-awstats&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&classification=Contribs&component=smeserver-awstats&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&classification=Contribs&component=smeserver-awstats&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
## Description

View File

@@ -26,12 +26,12 @@ use SrvMngr qw(theme_list init_session);
use POSIX qw(strftime);
use esmith::DomainsDB;
use esmith::ConfigDB;
use esmith::DomainsDB::UTF8;
use esmith::ConfigDB::UTF8;
our $ddb = esmith::DomainsDB->open || die "Couldn't open domains db";
our $cdb = esmith::ConfigDB->open || die "Couldn't open configuration db";
my $ddb;
my $cdb;
our $awsdirdata="/home/e-smith/files/users/admin/home/awstats";
our $REGEXP_DOMAIN = qq([a-zA-Z0-9\-\.]+);
@@ -44,6 +44,9 @@ sub main {
my %aws_datas = ();
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';
my $rec = $cdb->get('AWStats');
@@ -100,6 +103,9 @@ sub do_display {
my $title = $c->l('aws_FORM_TITLE');
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 $domain = $c->param('Domain');
@@ -161,6 +167,9 @@ sub do_update {
$aws_datas{trt} = $trt;
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' ) {
my $status = $c->param('Status');
@@ -279,7 +288,7 @@ sub do_update {
return $c->render( 'awstats' );
}
# $cdb = esmith::ConfigDB->open();
# $cdb = esmith::ConfigDB::UTF8->open();
my $message = "'AWStats configuration' update ($trt) DONE";
$c->app->log->info($message);
@@ -352,4 +361,4 @@ sub language_options_list {
}
1
1

View File

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

View File

@@ -4,7 +4,7 @@
%define realname smeserver-awstats
%define version 1.4
%define release 11
%define release 16
Summary: SME Server integration rpm for awstats
Name: %{realname}
@@ -16,8 +16,8 @@ Source: %{name}-%{version}.tar.xz
BuildRoot: /var/tmp/%{name}-%{version}
URL: https://wiki.koozali.org/AWStats
BuildArchitectures: noarch
BuildRequires: e-smith-devtools >= 1.13.1-03
Requires: e-smith-release >= 10
BuildRequires: smeserver-devtools >= 1.13.1-03
Requires: smeserver-release >= 10
Requires: awstats >= 6.5
Requires: perl(POSIX)
AutoReqProv: no
@@ -26,6 +26,21 @@ AutoReqProv: no
SME Server integration rpm for awstats.
%changelog
* 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
- Remove smanager-refresh from spec file [SME: 13212]
* Wed Sep 24 2025 Brian Read <brianr@koozali.org> 1.4-14.sme
- Sort out archive on git stopping local archive update [SME: 13171]
* Tue Sep 23 2025 Brian Read <brianr@koozali.org> 1.4-13.sme
- 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-12.sme
- Fix e-smith references in smeserver-awstats [SME: 12732]
* Sat Sep 07 2024 cvs2git.sh aka Brian Read <brianr@koozali.org> 1.4-11.sme
- Roll up patches and move to git repo [SME: 12338]
@@ -201,10 +216,6 @@ rm -rf %{name}-%{version}
%pre
%post
if (systemctl list-unit-files |grep smanager) then
echo "Smanager restart in spec file"
/sbin/e-smith/signal-event smanager-refresh;
fi
%preun