Form: version nicht mehr in $::form cachen

diff --git a/SL/Form.pm b/SL/Form.pm
index 48a03887d19cf23cbc155a079c4da5b908e1d562..43a3a39cb8946beee8d9c18b2526d066dede81fa 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -110,8 +110,6 @@ sub new {
 
   bless $self, $type;
 
 
   bless $self, $type;
 

-  $self->{version} = $self->read_version;
-

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


@@ -183,7 +181,7 @@ sub flatten_standard_variables {
   $main::lxdebug->enter_sub(2);
 
   my $self      = shift;
   $main::lxdebug->enter_sub(2);
 
   my $self      = shift;

-  my %skip_keys = map { $_ => 1 } (qw(login password header stylesheet titlebar version), @_);
+  my %skip_keys = map { $_ => 1 } (qw(login password header stylesheet titlebar), @_);

 
   my @variables;
 
 
   my @variables;
 


@@ -470,7 +468,7 @@ sub header {
   ), "jquery/ui/i18n/jquery.ui.datepicker-$::myconfig{countrycode}");
 
   $self->{favicon} ||= "favicon.ico";
   ), "jquery/ui/i18n/jquery.ui.datepicker-$::myconfig{countrycode}");
 
   $self->{favicon} ||= "favicon.ico";

-  $self->{titlebar} = join ' - ', grep $_, $self->{title}, $self->{login}, $::myconfig{dbname}, $self->{version} if $self->{title} || !$self->{titlebar};
+  $self->{titlebar} = join ' - ', grep $_, $self->{title}, $self->{login}, $::myconfig{dbname}, $self->read_version if $self->{title} || !$self->{titlebar};

 
   # build includes
   if ($self->{refresh_url} || $self->{refresh_time}) {
 
   # build includes
   if ($self->{refresh_url} || $self->{refresh_time}) {


@@ -564,7 +562,7 @@ sub set_standard_title {
   $::lxdebug->enter_sub;
   my $self = shift;
 
   $::lxdebug->enter_sub;
   my $self = shift;
 

-  $self->{titlebar}  = "kivitendo " . $::locale->text('Version') . " $self->{version}";
+  $self->{titlebar}  = "kivitendo " . $::locale->text('Version') . " " . $self->read_version;

   $self->{titlebar} .= "- $::myconfig{name}"   if $::myconfig{name};
   $self->{titlebar} .= "- $::myconfig{dbname}" if $::myconfig{name};
 
   $self->{titlebar} .= "- $::myconfig{name}"   if $::myconfig{name};
   $self->{titlebar} .= "- $::myconfig{dbname}" if $::myconfig{name};
 


@@ -1129,7 +1127,7 @@ sub send_email {
   my $mail = Mailer->new;
 
   map { $mail->{$_} = $self->{$_} }
   my $mail = Mailer->new;
 
   map { $mail->{$_} = $self->{$_} }

-    qw(cc subject message version format);
+    qw(cc subject message format);

 
   $mail->{bcc}    = $self->get_bcc_defaults($myconfig, $self->{bcc});
   $mail->{to}     = $self->{EMAIL_RECIPIENT} ? $self->{EMAIL_RECIPIENT} : $self->{email};
 
   $mail->{bcc}    = $self->get_bcc_defaults($myconfig, $self->{bcc});
   $mail->{to}     = $self->{EMAIL_RECIPIENT} ? $self->{EMAIL_RECIPIENT} : $self->{email};

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 87b3dfc86cc08778d3735d9ae349bed0c8559634..b7932457b938cf5be583f4959b65236ea9427a89 100644 (file)
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -34,6 +34,7 @@ use SL::DB::EmailJournal;
 use SL::DB::EmailJournalAttachment;
 use SL::DB::Employee;
 use SL::Template;
 use SL::DB::EmailJournalAttachment;
 use SL::DB::Employee;
 use SL::Template;

+use SL::Version;

 
 use strict;
 
 
 use strict;
 


@@ -87,7 +88,7 @@ sub _create_message_id {
   $domain     =~ s/.*\@//;
   $domain     =~ s/>.*//;
 
   $domain     =~ s/.*\@//;
   $domain     =~ s/>.*//;
 

-  return  "kivitendo-$self->{version}-" . time() . "-${$}-${num_sent}\@$domain";
+  return  "kivitendo-" . SL::Version->get_version . "-" . time() . "-${$}-${num_sent}\@$domain";

 }
 
 sub _create_address_headers {
 }
 
 sub _create_address_headers {


@@ -234,7 +235,7 @@ sub send {
   $self->{headers}       =  [
     Subject              => $self->{subject},
     'Message-ID'         => '<' . $self->_create_message_id . '>',
   $self->{headers}       =  [
     Subject              => $self->{subject},
     'Message-ID'         => '<' . $self->_create_message_id . '>',

-    'X-Mailer'           => "kivitendo $self->{version}",
+    'X-Mailer'           => "kivitendo " . SL::Version->get_version,

   ];
   $self->{mail_attachments} = [];
   $self->{content_by_name}  = $::instance_conf->get_email_journal == 1 && $::instance_conf->get_doc_files;
   ];
   $self->{mail_attachments} = [];
   $self->{content_by_name}  = $::instance_conf->get_email_journal == 1 && $::instance_conf->get_doc_files;

diff --git a/templates/webpages/login/company_logo.html b/templates/webpages/login/company_logo.html
index bfb40167af470fc0f5be3ed95b69c259f480f607..95c6eca5fbc65adf862e8850a35e4161b791fe0e 100644 (file)
--- a/templates/webpages/login/company_logo.html
+++ b/templates/webpages/login/company_logo.html
@@ -9,7 +9,7 @@
  <center>
   <a class="nomobile" href="http://www.kivitendo.de" target="_top"><img src="image/kivitendo[% xmas %].png" class='kivitendo-logo' border="0" alt='[% 'kivitendo' | $T8 %]' title="[% 'kivitendo Homepage' | $T8 %]"></a>
 
  <center>
   <a class="nomobile" href="http://www.kivitendo.de" target="_top"><img src="image/kivitendo[% xmas %].png" class='kivitendo-logo' border="0" alt='[% 'kivitendo' | $T8 %]' title="[% 'kivitendo Homepage' | $T8 %]"></a>
 

-  <h3 class="login">[% 'kivitendo' | $T8 %] [% version %]</h3>
+  <h3 class="login">[% 'kivitendo' | $T8 %] [% FORM.read_version %]</h3>

 
 [%- IF git_head %]
   <p>[%- LxERP.t8("Git revision: #1, #2 #3", git_head.hash.substr(0, 7), git_head.author_date.to_kivitendo, git_head.author_date.strftime('%H:%M:%S %Z')) %]</p>
 
 [%- IF git_head %]
   <p>[%- LxERP.t8("Git revision: #1, #2 #3", git_head.hash.substr(0, 7), git_head.author_date.to_kivitendo, git_head.author_date.strftime('%H:%M:%S %Z')) %]</p>