X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/bbc9fa5eef6ad9cfadb370029cab8429fb82de88..9f055edb25f912aa2cb3dfd8e8a4cf20703f75a2:/bin/mozilla/admin.pl
diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 2632aff07..32922a274 100644
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -164,6 +164,10 @@ sub add_user {
}
$myconfig->{vclimit} = 200;
+ $myconfig->{"countrycode"} = "de";
+ $myconfig->{"numberformat"} = "1000,00";
+ $myconfig->{"dateformat"} = "dd.mm.yy";
+
&form_header;
&form_footer;
@@ -235,7 +239,7 @@ sub list_users {
if (/^(name=|company=|templates=|dbuser=|dbdriver=|dbname=|dbhost=)/) {
chop($var = $&);
- ($null, $member{$login}{$var}) = split /=/, $_, 2;
+ ($null, $member{$login}{$var}) = split(/=/, $_, 2);
}
}
@@ -298,7 +302,7 @@ sub list_users {
$member{$key}{dbname} = $member{$key}{dbuser}
if ($member{$key}{dbdriver} eq 'Oracle');
- $column_data{login} = qq|| $key | |;
+ $column_data{login} = qq|$key | |;
$column_data{name} = qq|$member{$key}{name} | |;
$column_data{company} = qq|$member{$key}{company} | |;
$column_data{dbdriver} = qq|$member{$key}{dbdriver} | |;
@@ -309,7 +313,7 @@ sub list_users {
$i++;
$i %= 2;
print qq|
- |;
+
|;
map { print "$column_data{$_}\n" } @column_index;
@@ -440,7 +444,7 @@ sub form_header {
closedir TEMPLATEDIR;
@allhtml = sort grep /\.html/, @all;
- @alldir = grep !/\.(html|tex)$/, @all;
+ @alldir = grep !/\.(html|tex|sty|odt)$/, @all;
@alldir = grep !/^(webpages|\.svn)$/, @alldir;
@allhtml = reverse grep !/Default/, @allhtml;
@@ -462,7 +466,8 @@ sub form_header {
$item =~ s/-.*//g;
if ($item ne $lastitem) {
- $mastertemplates .= qq|
|;
- foreach $item (split /;/, $myconfig->{acs}) {
+ foreach $item (split(/;/, $myconfig->{acs})) {
($key, $value) = split /--/, $item, 2;
$excl{$key}{$value} = 1;
}
@@ -858,7 +863,7 @@ sub save {
$myconfig = new User "$memberfile", "$form->{login}";
# redo acs variable and delete all the acs codes
- @acs = split /;/, $form->{acs};
+ @acs = split(/;/, $form->{acs});
$form->{acs} = "";
foreach $item (@acs) {
@@ -964,7 +969,7 @@ sub save {
# copy templates to the directory
opendir TEMPLATEDIR, "$templates/." or $form - error("$templates : $!");
- @templates = grep /$form->{mastertemplates}.*?\.(html|tex)$/,
+ @templates = grep /$form->{mastertemplates}.*?\.(html|tex|sty)$/,
readdir TEMPLATEDIR;
closedir TEMPLATEDIR;
@@ -1065,6 +1070,7 @@ sub delete {
if (-d "$dir") {
unlink <$dir/*.html>;
unlink <$dir/*.tex>;
+ unlink <$dir/*.sty>;
rmdir "$dir";
}
}
@@ -1115,9 +1121,16 @@ sub change_admin_password {
@@ -1320,11 +1352,12 @@ sub update_dataset {
$form->{title}
|;
-
+ my $field_id = 0;
foreach $key (sort keys %needsupdate) {
if ($needsupdate{$key} ne $form->{dbversion}) {
- $upd .= qq| $key\n|;
+ $upd .= qq| $key\n|;
$form->{dbupdate} .= "db$key ";
+ $field_id++;
}
}
@@ -1391,10 +1424,29 @@ $upd
}
sub dbupdate {
+ $form->{"stylesheet"} = "lx-office-erp.css";
+ $form->{"title"} = $main::locale->text("Dataset upgrade");
+ $form->header();
+ my $dbname =
+ join(" ",
+ map({ s/\s//g; s/^db//; $_; }
+ grep({ $form->{$_} }
+ split(/\s+/, $form->{"dbupdate"}))));
+ print($form->parse_html_template("dbupgrade/header",
+ { "dbname" => $dbname }));
User->dbupdate(\%$form);
- $form->redirect($locale->text('Dataset updated!'));
+ print qq|
+
+
+| . $locale->text('Dataset updated!') . qq|
+
+
+
+| . $locale->text("Continue") . qq||;
}