X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fadmin.pl;h=879ccd7498cc27d19298fb2adb8e185226191940;hb=599030d5e26bcef0f9850ddbbedba106ded70ebb;hp=c2db1384dc5f9ec0c0504d03c53c0d63cb2ddb9c;hpb=6faa9b06caa1304831fbbac82f12c516b2d8396f;p=kivitendo-erp.git
diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index c2db1384d..879ccd749 100644
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -34,20 +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 ($@);
}
@@ -67,7 +72,7 @@ if ($form->{action}) {
&check_password;
- &$subroutine;
+ call_sub($subroutine);
} else {
@@ -125,7 +130,6 @@ sub adminlogin {
. $locale->text('Login') . qq|">
-{path}>
@@ -197,8 +201,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 +333,6 @@ sub list_users {
-{path}>
{rpw}>
text('Login') . qq|">
-{path}>
@@ -473,9 +474,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}) {
@@ -575,10 +580,6 @@ sub form_header {
@@ -1184,7 +1184,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 +1305,7 @@ sub dbselect_source {
-
-{path}>
+
{rpw}>
@@ -1340,9 +1339,7 @@ print qq|
-
+
-{path}>
{rpw}>
@@ -1456,7 +1452,7 @@ sub dbupdate {
escape($form->{$_}); } qw(path rpw))) .
+join("&", map({ "$_=" . $form->escape($form->{$_}); } qw(rpw))) .
qq|">| . $locale->text("Continue") . qq||;
}
@@ -1476,24 +1472,24 @@ sub create_dataset {
}
closedir SQLDIR;
- $selectencoding = qq|