X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fadmin.pl;h=86d66018825165f0ffbe3049f91614d559f52532;hb=4826a1d124c8fede00d1c0ac9625a8e418d7978f;hp=a4c8d0c2181c382514beca5dcaef22e3619c9383;hpb=daac86985672692c14b72aab942144b097d8c8fd;p=kivitendo-erp.git
diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index a4c8d0c21..86d660188 100644
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -239,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);
}
}
@@ -302,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} | |;
@@ -313,7 +313,7 @@ sub list_users {
$i++;
$i %= 2;
print qq|
- |;
+
|;
map { print "$column_data{$_}\n" } @column_index;
@@ -440,11 +440,12 @@ sub form_header {
}
opendir TEMPLATEDIR, "$templates/." or $form->error("$templates : $!");
- @all = grep !/^\.\.?$/, readdir TEMPLATEDIR;
+ my @all = readdir(TEMPLATEDIR);
+ my @alldir = sort(grep({ -d "$templates/$_" && !/^\.\.?$/ } @all));
+ my @allhtml = sort(grep({ -f "$templates/$_" && /\.html$/ } @all));
closedir TEMPLATEDIR;
- @allhtml = sort grep /\.html/, @all;
- @alldir = grep !/\.(html|tex|sty|odt)$/, @all;
+ @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir;
@alldir = grep !/^(webpages|\.svn)$/, @alldir;
@allhtml = reverse grep !/Default/, @allhtml;
@@ -473,7 +474,7 @@ sub form_header {
}
opendir CSS, "css/.";
- @all = grep /.*\.css$/, readdir CSS;
+ @all = sort(grep({ /\.css$/ && ($_ ne "tabcontent.css") } readdir(CSS)));
closedir CSS;
foreach $item (@all) {
@@ -483,12 +484,16 @@ sub form_header {
$selectstylesheet .= qq|
- | . $locale->text('Steuernummer') . qq| |
- |
+ | . $locale->text('Tax number') . qq| |
+ |
| . $locale->text('Ust-IDNr') . qq| |
@@ -596,8 +601,13 @@ sub form_header {
| . $locale->text('Setup Menu') . qq| |
- New
- Old |
+ | .
+ $locale->text("Top (CSS)") . qq|
+ | .
+ $locale->text("Top (Javascript)") . qq|
+ | .
+ $locale->text("Old (on the side)") . qq|
+ |
{templates}>
@@ -728,7 +738,7 @@ sub form_header {
|;
- foreach $item (split /;/, $myconfig->{acs}) {
+ foreach $item (split(/;/, $myconfig->{acs})) {
($key, $value) = split /--/, $item, 2;
$excl{$key}{$value} = 1;
}
@@ -863,7 +873,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) {
@@ -969,7 +979,7 @@ sub save {
# copy templates to the directory
opendir TEMPLATEDIR, "$templates/." or $form - error("$templates : $!");
- @templates = grep /$form->{mastertemplates}.*?\.(html|tex|sty)$/,
+ @templates = grep /$form->{mastertemplates}.*?\.(html|tex|sty|xml|txb)$/,
readdir TEMPLATEDIR;
closedir TEMPLATEDIR;
@@ -1121,9 +1131,16 @@ sub change_admin_password {
@@ -1398,10 +1434,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|
+
+
+
+escape($form->{$_}); } qw(path rpw))) .
+qq|">| . $locale->text("Continue") . qq||;
}
@@ -1421,21 +1476,22 @@ sub create_dataset {
closedir SQLDIR;
$selectencoding = qq|