version 1.43, 2014/02/12 20:47:40
|
version 1.45, 2014/04/16 13:32:43
|
Line 90 use Apache::loncommon;
|
Line 90 use Apache::loncommon;
|
use Apache::lonmsg; |
use Apache::lonmsg; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonuserutils; |
use Apache::lonuserutils; |
|
use LONCAPA::batchcreatecourse; |
use LONCAPA qw(:DEFAULT :match); |
use LONCAPA qw(:DEFAULT :match); |
|
|
sub send_selfserve_notification { |
sub send_selfserve_notification { |
Line 876 sub update_request_queue {
|
Line 877 sub update_request_queue {
|
|
|
if (ref($curr{$uname}) eq 'HASH') { |
if (ref($curr{$uname}) eq 'HASH') { |
my ($username,$logtoken,$serverid,$encpass,$courseid,$id,$firstname, |
my ($username,$logtoken,$serverid,$encpass,$courseid,$id,$firstname, |
$middlename,$lastname,$generation); |
$middlename,$lastname,$generation,$inststatus); |
$curr{$uname}{'timestamp'} = $now; |
$curr{$uname}{'timestamp'} = $now; |
$curr{$uname}{'adjudicator'} = $env{'user.name'}.':'.$env{'user.domain'}; |
$curr{$uname}{'adjudicator'} = $env{'user.name'}.':'.$env{'user.domain'}; |
$courseid = $curr{$uname}{'courseid'}; |
$courseid = $curr{$uname}{'courseid'}; |
Line 885 sub update_request_queue {
|
Line 886 sub update_request_queue {
|
$middlename = $curr{$uname}{'middlename'}; |
$middlename = $curr{$uname}{'middlename'}; |
$lastname = $curr{$uname}{'lastname'}; |
$lastname = $curr{$uname}{'lastname'}; |
$generation = $curr{$uname}{'generation'}; |
$generation = $curr{$uname}{'generation'}; |
|
$inststatus = $curr{$uname}{'usertype'}; |
|
|
my ($key,$caller)=split(/&/,$curr{$uname}{'tmpinfo'}); |
my ($key,$caller)=split(/&/,$curr{$uname}{'tmpinfo'}); |
if ($caller eq 'createaccount') { |
if ($caller eq 'createaccount') { |
Line 901 sub update_request_queue {
|
Line 903 sub update_request_queue {
|
if ($uhome eq 'no_host') { |
if ($uhome eq 'no_host') { |
push(@warn_approves,$uname); |
push(@warn_approves,$uname); |
} else { |
} else { |
|
unless (($inststatus eq 'default') || ($inststatus eq '')) { |
|
&Apache::lonnet::put('environment',{inststatus => $inststatus},$cdom,$uname); |
|
} |
&send_selfserve_notification($uname.':'.$cdom, |
&send_selfserve_notification($uname.':'.$cdom, |
$approvedmsg,undef,undef,$now, |
$approvedmsg,undef,undef,$now, |
$beneficiary,$sender); |
$beneficiary,$sender); |
Line 2125 sub process_official_reqs {
|
Line 2130 sub process_official_reqs {
|
return $output; |
return $output; |
} |
} |
|
|
|
sub requestcourses_validation_types { |
|
my @items = ('url','fields','button','markup'); |
|
my %names = &Apache::lonlocal::texthash ( |
|
url => 'Web address of validation server/script', |
|
fields => 'Form fields to send to validator', |
|
button => 'Text for validation button', |
|
markup => 'Validation description (HTML)', |
|
); |
|
my @fields = ('owner','course','coursetype','description'); |
|
return (\@items,\%names,\@fields); |
|
} |
|
|
sub is_active_author { |
sub is_active_author { |
if ($env{'user.role.au./'.$env{'user.domain'}.'/'} =~ /^(\d*)\.(\d*)$/) { |
if ($env{'user.role.au./'.$env{'user.domain'}.'/'} =~ /^(\d*)\.(\d*)$/) { |
if ((!$1 || $1 < time) && |
if ((!$1 || $1 < time) && |