From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 16 May 2007 10:43:40 +0000 (+0000)
Subject: Umstellung des Anlegens und Bearbeitens von Benutzern auf die Verwendung von HTML... 
X-Git-Tag: release-2.4.3^2~303
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;ds=inline;h=c3cee60334aa81dfb51e5ffe45635d59450c3409;p=kivitendo-erp.git

Umstellung des Anlegens und Bearbeitens von Benutzern auf die Verwendung von HTML-Vorlagen.
---

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index a9769a06b..ef985f40c 100644
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -160,18 +160,15 @@ sub add_user {
   $form->{Oracle_dbport} = '1521';
   $form->{Oracle_dbhost} = `hostname`;
 
-  if (-f "css/lx-office-erp.css") {
-    $myconfig->{stylesheet} = "lx-office-erp.css";
-  }
-
-  $myconfig->{vclimit}      = 200;
-  $myconfig->{countrycode}  = "de";
-  $myconfig->{numberformat} = "1000,00";
-  $myconfig->{dateformat}   = "dd.mm.yy";
-
-  form_header();
-  form_footer();
-
+  my $myconfig = {
+    "vclimit"      => 200,
+    "countrycode"  => "de",
+    "numberformat" => "1000,00",
+    "dateformat"   => "dd.mm.yy",
+    "stylesheet"   => "lx-office-erp.css",
+  };
+
+  edit_user_form($myconfig);
 }
 
 sub edit {
@@ -182,91 +179,46 @@ sub edit {
     . $locale->text('Edit User');
   $form->{edit} = 1;
 
-  form_header();
-  form_footer();
-
-}
-
-sub form_footer {
-
-  if ($form->{edit}) {
-    $delete =
-      qq|<input type=submit class=submit name=action value="|
-      . $locale->text('Delete') . qq|">
-<input type=hidden name=edit value=1>|;
-  }
-
-  print qq|
-
-<input name=callback type=hidden value="$form->{script}?action=list_users&rpw=$form->{rpw}">
-<input type=hidden name=rpw value=$form->{rpw}>
+  $form->isblank("login", $locale->text("The login is missing."));
 
-<input type=submit class=submit name=action value="|
-    . $locale->text('Save') . qq|">
-$delete
+  # get user
+  my $myconfig = new User "$memberfile", "$form->{login}";
 
-</form>
+  $myconfig->{signature} =~ s/\\n/\r\n/g;
+  $myconfig->{address}   =~ s/\\n/\r\n/g;
 
-</body>
-</html>
-|;
+  # strip basedir from templates directory
+  $myconfig->{templates} =~ s|.*/||;
 
+  edit_user_form($myconfig);
 }
 
-sub form_header {
-
-  # if there is a login, get user
-  if ($form->{login}) {
-
-    # get user
-    $myconfig = new User "$memberfile", "$form->{login}";
-
-    $myconfig->{signature} =~ s/\\n/\r\n/g;
-    $myconfig->{address}   =~ s/\\n/\r\n/g;
-
-    # strip basedir from templates directory
-    $myconfig->{templates} =~ s/^$templates\///;
-
-    # $myconfig->{dbpasswd} = unpack 'u', $myconfig->{dbpasswd};
-  }
+sub edit_user_form {
+  my ($myconfig) = @_;
 
-  foreach $item (qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd)) {
-    $dateformat .=
-      ($item eq $myconfig->{dateformat})
-      ? "<option selected>$item\n"
-      : "<option>$item\n";
-  }
+  my @valid_dateformats = qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd);
+  $form->{ALL_DATEFORMATS} = [ map { { "format" => $_, "selected" => $_ eq $myconfig->{dateformat} } } @valid_dateformats ];
 
-  foreach $item (qw(1,000.00 1000.00 1.000,00 1000,00)) {
-    $numberformat .=
-      ($item eq $myconfig->{numberformat})
-      ? "<option selected>$item\n"
-      : "<option>$item\n";
-  }
+  my @valid_numberformats = qw(1,000.00 1000.00 1.000,00 1000,00);
+  $form->{ALL_NUMBERFORMATS} = [ map { { "format" => $_, "selected" => $_ eq $myconfig->{numberformat} } } @valid_numberformats ];
 
   %countrycodes = User->country_codes;
-  $countrycodes = "";
-  foreach $key (sort { $countrycodes{$a} cmp $countrycodes{$b} }
-                keys %countrycodes
-    ) {
-    $countrycodes .=
-      ($myconfig->{countrycode} eq $key)
-      ? "<option selected value=$key>$countrycodes{$key}"
-      : "<option value=$key>$countrycodes{$key}";
+  $form->{ALL_COUNTRYCODES} = [];
+  foreach $countrycode (sort { $countrycodes{$a} cmp $countrycodes{$b} } keys %countrycodes) {
+    push @{ $form->{ALL_COUNTRYCODES} }, { "value"    => $countrycode,
+                                           "name"     => $countrycodes{$countrycode},
+                                           "selected" => $countrycode eq $myconfig->{countrycode} };
   }
-  $countrycodes = qq|<option value="">American English\n$countrycodes|;
 
   # is there a templates basedir
   if (!-d "$templates") {
-    $form->error(  $locale->text('Directory')
-                 . ": $templates "
-                 . $locale->text('does not exist'));
+    $form->error(sprintf($locale->text("The directory %s does not exist."), $templates));
   }
 
   opendir TEMPLATEDIR, "$templates/." or $form->error("$templates : $!");
-  my @all = readdir(TEMPLATEDIR);
-  my @alldir = sort(grep({ -d "$templates/$_" && !/^\.\.?$/ } @all));
-  my @allhtml = sort(grep({ -f "$templates/$_" && /\.html$/ } @all));
+  my @all     = readdir(TEMPLATEDIR);
+  my @alldir  = sort grep { -d "$templates/$_" && !/^\.\.?$/ } @all;
+  my @allhtml = sort grep { -f "$templates/$_" && /\.html$/ } @all;
   closedir TEMPLATEDIR;
 
   @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir;
@@ -276,253 +228,43 @@ sub form_header {
   push @allhtml, 'Default';
   @allhtml = reverse @allhtml;
 
-  foreach $item (@alldir) {
-    if ($item eq $myconfig->{templates}) {
-      $usetemplates .= qq|<option selected>$item\n|;
-    } else {
-      $usetemplates .= qq|<option>$item\n|;
-    }
-  }
+  $form->{ALL_TEMPLATES} = [ map { { "name", => $_, "selected" => $_ eq $myconfig->{templates} } } @alldir ];
 
   $lastitem = $allhtml[0];
   $lastitem =~ s/-.*//g;
-  $mastertemplates = qq|<option>$lastitem\n|;
+  $form->{ALL_MASTER_TEMPLATES} = [ { "name" => $lastitem, "selected" => $lastitem eq "German" } ];
   foreach $item (@allhtml) {
     $item =~ s/-.*//g;
+    next if ($item eq $lastitem);
 
-    if ($item ne $lastitem) {
-      my $selected = $item eq "German" ? " selected" : "";
-      $mastertemplates .= qq|<option$selected>$item\n|;
-      $lastitem = $item;
-    }
+    push @{ $form->{ALL_MASTER_TEMPLATES} }, { "name" => $item, "selected" => $item eq "German" };
+    $lastitem = $item;
   }
 
-#  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
+  $form->{ALL_STYLESHEETS} = [ map { { "name" => $_, "selected" => $_ eq $myconfig->{stylesheet} } } qw(lx-office-erp.css Win2000.css) ];
 
-# css dir has styles that are not intended as general layouts.
-# reverting to hardcoded list
-  @all = qw(lx-office-erp.css Win2000.css);
+  $form->{"menustyle_" . $myconfig->{menustyle} } = 1;
 
-  foreach $item (@all) {
-    if ($item eq $myconfig->{stylesheet}) {
-      $selectstylesheet .= qq|<option selected>$item\n|;
-    } else {
-      $selectstylesheet .= qq|<option>$item\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>
-
-<form method=post action=$form->{script}>
-
-<table width=100%>
-  <tr class=listheading><th colspan=2>$form->{title}</th></tr>
-  <tr size=5></tr>
-  <tr valign=top>
-    <td>
-      <table>
-	<tr>
-	  <th align=right>| . $locale->text('Login') . qq|</th>
-	  <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}">
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Name') . qq|</th>
-	  <td><input name="name" size="15" value="$myconfig->{name}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('E-mail') . qq|</th>
-	  <td><input name=email size=30 value="$myconfig->{email}"></td>
-	</tr>
-	<tr valign=top>
-	  <th align=right>| . $locale->text('Signature') . qq|</th>
-	  <td><textarea name=signature rows=3 cols=35>$myconfig->{signature}</textarea></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Phone') . qq|</th>
-	  <td><input name=tel size=14 value="$myconfig->{tel}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Fax') . qq|</th>
-	  <td><input name=fax size=14 value="$myconfig->{fax}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Company') . qq|</th>
-	  <td><input name=company size=35 value="$myconfig->{company}"></td>
-	</tr>
-	<tr valign=top>
-	  <th align=right>| . $locale->text('Address') . qq|</th>
-	  <td><textarea name=address rows=4 cols=35>$myconfig->{address}</textarea></td>
-	</tr>
-        <tr valign=top>
-	  <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=co_ustid size=14 value="$myconfig->{co_ustid}"></td>
-	</tr>
-        <tr valign=top>
-	  <th align=right>| . $locale->text('DUNS-Nr') . qq|</th>
-	  <td><input name=duns size=14 value="$myconfig->{duns}"></td>
-	</tr>
-      </table>
-    </td>
-    <td>
-      <table>
-	<tr>
-	  <th align=right>| . $locale->text('Date Format') . qq|</th>
-	  <td><select name=dateformat>$dateformat</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Number Format') . qq|</th>
-	  <td><select name=numberformat>$numberformat</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Dropdown Limit') . qq|</th>
-	  <td><input name=vclimit value="$myconfig->{vclimit}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Language') . qq|</th>
-	  <td><select name=countrycode>$countrycodes</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Stylesheet') . qq|</th>
-	  <td><select name=userstylesheet>$selectstylesheet</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Printer') . qq|</th>
-	  <td><input name=printer size=20 value="$myconfig->{printer}"></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('Use Templates') . qq|</th>
-	  <td><select name=usetemplates>$usetemplates</select></td>
-	</tr>
-	<tr>
-	  <th align=right>| . $locale->text('New Templates') . qq|</th>
-	  <td><input name=newtemplates></td>
-	</tr>
-	<tr>
-	  <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>
-  </tr>
-  <tr class=listheading>
-    <th colspan=2>| . $locale->text('Database') . qq|</th>
-  </tr>|;
-
-  # list section for database drivers
-  foreach $item (User->dbdrivers) {
-
-    print qq|
-  <tr>
-    <td colspan=2>
-      <table>
-	<tr>|;
-
-    $checked = "";
-    if ($myconfig->{dbdriver} eq $item) {
-      map { $form->{"${item}_$_"} = $myconfig->{$_} }
-        qw(dbhost dbport dbuser dbpasswd dbname sid);
-      $checked = "checked";
-    }
-
-    print qq|
-	  <th align=right>| . $locale->text('Driver') . qq|</th>
-	  <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>
-	</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>
-	  <th align=right>| . $locale->text('Port') . qq|</th>
-	  <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>
-	  <th align=right>| . $locale->text('Password') . qq|</th>
-	  <td><input name="${item}_dbpasswd" type=password size=10 value="$form->{"${item}_dbpasswd"}"></td>
-	</tr>|;
-
-    }
-
-    if ($item eq 'Oracle') {
-      print qq|
-	  <th align=right>SID</th>
-	  <td><input name=Oracle_sid value=$form->{Oracle_sid}></td>
-	  <th align=right>| . $locale->text('Port') . qq|</th>
-	  <td><input name=Oracle_dbport size=4 value=$form->{Oracle_dbport}></td>
-	</tr>
-	<tr>
-	  <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>
-
-	</tr>|;
-    }
-
-    print qq|
-	<input type="hidden" name="old_dbpasswd" value="$myconfig->{dbpasswd}">
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td colspan=2><hr size=2 noshade></td>
-  </tr>
-|;
+  map { $form->{"myc_${_}"} = $myconfig->{$_} } keys %{ $myconfig };
 
-  }
+  map { $form->{"Pg_${_}"} = $myconfig->{$_} } qw(dbhost dbport dbname dbuser dbpasswd);
 
   # access control
+  my @acsorder = ();
+  my %acs      = ();
+  my %excl     = ();
   open(FH, $menufile) or $form->error("$menufile : $!");
 
-  # scan for first menu level
-  @a = <FH>;
-  close(FH);
-
-  foreach $item (@a) {
+  while ($item = <FH>) {
     next unless $item =~ /\[/;
     next if $item =~ /\#/;
 
     $item =~ s/(\[|\])//g;
-    chop $item;
+    chomp $item;
+
+    my ($level, $menuitem);
 
     if ($item =~ /--/) {
       ($level, $menuitem) = split /--/, $item, 2;
@@ -532,122 +274,42 @@ sub form_header {
       push @acsorder, $item;
     }
 
+    $acs{$level} ||= [];
     push @{ $acs{$level} }, $menuitem;
 
   }
 
-  %role = ('admin'      => $locale->text('Administrator'),
-           'user'       => $locale->text('User'),
-           'manager'    => $locale->text('Manager'),
-           'supervisor' => $locale->text('Supervisor'));
-
-  $selectrole = "";
-  foreach $item (qw(user supervisor manager admin)) {
-    $selectrole .=
-      ($myconfig->{role} eq $item)
-      ? "<option selected value=$item>$role{$item}\n"
-      : "<option value=$item>$role{$item}\n";
-  }
-
-  print qq|
-  <tr class=listheading>
-    <th colspan=2>| . $locale->text('Access Control') . qq|</th>
-  </tr>
-  <tr>
-    <td><select name=role>$selectrole</select></td>
-  </tr>
-|;
-
   foreach $item (split(/;/, $myconfig->{acs})) {
     ($key, $value) = split /--/, $item, 2;
     $excl{$key}{$value} = 1;
   }
 
-  foreach $key (@acsorder) {
-
-    $checked = "checked";
-    if ($form->{login}) {
-      $checked = ($excl{$key}{$key}) ? "" : "checked";
-    }
-
-    # can't have variable names with spaces
-    # the 1 is for apache 2
-    $item = $form->escape("${key}--$key", 1);
-
-    $acsheading = $key;
-    $acsheading =~ s/ /&nbsp;/g;
+  $form->{ACLS}    = [];
+  $form->{all_acs} = "";
 
-    $acsheading = qq|
-    <th align=left><input name="$item" class=checkbox type=checkbox value=1 $checked>&nbsp;$acsheading</th>\n|;
-    $menuitems .= "$item;";
-    $acsdata = "
-    <td>";
+  foreach $key (@acsorder) {
+    my $acl = { "checked" => $form->{login} ? !$excl{$key}->{$key} : 1,
+                "name"    => "${key}--${key}",
+                "title"   => $key,
+                "SUBACLS" => [], };
+    $form->{all_acs} .= "${key}--${key};";
 
     foreach $item (@{ $acs{$key} }) {
       next if ($key eq $item);
 
-      $checked = "checked";
-      if ($form->{login}) {
-        $checked = ($excl{$key}{$item}) ? "" : "checked";
-      }
-
-      $acsitem = $form->escape("${key}--$item", 1);
-
-      $acsdata .= qq|
-    <br><input name="$acsitem" class=checkbox type=checkbox value=1 $checked>&nbsp;$item|;
-      $menuitems .= "$acsitem;";
+      my $subacl = { "checked" => $form->{login} ? !$excl{$key}->{$item} : 1,
+                     "name"    => "${key}--${item}",
+                     "title"   => $item };
+      push @{ $acl->{SUBACLS} }, $subacl;
+      $form->{all_acs} .= "${key}--${item};";
     }
-
-    $acsdata .= "
-    </td>";
-
-    print qq|
-  <tr valign=top>$acsheading $acsdata
-  </tr>
-|;
+    push @{ $form->{ACLS} }, $acl;
   }
 
-  print qq|<input type=hidden name=acs value="$menuitems">
-|;
-  if ($webdav) {
-    @webdavdirs =
-      qw(angebote bestellungen rechnungen anfragen lieferantenbestellungen einkaufsrechnungen);
-    foreach $directory (@webdavdirs) {
-      if ($myconfig->{$directory}) {
-        $webdav{"${directory}c"} = "checked";
-      } else {
-        $webdav{"${directory}c"} = "";
-      }
-    }
-    print qq|
-   <tr>
-    <td colspan=2><hr size=3 noshade></td>
-  </tr>
-  <tr class=listheading>
-    <th colspan=2>| . $locale->text('WEBDAV-Zugriff') . qq|</th>
-  </tr>
-  <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=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=einkaufsrechnungen class=checkbox type=checkbox value=1 $webdav{einkaufsrechnungenc}>&nbsp;Einkaufsrechnung</td>
-	</tr>
-  </table>
-  <tr>
-    <td colspan=2><hr size=3 noshade></td>
-  </tr>
-|;
-  }
-  print qq|
-</table>
-</div>
-|;
+  chop $form->{all_acs};
 
+  $form->header();
+  print $form->parse_html_template("admin/edit_user");
 }
 
 sub save {
@@ -682,28 +344,24 @@ sub save {
 
   # is there a basedir
   if (!-d "$templates") {
-    $form->error(  $locale->text('Directory')
-                 . ": $templates "
-                 . $locale->text('does not exist'));
+    $form->error(sprintf($locale->text("The directory %s does not exist."), $templates));
   }
 
   # add base directory to $form->{templates}
-  $form->{templates} = "$templates/$form->{templates}";
+  $form->{templates} =~ s|.*/||;
+  $form->{templates} =  "$templates/$form->{templates}";
 
   $myconfig = new User "$memberfile", "$form->{login}";
 
   # redo acs variable and delete all the acs codes
-  @acs = split(/;/, $form->{acs});
-
-  $form->{acs} = "";
-  foreach $item (@acs) {
-    $item = $form->escape($item, 1);
-
-    if (!$form->{$item}) {
-      $form->{acs} .= $form->unescape($form->unescape($item)) . ";";
-    }
-    delete $form->{$item};
+  my @acs;
+  foreach $item (split m|;|, $form->{all_acs}) {
+    my $name =  "ACS_${item}";
+    $name    =~ s| |+|g;
+    push @acs, $item if !$form->{$name};
+    delete $form->{$name};
   }
+  $form->{acs} = join ";", @acs;
 
   # check which database was filled in
   if ($form->{dbdriver} eq 'Oracle') {
@@ -729,18 +387,6 @@ sub save {
     $form->isblank("dbuser", $locale->text('Database User missing!'));
   }
 
-  if ($webdav) {
-    @webdavdirs =
-      qw(angebote bestellungen rechnungen anfragen lieferantenbestellungen einkaufsrechnungen);
-    foreach $directory (@webdavdirs) {
-      if ($form->{$directory}) {
-        $form->{$directory} = $form->{$directory};
-      } else {
-        $form->{$directory} = 0;
-      }
-    }
-  }
-
   foreach $item (keys %{$form}) {
     $myconfig->{$item} = $form->{$item};
   }
diff --git a/locale/de/admin b/locale/de/admin
index 649ad6c35..9455d2890 100644
--- a/locale/de/admin
+++ b/locale/de/admin
@@ -1,17 +1,14 @@
 $self->{texts} = {
   'ADDED'                       => 'Hinzugefügt',
-  'Access Control'              => 'Zugriffkontrolle',
   'Add User'                    => 'Benutzer erfassen',
   'Address'                     => 'Adresse',
   'Administration'              => 'Administration',
-  'Administrator'               => 'Administrator',
   'All Datasets up to date!'    => 'Alle Datenbanken sind auf aktuellem Stand.',
   'Attempt to call an undefined sub named \'%s\'' => 'Es wurde versucht, eine nicht definierte Unterfunktion namens \'%s\' aufzurufen.',
   'Bin List'                    => 'Lagerliste',
   'CANCELED'                    => 'Storniert',
   'Cannot create Lock!'         => 'System kann nicht gesperrt werden!',
   'Change Admin Password'       => 'Administratorpasswort ändern',
-  'Company'                     => 'Firma',
   'Confirmation'                => 'Auftragsbestätigung',
   'Connect to'                  => 'Als Vorlage verwenden',
   'Continue'                    => 'Weiter',
@@ -21,47 +18,34 @@ $self->{texts} = {
   'Customer details'            => 'Kundendetails',
   'DELETED'                     => 'Gelöscht',
   'DUNNING STARTED'             => 'Mahnprozess gestartet',
-  'DUNS-Nr'                     => 'DUNS-Nr.',
   'Database'                    => 'Datenbank',
   'Database Administration'     => 'Datenbankadministration',
   'Database Driver not checked!' => 'Kein Datenbanktreiber ausgewählt!',
   'Database User missing!'      => 'Datenbankbenutzer fehlt!',
-  'Dataset'                     => 'Datenbank',
   'Dataset missing!'            => 'Datenbank fehlt!',
   'Dataset updated!'            => 'Datenbank erneuert!',
   'Dataset upgrade'             => 'Datenbankaktualisierung',
-  'Date Format'                 => 'Datumsformat',
-  'Delete'                      => 'Löschen',
   'Delete Dataset'              => 'Datenbank löschen',
   'Dependency loop detected:'   => 'Schleife in den Abh&auml;ngigkeiten entdeckt:',
-  'Directory'                   => 'Verzeichnis',
-  'Driver'                      => 'Treiber',
-  'Dropdown Limit'              => 'Auswahllistenbegrenzung',
-  'E-mail'                      => 'eMail',
   'ELSE'                        => 'Zusatz',
   'Edit User'                   => 'Benutzerdaten bearbeiten',
   'Enter longdescription'       => 'Langtext eingeben',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',
-  'Fax'                         => 'Fax',
   'File locked!'                => 'Datei gesperrt!',
   'History'                     => 'Historie',
   'Host'                        => 'Datenbankcomputer',
   'Hostname missing!'           => 'Computername fehlt!',
   'Incorrect Password!'         => 'Ungültiges Passwort!',
   'Invoice'                     => 'Rechnung',
-  'Language'                    => 'Sprache',
   'Leave host and port field empty unless you want to make a remote connection.' => 'Für lokale Verbindungen "Rechner" und "Port" freilassen.',
   'Lockfile created!'           => 'System gesperrt!',
   'Lockfile removed!'           => 'System entsperrt!',
-  'Login'                       => 'Anmeldung',
   'Login name missing!'         => 'Loginname fehlt.',
   'MAILED'                      => 'Gesendet',
-  'Manager'                     => 'Manager',
   'Missing \'description\' field.' => 'Fehlendes Feld \'description\'.',
   'Missing \'tag\' field.'      => 'Fehlendes Feld \'tag\'.',
   'More than one control file with the tag \'%s\' exist.' => 'Es gibt mehr als eine Kontrolldatei mit dem Tag \'%s\'.',
   'Name'                        => 'Name',
-  'New Templates'               => 'neue Vorlagen',
   'No Customer was found matching the search parameters.' => 'Zu dem Suchbegriff wurde kein Endkunde gefunden',
   'No Database Drivers available!' => 'Kein Datenbanktreiber verfügbar!',
   'No Dataset selected!'        => 'Keine Datenbank ausgewählt!',
@@ -72,8 +56,6 @@ $self->{texts} = {
   'No project was found matching the search parameters.' => 'Es wurde kein Projekt gefunden, auf das die Suchparameter zutreffen.',
   'No vendor has been selected yet.' => 'Es wurde noch kein Lieferant ausgewählt.',
   'Nothing to delete!'          => 'Es konnte nichts gelöscht werden!',
-  'Number Format'               => 'Zahlenformat',
-  'Old (on the side)'           => 'Alt (seitlich)',
   'PAYMENT POSTED'              => 'Rechung gebucht',
   'POSTED'                      => 'Gebucht',
   'POSTED AS NEW'               => 'Als neu gebucht',
@@ -83,12 +65,10 @@ $self->{texts} = {
   'Part description'            => 'Artikelbeschreibung',
   'Password'                    => 'Passwort',
   'Password changed!'           => 'Passwort geändert!',
-  'Phone'                       => 'Telefon',
   'Pick List'                   => 'Sammelliste',
   'Please enter values'         => 'Bitte Werte eingeben',
   'Port'                        => 'Port',
   'Port missing!'               => 'Portangabe fehlt!',
-  'Printer'                     => 'Drucker',
   'Proforma Invoice'            => 'Proformarechnung',
   'Project Number'              => 'Projektnummer',
   'Project description'         => 'Projektbeschreibung',
@@ -98,41 +78,30 @@ $self->{texts} = {
   'SAVED'                       => 'Gespeichert',
   'SAVED FOR DUNNING'           => 'Gespeichert',
   'SCREENED'                    => 'Angezeigt',
-  'Save'                        => 'Speichern',
   'Select a Customer'           => 'Endkunde auswählen',
   'Select a part'               => 'Artikel ausw&auml;hlen',
   'Select a project'            => 'Projekt ausw&auml;hlen',
   'Select an employee'          => 'Angestellten ausw&auml;hlen',
-  'Setup Menu'                  => 'Menüsetup',
-  'Setup Templates'             => 'Vorlagen auswählen',
-  'Signature'                   => 'Unterschrift',
   'Storno Invoice'              => 'Stornorechnung',
   'Storno Packing List'         => 'Stornolieferschein',
-  'Stylesheet'                  => 'Stilvorlage',
-  'Supervisor'                  => 'Supervisor',
-  'Tax number'                  => 'Steuernummer',
   'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.',
+  'The directory %s does not exist.' => 'Das Verzeichnis %s existiert nicht.',
   'The following Datasets need to be updated' => 'Folgende Datenbanken müssen aktualisiert werden',
+  'The login is missing.'       => 'Das Login fehlt.',
   'The passwords do not match.' => 'Die Passw&ouml;rter stimmen nicht &uuml;berein.',
   'This is a preliminary check for existing sources. Nothing will be created or deleted at this stage!' => 'In diesem Schritt werden bestehende Datenbanken gesucht. Es werden noch keine Änderungen vorgenommen!',
-  'Top (CSS)'                   => 'Oben (mit CSS)',
-  'Top (Javascript)'            => 'Oben (mit Javascript)',
   'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',
   'Unit'                        => 'Einheit',
   'Unknown dependency \'%s\'.'  => 'Unbekannte Abh&auml;ngigkeit \'%s\'.',
   'Update Dataset'              => 'Datenbank aktualisieren',
-  'Use Templates'               => 'benutze Vorlagen',
   'User'                        => 'Benutzer',
   'User deleted!'               => 'Benutzer gelöscht!',
   'User saved!'                 => 'Benutzer gespeichert!',
-  'Ust-IDNr'                    => 'USt-IdNr.',
   'Value'                       => 'Wert',
   'Variable'                    => 'Variable',
   'Vendor details'              => 'Lieferantendetails',
-  'WEBDAV-Zugriff'              => 'WEBDAV-Zugriff',
   'You must enter a host and port for local and remote connections!' => '"Rechner" und "Port" müssen für lokale und externe Verbindungen eingetragen werden!',
   'bin_list'                    => 'Lagerliste',
-  'does not exist'              => 'existiert nicht',
   'invoice'                     => 'Rechnung',
   'is already a member!'        => 'ist bereits ein Mitglied!',
   'packing_list'                => 'Versandliste',
@@ -168,9 +137,8 @@ $self->{subs} = {
   'delete_dataset'              => 'delete_dataset',
   'delivery_customer_selection' => 'delivery_customer_selection',
   'edit'                        => 'edit',
+  'edit_user_form'              => 'edit_user_form',
   'employee_selection_internal' => 'employee_selection_internal',
-  'form_footer'                 => 'form_footer',
-  'form_header'                 => 'form_header',
   'format_dates'                => 'format_dates',
   'get_value'                   => 'get_value',
   'list_users'                  => 'list_users',
diff --git a/locale/de/all b/locale/de/all
index 0ab7c1c78..7e11ca35c 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -123,7 +123,6 @@ $self->{texts} = {
   'Add unit'                    => 'Einheit hinzuf&uuml;gen',
   'Address'                     => 'Adresse',
   'Administration'              => 'Administration',
-  'Administrator'               => 'Administrator',
   'Aktion'                      => 'Aktion',
   'All'                         => 'Alle',
   'All Accounts'                => 'Alle Konten',
@@ -198,7 +197,6 @@ aktualisieren wollen?',
   'Buchungsgruppen'             => 'Buchungsgruppen',
   'Buchungsjournal'             => 'Buchungsjournal',
   'Buchungsnummer'              => 'Buchungsnummer',
-  'Business'                    => '',
   'Business Number'             => 'Firmennummer',
   'Business Volume'             => 'Geschäftsvolumen',
   'Business deleted!'           => 'Firma gelöscht.',
@@ -366,7 +364,6 @@ aktualisieren wollen?',
   'Difference'                  => 'Differenz',
   'Dimension unit'              => 'Ma&szlig;einheit',
   'Dimension units'             => 'Ma&szlig;einheiten',
-  'Directory'                   => 'Verzeichnis',
   'Discount'                    => 'Rabatt',
   'Display'                     => 'Anzeigen',
   'Display file'                => 'Datei anzeigen',
@@ -656,7 +653,6 @@ gestartet',
   'MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES' => 'Ihr Browser kann leider keine eingebetteten Frames anzeigen. Bitte w&auml;hlen Sie ein anderes Men&uuml; in der Benutzerkonfiguration im Administrationsmen&uuml; aus.',
   'Main Preferences'            => 'Grundeinstellungen',
   'Make'                        => 'Hersteller',
-  'Manager'                     => 'Manager',
   'Mandantennummer'             => 'Mandantennummer',
   'Mar'                         => 'März',
   'March'                       => 'März',
@@ -790,7 +786,6 @@ gestartet',
   'Payment date missing!'       => 'Tag der Zahlung fehlt!',
   'Payment posted!'             => 'Zahlung gebucht!',
   'Payment terms deleted!'      => 'Zahlungskonditionen gelöscht!',
-  'Payment until'               => '',
   'Payments'                    => 'Zahlungsausgänge',
   'Period'                      => 'Zeitraum',
   'Pg Database Administration'  => 'Datenbankadministration',
@@ -1007,7 +1002,6 @@ gestartet',
   'Subject'                     => 'Betreff',
   'Subject:'                    => 'Betreff:',
   'Subtotal'                    => 'Zwischensumme',
-  'Supervisor'                  => 'Supervisor',
   'System'                      => 'System',
   'TOP100'                      => 'Top 100',
   'Tax'                         => 'Steuer',
@@ -1047,6 +1041,7 @@ gestartet',
   'The database upgrade for the introduction of Buchungsgruppen is now complete.' => 'Das Datenbankupgrade f&uuml;r die Einf&uuml;hrung von Buchungsgruppen ist jetzt beendet.',
   'The database upgrade for the introduction of units is now complete.' => 'Das Datenbankupgrade zwecks Einf&uuml;hrung von Einheiten ist nun beendet.',
   'The dataset <TMPL_VAR db ESCAPE=HTML> has been successfully created.' => 'Die Datenbank <TMPL_VAR db ESCAPE=HTML> wurde erfolgreich erstellt.',
+  'The directory %s does not exist.' => 'Das Verzeichnis %s existiert nicht.',
   'The dunning process started' => 'Der Mahnprozess ist gestartet.',
   'The factor is missing in row %d.' => 'Der Faktor fehlt in Zeile %d.',
   'The factor is missing.'      => 'Der Faktor fehlt.',
@@ -1058,6 +1053,7 @@ gestartet',
   'The following warnings occured during an upgrade to the document templates:' => 'Die folgenden Warnungen traten w&auml;hrend einer Aktualisierung der Dokumentenvorlagen auf:',
   'The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br>' => 'Die Formeln m&uuml;ssen in der folgenden Syntax eingegeben werden:<br>Bei normalen Artikeln:<br>Variablenname= Variable Einheit;<br>Variablenname2= Variable2 Einheit2;<br>...<br>###<br>Variable + Variable2 * ( Variable - Variable2 )<br>Bitte achten Sie auf die Leerzeichen in der Formel<br>Es muss jeweils die Gesamte Zeile eingegeben werden',
   'The licensing module has been deactivated in lx-erp.conf.' => 'Das Lizenzverwaltungsmodul wurde in lx-erp.conf deaktiviert.',
+  'The login is missing.'       => 'Das Login fehlt.',
   'The name in row %d has already been used before.' => 'Der Name in Zeile %d wurde vorher bereits benutzt.',
   'The name is missing in row %d.' => 'Der Name fehlt in Zeile %d.',
   'The name is missing.'        => 'Der Name fehlt.',
@@ -1091,7 +1087,6 @@ gestartet',
   'Top Level'                   => 'Hauptartikelbezeichnung',
   'Total'                       => 'Summe',
   'Total Fees'                  => 'Kumulierte Gebühren',
-  'Total Interest'              => '',
   'Trade Discount'              => 'Rabatt',
   'Transaction Date missing!'   => 'Buchungsdatum fehlt!',
   'Transaction deleted!'        => 'Buchung gelöscht!',
@@ -1159,7 +1154,7 @@ gestartet',
   'Version'                     => 'Version',
   'View License'                => 'Lizenz ansehen',
   'Von Konto: '                 => 'von Konto: ',
-  'WEBDAV-Zugriff'              => 'WEBDAV-Zugriff',
+  'WEBDAV access'               => 'WEBDAV-Zugriff',
   'Warnings during template upgrade' => 'Warnungen bei Aktualisierung der Dokumentenvorlagen',
   'Weight'                      => 'Gewicht',
   'What type of item is this?'  => 'Was ist dieser Artikel?',
@@ -1213,7 +1208,6 @@ gestartet',
   'delete'                      => 'Löschen',
   'deliverydate'                => 'Lieferdatum',
   'dimension units'             => 'Ma&szlig;einheiten',
-  'does not exist'              => 'existiert nicht',
   'done'                        => 'erledigt',
   'down'                        => 'runter',
   'drucken'                     => 'drucken',
diff --git a/templates/webpages/admin/edit_user_de.html b/templates/webpages/admin/edit_user_de.html
new file mode 100644
index 000000000..d76881bc9
--- /dev/null
+++ b/templates/webpages/admin/edit_user_de.html
@@ -0,0 +1,260 @@
+<body class="admin">
+
+ <form method="post" action="admin.pl">
+
+  <div class="listtop" width="100%"><TMPL_VAR title></div>
+
+  <table width="100%">
+   <tr valign="top">
+    <td>
+     <table>
+      <tr>
+       <th align="right">Anmeldung</th>
+       <td><input name="login" value="<TMPL_VAR myc_login ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr>
+       <th align="right">Passwort</th>
+       <td><input type="password" name="password" size="8" value="<TMPL_VAR myc_password ESCAPE=HTML>"></td>
+       <input type="hidden" name="old_password" value="<TMPL_VAR myc_password ESCAPE=HTML>">
+      </tr>
+
+      <tr>
+       <th align="right">Name</th>
+       <td><input name="name" size="15" value="<TMPL_VAR myc_name ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr>
+       <th align="right">eMail</th>
+       <td><input name="email" size="30" value="<TMPL_VAR myc_email ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr valign="top">
+       <th align="right">Unterschrift</th>
+       <td><textarea name="signature" rows="3" cols="35"><TMPL_VAR myc_signature ESCAPE=HTML></textarea></td>
+      </tr>
+
+      <tr>
+       <th align="right">Telefon</th>
+       <td><input name="tel" size="14" value="<TMPL_VAR myc_tel ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr>
+       <th align="right">Fax</th>
+       <td><input name="fax" size="14" value="<TMPL_VAR myc_fax ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr>
+       <th align="right">Firma</th>
+       <td><input name="company" size="35" value="<TMPL_VAR myc_company ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr valign="top">
+       <th align="right">Adresse</th>
+       <td><textarea name="address" rows="4" cols="35"><TMPL_VAR myc_address ESCAPE=HTML></textarea></td>
+      </tr>
+
+      <tr valign="top">
+       <th align="right">Steuernummer</th>
+       <td><input name="taxnumber" size="14" value="<TMPL_VAR myc_taxnumber ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr valign="top">
+       <th align="right">USt-IdNr.</th>
+       <td><input name="co_ustid" size="14" value="<TMPL_VAR myc_co_ustid ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr valign="top">
+       <th align="right">DUNS-Nr.</th>
+       <td><input name="duns" size="14" value="<TMPL_VAR myc_duns ESCAPE=HTML>"></td>
+      </tr>
+     </table>
+    </td>
+
+    <td>
+     <table>
+      <tr>
+       <th align="right">Datumsformat</th>
+       <td>
+        <select name="dateformat">
+         <TMPL_LOOP ALL_DATEFORMATS><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR format ESCAPE=HTML></option>
+         </TMPL_LOOP>
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right">Zahlenformat</th>
+       <td>
+        <select name="numberformat">
+         <TMPL_LOOP ALL_NUMBERFORMATS><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR format ESCAPE=HTML></option>
+         </TMPL_LOOP>
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right">Auswahllistenbegrenzung</th>
+       <td><input name="vclimit" value="<TMPL_VAR myc_vclimit ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr>
+       <th align="right">Sprache</th>
+       <td>
+        <select name="countrycode">
+         <TMPL_LOOP ALL_COUNTRYCODES><option value="<TMPL_VAR value ESCAPE=HTML>" <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
+         </TMPL_LOOP>
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right">Stilvorlage</th>
+       <td>
+        <select name="userstylesheet">
+         <TMPL_LOOP ALL_STYLESHEETS><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
+         </TMPL_LOOP>
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right">Drucker</th>
+       <td><input name="printer" size="20" value="<TMPL_VAR myc_printer ESCAPE=HTML>"></td>
+      </tr>
+      <tr>
+       <th align="right">benutze Vorlagen</th>
+       <td>
+        <select name="usetemplates">
+         <TMPL_LOOP ALL_TEMPLATES><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
+         </TMPL_LOOP>
+        </select>
+       </td>
+      </tr>
+      <tr>
+       <th align="right">neue Vorlagen</th>
+       <td><input name="newtemplates"></td>
+      </tr>
+      <tr>
+       <th align="right">Vorlagen auswählen</th>
+       <td>
+        <select name="mastertemplates">
+         <TMPL_LOOP ALL_MASTER_TEMPLATES><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
+         </TMPL_LOOP>
+        </select>
+       </td>
+      </tr>
+      <tr>
+       <th align="right">Menüsetup</th>
+       <td>
+        <input name="menustyle" type="radio" class="radio" value="v3" <TMPL_IF menustyle_v3>checked</TMPL_IF>>&nbsp;Oben (mit CSS)
+        <input name="menustyle" type="radio" class="radio" value="neu" <TMPL_IF menustyle_neu>checked</TMPL_IF>>&nbsp;Oben (mit Javascript)
+        <input name="menustyle" type="radio" class="radio" value="old" <TMPL_IF menustyle_old>checked</TMPL_IF>>&nbsp;Alt (seitlich)
+       </td>
+      </tr>
+
+      <input type="hidden" name="templates" value="<TMPL_VAR myc_templates ESCAPE=HTML>">
+     </table>
+    </td>
+   </tr>
+
+   <tr class="listheading">
+    <th colspan="2">Datenbank</th>
+   </tr>
+
+   <tr>
+    <td colspan="2">
+     <table>
+      <tr>
+       <th align="right">Treiber</th>
+       <td><input type="hidden" name="dbdriver" value="Pg">PostgreSQL</td>
+       <th align="right">Datenbankcomputer</th>
+       <td><input name="Pg_dbhost" size="30" value="<TMPL_VAR Pg_dbhost ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr>
+       <th align="right">Datenbank</th>
+       <td><input name="Pg_dbname" size="15" value="<TMPL_VAR Pg_dbname ESCAPE=HTML>"></td>
+       <th align="right">Port</th>
+       <td><input name="Pg_dbport" size="4" value="<TMPL_VAR Pg_dbport ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr>
+       <th align="right">Benutzer</th>
+       <td><input name="Pg_dbuser" size="15" value="<TMPL_VAR Pg_dbuser ESCAPE=HTML>"></td>
+       <th align="right">Passwort</th>
+       <td><input name="Pg_dbpasswd" type="password" size="10" value="<TMPL_VAR Pg_dbpasswd ESCAPE=HTML>"></td>
+      </tr>
+
+      <input type="hidden" name="old_dbpasswd" value="<TMPL_VAR myc_dbpasswd ESCAPE=HTML>">
+     </table>
+    </td>
+   </tr>
+
+   <tr>
+    <td colspan="2"><hr size="2" noshade></td>
+   </tr>
+
+   <tr class="listheading"><th colspan="2">Zugriffkontrolle</th></tr>
+
+   <TMPL_LOOP ACLS>
+    <tr>
+     <td valign="top">
+      <input type="checkbox" name="ACS_<TMPL_VAR name ESCAPE=HTML>" id="ACS_<TMPL_VAR name ESCAPE=HTML>" value="1" <TMPL_IF checked>checked</TMPL_IF>>
+      <label for="ACS_<TMPL_VAR name ESCAPE=HTML>"><TMPL_VAR title ESCAPE=HTML></label>
+     </td>
+
+     <td valign="top">
+      <TMPL_LOOP SUBACLS>
+       <input type="checkbox" name="ACS_<TMPL_VAR name ESCAPE=HTML>" id="ACS_<TMPL_VAR name ESCAPE=HTML>" value="1" <TMPL_IF checked>checked</TMPL_IF>>
+       <label for="ACS_<TMPL_VAR name ESCAPE=HTML>"><TMPL_VAR title ESCAPE=HTML></label>
+       <TMPL_UNLESS __last__><br></TMPL_UNLESS>
+      </TMPL_LOOP>
+     </td>
+    </tr>
+   </TMPL_LOOP>
+
+   <input type="hidden" name="all_acs" value="<TMPL_VAR all_acs ESCAPE=HTML>">
+
+   <tr><td colspan="2"><hr size="3" noshade></td></tr>
+
+   <tr class="listheading">
+    <th colspan="2">WEBDAV-Zugriff</th>
+   </tr>
+
+   <tr>
+    <td colspan="2">
+     <table>
+      <tr>
+       <td><input name="angebote" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_angebote>checked</TMPL_IF>>&nbsp;Angebot</td>
+       <td><input name="bestellungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_bestellungen>checked</TMPL_IF>>&nbsp;Bestellung</td>
+       <td><input name="rechnungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_rechnung>checked</TMPL_IF>>&nbsp;Rechnung</td>
+      </tr>
+
+      <tr>
+       <td><input name="anfragen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_anfragen>checked</TMPL_IF>>&nbsp;Anfragen</td>
+       <td><input name="lieferantenbestellungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_lieferantenbestellungen>checked</TMPL_IF>>&nbsp;Lieferantenbestellung</td>
+       <td><input name="einkaufsrechnungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_einkaufsrechnungen>checked</TMPL_IF>>&nbsp;Einkaufsrechnung</td>
+      </tr>
+     </table>
+    </td>
+   </tr>
+
+   <tr><td colspan="2"><hr size="3" noshade></td></tr>
+
+  </table>
+
+  <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
+  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+
+  <input type="submit" class="submit" name="action" value="Speichern">
+
+  <TMPL_IF edit>
+   <input type="submit" class="submit" name="action" value="Löschen">
+   <input type="hidden" name="edit" value="1">
+  </TMPL_IF>
+
+ </form>
+
+</body>
+</html>
diff --git a/templates/webpages/admin/edit_user_master.html b/templates/webpages/admin/edit_user_master.html
new file mode 100644
index 000000000..25a870670
--- /dev/null
+++ b/templates/webpages/admin/edit_user_master.html
@@ -0,0 +1,260 @@
+<body class="admin">
+
+ <form method="post" action="admin.pl">
+
+  <div class="listtop" width="100%"><TMPL_VAR title></div>
+
+  <table width="100%">
+   <tr valign="top">
+    <td>
+     <table>
+      <tr>
+       <th align="right"><translate>Login</translate></th>
+       <td><input name="login" value="<TMPL_VAR myc_login ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr>
+       <th align="right"><translate>Password</translate></th>
+       <td><input type="password" name="password" size="8" value="<TMPL_VAR myc_password ESCAPE=HTML>"></td>
+       <input type="hidden" name="old_password" value="<TMPL_VAR myc_password ESCAPE=HTML>">
+      </tr>
+
+      <tr>
+       <th align="right"><translate>Name</translate></th>
+       <td><input name="name" size="15" value="<TMPL_VAR myc_name ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr>
+       <th align="right"><translate>E-mail</translate></th>
+       <td><input name="email" size="30" value="<TMPL_VAR myc_email ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr valign="top">
+       <th align="right"><translate>Signature</translate></th>
+       <td><textarea name="signature" rows="3" cols="35"><TMPL_VAR myc_signature ESCAPE=HTML></textarea></td>
+      </tr>
+
+      <tr>
+       <th align="right"><translate>Phone</translate></th>
+       <td><input name="tel" size="14" value="<TMPL_VAR myc_tel ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr>
+       <th align="right"><translate>Fax</translate></th>
+       <td><input name="fax" size="14" value="<TMPL_VAR myc_fax ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr>
+       <th align="right"><translate>Company</translate></th>
+       <td><input name="company" size="35" value="<TMPL_VAR myc_company ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr valign="top">
+       <th align="right"><translate>Address</translate></th>
+       <td><textarea name="address" rows="4" cols="35"><TMPL_VAR myc_address ESCAPE=HTML></textarea></td>
+      </tr>
+
+      <tr valign="top">
+       <th align="right"><translate>Tax number</translate></th>
+       <td><input name="taxnumber" size="14" value="<TMPL_VAR myc_taxnumber ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr valign="top">
+       <th align="right"><translate>Ust-IDNr</translate></th>
+       <td><input name="co_ustid" size="14" value="<TMPL_VAR myc_co_ustid ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr valign="top">
+       <th align="right"><translate>DUNS-Nr</translate></th>
+       <td><input name="duns" size="14" value="<TMPL_VAR myc_duns ESCAPE=HTML>"></td>
+      </tr>
+     </table>
+    </td>
+
+    <td>
+     <table>
+      <tr>
+       <th align="right"><translate>Date Format</translate></th>
+       <td>
+        <select name="dateformat">
+         <TMPL_LOOP ALL_DATEFORMATS><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR format ESCAPE=HTML></option>
+         </TMPL_LOOP>
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right"><translate>Number Format</translate></th>
+       <td>
+        <select name="numberformat">
+         <TMPL_LOOP ALL_NUMBERFORMATS><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR format ESCAPE=HTML></option>
+         </TMPL_LOOP>
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right"><translate>Dropdown Limit</translate></th>
+       <td><input name="vclimit" value="<TMPL_VAR myc_vclimit ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr>
+       <th align="right"><translate>Language</translate></th>
+       <td>
+        <select name="countrycode">
+         <TMPL_LOOP ALL_COUNTRYCODES><option value="<TMPL_VAR value ESCAPE=HTML>" <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
+         </TMPL_LOOP>
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right"><translate>Stylesheet</translate></th>
+       <td>
+        <select name="userstylesheet">
+         <TMPL_LOOP ALL_STYLESHEETS><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
+         </TMPL_LOOP>
+        </select>
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right"><translate>Printer</translate></th>
+       <td><input name="printer" size="20" value="<TMPL_VAR myc_printer ESCAPE=HTML>"></td>
+      </tr>
+      <tr>
+       <th align="right"><translate>Use Templates</translate></th>
+       <td>
+        <select name="usetemplates">
+         <TMPL_LOOP ALL_TEMPLATES><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
+         </TMPL_LOOP>
+        </select>
+       </td>
+      </tr>
+      <tr>
+       <th align="right"><translate>New Templates</translate></th>
+       <td><input name="newtemplates"></td>
+      </tr>
+      <tr>
+       <th align="right"><translate>Setup Templates</translate></th>
+       <td>
+        <select name="mastertemplates">
+         <TMPL_LOOP ALL_MASTER_TEMPLATES><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
+         </TMPL_LOOP>
+        </select>
+       </td>
+      </tr>
+      <tr>
+       <th align="right"><translate>Setup Menu</translate></th>
+       <td>
+        <input name="menustyle" type="radio" class="radio" value="v3" <TMPL_IF menustyle_v3>checked</TMPL_IF>>&nbsp;<translate>Top (CSS)</translate>
+        <input name="menustyle" type="radio" class="radio" value="neu" <TMPL_IF menustyle_neu>checked</TMPL_IF>>&nbsp;<translate>Top (Javascript)</translate>
+        <input name="menustyle" type="radio" class="radio" value="old" <TMPL_IF menustyle_old>checked</TMPL_IF>>&nbsp;<translate>Old (on the side)</translate>
+       </td>
+      </tr>
+
+      <input type="hidden" name="templates" value="<TMPL_VAR myc_templates ESCAPE=HTML>">
+     </table>
+    </td>
+   </tr>
+
+   <tr class="listheading">
+    <th colspan="2"><translate>Database</translate></th>
+   </tr>
+
+   <tr>
+    <td colspan="2">
+     <table>
+      <tr>
+       <th align="right"><translate>Driver</translate></th>
+       <td><input type="hidden" name="dbdriver" value="Pg">PostgreSQL</td>
+       <th align="right"><translate>Host</translate></th>
+       <td><input name="Pg_dbhost" size="30" value="<TMPL_VAR Pg_dbhost ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr>
+       <th align="right"><translate>Dataset</translate></th>
+       <td><input name="Pg_dbname" size="15" value="<TMPL_VAR Pg_dbname ESCAPE=HTML>"></td>
+       <th align="right"><translate>Port</translate></th>
+       <td><input name="Pg_dbport" size="4" value="<TMPL_VAR Pg_dbport ESCAPE=HTML>"></td>
+      </tr>
+
+      <tr>
+       <th align="right"><translate>User</translate></th>
+       <td><input name="Pg_dbuser" size="15" value="<TMPL_VAR Pg_dbuser ESCAPE=HTML>"></td>
+       <th align="right"><translate>Password</translate></th>
+       <td><input name="Pg_dbpasswd" type="password" size="10" value="<TMPL_VAR Pg_dbpasswd ESCAPE=HTML>"></td>
+      </tr>
+
+      <input type="hidden" name="old_dbpasswd" value="<TMPL_VAR myc_dbpasswd ESCAPE=HTML>">
+     </table>
+    </td>
+   </tr>
+
+   <tr>
+    <td colspan="2"><hr size="2" noshade></td>
+   </tr>
+
+   <tr class="listheading"><th colspan="2"><translate>Access Control</translate></th></tr>
+
+   <TMPL_LOOP ACLS>
+    <tr>
+     <td valign="top">
+      <input type="checkbox" name="ACS_<TMPL_VAR name ESCAPE=HTML>" id="ACS_<TMPL_VAR name ESCAPE=HTML>" value="1" <TMPL_IF checked>checked</TMPL_IF>>
+      <label for="ACS_<TMPL_VAR name ESCAPE=HTML>"><TMPL_VAR title ESCAPE=HTML></label>
+     </td>
+
+     <td valign="top">
+      <TMPL_LOOP SUBACLS>
+       <input type="checkbox" name="ACS_<TMPL_VAR name ESCAPE=HTML>" id="ACS_<TMPL_VAR name ESCAPE=HTML>" value="1" <TMPL_IF checked>checked</TMPL_IF>>
+       <label for="ACS_<TMPL_VAR name ESCAPE=HTML>"><TMPL_VAR title ESCAPE=HTML></label>
+       <TMPL_UNLESS __last__><br></TMPL_UNLESS>
+      </TMPL_LOOP>
+     </td>
+    </tr>
+   </TMPL_LOOP>
+
+   <input type="hidden" name="all_acs" value="<TMPL_VAR all_acs ESCAPE=HTML>">
+
+   <tr><td colspan="2"><hr size="3" noshade></td></tr>
+
+   <tr class="listheading">
+    <th colspan="2"><translate>WEBDAV access</translate></th>
+   </tr>
+
+   <tr>
+    <td colspan="2">
+     <table>
+      <tr>
+       <td><input name="angebote" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_angebote>checked</TMPL_IF>>&nbsp;Angebot</td>
+       <td><input name="bestellungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_bestellungen>checked</TMPL_IF>>&nbsp;Bestellung</td>
+       <td><input name="rechnungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_rechnung>checked</TMPL_IF>>&nbsp;Rechnung</td>
+      </tr>
+
+      <tr>
+       <td><input name="anfragen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_anfragen>checked</TMPL_IF>>&nbsp;Anfragen</td>
+       <td><input name="lieferantenbestellungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_lieferantenbestellungen>checked</TMPL_IF>>&nbsp;Lieferantenbestellung</td>
+       <td><input name="einkaufsrechnungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_einkaufsrechnungen>checked</TMPL_IF>>&nbsp;Einkaufsrechnung</td>
+      </tr>
+     </table>
+    </td>
+   </tr>
+
+   <tr><td colspan="2"><hr size="3" noshade></td></tr>
+
+  </table>
+
+  <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
+  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+
+  <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
+
+  <TMPL_IF edit>
+   <input type="submit" class="submit" name="action" value="<translate>Delete</translate>">
+   <input type="hidden" name="edit" value="1">
+  </TMPL_IF>
+
+ </form>
+
+</body>
+</html>