From aff2191c2c31501c72a89aabd2fd6cb2eb3ce8aa Mon Sep 17 00:00:00 2001 From: einhverfr Date: Sat, 2 Sep 2006 06:14:40 +0000 Subject: Removed CONTRIBUTORS lines in the various files, moved any contributors to the CONTRIBUTORS file. Added TODO, CONTRIBUTORS, and the upgrade/cross-grade SL2LS.pl (incomplete). git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@16 4979c152-3d1c-0410-bac9-87ea11338e46 --- bin/lynx/admin.pl | 74 +++++++++++++++++++++++++++++++++---------------------- bin/lynx/login.pl | 12 ++++----- bin/lynx/menu.pl | 8 +----- 3 files changed, 52 insertions(+), 42 deletions(-) (limited to 'bin/lynx') diff --git a/bin/lynx/admin.pl b/bin/lynx/admin.pl index ac422b8f..114c0f69 100755 --- a/bin/lynx/admin.pl +++ b/bin/lynx/admin.pl @@ -1,23 +1,12 @@ #===================================================================== -# LedgerSMB Small Medium Business Accounting -# Copyright (c) 2002 -# -# Author: DWS Systems Inc. -# Web: http://sourceforge.net/projects/ledger-smb/ -# +# LedgerSMB +# Small Medium Business Accounting software +# +# See COPYRIGHT file for copyright information +#====================================================================== # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# This file has NOT undergone whitespace cleanup. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #====================================================================== # # setup module @@ -27,8 +16,8 @@ $menufile = "menu.ini"; -use SL::Form; -use SL::User; +use LedgerSMB::Form; +use LedgerSMB::User; $form = new Form; @@ -39,7 +28,7 @@ $form->{charset} = $locale->{charset}; eval { require DBI; }; $form->error($locale->text('DBI not installed!')) if ($@); -$form->{stylesheet} = "sql-ledger.css"; +$form->{stylesheet} = "ledger-smb.css"; $form->{favicon} = "favicon.ico"; $form->{timeout} = 600; @@ -66,7 +55,7 @@ if ($form->{action}) { # create memberfile if (! -f $memberfile) { open(FH, ">$memberfile") or $form->error("$memberfile : $!"); - print FH qq|# LedgerSMB Small Medium Business Accounting members + print FH qq|# LedgerSMB Accounting members [root login] password= @@ -102,7 +91,7 @@ function sf(){
- +

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

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

@@ -119,7 +108,7 @@ function sf(){
-LedgerSMB |.$locale->text('website').qq| +LedgerSMB |.$locale->text('website').qq|
@@ -140,6 +129,8 @@ sub login { 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')); } @@ -153,8 +144,8 @@ sub add_user { $form->{Oracle_dbport} = '1521'; $form->{Oracle_dbhost} = `hostname`; - if (-f "css/sql-ledger.css") { - $myconfig->{stylesheet} = "sql-ledger.css"; + if (-f "css/ledger-smb.css") { + $myconfig->{stylesheet} = "ledger-smb.css"; } $myconfig->{vclimit} = 1000; $myconfig->{menuwidth} = 155; @@ -1036,9 +1027,16 @@ sub change_password { } +sub get_hash { + use Digest::MD5; + $form->{hash} = Digest::MD5::md5_hex rand(); + +} sub check_password { + + $root = new User "$memberfile", "root login"; if ($root->{password}) { @@ -1050,12 +1048,29 @@ sub check_password { &getpassword; exit; } + + &get_hash; + + open(HASHFILE, "> $userspath/adminhash") + || $form->error("Can't Open Hashfile: $!"); + print HASHFILE $form->{hash}; + + print qq|Set-Cookie: LedgerSMB=$form->{hash}; path=/;\n|; + } else { if ($ENV{HTTP_USER_AGENT}) { $ENV{HTTP_COOKIE} =~ s/;\s*/;/g; - %cookie = split /[=;]/, $ENV{HTTP_COOKIE}; - $cookie = ($form->{path} eq 'bin/lynx') ? $cookie{login} : $cookie{"SQL-Ledger-root login"}; - if (! $cookie || $cookie ne $form->{sessionid}) { + %cookie = split /[=;]/, $ENV{HTTP_COOKIE}; # Changeme to %cookies + $cookie = ($form->{path} eq 'bin/lynx') ? $cookie{login} : $cookie{"LedgerSMB-root login"}; + + open (HASHFILE, "< $userspath/adminhash") || $form->error("Can't Open Hashfile: $!"); + + chomp($form->{hash} = ); + + %cookies = split /[=;]/, $ENV{HTTP_COOKIE}; + + if (! $cookie || $cookie ne $form->{sessionid} || + $form->{hash} ne $cookies{LedgerSMB}) { &getpassword; exit; } @@ -1094,7 +1109,7 @@ sub dbdriver_defaults { # load some defaults for the selected driver %driverdefaults = ( 'Pg' => { dbport => '', - dbuser => 'sql-ledger', + dbuser => 'ledger-smb', dbdefault => 'template1', dbhost => '', connectstring => $locale->text('Connect to') @@ -1610,3 +1625,4 @@ sub lock_system { } + diff --git a/bin/lynx/login.pl b/bin/lynx/login.pl index b674b03f..fb2fe312 100755 --- a/bin/lynx/login.pl +++ b/bin/lynx/login.pl @@ -64,8 +64,8 @@ if ($form->{action}) { sub login_screen { - $form->{stylesheet} = "sql-ledger.css"; - $form->{favicon} = "sql-ledger.ico"; + $form->{stylesheet} = "ledger-smb.css"; + $form->{favicon} = "favicon.ico"; $form->{endsession} = 1; $form->header(1); @@ -154,8 +154,8 @@ $sf sub selectdataset { my ($login) = @_; - if (-f "css/sql-ledger.css") { - $form->{stylesheet} = "sql-ledger.css"; + if (-f "css/ledger-smb.css") { + $form->{stylesheet} = "ledger-smb.css"; } $form->header(1); @@ -232,8 +232,8 @@ sub selectdataset { sub login { - $form->{stylesheet} = "sql-ledger.css"; - $form->{favicon} = "sql-ledger.ico"; + $form->{stylesheet} = "ledger-smb.css"; + $form->{favicon} = "favicon.ico"; $form->error($locale->text('You did not enter a name!')) unless ($form->{login}); diff --git a/bin/lynx/menu.pl b/bin/lynx/menu.pl index 58d75511..d087bc1f 100755 --- a/bin/lynx/menu.pl +++ b/bin/lynx/menu.pl @@ -1,13 +1,7 @@ ###################################################################### # LedgerSMB Small Medium Business Accounting -# Copyright (c) 2000 +# Copyright (c) 2006 # -# Author: Dieter Simader -# Email: dsimader@sql-ledger.org -# Web: http://sourceforge.net/projects/ledger-smb/ -# -# Contributors: Christopher Browne -# Tony Fraser # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- cgit v1.2.3