X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fadmin.pl;h=86d66018825165f0ffbe3049f91614d559f52532;hb=4826a1d124c8fede00d1c0ac9625a8e418d7978f;hp=71828e2bdb609b344a5c2d2dc5f2d2392376aa28;hpb=6231ae0a8eccf1dd836fce3ca20ce52c3bb34ff3;p=kivitendo-erp.git diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 71828e2bd..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); } } @@ -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|$item\n|; } } - $selectstylesheet .= "\n"; $form->header; - if ($myconfig->{menustyle} eq "neu") { $neu = "checked"; } - else { $old = "checked"; } + if ($myconfig->{menustyle} eq "v3") { + $menustyle_v3 = "checked"; + } elsif ($myconfig->{menustyle} eq "neu") { + $menustyle_neu = "checked"; + } else { + $menustyle_old = "checked"; + } print qq| @@ -539,8 +544,8 @@ sub form_header { $myconfig->{address} - | . $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; } @@ -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; @@ -1301,10 +1311,11 @@ sub dbselect_source { - -|; +# Vorübergehend Deaktiviert +# +print qq| @@ -1423,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||; } @@ -1446,21 +1476,22 @@ sub create_dataset { closedir SQLDIR; $selectencoding = qq| - ASCII - Japanese Extended UNIX Code - Chinese Extended UNIX Code - Korean Extended UNIX Code - Taiwan Extended UNIX Code - UTF-8 Unicode - Mule internal type - ISO 8859-1 - ISO 8859-2 - ISO 8859-3 - ISO 8859-4 - ISO 8859-5 - KOI8-R - Windows CP1251 - Windows CP866 + ASCII + Japanese Extended UNIX Code + Chinese Extended UNIX Code + Korean Extended UNIX Code + Taiwan Extended UNIX Code + UTF-8 Unicode + Mule internal type + ISO 8859-1 + ISO 8859-2 + ISO 8859-3 + ISO 8859-4 + ISO 8859-5 + ISO 8859-15 + KOI8-R + Windows CP1251 + Windows CP866 |; $form->{title} =