Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision d90b14b1

Von Sven Schöling vor etwa 7 Jahren hinzugefügt

  • ID d90b14b107fc7859eb0b197208276919ded2079d
  • Vorgänger 4a395995
  • Nachfolger 173d5a54

Form: version nicht mehr in $::form cachen

Unterschiede anzeigen:

SL/Form.pm
110 110 

  		




  111
  111
  
    
  bless $self, $type;


  		




  112
  112
  
    

  		




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


  		




  114
  
  
    

  		




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


  		




  116
  114
  
    

  		




  117
  115
  
    
  return $self;


  		




  ......




  183
  181
  
    
  $main::lxdebug->enter_sub(2);


  		




  184
  182
  
    

  		




  185
  183
  
    
  my $self      = shift;


  		




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


  		




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


  		




  187
  185
  
    

  		




  188
  186
  
    
  my @variables;


  		




  189
  187
  
    

  		




  ......




  470
  468
  
    
  ), "jquery/ui/i18n/jquery.ui.datepicker-$::myconfig{countrycode}");


  		




  471
  469
  
    

  		




  472
  470
  
    
  $self->{favicon} ||= "favicon.ico";


  		




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


  		




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


  		




  474
  472
  
    

  		




  475
  473
  
    
  # build includes


  		




  476
  474
  
    
  if ($self->{refresh_url} || $self->{refresh_time}) {


  		




  ......




  564
  562
  
    
  $::lxdebug->enter_sub;


  		




  565
  563
  
    
  my $self = shift;


  		




  566
  564
  
    

  		




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


  		




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


  		




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


  		




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


  		




  570
  568
  
    

  		




  ......




  1129
  1127
  
    
  my $mail = Mailer->new;


  		




  1130
  1128
  
    

  		




  1131
  1129
  
    
  map { $mail->{$_} = $self->{$_} }


  		




  1132
  
  
    
    qw(cc subject message version format);


  		




  
  1130
  
    
    qw(cc subject message format);


  		




  1133
  1131
  
    

  		




  1134
  1132
  
    
  $mail->{bcc}    = $self->get_bcc_defaults($myconfig, $self->{bcc});


  		




  1135
  1133
  
    
  $mail->{to}     = $self->{EMAIL_RECIPIENT} ? $self->{EMAIL_RECIPIENT} : $self->{email};


  		












  

    
      SL/Mailer.pm
    
  





  34
  34
  
    
use SL::DB::EmailJournalAttachment;


  		




  35
  35
  
    
use SL::DB::Employee;


  		




  36
  36
  
    
use SL::Template;


  		




  
  37
  
    
use SL::Version;


  		




  37
  38
  
    

  		




  38
  39
  
    
use strict;


  		




  39
  40
  
    

  		




  ......




  87
  88
  
    
  $domain     =~ s/.*\@//;


  		




  88
  89
  
    
  $domain     =~ s/>.*//;


  		




  89
  90
  
    

  		




  90
  
  
    
  return  "kivitendo-$self->{version}-" . time() . "-${$}-${num_sent}\@$domain";


  		




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


  		




  91
  92
  
    
}


  		




  92
  93
  
    

  		




  93
  94
  
    
sub _create_address_headers {


  		




  ......




  234
  235
  
    
  $self->{headers}       =  [


  		




  235
  236
  
    
    Subject              => $self->{subject},


  		




  236
  237
  
    
    'Message-ID'         => '<' . $self->_create_message_id . '>',


  		




  237
  
  
    
    'X-Mailer'           => "kivitendo $self->{version}",


  		




  
  238
  
    
    'X-Mailer'           => "kivitendo " . SL::Version->get_version,


  		




  238
  239
  
    
  ];


  		




  239
  240
  
    
  $self->{mail_attachments} = [];


  		




  240
  241
  
    
  $self->{content_by_name}  = $::instance_conf->get_email_journal == 1 && $::instance_conf->get_doc_files;


  		












  

    
      templates/webpages/login/company_logo.html
    
  





  9
  9
  
    
 <center>


  		




  10
  10
  
    
  <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>


  		




  11
  11
  
    

  		




  12
  
  
    
  <h3 class="login">[% 'kivitendo' | $T8 %] [% version %]</h3>


  		




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


  		




  13
  13
  
    

  		




  14
  14
  
    
[%- IF git_head %]


  		




  15
  15
  
    
  <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>


  		












Auch abrufbar als:  Unified diff