X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fadmin.pl;h=e936b2a12430c68d8f04527ea53e822502bbb511;hb=564d8509117493b1b4b28c08d95ba4d1df8d599b;hp=c2db1384dc5f9ec0c0504d03c53c0d63cb2ddb9c;hpb=6faa9b06caa1304831fbbac82f12c516b2d8396f;p=kivitendo-erp.git
diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index c2db1384d..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}) {
@@ -1143,7 +1143,6 @@ sub change_admin_password {
-{path}>
{rpw}>
@@ -1184,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!'));
@@ -1305,8 +1304,7 @@ sub dbselect_source {
-
-{path}>
+
{rpw}>
@@ -1340,9 +1338,7 @@ print qq|
-
+
-{path}>
{rpw}>
@@ -1456,7 +1451,7 @@ sub dbupdate {
escape($form->{$_}); } qw(path rpw))) .
+join("&", map({ "$_=" . $form->escape($form->{$_}); } qw(rpw))) .
qq|">| . $locale->text("Continue") . qq||;
}
@@ -1554,9 +1549,8 @@ sub create_dataset {
-
+
-{path}>
{rpw}>
@@ -1607,7 +1601,6 @@ sub dbcreate {
. qq|
-
@@ -1670,9 +1663,8 @@ sub delete_dataset {
-
+
-
@@ -1722,7 +1714,6 @@ $form->{db} | . $locale->text('successfully deleted!')
. qq|
-
@@ -1743,7 +1734,7 @@ sub unlock_system {
unlink "$userspath/nologin";
$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('Lockfile removed!'));
@@ -1756,7 +1747,7 @@ sub lock_system {
close(FH);
$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('Lockfile created!'));