X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fadmin.pl;h=e936b2a12430c68d8f04527ea53e822502bbb511;hb=84bed7a655edfe816ad2a04b5549b6bd6a968c79;hp=cd08e3f9f050f44d412586e2c53ce7b762f38f84;hpb=d9cb2f120ebebd2f7cf1018691fd7c8e8c54f496;p=kivitendo-erp.git
diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index cd08e3f9f..e936b2a12 100644
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -34,20 +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 ($@);
}
@@ -67,7 +67,7 @@ if ($form->{action}) {
&check_password;
- &$subroutine;
+ call_sub($subroutine);
} else {
@@ -125,7 +125,6 @@ sub adminlogin {
. $locale->text('Login') . qq|">
-{path}>
@@ -197,8 +196,7 @@ sub form_footer {
print qq|
-
-{path}>
+
{rpw}>
{path}&rpw=$form->{rpw}";
+ "$script?action=edit&login=$key&rpw=$form->{rpw}";
$href =~ s/ /%20/g;
$member{$key}{templates} =~ s/^$templates\///;
@@ -330,7 +328,6 @@ sub list_users {
-{path}>
{rpw}>
text('Login') . qq|">
-{path}>
@@ -473,9 +469,13 @@ sub form_header {
}
}
- opendir CSS, "css/.";
- @all = sort(grep({ /\.css$/ && ($_ ne "tabcontent.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}) {
@@ -508,16 +508,16 @@ sub form_header {
| . $locale->text('Login') . qq| | -+ | |||||||
---|---|---|---|---|---|---|---|---|
| . $locale->text('Password') . qq| | -{password}> | - {password}> ++ | ||||||
| . $locale->text('Name') . qq| | -+ | |||||||
| . $locale->text('E-mail') . qq| | @@ -601,7 +601,9 @@ sub form_header {||||||||
| . $locale->text('Setup Menu') . qq| | -| . + | | . + $locale->text("Top (CSS)") . qq| + | . $locale->text("Top (Javascript)") . qq| | . $locale->text("Old (on the side)") . qq| @@ -633,24 +635,25 @@ sub form_header { print qq| | | . $locale->text('Driver') . qq| | -$item | +$item | | . $locale->text('Host') . qq| | -{"${item}_dbhost"}> | +|
| . $locale->text('Dataset') . qq| | -{Pg_dbname}> | +| . $locale->text('Port') . qq| | -{Pg_dbport}> | +|||||
| . $locale->text('User') . qq| | -{"${item}_dbuser"}> | +| . $locale->text('Password') . qq| | -{"${item}_dbpasswd"}> | +| . $locale->text('Dataset') . qq| | {"${item}_dbuser"}> | | . $locale->text('Password') . qq| | -{"${item}_dbpasswd"}> | +|; } print qq| - {dbpasswd}> + |
@@ -1181,7 +1183,7 @@ sub change_password { $root->save_member($memberfile); $form->{callback} = - "$form->{script}?action=list_users&path=$form->{path}&rpw=$root->{password}"; + "$form->{script}?action=list_users&rpw=$root->{password}"; $form->redirect($locale->text('Password changed!')); @@ -1284,9 +1286,9 @@ sub dbselect_source {