name is also defined in makefile

- Add UTF8 and avoid potential DB caching problems [SME: 13209]

.gitignore

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

Makefile

@@ -1,6 +1,6 @@
 # Makefile for source rpm: smeserver-domains
 # $Id: Makefile,v 1.1 2020/06/10 08:54:29 brianr Exp $
-NAME := smeserver-domains
+NAME := smeserver-domains-advanced
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common

README.md

@@ -1,15 +1,19 @@
-# <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> smeserver-domains
+# <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> smeserver-domains-advanced
 
-SMEServer Koozali developed git repo for smeserver-domains smecontribs
+SMEServer Koozali developed git repo for smeserver-domains-advanced smecontribs
 
 ## Wiki
-<br />https://wiki.koozali.org/Lat-domains
-<br />https://wiki.koozali.org/Domains
-<br />https://wiki.koozali.org/Koozali_Foundation_Domains
-<br />https://wiki.koozali.org/Esmith::FormMagick::Panel::domains
+<br />https://wiki.koozali.org/Domains_Advanced
 
 ## Bugzilla
-Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-domains&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-domains-advanced&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-domains-advanced&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-domains-advanced&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-domains-advanced&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-domains-advanced&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-domains-advanced&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-domains-advanced&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)  
 
 ## Description
 

createlinks

@@ -1,7 +1,7 @@
 #! /usr/bin/perl -w
 use esmith::Build::CreateLinks qw(:all);
 # our event specific for updating with yum without reboot
-$event = 'smeserver-domains-update';
+$event = 'smeserver-domains-advanced-update';
 #add here the path to your templates needed to expand
 #see the /etc/systemd/system-preset/49-koozali.preset should be present for systemd integration on all you yum update event
 

root/etc/e-smith/web/functions/dungog-domains

@@ -131,7 +131,7 @@ sub showInitial ($$)
         print $q->hr;
     }
 
-    print $q->startform (-method => 'POST', -action => $q->url (-absolute => 1));
+    print $q->start_form (-method => 'POST', -action => $q->url (-absolute => 1));
 
     print $q->p ('Set pseudonyms for a single domain,<br>
                   This panel just shows the pseudonyms for a single domain.<br>
@@ -189,7 +189,7 @@ sub showInitial ($$)
 
     print $q->hidden (-name => 'MailServer', -override => 1, -default => 'skipMS');
     print $q->hidden (-name => 'state', -override => 1, -default => 'save');
-    print $q->endform;
+    print $q->end_form;
     print $q->p ($q->hr, $q->font ({size => "-1"}, "Copyright dungog.net"));
 
     print '</FONT>';
@@ -218,7 +218,7 @@ sub modifyOptions ($$)
         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
     my @userlist = ('admin','everyone');
@@ -271,7 +271,7 @@ sub modifyOptions ($$)
     print $q->hidden (-name => 'domain', -override => 1, -default => $domain);
     print $q->hidden (-name => 'state',  -override => 1, -default => 'performModifyOptions');
 
-    print $q->endform;
+    print $q->end_form;
     print $q->p ($q->hr, $q->font ({size => "-1"}, "Copyright dungog.net"));
 
     print '</FONT>';
@@ -325,7 +325,7 @@ sub modifyEmail ($$)
         print $q->hr;
     }
 
-    print $q->startform (-method => 'POST', -action => $q->url (-absolute => 1));
+    print $q->start_form (-method => 'POST', -action => $q->url (-absolute => 1));
 
 
     #commom with userpanel
@@ -412,7 +412,7 @@ sub modifyEmail ($$)
     print $q->hidden (-name => 'state', -override => 1, -default => 'save');
     print $q->hidden (-name => 'domain', -override => 1, -default => $domain);
 
-    print $q->endform;
+    print $q->end_form;
     print $q->p ($q->hr, $q->font ({size => "-1"}, "Copyright dungog.net"));
 
     print '</FONT>';
@@ -480,7 +480,7 @@ sub editEmail ($$)
 
     my @sorted = sort @selected;
 
-    print $q->startform (-method => 'POST', -action => $q->url (-absolute => 1));
+    print $q->start_form (-method => 'POST', -action => $q->url (-absolute => 1));
 
     print $q->table ({border => 0, cellspacing => 0, cellpadding => 4},
 
@@ -508,7 +508,7 @@ sub editEmail ($$)
     print $q->hidden (-name => 'newuser', -override => 1, -default => $newuser);
     print $q->hidden (-name => 'state',   -override => 1, -default => 'performEmail');
 
-    print $q->endform;
+    print $q->end_form;
     print $q->p ($q->hr, $q->font ({size => "-1"}, "Copyright dungog.net"));
 
     print '</FONT>';
@@ -617,4 +617,4 @@ sub performSave ($)
 
     showInitial ($q, "Settings saved and email restarted.");
     #showInitial ($q, "Settings saved and email restarted." ,"$domain");
-}
+}

