projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gelöschte Benutzer in do/search ausblenden
[kivitendo-erp.git]
/
SL
/
User.pm
diff --git
a/SL/User.pm
b/SL/User.pm
index
75e7a38
..
5d58b5d
100644
(file)
--- a/
SL/User.pm
+++ b/
SL/User.pm
@@
-77,9
+77,9
@@
sub country_codes {
my @dir = grep(!/(^\.\.?$|\..*)/, readdir(DIR));
foreach my $dir (@dir) {
my @dir = grep(!/(^\.\.?$|\..*)/, readdir(DIR));
foreach my $dir (@dir) {
- next unless open(
FH
, "locale/$dir/LANGUAGE");
- @language = <
FH
>;
- close
FH
;
+ next unless open(
my $fh, '<:encoding(UTF-8)'
, "locale/$dir/LANGUAGE");
+ @language = <
$fh
>;
+ close
$fh
;
$cc{$dir} = "@language";
}
$cc{$dir} = "@language";
}
@@
-150,7
+150,7
@@
sub login {
}
# update the tables
}
# update the tables
- if (!open(FH, ">"
.
$::lx_office_conf{paths}->{userspath} . "/nologin")) {
+ if (!open(FH, ">"
,
$::lx_office_conf{paths}->{userspath} . "/nologin")) {
$form->show_generic_error($main::locale->text('A temporary file could not be created. ' .
'Please verify that the directory "#1" is writeable by the webserver.',
$::lx_office_conf{paths}->{userspath}),
$form->show_generic_error($main::locale->text('A temporary file could not be created. ' .
'Please verify that the directory "#1" is writeable by the webserver.',
$::lx_office_conf{paths}->{userspath}),
@@
-177,7
+177,6
@@
sub login {
$self->{"menustyle"} eq "v3" ? "menuv3.pl" :
$self->{"menustyle"} eq "neu" ? "menunew.pl" :
$self->{"menustyle"} eq "js" ? "menujs.pl" :
$self->{"menustyle"} eq "v3" ? "menuv3.pl" :
$self->{"menustyle"} eq "neu" ? "menunew.pl" :
$self->{"menustyle"} eq "js" ? "menujs.pl" :
- $self->{"menustyle"} eq "xml" ? "menuXML.pl" :
"menu.pl";
print $form->parse_html_template("dbupgrade/footer", { "menufile" => $menufile });
"menu.pl";
print $form->parse_html_template("dbupgrade/footer", { "menufile" => $menufile });
@@
-739,7
+738,7
@@
sub create_employee_entry {
do_query($form, $dbh, $query, ($self->{login}, $myconfig->{name}, $myconfig->{tel}, "user"));
} elsif ($update_existing) {
do_query($form, $dbh, $query, ($self->{login}, $myconfig->{name}, $myconfig->{tel}, "user"));
} elsif ($update_existing) {
- my $query = qq|UPDATE employee SET name = ?, workphone = ?, role = 'user' WHERE id = ?|;
+ my $query = qq|UPDATE employee SET name = ?, workphone = ?, role = 'user'
, deleted = 'f'
WHERE id = ?|;
do_query($form, $dbh, $query, $myconfig->{name}, $myconfig->{tel}, $id);
}
do_query($form, $dbh, $query, $myconfig->{name}, $myconfig->{tel}, $id);
}
@@
-752,7
+751,7
@@
sub config_vars {
my @conf = qw(address admin businessnumber company countrycode
currency dateformat dbconnect dbdriver dbhost dbport dboptions
dbname dbuser dbpasswd email fax name numberformat password
my @conf = qw(address admin businessnumber company countrycode
currency dateformat dbconnect dbdriver dbhost dbport dboptions
dbname dbuser dbpasswd email fax name numberformat password
- printer
role
sid signature stylesheet tel templates vclimit angebote
+ printer sid signature stylesheet tel templates vclimit angebote
bestellungen rechnungen anfragen lieferantenbestellungen einkaufsrechnungen
taxnumber co_ustid duns menustyle template_format default_media
default_printer_id copies show_form_details favorites
bestellungen rechnungen anfragen lieferantenbestellungen einkaufsrechnungen
taxnumber co_ustid duns menustyle template_format default_media
default_printer_id copies show_form_details favorites