X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fadmin.pl;h=4e33ef200c80fedbd94c2434962d5c38103f5007;hb=8482e69b2e36af353705a84e4465668f7431dddf;hp=6ac2a514404e660364e1d6dda425c9cb2816d2b3;hpb=27cd1e791f08771c4c0873461c83397345a47d88;p=kivitendo-erp.git
diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 6ac2a5144..4e33ef200 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}) {
@@ -487,8 +492,13 @@ sub form_header {
$form->header;
- if ($myconfig->{menustyle} eq "neu") { $neu = "checked"; }
- else { $old = "checked"; }
+ if ($myconfig->{menustyle} eq "v3") {
+ $menustyle_v3 = "checked";
+ } elsif ($myconfig->{menustyle} eq "neu") {
+ $menustyle_neu = "checked";
+ } else {
+ $menustyle_old = "checked";
+ }
print qq|
| . $locale->text('Login') . qq| | -+ | |
---|---|---|
| . $locale->text('Password') . qq| | -{password}> | - {password}> ++ |
| . $locale->text('Name') . qq| | -+ | |
| . $locale->text('E-mail') . qq| | @@ -570,10 +580,6 @@ sub form_header {| . $locale->text('Language') . qq| | |
| . $locale->text('Character Set') . qq| | -- | |
| . $locale->text('Stylesheet') . qq| | @@ -596,8 +602,13 @@ sub form_header { | |
| . $locale->text('Setup Menu') . qq| | -New - Old | +| . + $locale->text("Top (CSS)") . qq| + | . + $locale->text("Top (Javascript)") . qq| + | . + $locale->text("Old (on the side)") . qq| + |
@@ -1173,7 +1182,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!')); @@ -1276,9 +1285,9 @@ sub dbselect_source {