From 8900bd74ff3fbe971f723ad7791e4620d5d5b2ee Mon Sep 17 00:00:00 2001 From: christopherm Date: Mon, 11 Sep 2006 00:31:16 +0000 Subject: applying HTML fixes patch supplied by David, also doing major whitespace cleanup, fixing more html bugs. Removing all references to Oracle. This has been tested, but it could use more testing git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@63 4979c152-3d1c-0410-bac9-87ea11338e46 --- bin/mozilla/admin.pl | 2546 +++++++++++++++++++++++--------------------------- 1 file changed, 1194 insertions(+), 1352 deletions(-) diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index d552e4ca..5a3c0ef3 100755 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -23,7 +23,7 @@ # #====================================================================== # -# This file has NOT undergone whitespace cleanup. +# This file has undergone whitespace cleanup. # #====================================================================== # @@ -54,36 +54,34 @@ require "$form->{path}/pw.pl"; # customization if (-f "$form->{path}/custom_$form->{script}") { - eval { require "$form->{path}/custom_$form->{script}"; }; - $form->error($@) if ($@); + eval { require "$form->{path}/custom_$form->{script}"; }; + $form->error($@) if ($@); } if ($form->{action}) { - &check_password unless $form->{action} eq 'logout'; - - &{ $locale->findsub($form->{action}) }; - -} else { + &check_password unless $form->{action} eq 'logout'; + &{ $locale->findsub($form->{action}) }; - # if there are no drivers bail out - $form->error($locale->text('No Database Drivers available!')) unless (User->dbdrivers); +} else { - # create memberfile - if (! -f $memberfile) { - open(FH, ">$memberfile") or $form->error("$memberfile : $!"); - print FH qq|# LedgerSMB Accounting members + # if there are no drivers bail out + $form->error($locale->text('No Database Drivers available!')) unless (User->dbdrivers); -[root login] -password= + # create memberfile + if (! -f $memberfile) { + open(FH, ">$memberfile") or $form->error("$memberfile : $!"); + print FH qq|# LedgerSMB Accounting members -|; - close FH; - } + [root login] + password= - &adminlogin; + |; + close FH; + } + &adminlogin; } 1; @@ -92,1564 +90,1408 @@ password= sub adminlogin { - $form->{title} = qq|LedgerSMB $form->{version} |.$locale->text('Administration'); + $form->{title} = qq|LedgerSMB $form->{version} |.$locale->text('Administration'); + + $myheaderadd = qq| + + |; + $form->header(undef, $myheaderadd); + + print qq| + +
+ LedgerSMB Logo +

|.$locale->text('Version').qq| $form->{version}
|.$locale->text('Administration').qq|

