Versionsanzeige im Adminlogin nach forçiertem Logout fixen

diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm
index c1b2ec1e8ae5b41960cf51e43e7f6bd76aa056da..5fdc308fce0081915ace9c3969e1a4d1b52819b1 100644 (file)
--- a/SL/Controller/Admin.pm
+++ b/SL/Controller/Admin.pm
@@ -455,7 +455,7 @@ sub use_multiselect_js {
 sub login_form {
   my ($self, %params) = @_;
   $::request->layout->focus('#admin_password');
 sub login_form {
   my ($self, %params) = @_;
   $::request->layout->focus('#admin_password');

-  $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $::form->{version}), %params);
+  $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $::form->read_version), %params);

 }
 
 sub edit_user_form {
 }
 
 sub edit_user_form {

diff --git a/SL/Form.pm b/SL/Form.pm
index 330799766119ae84e94f0e69d49d0e0ef20a8466..8a82587e99e901e0618551905d9b97ebe396b3e4 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -86,6 +86,17 @@ sub disconnect_standard_dbh {
   undef $standard_dbh;
 }
 
   undef $standard_dbh;
 }
 

+sub read_version {
+  my ($self) = @_;
+
+  open VERSION_FILE, "VERSION";                 # New but flexible code reads version from VERSION-file
+  my $version =  <VERSION_FILE>;
+  $version    =~ s/[^0-9A-Za-z\.\_\-]//g; # only allow numbers, letters, points, underscores and dashes. Prevents injecting of malicious code.
+  close VERSION_FILE;
+
+  return $version;
+}
+

 sub new {
   $main::lxdebug->enter_sub();
 
 sub new {
   $main::lxdebug->enter_sub();
 


@@ -101,10 +112,7 @@ sub new {
 
   bless $self, $type;
 
 
   bless $self, $type;
 

-  open VERSION_FILE, "VERSION";                 # New but flexible code reads version from VERSION-file
-  $self->{version} =  <VERSION_FILE>;
-  close VERSION_FILE;
-  $self->{version}  =~ s/[^0-9A-Za-z\.\_\-]//g; # only allow numbers, letters, points, underscores and dashes. Prevents injecting of malicious code.
+  $self->{version} = $self->read_version;

 
   $main::lxdebug->leave_sub();
 
 
   $main::lxdebug->leave_sub();