version 1.251, 2009/02/11 11:49:22
|
version 1.258.2.3, 2009/11/24 01:11:53
|
Line 384 sub selectbox {
|
Line 384 sub selectbox {
|
my $selout="\n".&Apache::lonhtmlcommon::row_title($title) |
my $selout="\n".&Apache::lonhtmlcommon::row_title($title) |
.'<select name="'.$name.'">'; |
.'<select name="'.$name.'">'; |
foreach (@idlist) { |
foreach (@idlist) { |
$selout.='<option value=\''.$_.'\''; |
$selout.='<option value="'.$_.'"'; |
if ($_ eq $value) { |
if ($_ eq $value) { |
$selout.=' selected>'.&{$functionref}($_).'</option>'; |
$selout.=' selected="selected"'; |
} |
} |
else {$selout.='>'.&{$functionref}($_).'</option>';} |
$selout.='>'.&{$functionref}($_).'</option>'; |
} |
} |
$selout.='</select>'.&Apache::lonhtmlcommon::row_closure(); |
$selout.='</select>'.&Apache::lonhtmlcommon::row_closure(); |
return $selout; |
return $selout; |
Line 1062 sub publish {
|
Line 1062 sub publish {
|
my %oldparmstores=(); |
my %oldparmstores=(); |
|
|
unless ($batch) { |
unless ($batch) { |
$scrout.='<h3>'.&mt('Metadata Information').' ' . |
$scrout.='<h3>'.&mt('Metadata').' ' . |
&Apache::loncommon::help_open_topic("Metadata_Description") |
&Apache::loncommon::help_open_topic("Metadata_Description") |
. '</h3>'; |
. '</h3>'; |
} |
} |
Line 1166 sub publish {
|
Line 1166 sub publish {
|
} |
} |
} |
} |
if ($chparms) { |
if ($chparms) { |
$scrout.='<p><b>'.&mt('Obsolete parameters or saved values').':</b> '. |
$scrout.='<p><b>'.&mt('Obsolete parameters or saved values').':</b> ' |
$chparms.'</p><h1><span class="LC_warning">'.&mt('Warning!'). |
.$chparms.'</p>' |
'</span></h1><p><span class="LC_warning">'. |
.'<p class="LC_warning"><b>'.&mt('Warning!').'</b><br />' |
&mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</span></p><hr />'; |
.&mt('If this resource is in active use, student performance data from the previous version may become inaccessible.') |
|
.'</p><hr />'; |
} |
} |
if ($metadatafields{'copyright'} eq 'priv') { |
if ($metadatafields{'copyright'} eq 'priv') { |
$scrout.='</p><h1><span class="LC_warning">'.&mt('Warning!'). |
$scrout.='<p class="LC_warning"><b>'.&mt('Warning!').'</b><br />' |
'</span></h1><p><span class="LC_warning">'. |
.&mt('Copyright/distribution option "Private" is no longer supported. Select another option from below. Consider "Custom Rights" for maximum control over the usage of your resource.') |
&mt('Copyright/distribution option "Private" is no longer supported. Select another option from below. Consider "Custom Rights" for maximum control over the usage of your resource.').'</span></p><hr />'; |
.'</p><hr />'; |
} |
} |
|
|
# ------------------------------------------------------- Now have all metadata |
# ------------------------------------------------------- Now have all metadata |
Line 1282 END
|
Line 1283 END
|
$keywordout.='<label><input type="checkbox" name="keywords" value="'.$word.'"'; |
$keywordout.='<label><input type="checkbox" name="keywords" value="'.$word.'"'; |
if ($metadatafields{'keywords'}) { |
if ($metadatafields{'keywords'}) { |
if ($metadatafields{'keywords'}=~/\Q$word\E/) { |
if ($metadatafields{'keywords'}=~/\Q$word\E/) { |
$keywordout.=' checked="on"'; |
$keywordout.=' checked="checked"'; |
$env{'form.keywords'}.=$word.','; |
$env{'form.keywords'}.=$word.','; |
} |
} |
} elsif (&Apache::loncommon::keyword($word)) { |
} elsif (&Apache::loncommon::keyword($word)) { |
$keywordout.=' checked="on"'; |
$keywordout.=' checked="checked"'; |
$env{'form.keywords'}.=$word.','; |
$env{'form.keywords'}.=$word.','; |
} |
} |
$keywordout.=' />'.$word.'</label></td>'; |
$keywordout.=' />'.$word.'</label></td>'; |
Line 1401 END
|
Line 1402 END
|
(&Apache::loncommon::source_copyrightids)); |
(&Apache::loncommon::source_copyrightids)); |
# $intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights'); |
# $intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights'); |
my $uctitle=&mt('Obsolete'); |
my $uctitle=&mt('Obsolete'); |
my $obsolete_checked=($metadatafields{'obsolete'})?' checked="1" ':''; |
my $obsolete_checked=($metadatafields{'obsolete'})?' checked="checked"':''; |
$intr_scrout.="\n".&Apache::lonhtmlcommon::row_title($uctitle) |
$intr_scrout.="\n".&Apache::lonhtmlcommon::row_title($uctitle) |
.'<input type="checkbox" name="obsolete" '.$obsolete_checked.'/ >' |
.'<input type="checkbox" name="obsolete"'.$obsolete_checked.' />' |
.&Apache::lonhtmlcommon::row_closure(1); |
.&Apache::lonhtmlcommon::row_closure(1); |
$intr_scrout.=&text_with_browse_field('Suggested Replacement for Obsolete File', |
$intr_scrout.=&text_with_browse_field('Suggested Replacement for Obsolete File', |
'obsoletereplacement', |
'obsoletereplacement', |
Line 1504 sub phasetwo {
|
Line 1505 sub phasetwo {
|
return 0; |
return 0; |
} |
} |
if ($target=~/\.(\d+)\.(\w+)$/) { |
if ($target=~/\.(\d+)\.(\w+)$/) { |
$r->print('<span class="LC_error">'.&mt('Cannot publish versioned resource, FAIL').'</span>'); |
$r->print('<span class="LC_error">'.&mt('Filename of resource contains internal version number. Cannot publish such resources, FAIL').'</span>'); |
return 0; |
return 0; |
} |
} |
} |
} |
Line 1640 sub phasetwo {
|
Line 1641 sub phasetwo {
|
my $srcf=$2; |
my $srcf=$2; |
my $srct=$3; |
my $srct=$3; |
my $srcd=$1; |
my $srcd=$1; |
unless ($srcd=~/^\/home\/httpd\/html\/res/) { |
my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
|
unless ($srcd=~/^\Q$docroot\E\/res/) { |
print $logfile "\nPANIC: Target dir is ".$srcd; |
print $logfile "\nPANIC: Target dir is ".$srcd; |
$r->print( |
$r->print( |
"<span class=\"LC_error\">".&mt('Invalid target directory, FAIL')."</span>"); |
"<span class=\"LC_error\">".&mt('Invalid target directory, FAIL')."</span>"); |
Line 1652 sub phasetwo {
|
Line 1654 sub phasetwo {
|
unlink($srcd.'/'.$filename); |
unlink($srcd.'/'.$filename); |
unlink($srcd.'/'.$filename.'.meta'); |
unlink($srcd.'/'.$filename.'.meta'); |
} else { |
} else { |
if ($filename=~/\Q$srcf\E\.(\d+)\.\Q$srct\E$/) { |
if ($filename=~/^\Q$srcf\E\.(\d+)\.\Q$srct\E$/) { |
$maxversion=($1>$maxversion)?$1:$maxversion; |
$maxversion=($1>$maxversion)?$1:$maxversion; |
} |
} |
} |
} |
} |
} |
closedir(DIR); |
closedir(DIR); |
$maxversion++; |
$maxversion++; |
$r->print('<p>Creating old version '.$maxversion.'</p>'); |
$r->print('<p>'.&mt('Creating old version [_1]',$maxversion).'</p>'); |
print $logfile "\nCreating old version ".$maxversion."\n"; |
print $logfile "\nCreating old version ".$maxversion."\n"; |
|
|
my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct; |
my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct; |
Line 1708 sub phasetwo {
|
Line 1710 sub phasetwo {
|
$path.="/$parts[$count]"; |
$path.="/$parts[$count]"; |
if ((-e $path)!=1) { |
if ((-e $path)!=1) { |
print $logfile "\nCreating directory ".$path; |
print $logfile "\nCreating directory ".$path; |
$r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>'); |
|
mkdir($path,0777); |
mkdir($path,0777); |
|
$r->print('<p>' |
|
.&mt('Created directory [_1]' |
|
,'<span class="LC_filename">'.$parts[$count].'</span>') |
|
.'</p>' |
|
); |
} |
} |
} |
} |
|
|
Line 1741 sub phasetwo {
|
Line 1747 sub phasetwo {
|
# ------------------------------------------------------------- Trigger updates |
# ------------------------------------------------------------- Trigger updates |
push(@{$modified_urls},[$target,$source]); |
push(@{$modified_urls},[$target,$source]); |
unless ($registered_cleanup) { |
unless ($registered_cleanup) { |
$r->register_cleanup(\¬ify); |
my $handlers = $r->get_handlers('PerlCleanupHandler'); |
|
$r->set_handlers('PerlCleanupHandler' => [\¬ify,@{$handlers}]); |
$registered_cleanup=1; |
$registered_cleanup=1; |
} |
} |
|
|
Line 1752 sub phasetwo {
|
Line 1759 sub phasetwo {
|
&Apache::lonnet::devalidate_cache_new('meta', |
&Apache::lonnet::devalidate_cache_new('meta', |
&Apache::lonnet::declutter($thisdistarget)); |
&Apache::lonnet::declutter($thisdistarget)); |
|
|
|
# ------------------------------------------------------------- Everything done |
|
$logfile->close(); |
|
$r->print('<p class="LC_success">'.&mt('Done').'</p>'); |
|
|
# ------------------------------------------------ Provide link to new resource |
# ------------------------------------------------ Provide link to new resource |
unless ($batch) { |
unless ($batch) { |
|
|
my $thissrc=$source; |
my $thissrc=$source; |
$thissrc=~s{^/home/($match_username)/public_html}{/priv/$1}; |
$thissrc=~s{^/home/($match_username)/public_html}{/priv/$1}; |
|
|
my $thissrcdir=$thissrc; |
my $thissrcdir=$thissrc; |
$thissrcdir=~s/\/[^\/]+$/\//; |
$thissrcdir=~s/\/[^\/]+$/\//; |
|
|
|
unless ($env{'request.role'} =~ /^aa/) { |
$r->print( |
$r->print( |
'<hr /><a href="'.$thisdistarget.'"><font size="+2">'. |
'<hr /><a href="'.$thisdistarget.'"><font size="+2">'. |
&mt('View Published Version').'</font></a>'. |
&mt('View Published Version').'</font></a>'); |
'<p><a href="'.$thissrc.'"><font size="+2">'. |
} |
|
$r->print('<p><a href="'.$thissrc.'"><font size="+2">'. |
&mt('Back to Source').'</font></a></p>'. |
&mt('Back to Source').'</font></a></p>'. |
'<p><a href="'.$thissrcdir. |
'<p><a href="'.$thissrcdir. |
'"><font size="+2">'. |
'"><font size="+2">'. |
&mt('Back to Source Directory').'</font></a></p>'); |
&mt('Back to Source Directory').'</font></a></p>'); |
} |
} |
$logfile->close(); |
|
$r->print('<p><font color="green">'.&mt('Done').'</font></p>'); |
|
return 1; |
return 1; |
} |
} |
|
|
Line 1839 sub batchpublish {
|
Line 1848 sub batchpublish {
|
|
|
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
|
|
$r->print('<h2>'.&mt('Publishing').' <tt>'.$thisdisfn.'</tt></h2>'); |
$r->print('<h2>' |
|
.&mt('Publishing [_1]' |
|
,'<span class="LC_filename">'.$thisdisfn.'</span>') |
|
.'</h2>' |
|
); |
|
|
# phase one takes |
# phase one takes |
# my ($source,$target,$style,$batch)=@_; |
# my ($source,$target,$style,$batch)=@_; |
Line 1866 sub publishdirectory {
|
Line 1879 sub publishdirectory {
|
my $resdir= |
my $resdir= |
$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'. |
$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'. |
$thisdisfn; |
$thisdisfn; |
$r->print('<h1>'.&mt('Directory').' <tt>'.$thisdisfn.'</tt></h1>'. |
$r->print(&Apache::lonhtmlcommon::start_pick_box() |
&mt('Target').': <tt>'.$resdir.'</tt><br />'); |
.&Apache::lonhtmlcommon::row_title(&mt('Directory')) |
|
.'<span class="LC_filename">'.$thisdisfn.'</span>' |
|
.&Apache::lonhtmlcommon::row_closure() |
|
.&Apache::lonhtmlcommon::row_title(&mt('Target')) |
|
.'<span class="LC_filename">'.$resdir.'</span>' |
|
); |
|
|
my $dirptr=16384; # Mask indicating a directory in stat.cmode. |
my $dirptr=16384; # Mask indicating a directory in stat.cmode. |
unless ($env{'form.phase'} eq 'two') { |
unless ($env{'form.phase'} eq 'two') { |
# ask user what they want |
# ask user what they want |
|
$r->print(&Apache::lonhtmlcommon::row_closure() |
|
.&Apache::lonhtmlcommon::row_title(&mt('Options')) |
|
); |
$r->print('<form name="pubdirpref" method="post">'. |
$r->print('<form name="pubdirpref" method="post">'. |
&hiddenfield('phase','two'). |
&hiddenfield('phase','two'). |
&hiddenfield('filename',$env{'form.filename'}). |
&hiddenfield('filename',$env{'form.filename'}). |
Line 1880 sub publishdirectory {
|
Line 1901 sub publishdirectory {
|
&checkbox('obsolete','make file(s) obsolete'). |
&checkbox('obsolete','make file(s) obsolete'). |
&checkbox('forceoverride','force directory level metadata over existing'). |
&checkbox('forceoverride','force directory level metadata over existing'). |
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
|
$r->print(&Apache::lonhtmlcommon::row_closure(1) |
|
.&Apache::lonhtmlcommon::end_pick_box() |
|
); |
$lock=0; |
$lock=0; |
} else { |
} else { |
|
$r->print(&Apache::lonhtmlcommon::row_closure(1) |
|
.&Apache::lonhtmlcommon::end_pick_box() |
|
); |
unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); } |
unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); } |
# actually publish things |
# actually publish things |
opendir(DIR,$fn); |
opendir(DIR,$fn); |
Line 1961 sub defaultmetapublish {
|
Line 1988 sub defaultmetapublish {
|
for ($count=5;$count<$#parts;$count++) { |
for ($count=5;$count<$#parts;$count++) { |
$path.="/$parts[$count]"; |
$path.="/$parts[$count]"; |
if ((-e $path)!=1) { |
if ((-e $path)!=1) { |
$r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>'); |
|
mkdir($path,0777); |
mkdir($path,0777); |
|
$r->print('<p>' |
|
.&mt('Created directory [_1]' |
|
,'<span class="LC_filename">'.$parts[$count].'</span>') |
|
.'</p>' |
|
); |
} |
} |
} |
} |
|
|
Line 2169 sub handler {
|
Line 2200 sub handler {
|
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
if ($thistype eq 'page') { $thisembstyle = 'rat'; } |
if ($thistype eq 'page') { $thisembstyle = 'rat'; } |
|
|
$r->print('<h2>'.&mt('Publishing [_1]','<tt>'.$thisdisfn.'</tt>').'</h2>'); |
$r->print('<h2>' |
|
.&mt('Publishing [_1]' |
|
,'<span class="LC_filename">'.$thisdisfn.'</span>') |
|
.'</h2>' |
|
); |
|
|
$r->print('<h3>'.&mt('Resource Details').'</h3>'); |
$r->print('<h3>'.&mt('Resource Details').'</h3>'); |
|
|
Line 2198 ENDCAPTION
|
Line 2233 ENDCAPTION
|
$r->print(&Apache::lonhtmlcommon::row_closure() |
$r->print(&Apache::lonhtmlcommon::row_closure() |
.&Apache::lonhtmlcommon::row_title(&mt('Co-Author')) |
.&Apache::lonhtmlcommon::row_title(&mt('Co-Author')) |
.'<span class="LC_warning">' |
.'<span class="LC_warning">' |
.&mt('[_1] at [_2]',$cuname,$cudom) |
.&Apache::loncommon::plainname($cuname,$cudom) .' ('.$cuname.':'.$cudom.')' |
.'</span>' |
.'</span>' |
); |
); |
} |
} |