root/etc/e-smith/web/functions/userpanel-domains

@@ -177,7 +177,7 @@ sub showInitial ($$$)
         print $q->hr;
     }
 
-    print $q->startform (-method => 'POST', -action => $q->url (-absolute => 1));
+    print $q->start_form (-method => 'POST', -action => $q->url (-absolute => 1));
 
     #are there any ?
     my $domains = @domains;
@@ -343,7 +343,7 @@ sub editEmail ($$)
 
     my @sorted = sort @selected;
 
-    print $q->startform (-method => 'POST', -action => $q->url (-absolute => 1));
+    print $q->start_form (-method => 'POST', -action => $q->url (-absolute => 1));
 
     print $q->table ({border => 0, cellspacing => 0, cellpadding => 4},
 
@@ -371,7 +371,7 @@ sub editEmail ($$)
     print $q->hidden (-name => 'newuser', -override => 1, -default => $newuser);
     print $q->hidden (-name => 'state',   -override => 1, -default => 'performEmail');
 
-    print $q->endform;
+    print $q->end_form;
     print $q->p ($q->hr, $q->font ({size => "-1"}, "Copyright dungog.net"));
 
     print '</FONT>';
@@ -483,4 +483,4 @@ sub performSelect ($)
     my $swap = $q->param ('swap');
 
     showInitial ($q, "Domain switched to $swap" ,"$swap");
-}
+}

root/usr/share/smanager/lib/SrvMngr/Controller/Dungog_domains.pm

@@ -25,20 +25,17 @@ use SrvMngr qw(theme_list init_session);
 
 use Data::Dumper;
 use esmith::util;
-use esmith::HostsDB;
-use esmith::AccountsDB;
+use esmith::HostsDB::UTF8;
+use esmith::AccountsDB::UTF8;
 
-our $db  = esmith::ConfigDB->open();
-our $adb = esmith::AccountsDB->open();
+my $db  = esmith::ConfigDB::UTF8->open();
+my $adb = esmith::AccountsDB::UTF8->open();
 
 use constant FALSE => 0;
 use constant TRUE  => 1;
 
-our $domaindb = esmith::ConfigDB->open('/home/e-smith/db/domains')
-  or die "Unable to open domains db";
-
-our $dungogdb = esmith::ConfigDB->open('/home/e-smith/db/dungog')
-  or die("Unable to open dungog db");    #Created by rpm
+my $domaindb;
+my $dungogdb;   
   
 my %ddo_datas = ();
 
