--- loncom/interface/lonrequestcourse.pm 2015/07/14 00:11:48 1.92 +++ loncom/interface/lonrequestcourse.pm 2023/03/11 04:54:24 1.95.2.7.2.3 @@ -1,7 +1,7 @@ # The LearningOnline Network # Request a course # -# $Id: lonrequestcourse.pm,v 1.92 2015/07/14 00:11:48 raeburn Exp $ +# $Id: lonrequestcourse.pm,v 1.95.2.7.2.3 2023/03/11 04:54:24 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -119,6 +119,10 @@ use Apache::loncoursequeueadmin; use Apache::lonuserutils; use LONCAPA qw(:DEFAULT :match); +my $registered_flush; +my $registered_instcats; +my $modified_dom; + sub handler { my ($r) = @_; &Apache::loncommon::content_type($r,'text/html'); @@ -127,6 +131,10 @@ sub handler { return OK; } + $registered_flush = 0; + $registered_instcats = 0; + $modified_dom = ''; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['action','showdom','cnum','state','crstype','queue','tabs']); &Apache::lonhtmlcommon::clear_breadcrumbs(); @@ -311,8 +319,6 @@ sub handler { $jscript = &Apache::lonhtmlcommon::set_form_elements($elementsref,\%stored); if ($state eq 'courseinfo') { $jscript .= &cloning_javascript(); - } elsif ($state eq 'process') { - $jscript .= &processing_javascript(); } } } @@ -424,17 +430,6 @@ function setCloneDisplay(courseForm) { END } -sub processing_javascript { - return <<"END"; -function hideProcessing() { - if (document.getElementById('processing')) { - document.getElementById('processing').style.display="none"; - } -} - -END -} - sub get_breadcrumbs { my ($dom,$action,$state,$states,$trail) = @_; my ($crumb,$newinstcode,$codechk,$checkedcode,$numtitles,$description); @@ -551,6 +546,7 @@ sub form_elements { clonedom => 'selectbox', datemode => 'radio', dateshift => 'text', + tinyurls => 'radio', }, enrollment => { accessstart_month => 'selectbox', @@ -712,9 +708,6 @@ sub onload_action { if ($state eq 'courseinfo') { $loaditems{'onload'} .= 'javascript:setCloneDisplay(document.requestcrs);'; } - if ($state eq 'process') { - $loaditems{'onload'} .= 'javascript:hideProcessing();'; - } } return \%loaditems; } @@ -2097,6 +2090,18 @@ sub print_personnel_menu { $output .= &Apache::lonhtmlcommon::row_headline(). '

'.&Apache::loncommon::help_open_topic('Course_Request_Personnel').' '.$lt{$crstype}.' '.&mt('Include other personnel?').'

