From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 4 Dec 2006 17:08:38 +0000 (+0000)
Subject: Adminfrontend: Vor den Datenbankupdates wie in User.pm auch den HTML-Header ausgeben... 
X-Git-Tag: release-2.4.0^2~121
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a1b353ecfa73af25d82af151077d9bc25253d253;p=kivitendo-erp.git

Adminfrontend: Vor den Datenbankupdates wie in User.pm auch den HTML-Header ausgeben, damit die Perlscripte ihre Ausgaben anständig durchführen können. Danach zurück zur Administration. Bugfix für 435.
---

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 71828e2bd..8cd79a4c5 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);
     }
   }
 
@@ -728,7 +728,7 @@ sub form_header {
   </tr>
 |;
 
-  foreach $item (split /;/, $myconfig->{acs}) {
+  foreach $item (split(/;/, $myconfig->{acs})) {
     ($key, $value) = split /--/, $item, 2;
     $excl{$key}{$value} = 1;
   }
@@ -1423,10 +1423,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|
+<hr>
+
+| . $locale->text('Dataset updated!') . qq|
+
+<br>
+
+<a href="admin.pl?action=login&| .
+join("&", map({ "$_=" . $form->escape($form->{$_}); } qw(path rpw))) .
+qq|">| . $locale->text("Continue") . qq|</a>|;
 
 }