+
+ + + + + + +
|.$locale->text('Password').qq|
+ + +
+ + LedgerSMB |.$locale->text('website').qq| +
+ + + |; - $myheaderadd = qq| - - |; - $form->header(undef, $headeradd); - print qq| - -
+sub login { -LedgerSMB Logo -

|.$locale->text('Version').qq| $form->{version}

|.$locale->text('Administration').qq|

+ &list_users; +} -
- - - - - - - -{path}> -
|.$locale->text('Password').qq|
+sub logout { -
+ $form->{callback} = "$form->{script}?path=$form->{path}&endsession=1"; + unlink "$userspath/adminhash"; + print qq|Set-Cookie: LedgerSMB=; path=/;\n|; + $form->redirect($locale->text('You are logged out')); -LedgerSMB |.$locale->text('website').qq| +} -
- - -|; +sub add_user { + + $form->{title} = "LedgerSMB ".$locale->text('Accounting')." ".$locale->text('Administration')." / ".$locale->text('Add User'); + + if (-f "css/ledger-smb.css") { + $myconfig->{stylesheet} = "ledger-smb.css"; + } + + $myconfig->{vclimit} = 1000; + $myconfig->{menuwidth} = 155; + $myconfig->{timeout} = 3600; + &form_header; + &form_footer; } -sub login { +sub edit { - &list_users; + $form->{title} = "LedgerSMB ".$locale->text('Accounting')." ".$locale->text('Administration')." / ".$locale->text('Edit User'); + $form->{edit} = 1; + &form_header; + &form_footer; } -sub logout { +sub form_footer { - $form->{callback} = "$form->{script}?path=$form->{path}&endsession=1"; - unlink "$userspath/adminhash"; - print qq|Set-Cookie: LedgerSMB=; path=/;\n|; - $form->redirect($locale->text('You are logged out')); + if ($form->{edit}) { + $delete = qq| + |; + } + print qq| + + + + + $delete + + + + |; } -sub add_user { - - $form->{title} = "LedgerSMB ".$locale->text('Accounting')." ".$locale->text('Administration')." / ".$locale->text('Add User'); - - $form->{Oracle_sid} = $sid; - $form->{Oracle_dbport} = '1521'; - $form->{Oracle_dbhost} = `hostname`; - - if (-f "css/ledger-smb.css") { - $myconfig->{stylesheet} = "ledger-smb.css"; - } - $myconfig->{vclimit} = 1000; - $myconfig->{menuwidth} = 155; - $myconfig->{timeout} = 3600; - - &form_header; - &form_footer; - -} +sub list_users { + open(FH, "$memberfile") or $form->error("$memberfile : $!"); + $nologin = qq||; -sub edit { + if (-e "$userspath/nologin") { + $nologin = qq||; + } - $form->{title} = "LedgerSMB ".$locale->text('Accounting')." ".$locale->text('Administration')." / ".$locale->text('Edit User'); - $form->{edit} = 1; - &form_header; - &form_footer; + while () { + chop; -} + if (/^\[.*\]/) { + $login = $_; + $login =~ s/(\[|\])//g; + } + if (/^(name=|company=|templates=|dbuser=|dbdriver=|dbname=|dbhost=)/) { + chop ($var = $&); + ($null, $member{$login}{$var}) = split /=/, $_, 2; + } + } -sub form_footer { + close(FH); + + # type=submit $locale->text('Pg Database Administration') + # type=submit $locale->text('PgPP Database Administration') - if ($form->{edit}) { - $delete = qq| -|; - } + foreach $item (User->dbdrivers) { + $dbdrivers .= qq||; + } - print qq| - + $column_header{login} = qq||.$locale->text('Login').qq||; + $column_header{name} = qq||.$locale->text('Name').qq||; + $column_header{company} = qq||.$locale->text('Company').qq||; + $column_header{dbdriver} = qq||.$locale->text('Driver').qq||; + $column_header{dbhost} = qq||.$locale->text('Host').qq||; + $column_header{dataset} = qq||.$locale->text('Dataset').qq||; + $column_header{templates} = qq||.$locale->text('Templates').qq||; -{path}> -{sessionid}> + @column_index = qw(login name company dbdriver dbhost dataset templates); - -$delete + $form->{title} = "LedgerSMB ".$locale->text('Accounting')." ".$locale->text('Administration'); - + $form->{login} = "root login"; + $form->header; - - -|; + print qq| + +
+ + + + + + + |; + $column_data{name} = qq||; + $column_data{company} = qq||; + $column_data{dbdriver} = qq||; + $column_data{dbhost} = qq||; + $column_data{dataset} = qq||; + $column_data{templates} = qq||; -{path}> -{sessionid}> + $i++; $i %= 2; + print qq| |; -
- + for (@column_index) { print "$column_data{$_}\n"; } + + print qq| |; + } -$dbdrivers -$nologin - + print qq|
$form->{title}
+ + |; -} + for (@column_index) { print "$column_header{$_}\n" } + print qq| |; -sub list_users { + foreach $key (sort keys %member) { - open(FH, "$memberfile") or $form->error("$memberfile : $!"); - - $nologin = qq| -|; - - if (-e "$userspath/nologin") { - $nologin = qq| -|; - } - - - while () { - chop; - - if (/^\[.*\]/) { - $login = $_; - $login =~ s/(\[|\])//g; - } - - if (/^(name=|company=|templates=|dbuser=|dbdriver=|dbname=|dbhost=)/) { - chop ($var = $&); - ($null, $member{$login}{$var}) = split /=/, $_, 2; - } - } - - close(FH); - -# type=submit $locale->text('Pg Database Administration') -# type=submit $locale->text('PgPP Database Administration') -# type=submit $locale->text('Oracle Database Administration') - - foreach $item (User->dbdrivers) { - $dbdrivers .= qq||; - } - - - $column_header{login} = qq||; - $column_header{name} = qq||; - $column_header{company} = qq||; - $column_header{dbdriver} = qq||; - $column_header{dbhost} = qq||; - $column_header{dataset} = qq||; - $column_header{templates} = qq||; - - @column_index = qw(login name company dbdriver dbhost dataset templates); - - $form->{title} = "LedgerSMB ".$locale->text('Accounting')." ".$locale->text('Administration'); - - $form->{login} = "root login"; - $form->header; - - print qq| - - -{script}> - -
|.$locale->text('Login').qq||.$locale->text('Name').qq||.$locale->text('Company').qq||.$locale->text('Driver').qq||.$locale->text('Host').qq||.$locale->text('Dataset').qq||.$locale->text('Templates').qq|
- - - - - - - - - - - -
$form->{title}
- - |; - - for (@column_index) { print "$column_header{$_}\n" } - - print qq| - -|; - -foreach $key (sort keys %member) { - $href = "$script?action=edit&login=$key&path=$form->{path}&sessionid=$form->{sessionid}"; - $href =~ s/ /%20/g; - - $member{$key}{templates} =~ s/^$templates\///; - $member{$key}{dbhost} = $locale->text('localhost') unless $member{$key}{dbhost}; - $member{$key}{dbname} = $member{$key}{dbuser} if ($member{$key}{dbdriver} eq 'Oracle'); - - $column_data{login} = qq||; - $column_data{name} = qq||; - $column_data{company} = qq||; - $column_data{dbdriver} = qq||; - $column_data{dbhost} = qq||; - $column_data{dataset} = qq||; - $column_data{templates} = qq||; - - $i++; $i %= 2; - print qq| - |; - - for (@column_index) { print "$column_data{$_}\n" } - - print qq| - |; -} + $href = "$script?action=edit&login=$key&path=$form->{path}&sessionid=$form->{sessionid}"; + $href =~ s/ /%20/g; + $member{$key}{templates} =~ s/^$templates\///; + $member{$key}{dbhost} = $locale->text('localhost') unless $member{$key}{dbhost}; -print qq| -
$key$member{$key}{name}$member{$key}{company}$member{$key}{dbdriver}$member{$key}{dbhost}$member{$key}{dbname}$member{$key}{templates}
-
+ $column_data{login} = qq|		$key$member{$key}{name}$member{$key}{company}$member{$key}{dbdriver}$member{$key}{dbhost}$member{$key}{dbname}$member{$key}{templates}
+ + + +
+ + + + +
+ + -
+ $dbdrivers + $nologin -|.$locale->text('Click on login name to edit!').qq| -
-|.$locale->text('To add a user to a group edit a name, change the login name and save. A new user with the same variables will then be saved under the new login name.').qq| + + - - -|; + |.$locale->text('Click on login name to edit!').qq| +
+ |.$locale->text('To add a user to a group edit a name, change the login name and save. A new user with the same variables will then be saved under the new login name.').qq| + + |; } sub form_header { - # if there is a login, get user - if ($form->{login}) { - # get user - $myconfig = new User "$memberfile", "$form->{login}"; - - for (qw(company address signature)) { $myconfig->{$_} = $form->quote($myconfig->{$_}) } - for (qw(address signature)) { $myconfig->{$_} =~ s/\\n/\n/g } - - # strip basedir from templates directory - $myconfig->{templates} =~ s/^$templates\///; - - $myconfig->{dbpasswd} = unpack 'u', $myconfig->{dbpasswd}; - } - - foreach $item (qw(mm-dd-yy mm/dd/yy dd-mm-yy dd/mm/yy dd.mm.yy yyyy-mm-dd)) { - $dateformat .= ($item eq $myconfig->{dateformat}) ? "