'; } + my $cansearch = 1; + my @alldoms = &Apache::lonnet::all_domains(); + if (@alldoms == 1) { + my %domsrch = &Apache::lonnet::get_dom('configuration', + ['directorysrch'],$alldoms[0]); + if (ref($domsrch{'directorysrch'}) eq 'HASH') { + if ((!$domsrch{'directorysrch'}{'available'}) && + ($domsrch{'directorysrch'}{'lcavailable'} eq '0')) { + $cansearch = 0; + } + } + } for (my $i=0; $i<$persontotal; $i++) { my @linkargs = map { 'person_'.$i.'_'.$_ } (@items); my $linkargstr = join("','",@linkargs); @@ -2121,9 +2126,14 @@ sub print_personnel_menu { } $sectionselector .= $newtitle. ''."\n"; - my $usersrchlinktxt = &mt('Search for user'); - my $usersrchlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom, - $usersrchlinktxt); + my $usersrchlink; + if ($cansearch) { + my $usersrchlinktxt = &mt('Search for user'); + $usersrchlink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom, + $usersrchlinktxt); + } else { + $usersrchlink = ' '; + } my $userchklinktxt = &mt('Check username'); my $userchklink = &Apache::loncommon::selectuser_link($formname,@linkargs,$dom, $userchklinktxt,'checkusername'); @@ -2370,7 +2380,7 @@ sub print_cancel_request { &Apache::loncommon::start_data_table_row(). ''.$history{details}{'cdescr'}.''. &Apache::lonlocal::locallocaltime($timestamp).''. - ''.$showtype.''. + ''.&mt($showtype).''. &Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table(). '
'; @@ -2724,7 +2734,7 @@ sub requestlog_display_filter { $typename = $typenames->{$crstype}; } } - $output .= ''."\n"; + $output .= ''."\n"; } $output .= ''; } @@ -2900,7 +2910,7 @@ sub print_review { $inst_values .= ''.$env{'form.coursecredits'}.''; } - my %ctxt = &clone_text(); + my %ctxt = &clone_text($env{'form.crstype'}); $inst_headers .= ''.&mt('Clone From').''; if (($env{'form.cloning'}) && ($env{'form.clonecrs'} =~ /^$match_name$/) && @@ -2912,7 +2922,8 @@ sub print_review { my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'}, $env{'form.clonecrs'},('description','internal.coursecode')); if (keys(%courseenv) > 0) { - $inst_headers .= ''.$ctxt{'dsh'}.''; + $inst_headers .= ''.$ctxt{'dsh'}.''. + ''.$ctxt{'dpl'}.''; $inst_values .= ''.$courseenv{'description'}.' '; my $cloneinst = $courseenv{'internal.coursecode'}; if ($cloneinst ne '') { @@ -2928,6 +2939,14 @@ sub print_review { } else { $inst_values .= $ctxt{'ncd'}; } + $inst_values .= ''; + if ($env{'form.tinyurls'} eq 'delete') { + $inst_values .= $ctxt{'nsl'}; + } elsif ($env{'form.tinyurls'} eq 'transfer') { + $inst_values .= $ctxt{'tsl'}; + } else { + $inst_values .= $ctxt{'csl'}; + } $inst_values .= ''; } else { $inst_values .= ''.&mt('Unknown').''; @@ -3156,13 +3175,13 @@ sub clone_form { if ($crstype eq 'community') { $type = 'Community'; } - my %lt = &clone_text(); + my %lt = &clone_text($crstype); my $output .= &Apache::lonhtmlcommon::row_title($lt{'dmn'}).''. &Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::row_title($lt{'cid'}).' '. &Apache::loncommon::selectcourse_link($formname,'clonecrs','clonedom','','','',$type). &Apache::lonhtmlcommon::row_closure(1). @@ -3173,20 +3192,38 @@ sub clone_form { '
'. - ''. + ''. + &Apache::lonhtmlcommon::row_closure(1). + &Apache::lonhtmlcommon::row_title($lt{'dpl'}).'

'. &Apache::lonhtmlcommon::row_closure(1); return $output; } sub clone_text { - return &Apache::lonlocal::texthash( + my ($crstype) = @_; + my %lt = &Apache::lonlocal::texthash( 'cid' => 'Course ID', 'dmn' => 'Domain', 'dsh' => 'Date Shift', 'ncd' => 'Do not clone date parameters', 'prd' => 'Clone date parameters as-is', 'shd' => 'Shift date parameters by number of days', - ); + 'dpl' => 'URL shortcuts (for deep linking)', + 'nsl' => 'Do not clone URL shortcuts', + 'tsl' => 'Transfer URL shortcuts from existing course to new course', + 'csl' => 'Create new URL shortcuts in new course', + ); + if ($crstype eq 'Community') { + $lt{'tsl'} = &mt('Transfer URL shortcuts from existing course to new community'); + $lt{'csl'} = &mt('Create new URL shortcuts in new course'); + } + return %lt; } sub coursecode_form { @@ -3212,7 +3249,7 @@ sub coursecode_form { } if (@{$codetitles} > 0) { my $lastitem = pop(@{$codetitles}); - my $lastinput = ''; + my $lastinput = ''; if (@{$codetitles} > 0) { my $helplink; if (defined($helpitem{$context})) { @@ -3613,6 +3650,19 @@ sub print_request_outcome { } } } + if ($env{'form.chome'} eq 'default') { + my %servers = &Apache::lonnet::get_servers($dom,'library'); + my $numlib = keys(%servers); + if ($numlib) { + my $loadm=10000000; + my $chome; + foreach my $tryserver (keys(%servers)) { + ($chome,$loadm) = + &Apache::lonnet::compare_server_load($tryserver,$chome,$loadm); + } + $env{'form.chome'} = $chome; + } + } my $details = { owner => $env{'user.name'}, domain => $env{'user.domain'}, @@ -3628,6 +3678,7 @@ sub print_request_outcome { clonecrs => $clonecrs, datemode => $env{'form.datemode'}, dateshift => $env{'form.dateshift'}, + tinyurls => $env{'form.tinyurls'}, sectotal => $sectotal, sections => \%sections, crosslisttotal => $crosslisttotal, @@ -3667,7 +3718,7 @@ sub process_request { } $storeresult = 'notpermitted'; } else { - my ($disposition,$message,$reqstatus,$coursedesc,%customvalidation); + my ($disposition,$message,$reqstatus,$coursedesc,$accessstart,$accessend,%customvalidation); my %reqhash = ( reqtime => $now, crstype => $crstype, @@ -3679,6 +3730,8 @@ sub process_request { $env{'user.domain'}); if (ref($details) eq 'HASH') { $coursedesc = $details->{'cdescr'}; + $accessstart = $details->{'accessstart'}; + $accessend = $details->{'accessend'}; } if ($val eq 'autolimit=') { $disposition = 'process'; @@ -3757,7 +3810,9 @@ sub process_request { $storeresult = 'rejected'; } elsif ($disposition eq 'process') { my %domdefs = &Apache::lonnet::get_domain_defaults($dom); - my ($logmsg,$newusermsg,$addresult,$enrollcount,$response,$keysmsg,%longroles,$code); + my ($logmsg,$newusermsg,$addresult,$enrollcount,$response, + $keysmsg,%longroles,$code); + my $clonemsg = []; my $type = 'Course'; if ($crstype eq 'community') { $type = 'Community'; @@ -3766,9 +3821,20 @@ sub process_request { foreach my $role (@roles) { $longroles{$role}=&Apache::lonnet::plaintext($role,$type); } - $r->print('
'."\n". - &mt('Your request is being processed; this page will update when processing is complete.'). - '
'); + my $preamble = '
'. + '
'. + &mt("Please be patient while your request is processed"). + '
'. + '
'; + my $closure = < +// + +ENDCLOSE + my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble); + &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Processing ...')); $r->rflush(); if (ref($details) eq 'HASH') { if ($details->{'clonecrs'}) { @@ -3786,10 +3852,16 @@ sub process_request { $customitems{'_LC_owneremail'} = $owneremail; } $customitems{'_LC_coursedomainname'} = &Apache::lonnet::domain($dom,'description'); + $customitems{'_LC_coursedescription'} = $coursedesc; + $customitems{'_LC_coursestartdate'} = $accessstart; + $customitems{'_LC_courseenddate'} = $accessend; my ($result,$postprocess) = &Apache::loncoursequeueadmin::course_creation($dom,$cnum, - 'autocreate',$details,\$logmsg,\$newusermsg,\$addresult, - \$enrollcount,\$response,\$keysmsg,\%domdefs,\%longroles, - \$code,\%customitems); + 'autocreate',$details,\$logmsg,$clonemsg,\$newusermsg, + \$addresult,\$enrollcount,\$response,\$keysmsg,\%domdefs, + \%longroles,\$code,\%customitems); + &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!')); + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + $r->print($closure); if (ref($postprocess) eq 'HASH') { $customized = $postprocess->{'createdcustomized'}; } @@ -3823,7 +3895,39 @@ sub process_request { $output .= '
'.$role_result; } $output .= '

'; + if ($logmsg) { + $output .= '

'.$logmsg.'

'; + } + if ((ref($clonemsg) eq 'ARRAY') && (@{$clonemsg})) { + $output .= '

'; + my $user_lh = &Apache::loncommon::user_lang($env{'user.name'},$env{'user.domain'}); + foreach my $item (@{$clonemsg}) { + if (ref($item) eq 'HASH') { + $output .= &mt_user($user_lh,$item->{mt}, + @{$item->{args}}).'
'."\n"; + } + } + $output .= '

'."\n"; + } $creationresult = 'created'; + # Flush the course logs so reverse user roles immediately updated + unless ($registered_flush) { + my $handlers = $r->get_handlers('PerlCleanupHandler'); + $r->set_handlers('PerlCleanupHandler' => [\&Apache::lonnet::flushcourselogs,@{$handlers}]); + $registered_flush=1; + } + if ($instcode ne '') { + &Apache::lonnet::devalidate_cache_new('instcats',$dom); + # Update cache of self-cataloging courses on institution's server(s). + if (&Apache::lonnet::shared_institution($dom)) { + unless ($registered_instcats) { + my $handlers = $r->get_handlers('PerlCleanupHandler'); + $r->set_handlers('PerlCleanupHandler' => [\&devalidate_remote_instcats,@{$handlers}]); + $registered_instcats=1; + $modified_dom = $dom; + } + } + } } else { $output = ''; if ($crstype eq 'community') { @@ -3932,7 +4036,7 @@ sub process_request { } elsif ($disposition eq 'pending') { my $pendingform; if ($crstype ne 'official') { - $pendingform = &pending_validation_form($dom,$cnum,$crstype,$now,$token, + $pendingform = &pending_validation_form($r,$dom,$cnum,$crstype,$now,$token, $lonhost,$env{'form.cdescr'}); } if ($pendingform) { @@ -3959,6 +4063,22 @@ sub process_request { } } +sub devalidate_remote_instcats { + if ($modified_dom ne '') { + my %servers = &Apache::lonnet::internet_dom_servers($modified_dom); + my %thismachine; + map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); + if (keys(%servers)) { + foreach my $server (keys(%servers)) { + next if ($thismachine{$server}); + &Apache::lonnet::remote_devalidate_cache($server,['instcats:'.$modified_dom]); + } + } + $modified_dom = ''; + } + return; +} + sub custom_formitems { my ($preprocess,$customhash) = @_; return unless ((ref($preprocess) eq 'HASH') && (ref($customhash) eq 'HASH')); @@ -4234,7 +4354,7 @@ sub notification_information { } sub pending_validation_form { - my ($cdom,$cnum,$crstype,$now,$token,$lonhost,$cdesc) = @_; + my ($r,$cdom,$cnum,$crstype,$now,$token,$lonhost,$cdesc) = @_; my $output; my %postvalues = ( 'owner' => $env{'user.name'}.':'.$env{'user.domain'}, @@ -4267,9 +4387,12 @@ sub pending_validation_form { $buttontext = &mt('Create course'); } } + my $hostname = &Apache::lonnet::hostname($lonhost); my $protocol = $Apache::lonnet::protocol{$lonhost}; $protocol = 'http' if ($protocol ne 'https'); - my $crscreator = $protocol.'://'.&Apache::lonnet::hostname($lonhost).'/cgi-bin/createpending.pl'; + my $alias = &Apache::lonnet::use_proxy_alias($r,$lonhost); + $hostname = $alias if ($alias ne ''); + my $crscreator = $protocol.'://'.$hostname.'/cgi-bin/createpending.pl'; $output .= ''."\n". ''."\n". ''."\n". @@ -4345,6 +4468,7 @@ sub retrieve_settings { } $env{'form.datemode'} = $reqinfo{'datemode'}; $env{'form.dateshift'} = $reqinfo{'dateshift'}; + $env{'form.tinyurls'} = $reqinfo{'tinyurls'}; if ($reqinfo{'crstype'} eq 'official') { $env{'form.autoadds'} = $reqinfo{'autoadds'}; $env{'form.autodrops'} = $reqinfo{'autodrops'}; @@ -4549,7 +4673,16 @@ sub print_textbook_form { $cc_clone .= $cdom.':'.$cnum.'&'; unless (exists($cloneable{$cdom.'_'.$cnum})) { my %courseinfo = &Apache::lonnet::coursedescription($cdom.'_'.$cnum,{'one_time' => 1}); - $cloneable{$cdom.'_'.$cnum} = \%courseinfo; + $cloneable{$cdom.'_'.$cnum} = { + context => $courseinfo{'internal.creationcontext'}, + created => $courseinfo{'internal.created'}, + creator => $courseinfo{'internal.creator'}, + description => $courseinfo{'description'}, + inst_code => $courseinfo{'coursecode'}, + owner => $courseinfo{'internal.courseowner'}, + releaserequired => $courseinfo{'internal.releaserequired'}, + type => $courseinfo{'type'}, + }; } } @@ -4738,17 +4871,26 @@ sub print_textbook_form { # # Table of user's current courses (owner and/or course coordinator) # - my %lt = &clone_text(); + my %lt = &clone_text('Course'); if (keys(%cloneable)) { $r->print(''); } # @@ -4757,13 +4899,20 @@ sub print_textbook_form { if (keys(%domcloneable)) { $r->print(''); } @@ -4845,11 +4994,14 @@ sub clone_selection_table { $cleantitle=~s/'/\\'/g; $cleantitle =~ s/^\s+//; my ($namestr,@owners,%ownernames); - my $singleowner = $cloneableref->{$cid}{'internal.courseowner'}; - push(@owners,$singleowner); + if ($cloneableref->{$cid}{'owner'} ne '') { + push(@owners,$cloneableref->{$cid}{'owner'}); + } if ($cloneableref->{$cid}{'co-owners'} ne '') { - foreach my $item (split(/,/,$cloneableref->{$cid}{'internal.co-owners'})) { - push(@owners,$item); + foreach my $item (split(/,/,$cloneableref->{$cid}{'co-owners'})) { + if (($item ne '') && (!grep(/^\Q$item\E$/,@owners))) { + push(@owners,$item); + } } } foreach my $owner (@owners) { @@ -4945,11 +5097,7 @@ sub process_textbook_request { undef($clonedom); } } - my $js = &processing_javascript(); - my $loaditems = { - onload => 'javascript:hideProcessing();', - }; - $r->print(&header('Course Creation',$js,$loaditems)); + $r->print(&header('Course Creation')); if (ref($can_request) eq 'HASH') { unless ((scalar(keys(%{$can_request})) == 1) && ($can_request->{'textbook'})) { @@ -4983,9 +5131,35 @@ sub process_textbook_request { accessend => $accessend, personnel => {}, }; - if ($reqtype eq 'existing') { - $details->{datemode} = $env{'form.datemode'}; - $details->{dateshift} = $env{'form.dateshift'}; + if (($clonecrs ne '') && ($clonedom ne '')) { + if ($reqtype eq 'existing') { + $details->{datemode} = $env{'form.owndatemode'}; + if ($details->{datemode} eq 'shift') { + $details->{dateshift} = $env{'form.owndateshift'}; + } else { + $details->{dateshift} = ''; + } + $details->{tinyurls} = $env{'form.owntinyurls'}; + } elsif ($reqtype eq 'colleague') { + $details->{datemode} = $env{'form.colldatemode'}; + if ($details->{datemode} eq 'shift') { + $details->{dateshift} = $env{'form.colldateshift'}; + } else { + $details->{dateshift} = ''; + } + $details->{tinyurls} = $env{'form.colltinyurls'}; + } elsif (($reqtype eq 'textbook') || ($reqtype eq 'template')) { + $details->{datemode} = 'delete'; + $details->{dateshift} = ''; + $details->{tinyurls} = ''; + } + if ($details->{dateshift} ne '') { + $details->{dateshift} =~ s/[^\d\.]+//g; + } + } else { + $details->{datemode} = ''; + $details->{dateshift} = ''; + $details->{tinyurls} = ''; } my $lonhost = $r->dir_config('lonHostID'); $r->rflush();