From a9060f5bf7ee105eb2f3bb379feb4dd3e59ee27a Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 21 Jun 2004 10:45:15 +0000 Subject: [PATCH 1/1] field name is primary_svc, not primary --- FS/FS/ClientAPI/MyAccount.pm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm index f2cd48863..6caa19790 100644 --- a/FS/FS/ClientAPI/MyAccount.pm +++ b/FS/FS/ClientAPI/MyAccount.pm @@ -61,6 +61,11 @@ sub login { ); return { error => 'User not found.' } unless $svc_acct; + my $conf = new FS::Conf; + my $pkg_svc = $svc_acct->cust_svc->pkg_svc; + return { error => 'Only primary user may log in.' } + if $conf->exists('selfservice_server-primary_only') + && ( ! $pkg_svc || $pkg_svc->primary_svc ne 'Y' ); return { error => 'Incorrect password.' } unless $svc_acct->check_password($p->{'password'}); @@ -75,12 +80,6 @@ sub login { $session->{'custnum'} = $cust_main->custnum; } - my $conf = new FS::Conf; - my $pkg_svc = $svc_acct->cust_svc->pkg_svc; - return { error => 'Only primary user may log in.' } - if $conf->exists('selfservice_server-primary_only') - && ( ! $pkg_svc || $pkg_svc->primary ne 'Y' ); - my $session_id; do { $session_id = md5_hex(md5_hex(time(). {}. rand(). $$)) -- 2.11.0