[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb: [1331] trunk
- Subject: SF.net SVN: ledger-smb: [1331] trunk
- From: ..hidden..
- Date: Tue, 26 Jun 2007 12:02:04 -0700
Revision: 1331
http://svn.sourceforge.net/ledger-smb/?rev=1331&view=rev
Author: einhverfr
Date: 2007-06-26 12:02:03 -0700 (Tue, 26 Jun 2007)
Log Message:
-----------
Fixing ordering issue for LedgerSMB.pm
Modified Paths:
--------------
trunk/LedgerSMB/Session/DB.pm
trunk/LedgerSMB.pm
trunk/am.pl
trunk/ap.pl
trunk/ar.pl
trunk/bp.pl
trunk/ca.pl
trunk/cp.pl
trunk/css/scripts/login.css
trunk/ct.pl
trunk/employee.pl
trunk/gl.pl
trunk/hr.pl
trunk/ic.pl
trunk/ir.pl
trunk/is.pl
trunk/jc.pl
trunk/location.pl
trunk/lsmb-request.pl
trunk/oe.pl
trunk/pe.pl
trunk/ps.pl
trunk/rc.pl
trunk/rp.pl
trunk/scripts/login.pl
Added Paths:
-----------
trunk/menu.pl
trunk/old-handler.pl
Removed Paths:
-------------
trunk/menu.pl
Modified: trunk/LedgerSMB/Session/DB.pm
===================================================================
--- trunk/LedgerSMB/Session/DB.pm 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/LedgerSMB/Session/DB.pm 2007-06-26 19:02:03 UTC (rev 1331)
@@ -43,7 +43,6 @@
"SELECT u.username, s.transaction_id
FROM session as s, users as u
WHERE s.session_id = ?
- AND s.token = ?
AND s.users_id = u.id
AND s.last_used > now() - ?::interval"
);
@@ -73,7 +72,7 @@
$timeout = "$myconfig{timeout} seconds";
}
- $checkQuery->execute( $sessionID, $token, $timeout )
+ $checkQuery->execute( $sessionID, $timeout )
|| $form->dberror(
__FILE__ . ':' . __LINE__ . ': Looking for session: ' );
my $sessionValid = $checkQuery->rows;
Modified: trunk/LedgerSMB.pm
===================================================================
--- trunk/LedgerSMB.pm 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/LedgerSMB.pm 2007-06-26 19:02:03 UTC (rev 1331)
@@ -164,13 +164,13 @@
#this is an ugly hack we need to rethink.
return $self;
}
+ $self->{_user} = LedgerSMB::User->fetch_config($self->{login});
my $locale = LedgerSMB::Locale->get_handle($self->{_user}->{countrycode})
or $self->error(__FILE__.':'.__LINE__.": Locale not loaded: $!\n");
if ( !${LedgerSMB::Sysconfig::GLOBALDBH} ) {
$locale->text("No GlobalDBH Configured or Could not Connect");
}
- $self->{_user} = LedgerSMB::User->fetch_config($self->{login});
$self->{_locale} = $locale;
$self->{stylesheet} = $self->{_user}->{stylesheet};
if ( $self->{password} ) {
Modified: trunk/am.pl
===================================================================
--- trunk/am.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/am.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/ap.pl
===================================================================
--- trunk/ap.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/ap.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/ar.pl
===================================================================
--- trunk/ar.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/ar.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/bp.pl
===================================================================
--- trunk/bp.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/bp.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/ca.pl
===================================================================
--- trunk/ca.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/ca.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/cp.pl
===================================================================
--- trunk/cp.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/cp.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/css/scripts/login.css
===================================================================
--- trunk/css/scripts/login.css 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/css/scripts/login.css 2007-06-26 19:02:03 UTC (rev 1331)
@@ -11,7 +11,7 @@
div.login div.login {
width: 21em;
height: 18em;
- border-width: 1;
+ border-width: 1px;
border-style: solid;
padding-bottom: 2em;
}
Modified: trunk/ct.pl
===================================================================
--- trunk/ct.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/ct.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/employee.pl
===================================================================
--- trunk/employee.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/employee.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/gl.pl
===================================================================
--- trunk/gl.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/gl.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/hr.pl
===================================================================
--- trunk/hr.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/hr.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/ic.pl
===================================================================
--- trunk/ic.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/ic.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/ir.pl
===================================================================
--- trunk/ir.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/ir.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/is.pl
===================================================================
--- trunk/is.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/is.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/jc.pl
===================================================================
--- trunk/jc.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/jc.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/location.pl
===================================================================
--- trunk/location.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/location.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/lsmb-request.pl
===================================================================
--- trunk/lsmb-request.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/lsmb-request.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -48,7 +48,7 @@
}
eval { require "scripts/$script" }
- || $request->error($locale->text('Unable to open script') . ": $!");
+ || $request->error($locale->text('Unable to open script') . ": $script : $!");
$script =~ s/\.pl$//;
$script = "LedgerSMB::Scripts::$script";
Deleted: trunk/menu.pl
===================================================================
--- trunk/menu.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/menu.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,206 +0,0 @@
-#!/usr/bin/perl
-#
-######################################################################
-# LedgerSMB Accounting and ERP
-
-# http://www.ledgersmb.org/
-#
-# Copyright (C) 2006
-# This work contains copyrighted information from a number of sources all used
-# with permission.
-#
-# This file contains source code included with or based on SQL-Ledger which
-# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
-# under the GNU General Public License version 2 or, at your option, any later
-# version. For a full list including contact information of contributors,
-# maintainers, and copyright holders, see the CONTRIBUTORS file.
-#
-# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
-# Copyright (C) 2001
-#
-# Author: Dieter Simader
-# Email: ..hidden..
-# Web: http://www.sql-ledger.org
-#
-# Contributors:
-#
-#
-#
-# 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 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.
-#######################################################################
-#
-# this script is the frontend called from bin/$terminal/$script
-# all the accounting modules are linked to this script which in
-# turn execute the same script in bin/$terminal/
-#
-#######################################################################
-
-use LedgerSMB::Sysconfig;
-use Digest::MD5;
-use Error qw(:try);
-
-$| = 1;
-
-use LedgerSMB::User;
-use LedgerSMB::Form;
-use LedgerSMB::Locale;
-use LedgerSMB::Session;
-use Data::Dumper;
-require "common.pl";
-
-# for custom preprocessing logic
-eval { require "custom.pl"; };
-
-$form = new Form;
-
-# name of this script
-$0 =~ tr/\\/\//;
-$pos = rindex $0, '/';
-$script = substr( $0, $pos + 1 );
-
-$locale = LedgerSMB::Locale->get_handle( ${LedgerSMB::Sysconfig::language} )
- or $form->error( __FILE__ . ':' . __LINE__ . ": Locale not loaded: $!\n" );
-
-# we use $script for the language module
-$form->{script} = $script;
-
-# strip .pl for translation files
-$script =~ s/\.pl//;
-
-# pull in DBI
-use DBI qw(:sql_types);
-
-# send warnings to browser
-$SIG{__WARN__} = sub { $form->info( $_[0] ) };
-
-# send errors to browser
-$SIG{__DIE__} =
- sub { $form->error( __FILE__ . ':' . __LINE__ . ': ' . $_[0] ) };
-
-## did sysadmin lock us out
-#if (-f "${LedgerSMB::Sysconfig::userspath}/nologin") {
-# $locale = LedgerSMB::Locale->get_handle(${LedgerSMB::Sysconfig::language}) or
-# $form->error(__FILE__.':'.__LINE__.": Locale not loaded: $!\n");
-# $form->{charset} = 'UTF-8';
-# $locale->encoding('UTF-8');
-#
-# $form->{callback} = "";
-# $form->error(__FILE__.':'.__LINE__.': '.$locale->text('System currently down for maintenance!'));
-#}
-
-&check_password;
-
-# grab user config. This is ugly and unecessary if/when
-# we get rid of myconfig and use User as a real object
-%myconfig = %{ LedgerSMB::User->fetch_config( $form->{login} ) };
-$locale = LedgerSMB::Locale->get_handle( $myconfig{countrycode} )
- or $form->error( __FILE__ . ':' . __LINE__ . ": Locale not loaded: $!\n" );
-
-# locale messages
-#$form->{charset} = $locale->encoding;
-$form->{charset} = 'UTF-8';
-$locale->encoding('UTF-8');
-
-if ($@) {
- $form->{callback} = "";
- $msg1 = $locale->text('You are logged out!');
- $msg2 = $locale->text('Login');
- $form->redirect(
- "$msg1 <p><a href=\"login.pl\" target=\"_top\">$msg2</a></p>");
-}
-
-map { $form->{$_} = $myconfig{$_} } qw(stylesheet timeout)
- unless ( $form->{type} eq 'preferences' );
-
-$form->db_init( \%myconfig );
-
-# pull in the main code
-require "bin/$form->{script}";
-
-# customized scripts
-if ( -f "bin/custom/$form->{script}" ) {
- eval { require "bin/custom/$form->{script}"; };
-}
-
-# customized scripts for login
-if ( -f "bin/custom/$form->{login}_$form->{script}" ) {
- eval { require "bin/custom/$form->{login}_$form->{script}"; };
-}
-
-if ( $form->{action} ) {
-
- # window title bar, user info
- $form->{titlebar} =
- "LedgerSMB "
- . $locale->text('Version')
- . " $form->{version} - $myconfig{name} - $myconfig{dbname}";
-
- &{ $form->{action} };
-
-}
-else {
- $form->error( __FILE__ . ':' . __LINE__ . ': '
- . $locale->text('action= not defined!') );
-}
-
-1;
-
-# end
-
-sub check_password {
-
- require "bin/pw.pl";
-
- if ( $form->{password} ) {
- if (
- !Session::password_check(
- $form, $form->{login}, $form->{password}
- )
- )
- {
- if ( $ENV{GATEWAY_INTERFACE} ) {
- &getpassword;
- }
- else {
- $form->error( __FILE__ . ':' . __LINE__ . ': '
- . $locale->text('Access Denied!') );
- }
- exit;
- }
- else {
- Session::session_create($form);
- }
-
- }
- else {
- if ( $ENV{GATEWAY_INTERFACE} ) {
- $ENV{HTTP_COOKIE} =~ s/;\s*/;/g;
- @cookies = split /;/, $ENV{HTTP_COOKIE};
- foreach (@cookies) {
- ( $name, $value ) = split /=/, $_, 2;
- $cookie{$name} = $value;
- }
-
- #check for valid session
- if ( !Session::session_check( $cookie{"LedgerSMB"}, $form ) ) {
- &getpassword(1);
- exit;
- }
- }
- else {
- exit;
- }
- }
-}
-
Added: trunk/menu.pl
===================================================================
--- trunk/menu.pl (rev 0)
+++ trunk/menu.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -0,0 +1,3 @@
+#!/usr/bin/perl
+
+require "lsmb-request.pl";
Property changes on: trunk/menu.pl
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/oe.pl
===================================================================
--- trunk/oe.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/oe.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Copied: trunk/old-handler.pl (from rev 1320, trunk/menu.pl)
===================================================================
--- trunk/old-handler.pl (rev 0)
+++ trunk/old-handler.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -0,0 +1,206 @@
+#!/usr/bin/perl
+#
+######################################################################
+# LedgerSMB Accounting and ERP
+
+# http://www.ledgersmb.org/
+#
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version. For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2001
+#
+# Author: Dieter Simader
+# Email: ..hidden..
+# Web: http://www.sql-ledger.org
+#
+# Contributors:
+#
+#
+#
+# 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 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.
+#######################################################################
+#
+# this script is the frontend called from bin/$terminal/$script
+# all the accounting modules are linked to this script which in
+# turn execute the same script in bin/$terminal/
+#
+#######################################################################
+
+use LedgerSMB::Sysconfig;
+use Digest::MD5;
+use Error qw(:try);
+
+$| = 1;
+
+use LedgerSMB::User;
+use LedgerSMB::Form;
+use LedgerSMB::Locale;
+use LedgerSMB::Session;
+use Data::Dumper;
+require "common.pl";
+
+# for custom preprocessing logic
+eval { require "custom.pl"; };
+
+$form = new Form;
+
+# name of this script
+$0 =~ tr/\\/\//;
+$pos = rindex $0, '/';
+$script = substr( $0, $pos + 1 );
+
+$locale = LedgerSMB::Locale->get_handle( ${LedgerSMB::Sysconfig::language} )
+ or $form->error( __FILE__ . ':' . __LINE__ . ": Locale not loaded: $!\n" );
+
+# we use $script for the language module
+$form->{script} = $script;
+
+# strip .pl for translation files
+$script =~ s/\.pl//;
+
+# pull in DBI
+use DBI qw(:sql_types);
+
+# send warnings to browser
+$SIG{__WARN__} = sub { $form->info( $_[0] ) };
+
+# send errors to browser
+$SIG{__DIE__} =
+ sub { $form->error( __FILE__ . ':' . __LINE__ . ': ' . $_[0] ) };
+
+## did sysadmin lock us out
+#if (-f "${LedgerSMB::Sysconfig::userspath}/nologin") {
+# $locale = LedgerSMB::Locale->get_handle(${LedgerSMB::Sysconfig::language}) or
+# $form->error(__FILE__.':'.__LINE__.": Locale not loaded: $!\n");
+# $form->{charset} = 'UTF-8';
+# $locale->encoding('UTF-8');
+#
+# $form->{callback} = "";
+# $form->error(__FILE__.':'.__LINE__.': '.$locale->text('System currently down for maintenance!'));
+#}
+
+&check_password;
+
+# grab user config. This is ugly and unecessary if/when
+# we get rid of myconfig and use User as a real object
+%myconfig = %{ LedgerSMB::User->fetch_config( $form->{login} ) };
+$locale = LedgerSMB::Locale->get_handle( $myconfig{countrycode} )
+ or $form->error( __FILE__ . ':' . __LINE__ . ": Locale not loaded: $!\n" );
+
+# locale messages
+#$form->{charset} = $locale->encoding;
+$form->{charset} = 'UTF-8';
+$locale->encoding('UTF-8');
+
+if ($@) {
+ $form->{callback} = "";
+ $msg1 = $locale->text('You are logged out!');
+ $msg2 = $locale->text('Login');
+ $form->redirect(
+ "$msg1 <p><a href=\"login.pl\" target=\"_top\">$msg2</a></p>");
+}
+
+map { $form->{$_} = $myconfig{$_} } qw(stylesheet timeout)
+ unless ( $form->{type} eq 'preferences' );
+
+$form->db_init( \%myconfig );
+
+# pull in the main code
+require "bin/$form->{script}";
+
+# customized scripts
+if ( -f "bin/custom/$form->{script}" ) {
+ eval { require "bin/custom/$form->{script}"; };
+}
+
+# customized scripts for login
+if ( -f "bin/custom/$form->{login}_$form->{script}" ) {
+ eval { require "bin/custom/$form->{login}_$form->{script}"; };
+}
+
+if ( $form->{action} ) {
+
+ # window title bar, user info
+ $form->{titlebar} =
+ "LedgerSMB "
+ . $locale->text('Version')
+ . " $form->{version} - $myconfig{name} - $myconfig{dbname}";
+
+ &{ $form->{action} };
+
+}
+else {
+ $form->error( __FILE__ . ':' . __LINE__ . ': '
+ . $locale->text('action= not defined!') );
+}
+
+1;
+
+# end
+
+sub check_password {
+
+ require "bin/pw.pl";
+
+ if ( $form->{password} ) {
+ if (
+ !Session::password_check(
+ $form, $form->{login}, $form->{password}
+ )
+ )
+ {
+ if ( $ENV{GATEWAY_INTERFACE} ) {
+ &getpassword;
+ }
+ else {
+ $form->error( __FILE__ . ':' . __LINE__ . ': '
+ . $locale->text('Access Denied!') );
+ }
+ exit;
+ }
+ else {
+ Session::session_create($form);
+ }
+
+ }
+ else {
+ if ( $ENV{GATEWAY_INTERFACE} ) {
+ $ENV{HTTP_COOKIE} =~ s/;\s*/;/g;
+ @cookies = split /;/, $ENV{HTTP_COOKIE};
+ foreach (@cookies) {
+ ( $name, $value ) = split /=/, $_, 2;
+ $cookie{$name} = $value;
+ }
+
+ #check for valid session
+ if ( !Session::session_check( $cookie{"LedgerSMB"}, $form ) ) {
+ &getpassword(1);
+ exit;
+ }
+ }
+ else {
+ exit;
+ }
+ }
+}
+
Modified: trunk/pe.pl
===================================================================
--- trunk/pe.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/pe.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/ps.pl
===================================================================
--- trunk/ps.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/ps.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/rc.pl
===================================================================
--- trunk/rc.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/rc.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/rp.pl
===================================================================
--- trunk/rp.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/rp.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -1,2 +1,2 @@
#!/usr/bin/perl
-require "menu.pl";
+require "old-handler.pl";
Modified: trunk/scripts/login.pl
===================================================================
--- trunk/scripts/login.pl 2007-06-26 06:35:19 UTC (rev 1330)
+++ trunk/scripts/login.pl 2007-06-26 19:02:03 UTC (rev 1331)
@@ -30,29 +30,9 @@
if (!$request->{_user}){
__default($request);
}
- our $user = new LedgerSMB::User($request->{login});
- our $form = new Form;
- for (keys %$request){
- $form->{$_} = $request->{$_};
- }
- my $menu_entrypoint;
- require "bin/menu.pl";
- if (($request->{_user}->{acs} !~ /Recurring Transactions/) ||
- $request->{_user}->{role} ne 'user'){
- if ($user->check_recurring($form) ) {
- $form->{main} = "recurring_transactions";
- }
- else {
- $form->{main} = "company_logo";
- }
+ require "scripts/menu.pl";
+ LedgerSMB::Scripts::menu::display($request);
- }
- else {
-
- $form->{main} = "company_logo";
- }
- &display;
-
}
sub logout {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.