--- loncom/interface/londocs.pm 2022/09/19 19:37:46 1.484.2.93.2.3 +++ loncom/interface/londocs.pm 2024/06/07 14:37:55 1.710 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.484.2.93.2.3 2022/09/19 19:37:46 raeburn Exp $ +# $Id: londocs.pm,v 1.710 2024/06/07 14:37:55 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -43,13 +43,17 @@ use Apache::lonnavdisplay(); use Apache::lonextresedit(); use Apache::lontemplate(); use Apache::lonsimplepage(); +use Apache::lonhomework(); +use Apache::lonpublisher(); use Apache::loncourserespicker(); use HTML::Entities; use HTML::TokeParser; use GDBM_File; use File::MMagic; +use File::Copy; use Apache::lonlocal; use Cwd; +use UUID::Tiny ':std'; use LONCAPA qw(:DEFAULT :match); my $iconpath; @@ -86,7 +90,7 @@ sub storemap { if ($map =~ /^default/) { $hadchanges=1; - } else { + } elsif ($contentchg) { $suppchanges=1; } return ($errtext,0); @@ -98,6 +102,7 @@ sub authorhosts { my %outhash=(); my $home=0; my $other=0; + my @ids=&Apache::lonnet::current_machine_ids(); foreach my $key (keys(%env)) { if ($key=~/^user\.role\.(au|ca)\.(.+)$/) { my $role=$1; @@ -114,7 +119,6 @@ sub authorhosts { } my $allowed=0; my $myhome=&Apache::lonnet::homeserver($ca,$cd); - my @ids=&Apache::lonnet::current_machine_ids(); foreach my $id (@ids) { if ($id eq $myhome) { $allowed=1; @@ -178,43 +182,62 @@ sub default_folderpath { } } -sub validate_folderpath { - my ($supplementalflag) = @_; - if ($env{'form.folderpath'} ne '') { - my @items = split(/\&/,$env{'form.folderpath'}); - my $badpath; - for (my $i=0; $i<@items; $i++) { - my $odd = $i%2; - if (($odd) && (!$supplementalflag) && ($items[$i] !~ /^[^:]*:(|\d+):(|1):(|1):(|1):(|1)$/)) { - $badpath = 1; - } elsif ((!$odd) && ($items[$i] !~ /^(default|supplemental)(|_\d+)$/)) { - $badpath = 1; - } - last if ($badpath); - } - if ($badpath) { - delete($env{'form.folderpath'}); - } - } - return; -} - -sub validate_suppath { +sub validate_supppath { + my ($coursenum,$coursedom) = @_; + my $backto; if ($env{'form.supppath'} ne '') { my @items = split(/\&/,$env{'form.supppath'}); - my $badpath; + my ($badpath,$got_supp,$supppath,%supphidden,%suppids); for (my $i=0; $i<@items; $i++) { my $odd = $i%2; if ((!$odd) && ($items[$i] !~ /^supplemental(|_\d+)$/)) { $badpath = 1; + last; + } elsif ($odd) { + my $suffix; + my $idx = $i-1; + if ($items[$i] =~ /^([^:]*)::(|1):::$/) { + $backto .= '&'.$1; + } elsif ($items[$idx] eq 'supplemental') { + $backto .= '&'.$items[$i]; + } else { + $backto .= '&'.$items[$i]; + my $is_hidden; + unless ($got_supp) { + my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom); + if (ref($supplemental) eq 'HASH') { + if (ref($supplemental->{'hidden'}) eq 'HASH') { + %supphidden = %{$supplemental->{'hidden'}}; + } + if (ref($supplemental->{'ids'}) eq 'HASH') { + %suppids = %{$supplemental->{'ids'}}; + } + } + $got_supp = 1; + } + if (ref($suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}) eq 'ARRAY') { + my $mapid = $suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}->[0]; + if ($supphidden{$mapid}) { + $is_hidden = 1; + } + } + $suffix = '::'.$is_hidden.':::'; + } + $supppath .= '&'.$items[$i].$suffix; + } else { + $supppath .= '&'.$items[$i]; + $backto .= '&'.$items[$i]; } - last if ($badpath); } if ($badpath) { delete($env{'form.supppath'}); + } else { + $supppath =~ s/^\&//; + $backto =~ s/^\&//; + $env{'form.supppath'} = $supppath; } } - return; + return $backto; } sub dumpcourse { @@ -240,8 +263,8 @@ ENDJS add_entries => {'onload' => "hide_searching();"}, }; } - $r->print(&Apache::loncommon::start_page('Copy '.$crstype.' Content to Authoring Space',$js,$starthash)."\n". - &Apache::lonhtmlcommon::breadcrumbs('Copy '.$crstype.' Content to Authoring Space')."\n"); + $r->print(&Apache::loncommon::start_page('Copy uploaded content to Authoring Space',$js,$starthash)."\n". + &Apache::lonhtmlcommon::breadcrumbs('Copy uploaded content to Authoring Space')."\n"); $r->print(&startContentScreen('tools')); my ($home,$other,%outhash)=&authorhosts(); unless ($home) { @@ -272,7 +295,7 @@ ENDJS } else { &Apache::loncourserespicker::enumerate_course_contents($navmap,\%maps,\%resources,\%titles, 'dumpdocs',$cdom,$cnum); - } + } my @todump = &Apache::loncommon::get_env_multiple('form.archive'); my (%tocopy,%replacehash,%lookup,%deps,%display,%result,%depresult,%simpleproblems,%simplepages, %newcontent,%has_simpleprobs); @@ -283,7 +306,7 @@ ENDJS if ($res =~ m{^uploaded/$cdom/$cnum/\E((?:docs|supplemental)/.+)$}) { $tocopy{$1} = $name; $display{$item} = $1; - $lookup{$1} = $item; + $lookup{$1} = $item; } elsif ($res eq 'lib/templates/simpleproblem.problem') { $simpleproblems{$item} = { symb => $resources{$item}, @@ -383,7 +406,7 @@ $contents{content}.' </div>'; } if ($contents{webreferences}) { - $content .= ' + $content .= ' <div class="LC_Box"> <h4 class="LC_hcell">'.&mt('Web References').'</h4>'. $contents{webreferences}.' @@ -393,10 +416,10 @@ $contents{webreferences}.' </body> </html> '; - $newcontent{'/'.$simplepages{$item}{res}} = $content; + $newcontent{'/'.$simplepages{$item}{res}} = $content; } } - foreach my $item (keys(%tocopy)) { + foreach my $item (keys(%tocopy)) { unless ($item=~/\.(sequence|page)$/) { my $currurlpath = $prefix.$item; my $currdirpath = &Apache::lonnet::filelocation('',$currurlpath); @@ -427,39 +450,39 @@ $contents{webreferences}.' if ($simpleproblems{$num}) { $newfilename=$title.'/'.$simpleproblems{$num}{'name'}; } else { - $newfilename=$title.'/'.$replacehash{$item}; + $newfilename=$title.'/'.$replacehash{$item}; } - $newfilename=~s/\.(\w+)$//; - my $ext=$1; - $newfilename=&clean($newfilename); - $newfilename.='.'.$ext; - my ($newrelpath) = ($newfilename =~ m{^\Q$title/\E(.+)$}); + $newfilename=~s/\.(\w+)$//; + my $ext=$1; + $newfilename=&clean($newfilename); + $newfilename.='.'.$ext; + my ($newrelpath) = ($newfilename =~ m{^\Q$title/\E(.+)$}); if ($newrelpath ne $replacehash{$item}) { $replacehash{$item} = $newrelpath; } - my @dirs=split(/\//,$newfilename); - my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca"; - my $makepath=$path; - my $fail; + my @dirs=split(/\//,$newfilename); + my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca"; + my $makepath=$path; + my $fail; my $origin; - for (my $i=0;$i<$#dirs;$i++) { - $makepath.='/'.$dirs[$i]; - unless (-e $makepath) { - unless(mkdir($makepath,0755)) { + for (my $i=0;$i<$#dirs;$i++) { + $makepath.='/'.$dirs[$i]; + unless (-e $makepath) { + unless(mkdir($makepath,0755)) { $fail = &mt('Directory creation failed.'); } - } - } + } + } if ($i == 0) { - $result = '<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: '; + $result = '<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: '; } else { $depresult .= '<li><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt> '. '<span class="LC_fontsize_small" style="font-weight: bold;">'. &mt('(dependency)').'</span>: '; } if (-e $path.'/'.$newfilename) { - $fail = &mt('Destination already exists -- not overwriting.'); - } else { + $fail = &mt('Destination already exists -- not overwriting.'); + } else { if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) { if (($item =~ m{^/adm/$match_domain/$match_username/\d+/smppg}) || ($item =~ /^simpleproblem_/)) { @@ -481,18 +504,18 @@ $contents{webreferences}.' while (my $token = $parser->get_token) { if ($token->[0] eq 'S') { if (($token->[1] eq 'resource') && - ($token->[2]->{'src'} eq '/res/lib/templates/simpleproblem.problem') && + ($token->[2]->{'src'} eq '/res/lib/templates/simpleproblem.problem') && ($changes{$token->[2]->{'id'}})) { my $id = $token->[2]->{'id'}; $updatedcontent .= '<'.$token->[1]; foreach my $attrib (@{$token->[3]}) { - next unless ($attrib =~ /^(src|type|title|id)$/); + next unless ($attrib =~ /^(src|type|title|id)$/); if ($attrib eq 'src') { - my ($file) = ($display{$changes{$id}} =~ /^\Qsimpleproblem_\E(.+)$/); + my ($file) = ($display{$changes{$id}} =~ /^\Qsimpleproblem_\E(.+)$/); if ($file) { $updatedcontent .= ' '.$attrib.'="'.$file.'"'; } else { - $updatedcontent .= ' '.$attrib.'="'.$token->[2]->{$attrib}.'"'; + $updatedcontent .= ' '.$attrib.'="'.$token->[2]->{$attrib}.'"'; } } else { $updatedcontent .= ' '.$attrib.'="'.$token->[2]->{$attrib}.'"'; @@ -507,36 +530,36 @@ $contents{webreferences}.' } } print $fh $updatedcontent; - } else { - print $fh &Apache::lonclonecourse::rewritefile( + } else { + print $fh &Apache::lonclonecourse::rewritefile( &Apache::lonclonecourse::readfile($env{'request.course.id'},$item), - (%replacehash,$crs => '') - ); + (%replacehash,$crs => '') + ); } } else { - print $fh + print $fh &Apache::lonclonecourse::readfile($env{'request.course.id'},$item); - } + } } else { - $fail = &mt('Source does not exist.'); + $fail = &mt('Source does not exist.'); } } $fh->close(); - } else { - $fail = &mt('Could not write to destination.'); + } else { + $fail = &mt('Could not write to destination.'); } - } + } my $text; - if ($fail) { + if ($fail) { $text = '<span class="LC_error">'.&mt('fail').(' 'x3).$fail.'</span>'; - } else { + } else { $text = '<span class="LC_success">'.&mt('ok').'</span>'; } if ($i == 0) { $result .= $text; } else { $depresult .= $text.'</li>'; - } + } } $r->print($result); if ($depresult) { @@ -553,63 +576,63 @@ $contents{webreferences}.' $r->rflush(); my ($preamble,$formname); $formname = 'dumpdoc'; - unless ($home==1) { - $preamble = '<div class="LC_left_float">'. - '<fieldset><legend>'. + unless ($home==1) { + $preamble = '<div class="LC_left_float">'. + '<fieldset><legend>'. &mt('Select the Authoring Space'). '</legend><select name="authorspace">'; - } + } my @orderspaces = (); - foreach my $key (sort(keys(%outhash))) { + foreach my $key (sort(keys(%outhash))) { if ($key=~/^home_(.+)$/) { if ($1 eq $env{'user.name'}.':'.$env{'user.domain'}) { unshift(@orderspaces,$1); } else { push(@orderspaces,$1); } - } + } } if ($home>1) { $preamble .= '<option value="" selected="selected">'.&mt('Select').'</option>'; } foreach my $user (@orderspaces) { - if ($home==1) { - $preamble .= '<input type="hidden" name="authorspace" value="'.$user.'" />'; - } else { - $preamble .= '<option value="'.$user.'">'.$user.' - '. - &Apache::loncommon::plainname(split(/\:/,$user)).'</option>'; - } - } - unless ($home==1) { - $preamble .= '</select></fieldset></div>'."\n"; - } - my $title=$origcrsdata{'description'}; - $title=~s/[\/\s]+/\_/gs; - $title=&clean($title); - $preamble .= '<div class="LC_left_float">'. + if ($home==1) { + $preamble .= '<input type="hidden" name="authorspace" value="'.$user.'" />'; + } else { + $preamble .= '<option value="'.$user.'">'.$user.' - '. + &Apache::loncommon::plainname(split(/\:/,$user)).'</option>'; + } + } + unless ($home==1) { + $preamble .= '</select></fieldset></div>'."\n"; + } + my $title=$origcrsdata{'description'}; + $title=~s/[\/\s]+/\_/gs; + $title=&clean($title); + $preamble .= '<div class="LC_left_float">'. '<fieldset><legend>'.&mt('Folder in Authoring Space').'</legend>'. '<input type="text" size="50" name="authorfolder" value="'. $title.'" />'. '</fieldset></div><div style="padding:0;clear:both;margin:0;border:0"></div>'."\n"; my %uploadedfiles; - &tiehash(); - foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) { - my ($ext)=($file=~/\.(\w+)$/); + &tiehash(); + foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) { + my ($ext)=($file=~/\.(\w+)$/); # FIXME Check supplemental here - my $title=$hash{'title_'.$hash{ - 'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}}; - if (!$title) { - $title=$file; - } else { - $title=~s|/|_|g; - } - $title=~s/\.(\w+)$//; - $title=&clean($title); - $title.='.'.$ext; -# $r->print("\n<td><input type='text' size='60' name='namefor_".$file."' value='".$title."' /></td>" + my $title=$hash{'title_'.$hash{ + 'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}}; + if (!$title) { + $title=$file; + } else { + $title=~s|/|_|g; + } + $title=~s/\.(\w+)$//; + $title=&clean($title); + $title.='.'.$ext; +# $r->print("\n<td><input type='text' size='60' name='namefor_".$file."' value='".$title."' /></td>" $uploadedfiles{$file} = $title; - } - &untiehash(); + } + &untiehash(); $r->print(&Apache::loncourserespicker::create_picker($navmap,'dumpdocs',$formname,$crstype,undef, undef,undef,$preamble,$home,\%uploadedfiles)); } @@ -640,7 +663,7 @@ sub recurse_html { } else { $relfile = $dependency; $depurl = $currurlpath; - $depurl =~ s{[^/]+$}{}; + $depurl =~ s{[^/]+$}{}; $depurl .= $dependency; ($newcontainer) = ($depurl =~ m{^\Q$prefix\E(.+)$}); } @@ -649,7 +672,7 @@ sub recurse_html { $newname =~ s{[^/]+$}{}; $replacehash->{$newcontainer} = $newname.$relfile; $deps->{$item}{$newcontainer} = 1; - my ($newurlpath) = ($depurl =~ m{^(.*)/[^/]+$}); + my ($newurlpath) = ($depurl =~ m{^(.*)/[^/]+$}); my $depfile = &Apache::lonnet::filelocation('',$depurl); my $type = $mm->checktype_filename($depfile); if ($type eq 'text/html') { @@ -695,7 +718,7 @@ sub group_import { $url = $1; my $marker = $2; my $info = $3; - my ($toolid,%toolhash,%toolsettings); + my ($toolid,$toolprefix,$tooltype,%toolhash,%toolsettings); my @extras = ('linktext','explanation','crslabel','crstitle','crsappend'); my @toolinfo = split(/:/,$info); if ($residx) { @@ -704,97 +727,149 @@ sub group_import { } else { $toolid = shift(@toolinfo); } + if ($toolid =~ /^c/) { + $tooltype = 'crs'; + $toolprefix = 'c'; + } else { + $tooltype = 'dom'; + } $toolid =~ s/\D//g; ($toolhash{'target'},$toolhash{'width'},$toolhash{'height'}, - $toolhash{'linktext'},$toolhash{'explanation'}, - $toolhash{'crslabel'},$toolhash{'crstitle'},$toolhash{'crsappend'}) = @toolinfo; + $toolhash{'linktext'},$toolhash{'explanation'},$toolhash{'crslabel'}, + $toolhash{'crstitle'},$toolhash{'crsappend'},$toolhash{'gradable'}) = @toolinfo; foreach my $item (@extras) { $toolhash{$item} = &unescape($toolhash{$item}); } + if ($folder =~ /^supplemental/) { + delete($toolhash{'gradable'}); + } else { + $toolhash{'gradable'} =~ s/\D+//g; + } if (ref($ltitoolsref) eq 'HASH') { - my @deleted; - if (ref($ltitoolsref->{$toolid}) eq 'HASH') { - $toolhash{'id'} = $toolid; - if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'tab') || - ($toolhash{'target'} eq 'window')) { - if ($toolhash{'target'} eq 'window') { - foreach my $item ('width','height') { - $toolhash{$item} =~ s/^\s+//; - $toolhash{$item} =~ s/\s+$//; - if ($toolhash{$item} =~ /\D/) { - delete($toolhash{$item}); - if ($residx) { - if ($toolsettings{$item}) { - push(@deleted,$item); + if (ref($ltitoolsref->{$tooltype}) eq 'HASH') { + if (ref($ltitoolsref->{$tooltype}->{$toolid}) eq 'HASH') { + my %tools = %{$ltitoolsref->{$tooltype}->{$toolid}}; + my @deleted; + $toolhash{'id'} = $toolprefix.$toolid; + if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'tab') || + ($toolhash{'target'} eq 'window')) { + if ($toolhash{'target'} eq 'window') { + foreach my $item ('width','height') { + $toolhash{$item} =~ s/^\s+//; + $toolhash{$item} =~ s/\s+$//; + if ($toolhash{$item} =~ /\D/) { + delete($toolhash{$item}); + if ($residx) { + if ($toolsettings{$item}) { + push(@deleted,$item); + } } } } } - } - } elsif ($residx) { - $toolhash{'target'} = $toolsettings{'target'}; - if ($toolhash{'target'} eq 'window') { - foreach my $item ('width','height') { - $toolhash{$item} = $toolsettings{$item}; + } elsif ($residx) { + $toolhash{'target'} = $toolsettings{'target'}; + if ($toolhash{'target'} eq 'window') { + foreach my $item ('width','height') { + $toolhash{$item} = $toolsettings{$item}; + } + } + } elsif (ref($tools{'display'}) eq 'HASH') { + $toolhash{'target'} = $tools{'display'}{'target'}; + if ($toolhash{'target'} eq 'window') { + $toolhash{'width'} = $tools{'display'}{'width'}; + $toolhash{'height'} = $tools{'display'}{'height'}; } } - } elsif (ref($ltitoolsref->{$toolid}->{'display'}) eq 'HASH') { - $toolhash{'target'} = $ltitoolsref->{$toolid}->{'display'}->{'target'}; - if ($toolhash{'target'} eq 'window') { - $toolhash{'width'} = $ltitoolsref->{$toolid}->{'display'}->{'width'}; - $toolhash{'height'} = $ltitoolsref->{$toolid}->{'display'}->{'height'}; - } - } - if ($toolhash{'target'} eq 'iframe') { - foreach my $item ('width','height','linktext','explanation') { - delete($toolhash{$item}); - if ($residx) { - if ($toolsettings{$item}) { - push(@deleted,$item); + if ($toolhash{'target'} eq 'iframe') { + foreach my $item ('width','height','linktext','explanation') { + delete($toolhash{$item}); + if ($residx) { + if ($toolsettings{$item}) { + push(@deleted,$item); + } } } - } - } elsif ($toolhash{'target'} eq 'tab') { - foreach my $item ('width','height') { - delete($toolhash{$item}); - if ($residx) { - if ($toolsettings{$item}) { - push(@deleted,$item); + } elsif ($toolhash{'target'} eq 'tab') { + foreach my $item ('width','height') { + delete($toolhash{$item}); + if ($residx) { + if ($toolsettings{$item}) { + push(@deleted,$item); + } } } } - } - if (ref($ltitoolsref->{$toolid}->{'crsconf'}) eq 'HASH') { - foreach my $item ('label','title','linktext','explanation') { - my $crsitem; - if (($item eq 'label') || ($item eq 'title')) { - $crsitem = 'crs'.$item; - } else { - $crsitem = $item; - } - if ($ltitoolsref->{$toolid}->{'crsconf'}->{$item}) { - $toolhash{$crsitem} =~ s/^\s+//; - $toolhash{$crsitem} =~ s/\s+$//; - if ($toolhash{$crsitem} eq '') { + if (ref($tools{'crsconf'}) eq 'HASH') { + foreach my $item ('label','title','linktext','explanation') { + my $crsitem; + if (($item eq 'label') || ($item eq 'title')) { + $crsitem = 'crs'.$item; + } else { + $crsitem = $item; + } + if ($tools{'crsconf'}{$item}) { + $toolhash{$crsitem} =~ s/^\s+//; + $toolhash{$crsitem} =~ s/\s+$//; + if ($toolhash{$crsitem} eq '') { + delete($toolhash{$crsitem}); + } + } else { delete($toolhash{$crsitem}); } - } else { - delete($toolhash{$crsitem}); + if (($residx) && (exists($toolsettings{$crsitem}))) { + unless (exists($toolhash{$crsitem})) { + push(@deleted,$crsitem); + } + } + } + } + if ($toolhash{'passback'}) { + my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4); + $toolhash{'gradesecret'} = $gradesecret; + $toolhash{'gradesecretdate'} = time; + } + if ($toolhash{'roster'}) { + my $rostersecret = UUID::Tiny::create_uuid_as_string(UUID_V4); + $toolhash{'rostersecret'} = $rostersecret; + $toolhash{'rostersecretdate'} = time; + } + my $changegradable; + if (($residx) && ($folder =~ /^default/)) { + if ($toolsettings{'gradable'}) { + unless (($toolhash{'gradable'}) || (defined($LONCAPA::map::zombies[$residx]))) { + push(@deleted,'gradable'); + $changegradable = 1; + } + } elsif ($toolhash{'gradable'}) { + $changegradable = 1; } - if (($residx) && (exists($toolsettings{$crsitem}))) { - unless (exists($toolhash{$crsitem})) { - push(@deleted,$crsitem); + if (($caller eq 'londocs') && (defined($LONCAPA::map::zombies[$residx]))) { + $changegradable = 1; + if ($toolsettings{'gradable'}) { + $toolhash{'gradable'} = 1; } } } - } - my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum); - if ($putres eq 'ok') { - if (@deleted) { - &Apache::lonnet::del('exttool_'.$marker,\@deleted,$coursedom,$coursenum); + my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum); + if ($putres eq 'ok') { + if (@deleted) { + &Apache::lonnet::del('exttool_'.$marker,\@deleted,$coursedom,$coursenum); + } + if (($changegradable) && ($folder =~ /^default/)) { + my $val; + if ($toolhash{'gradable'}) { + $val = 'yes'; + } else { + $val = 'no'; + } + &LONCAPA::map::storeparameter($residx,'parameter_0_gradable',$val, + 'string_yesno'); + &remember_parms($residx,'gradable','set',$val); + } + } else { + return (&mt('Failed to save update to external tool.'),1); } - } else { - return (&mt('Failed to save update to external tool.'),1); } } } @@ -811,7 +886,7 @@ sub group_import { } if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) { &contained_map_check($url,$folder,$coursenum,$coursedom,\%removefrommap, - \%removeparam,\%addedmaps,\%hierarchy,\%titles,$allmaps); + \%removeparam,\%addedmaps,\%hierarchy,\%titles,$allmaps); $importuploaded = 1; } elsif ($url =~ m{^/res/.+\.(page|sequence)$}) { next if ($allmaps->{$url}); @@ -878,7 +953,7 @@ END removefrommap => \%removefrommap, removeparam => \%removeparam, ); - my ($result,$msgsarray,$lockerror) = + my ($result,$msgsarray,$lockerror) = &apply_fixups($folder,1,$coursedom,$coursenum,\%import_errors,\%updated); if (keys(%import_errors) > 0) { $fixuperrors = @@ -907,7 +982,6 @@ END &storemap($coursenum, $coursedom, $folder.'.'.$container,1); unless ($fatal) { if ($folder =~ /^supplemental/) { - &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1); my ($errtext,$fatal) = &mapread($coursenum,$coursedom, $folder.'.'.$container); } @@ -979,12 +1053,12 @@ sub log_docs { sub docs_change_log { my ($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath,$canedit)=@_; my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/); - my $navmap; + my $navmap; my $js = '<script type="text/javascript">'."\n". '// <![CDATA['."\n". &Apache::loncommon::display_filter_js('docslog')."\n". &editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag, - $coursedom,$coursenum,'',$canedit,'',\$navmap)."\n". + $coursedom,$coursenum,'','',$canedit,'',\$navmap)."\n". &history_tab_js()."\n". &Apache::lonratedt::editscript('simple')."\n". '// ]]>'."\n". @@ -1012,7 +1086,7 @@ sub docs_change_log { if ($supplementalflag) { $tid = 2; } - my ($breadcrumbtrail) = + my ($breadcrumbtrail) = &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1); $r->print($breadcrumbtrail. &generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto, @@ -1034,6 +1108,7 @@ sub docs_change_log { 'encrypturl' => 'URL hidden', 'randompick' => 'Randomly pick', 'randomorder' => 'Randomly ordered', + 'gradable' => 'Grade can be assigned to External Tool', 'set' => 'set to', 'del' => 'deleted'); my $filter = &Apache::loncommon::display_filter('docslog')."\n". @@ -1140,8 +1215,14 @@ sub docs_change_log { } $r->print('</ul>'); if ($docslog{$id}{'logentry'}{'parameter_res'}) { - $r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>'); - foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') { + my ($title,$url) = split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'},3); + if ($title eq '') { + ($title) = ($url =~ m{/([^/]+)$}); + } elsif ($is_supp) { + $title = &Apache::loncommon::parse_supplemental_title($title); + } + $r->print(&LONCAPA::map::qtescape($title).':<ul>'); + foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder','gradable') { if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) { # FIXME: internationalization seems wrong here $r->print('<li>'. @@ -1338,7 +1419,7 @@ sub print_paste_buffer { } my @currpaste = split(/,/,$env{'docs.markedcopies'}); - my ($pasteitems,@pasteable); + my ($pasteitems,@pasteable,$same_institution,$checkedsameinst); my $clipboardcount = 0; # Construct identifiers for current contents of user's paste buffer @@ -1346,16 +1427,18 @@ sub print_paste_buffer { next if ($suffix =~ /\D/); my $cid = $env{'docs.markedcopy_crs_'.$suffix}; my $url = $env{'docs.markedcopy_url_'.$suffix}; - my $mapidx = $env{'docs.markedcopy_map_'.$suffix}; + my $mapidx = $env{'docs.markedcopy_map_'.$suffix}; if (($cid =~ /^$match_domain\_$match_courseid$/) && ($url ne '')) { $clipboardcount ++; my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent, - $canpaste,$nopaste,$othercrs,$areachange,$is_exttool); + $canpaste,$nopaste,$othercrs,$areachange,$is_exttool,$toolcdom, + $toolcnum,$marker); my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1]; if ($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) { $is_external = 1; - } elsif ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) { + } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { + ($toolcdom,$toolcnum,$marker) = ($1,$2,$3); $is_exttool = 1; } if ($folder =~ /^supplemental/) { @@ -1393,17 +1476,56 @@ sub print_paste_buffer { if ($cid ne $env{'request.course.id'}) { my ($srcdom,$srcnum) = split(/_/,$cid); if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) { - if (($is_exttool) && ($srcdom ne $coursedom)) { - $canpaste = 0; - $nopaste = &mt('Paste from another domain unavailable.'); - } else { - $othercrs = '<br />'.&mt('(from another course)'); + if ($is_exttool) { + if ($toolcdom ne $coursedom) { + $canpaste = 0; + $nopaste = &mt('Paste from another domain unavailable.'); + } elsif ($toolcnum ne $coursenum) { + my %toolsettings = + &Apache::lonnet::dump('exttool_'.$marker,$toolcdom,$toolcnum); + my %tooltypes = &Apache::loncommon::usable_exttools(); + if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) || + (($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) { + $canpaste = 0; + $nopaste = &mt('Paste from another course unavailable.'); + } elsif ($toolsettings{'id'} =~ /^c\d+$/) { + unless ($checkedsameinst) { + my $primary_id = &Apache::lonnet::domain($coursedom,'primary'); + my $intdom = &Apache::lonnet::internet_dom($primary_id); + if ($intdom ne '') { + my $internet_names = + &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'}); + if (ref($internet_names) eq 'ARRAY') { + if (grep(/^\Q$intdom\E$/,@{$internet_names})) { + $same_institution = 1; + } + } + } + $checkedsameinst = 1; + } + if ($same_institution) { + $othercrs = '<br />'.&mt('(from another course)'); + } else { + $nopaste = &mt('Paste from another course unavailable.'); + } + } else { + $othercrs = '<br />'.&mt('(from another course)'); + } + } } } else { $canpaste = 0; $nopaste = &mt('Paste from another course unavailable.'); } } + } elsif ($url =~ m{/res/($match_domain)/($match_username)/}) { + my ($audom,$auname) = ($1,$2); + unless (($auname eq $coursenum) && ($audom eq $coursedom)) { + if (&Apache::lonnet::is_course($audom,$auname)) { + $canpaste = 0; + $nopaste = &mt('Paste from another course unavailable.'); + } + } } if ($canpaste) { push(@pasteable,$suffix); @@ -1446,7 +1568,7 @@ sub print_paste_buffer { } $pasteitems .= '<label><input type="checkbox" name="pasting" id="pasting_'.$suffix.'" value="'.$suffix.'" '.$onclick.'/>'.$buffer.'</label>'; if ($nopaste) { - $pasteitems .= $nopaste; + $pasteitems .= ' <span class="LC_cusr_emph">'.$nopaste.'</span>'; } else { if ($othercrs) { $pasteitems .= $othercrs; @@ -1469,7 +1591,7 @@ sub print_paste_buffer { my $value = &mt('Paste to current folder'); if ($container eq 'page') { $value = &mt('Paste to current page'); - } + } $buttons = '<input type="submit" name="pastemarked" value="'.$value.'" />'.(' 'x2); } $buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Remove from clipboard').'" />'.(' 'x2); @@ -1646,7 +1768,7 @@ function checkClipboard() { if (document.pasteform.pasting.length > 1) { for (var i=0; i<document.pasteform.pasting.length; i++) { document.pasteform.pasting[i].checked = true; - } + } } return; } @@ -1696,13 +1818,16 @@ sub do_paste_from_buffer { return(); } - my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%notindom,%duplicate, - %prefixchg,%srcdom,%srcnum,%srcmapidx,%marktomove,$save_err,$lockerrors,$allresult); - + my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%notindom, + %othcrstool,%othcrsres,%duplicate,%prefixchg,%srcdom,%srcnum,%srcmapidx, + %marktomove,$save_err,$lockerrors,$allresult,%currcrsltitools, + %currltititles,$currltimax,$gotcrsltitools); + $currltimax = 0; + $gotcrsltitools = 0; foreach my $suffix (@topaste) { my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix}); my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix}); - my $mapidx=&LONCAPA::map::qtescape($env{'docs.markedcopy_map_'.$suffix}); + my $mapidx=&LONCAPA::map::qtescape($env{'docs.markedcopy_map_'.$suffix}); # Supplemental content may only include certain types of content # Early out if pasted content is not supported in Supplemental area if ($folder =~ /^supplemental/) { @@ -1724,7 +1849,9 @@ sub do_paste_from_buffer { } $srcdom{$suffix} = $srcd; $srcnum{$suffix} = $srcn; - } elsif ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) { + } elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) || + ($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard|smppg)$}) || + ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$})) { my ($srcd,$srcn) = split(/_/,$cid); # When paste buffer was populated using an active role in a different course # check for mdc privilege in the course from which the resource was pasted @@ -1735,38 +1862,64 @@ sub do_paste_from_buffer { } } # When buffer was populated using an active role in a different course -# disallow pasting of External Tool if course is in a different domain. - if ($srcd ne $coursedom) { - $notindom{$suffix} = 1; - next; +# disallow pasting of External Tool if course is in a different domain, +# or if External Tool use is not permitted in this course. + if ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { + my ($toolcdom,$toolcnum,$marker) = ($1,$2,$3); + if ($toolcdom ne $coursedom) { + $notindom{$suffix} = 1; + next; + } elsif ($toolcnum ne $coursenum) { + my %toolsettings = + &Apache::lonnet::dump('exttool_'.$marker,$toolcdom,$toolcnum); + my %tooltypes = &Apache::loncommon::usable_exttools(); + if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) || + (($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) { + $othcrstool{$suffix} = 1; + next; + } + if ($toolsettings{'id'} =~ /^c\d+$/) { + unless ($gotcrsltitools) { + %currcrsltitools = + &Apache::lonnet::get_course_lti($coursenum,$coursedom,'consumer'); + foreach my $item (sort(keys(%currcrsltitools))) { + if (ref($currcrsltitools{$item}) eq 'HASH') { + $currltimax ++; + if (ref($currltititles{$currcrsltitools{$item}{'title'}}) eq 'ARRAY') { + push(@{$currltititles{$currcrsltitools{$item}{'title'}}},$item); + } else { + $currltititles{$currcrsltitools{$item}{'title'}} = [$item]; + } + } + } + $gotcrsltitools = 1; + } + } + } } $srcdom{$suffix} = $srcd; $srcnum{$suffix} = $srcn; - } elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) || - ($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard|smppg)$})) { - my ($srcd,$srcn) = split(/_/,$cid); -# When paste buffer was populated using an active role in a different course -# check for mdc privilege in the course from which the resource was pasted - if (($srcd ne $coursedom) || ($srcn ne $coursenum)) { - unless ($env{"user.priv.cm./$srcd/$srcn"} =~ /\Q:mdc&F\E/) { - $notincrs{$suffix} = 1; + } elsif ($url =~ m{^/res/($match_domain)/($match_courseid)/}) { + my ($audom,$auname) = ($1,$2); +# When buffer was populated using an active role in a different course +# disallow pasting of published resources from Course Authoring Space + unless (($auname eq $coursenum) && ($audom eq $coursedom)) { + if (&Apache::lonnet::is_course($audom,$auname)) { + $othcrsres{$suffix} = 1; next; } } - $srcdom{$suffix} = $srcd; - $srcnum{$suffix} = $srcn; } - $srcmapidx{$suffix} = $mapidx; + $srcmapidx{$suffix} = $mapidx; push(@dopaste,$suffix); if ($url=~/\.(page|sequence)$/) { $is_map{$suffix} = 1; } - if ($url =~ m{^/uploaded/$match_domain/$match_courseid/([^/]+)}) { my $oldprefix = $1; # When pasting content from Main Content to Supplemental Content and vice versa # URLs will contain different paths (which depend on whether pasted item is -# a folder/page or a document). +# a folder/page or a document). if (($folder =~ /^supplemental/) && (($oldprefix =~ /^default/) || ($oldprefix eq 'docs'))) { $prefixchg{$suffix} = 'docstosupp'; } elsif (($folder =~ /^default/) && ($oldprefix =~ /^supplemental/)) { @@ -1806,7 +1959,9 @@ sub do_paste_from_buffer { %msgs = &Apache::lonlocal::texthash ( notinsupp => 'Paste failed: content type is not supported within Supplemental Content', notincrs => 'Paste failed: Item is from a different course which you do not have rights to edit.', - notindom => 'Paste failed: Item is an external tool from a course in a different donain.', + notindom => 'Paste failed: Item is an external tool from a course in a different domain.', + othcrstool => 'Paste failed: Item is an external tool from a different course, for which use is not allowed in this course.', + othcrsres => 'Paste failed: Item is a course-authored resource from a different course', duplicate => 'Paste failed: only one instance of a particular published sequence or page is allowed within each course.', ); @@ -1835,7 +1990,9 @@ sub do_paste_from_buffer { # Retrieve information about all course maps in main content area my $allmaps = {}; - my (@toclear,%mapurls,%lockerrs,%msgerrs,%results,$donechk); + my (@toclear,%mapurls,%lockerrs,%msgerrs,%results,$donechk, + @updatetoolsenc,$updatetoolscache,$checkedsameinst, + $same_institution); # Loop over the items to paste foreach my $suffix (@dopaste) { @@ -1848,7 +2005,7 @@ sub do_paste_from_buffer { } my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix}); my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}); - my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix}); + my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix}); my $oldurl = $url; if ($is_map{$suffix}) { # If pasting a map, check if map contains other maps @@ -1858,7 +2015,7 @@ sub do_paste_from_buffer { &Apache::loncommon::allmaps_incourse($coursedom,$coursenum, $env{"course.$env{'request.course.id'}.home"}, $env{'request.course.id'}); - $donechk = 1; + $donechk = 1; } &contained_map_check($url,$folder,$coursenum,$coursedom, \%removefrommap,\%removeparam,\%addedmaps, @@ -1901,7 +2058,7 @@ sub do_paste_from_buffer { $coursenum,$srcdom{$suffix},$srcnum{$suffix}, $allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies, \%zombies,\%params,\%mapmoves,\%mapchanges, - \%tomove,\%newsubdir,\%newurls,\%resdatacopy); + \%tomove,\%newsubdir,\%newurls,\%resdatacopy); } } elsif ($url=~m {^/res/}) { # published map can only exist once, so remove from paste buffer when done @@ -1924,17 +2081,37 @@ sub do_paste_from_buffer { cdom => $coursedom, cnum => $coursenum, ); + if ($prefix eq 'ext.tool') { + if ($prefixchg{$suffix} eq 'docstosupp') { + $info{'delgradable'} = 1; + } + } if (($srcdom{$suffix} =~ /^$match_domain$/) && ($srcnum{$suffix} =~ /^$match_courseid$/)) { unless (($srcdom{$suffix} eq $coursedom) && ($srcnum{$suffix} eq $coursenum)) { $fromothercrs = 1; $info{'cdom'} = $srcdom{$suffix}; $info{'cnum'} = $srcnum{$suffix}; + unless ($checkedsameinst) { + my $primary_id = &Apache::lonnet::domain($coursedom,'primary'); + my $intdom = &Apache::lonnet::internet_dom($primary_id); + if ($intdom ne '') { + my $internet_names = + &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'}); + if (ref($internet_names) eq 'ARRAY') { + if (grep(/^\Q$intdom\E$/,@{$internet_names})) { + $same_institution = 1; + } + } + } + $checkedsameinst = 1; + } } } unless (($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') && (!$fromothercrs)) { - my (%lockerr,$msg); + my (%lockerr,$msg); my ($newurl,$result,$errtext) = - &dbcopy(\%info,$coursedom,$coursenum,\%lockerr); + &dbcopy(\%info,$coursedom,$coursenum,\%lockerr,\%currltititles, + \$currltimax,\@updatetoolsenc,\$updatetoolscache,$same_institution); if ($result eq 'ok') { $url = $newurl; $title=&mt('Copy of').' '.$title; @@ -1952,7 +2129,7 @@ sub do_paste_from_buffer { next; } if ($lockerr{$prefix}) { - $lockerrs{$suffix} = $lockerr{$prefix}; + $lockerrs{$suffix} = $lockerr{$prefix}; } } } @@ -1992,7 +2169,7 @@ sub do_paste_from_buffer { $newdocsdir = 'default'; } if (($prefixchg{$suffix}) || - ($srcdom{$suffix} ne $coursedom) || + ($srcdom{$suffix} ne $coursedom) || ($srcnum{$suffix} ne $coursenum) || ($env{'form.docs.markedcopy_options_'.$suffix} ne 'move')) { my $newpath = "$newprefix/$newdocsdir/$newidx/$rem"; @@ -2015,6 +2192,18 @@ sub do_paste_from_buffer { ©_templated_files($url,$srcdom{$suffix},$srcnum{$suffix},$srcmapidx{$suffix}, $coursedom,$coursenum,$template,$newidx,"$folder.$container"); } + } elsif ($url =~ /ext\.tool$/) { + if (($newidx) && ($folder=~/^default/)) { + my $marker = (split(m{/},$url))[4]; + my %toolsettings = &Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum); + my $val = 'no'; + if ($toolsettings{'gradable'}) { + $val = 'yes'; + } + &LONCAPA::map::storeparameter($newidx,'parameter_0_gradable',$val, + 'string_yesno'); + &remember_parms($newidx,'gradable','set',$val); + } } $LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url). ':'.$ext.':normal:res'; @@ -2028,8 +2217,8 @@ sub do_paste_from_buffer { } } -# Apply any changes to maps, or copy dependencies for uploaded HTML pages, or update -# resourcedata for simpleproblems copied from another course +# Apply any changes to maps, or copy dependencies for uploaded HTML pages, or update +# resourcedata for simpleproblems copied from another course unless ($allresult eq 'fail') { my %updated = ( rewrites => \%rewrites, @@ -2091,6 +2280,10 @@ sub do_paste_from_buffer { } } } + if (($updatetoolscache) || (@updatetoolsenc)) { + &update_ltitools_caches($coursedom,$coursenum,$updatetoolscache, + \@updatetoolsenc); + } &clear_from_buffer(\@toclear,\@currpaste); my $msgsarray; foreach my $suffix (keys(%msgs)) { @@ -2139,6 +2332,30 @@ sub clear_from_buffer { return $numdel; } +sub update_ltitools_caches { + my ($coursedom,$coursenum,$updatetoolscache,$updatetoolsenc) = @_; + my $hashid=$coursedom.'_'.$coursenum; + if ($updatetoolscache) { + &Apache::lonnet::devalidate_cache_new('courseltitools',$hashid); + } + if ((ref($updatetoolsenc) eq 'ARRAY') && + (@{$updatetoolsenc})) { + my @ids=&Apache::lonnet::current_machine_ids(); + my $updatedone; + foreach my $lonhost (@{$updatetoolsenc}) { + if (grep(/^\Q$lonhost\E$/,@ids)) { + unless ($updatedone) { + &Apache::lonnet::devalidate_cache_new('crsltitoolsenc',$hashid); + } + $updatedone = 1; + } else { + &Apache::lonnet::remote_devalidate_cache($lonhost,["crsltitoolsenc:$hashid"]); + } + } + } + return; +} + sub get_newmap_url { my ($url,$folder,$prefixchg,$coursedom,$coursenum,$srcdom,$srcnum, $titleref,$allmaps,$newurls) = @_; @@ -2200,7 +2417,8 @@ sub get_newmap_url { } sub dbcopy { - my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_; + my ($dbref,$coursedom,$coursenum,$lockerrorsref,$currltititles, + $currltimax,$updatetoolsenc,$updatetoolscache,$same_institution) = @_; my ($url,$result,$errtext); if (ref($dbref) eq 'HASH') { $url = $dbref->{'src'}; @@ -2209,7 +2427,7 @@ sub dbcopy { if ($prefix eq 'ext.tool') { $prefix = 'exttool'; } - if (($dbref->{'cdom'} =~ /^$match_domain$/) && + if (($dbref->{'cdom'} =~ /^$match_domain$/) && ($dbref->{'cnum'} =~ /^$match_courseid$/)) { my $db_name; my $marker = (split(m{/},$url))[4]; @@ -2244,6 +2462,117 @@ sub dbcopy { my %contents=&Apache::lonnet::dump($db_name, $dbref->{'cdom'}, $dbref->{'cnum'}); + my ($toolcopyerror,$toolpassback,$toolroster,%toolinfo,$oldtoolid,$defincrs); + if ($url eq '/adm/'.$dbref->{'cdom'}.'/'.$dbref->{'cnum'}."/$marker/ext.tool") { + if ($contents{'id'} =~ /^(|c)(\d+)$/) { + $oldtoolid = $2; + if ($1 eq 'c') { + $defincrs = 1; + %toolinfo = + &Apache::lonnet::get('ltitools',[$oldtoolid],$dbref->{'cdom'},$dbref->{'cnum'}); + } else { + %toolinfo= &Apache::lonnet::get_domain_lti($dbref->{'cdom'},'consumer'); + } + if (ref($toolinfo{$oldtoolid}) eq 'HASH') { + if ($toolinfo{$oldtoolid}{'passback'}) { + $toolpassback = 1; + } + if ($toolinfo{$oldtoolid}{'roster'}) { + $toolroster = 1; + } + } else { + $toolcopyerror = 1; + $errtext = &mt('Could not retrieve original settings for pasted external tool.'); + } + } + unless (($dbref->{'cnum'} eq $coursenum) && ($dbref->{'cdom'} eq $coursedom)) { + $url = "/adm/$coursedom/$coursenum/$marker/ext.tool"; + if ($contents{'crstitle'} ne '') { + $contents{'crstitle'} = $env{'course.'.$coursedom.'_'.$coursenum.'.description'}; + } + if (($defincrs) && (!$toolcopyerror)) { + my %newtool; + my $oldcdom = $dbref->{'cdom'}; + my $oldcnum = $dbref->{'cnum'}; + my $title = $toolinfo{$oldtoolid}{'title'}; + if (ref($currltititles) eq 'HASH') { + if (exists($currltititles->{$title})) { + $title .= ' (copied from another course)'; + } + } + my ($newid,$iderror) = + &Apache::lonnet::get_ltitools_id('course',$coursedom,$coursenum,$title); + if ($newid =~ /^\d+$/) { + %{$newtool{$newid}} = %{$toolinfo{$oldtoolid}}; + $newtool{$newid}{'title'} = $title; + if (ref($currltimax)) { + $newtool{$newid}{'order'} = $$currltimax; + } + if ($newtool{$newid}{'image'} =~ m{^\Q/uploaded/$oldcdom/$oldcnum/toollogo/$oldtoolid/\E([^/]+)$}) { + my $fname = $1; + my $content = &Apache::lonnet::getfile($newtool{$newid}{'image'}); + if ($content eq '-1') { + delete($newtool{$newid}{'image'}); + } else { + $env{'form.'.$suffix.'.image'} = $content; + my $newlogo = + &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.image',"toollogo/$newid/$fname"); + delete($env{'form.'.$suffix.'.image'}); + if ($newlogo =~ m{^/uploaded/}) { + $newtool{$newid}{'image'} = $newlogo; + } else { + delete($newtool{$newid}{'image'}); + } + } + } + my $newusable; + if ($same_institution) { + my %oldtoolsenc = &Apache::lonnet::eget('nohist_toolsenc',[$oldtoolid],$oldcdom,$oldcnum); + if (ref($oldtoolsenc{$oldtoolid}) eq 'HASH') { + my %newtoolsenc; + %{$newtoolsenc{$newid}} = %{$oldtoolsenc{$oldtoolid}}; + my $putres = &Apache::lonnet::put('nohist_toolsenc',\%newtoolsenc,$coursedom,$coursenum,1); + if ($putres eq 'ok') { + if (ref($updatetoolsenc) eq 'ARRAY') { + my $newhome = &Apache::lonnet::homeserver($coursenum,$coursedom); + unless (grep(/^\Q$newhome\E$/,@{$updatetoolsenc})) { + push(@{$updatetoolsenc},$newhome); + } + } + $newusable = 1; + } + } + } + if ($newtool{$newid}{'usable'}) { + unless ($newusable) { + delete($newtool{$newid}{'usable'}); + } + } + my $putres = &Apache::lonnet::put('ltitools',\%newtool,$coursedom,$coursenum); + if ($putres eq 'ok') { + $contents{'id'} = "c$newid"; + if (ref($updatetoolscache)) { + $$updatetoolscache ++; + } + if (ref($currltititles->{$title}) eq 'ARRAY') { + push(@{$currltititles->{$title}},$newid); + } else { + $currltititles->{$title} = [$newid]; + } + if (ref($currltimax)) { + $$currltimax ++; + } + } else { + $toolcopyerror = 1; + $errtext = &mt('Unable to save external tool definition in Course Settings.'); + } + } else { + $toolcopyerror = 1; + $errtext = &mt('Unable to retrieve new tool ID when adding external tool definition to Course Settings.'); + } + } + } + } if (exists($contents{'uploaded.photourl'})) { my $photo = $contents{'uploaded.photourl'}; my ($subdir,$fname) = @@ -2253,7 +2582,7 @@ sub dbcopy { my $content = &Apache::lonnet::getfile($photo); unless ($content eq '-1') { $env{'form.'.$suffix.'.photourl'} = $content; - $newphoto = + $newphoto = &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.photourl',"$subdir/$suffix/$fname"); delete($env{'form.'.$suffix.'.photourl'}); } @@ -2263,10 +2592,40 @@ sub dbcopy { } } $db_name =~ s{_\d*$ }{_$suffix}x; - $result=&Apache::lonnet::put($db_name,\%contents, - $coursedom,$coursenum); - if ($result eq 'ok') { - $url =~ s{/(\d*)/(smppg|bulletinboard|ext\.tool)$}{/$suffix/$2}x; + if ($prefix eq 'exttool') { + unless ($toolcopyerror) { + foreach my $key ('oldgradesecret','gradesecret','gradesecretdate','oldrostersecret','rostersecret','rostersecretdate') { + if (exists($contents{$key})) { + delete($contents{$key}); + } + } + if ($dbref->{'delgradable'}) { + if (exists($contents{'gradable'})) { + delete($contents{'gradable'}); + } + } + if ($toolpassback) { + if ($contents{'gradable'}) { + my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4); + $contents{'gradesecret'} = $gradesecret; + $contents{'gradesecretdate'} = time; + } + } + if ($toolroster) { + my $rostersecret = UUID::Tiny::create_uuid_as_string(UUID_V4); + $contents{'rostersecret'} = $rostersecret; + $contents{'rostersecretdate'} = time; + } + } + } + if (($prefix eq 'exttool') && ($toolcopyerror)) { + $result = 'error'; + } else { + $result=&Apache::lonnet::put($db_name,\%contents, + $coursedom,$coursenum); + if ($result eq 'ok') { + $url =~ s{/(\d*)/(smppg|bulletinboard|ext\.tool)$}{/$suffix/$2}x; + } } } if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) { @@ -2421,12 +2780,37 @@ sub contained_map_check { if ($token->[1] eq 'resource') { next if ($token->[2]->{'type'} eq 'zombie'); my $ressrc = $token->[2]->{'src'}; - if ($folder =~ /^supplemental/) { + if ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { + my ($srcdom,$srcnum,$marker) = ($1,$2,$3); + unless ($srcdom eq $coursedom) { + $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; + next; + } + unless ($srcnum eq $coursenum) { + my %toolsettings = + &Apache::lonnet::dump('exttool_'.$marker,$srcdom,$srcnum); + my %tooltypes = &Apache::loncommon::usable_exttools(); + if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) || + (($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) { + $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; + next; + } + } + } elsif ($folder =~ /^supplemental/) { unless (&supp_pasteable($ressrc)) { $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; next; } } + if ($ressrc =~ m{^/res/($match_domain)/($match_courseid)/}) { + my ($srcdom,$srcnum) = ($1,$2); + unless (($srcnum eq $coursenum) && ($srcdom eq $coursedom)) { + if (&Apache::lonnet::is_course($srcdom,$srcnum)) { + $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; + next; + } + } + } if ($ressrc =~ m{^/(res|uploaded)/.+\.(sequence|page)$}) { if ($1 eq 'uploaded') { $hierarchy->{$url}{$token->[2]->{'id'}} = $ressrc; @@ -2440,9 +2824,8 @@ sub contained_map_check { $addedmaps->{$ressrc} = [$url]; } } - &contained_map_check($ressrc,$folder,$coursenum,$coursedom, - $removefrommap,$removeparam, - $addedmaps,$hierarchy,$titles,$allmaps); + &contained_map_check($ressrc,$folder,$coursenum,$coursedom,$removefrommap, + $removeparam,$addedmaps,$hierarchy,$titles,$allmaps); } } elsif ($token->[1] eq 'param') { if ($folder =~ /^supplemental/) { @@ -2493,7 +2876,7 @@ sub url_paste_fixups { } next if ($token->[2]->{'type'} eq 'external'); if ($token->[2]->{'type'} eq 'zombie') { - next if ($skip); + next if ($skip); $zombies->{$oldurl}{$id} = $ressrc; $changed = 1; } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) { @@ -2544,16 +2927,38 @@ sub url_paste_fixups { $changed = 1; } } - } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/.+$}) { + } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(.+)$}) { next if ($skip); my $srcdom = $1; my $srcnum = $2; + my $rem = $3; + my ($is_exttool,$exttoolchg); + if ($rem =~ m{\d+/ext\.tool$}) { + $is_exttool = 1; + } if (($srcdom ne $cdom) || ($srcnum ne $cnum)) { $rewrites->{$oldurl}{$id} = $ressrc; $dbcopies->{$oldurl}{$id}{'src'} = $ressrc; $dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom; $dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum; $changed = 1; + if ($is_exttool) { + $exttoolchg = 1; + } + } elsif (($is_exttool) && + ($env{'form.docs.markedcopy_options'} ne 'move')) { + $dbcopies->{$oldurl}{$id}{'src'} = $ressrc; + $dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom; + $dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum; + $changed = 1; + $exttoolchg = 1; + } + if (($is_exttool) && ($prefixchg)) { + if ($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/default}) { + if ($exttoolchg) { + $dbcopies->{$oldurl}{$id}{'delgradable'} = 1; + } + } } } elsif ($ressrc =~ m{^/adm/$match_domain/$match_username/\d+/(smppg|bulletinboard)$}) { if (($fromcdom ne $cdom) || ($fromcnum ne $cnum) || @@ -2600,7 +3005,9 @@ sub apply_fixups { $oldurl,$url,$caller) = @_; my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles, %params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs, - %resdatacopy,%lockerrors,$lockmsg); + %resdatacopy,%lockerrors,$lockmsg,%currcrsltitools,$gotcrsltitools, + %currltititles,$currltimax); + $currltimax = 0; if (ref($updated) eq 'HASH') { if (ref($updated->{'rewrites'}) eq 'HASH') { %rewrites = %{$updated->{'rewrites'}}; @@ -2716,6 +3123,15 @@ sub apply_fixups { $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/; } my $mapcontent = &Apache::lonnet::getfile($key); + if (($mapcontent eq '-1') && ($before{'map'} eq 'supplemental') && + ($after{'map'} eq 'default') && + ($key =~ m{^/uploaded/$match_domain/$match_courseid/supplemental_\d+\.sequence$})) { + $mapcontent = '<map>'."\n". + '<resource id="1" src="" type="start" />'."\n". + '<link from="1" to="2" index="1" />'."\n". + '<resource id="2" src="" type="finish" />'."\n". + '</map>'; + } if ($mapcontent eq '-1') { if (ref($errors) eq 'HASH') { $errors->{$key} = 1; @@ -2742,6 +3158,7 @@ sub apply_fixups { } } } + my ($updatetoolscache,@updatetoolsenc,$same_institution,$checkedsameinst); foreach my $key (keys(%updates)) { my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb); if (ref($rewrites{$key}) eq 'HASH') { @@ -2762,10 +3179,63 @@ sub apply_fixups { if (ref($dbcopies{$key}) eq 'HASH') { foreach my $idx (keys(%{$dbcopies{$key}})) { if (ref($dbcopies{$key}{$idx}) eq 'HASH') { + my $oldurl = $dbcopies{$key}{$idx}{'src'}; + my $oldcdom = $dbcopies{$key}{$idx}{'cdom'}; + my $oldcnum = $dbcopies{$key}{$idx}{'cnum'}; + my $oldmarker; + if ($oldurl =~ m{^\Q/adm/$oldcdom/$oldcnum/\E(\d+)/ext\.tool$}) { + $oldmarker = $1; + unless (($gotcrsltitools) || + (($oldcnum eq $cnum) && ($oldcdom eq $cdom))) { + my %oldtoolsettings=&Apache::lonnet::dump('exttool_'.$oldmarker,$oldcdom,$oldcnum); + if ($oldtoolsettings{'id'} =~ /^c\d+$/) { + unless ($gotcrsltitools) { + %currcrsltitools = + &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer'); + foreach my $item (sort(keys(%currcrsltitools))) { + if (ref($currcrsltitools{$item}) eq 'HASH') { + $currltimax ++; + if (ref($currltititles{$currcrsltitools{$item}{'title'}}) eq 'ARRAY') { + push(@{$currltititles{$currcrsltitools{$item}{'title'}}},$item); + } else { + $currltititles{$currcrsltitools{$item}{'title'}} = [$item]; + } + } + } + $gotcrsltitools = 1; + } + unless ($checkedsameinst) { + my $primary_id = &Apache::lonnet::domain($cdom,'primary'); + my $intdom = &Apache::lonnet::internet_dom($primary_id); + if ($intdom ne '') { + my $internet_names = + &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'}); + if (ref($internet_names) eq 'ARRAY') { + if (grep(/^\Q$intdom\E$/,@{$internet_names})) { + $same_institution = 1; + } + } + } + $checkedsameinst = 1; + } + } + } + } my ($newurl,$result,$errtext) = - &dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors); + &dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors,\%currltititles, + \$currltimax,\@updatetoolsenc,\$updatetoolscache,$same_institution); if ($result eq 'ok') { $newdb{$idx} = $newurl; + if ($newurl =~ /ext\.tool$/) { + if ($torewrite{$idx} eq "/adm/$oldcdom/$oldcnum/$oldmarker/ext.tool") { + if ($newurl =~ m{^\Q/adm/$cdom/$cnum/\E(\d+)/ext.tool$}) { + my $newmarker = $1; + unless ($oldmarker eq $newmarker) { + $torewrite{$idx} = "/adm/$oldcdom/$oldcnum/$newmarker/ext.tool"; + } + } + } + } } elsif (ref($errors) eq 'HASH') { $errors->{$key} = 1; } @@ -2904,6 +3374,10 @@ sub apply_fixups { } } } + if (($updatetoolscache) || (@updatetoolsenc)) { + &update_ltitools_caches($cdom,$cnum,$updatetoolscache, + \@updatetoolsenc); + } } return ('ok',\@msgs,$lockmsg); } @@ -2998,7 +3472,7 @@ sub update_parameter { my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); $name=&LONCAPA::map::qtescape($name); $url=&LONCAPA::map::qtescape($url); - next unless ($name && $url); + next unless $url; my $is_map; if ($url =~ m{/uploaded/.+\.(page|sequence)$}) { $is_map = 1; @@ -3006,7 +3480,7 @@ sub update_parameter { foreach my $which (keys(%allchecked)) { if (($which eq 'randompick' || $which eq 'randomorder')) { next if (!$is_map); - } + } my $oldvalue = 0; my $newvalue = 0; if ($allchecked{$which}{$res}) { @@ -3058,8 +3532,8 @@ sub update_parameter { $oldvalue = 1; } if ($env{'form.'.$which.'_'.$idx}) { - $newvalue = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx} - : 1; + $newvalue = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx} + : 1; } if ($oldvalue ne $newvalue) { $haschanges = 1; @@ -3068,23 +3542,23 @@ sub update_parameter { if ($which eq 'randompick') { $storeval = $newvalue; } - &LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $storeval, - $parameter_type{$which}); - &remember_parms($idx,$which,'set',$storeval); + &LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $storeval, + $parameter_type{$which}); + &remember_parms($idx,$which,'set',$storeval); } else { - &LONCAPA::map::delparameter($idx,'parameter_'.$which); - &remember_parms($idx,$which,'del'); + &LONCAPA::map::delparameter($idx,'parameter_'.$which); + &remember_parms($idx,$which,'del'); } } return $haschanges; } - return; } sub handle_edit_cmd { my ($coursenum,$coursedom) =@_; + my $haschanges = 0; if ($env{'form.cmd'} eq '') { - return 0; + return $haschanges; } my ($cmd,$idx)=split('_',$env{'form.cmd'}); @@ -3099,19 +3573,19 @@ sub handle_edit_cmd { &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]); } splice(@LONCAPA::map::order, $idx, 1); - + $haschanges = 1; } elsif ($cmd eq 'cut') { &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]); splice(@LONCAPA::map::order, $idx, 1); - + $haschanges = 1; } elsif ($cmd eq 'up' && ($idx) && (defined($LONCAPA::map::order[$idx-1]))) { @LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1]; - + $haschanges = 1; } elsif ($cmd eq 'down' && defined($LONCAPA::map::order[$idx+1])) { @LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1]; - + $haschanges = 1; } elsif ($cmd eq 'rename') { my $comment = &LONCAPA::map::qtunescape($env{'form.title'}); if ($comment=~/\S/) { @@ -3121,11 +3595,26 @@ sub handle_edit_cmd { # Devalidate title cache my $renamed_url=&LONCAPA::map::qtescape($url); &Apache::lonnet::devalidate_title_cache($renamed_url); - - } else { - return 0; + $haschanges = 1; + } elsif ($cmd eq 'setalias') { + my $newvalue = $env{'form.alias'}; + if ($newvalue ne '') { + unless (Apache::lonnet::get_symb_from_alias($newvalue)) { + &LONCAPA::map::storeparameter($idx,'parameter_0_mapalias',$newvalue, + 'string'); + &remember_parms($idx,'mapalias','set',$newvalue); + $haschanges = 1; + } + } + } elsif ($cmd eq 'delalias') { + my $current = (&LONCAPA::map::getparameter($idx,'parameter_0_mapalias'))[0]; + if ($current ne '') { + &LONCAPA::map::delparameter($idx,'parameter_0_mapalias'); + &remember_parms($idx,'mapalias','del'); + $haschanges = 1; + } } - return 1; + return $haschanges; } sub editor { @@ -3163,10 +3652,10 @@ sub editor { undef(@LONCAPA::map::zombies); } $folder = 'default'; - $container = 'sequence'; + $container = 'sequence'; } else { ($errtext,$fatal) = &mapread($coursenum,$coursedom, - $folder.'.'.$container); + $folder.'.'.$container); return $errtext if ($fatal); } @@ -3249,7 +3738,7 @@ sub editor { # Rename, cut, copy or remove a single resource if (&handle_edit_cmd($coursenum,$coursedom)) { my $contentchg; - if ($env{'form.cmd'} =~ m{^(remove|cut)_}) { + if ($env{'form.cmd'} =~ m{^(remove|cut|setalias|delalias)_}) { $contentchg = 1; } ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg); @@ -3435,6 +3924,21 @@ sub editor { $r->print('</div>'); } + if ((!$allowed) && ($folder =~ /^supplemental_\d+$/)) { + my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom); + if (ref($supplemental) eq 'HASH') { + if ((ref($supplemental->{'hidden'}) eq 'HASH') && + (ref($supplemental->{'ids'}) eq 'HASH')) { + if (ref($supplemental->{'ids'}->{"/uploaded/$coursedom/$coursenum/$folder.$container"}) eq 'ARRAY') { + my $mapnum = $supplemental->{'ids'}->{"/uploaded/$coursedom/$coursenum/$folder.$container"}->[0]; + if ($supplemental->{'hidden'}->{$mapnum}) { + $ishidden = 1; + } + } + } + } + } + my ($to_show,$output,@allidx,@allmapidx,%filters,%lists,%curr_groups); %filters = ( canremove => [], @@ -3458,11 +3962,17 @@ sub editor { push(@allmapidx,$res); } + if (($supplementalflag) && (!$allowed) && (!$env{'request.role.adv'})) { + if (($ishidden) || ((&LONCAPA::map::getparameter($res,'parameter_hiddenresource'))[0]=~/^yes$/i)) { + $idx++; + next; + } + } $output .= &entryline($idx,$name,$url,$folder,$allowed,$res, $coursenum,$coursedom,$crstype, $pathitem,$supplementalflag,$container, \%filters,\%curr_groups,$ltitoolsref,$canedit, - $isencrypted,$navmapref,$hostname); + $isencrypted,$ishidden,$navmapref,$hostname); $idx++; $shown++; } @@ -3471,10 +3981,14 @@ sub editor { my $need_save; if ($allowed || ($supplementalflag && $folder eq 'supplemental')) { my $toolslink; - if ($allowed) { + if ($allowed || $canedit) { + my $helpitem = 'Navigation_Screen'; + if (!$allowed) { + $helpitem = 'Supplemental_Navigation'; + } $toolslink = '<table><tr><td>' .&Apache::loncommon::help_open_menu('Navigation Screen', - 'Navigation_Screen',undef,'RAT') + $helpitem,undef,'RAT') .'</td><td class="LC_middle">'.&mt('Tools:').'</td>' .'<td align="left"><ul id="LC_toolbar">' .'<li><a href="/adm/coursedocs?forcesupplement=1&command=editsupp" ' @@ -3489,12 +4003,10 @@ sub editor { .&Apache::loncommon::start_data_table(undef,'contentlist') .&Apache::loncommon::start_data_table_header_row() .'<th colspan="2">'.&mt('Move').'</th>' - .'<th colspan="2">'.&mt('Actions').'</th>' - .'<th>'.&mt('Document').'</th>'; - if ($folder !~ /^supplemental/) { - $to_show .= '<th colspan="4">'.&mt('Settings').'</th>'; - } - $to_show .= &Apache::loncommon::end_data_table_header_row(); + .'<th colspan="3">'.&mt('Actions').'</th>' + .'<th>'.&mt('Document').'</th>' + .'<th colspan="2">'.&mt('Settings').'</th>' + .&Apache::loncommon::end_data_table_header_row(); if ($folder !~ /^supplemental/) { $lists{'canhide'} = join(',',@allidx); $lists{'canrandomlyorder'} = join(',',@allmapidx); @@ -3520,9 +4032,8 @@ sub editor { '<td>'. &multiple_check_form('actions',\%lists,$canedit). '</td>'. - '<td> </td>'. - '<td> </td>'. - '<td colspan="4">'. + '<td colspan="3"> </td>'. + '<td colspan="2">'. &multiple_check_form('settings',\%lists,$canedit). '</td>'. &Apache::loncommon::end_data_table_row(); @@ -3546,7 +4057,7 @@ sub editor { } my $noresmsg; if ($allowed && $hiddentop && !$supplementalflag) { - $noresmsg = &mt('Main Content Hidden'); + $noresmsg = &mt('Main Content Hidden'); } else { $noresmsg = &mt('Currently empty'); } @@ -3591,7 +4102,7 @@ sub multiple_check_form { return unless (ref($listsref) eq 'HASH'); my $disabled; unless ($canedit) { - $disabled = 'disabled="disabled"'; + $disabled = ' disabled="disabled"'; } my $output = '<form action="/adm/coursedocs" method="post" name="togglemult'.$caller.'">'. @@ -3671,6 +4182,8 @@ sub process_file_upload { my $quotatype = 'unofficial'; if ($crstype eq 'Community') { $quotatype = 'community'; + } elsif ($crstype eq 'Placement') { + $quotatype = 'placement'; } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) { $quotatype = 'official'; } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) { @@ -3760,7 +4273,7 @@ sub process_file_upload { my $uploadphase = 'upload_embedded'; my $primaryurl = &HTML::Entities::encode($url,'<>&"'); my $state = &embedded_form_elems($uploadphase,$primaryurl,$newidx); - my ($embedded,$num) = + my ($embedded,$num) = &Apache::loncommon::ask_for_embedded_content( '/adm/coursedocs',$state,$allfiles,$codebase,{'docs_url' => $url}); if ($embedded) { @@ -3841,12 +4354,14 @@ sub is_supplemental_title { sub entryline { my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, $crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups, - $ltitoolsref,$canedit,$isencrypted,$navmapref,$hostname)=@_; - my ($foldertitle,$renametitle,$oldtitle); + $ltitoolsref,$canedit,$isencrypted,$ishidden,$navmapref,$hostname)=@_; + my ($foldertitle,$renametitle,$oldtitle,$encodedtitle); if (&is_supplemental_title($title)) { ($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); + $encodedtitle=$title; } else { $title=&HTML::Entities::encode($title,'"<>&\''); + $encodedtitle=$title; $renametitle=$title; $foldertitle=$title; } @@ -3864,11 +4379,11 @@ sub entryline { $renametitle=~s/"/%22/g; $renametitle=~s/ /%20/g; $oldtitle = $renametitle; - $renametitle=~s/\'\;/\\\'/g; + $renametitle=~s/\'/\\\'/g; my $line=&Apache::loncommon::start_data_table_row(); my ($form_start,$form_end,$form_common,$form_param); # Edit commands - my ($esc_path, $path, $symb, $shownsymb); + my ($esc_path, $path, $symb, $shownsymb, $curralias); if ($env{'form.folderpath'}) { $esc_path=&escape($env{'form.folderpath'}); $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); @@ -3937,6 +4452,8 @@ END 'ct' => 'Cut', 'rn' => 'Rename', 'cp' => 'Copy', + 'da' => 'Unset alias', + 'sa' => 'Set alias', 'ex' => 'External Resource', 'et' => 'External Tool', 'ed' => 'Edit', @@ -3944,7 +4461,7 @@ END 'sv' => 'Save', 'ul' => 'URL', 'ti' => 'Title', - 'er' => 'Editing rights unavailable for your current role.', + 'er' => 'Editing rights unavailable for your current role.', ); my %denied = &action_restrictions($coursenum,$coursedom,$url, $env{'form.folderpath'}, @@ -3967,6 +4484,9 @@ END ($url!~/$LONCAPA::assess_page_seq_re/)) { $confirm_removal = 1; } + if ($url =~ /$LONCAPA::assess_re/) { + $curralias = (&LONCAPA::map::getparameter($orderidx,'parameter_0_mapalias'))[0]; + } if ($denied{'copy'}) { $copylink=(<<ENDCOPY) @@ -4068,6 +4588,7 @@ END my $ispage; my $containerarg; my $folderurl; + my $plainurl; if ($uploaded) { if (($extension eq 'sequence') || ($extension eq 'page')) { $url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/; @@ -4086,7 +4607,7 @@ END $url='/adm/supplemental?'; } } else { - &Apache::lonnet::allowuploaded('/adm/coursedoc',$url); + $plainurl = $url; } } @@ -4105,7 +4626,7 @@ END $url=&Apache::lonnet::clutter_with_no_wrapper($url); } else { $url=&Apache::lonnet::clutter($url); - } + } if ($url=~/^\/*uploaded\//) { $url=~/\.(\w+)$/; my $embstyle=&Apache::loncommon::fileembstyle($1); @@ -4116,17 +4637,17 @@ END } elsif ($url!~/\.(sequence|page)$/) { $url='/adm/coursedocs/showdoc'.$url; } - } elsif ($url=~m{^(|/adm/wrapper)/ext/([^#]+)}) { + } elsif ($url=~m{^(|/adm/wrapper)/ext/([^#]+)}) { my $wrapped = $1; my $exturl = $2; - if (($wrapped eq '') && ($container ne 'page')) { + if (($wrapped eq '') && ($container ne 'page')) { $url='/adm/wrapper'.$url; } if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) { $nomodal = 1; } - } elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { - $url='/adm/wrapper'.$url; + } elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { + $url='/adm/wrapper'.$url; } elsif ($url eq "/public/$coursedom/$coursenum/syllabus") { if (($ENV{'SERVER_PORT'} == 443) && ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { @@ -4135,31 +4656,11 @@ END } $nomodal = 1; } - } - if (&Apache::lonnet::symbverify($symb,$url)) { - $shownsymb = $symb; - if ($isexternal) { - $url =~ s/\#[^#]+$//; - if ($container eq 'page') { - $url = &Apache::lonnet::clutter($url); - } - } - unless ($env{'request.role.adv'}) { - if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { - $url = ''; - } - if (&Apache::lonnet::EXT('resource.0.hiddenresource',$symb) =~ /^yes$/i) { - $url = ''; - $hiddenres = 1; - } - } - if ($url ne '') { - $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($shownsymb); - } - } elsif (!$env{'request.role.adv'}) { - my $checkencrypt; + } + my $checkencrypt; + if (!$env{'request.role.adv'}) { if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) || - $isencrypted || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) { + ($isencrypted) || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) { $checkencrypt = 1; } elsif (ref($navmapref)) { unless (ref($$navmapref)) { @@ -4171,22 +4672,40 @@ END } } } - if ($checkencrypt) { - $shownsymb = &Apache::lonenc::encrypted($symb); - my $shownurl = &Apache::lonenc::encrypted($url); - if (&Apache::lonnet::symbverify($shownsymb,$shownurl)) { - $url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&escape($shownsymb); - if ($env{'request.enc'} ne '') { - delete($env{'request.enc'}); - } - } else { - $url=''; - } + } + if ($checkencrypt) { + my $currenc = $env{'request.enc'}; + $env{'request.enc'} = 1; + $shownsymb = &Apache::lonenc::encrypted($symb); + my $shownurl = &Apache::lonenc::encrypted($url); + if (&Apache::lonnet::symbverify($symb,$url)) { + $url = $shownurl; } else { - $url=''; + $url = ''; + } + $env{'request.enc'} = $currenc; + } elsif (&Apache::lonnet::symbverify($symb,$url)) { + $shownsymb = $symb; + if ($isexternal) { + $url =~ s/\#[^#]+$//; + if ($container eq 'page') { + $url = &Apache::lonnet::clutter($url); + } } } else { - $url=''; + $url = ''; + } + unless ($env{'request.role.adv'}) { + if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { + $url = ''; + } + if (&Apache::lonnet::EXT('resource.0.hiddenresource',$symb) =~ /^yes$/i) { + $url = ''; + $hiddenres = 1; + } + } + if (($url ne '') && ($shownsymb ne '')) { + $url .= (($url=~/\?/)?'&':'?').'symb='.&escape($shownsymb); } } } elsif ($supplementalflag) { @@ -4215,6 +4734,22 @@ END } $nomodal = 1; } + } elsif (($uploaded) && ($url ne '/adm/supplemental?') && ($url ne '/adm/coursedocs?')) { + my $embstyle=&Apache::loncommon::fileembstyle($extension); + unless ($embstyle eq 'ssi') { + if (($embstyle eq 'img') + || ($embstyle eq 'emb') + || ($embstyle eq 'wrp')) { + $url='/adm/wrapper'.$url; + } elsif ($url !~ /\.(sequence|page)$/) { + $url='/adm/coursedocs/showdoc'.$url; + } + } + } + unless ($allowed && $env{'request.role.adv'}) { + if ($ishidden || (&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { + $hiddenres = 1; + } } } my ($rand_pick_text,$rand_order_text,$hiddenfolder); @@ -4226,6 +4761,9 @@ END if (!$allowed && $supplementalflag) { $folderpath.=$containerarg.'&'.$foldername; $url.='folderpath='.&escape($folderpath); + if ($ishidden || (&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { + $hiddenfolder = 1; + } } else { my $rpicknum = (&LONCAPA::map::getparameter($orderidx, 'parameter_randompick'))[0]; @@ -4245,7 +4783,7 @@ END my @resources = $$navmapref->retrieveResources($folderurl,$filterFunc,1,1); unless (@resources) { $hiddenmap = 1; - unless ($env{'request.role.adv'}) { + unless ($env{'request.role.adv'}) { $url = ''; $hiddenfolder = 1; } @@ -4264,7 +4802,7 @@ END # Append randompick number, hidden, and encrypted with ":" to foldername, # so it gets transferred between levels - $folderpath.=$containerarg.'&'.$foldername. + $folderpath.=$containerarg.'&'.$foldername. ':'.$rpicknum.':'.$hiddenmap.':'.$encryptmap.':'.$randorder.':'.$ispage; unless ($url eq '') { $url.='folderpath='.&escape($folderpath); @@ -4300,9 +4838,9 @@ $form_common."\n". $form_param."\n". $form_common."\n". '<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" id="randomorder_'.$orderidx.'" onclick="checkForSubmit(this.form,'."'randomorder','settings'".');" '.$ro_set.$disabled.' /> '.&mt('Random Order').' </label></span>'. -$form_end; +$form_end; } - } elsif ($supplementalflag && !$allowed) { + } elsif ($supplementalflag) { my $isexttool; if ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { $url='/adm/wrapper'.$url; @@ -4311,7 +4849,7 @@ $form_end; $url .= ($url =~ /\?/) ? '&':'?'; $url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"'); if ($title) { - $url .= '&title='.&HTML::Entities::encode($renametitle,'<>&"'); + $url .= '&title='.$encodedtitle; } if ((($isexternal) || ($isexttool)) && $orderidx) { $url .= '&idx='.$orderidx; @@ -4322,10 +4860,10 @@ $form_end; } my ($tdalign,$tdwidth); if ($allowed) { - my $fileloc = + my $fileloc = &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url)); if ($isexternal) { - ($editlink,$extresform) = + ($editlink,$extresform) = &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem, undef,undef,undef,undef,undef,undef, undef,$disabled); @@ -4342,7 +4880,7 @@ $form_end; if ($supplementalflag) { $suppanchor = $anchor; } - my $jscall = + my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home, $switchserver, $forceedit, @@ -4365,10 +4903,30 @@ $form_end; } else { $reinit = &mt('(re-initialize course to access)'); } - $line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink; - my $link; + $line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink.'</span>'; + if ($orig_url =~ /$LONCAPA::assess_re/) { + $line.= '<br />'; + if ($curralias ne '') { + $line.='<span class="LC_nobreak"><a href="javascript:delalias('."'$esc_path','$orderidx'".');" class="LC_docs_alias">'. + $lt{'da'}.'</a></span>'; + } else { + $line.='<span class="LC_nobreak"><a href="javascript:setalias('."'$esc_path','$orderidx'".');" class="LC_docs_alias">'. + $lt{'sa'}.'</a></span>'; + } + } + $line.='</td><td><span class="LC_nobreak">'; + my ($link,$nolink); if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { - $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>'; + if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage) { + if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { + $nolink = 1; + } + } + if ($nolink) { + $line .= '<img src="'.$icon.'" alt="" class="LC_icon" /></a>'; + } else { + $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>'; + } } elsif ($url) { if ($anchor ne '') { if ($supplementalflag) { @@ -4377,14 +4935,28 @@ $form_end; $anchor = '#'.&HTML::Entities::encode($anchor,'"<>&'); } } - - if ((!$supplementalflag) && ($nomodal) && ($hostname ne '')) { + if (($nomodal) && ($hostname ne '')) { $link = 'http://'.$hostname.$url; } else { $link = $url; } - $link = &js_escape($link.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.$anchor); - if ($nomodal) { + my $inhibitmenu; + if ((($supplementalflag) && ($allowed) && ($url =~ m{^/adm/wrapper/})) || + (($allowed) && (($url =~ m{^/adm/(viewclasslist|$match_domain/$match_username/aboutme)(\?|$)}) || + ($url =~ m{^/public/$match_domain/$match_courseid/syllabus(\?|$)})))) { + $inhibitmenu = 'only_body=1'; + } else { + $inhibitmenu = 'inhibitmenu=yes'; + } + $link = &js_escape($link.(($url=~/\?/)?'&':'?').$inhibitmenu.$anchor); + if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage && !$uploaded) { + if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { + $nolink = 1; + } + } + if ($nolink) { + $line.='<img src="'.$icon.'" alt="" class="LC_icon" />'; + } elsif ($nomodal) { $line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'. '<img src="'.$icon.'" alt="" class="LC_icon" border="0" /></a>'; } else { @@ -4396,9 +4968,26 @@ $form_end; } $line.='</span></td><td'.$tdwidth.'>'; if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { - $line.='<a href="'.$url.'">'.$title.'</a>'; + if ($nolink) { + $line.=$title; + } else { + $line.='<a href="'.$url.'">'.$title.'</a>'; + } + if (!$allowed && $supplementalflag && $canedit && $isfolder) { + my $editicon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png'; + my $editurl = $url; + $editurl =~ s{^\Q/adm/supplemental?\E}{/adm/coursedocs?command=direct&forcesupplement=1&}; + $line .= ' '.'<a href="'.$editurl.'">'. + '<img src="'.$editicon.'" alt="'.&mt('Edit Content').'" title="'.&mt('Edit Content').'" />'. + '</a>'; + } + if ((($hiddenfolder) || ($hiddenres)) && (!$allowed) && ($supplementalflag)) { + $line.= ' <span class="LC_warning">('.&mt('hidden').')</span> '; + } } elsif ($url) { - if ($nomodal) { + if ($nolink) { + $line.=$title; + } elsif ($nomodal) { $line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'. $title.'</a>'; } else { @@ -4409,35 +4998,50 @@ $form_end; } else { $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>'; } - $line.="$extresform</td>"; + if (($allowed) && ($curralias ne '')) { + $line .= '<br /><span class="LC_docs_alias_name">('.$curralias.')</span>'; + } else { + $line .= $extresform; + } + $line .= '</td>'; $rand_pick_text = ' ' if ($rand_pick_text eq ''); $rand_order_text = ' ' if ($rand_order_text eq ''); - if (($allowed) && ($folder!~/^supplemental/)) { - my %lt=&Apache::lonlocal::texthash( - 'hd' => 'Hidden', - 'ec' => 'URL hidden'); - my ($enctext,$hidtext); - if ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) { - $enctext = ' checked="checked"'; - if (($ishash) && (ref($filtersref->{'encrypturl'}) eq 'ARRAY')) { - push(@{$filtersref->{'encrypturl'}},$orderidx); - } + if ($uploaded && $url && !$isfolder && !$ispage) { + if (($plainurl ne '') && ($env{'request.role.adv'} || $allowed || !$hiddenres)) { + &Apache::lonnet::allowuploaded('/adm/coursedoc',$plainurl); } + } + if ($allowed) { + my %lt=&Apache::lonlocal::texthash( + 'hd' => 'Hidden', + 'ec' => 'URL hidden'); + my ($enctext,$hidtext,$formhidden,$formurlhidden); if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { $hidtext = ' checked="checked"'; - if (($ishash) && (ref($filtersref->{'randomorder'}) eq 'ARRAY')) { + if (($ishash) && (ref($filtersref->{'hiddenresource'}) eq 'ARRAY')) { push(@{$filtersref->{'hiddenresource'}},$orderidx); } } - my $formhidden = 'edit_hiddenresource_'.$orderidx; - my $formurlhidden = 'edit_encrypturl_'.$orderidx; - $line.=(<<ENDPARMS); + $formhidden = 'edit_hiddenresource_'.$orderidx; + $line.=(<<ENDPARMS); <td class="LC_docs_entry_parameter"> <form action="/adm/coursedocs" method="post" name="$formhidden"> $form_param $form_common <label><input type="checkbox" name="hiddenresource_$orderidx" id="hiddenresource_$orderidx" onclick="checkForSubmit(this.form,'hiddenresource','settings');" $hidtext $disabled /> $lt{'hd'}</label> $form_end +ENDPARMS + if ($folder =~/^supplemental/) { + $line.= "\n <td>"; + } else { + if ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) { + $enctext = ' checked="checked"'; + if (($ishash) && (ref($filtersref->{'encrypturl'}) eq 'ARRAY')) { + push(@{$filtersref->{'encrypturl'}},$orderidx); + } + } + $formurlhidden = 'edit_encrypturl_'.$orderidx; + $line.=(<<ENDPARMS); <br /> <form action="/adm/coursedocs" method="post" name="$formurlhidden"> $form_param @@ -4448,6 +5052,7 @@ $form_end; <td class="LC_docs_entry_parameter">$rand_pick_text<br /> $rand_order_text</td> ENDPARMS + } } $line.=&Apache::loncommon::end_data_table_row(); return $line; @@ -4562,9 +5167,9 @@ sub new_timebased_suffix { $locknotfreed = '<div class="LC_error">'. &mt('A lockfile was not released when you added content to the clipboard earlier in this session.').' '. - + &mt('As a result addition of items to the clipboard will be unavailable until your next log-in.'); - } else { + } else { $locknotfreed .= &mt('This will prevent addition of items to the clipboard until your next log-in.'); } @@ -4853,7 +5458,6 @@ sub verifycontent { $r->print(&endContentScreen()); } - sub devalidateversioncache { my $src=shift; &Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'. @@ -4917,8 +5521,8 @@ sub checkversions { } if ($haschanged) { if (&Apache::lonnet::put('resourceversions',\%newsetversions, - $env{'course.'.$env{'request.course.id'}.'.domain'}, - $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') { + $env{'course.'.$env{'request.course.id'}.'.domain'}, + $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') { $r->print(&Apache::loncommon::confirmwrapper( &Apache::lonhtmlcommon::confirm_success(&mt('Your Version Settings have been Saved')))); } else { @@ -5050,7 +5654,7 @@ ENDHEADERS return; } $r->print( - '<input type="submit" name="setversions" value="'.$lt{'save'}.'"'.$disabled.' />'. + '<input type="submit" name="setversions" value="'.$lt{'save'}.'"'.$disabled.' />'. &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). '<th>'.&mt('Resources').'</th>'. @@ -5093,9 +5697,9 @@ ENDHEADERS $setversions{$linkurl}, 'set_version_'.$linkurl, {'select_form_order' => ['',1..$currentversion,'mostrecent'], - '' => '', - 'mostrecent' => &mt('most recent'), - map {$_,$_} (1..$currentversion)},'',$readonly)); + '' => '', + 'mostrecent' => &mt('most recent'), + map {$_,$_} (1..$currentversion)},'',$readonly)); my $lastold=1; for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { my $url=$root.'.'.$prevvers.'.'.$extension; @@ -5173,13 +5777,17 @@ sub changewarning { if (!defined($message)) { $message='Changes will become active for your current session after [_1], or the next time you log in.'; } + my $windowname = 'loncapaclient'; + if ($env{'request.lti.login'}) { + $windowname .= 'lti'; + } $r->print("\n\n". '<script type="text/javascript">'."\n". '// <![CDATA['."\n". 'function reinit(tf) { tf.submit();'.$postexec.' }'."\n". '// ]]>'."\n". '</script>'."\n". -'<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'. +'<form name="reinitform" method="post" action="/adm/roles" target="'.$windowname.'">'. '<input type="hidden" name="orgurl" value="'.$url. '" /><input type="hidden" name="selectrole" value="1" /><p class="LC_warning">'. &mt($message,' <input type="hidden" name="'. @@ -5232,6 +5840,7 @@ sub startContentScreen { if (($mode eq 'navmaps') || ($mode eq 'supplemental')) { $output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b> '.&mt('Content Overview').' </b></a></li>'."\n"; $output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b> '.&mt('Content Search').' </b></a></li>'."\n"; + $output .= '<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b> '.&mt('Content Index').' </b></a></li>'."\n"; $output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>'; } else { $output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b> '.&mt('Main Content Editor').' </b></a></li>'."\n"; @@ -5269,6 +5878,9 @@ sub handler { my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'}; my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'}; +# get docroot + my $londocroot = $r->dir_config('lonDocRoot'); + # graphics settings $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL').'/'); @@ -5277,10 +5889,12 @@ sub handler { foreach my $topic ('Adding_Course_Doc','Main_Course_Documents', 'Adding_External_Resource','Adding_External_Tool', 'Navigate_Content','Adding_Folders','Docs_Overview', - 'Load_Map','Supplemental','Score_Upload_Form', + 'Load_Map','Supplemental','Score_Upload_Form', 'Adding_Pages','Importing_LON-CAPA_Resource', 'Importing_IMS_Course','Uploading_From_Harddrive', - 'Course_Roster','Web_Page','Dropbox','Simple_Problem') { + 'Course_Roster','Web_Page','Dropbox','Simple_Problem', + 'Standard_Problem','Course_Resources', + 'Search_LON-CAPA_Resource','Import_Stored_Links') { $help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic); } # Composite help files @@ -5295,18 +5909,21 @@ sub handler { $help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files'); $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching'); - my ($allowed,$canedit,$canview,$disabled); + my ($allowed,$canedit,$canview,$noendpage,$disabled); +# does this user have privileges to modify content. + if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { # URI is /adm/supplemental when viewing supplemental docs in non-edit mode. - unless ($r->uri eq '/adm/supplemental') { - # does this user have privileges to modify content. - if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { + unless ($r->uri eq '/adm/supplemental') { $allowed = 1; - $canedit = 1; - $canview = 1; - } elsif (&Apache::lonnet::allowed('cev',$env{'request.course.id'})) { + } + $canedit = 1; + $canview = 1; + } elsif (&Apache::lonnet::allowed('cev',$env{'request.course.id'})) { +# URI is /adm/supplemental when viewing supplemental docs in non-edit mode. + unless ($r->uri eq '/adm/supplemental') { $allowed = 1; - $canview = 1; } + $canview = 1; } unless ($canedit) { $disabled = ' disabled="disabled"'; @@ -5348,19 +5965,70 @@ sub handler { &init_breadcrumbs('versions','Check/Set Resource Versions','Docs_Check_Resource_Versions'); &checkversions($r,$canedit); } elsif ($canedit && $env{'form.dumpcourse'}) { - &init_breadcrumbs('dumpcourse','Copy '.&Apache::loncommon::course_type().' Content to Authoring Space'); + &init_breadcrumbs('dumpcourse','Copy uploaded content to Authoring Space'); &dumpcourse($r); - } elsif ($allowed && $env{'form.exportcourse'}) { + } elsif ($canedit && $env{'form.exportcourse'}) { &init_breadcrumbs('exportcourse','IMS Export'); &Apache::imsexport::exportcourse($r); } else { + if ($canedit && $env{'form.authorrole'}) { + $noendpage = 1; + my ($redirect,$error) = &makenewproblem($r,$coursedom,$coursenum); + if ($redirect) { + if (($env{'form.newresourceadd'}) && ($env{'form.folderpath'})) { + my $container = 'sequence'; + my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain, + $is_random_order,$container) = + &Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1); + my (@folders)=split('&',$env{'form.folderpath'}); + $env{'form.foldername'}=&unescape(pop(@folders)); + my $folder=pop(@folders); + my ($errtext,$fatal) = &mapread($coursenum,$coursedom, + $folder.'.'.$container); + my $warning; + if ($fatal) { + if ($container eq 'page') { + $warning = &mt('An error occurred retrieving the contents of the current page.'); + } else { + $warning = &mt('An error occurred retrieving the contents of the current folder.'); + } + } else { + my $url = $redirect; + my $srcfile = $londocroot.$url; + $url =~ s{^/priv/}{/res/}; + my $targetfile = $londocroot.$url; + my $nokeyref = &Apache::lonpublisher::getnokey($r->dir_config('lonIncludes')); + my $output = &Apache::lonpublisher::batchpublish($r,$srcfile,$targetfile,$nokeyref,1); + $env{'form.folder'} = $folder; + &snapshotbefore(); + my $title = &LONCAPA::map::qtunescape($env{'form.newresourcetitle'}); + my $ext = 'false'; + my $newidx = &LONCAPA::map::getresidx(&LONCAPA::map::qtunescape($url)); + $LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url). + ':'.$ext.':normal:res'; + push(@LONCAPA::map::order,$newidx); + &LONCAPA::map::storeparameter($newidx,'parameter_hiddenresource','yes', + 'string_yesno'); + &remember_parms($newidx,'hiddenresource','set','yes'); + ($errtext,$fatal) = + &storemap($coursenum, $coursedom, $folder.'.'.$container,1); + &log_differences($plain); + &mark_hash_old(); + $r->internal_redirect($redirect); + return OK; + } + } else { + $r->internal_redirect($redirect); + } + } + } # # Done catching special calls # The whole rest is for course and supplemental documents and utilities menu # Get the parameters that may be needed # &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['folderpath', + ['folderpath','title', 'forcesupplement','forcestandard', 'tools','symb','command','supppath']); @@ -5379,7 +6047,7 @@ sub handler { if ($env{'form.symb'}) { my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'}); - unless (($id =~ /^\d+$/) && (&Apache::lonnet::is_on_map($resurl))) { + unless (($id =~ /^\d+$/) && (&Apache::lonnet::is_on_map($resurl))) { delete($env{'form.symb'}); } } @@ -5401,17 +6069,23 @@ sub handler { } if ($env{'form.forcesupplement'}) { $supplementalflag=1; } if ($env{'form.forcestandard'}) { $supplementalflag=0; } - unless ($allowed) { $supplementalflag=1; } - unless ($standard) { $supplementalflag=1; } + unless (($supplementalflag) || + ($r->uri =~ m{^/adm/coursedocs/showdoc/uploaded/\Q$coursedom\E/\Q$coursenum\E/docs/})) { + unless ($allowed) { $supplementalflag=1; } + unless ($standard) { $supplementalflag=1; } + } my $toolsflag=0; if ($env{'form.tools'}) { $toolsflag=1; } if ($env{'form.folderpath'} ne '') { - &validate_folderpath($supplementalflag); + &Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom); } + my $backto_supppath; if ($env{'form.supppath'} ne '') { - &validate_suppath(); + if ($supplementalflag && $allowed) { + $backto_supppath = &validate_supppath($coursenum,$coursedom); + } } my $script=''; @@ -5421,6 +6095,7 @@ sub handler { my $containertag; my $pathitem; my %ltitools; + my $posslti; my $hiddentop; my $navmap; my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) }; @@ -5432,10 +6107,10 @@ sub handler { &Apache::loncommon::symb_to_docspath($env{'form.symb'},\$navmap); &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}.'_'.$env{'form.symb'}}); - } elsif ($env{'form.supppath'} ne '') { + } elsif (($env{'form.supppath'} ne '') && $supplementalflag && $allowed) { $env{'form.folderpath'}=$env{'form.supppath'}; &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => - $env{'form.command'}.'_'.$env{'form.supppath'}}); + $env{'form.command'}.'_'.$backto_supppath}); } } elsif ($env{'form.command'} eq 'editdocs') { $env{'form.folderpath'} = &default_folderpath($coursenum,$coursedom,\$navmap); @@ -5463,7 +6138,7 @@ sub handler { if (&unescape($env{'form.folderpath'}) =~ m{^(default|supplemental)&}) { if ($supplementalflag) { - undef($env{'form.folderpath'}) if ($1 eq 'default'); + undef($env{'form.folderpath'}) if ($1 eq 'default'); } else { undef($env{'form.folderpath'}) if ($1 eq 'supplemental'); } @@ -5471,12 +6146,12 @@ sub handler { undef($env{'form.folderpath'}); } if ($env{'form.folderpath'} ne '') { - &validate_folderpath($supplementalflag); + &Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom); } } - -# If we are not allowed to make changes, all we can see are supplemental docs - if (!$allowed) { + +# Set folderpath if we are not allowed to make changes and this is supplemental content + if ((!$allowed) && ($supplementalflag)) { unless ($env{'form.folderpath'} =~ /^supplemental/) { $env{'form.folderpath'} = &supplemental_base(); } @@ -5488,9 +6163,9 @@ sub handler { $env{'form.folderpath'}; } # If allowed and user's role is not advanced check folderpath is not hidden - if (($allowed) && (!$env{'request.role.adv'}) && - ($env{'form.folderpath'} ne '') && (!$supplementalflag)) { - my $folderurl; + my $hidden_and_empty; + if (($allowed) && (!$env{'request.role.adv'}) && ($env{'form.folderpath'} ne '')) { + my ($folderurl,$foldername,$hiddenfolder); my @pathitems = split(/\&/,$env{'form.folderpath'}); my $folder = $pathitems[-2]; if ($folder eq '') { @@ -5502,21 +6177,74 @@ sub handler { } else { $folderurl .= '.sequence'; } - unless (ref($navmap)) { - $navmap = Apache::lonnavmaps::navmap->new(); - } - if (ref($navmap)) { - if (lc($navmap->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') { - my @resources = $navmap->retrieveResources($folderurl,$filterFunc,1,1); - unless (@resources) { - undef($env{'form.folderpath'}); + if ($supplementalflag) { + ($foldername,$hiddenfolder) = ($pathitems[-1] =~ /^([^:]*)::(|1):::$/); + $foldername = &HTML::Entities::decode(&unescape($foldername)); + my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom); + if (ref($supplemental) eq 'HASH') { + my ($suppmap,$suppmapnum); + if ($folder eq 'supplemental') { + $suppmap = 'default'; + $suppmapnum = 0; + } elsif ($folder =~ /^supplemental_(\d+)$/) { + $suppmap = $1; + $suppmapnum = $suppmap; + } + if ($hiddenfolder) { + my $hascontent; + foreach my $key (reverse(sort(keys(%{$supplemental->{'ids'}})))) { + if ($key =~ m{^\Q/uploaded/$coursedom/$coursenum/supplemental/$suppmap/\E}) { + $hascontent = 1; + } elsif (ref($supplemental->{'ids'}->{$key}) eq 'ARRAY') { + foreach my $id (@{$supplemental->{'ids'}->{$key}}) { + if ($id =~ /^$suppmapnum\:/) { + $hascontent = 1; + last; + } + } + } + last if ($hascontent); + } + unless ($hascontent) { + if ($foldername ne '') { + $hidden_and_empty = $foldername; + } else { + $hidden_and_empty = $folder; + } + } } } + } else { + unless (ref($navmap)) { + $navmap = Apache::lonnavmaps::navmap->new(); + } + ($foldername,$hiddenfolder) = ($pathitems[-1] =~ /^([^:]*):|\d+:|1:(|1):|1:|1$/); + $foldername = &HTML::Entities::decode(&unescape($foldername)); + if (ref($navmap)) { + if ($hiddenfolder || + (lc($navmap->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes')) { + my @resources = $navmap->retrieveResources($folderurl,$filterFunc,1,1); + unless (@resources) { + if ($foldername ne '') { + $hidden_and_empty = $foldername; + } else { + $hidden_and_empty = $folder; + } + } + } + } + } + if ($hidden_and_empty ne '') { + splice(@pathitems,-2); + if (@pathitems) { + $env{'form.folderpath'} = join('&',@pathitems); + } else { + undef($env{'form.folderpath'}); + } } } } - # If after all of this, we still don't have any paths, make them unless ($env{'form.folderpath'}) { if ($supplementalflag) { @@ -5591,7 +6319,7 @@ sub handler { my $tid = 1; my @tabids; if ($supplementalflag) { - @tabids = ('002','ee2','ff2'); + @tabids = ('002','dd2','ee2','ff2'); $tid = 2; } else { @tabids = ('aa1','bb1','cc1','ff1'); @@ -5601,17 +6329,34 @@ sub handler { } } my $tabidstr = join("','",@tabids); - %ltitools = &Apache::lonnet::get_domain_lti($coursedom,'consumer'); - my $posslti = keys(%ltitools); + my (%domtools,%crstools); + my %tooltypes = &Apache::loncommon::usable_exttools(); + if ($tooltypes{'dom'}) { + %domtools = &Apache::lonnet::get_domain_lti($coursedom,'consumer'); + } + if ($tooltypes{'crs'}) { + %crstools = &Apache::lonnet::get_course_lti($coursenum,$coursedom,'consumer'); + } + %ltitools = ( + dom => \%domtools, + crs => \%crstools, + ); + $posslti = scalar(keys(%domtools)) + scalar(keys(%crstools)); my $hostname = $r->hostname(); - $script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, - $canedit,$hostname,\$navmap). + $script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, + $londocroot,$canedit,$hostname,\$navmap). &history_tab_js(). &inject_data_js(). &Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid). &Apache::lonextresedit::extedit_javascript(\%ltitools); + my $onload = "javascript:resize_scrollbox('contentscroll','1','1');"; + if ($hidden_and_empty ne '') { + my $alert = &mt("Additional privileges required to edit empty and hidden folder: '[_1]'", + $hidden_and_empty); + $onload .= "javascript:alert('".&js_escape($alert)."');"; + } $addentries = { - onload => "javascript:resize_scrollbox('contentscroll','1','1');", + onload => $onload, }; } $script .= &paste_popup_js(); @@ -5626,14 +6371,23 @@ sub handler { .$script."\n" .'// ]]>'."\n" .'</script>'."\n" - .'<script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>'."\n"; + .'<script type="text/javascript" + src="/res/adm/includes/file_upload.js"></script>'."\n"; # Breadcrumbs &Apache::lonhtmlcommon::clear_breadcrumbs(); if ($showdoc) { - $r->print(&Apache::loncommon::start_page("$crstype documents",undef, - {'force_register' => $showdoc,})); + my $args; + if ($supplementalflag) { + my $title = &HTML::Entities::encode($env{'form.title'},'\'"<>&'); + my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); + $args = {'bread_crumbs' => $brcrum, + 'bread_crumbs_nomenu' => 1}; + } else { + $args = {'force_register' => $showdoc}; + } + $r->print(&Apache::loncommon::start_page("$crstype documents",undef,$args)); } elsif ($toolsflag) { my ($breadtext,$breadtitle); $breadtext = "$crstype Editor"; @@ -5651,9 +6405,20 @@ sub handler { $breadtitle) ); } elsif ($r->uri eq '/adm/supplemental') { + unless ($env{'request.role.adv'}) { + unless (&Apache::lonnet::has_unhidden_suppfiles($coursenum,$coursedom)) { + $r->internal_redirect('/adm/navmaps'); + return OK; + } + } my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype); + my $args = {'bread_crumbs' => $brcrum}; + unless (($env{'form.folderpath'} eq '') || + ($env{'form.folder'} eq 'supplemental')) { + $args->{'bread_crumbs_nomenu'} = 1; + } $r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef, - {'bread_crumbs' => $brcrum,})); + $args)); } else { my ($breadtext,$breadtitle,$helpitem); $breadtext = "$crstype Editor"; @@ -5681,6 +6446,7 @@ sub handler { my %codebase = (); my ($upload_result,$upload_output,$uploadphase); if ($canedit) { + undef($suppchanges); if (($env{'form.uploaddoc.filename'}) && ($env{'form.cmd'}=~/^upload_(\w+)/)) { my $context = $1; @@ -5692,6 +6458,10 @@ sub handler { if ($hadchanges) { &mark_hash_old(); } + if ($suppchanges) { + &Apache::lonnet::update_supp_caches($coursedom,$coursenum); + undef($suppchanges); + } $r->print($upload_output); } elsif ($env{'form.phase'} eq 'upload_embedded') { # Process file upload - phase two - upload embedded objects @@ -5704,7 +6474,7 @@ sub handler { my ($destination,$dir_root) = &embedded_destination(); my $url_root = '/uploaded/'.$docudom.'/'.$docuname; my $actionurl = '/adm/coursedocs'; - my ($result,$flag) = + my ($result,$flag) = &Apache::loncommon::upload_embedded('coursedoc',$destination, $docuname,$docudom,$dir_root,$url_root,undef,undef,undef,$state, $actionurl); @@ -5715,11 +6485,11 @@ sub handler { my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'}; my ($destination,$dir_root) = &embedded_destination(); - my $result = + my $result = &Apache::loncommon::modify_html_refs('coursedoc',$destination, $docuname,$docudom,undef, $dir_root); - $r->print($result.&return_to_editor()); + $r->print($result.&return_to_editor()); } elsif ($env{'form.phase'} eq 'decompress_uploaded') { $uploadphase = 'decompress_phase_one'; $r->print(&decompression_phase_one(). @@ -5733,7 +6503,7 @@ sub handler { if ($allowed && $toolsflag) { $r->print(&startContentScreen('tools')); - $r->print(&generate_admin_menu($crstype,$canedit)); + $r->print(&generate_admin_menu($crstype,$canedit,$coursenum,$coursedom)); $r->print(&endContentScreen()); } elsif ((!$showdoc) && (!$uploadphase)) { # ----------------------------------------------------------------------------- @@ -5741,10 +6511,11 @@ sub handler { 'copm' => 'All documents out of a published map into this folder', 'upfi' => 'Upload File', 'upld' => 'Upload Content', - 'srch' => 'Search', - 'impo' => 'Import', + 'srch' => 'Search Repository', + 'impo' => 'Import from Repository', 'lnks' => 'Import from Stored Links', 'impm' => 'Import from Assembled Map', + 'imcr' => 'Import from Course Resources', 'extr' => 'External Resource', 'extt' => 'External Tool', 'selm' => 'Select Map', @@ -5756,6 +6527,10 @@ sub handler { 'sipa' => 'Simple Course Page', 'sipr' => 'Simple Problem', 'webp' => 'Blank Web Page (editable)', + 'stpr' => 'Standard Problem', + 'news' => 'New sub-directory', + 'crpr' => 'Create Problem', + 'swit' => 'Switch Server', 'drbx' => 'Drop Box', 'scuf' => 'External Scores (handgrade, upload, clicker)', 'bull' => 'Discussion Board', @@ -5769,20 +6544,33 @@ sub handler { 'se' => 'Select', 'file' => 'File', 'title' => 'Title', + 'addp' => 'Add Placeholder to course?', + 'uste' => 'Use Template?', + 'fnam' => 'File Name:', + 'loca' => 'Location:', + 'dire' => 'Directory:', + 'cate' => 'Category:', + 'tmpl' => 'Template:', + 'empd' => 'No resources found', 'comment' => 'Comment', 'parse' => 'Upload embedded images/multimedia files if HTML file', 'bb5' => 'Blackboard 5', 'bb6' => 'Blackboard 6', 'angel5' => 'ANGEL 5.5', 'webctce4' => 'WebCT 4 Campus Edition', + 'yes' => 'Yes', + 'no' => 'No', 'er' => 'Editing rights unavailable for your current role.', ); # ----------------------------------------------------------------------------- + # Calculate free quota space for a user or course. A javascript function checks # file size to determine if upload should be allowed. my $quotatype = 'unofficial'; if ($crstype eq 'Community') { $quotatype = 'community'; + } elsif ($crstype eq 'Placement') { + $quotatype = 'placement'; } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) { $quotatype = 'official'; } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) { @@ -5813,10 +6601,7 @@ sub handler { my $fileupload=(<<FIUP); $quotainfo $lt{'file'}:<br /> - <input type="file" name="uploaddoc" class="LC_flUpload" size="40" $disabled /> - <input type="hidden" id="LC_free_space" value="$free_space" /> FIUP - my $checkbox=(<<CHBO); <!-- <label>$lt{'parse'}? <input type="checkbox" name="parserflag" /> @@ -5836,6 +6621,8 @@ CHBO <fieldset id="uploadimsform" style="display: none;"> <legend>$lt{'imsf'}</legend> $fileupload + <input type="file" name="uploaddoc" id="uploaddocims" class="LC_flUpload LC_uploaddoc" size="40" $disabled /> + <input type="hidden" id="LC_free_space_ims" value="$free_space" /> <br /> <p> $lt{'cms'}: @@ -5861,7 +6648,9 @@ IMSFORM <fieldset id="uploaddocform" style="display: none;"> <legend>$lt{'upfi'}</legend> <input type="hidden" name="active" value="aa" /> - $fileupload + $fileupload + <input type="file" name="uploaddoc" class="LC_flUpload" size="40" $disabled /> + <input type="hidden" id="LC_free_space" value="$free_space" /> <br /> $lt{'title'}:<br /> <input type="text" size="60" name="comment" $disabled /> @@ -5879,7 +6668,7 @@ FUFORM my $mapimportjs; if ($canedit) { - $mapimportjs = "javascript:openbrowser('mapimportform','importmap','sequence,page','');"; + $mapimportjs = "javascript:openbrowser('mapimportform','importmap','sequence,page','');"; } else { $mapimportjs = "javascript:alert('".&js_escape($lt{'er'})."');"; } @@ -5900,20 +6689,74 @@ FUFORM </form> SEDFFORM + my ($importcrsresform,$checkcrsres); + if ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.crsauthor'}) { + $checkcrsres = 1; + } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.crsauthor'} ne '0') { + my %domdefs=&Apache::lonnet::get_domain_defaults($coursedom); + my $type = lc($env{'course.'.$env{'request.course.id'}.'.type'}); + unless (($type eq 'community') || ($type eq 'placement')) { + $type = 'unofficial'; + if ($env{'course.'.$env{'request.course.id'}.'internal.coursecode'} ne '') { + $type = 'official'; + } elsif ($env{'course.'.$env{'request.course.id'}.'internal.textbook'} ne '') { + $type = 'textbook'; + } else { + $type = 'unofficial'; + } + } + if ($domdefs{$type.'crsauthor'}) { + $checkcrsres = 1; + } + } + if ($checkcrsres) { + my ($numdirs,$pickfile) = + &Apache::loncommon::import_crsauthor_form('coursepath','coursefile', + "resize_scrollbox('contentscroll','1','0');", + undef,'res'); + if ($pickfile) { + $importcrsresform=(<<CRSFORM); + <a class="LC_menubuttons_link" href="javascript:toggleImportCrsres('res');"> + $lt{'imcr'}</a>$help{'Course_Resources'} + <form action="/adm/coursedocs" method="post" name="crsresimportform" onsubmit="return validImportCrsRes();"> + <fieldset id="importcrsresform" style="display: none;"> + <legend>$lt{'imcr'}</legend> + <div id="importcrsrescontent" style="display: none;"> + <input type="hidden" name="active" value="bb" /> + $pickfile + <p> + $lt{'title'}: <input type="text" name="crsrestitle" value="" $disabled /> + </p> + <input type="hidden" name="importdetail" value="" /> + <input type="submit" name="crsres" value="$lt{'impo'}" $disabled /><br /> + </div> + <div id="importcrsresempty" style="display: none;"> + <p> + $lt{'empd'} + </p> + </div> + </fieldset> + </form> +CRSFORM + } + } my $fromstoredjs; if ($canedit) { - $fromstoredjs = 'open_StoredLinks_Import()'; + $fromstoredjs = 'open_StoredLinks_Import()'; } else { $fromstoredjs = "alert('".&js_escape($lt{'er'})."')"; } my @importpubforma = ( - { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'" onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" }, + { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'" onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>$help{'Search_LON-CAPA_Resource'}" }, { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'" onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" }, - { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:'.$fromstoredjs.';" />' => '<a class="LC_menubuttons_link" href="javascript:'.$fromstoredjs.';">'.$lt{'lnks'}.'</a>' }, - { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform } - ); + { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:'.$fromstoredjs.';" />' => '<a class="LC_menubuttons_link" href="javascript:'.$fromstoredjs.';">'.$lt{'lnks'}.'</a>'.$help{'Import_Stored_Links'} }, + { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform }, + ); + if ($importcrsresform) { + push(@importpubforma,{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/impcrsau.png" alt="'.$lt{imcr}.'" onclick="javascript:toggleImportCrsres(\'res\');" />' => $importcrsresform}); + } $importpubform = &create_form_ul(&create_list_elements(@importpubforma)); my $extresourcesform = &Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem, @@ -5943,6 +6786,11 @@ SEDFFORM <input type="hidden" name="copyfolder" /> $containertag </form> + <form name="aliasform" method="post" action="/adm/coursedocs"> + <input type="hidden" name="alias" /> + <input type="hidden" name="cmd" /> + $containertag + </form> HIDDENFORM $r->print(&makesimpleeditform($pathitem)."\n". @@ -5965,9 +6813,8 @@ HIDDENFORM } # - - my $savefolderpath; my $hostname = $r->hostname(); + my $savefolderpath; if ($allowed) { my $folder=$env{'form.folder'}; @@ -5980,9 +6827,13 @@ HIDDENFORM } my $postexec=''; if ($folder eq 'default') { + my $windowname = 'loncapaclient'; + if ($env{'request.lti.login'}) { + $windowname .= 'lti'; + } $r->print('<script type="text/javascript">'."\n" .'// <![CDATA['."\n" - .'this.window.name="loncapaclient";'."\n" + .'this.window.name="'.$windowname.'";'."\n" .'// ]]>'."\n" .'</script>'."\n" ); @@ -5995,7 +6846,7 @@ HIDDENFORM my $newnavform=(<<NNFORM); <form action="/adm/coursedocs" method="post" name="newnav"> - <input type="hidden" name="active" value="ee" /> + <input type="hidden" name="active" value="ff" /> $pathitem <input type="hidden" name="importdetail" value="$lt{'navc'}=/adm/navmaps" /> @@ -6005,7 +6856,7 @@ HIDDENFORM NNFORM my $newsmppageform=(<<NSPFORM); <form action="/adm/coursedocs" method="post" name="newsmppg"> - <input type="hidden" name="active" value="ee" /> + <input type="hidden" name="active" value="ff" /> $pathitem <input type="hidden" name="importdetail" value="" /> <a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a> @@ -6015,7 +6866,7 @@ NSPFORM my $newsmpproblemform=(<<NSPROBFORM); <form action="/adm/coursedocs" method="post" name="newsmpproblem"> - <input type="hidden" name="active" value="cc" /> + <input type="hidden" name="active" value="dd" /> $pathitem <input type="hidden" name="importdetail" value="" /> <a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a> @@ -6026,7 +6877,7 @@ NSPROBFORM my $newdropboxform=(<<NDBFORM); <form action="/adm/coursedocs" method="post" name="newdropbox"> - <input type="hidden" name="active" value="cc" /> + <input type="hidden" name="active" value="dd" /> $pathitem <input type="hidden" name="importdetail" value="" /> <a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a> @@ -6036,7 +6887,7 @@ NDBFORM my $newexuploadform=(<<NEXUFORM); <form action="/adm/coursedocs" method="post" name="newexamupload"> - <input type="hidden" name="active" value="cc" /> + <input type="hidden" name="active" value="dd" /> $pathitem <input type="hidden" name="importdetail" value="" /> <a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a> @@ -6046,7 +6897,7 @@ NEXUFORM my $newbulform=(<<NBFORM); <form action="/adm/coursedocs" method="post" name="newbul"> - <input type="hidden" name="active" value="dd" /> + <input type="hidden" name="active" value="ee" /> $pathitem <input type="hidden" name="importdetail" value="" /> <a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a> @@ -6056,7 +6907,7 @@ NBFORM my $newaboutmeform=(<<NAMFORM); <form action="/adm/coursedocs" method="post" name="newaboutme"> - <input type="hidden" name="active" value="dd" /> + <input type="hidden" name="active" value="ee" /> $pathitem <input type="hidden" name="importdetail" value="$plainname=/adm/$udom/$uname/aboutme" /> @@ -6067,7 +6918,7 @@ NAMFORM my $newaboutsomeoneform=(<<NASOFORM); <form action="/adm/coursedocs" method="post" name="newaboutsomeone"> - <input type="hidden" name="active" value="dd" /> + <input type="hidden" name="active" value="ee" /> $pathitem <input type="hidden" name="importdetail" value="" /> <a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a> @@ -6076,7 +6927,7 @@ NASOFORM my $newrosterform=(<<NROSTFORM); <form action="/adm/coursedocs" method="post" name="newroster"> - <input type="hidden" name="active" value="dd" /> + <input type="hidden" name="active" value="ee" /> $pathitem <input type="hidden" name="importdetail" value="$lt{'rost'}=/adm/viewclasslist" /> @@ -6097,14 +6948,172 @@ NROSTFORM } my $newwebpageform =(<<NWEBFORM); <form action="/adm/coursedocs" method="post" name="newwebpage"> - <input type="hidden" name="active" value="ee" /> + <input type="hidden" name="active" value="ff" /> $pathitem <input type="hidden" name="importdetail" value="$newwebpage" /> <a class="LC_menubuttons_link" href="javascript:makewebpage();">$lt{'webp'}</a> $help{'Web_Page'} </form> NWEBFORM - + my $showpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); + my @ids=&Apache::lonnet::current_machine_ids(); + my $machines_str = "'".join("','",@ids)."'"; + my (%is_home,%toppath,$rolehomes); + if ($env{'user.author'}) { + if (grep(/^\Q$env{'user.home'}\E$/,@ids)) { + $is_home{'author'} = 1; + } + $rolehomes = '<input type="hidden" id="rolehome_author" name="rolehome_author" value="'.$env{'user.home'}.'" />'."\n"; + } + my %roleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles', + ['active'],['ca','aa']); + my %by_roletype; + if (keys(%roleshash)) { + foreach my $entry (keys(%roleshash)) { + my ($auname,$audom,$roletype) = split(/:/,$entry); + my $key = $entry; + $key =~ s/:/___/g; + my $author = $auname.'___'.$audom; + $by_roletype{$roletype}{$author} = 1; + my $rolehome = &Apache::lonnet::homeserver($auname,$audom); + $toppath{$author} = "/priv/$audom/$auname"; + if (grep(/^\Q$rolehome\E$/,@ids)) { + $is_home{$author} = 1; + } + $rolehomes .= '<input type="hidden" id="rolehome_coauthor_'.$roletype.'_'.$audom.'/'.$auname.'" '. + 'name="rolehome_coauthor" value="'.$roletype.'='.$audom.'/'.$auname.'='.$rolehome.'" />'."\n"; + } + } + my $crshome = $env{'course.'.$env{'request.course.id'}.'.home'}; + if (grep(/^\Q$crshome\E$/,@ids)) { + $is_home{'course'} = 1; + } + $rolehomes .= '<input type="hidden" id="rolehome_course" name="rolehome_course" value="'.$crshome.'" />'."\n"; + my $pickdir = $lt{'loca'}. + '<select name="authorrole" onchange="populateDirSelects(this.form,'."'authorrole','authorpath'".',1,1,0);">'."\n". + '<option value="" selected="selected">'.&mt('Select').'</option>'."\n"; + if ($env{'user.author'}) { + $pickdir .= '<option value="author">'.&Apache::lonnet::plaintext('au').'</option>'."\n"; + } + if (keys(%by_roletype)) { + foreach my $possrole ('ca','aa') { + if (ref($by_roletype{$possrole}) eq 'HASH') { + my $roletitle = &Apache::lonnet::plaintext($possrole); + foreach my $author (sort { lc($a) cmp lc($b) } (keys(%{$by_roletype{$possrole}}))) { + my ($none,$where,$auname,$audom) = split(/\//,$toppath{$author}); + $pickdir .= '<option value="'.$author.'___'.$possrole.'">'. + $roletitle." ($audom/$auname)</option>\n"; + } + } + } + } + if ($checkcrsres) { + $pickdir .= '<option value="course">'.&mt('Course Resource').'</option>'."\n"; + } + $pickdir .= '</select><br />'."\n". + $lt{'dire'}. + '<select name="authorpath" onchange="toggleCrsResTitle();">'. + '<option value=""></option>'. + '</select><br />'."\n"; + my %seltemplate_menus; + my @files = &Apache::lonhomework::get_template_list('problem'); + my @noexamplelink = ('blank.problem','blank.library','script.library'); + my $currentcategory = ''; + my @ordered = (''); + my %templatehelp; + my $defcategory = ''; + my @catorder = ($defcategory); + $seltemplate_menus{$defcategory}->{'order'} = ['']; + $seltemplate_menus{$defcategory}->{'text'} = ''; + foreach my $file (@files) { + if (ref($file) eq 'ARRAY') { + my ($path,$title,$category,$help) = @{$file}; + next if ($title !~ /\S/); + if (&js_escape($category) ne $currentcategory) { + $currentcategory = &js_escape($category); + push(@catorder,&js_escape($currentcategory)); + $seltemplate_menus{$currentcategory}->{'text'} = $category; + $seltemplate_menus{$currentcategory}->{'default'} = ''; + $seltemplate_menus{$currentcategory}->{'select2'}->{''} = ''; + push(@{$seltemplate_menus{$currentcategory}->{'order'}},''); + } + if ($path) { + $seltemplate_menus{$currentcategory}->{'select2'}->{&js_escape($path)} = $title; + push(@{$seltemplate_menus{$currentcategory}->{'order'}},&js_escape($path)); + if ($help) { + $templatehelp{$path} = $help; + } + } + } + } + + my $templates = $lt{'cate'}.' '. + &Apache::loncommon::linked_select_forms('courseresform','<br />'.$lt{'tmpl'}.' ', + $defcategory,'tempcategory','template', + \%seltemplate_menus,\@catorder, + "resize_scrollbox('contentscroll','1','0');", + "toggleExampleText();",'template').'<br />'; + my $templatepreview = '<a href="#" target="sample" onclick="javascript:getExample(600,420,\'yes\',true); return false;">'. + '<span id="newresexample">'.&mt('Example').'</span></a>'; + my $crsresform; + if (($env{'user.author'}) || ($checkcrsres)) { + $crsresform=(<<RESFORM); + <a class="LC_menubuttons_link" href="javascript:toggleCrsRes('res');"> + $lt{'stpr'}</a>$help{'Standard_Problem'} + <form action="/adm/coursedocs" method="post" name="courseresform"> + <fieldset id="crsresform" style="display:none;"> + <legend>$lt{'stpr'}</legend> + <input type="hidden" name="active" value="bb" /> + <p> + $pickdir + </p> + <div id="newstdproblem" style="display:none;"> + <p> + <span class="LC_nobreak">$lt{'news'}? + <label><input type="radio" name="newsubdir" value="0" onclick="toggleNewsubdir(this.form);" checked="checked" $disabled />No</label> + + <label><input type="radio" name="newsubdir" value="1" onclick="toggleNewsubdir(this.form);" $disabled />Yes</label> + </span><span id="newsubdir"></span> + <input type="hidden" name="newsubdirname" id="newsubdirname" value="" autocomplete="off" /> + </p> + </div> + $lt{'fnam'} + <input type="text" size="20" name="newresourcename" autocomplete="off" $disabled /> + <div id="newresource" style="display:none"> + <p> + $lt{'addp'} + <label><input type="radio" name="newresourceadd" value="0" checked="checked" onclick="toggleNewInCourse(this.form);" $disabled /> + $lt{'no'}</label> + <label><input type="radio" name="newresourceadd" value="1" onclick="toggleNewInCourse(this.form);" $disabled /> + $lt{'yes'}</label> + <span id="newrestitle"></span> + <input type="hidden" size="20" name="newresourcetitle" id="newresourcetitle" autocomplete="off" $disabled /> + </p> + </div> + <p> + $lt{'uste'} + <label><input type="radio" name="newresusetemp" value="0" checked="checked" onclick="toggleWithTemplate(this.form);" $disabled /> + $lt{'no'}</label> + <label><input type="radio" name="newresusetemp" value="1" onclick="toggleWithTemplate(this.form);" $disabled /> + $lt{'yes'}</label> + </p> + <div id="newrestemplate" style="display:none"> + $templates + $templatepreview + </div> + <span class="LC_nobreak"> + <input type="hidden" name="folderpath" value="$showpath" /> + <input type="submit" name="newcrs" value="$lt{'crpr'}" $disabled /> + </span> + <div id="stdprobswitch" style="display:none;"> + $rolehomes + <input type="button" name="switchfornewprob" value="$lt{'swit'}" onclick="switchForProb();" /> + </div> + </fieldset> + </form> + +RESFORM + } my $specialdocumentsform; my @specialdocumentsforma; @@ -6151,7 +7160,7 @@ NSYLFORM my $newgroupfileform=(<<NGFFORM); <form action="/adm/coursedocs" method="post" name="newgroupfiles"> - <input type="hidden" name="active" value="dd" /> + <input type="hidden" name="active" value="ee" /> $pathitem <input type="hidden" name="importdetail" value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" /> @@ -6174,15 +7183,17 @@ NGFFORM } $specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma)); - - my @importdoc = ( - {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'ext\');" />'=>$extresourcesform} - ); - if (keys(%ltitools)) { - push(@importdoc, - {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="toggleUpload(\'tool\');" />'=>$exttoolform}, + my @external = ( + {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleExternal(\'ext\');" />'=>$extresourcesform} ); + if ($posslti) { + push(@external, + {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="toggleExternal(\'tool\');" />'=>$exttoolform}, + ); } + my $externalform = &create_form_ul(&create_list_elements(@external)); + + my @importdoc = (); unless ($container eq 'page') { push(@importdoc, {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform} @@ -6196,9 +7207,13 @@ NGFFORM @gradingforma=( {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform}, {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform}, - {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform}, - + {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform} ); + if ($crsresform) { + push(@gradingforma, + {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{stpr}.'" onclick="javascript:toggleCrsRes(\'res\');" />'=>$crsresform} + ); + } $gradingform = &create_form_ul(&create_list_elements(@gradingforma)); @communityforma=( @@ -6212,13 +7227,14 @@ NGFFORM my %orderhash = ( 'aa' => ['Upload',$fileuploadform], - 'bb' => ['Import',$importpubform], - 'cc' => ['Grading',$gradingform], - 'ee' => ['Other',$specialdocumentsform], + 'bb' => ['External',$externalform], + 'cc' => ['Import',$importpubform], + 'dd' => ['Assessment',$gradingform], + 'ff' => ['Other',$specialdocumentsform], ); unless ($container eq 'page') { $orderhash{'00'} = ['Newfolder',$newfolderform]; - $orderhash{'dd'} = ['Collaboration',$communityform]; + $orderhash{'ee'} = ['Collaboration',$communityform]; } $hadchanges=0; @@ -6231,10 +7247,10 @@ unless ($container eq 'page') { $r->print('<p><span class="LC_error">'.$error.'</span></p>'); } if ($hadchanges) { - unless (&is_hash_old()) { - &mark_hash_old(); - } - } + unless (&is_hash_old()) { + &mark_hash_old(); + } + } &changewarning($r,''); } @@ -6246,7 +7262,7 @@ unless ($container eq 'page') { unless ($supplementalflag) { $folder='supplemental'; } - if ($folder =~ /^supplemental$/ && + if (($folder eq 'supplemental') && (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) { $env{'form.folderpath'} = &supplemental_base(); } elsif ($allowed) { @@ -6264,8 +7280,10 @@ unless ($container eq 'page') { <form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data"> <fieldset id="uploadsuppdocform" style="display: none;"> <legend>$lt{'upfi'}</legend> - <input type="hidden" name="active" value="ee" /> + <input type="hidden" name="active" value="ee" /> $fileupload + <input type="file" name="uploaddoc" id="uploaddocsupp" class="LC_flUpload LC_uploaddoc" size="40" $disabled /> + <input type="hidden" id="LC_free_space_supp" value="$free_space" /> <br /> <br /> <span class="LC_nobreak"> @@ -6278,6 +7296,7 @@ unless ($container eq 'page') { $pathitem <input type="hidden" name="cmd" value="upload_supplemental" /> <input type='submit' value="$lt{'upld'}" /> + </fieldset> </form> SUPDOCFORM @@ -6294,7 +7313,9 @@ SNFFORM my $supextform = &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem, $help{'Adding_External_Resource'}, - undef,undef,$disabled); + undef,undef,undef,undef,undef,undef, + $disabled); + my $supexttoolform = &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem, $help{'Adding_External_Tool'}, @@ -6352,49 +7373,43 @@ my @specialdocs = ( {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage('."'supp'".');" />'=>$supwebpageform}, ); -my @supimportdoc = ( - {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleUpload(\'suppext\')" />' - =>$supextform}); - if (keys(%ltitools)) { - push(@supimportdoc, - {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="javascript:toggleUpload(\'supptool\')" />' + my @supexternal = ( + {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleExternal(\'suppext\')" />' + =>$supextform}); + if ($posslti) { + push(@supexternal, + {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="javascript:toggleExternal(\'supptool\')" />' =>$supexttoolform}); } - push(@supimportdoc, - {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />' + my @supimportdoc = ( + {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />' =>$supupdocform}, ); $supupdocform = &create_form_ul(&create_list_elements(@supimportdoc)); my %suporderhash = ( '00' => ['Supnewfolder', $supnewfolderform], - 'ee' => ['Upload',$supupdocform], + 'dd' => ['Upload',$supupdocform], + 'ee' => ['External',&create_form_ul(&create_list_elements(@supexternal))], 'ff' => ['Other',&create_form_ul(&create_list_elements(@specialdocs))] ); if ($supplementalflag) { - my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, - $supplementalflag,\%suporderhash,$iconpath,$pathitem, - \%ltitools,$canedit,$hostname); - if ($error) { - $r->print('<p><span class="LC_error">'.$error.'</span></p>'); - } else { - if ($suppchanges) { - my %servers = &Apache::lonnet::internet_dom_servers($coursedom); - my @ids=&Apache::lonnet::current_machine_ids(); - foreach my $server (keys(%servers)) { - next if (grep(/^\Q$server\E$/,@ids)); - my $hashid=$coursenum.':'.$coursedom; - my $cachekey = &escape('suppcount').':'.&escape($hashid); - &Apache::lonnet::remote_devalidate_cache($server,[$cachekey]); - } - &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1); - undef($suppchanges); - } - } + $suppchanges = 0; + my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, + $supplementalflag,\%suporderhash,$iconpath,$pathitem, + \%ltitools,$canedit,$hostname); + if ($error) { + $r->print('<p><span class="LC_error">'.$error.'</span></p>'); + } + if ($suppchanges) { + &Apache::lonnet::update_supp_caches($coursedom,$coursenum); + undef($suppchanges); + } } } elsif ($supplementalflag) { my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, - $supplementalflag,'',$iconpath,$pathitem,'',$hostname); + $supplementalflag,'',$iconpath,$pathitem,'',$canedit, + $hostname); if ($error) { $r->print('<p><span class="LC_error">'.$error.'</span></p>'); } @@ -6421,7 +7436,9 @@ my %suporderhash = ( &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>'); } } - $r->print(&Apache::loncommon::end_page()); + unless ($noendpage) { + $r->print(&Apache::loncommon::end_page()); + } return OK; } @@ -6499,7 +7516,7 @@ sub decompression_phase_one { $error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'}); } else { my $file = $1; - $output = + $output = &Apache::loncommon::process_decompression($docudom,$docuname,$file, $destination,$dir_root, $hiddenelem); @@ -6556,6 +7573,10 @@ sub remove_archive { if ($url eq $env{'form.archiveurl'}) { if (&handle_edit_cmd($docuname,$docudom)) { ($errtext,$fatal) = &storemap($docuname,$docudom,$map,1); + if ($suppchanges) { + &Apache::lonnet::update_supp_caches($docudom,$docuname); + undef($suppchanges); + } if ($fatal) { if ($container eq 'page') { $delwarning = &mt('An error occurred updating the contents of the current page.'); @@ -6587,7 +7608,7 @@ sub remove_archive { } sub generate_admin_menu { - my ($crstype,$canedit) = @_; + my ($crstype,$canedit,$coursenum,$coursedom) = @_; my $lc_crstype = lc($crstype); my ($home,$other,%outhash)=&authorhosts(); my %lt= ( # do not translate here @@ -6595,6 +7616,7 @@ sub generate_admin_menu { 'cv' => 'Check/Set Resource Versions', 'ls' => 'List Resource Identifiers', 'ct' => 'Display/Set Shortened URLs for Deep-linking', + 'ca' => "Enter $crstype Authoring Space", 'imse' => 'Export contents to IMS Archive', 'dcd' => "Copy $crstype Content to Authoring Space", ); @@ -6655,6 +7677,31 @@ sub generate_admin_menu { ] }); if ($canedit) { + my ($crsauname,$crsaudom,$crshome); + if (($coursenum ne '') && ($coursedom ne '')) { + my $crsauthorurl = "/priv/$coursedom/$coursenum/"; + ($crsauname,$crsaudom,$crshome) = &Apache::lonnet::constructaccess($crsauthorurl); + if (($crsauname eq $coursenum) && ($crsaudom eq $coursedom)) { + my @ids=&Apache::lonnet::current_machine_ids(); + my $linkurl; + if (grep(/^\Q$crshome\E$/,@ids)) { + $linkurl = $crsauthorurl; + } else { + $linkurl = + &Apache::lonhtmlcommon::jump_to_editres($crsauthorurl,$crshome,1); + } + if ((ref($menu[0]) eq 'HASH') && (ref($menu[0]->{'items'}) eq 'ARRAY')) { + push(@{$menu[0]->{items}}, + { linktext => $lt{'ca'}, + url => $linkurl, + permission => 'F', + help => 'Docs_Course_Authorspace', + icon => 'impcrsau.png', + linktitle => $lt{'ca'}, + }); + } + } + } push(@menu, { categorytitle=>'Export', items =>[ @@ -6783,7 +7830,7 @@ END sub editing_js { my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, - $canedit,$hostname,$navmapref) = @_; + $londocroot,$canedit,$hostname,$navmapref) = @_; my %js_lt = &Apache::lonlocal::texthash( p_mnf => 'Name of New Folder', t_mnf => 'New Folder', @@ -6795,6 +7842,7 @@ sub editing_js { p_mdb => 'Title for the Drop Box', p_mbb => 'Title for the Discussion Board', p_mwp => 'Title for Web Page', + p_mnr => 'Title for the Resource', p_mab => "Enter user:domain for User's Personal Information Page", p_mab2 => 'Personal Information Page of ', p_mab_alrt1 => 'Not a valid user:domain', @@ -6813,6 +7861,8 @@ sub editing_js { p_ctr2b => '?', p_ctr3a => 'Cut those', p_ctr3b => 'items?', + setal => 'Enter a (unique) alias', + delal => 'Are you sure you want to eliminate the alias?', rpck => 'Enter number to pick (e.g., 3)', imsfile => 'You must choose an IMS package for import', imscms => 'You must select which Course Management System was the source of the IMS package', @@ -6823,9 +7873,13 @@ sub editing_js { noor => 'No actions selected or changes to settings specified.', noch => 'No changes to settings specified.', noac => 'No actions selected.', + nofi => 'No file selected', + tinc => 'Title in course', + sunm => 'Sub-directory name', edri => 'Editing rights unavailable for your current role.', + sele => 'Select', + swit => 'Switch server required', ); - &js_escape(\%js_lt); my $crstype = &Apache::loncommon::course_type(); my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"'); @@ -6836,7 +7890,9 @@ sub editing_js { my $backtourl; my $toplevelmain = &escape(&default_folderpath($coursenum,$coursedom,$navmapref)); my $toplevelsupp = &supplemental_base(); - + my $showfile_js = &Apache::loncommon::show_crsfiles_js(); + my @ids=&Apache::lonnet::current_machine_ids(); + my $machines_str = "'".join("','",@ids)."'"; if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) { my $caller = $1; if ($caller =~ /^supplemental/) { @@ -6885,7 +7941,7 @@ sub editing_js { if ($anchor ne '') { $backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"'); } - $backtourl = &Apache::loncommon::escape_single($backtourl); + $backtourl = &Apache::loncommon::escape_single($backtourl); } else { $backtourl = '/adm/navmaps'; } @@ -6893,22 +7949,29 @@ sub editing_js { } elsif ($env{'docs.exit.'.$env{'request.course.id'}} eq '/adm/menu') { $backtourl = '/adm/menu'; } elsif ($supplementalflag) { - $backtourl = '/adm/supplemental'; + if (($env{'request.role.adv'}) || + (&Apache::lonnet::has_unhidden_suppfiles($coursenum,$coursedom))) { + $backtourl = '/adm/supplemental'; + } else { + $backtourl = '/adm/navmaps'; + } } else { $backtourl = '/adm/navmaps'; } - my $fieldsets = "'ext','doc'"; - if ($posslti) { - $fieldsets .= ",'tool'"; - } + my $fieldsets = "'doc'"; unless ($main_container_page) { $fieldsets .=",'ims'"; } + my $extfieldsets = "'ext'"; + if ($posslti) { + $extfieldsets .= ",'tool'"; + } if ($supplementalflag) { - $fieldsets = "'suppext','suppdoc'"; + $fieldsets = "'suppdoc'"; + $extfieldsets = "'suppext'"; if ($posslti) { - $fieldsets .= ",'supptool'"; + $extfieldsets .= ",'supptool'"; } } @@ -6958,7 +8021,7 @@ function makewebpage(type) { formname = this.document.forms.newwebpage; } if (title) { - var webpage = formname.importdetail.value; + var webpage = formname.importdetail.value; formname.importdetail.value = encodeURIComponent(title)+'='+webpage; formname.submit(); } @@ -7025,6 +8088,24 @@ function changename(folderpath,index,old } } +function setalias(folderpath,index) { + var alias = prompt('$js_lt{"setal"}'); + if ((alias != null) && (alias != '')) { + this.document.forms.aliasform.alias.value=alias; + this.document.forms.aliasform.cmd.value='setalias_'+index; + this.document.forms.aliasform.folderpath.value=folderpath; + this.document.forms.aliasform.submit(); + } +} + +function delalias(folderpath,index) { + if (confirm('$js_lt{"delal"}')) { + this.document.forms.aliasform.cmd.value='delalias_'+index; + this.document.forms.aliasform.folderpath.value=folderpath; + this.document.forms.aliasform.submit(); + } +} + ENDNEWSCRIPT } else { $jsmakefunctions = <<ENDNEWSCRIPT; @@ -7069,6 +8150,14 @@ function changename() { alert("$js_lt{'edri'}"); } +function setalias() { + alert("$js_lt{'edri'}"); +} + +function delalias() { + alert("$js_lt{'edri'}"); +} + function makenew() { alert("$js_lt{'edri'}"); } @@ -7106,6 +8195,22 @@ function toggleUpload(caller) { } } document.getElementById('upload'+blocks[i]+'form').style.display=disp; + } + resize_scrollbox('contentscroll','1','1'); + return; +} + +function toggleExternal(caller) { + var blocks = Array($extfieldsets); + for (var i=0; i<blocks.length; i++) { + var disp = 'none'; + if (caller == blocks[i]) { + var curr = document.getElementById('external'+caller+'form').style.display; + if (curr == 'none') { + disp='block'; + } + } + document.getElementById('external'+blocks[i]+'form').style.display=disp; if ((caller == 'tool') || (caller == 'supptool')) { if (disp == 'block') { if (document.getElementById('LC_exttoolid')) { @@ -7134,11 +8239,389 @@ function toggleMap(caller) { } } document.getElementById('importmapform').style.display=disp; + if (disp == 'block') { + if (document.getElementById('importcrsresform')) { + if (document.getElementById('importcrsresform').style.display == 'block') { + document.getElementById('importcrsresform').style.display = 'none'; + } + } + } resize_scrollbox('contentscroll','1','1'); } return; } +function toggleCrsRes(caller) { + var disp = 'none'; + if (document.getElementById('crsresform')) { + if (caller == 'res') { + var form = document.getElementById('crsresform'); + var curr = form.style.display; + if (curr == 'none') { + disp='block'; + document.courseresform.authorrole.selectedIndex = 0; + document.courseresform.authorpath.selectedIndex = 0; + document.courseresform.newresourceadd.selectedIndex = 0; + populateDirSelects(form,'authorrole','authorpath',1,0,0); + toggleNewInCourse(document.courseresform); + if (document.getElementById('newresource')) { + document.getElementById('newresource').style.display = 'none'; + } + if (document.courseresform.newresusetemp.length) { + document.courseresform.newresusetemp[0].checked = true; + toggleWithTemplate(document.courseresform); + } + document.courseresform.newresourcename.value = ''; + } + } + if (document.courseresform.newsubdir.length) { + for (var j=0; j<document.courseresform.newsubdir.length; j++) { + if (document.courseresform.newsubdir[j].value == 0) { + document.courseresform.newsubdir[j].checked = true; + } + break; + } + if (document.getElementById('newsubdirname')) { + document.getElementById('newsubdirname').type = "hidden"; + document.getElementById('newsubdirname').value = ""; + } + if (document.getElementById('newsubdir')) { + document.getElementById('newsubdir').innerHTML = ""; + } + } + document.getElementById('crsresform').style.display=disp; + resize_scrollbox('contentscroll','1','0'); + } + return; +} + +function toggleNewsubdir(form) { + if (form.newsubdir.length) { + for (var j=0; j<form.newsubdir.length; j++) { + if (form.newsubdir[j].checked) { + if (document.getElementById('newsubdirname')) { + if (form.newsubdir[j].value == '1') { + document.getElementById('newsubdirname').type = "text"; + if (document.getElementById('newsubdir')) { + document.getElementById('newsubdir').innerHTML = '<br />$js_lt{'sunm'}'; + } + } else { + document.getElementById('newsubdirname').type = "hidden"; + document.getElementById('newsubdirname').value = ""; + document.getElementById('newsubdir').innerHTML = ""; + } + } + break; + } + } + } +} + +function toggleCrsResTitle() { + if (document.getElementById('newresource')) { + var selloc = document.courseresform.authorrole.options[document.courseresform.authorrole.selectedIndex].value; + if (selloc == 'course') { + document.getElementById('newresource').style.display = 'inline'; + document.courseresform.newresourceadd[0].checked = true; + toggleNewInCourse(document.courseresform); + } else { + document.getElementById('newresource').style.display = 'none'; + } + } + if (document.getElementById('newstdproblem')) { + if (document.courseresform.authorpath.options[document.courseresform.authorpath.selectedIndex].value == 'switch') { + document.getElementById('newstdproblem').style.display = 'none'; + if (document.getElementById('stdprobswitch')) { + document.getElementById('stdprobswitch').style.display = 'block'; + } + } else { + document.getElementById('newstdproblem').style.display = 'block'; + if (document.getElementById('stdprobswitch')) { + document.getElementById('stdprobswitch').style.display = 'none'; + } + } + } +} + +function toggleNewInCourse(form) { + if (form.newresourceadd.length) { + for (var i=0; i<form.newresourceadd.length; i++) { + if (form.newresourceadd[i].checked) { + if (document.getElementById('newresourcetitle')) { + if (form.newresourceadd[i].value == '1') { + document.getElementById('newresourcetitle').type = 'text'; + if (document.getElementById('newrestitle')) { + document.getElementById('newrestitle').innerHTML = "<br />$js_lt{'tinc'}"; + } + } else { + document.getElementById('newresourcetitle').type = 'hidden'; + document.getElementById('newresourcetitle').value = ''; + if (document.getElementById('newrestitle')) { + document.getElementById('newrestitle').innerHTML = ''; + } + } + } + break; + } + } + } +} + +function toggleWithTemplate(form) { + if (form.newresusetemp.length) { + for (var i=0; i<form.newresusetemp.length; i++) { + if (form.newresusetemp[i].checked) { + if (document.getElementById('newrestemplate')) { + if (form.newresusetemp[i].value == '1') { + document.getElementById('newrestemplate').style.display = 'inline'; + toggleExampleText(); + } else { + form.tempcategory.selectedIndex = 0; + select1template_changed(); + document.getElementById('newrestemplate').style.display = 'none'; + } + } + } + } + } +} + +function toggleExampleText() { + if (document.getElementById('newresexample')) { + var url = document.courseresform.template.options[document.courseresform.template.selectedIndex].value; + if (url == '') { + document.getElementById('newresexample').style.fontWeight = 'normal'; + } else { + document.getElementById('newresexample').style.fontWeight = 'bold'; + } + } +} + +function getExample(width,height,scrolling,transparency) { + var url; + if (document.courseresform.newresusetemp.length) { + for (var i=0; i<document.courseresform.newresusetemp.length; i++) { + if (document.courseresform.newresusetemp[i].checked) { + if (document.courseresform.newresusetemp[i].value == '1') { + var url = document.courseresform.template.options[document.courseresform.template.selectedIndex].value; + if (url == '') { + alert('Pick a category and template'); + } else { + url = url.replace("$londocroot",""); + url += '?inhibitmenu=yes'; + } + } + break; + } + } + } + if (url != '') { + openMyModal(url,width,height,scrolling,transparency,''); + } +} + +function toggleImportCrsres(caller) { + var disp = 'none'; + if (document.getElementById('importcrsresform')) { + if (caller == 'res') { + var curr = document.getElementById('importcrsresform').style.display; + if (curr == 'none') { + disp='block'; + populateCrsSelects(document.crsresimportform,'coursepath','coursefile',1,'',1,0,1,1,0); + if ((document.getElementById('importcrsrescontent')) && + (document.getElementById('importcrsresempty'))) { + var selelem = document.crsresimportform.elements['coursepath']; + var numdirs = 0; + if (selelem.options.length) { + numdirs = selelem.options.length - 1; + } + if (numdirs) { + document.getElementById('importcrsrescontent').style.display='block'; + document.getElementById('importcrsresempty').style.display='none'; + } else { + document.getElementById('importcrsrescontent').style.display='none'; + document.getElementById('importcrsresempty').style.display='block'; + } + } + } + } + document.getElementById('importcrsresform').style.display=disp; + if (disp == 'block') { + if (document.getElementById('importmapform')) { + if (document.getElementById('importmapform').style.display == 'block') { + document.getElementById('importmapform').style.display = 'none'; + } + } + } + resize_scrollbox('contentscroll','1','0'); + } + return; +} + +$showfile_js + +function populateDirSelects(form,locsel,dirsel,setdir,recurse,nonemptydir) { + var location = form.elements[locsel].options[form.elements[locsel].selectedIndex].value; + if ((setdir) && (dirsel != null) && (dirsel != 'undefined') && (dirsel != '')) { + var selelem = form.elements[dirsel]; + var i, numfiles = selelem.options.length -1; + if (numfiles >=0) { + for (i = numfiles; i >= 0; i--) { + selelem.remove(i); + } + } + if ((location == '') || (location == null) || (location == 'undefined')) { + if (selelem.options.length == 0) { + selelem.options[selelem.options.length] = new Option('',''); + selelem.selectedIndex = 0; + } + if (document.getElementById('newstdproblem')) { + document.getElementById('newstdproblem').style.display = 'none'; + } + return; + } + var machineIds = new Array($machines_str); + var athome = 0; + var role = location; + if ((location == 'author') || (location == 'course')) { + if (document.getElementById('rolehome_'+location)) { + var currhome = document.getElementById('rolehome_'+location).value; + if ((currhome != '') && (currhome != null) && (currhome != 'undefined')) { + if (machineIds.includes(currhome)) { + athome = 1; + } + } + } + } else { + const roleinfo = location.split('___'); + role = encodeURIComponent(roleinfo[0]+'./'+roleinfo[1]); + if (document.getElementById('rolehome_coauthor_'+roleinfo[1]+'_'+roleinfo[0])) { + var currhome = document.getElementById('rolehome_coauthor_'+roleinfo[1]+'_'+roleinfo[0]).value; + if ((currhome != '') && (currhome != null) && (currhome != 'undefined')) { + if (machineIds.includes(currhome)) { + athome = 1; + } + } + } + } + var templateradio = document.courseresform.elements['newresusetemp']; + if (athome) { + if (document.getElementById('stdprobswitch')) { + document.getElementById('stdprobswitch').style.display = 'none'; + } + if (document.getElementById('newstdproblem')) { + document.getElementById('newstdproblem').style.display = 'none'; + } + var canedit = '$canedit'; + if (canedit) { + if (templateradio.length > 1) { + for (var i=0; i<templateradio.length; i++) { + templateradio[i].disabled = false; + } + } + document.courseresform.newresourcename.disabled = false; + document.courseresform.newcrs.disabled = false; + } + var http = new XMLHttpRequest(); + var url = "/adm/courseauthor"; + var params = "role="+role+"&rec="+recurse+"&nonempty="+nonemptydir+"&addtop=1"; + http.open("POST", url, true); + http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + http.onreadystatechange = function() { + if (http.readyState == 4 && http.status == 200) { + var data = JSON.parse(http.responseText); + if (Array.isArray(data.dirs)) { + var len = data.dirs.length; + if (len) { + if (len > 1) { + selelem.options[selelem.options.length] = new Option('$js_lt{sele}',''); + } + } + if (len) { + var j; + for (j = 0; j < len; j++) { + selelem.options[selelem.options.length] = new Option(data.dirs[j],data.dirs[j]); + } + selelem.selectedIndex = 0; + if (len == 1) { + toggleCrsResTitle(); + } + } + } + } + } + http.send(params); + } else { + selelem.options[selelem.options.length] = new Option('$js_lt{swit}','switch'); + selelem.selectedIndex = 0; + if (document.getElementById('stdprobswitch')) { + document.getElementById('stdprobswitch').style.display = 'block'; + } + if (document.getElementById('newstdproblem')) { + document.getElementById('newstdproblem').style.display = 'none'; + } + if (templateradio.length > 1) { + for (var i=0; i<templateradio.length; i++) { + templateradio[i].disabled = true; + } + } + document.courseresform.newresourcename.disabled = true; + document.courseresform.newcrs.disabled = true; + } + } + return; +} + +function switchForProb() { + if (document.courseresform.authorpath.options[document.courseresform.authorpath.selectedIndex].value == 'switch') { + var url = '/adm/switchserver?otherserver='; + var newhostid = ''; + var role = ''; + var selloc = document.courseresform.authorrole.options[document.courseresform.authorrole.selectedIndex].value; + if (selloc == 'author') { + newhostid = document.courseresform.rolehome_author.value; + role = "au./&js_escape($env{'user.domain'})/"; + } else if (selloc == 'course') { + newhostid = document.courseresform.rolehome_course.value; + role = "&js_escape($env{'request.role'})"; + } else { + var items = new Array(); + items = selloc.split('___'); + var len = document.courseresform.rolehome_coauthor.length; + if (null == len) { + var currval = document.courseresform.rolehome_coauthor.value; + if (null != currval) { + var info = new Array(); + info = currval.split('='); + newhostid = info[2]; + role = info[0]+'./'+info[1]; + } + } else { + for (var i=0; i<len; i++) { + var currval = document.courseresform.rolehome_coauthor[i].value; + if (null != currval) { + var info = new Array(); + info = currval.split('='); + if ((info[1] == items[1]+'/'+items[0]) && (info[0] == items[2])) { + newhostid = info[2]; + role = info[0]+'./'+info[1]; + break; + } + } + } + } + } + if (newhostid != '') { + url += newhostid; + if (role != '') { + url += '&role='+role; + } + document.location.href = url; + } + } + return; +} + function makeims(imsform) { if ((imsform.uploaddoc.value == '') || (!imsform.uploaddoc.value)) { alert("$js_lt{'imsfile'}"); @@ -7445,11 +8928,11 @@ for (i = 0; i < currentLis.length; i++) function hideAll(current, nav, data) { unselectInactive(nav); -if (current) { +if (current) { if (current.className == 'right'){ - current.className = 'right active' + current.className = 'right active' } else { - current.className = 'active'; + current.className = 'active'; } } currentData = document.getElementById(data); @@ -7487,13 +8970,16 @@ function showPage(current, pageId, nav, unselectInactive(nav); if ((currstate == 'active') || (currstate == 'right active')) { if (currstate == 'active') { - current.className = ''; + current.className = ''; } else { current.className = 'right'; } - activeTab = ''; + activeTab = ''; + toggleExternal(); toggleUpload(); toggleMap(); + toggleCrsRes(); + toggleImportCrsres(); resize_scrollbox('contentscroll','1','0'); return; } else { @@ -7502,8 +8988,11 @@ function showPage(current, pageId, nav, currentData = document.getElementById(pageId); currentData.style.display = 'block'; activeTab = pageId; + toggleExternal(); toggleUpload(); toggleMap(); + toggleCrsRes(); + toggleImportCrsres(); if (nav == 'mainnav') { var storedpath = "$docs_folderpath"; var storedpage = "$main_container_page"; @@ -7867,6 +9356,33 @@ function setBoxes(value) { return; } +function validImportCrsRes() { + var path = document.crsresimportform.coursepath.options[document.crsresimportform.coursepath.selectedIndex].value; + var fname = document.crsresimportform.coursefile.options[document.crsresimportform.coursefile.selectedIndex].value; + if ((fname == '') || (fname == null)) { + alert("$js_lt{'nofi'}"); + return false; + } + var url = '/res/$coursedom/$coursenum/'; + if (path && path != '/') { + url += path+'/'; + } + if (fname != '') { + url += fname; + } + var title = document.crsresimportform.crsrestitle.value; + document.crsresimportform.importdetail.value=encodeURIComponent(title)+'='+encodeURIComponent(url); + return true; +} + +function validateNewRes(caller) { + if (caller == 'single') { + var role = document.courseresform.authorrole.options[document.courseresform.authorrole.selectedIndex].value; + var authorpath = document.courseresform.authorpath.options[document.courseresform.authorpath.selectedIndex].value; + var resname = document.courseresform.newresourcename.value; + } +} + ENDSCRIPT } @@ -7902,7 +9418,7 @@ sub dump_switchserver_js { ); my %html_js_lt = &Apache::lonlocal::texthash( swit => 'Switch server?', - duco => 'Copying Content to Authoring Space', + duco => 'Copying uploaded content to Authoring Space', yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.', chos => 'Choose server', ); @@ -7997,6 +9513,212 @@ sub makesimpleeditform { SIMPFORM } +sub makenewproblem { + my ($r,$coursedom,$coursenum) = @_; +# Creating a new problem + my ($redirect,$error); + if ($env{'form.authorrole'}) { + my ($newsubdir,$filename); + if ($env{'form.newsubdir'}) { + if ($env{'form.newsubdirname'} ne '') { + $newsubdir = $env{'form.newsubdirname'}; + } + } + if ($env{'form.newresourcename'}) { + $filename = $env{'form.newresourcename'}; + $filename =~ s/\.(\d+)(\.\w+)$/$2/; + $filename =~ s/`//g; + $filename =~ s{/\.\./}{_}g; + $filename =~ s/\.+/./g; + $filename =~ s{/+}{_}g; + if ($filename ne '') { + my ($name,$ext) = ($filename =~ /(.+)\.([^.]+)$/); + if (($ext) && ($ext ne '.problem')) { + $filename = $name.'.problem'; + } elsif ($ext eq '') { + $filename .= '.problem'; + } + my $docroot = $r->dir_config('lonDocRoot'); + my @ids=&Apache::lonnet::current_machine_ids(); + if ($env{'form.authorrole'} eq 'author') { + if ($env{'user.author'}) { + if ($env{'user.home'} && grep(/^\Q$env{'user.home'}\E$/,@ids)) { + my $url = "/priv/$env{'user.domain'}/$env{'user.name'}"; + my $path = $docroot.$url; + my $subdir = $env{'form.authorpath'}; + $redirect = &finishnewprob($url,$path,$subdir,$newsubdir,$filename); + } + } + } elsif ($env{'form.authorrole'} eq 'course') { + my $chome = $env{'course.'.$env{'request.course.id'}.'.home'}; + if ($chome && grep(/^\Q$chome\E$/,@ids)) { + my $url = "/priv/$coursedom/$coursenum"; + my $path=$docroot.$url; + my $subdir = $env{'form.authorpath'}; + $redirect = &finishnewprob($url,$path,$subdir,$newsubdir,$filename); + if ($redirect) { + my $rightsfile = 'default.rights'; + my $sourcerights = "$path/$rightsfile"; + &Apache::loncommon::crsauthor_rights($rightsfile,$path,$docroot,$coursenum,$coursedom); + my $targetrights = $docroot."/res/$coursedom/$coursenum/$rightsfile"; + if ((-e $sourcerights) && (-e "$sourcerights.meta")) { + if (!-e "$docroot/res/$coursedom") { + mkdir("$docroot/res/$coursedom",0755); + } + if (!-e "$docroot/res/$coursedom/$coursenum") { + mkdir("$docroot/res/$coursedom/$coursenum",0755); + } + if ((-e "$docroot/res/$coursedom/$coursenum") && (!-e $targetrights)) { + my $nokeyref = &Apache::lonpublisher::getnokey($r->dir_config('lonIncludes')); + my $output = &Apache::lonpublisher::batchpublish($r,$sourcerights,$targetrights,$nokeyref,1); + } + } + my $source = $docroot.$redirect; + if (!-e "$source.meta") { + my $cid = $coursedom.'_'.$coursenum; + my $now = time; + if (open(my $fh,">$source.meta")) { + my $author=$env{'environment.firstname'}.' '. + $env{'environment.middlename'}.' '. + $env{'environment.lastname'}.' '. + $env{'environment.generation'}; + $author =~ s/\s+$//; + my $title = $env{'form.newresourcetitle'}; + $title =~ s/^\s+|\s+$//g; + print $fh <<END; + +<abstract></abstract> +<author>$author</author> +<authorspace>$coursenum:$coursedom</authorspace> +<copyright>custom</copyright> +<creationdate>$now</creationdate> +<customdistributionfile>/res/$coursedom/$coursenum/default.rights</customdistributionfile> +<dependencies></dependencies> +<domain>$coursedom</domain> +<highestgradelevel>0</highestgradelevel> +<keywords></keywords> +<language>notset </language> +<lastrevisiondate>$now</lastrevisiondate> +<lowestgradelevel>0</lowestgradelevel> +<mime>problem</mime> +<modifyinguser>$coursenum:$coursedom</modifyinguser> +<notes></notes> +<obsolete></obsolete> +<obsoletereplacement></obsoletereplacement> +<owner>$coursenum:$coursedom</owner> +<sourceavail></sourceavail> +<standards></standards> +<subject></subject> +<title>$title</title> +END + close($fh); + } + } + } + } + } else { + my ($auname,$audom,$role) = split('___',$env{'form.authorrole'}); + my $rolehome = &Apache::lonnet::homeserver($auname,$audom); + if (grep(/^\Q$rolehome\E$/,@ids)) { + my $now = time; + if (exists($env{'user.role.'.$role.'./'.$audom.'/'.$auname})) { + my ($start,$end) = split(/\./,$env{'user.role.'.$role.'./'.$audom.'/'.$auname}); + if (($start <= $now) && (($end == 0) || ($end >= $now))) { + my $url = "/priv/$audom/$auname"; + my $path = $r->dir_config('lonDocRoot').$url; + my $subdir = $env{'form.authorpath'}; + $redirect = &finishnewprob($url,$path,$subdir,$newsubdir,$filename); + } + } + } + } + } + } + } + return ($redirect,$error); +} + +sub finishnewprob { + my ($url,$path,$subdir,$newsubdir,$filename,$context) = @_; + unless (-d $path) { + unless (mkdir($path,02770)) { + return; + } + } + my $redirect; + if ($subdir ne '/') { + $subdir = &cleandir($subdir); + if (($subdir ne '') && (-d "$path/$subdir")) { + $path .= "/$subdir"; + $url .= "/$subdir"; + } + } + my $dest; + if ($newsubdir ne '') { + $newsubdir = &cleandir($newsubdir); + } + if ($newsubdir ne '') { + if (-d "$path/$newsubdir") { + $dest = "$path/$newsubdir/$filename"; + } else { + my $dirok; + unless (-e "$path/$newsubdir") { + if (mkdir("$path/$newsubdir",02770)) { + if (chmod(02770,"$path/$newsubdir")) { + $dirok = 1; + } + } + } + if ($dirok) { + $dest = "$path/$newsubdir/$filename"; + } + } + if (($dest ne '') && (!-e $dest)) { + $redirect = "$url/$newsubdir/$filename"; + } + } else { + $dest = "$path/$filename"; + if (($dest ne '') && (!-e $dest)) { + $redirect = "$url/$filename"; + } + } + if ((!-e $dest) && ($context ne 'upload')) { + my $template = $env{'form.template'}; + my $copyfrom; + if ($template ne '') { + my %templates; + my @files = &Apache::lonhomework::get_template_list('problem'); + foreach my $poss (@files) { + if (ref($poss) eq 'ARRAY') { + if ($template eq $poss->[0]) { + $templates{$template} = 1; + last; + } + } + } + if ($templates{$template}) { + $copyfrom = $template; + } + } + if ($filename =~ /\.problem$/) { + unless ($copyfrom) { + $copyfrom = $Apache::lonnet::perlvar{'lonIncludes'}.'/templates/blank.problem'; + } + &File::Copy::copy($copyfrom,$dest); + } + } + return $redirect; +} + +sub cleandir { + my ($dir) = @_; + $dir =~ s/^\s+//; + $dir =~ s/\s+$//; + $dir =~ s/\.+//g; + $dir =~ s/[\#\?&%\":]//g; + return $dir; +} + 1; __END__ @@ -8096,7 +9818,7 @@ check on this Verify Content -=item devalidateversioncache() +=item devalidateversioncache() =item checkversions()