X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fadmin.pl;h=879ccd7498cc27d19298fb2adb8e185226191940;hb=12c4c658bc579890462f96832d918337c2b2d484;hp=566f29ac24fe0fe47eeddc55c2d1c8c2384445ba;hpb=0576299f2aa98125991c4ffcd2f75073ea583d7d;p=kivitendo-erp.git
diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 566f29ac2..879ccd749 100644
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -34,19 +34,25 @@
$menufile = "menu.ini";
+use DBI;
+use CGI;
+
use SL::Form;
use SL::User;
+use SL::Common;
+
+require "bin/mozilla/common.pl";
+
+our $cgi = new CGI('');
$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 +61,7 @@ $form->{favicon} = "favicon.ico";
if ($form->{action}) {
+
$subroutine = $locale->findsub($form->{action});
if ($subroutine eq 'login') {
@@ -65,7 +72,7 @@ if ($form->{action}) {
&check_password;
- &$subroutine;
+ call_sub($subroutine);
} else {
@@ -120,12 +127,9 @@ sub adminlogin {
| . $locale->text('Password') . qq| |
|
|
+ . $locale->text('Login') . qq|">
-
-{path}>
@@ -164,6 +168,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 +201,7 @@ sub form_footer {
print qq|
-
-
-{path}>
+
{rpw}>
{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 +305,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} | |;
@@ -310,7 +316,7 @@ sub list_users {
$i++;
$i %= 2;
print qq|
- |;
+
|;
map { print "$column_data{$_}\n" } @column_index;
@@ -327,9 +333,7 @@ sub list_users {
-{path}>
{rpw}>
-
@@ -369,10 +373,8 @@ $nologin
| . $locale->text('Password') . qq| |
|
|
+ . $locale->text('Login') . qq|">
-{path}>
@@ -422,7 +424,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)
? "