X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fadmin.pl;h=e936b2a12430c68d8f04527ea53e822502bbb511;hb=564d8509117493b1b4b28c08d95ba4d1df8d599b;hp=afd284bd932b38ee117d8be14269434f6b60530c;hpb=d319704a66e9be64da837ccea10af6774c2b0838;p=kivitendo-erp.git

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index afd284bd9..e936b2a12 100644
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -34,19 +34,20 @@
 
 $menufile = "menu.ini";
 
+use DBI;
 use SL::Form;
 use SL::User;
 
+require "bin/mozilla/common.pl";
+
 $form = new Form;
+$form->{"root"} = "root login";
 
 $locale = new Locale $language, "admin";
 
-eval { require DBI; };
-$form->error($locale->text('DBI not installed!')) if ($@);
-
 # customization
-if (-f "$form->{path}/custom_$form->{script}") {
-  eval { require "$form->{path}/custom_$form->{script}"; };
+if (-f "bin/mozilla/custom_$form->{script}") {
+  eval { require "bin/mozilla/custom_$form->{script}"; };
   $form->error($@) if ($@);
 }
 
@@ -55,6 +56,7 @@ $form->{favicon}    = "favicon.ico";
 
 if ($form->{action}) {
 
+
   $subroutine = $locale->findsub($form->{action});
 
   if ($subroutine eq 'login') {
@@ -65,7 +67,7 @@ if ($form->{action}) {
 
   &check_password;
 
-  &$subroutine;
+  call_sub($subroutine);
 
 } else {
 
@@ -120,12 +122,9 @@ sub adminlogin {
     <th>| . $locale->text('Password') . qq|</th>
     <td><input type=password name=rpw></td>
     <td><input type=submit class=submit name=action value="|
-    . $locale->text('Login')
-    . qq|"></td>
+    . $locale->text('Login') . qq|"></td>
   </tr>
 <input type=hidden name=action value=login>
-<input type=hidden name=root value="root login">
-<input type=hidden name=path value=$form->{path}>
 </table>
 
 
@@ -164,6 +163,10 @@ sub add_user {
   }
   $myconfig->{vclimit} = 200;
 
+  $myconfig->{"countrycode"} = "de";
+  $myconfig->{"numberformat"} = "1000,00";
+  $myconfig->{"dateformat"} = "dd.mm.yy";
+
   &form_header;
   &form_footer;
 
@@ -193,9 +196,7 @@ sub form_footer {
 
   print qq|
 
-<input name=callback type=hidden value="$form->{script}?action=list_users&path=$form->{path}&root=$form->{root}&rpw=$form->{rpw}">
-<input type=hidden name=root value="$form->{root}">
-<input type=hidden name=path value=$form->{path}>
+<input name=callback type=hidden value="$form->{script}?action=list_users&rpw=$form->{rpw}">
 <input type=hidden name=rpw value=$form->{rpw}>
 
 <input type=submit class=submit name=action value="|
@@ -236,7 +237,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);
     }
   }
 
@@ -290,7 +291,7 @@ sub list_users {
 
   foreach $key (sort keys %member) {
     $href =
-      "$script?action=edit&login=$key&path=$form->{path}&root=$form->{root}&rpw=$form->{rpw}";
+      "$script?action=edit&login=$key&rpw=$form->{rpw}";
     $href =~ s/ /%20/g;
 
     $member{$key}{templates} =~ s/^$templates\///;
@@ -299,7 +300,7 @@ sub list_users {
     $member{$key}{dbname} = $member{$key}{dbuser}
       if ($member{$key}{dbdriver} eq 'Oracle');
 
-    $column_data{login}     = qq|<td><a href=$href>$key</a></td>|;
+    $column_data{login}     = qq|<td><a id="$key" href="$href">$key</a></td>|;
     $column_data{name}      = qq|<td>$member{$key}{name}</td>|;
     $column_data{company}   = qq|<td>$member{$key}{company}</td>|;
     $column_data{dbdriver}  = qq|<td>$member{$key}{dbdriver}</td>|;
@@ -310,7 +311,7 @@ sub list_users {
     $i++;
     $i %= 2;
     print qq|
-        <tr class=listrow$i>|;
+        <tr class="listrow$i">|;
 
     map { print "$column_data{$_}\n" } @column_index;
 
@@ -327,9 +328,7 @@ sub list_users {
   </tr>
 </table>
 
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=rpw value=$form->{rpw}>
-<input type=hidden name=root value="$form->{root}">
 
 <br><input type=submit class=submit name=action value="|
     . $locale->text('Add User') . qq|">
@@ -369,10 +368,8 @@ $nologin
 	  <th align=right>| . $locale->text('Password') . qq|</th>
 	  <td><input class=login type=password name=password></td>
 	  <td><input type=submit name=action value="|
-    . $locale->text('Login')
-    . qq|"></td>
+    . $locale->text('Login') . qq|"></td>
 	</tr>
-<input type=hidden name=path value=$form->{path}>
       </table>
     </td>
   </tr>
@@ -422,7 +419,8 @@ sub form_header {
   %countrycodes = User->country_codes;
   $countrycodes = "";
   foreach $key (sort { $countrycodes{$a} cmp $countrycodes{$b} }
-                keys %countrycodes) {
+                keys %countrycodes
+    ) {
     $countrycodes .=
       ($myconfig->{countrycode} eq $key)
       ? "<option selected value=$key>$countrycodes{$key}"
@@ -438,11 +436,13 @@ 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)$/, @all;
+  @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir;
+  @alldir = grep !/^(webpages|\.svn)$/, @alldir;
 
   @allhtml = reverse grep !/Default/, @allhtml;
   push @allhtml, 'Default';
@@ -463,14 +463,19 @@ sub form_header {
     $item =~ s/-.*//g;
 
     if ($item ne $lastitem) {
-      $mastertemplates .= qq|<option>$item\n|;
+      my $selected = $item eq "German" ? " selected" : "";
+      $mastertemplates .= qq|<option$selected>$item\n|;
       $lastitem = $item;
     }
   }
 
-  opendir CSS, "css/.";
-  @all = grep /.*\.css$/, readdir CSS;
-  closedir CSS;
+#  opendir CSS, "css/.";
+#  @all = grep /.*\.css$/, readdir CSS;
+#  closedir CSS;
+
+# css dir has styles that are not intended as general layouts.
+# reverting to hardcoded list
+  @all = qw(lx-office-erp.css Win2000.css);
 
   foreach $item (@all) {
     if ($item eq $myconfig->{stylesheet}) {
@@ -479,10 +484,17 @@ sub form_header {
       $selectstylesheet .= qq|<option>$item\n|;
     }
   }
-  $selectstylesheet .= "<option>\n";
 
   $form->header;
 
+  if ($myconfig->{menustyle} eq "v3") {
+    $menustyle_v3 = "checked";
+  } elsif ($myconfig->{menustyle} eq "neu") {
+    $menustyle_neu = "checked";
+  } else {
+    $menustyle_old = "checked";
+  }
+
   print qq|
 <body class=admin>
 
@@ -496,16 +508,16 @@ sub form_header {
       <table>
 	<tr>
 	  <th align=right>| . $locale->text('Login') . qq|</th>
-	  <td><input name=login value="$myconfig->{login}"></td>
+	  <td><input name="login" value="$myconfig->{login}"></td>
 	</tr>
 	<tr>
 	  <th align=right>| . $locale->text('Password') . qq|</th>
-	  <td><input type=password name=password size=8 value=$myconfig->{password}></td>
-	  <input type=hidden name=old_password value=$myconfig->{password}>
+	  <td><input type="password" name="password" size="8" value="$myconfig->{password}"></td>
+	  <input type="hidden" name="old_password" value="$myconfig->{password}">
 	</tr>
 	<tr>
 	  <th align=right>| . $locale->text('Name') . qq|</th>
-	  <td><input name=name size=15 value="$myconfig->{name}"></td>
+	  <td><input name="name" size="15" value="$myconfig->{name}"></td>
 	</tr>
 	<tr>
 	  <th align=right>| . $locale->text('E-mail') . qq|</th>
@@ -532,12 +544,12 @@ sub form_header {
 	  <td><textarea name=address rows=4 cols=35>$myconfig->{address}</textarea></td>
 	</tr>
         <tr valign=top>
-	  <th align=right>| . $locale->text('Steuernummer') . qq|</th>
-	  <td><input name=steuernummer size=14 value="$myconfig->{steuernummer}"></td>
+	  <th align=right>| . $locale->text('Tax number') . qq|</th>
+	  <td><input name=taxnumber size=14 value="$myconfig->{taxnumber}"></td>
 	</tr>
         <tr valign=top>
 	  <th align=right>| . $locale->text('Ust-IDNr') . qq|</th>
-	  <td><input name=ustid size=14 value="$myconfig->{ustid}"></td>
+	  <td><input name=co_ustid size=14 value="$myconfig->{co_ustid}"></td>
 	</tr>
         <tr valign=top>
 	  <th align=right>| . $locale->text('DUNS-Nr') . qq|</th>
@@ -587,6 +599,16 @@ sub form_header {
 	  <th align=right>| . $locale->text('Setup Templates') . qq|</th>
 	  <td><select name=mastertemplates>$mastertemplates</select></td>
 	</tr>
+       <tr>
+           <th align=right>| . $locale->text('Setup Menu') . qq|</th>
+           <td><input name=menustyle type=radio class=radio value=v3 $menustyle_v3>&nbsp;| .
+           $locale->text("Top (CSS)") . qq|
+           <input name=menustyle type=radio class=radio value=neu $menustyle_neu>&nbsp;| .
+           $locale->text("Top (Javascript)") . qq|
+           <input name=menustyle type=radio class=radio value=old $menustyle_old>&nbsp;| .
+           $locale->text("Old (on the side)") . qq|
+           </td>
+         </tr>
 	<input type=hidden name=templates value=$myconfig->{templates}>
       </table>
     </td>
@@ -613,24 +635,25 @@ sub form_header {
 
     print qq|
 	  <th align=right>| . $locale->text('Driver') . qq|</th>
-	  <td><input name=dbdriver type=radio class=radio value=$item $checked>&nbsp;$item</td>
+	  <td><input name="dbdriver" type="radio" class="radio" value="$item" $checked>&nbsp;$item</td>
 	  <th align=right>| . $locale->text('Host') . qq|</th>
-	  <td><input name="${item}_dbhost" size=30 value=$form->{"${item}_dbhost"}></td>
+	  <td><input name="${item}_dbhost" size=30 value="$form->{"${item}_dbhost"}"></td>
 	</tr>
 	<tr>|;
 
     if ($item eq 'Pg') {
+    
       print qq|
 	  <th align=right>| . $locale->text('Dataset') . qq|</th>
-	  <td><input name=Pg_dbname size=15 value=$form->{Pg_dbname}></td>
+	  <td><input name="Pg_dbname" size="15" value="$form->{Pg_dbname}"></td>
 	  <th align=right>| . $locale->text('Port') . qq|</th>
-	  <td><input name=Pg_dbport size=4 value=$form->{Pg_dbport}></td>
+	  <td><input name="Pg_dbport" size="4" value="$form->{Pg_dbport}"></td>
 	</tr>
 	<tr>
 	  <th align=right>| . $locale->text('User') . qq|</th>
-	  <td><input name="${item}_dbuser" size=15 value=$form->{"${item}_dbuser"}></td>
+	  <td><input name="${item}_dbuser" size=15 value="$form->{"${item}_dbuser"}"></td>
 	  <th align=right>| . $locale->text('Password') . qq|</th>
-	  <td><input name="${item}_dbpasswd" type=password size=10 value=$form->{"${item}_dbpasswd"}></td>
+	  <td><input name="${item}_dbpasswd" type=password size=10 value="$form->{"${item}_dbpasswd"}"></td>
 	</tr>|;
 
     }
@@ -646,13 +669,13 @@ sub form_header {
 	  <th align=right>| . $locale->text('Dataset') . qq|</th>
 	  <td><input name="${item}_dbuser" size=15 value=$form->{"${item}_dbuser"}></td>
 	  <th align=right>| . $locale->text('Password') . qq|</th>
-	  <td><input name="${item}_dbpasswd" type=password size=10 value=$form->{"${item}_dbpasswd"}></td>
-	  
+	  <td><input name="${item}_dbpasswd" type=password size=10 value="$form->{"${item}_dbpasswd"}"></td>
+
 	</tr>|;
     }
 
     print qq|
-	<input type=hidden name=old_dbpasswd value=$myconfig->{dbpasswd}>
+	<input type="hidden" name="old_dbpasswd" value="$myconfig->{dbpasswd}">
       </table>
     </td>
   </tr>
@@ -716,7 +739,7 @@ sub form_header {
   </tr>
 |;
 
-  foreach $item (split /;/, $myconfig->{acs}) {
+  foreach $item (split(/;/, $myconfig->{acs})) {
     ($key, $value) = split /--/, $item, 2;
     $excl{$key}{$value} = 1;
   }
@@ -777,7 +800,7 @@ sub form_header {
         $webdav{"${directory}c"} = "";
       }
     }
-    print qq|  
+    print qq|
    <tr>
     <td colspan=2><hr size=3 noshade></td>
   </tr>
@@ -787,15 +810,15 @@ sub form_header {
   <table width=100%>
 	<tr>
 	<td><input name=angebote class=checkbox type=checkbox value=1 $webdav{angebotec}>&nbsp;Angebot</td>
-	<td><input name=bestellungen class=checkbox type=checkbox value=1 $webdav{bestellungenc}>&nbsp;Bestellung</td> 
+	<td><input name=bestellungen class=checkbox type=checkbox value=1 $webdav{bestellungenc}>&nbsp;Bestellung</td>
 	<td><input name=rechnungen class=checkbox type=checkbox value=1 $webdav{rechnungenc}>&nbsp;Rechnung</td>
 	</tr>
 	<tr>
 	<td><input name=anfragen class=checkbox type=checkbox value=1 $webdav{anfragenc}>&nbsp;Angebot</td>
-	<td><input name=lieferantenbestellungen class=checkbox type=checkbox value=1 $webdav{lieferantenbestellungenc}>&nbsp;Lieferantenbestellung</td> 
+	<td><input name=lieferantenbestellungen class=checkbox type=checkbox value=1 $webdav{lieferantenbestellungenc}>&nbsp;Lieferantenbestellung</td>
 	<td><input name=einkaufsrechnungen class=checkbox type=checkbox value=1 $webdav{einkaufsrechnungenc}>&nbsp;Einkaufsrechnung</td>
 	</tr>
-  </table>    
+  </table>
   <tr>
     <td colspan=2><hr size=3 noshade></td>
   </tr>
@@ -851,7 +874,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) {
@@ -957,7 +980,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|xml|txb)$/,
         readdir TEMPLATEDIR;
       closedir TEMPLATEDIR;
 
@@ -1058,6 +1081,7 @@ sub delete {
     if (-d "$dir") {
       unlink <$dir/*.html>;
       unlink <$dir/*.tex>;
+      unlink <$dir/*.sty>;
       rmdir "$dir";
     }
   }
@@ -1108,12 +1132,17 @@ sub change_admin_password {
 
 <form method=post action=$form->{script}>
 
-<b>|
-    . $locale->text('Password')
-    . qq|</b> <input type=password name=password size=8>
+<table>
+  <tr>
+    <td><b>| . $locale->text('Password') . qq|</b></td>
+    <td><input type=password name=password size=8></td>
+  </tr>
+  <tr>
+    <td><b>| . $locale->text('Repeat the password') . qq|</b></td>
+    <td><input type=password name=password_again size=8></b></td>
+  </tr>
+</table>
 
-<input type=hidden name=root value="$form->{root}">
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=rpw value=$form->{rpw}>
 
 <p>
@@ -1129,6 +1158,24 @@ sub change_admin_password {
 }
 
 sub change_password {
+  if ($form->{"password"} ne $form->{"password_again"}) {
+    $form->{title} =
+      qq|Lx-Office ERP |
+      . $locale->text('Administration') . " / "
+      . $locale->text('Change Admin Password');
+
+    $form->header;
+
+    print qq|
+<body class=admin>
+
+
+<h2>| . $locale->text('Change Admin Password') . qq|</h2>
+
+<p>| . $locale->text("The passwords do not match.") . qq|<br>
+<input type="button" onclick="history.back()" value="| . $locale->text("Back") . qq|">|;
+    return;
+  }
 
   $root->{password} = $form->{password};
 
@@ -1136,20 +1183,17 @@ sub change_password {
   $root->save_member($memberfile);
 
   $form->{callback} =
-    "$form->{script}?action=list_users&path=$form->{path}&root=$form->{root}&rpw=$root->{password}";
+    "$form->{script}?action=list_users&rpw=$root->{password}";
 
   $form->redirect($locale->text('Password changed!'));
 
 }
 
 sub check_password {
-
   $root = new User "$memberfile", $form->{root};
 
-  if ($root->{password}) {
-    if ($root->{password} ne $form->{rpw}) {
-      $form->error($locale->text('Incorrect Password!'));
-    }
+  if (!defined($root->{password}) || ($root->{password} ne $form->{rpw})) {
+    $form->error($locale->text('Incorrect Password!'));
   }
 
 }
@@ -1242,12 +1286,12 @@ sub dbselect_source {
   <tr>
 
     <th align=right>| . $locale->text('User') . qq|</th>
-    <td><input name=dbuser size=10 value=$form->{dbuser}></td>
+    <td><input name="dbuser" size="10" value="$form->{dbuser}"></td>
     <th align=right>| . $locale->text('Password') . qq|</th>
-    <td><input type=password name=dbpasswd size=10></td>
+    <td><input type="password" name="dbpasswd" size="10"></td>
 
   </tr>
-  
+
   <tr>
 
     <th align=right>$form->{connectstring}</th>
@@ -1260,18 +1304,17 @@ sub dbselect_source {
 </td></tr>
 </table>
 
-<input name=callback type=hidden value="$form->{script}?action=list_users&path=$form->{path}&root=$form->{root}&rpw=$form->{rpw}">
-<input type=hidden name=root value="$form->{root}">
-<input type=hidden name=path value=$form->{path}>
+<input name=callback type=hidden value="$form->{script}?action=list_users&rpw=$form->{rpw}">
 <input type=hidden name=rpw value=$form->{rpw}>
 
 <br>
 
 <input type=submit class=submit name=action value="|
-    . $locale->text('Create Dataset') . qq|">
-<input type=submit class=submit name=action value="|
-    . $locale->text('Update Dataset') . qq|">
-<input type=submit class=submit name=action value="|
+    . $locale->text('Create Dataset') . qq|">|;
+# Vorübergehend Deaktiviert
+# <input type=submit class=submit name=action value="|
+#     . $locale->text('Update Dataset') . qq|">
+print qq| <input type=submit class=submit name=action value="|
     . $locale->text('Delete Dataset') . qq|">
 
 </form>
@@ -1295,9 +1338,7 @@ sub dbselect_source {
 }
 
 sub continue {
-
-  &{ $form->{nextsub} };
-
+  call_sub($form->{"nextsub"});
 }
 
 sub update_dataset {
@@ -1318,11 +1359,12 @@ sub update_dataset {
 <center>
 <h2>$form->{title}</h2>
 |;
-
+  my $field_id = 0;
   foreach $key (sort keys %needsupdate) {
     if ($needsupdate{$key} ne $form->{dbversion}) {
-      $upd .= qq|<input name="db$key" type=checkbox value=1 checked> $key\n|;
+      $upd .= qq|<input id="$field_id" name="db$key" type="checkbox" value="1" checked> $key\n|;
       $form->{dbupdate} .= "db$key ";
+      $field_id++;
     }
   }
 
@@ -1334,12 +1376,12 @@ sub update_dataset {
 <table width=100%>
 <form method=post action=$form->{script}>
 
-<input type=hidden name=dbdriver value=$form->{dbdriver}>
-<input type=hidden name=dbhost value=$form->{dbhost}>
-<input type=hidden name=dbport value=$form->{dbport}>
-<input type=hidden name=dbuser value=$form->{dbuser}>
-<input type=hidden name=dbpasswd value=$form->{dbpasswd}>
-<input type=hidden name=dbdefault value=$form->{dbdefault}>
+<input type=hidden name="dbdriver"  value="$form->{dbdriver}">
+<input type=hidden name="dbhost"    value="$form->{dbhost}">
+<input type=hidden name="dbport"    value="$form->{dbport}">
+<input type=hidden name="dbuser"    value="$form->{dbuser}">
+<input type=hidden name="dbpasswd"  value="$form->{dbpasswd}">
+<input type=hidden name="dbdefault" value="$form->{dbdefault}">
 
 <tr class=listheading>
   <th>| . $locale->text('The following Datasets need to be updated') . qq|</th>
@@ -1356,10 +1398,8 @@ $upd
 
 <input name=dbupdate type=hidden value="$form->{dbupdate}">
 
-<input name=callback type=hidden value="$form->{script}?action=list_users&path=$form->{path}&root=$form->{root}&rpw=$form->{rpw}">
+<input name=callback type=hidden value="$form->{script}?action=list_users&rpw=$form->{rpw}">
 
-<input type=hidden name=root value="$form->{root}">
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=rpw value=$form->{rpw}>
 
 <input type=hidden name=nextsub value=dbupdate>
@@ -1390,10 +1430,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 id="enddatasetupdate" href="admin.pl?action=login&| .
+join("&", map({ "$_=" . $form->escape($form->{$_}); } qw(rpw))) .
+qq|">| . $locale->text("Continue") . qq|</a>|;
 
 }
 
@@ -1404,7 +1463,7 @@ sub create_dataset {
   }
 
   opendir SQLDIR, "sql/." or $form - error($!);
-  foreach $item (sort grep /-chart\.sql/, readdir SQLDIR) {
+  foreach $item (sort grep /-chart\.sql\z/, readdir SQLDIR) {
     next if ($item eq 'Default-chart.sql');
     $item =~ s/-chart\.sql//;
     push @charts,
@@ -1413,21 +1472,22 @@ sub create_dataset {
   closedir SQLDIR;
 
   $selectencoding = qq|<option>
-  <option value=SQL_ASCII>ASCII
-  <option value=EUC_JP>Japanese Extended UNIX Code
-  <option value=EUC_CN>Chinese Extended UNIX Code
-  <option value=EUC_KR>Korean Extended UNIX Code
-  <option value=EUC_TW>Taiwan Extended UNIX Code
-  <option value=UNICODE>UTF-8 Unicode
-  <option value=MULE_INTERNAL>Mule internal type
-  <option value=LATIN1>ISO 8859-1
-  <option value=LATIN2>ISO 8859-2
-  <option value=LATIN3>ISO 8859-3
-  <option value=LATIN4>ISO 8859-4
-  <option value=LATIN5>ISO 8859-5
-  <option value=KOI8>KOI8-R
-  <option value=WIN>Windows CP1251
-  <option value=ALT>Windows CP866
+  <option value="SQL_ASCII">ASCII
+  <option value="EUC_JP">Japanese Extended UNIX Code
+  <option value="EUC_CN">Chinese Extended UNIX Code
+  <option value="EUC_KR">Korean Extended UNIX Code
+  <option value="EUC_TW">Taiwan Extended UNIX Code
+  <option value="UNICODE">UTF-8 Unicode
+  <option value="MULE_INTERNAL">Mule internal type
+  <option selected="selected"  value="LATIN1">ISO 8859-1 
+  <option value="LATIN2">ISO 8859-2
+  <option value="LATIN3">ISO 8859-3
+  <option value="LATIN4">ISO 8859-4
+  <option value="LATIN5">ISO 8859-5
+  <option value="LATIN9">ISO 8859-15
+  <option value="KOI8">KOI8-R
+  <option value="WIN">Windows CP1251
+  <option value="ALT">Windows CP866
   |;
 
   $form->{title} =
@@ -1457,7 +1517,7 @@ sub create_dataset {
     <td>$dbsources</td>
 
   </tr>
-  
+
   <tr>
 
     <th align=right nowrap>| . $locale->text('Create Dataset') . qq|</th>
@@ -1471,29 +1531,26 @@ sub create_dataset {
     <td><select name=encoding>$selectencoding</select></td>
 
   </tr>
- 
+
   <tr>
 
     <th align=right nowrap>|
-    . $locale->text('Create Chart of Accounts')
-    . qq|</th>
+    . $locale->text('Create Chart of Accounts') . qq|</th>
     <td>@charts</td>
 
   </tr>
- 
+
   <tr><td colspan=2>
 <p>
-<input type=hidden name=dbdriver value=$form->{dbdriver}>
-<input type=hidden name=dbuser value=$form->{dbuser}>
-<input type=hidden name=dbhost value=$form->{dbhost}>
-<input type=hidden name=dbport value=$form->{dbport}>
-<input type=hidden name=dbpasswd value=$form->{dbpasswd}>
-<input type=hidden name=dbdefault value=$form->{dbdefault}>
+<input type=hidden name="dbdriver"  value="$form->{dbdriver}">
+<input type=hidden name="dbuser"    value="$form->{dbuser}">
+<input type=hidden name="dbhost"    value="$form->{dbhost}">
+<input type=hidden name="dbport"    value="$form->{dbport}">
+<input type=hidden name="dbpasswd"  value="$form->{dbpasswd}">
+<input type=hidden name="dbdefault" value="$form->{dbdefault}">
 
-<input name=callback type=hidden value="$form->{script}?action=list_users&path=$form->{path}&root=$form->{root}&rpw=$form->{rpw}">
+<input name=callback type=hidden value="$form->{script}?action=list_users&rpw=$form->{rpw}">
 
-<input type=hidden name=root value="$form->{root}">
-<input type=hidden name=path value=$form->{path}>
 <input type=hidden name=rpw value=$form->{rpw}>
 
 <input type=hidden name=nextsub value=dbcreate>
@@ -1544,8 +1601,6 @@ sub dbcreate {
 
     . qq|
 
-<input type=hidden name=root value="$form->{root}">
-<input type=hidden name=path value="$form->{path}">
 <input type=hidden name=rpw value="$form->{rpw}">
 
 <input type=hidden name=nextsub value=list_users>
@@ -1598,20 +1653,18 @@ sub delete_dataset {
     $dbsources
     </td>
   </tr>
-  
+
   <tr><td>
 <p>
-<input type=hidden name=dbdriver value=$form->{dbdriver}>
-<input type=hidden name=dbuser value=$form->{dbuser}>
-<input type=hidden name=dbhost value=$form->{dbhost}>
-<input type=hidden name=dbport value=$form->{dbport}>
-<input type=hidden name=dbpasswd value=$form->{dbpasswd}>
-<input type=hidden name=dbdefault value=$form->{dbdefault}>
+<input type=hidden name="dbdriver"  value="$form->{dbdriver}">
+<input type=hidden name="dbuser"    value="$form->{dbuser}">
+<input type=hidden name="dbhost"    value="$form->{dbhost}">
+<input type=hidden name="dbport"    value="$form->{dbport}">
+<input type=hidden name="dbpasswd"  value="$form->{dbpasswd}">
+<input type=hidden name="dbdefault" value="$form->{dbdefault}">
 
-<input name=callback type=hidden value="$form->{script}?action=list_users&path=$form->{path}&root=$form->{root}&rpw=$form->{rpw}">
+<input name=callback type=hidden value="$form->{script}?action=list_users&rpw=$form->{rpw}">
 
-<input type=hidden name=root value="$form->{root}">
-<input type=hidden name=path value="$form->{path}">
 <input type=hidden name=rpw value="$form->{rpw}">
 
 <input type=hidden name=nextsub value=dbdelete>
@@ -1661,8 +1714,6 @@ $form->{db} | . $locale->text('successfully deleted!')
 
     . qq|
 
-<input type=hidden name=root value="$form->{root}">
-<input type=hidden name=path value="$form->{path}">
 <input type=hidden name=rpw value="$form->{rpw}">
 
 <input type=hidden name=nextsub value=list_users>
@@ -1683,7 +1734,7 @@ sub unlock_system {
   unlink "$userspath/nologin";
 
   $form->{callback} =
-    "$form->{script}?action=list_users&path=$form->{path}&root=$form->{root}&rpw=$root->{password}";
+    "$form->{script}?action=list_users&rpw=$root->{password}";
 
   $form->redirect($locale->text('Lockfile removed!'));
 
@@ -1696,9 +1747,8 @@ sub lock_system {
   close(FH);
 
   $form->{callback} =
-    "$form->{script}?action=list_users&path=$form->{path}&root=$form->{root}&rpw=$root->{password}";
+    "$form->{script}?action=list_users&rpw=$root->{password}";
 
   $form->redirect($locale->text('Lockfile created!'));
 
 }
-