@@ -49,6 +46,11 @@ sub main {
     my $c = shift;
     $c->app->log->info( $c->log_req );
 
+	$db  = esmith::ConfigDB::UTF8->open();
+	$adb = esmith::AccountsDB::UTF8->open();
+	$domaindb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/domains') or die "Unable to open domains db";
+	$dungogdb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/dungog') or die("Unable to open dungog db");    #Created by rpm
+
     my $title     = $c->l('ddo_title');
     my $modul     = '';
 
@@ -80,6 +82,10 @@ sub do_Save {
     #
     my $c = shift;
     $c->app->log->info( $c->log_req );
+	$db  = esmith::ConfigDB::UTF8->open();
+	$adb = esmith::AccountsDB::UTF8->open();
+	$domaindb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/domains') or die "Unable to open domains db";
+	$dungogdb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/dungog') or die("Unable to open dungog db");    #Created by rpm
 
     my $title     = $c->l('ddo_title');
     my $modul     = '';
@@ -201,6 +207,10 @@ sub do_Email {
 
     my $c = shift;
     $c->app->log->info( $c->log_req );
+	$db  = esmith::ConfigDB::UTF8->open();
+	$adb = esmith::AccountsDB::UTF8->open();
+	$domaindb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/domains') or die "Unable to open domains db";
+	$dungogdb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/dungog') or die("Unable to open dungog db");    #Created by rpm
 
     my %ddo_datas = ();
     my $title     = $c->l('ddo_Email_Title');
@@ -227,6 +237,10 @@ sub do_Options {
 
     my $c = shift;
     $c->app->log->info( $c->log_req );
+	$db  = esmith::ConfigDB::UTF8->open();
+	$adb = esmith::AccountsDB::UTF8->open();
+	$domaindb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/domains') or die "Unable to open domains db";
+	$dungogdb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/dungog') or die("Unable to open dungog db");    #Created by rpm
 
     my $title     = $c->l('ddo_modify_options_TITLE');
     my $modul     = '';
@@ -272,6 +286,8 @@ sub do_DelPseudo {
     #
     my $c = shift;
     $c->app->log->info( $c->log_req );
+	$db  = esmith::ConfigDB::UTF8->open();
+	$adb = esmith::AccountsDB::UTF8->open();
 
     my $title     = $c->l('ddo_title');
     my $modul     = '';
@@ -297,6 +313,8 @@ sub do_AddPseudo {
 
     my $c = shift;
     $c->app->log->info( $c->log_req );
+	$db  = esmith::ConfigDB::UTF8->open();
+	$adb = esmith::AccountsDB::UTF8->open();
 
     my $title     = $c->l('ddo_Edit_Title');
     my $modul     = '';
@@ -404,4 +422,4 @@ sub get_accts {
     return sort @selected;
 }
 
-1;
+1;

root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Dungog_domains/domains_en.lex

@@ -1,12 +1,3 @@
-package SrvMngr::I18N::Modules::Dungog_domains::en;
-use strict;
-use warnings;
-use utf8;
-use Mojo::Base 'SrvMngr::I18N';
-
-use SrvMngr::I18N::Modules::General::en;
-
-my %lexicon = (
 'ddo_title' =>'Domain Pseudonyms',
 'ddo_Final_Save' => 'Settings saved and email restarted.',
 'ddo_Intro' => 'Set pseudonyms specifically for a single domain,<br>This panel just shows the pseudonyms for a each single domain.<br>See also the <a href="/smanager/pseudonyms">Pseudonyms</a> panel to set global pseudonyms.<br>Documentation: <a href="https://wiki.contribs.org/Domains">https://wiki.contribs.org/Domains</a>',
@@ -52,14 +43,3 @@ For full access delegate this panel, dungog-domains.',
 'ddo_alternative_admin' => 'Alternative administrator:',
 'ddo_restrict_to_group'=>'Restrict the userlist in the email dropdown box to the Administrator or members of a group',
 'ddo_Alternative_group'=>'Alternative group:'
-
-
-);
-
-our %Lexicon = (
-	%{ SrvMngr::I18N::Modules::General::en::Lexicon },
-	%lexicon
-);
-
-
-1;

root/usr/share/smanager/themes/default/templates/dungog_domains.html.ep

@@ -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
 	</p>

smeserver-domains-advanced.spec

@@ -1,6 +1,6 @@
-%define name smeserver-domains
-%define version 1.4
-%define release 8
+%define name smeserver-domains-advanced
+%define version 11.0
+%define release 1
 Summary: SMEserver rpm for domain pseudonyms
 Name: %{name}
 Version: %{version}
@@ -15,13 +15,32 @@ Packager: Stephen Noble <stephen@dungog.net>
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildArchitectures: noarch
 BuildRequires: smeserver-devtools
-Requires: smeserver-release >= 8
+Requires: smeserver-release >= 11
 AutoReqProv: no
 
 %description
 SMEserver rpm for more advanced domain controls
 
 %changelog
+* Wed Oct 08 2025 Trevor Batley <trevor@batley.id.au> 11.0-1.sme
+- Rename to smeserver-domains-advanced as it conflicts with core package name [SME: 13219]
+- Update versioning to show it's an 11.0 package
+
+* Sun Oct 05 2025 Brian Read <brianr@koozali.org> 1.4-13.sme
+- Add UTF8 and avoid potential DB caching problems [SME: 13209]
+
+* Sat Oct 04 2025 Brian Read <brianr@koozali.org> 1.4-12.sme
+- Delete en.pm and create .lex file if needed [SME: 13214]
+
+* Sat Oct 04 2025 Brian Read <brianr@koozali.org> 1.4-11.sme
+- Remove smanager-refresh from spec file [SME: 13212]
+
+* Wed Sep 24 2025 Brian Read <brianr@koozali.org> 1.4-10.sme
+- Sort out archive on git stopping local archive update [SME: 13171]
+
+* Tue Sep 23 2025 Brian Read <brianr@koozali.org> 1.4-9.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-8.sme
 - Fix e-smith references in smeserver-domains [SME: 12732]
 
@@ -88,10 +107,6 @@ if [ $1 = 1 ] ; then
  /bin/touch /home/e-smith/db/dungog
 fi
 
-if (systemctl list-unit-files |grep smanager) then
-  echo "Smanager restart in spec file"
-  /sbin/e-smith/signal-event smanager-refresh;
-fi