* Tue Jan 28 2025 Brian Read <brianr@koozali.org> 11.0.0-47.sme

- Temp (we hope) remove CSRF protection plugin  [SME: ]
- Fix comparison in footer with config->mode

createlinks

@@ -45,6 +45,7 @@ for my $event ( qw( smeserver-manager-update smanager-refresh bootstrap-console-
     event_link('locales2-conf', "$event", '80');
 }
 
+event_link('post-upgrade-and-reboot','post-upgrade-and-reboot',80);
 event_link('systemd-default', "smeserver-manager-update", '88');
 event_link('systemd-reload', "smeserver-manager-update", '89');
 templates2events("/etc/rsyslog.conf", "smeserver-manager-update");

root/etc/e-smith/events/actions/post-upgrade-and-reboot

@@ -0,0 +1,3 @@
+#!/bin/bash
+/usr/sbin/e-smith/signal-event post-upgrade
+/usr/sbin/e-smith/signal-event reboot

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

@@ -224,12 +224,12 @@ sub setup_plugins {
     # CSRF protection if production mode
 #    $self->plugin('Mojolicious::Plugin::CSRFDefender' => {
 #   Adapted plugin for use with GET method
-    $self->plugin('SrvMngr::Plugin::CSRFDefender' => {
-	onetime => 1,
-	error_status => 400,
-	error_content => 'Error: CSRF token is invalid or outdated'
+    #$self->plugin('SrvMngr::Plugin::CSRFDefender' => {
+	#onetime => 1,
+	#error_status => 400,
+	#error_content => 'Error: CSRF token is invalid or outdated'
     	#error_template => 'csrf_400'
-	}) if ( $self->mode eq 'production' );
+	#}) if ( $self->mode eq 'production' );
 
     $self->plugin('SrvMngr::Plugin::I18N' => {namespace => 'SrvMngr::I18N', default => 'en'});
 
@@ -866,4 +866,4 @@ sub get_reg_mask {
 }
 
 
-1;
+1;

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

@@ -56,10 +56,11 @@ sub do_action {
 
             #    esmith::util::backgroundCommand( 1, "/sbin/e-smith/signal-event", "post-upgrade",
             #	    "; ", "/sbin/e-smith/signal-event", "reboot" );
-            system("/sbin/e-smith/signal-event", "post-upgrade") == 0
-                or die("Error occurred while running post-upgrade.\n");
-            system("/sbin/e-smith/signal-event", "reboot") == 0
-                or die("Error occurred while rebooting.\n");
+            esmith::util::backgroundCommand( 1, "/sbin/e-smith/signal-event", "post-upgrade-and-reboot");
+		    #system("/sbin/e-smith/signal-event", "post-upgrade") == 0
+		    #or die("Error occurred while running post-upgrade.\n");
+		    #system("/sbin/e-smith/signal-event", "reboot") == 0
+		    #or die("Error occurred while rebooting.\n");
         } ## end unless ($debug)
     } ## end elsif ($function eq 'reconfigure')
     $c->stash(title => $title, modul => $result);

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

@@ -17,7 +17,7 @@ use Locale::gettext;
 use SrvMngr::I18N;
 use SrvMngr qw(theme_list init_session);
 use esmith::ConfigDB;
-use Time::TAI64;
+#use Time::TAI64;
 use File::Basename;
 use HTML::Entities;
 use esmith::FormMagick qw(gen_locale_date_string);
@@ -104,10 +104,11 @@ sub do_action {
 sub timestamp2local {
     $_ = shift;
 
-    if (/^(\@[0-9a-f]{24})(.*)/s) {
-        return Time::TAI64::tai64nlocal($1) . $2;
-    } elsif (/^([0-9]{10}\.[0-9]{3})(.*)/s) {
-        return localtime($1) . $2;
+    #if (/^(\@[0-9a-f]{24})(.*)/s) {
+    #    return Time::TAI64::tai64nlocal($1) . $2;
+    #} els
+	if (/^([0-9]{10}\.[0-9]{3})(.*)/s) {
+		return localtime($1) . $2;
     }
     return $_;
 } ## end sub timestamp2local

root/usr/share/smanager/lib/SrvMngr/Model/Main.pm

@@ -43,8 +43,9 @@ sub init_data {
 sub reconf_needed {
 
     my $cdb = esmith::ConfigDB->open_ro() or die("can't open Config DB");
-    my $unsafe = ($cdb->get('bootstrap-console') and $cdb->get('bootstrap-console')->prop('Run') eq 'yes') ||
-         ($cdb->get('UnsavedChanges') and $cdb->get('UnsavedChanges')->value eq 'yes') || '0';
+    #my $unsafe = ($cdb->get('bootstrap-console') and $cdb->get('bootstrap-console')->prop('Run') eq 'yes') ||
+    #     ($cdb->get('UnsavedChanges') and $cdb->get('UnsavedChanges')->value eq 'yes') || '0';
+	my $unsafe = ($cdb->get('UnsavedChanges') and $cdb->get('UnsavedChanges')->value eq 'yes') || '0';   
     return $unsafe;
 }
 
@@ -104,5 +105,4 @@ sub check_adminalias {
 }
 
 
-1;
-
+1;

root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep

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

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

@@ -20,16 +20,15 @@
 
 	<p>
     %= $c->render_to_string(inline => $c->l('rbo_DESCRIPTION'))
-    <br>
+    <br><br>
 
 	<span class=label>
 	%=l 'rbo_LABEL_REBOOT'
 	</span>
-
 	<span class=data>
 	%= select_field 'function' => $c->rebootFunction_list()
 	</span>
-	</p>
+	</p><br>
 
 	%= submit_button "$btn", class => 'action'
 
@@ -38,4 +37,4 @@
     %= hidden_field 'debug' => '1'
 
 </div>
-%end
+%end

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

@@ -24,7 +24,7 @@
 	<span class=label>
 	%=l 'wkg_LABEL_WORKGROUP', class => 'label'
 	</span><span class=data>
-	%= text_field 'Workgroup' =>  $wkg_datas->{Workgroup}, class => 'input'
+	%= text_field 'Workgroup' =>  $wkg_datas->{Workgroup}, class => 'input' , pattern=>".{1,15}", title=>"Limited to 15 characters by the NETBIOS"
 	</span>
 	</p>
 	<p>
@@ -63,4 +63,4 @@
     % end    
 
 </div>
-%end
+%end

smeserver-manager.spec

@@ -2,7 +2,7 @@ Summary: Sme server  navigation module : manager 2
 %define name smeserver-manager
 Name: %{name}
 %define version 11.0.0
-%define release 44
+%define release 47
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -26,19 +26,47 @@ Requires: smeserver-lib >= 1.18.0-26
 Requires: smeserver-manager >= 2.4.0-22
 Requires: smeserver-apache >= 2.6.0-19
 Requires: smeserver-php >= 3.0.0-43
-Requires: perl(Mojolicious) >= 7.56
+#Requires: smeserver-manager-locale >= 11.0.0
+Requires: perl(Mojolicious) >= 8.42
 Requires: perl(Mojolicious::Plugin::I18N) >= 1.6
 Requires: perl(Mojolicious::Plugin::RenderFile) >= 0.12
 Requires: perl(Mojolicious::Plugin::CSRFDefender) >= 0.0.8
 Requires: perl(Net::Netmask) >= 1.9
 Requires: perl(DBM::Deep) >= 2.0011-1
 Requires: perl(Mojo::JWT) >= 0.08-1
+#Requires: perl(Time::TAI64) >= 2.11
 Requires: mutt >= 1.5.21
 Requires: smeserver-manager-jsquery >= 1.0
 Requires: smeserver-lib >= 11.0
 Requires: smeserver-certificates >= 11.0
 #Requires: js-jquery > 2.2.4-3 (optional)
 
+Requires: smeserver-manager-locale-bg
+Requires: smeserver-manager-locale-da
+Requires: smeserver-manager-locale-de
+Requires: smeserver-manager-locale-el
+Requires: smeserver-manager-locale-es
+Requires: smeserver-manager-locale-et
+Requires: smeserver-manager-locale-fr
+Requires: smeserver-manager-locale-he
+Requires: smeserver-manager-locale-hu
+Requires: smeserver-manager-locale-id
+Requires: smeserver-manager-locale-it
+Requires: smeserver-manager-locale-ja
+Requires: smeserver-manager-locale-nb
+Requires: smeserver-manager-locale-nl
+Requires: smeserver-manager-locale-pl
+Requires: smeserver-manager-locale-pt
+Requires: smeserver-manager-locale-pt_BR
+Requires: smeserver-manager-locale-ro
+Requires: smeserver-manager-locale-ru
+Requires: smeserver-manager-locale-sl
+Requires: smeserver-manager-locale-sv
+Requires: smeserver-manager-locale-th
+Requires: smeserver-manager-locale-tr
+Requires: smeserver-manager-locale-zh_CN
+Requires: smeserver-manager-locale-zh_TW
+
 Provides: server-manager
 AutoReqProv: no
 
@@ -115,6 +143,21 @@ true
 %defattr(-,root,root)
 
 %changelog
+* Tue Jan 28 2025 Brian Read <brianr@koozali.org> 11.0.0-47.sme
+- Temp (we hope) remove CSRF protection plugin  [SME: ]
+- Fix comparison in footer with config->mode 
+
+* Tue Jan 28 2025 Brian Read <brianr@koozali.org> 11.0.0-46.sme
+- Adjust conditions for showing "Reconfigure required" to only check UnSavedChanges DB entry [SME: 12891]
+- Add indication of development mode in footer
+
+* Sat Jan 25 2025 Brian Read <brianr@koozali.org> 11.0.0-45.sme
+- Add some space in the reboot/reconf/shutdown panel [SME: ]
+- Add check for 15 characters netbios name in workgroup panel [SME: ]
+- Add action for post-upgrade-and-reboot for reconfigure panel [SME: 12865]
+- Remove call to TAI64 in viewlogfiles as qmail specific format [SME: 12889]
+- Add requires to pull in all the locale translation [SME: 12757]
+
 * 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]