projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exact match funktion wieder hergestellt nach dem letzten commit
[kivitendo-erp.git]
/
SL
/
AM.pm
diff --git
a/SL/AM.pm
b/SL/AM.pm
index
441a184
..
cf48de6
100644
(file)
--- a/
SL/AM.pm
+++ b/
SL/AM.pm
@@
-43,6
+43,7
@@
use Encode;
use List::MoreUtils qw(any);
use SL::DBUtils;
use SL::DB::AuthUser;
use List::MoreUtils qw(any);
use SL::DBUtils;
use SL::DB::AuthUser;
+use SL::DB::Default;
use SL::DB::Employee;
use strict;
use SL::DB::Employee;
use strict;
@@
-994,7
+995,7
@@
sub prepare_template_filename {
$filename =~ s|.*/||;
}
$display_filename = $filename;
$filename =~ s|.*/||;
}
$display_filename = $filename;
- $filename =
"$myconfig->{templates}
/$filename";
+ $filename =
SL::DB::Default->get->templates . "
/$filename";
}
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
@@
-1020,7
+1021,7
@@
sub load_template {
close(TEMPLATE);
}
close(TEMPLATE);
}
- $content = Encode::decode('utf-8-strict', $content)
if $::locale->is_utf8
;
+ $content = Encode::decode('utf-8-strict', $content);
$main::lxdebug->leave_sub();
$main::lxdebug->leave_sub();
@@
-1037,7
+1038,7
@@
sub save_template {
my $error = "";
if (open(TEMPLATE, ">", $filename)) {
my $error = "";
if (open(TEMPLATE, ">", $filename)) {
- $content = Encode::encode('utf-8-strict', $content)
if $::locale->is_utf8
;
+ $content = Encode::encode('utf-8-strict', $content);
$content =~ s/\r\n/\n/g;
print(TEMPLATE $content);
close(TEMPLATE);
$content =~ s/\r\n/\n/g;
print(TEMPLATE $content);
close(TEMPLATE);
@@
-1061,8
+1062,7
@@
sub save_preferences {
my $user = SL::DB::Manager::AuthUser->find_by(login => $form->{login});
$user->update_attributes(
config_values => {
my $user = SL::DB::Manager::AuthUser->find_by(login => $form->{login});
$user->update_attributes(
config_values => {
- map({ ($_ => $form->{$_}) } SL::DB::AuthUser::CONFIG_VARS()),
- map({ ($_ => do { my $v = $form->{$_}; $v =~ s/\r//g; $v }) } qw(address signature)),
+ map { ($_ => $form->{$_}) } SL::DB::AuthUser::CONFIG_VARS(),
});
$main::lxdebug->leave_sub();
});
$main::lxdebug->leave_sub();