loncom/publisher/lonpubdir.pm - diff

Return to lonpubdir.pm CVS log

Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/lonpubdir.pm between versions 1.82 and 1.97

version 1.82, 2005/05/28 02:18:03	version 1.97, 2006/11/22 20:50:44
Line 36 use Apache::Constants qw(:common :http :	Line 36 use Apache::Constants qw(:common :http :
use Apache::loncacc;	use Apache::loncacc;
use Apache::loncommon();	use Apache::loncommon();
use Apache::lonhtmlcommon();	use Apache::lonhtmlcommon();
	use Apache::londiff();
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::lonmsg;	use Apache::lonmsg;
use Apache::lonmenu;	use Apache::lonmenu;
Line 104 sub handler {	Line 105 sub handler {

# Start off the directory table.	# Start off the directory table.
$r->print('<h3>Directory Contents:</h3>');	$r->print('<h3>Directory Contents:</h3>');
$r->print('<table border="0" cellspacing="2" cellpadding="2"><tr>'.	$r->print('<table id="LC_browser"><tr>'.
'<th bgcolor="#DDDDDD">'.&mt('Type').'</th>'.	'<th>'.&mt('Type').'</th>'.
'<th bgcolor="#DDDDDD">'.&mt('Actions').'</th>'.	'<th>'.&mt('Actions').'</th>'.
'<th bgcolor="#DDDDDD">'.&mt('Name').'</th>'.	'<th>'.&mt('Name').'</th>'.
'<th bgcolor="#DDDDDD">'.&mt('Title').'</th>'.	'<th>'.&mt('Title').'</th>'.
'<th bgcolor="#DDDDDD">'.&mt('Status').'</th>'.	'<th>'.&mt('Status').'</th>'.
'<th bgcolor="#DDDDDD">'.&mt('Last Modified').	'<th>'.&mt('Last Modified').
'</th></tr>');	'</th></tr>'."\n");

my $filename;	my $filename;
my $dirptr=16384; # Mask indicating a directory in stat.cmode.	my $dirptr=16384; # Mask indicating a directory in stat.cmode.
Line 137 sub handler {	Line 138 sub handler {
}	}
closedir(DIR);	closedir(DIR);

$r->print('</table></body></html>');	$r->print('</table>'.&Apache::loncommon::end_page());
return OK;	return OK;
}	}
#	#
Line 191 sub startpage {	Line 192 sub startpage {
my $currdir = '/priv/'.$uname.$thisdisfn;	my $currdir = '/priv/'.$uname.$thisdisfn;
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;
my $html=&Apache::lonxml::xmlbegin();
$r->print($html.'<head><title>LON-CAPA Construction Space</title></head>');

my $pagetitle;
my $formaction='/priv/'.$uname.$thisdisfn.'/';	my $formaction='/priv/'.$uname.$thisdisfn.'/';
$formaction=~s/\/+/\//g;	$formaction=~s\|/+\|/\|g;
$pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring').	my $pagetitle .= &Apache::loncommon::help_open_menu('','',3,'Authoring').
'<font face="Arial, Helvetica, sans-serif" size="+1"><b>Construction Space</b>:</font> '.	'<font face="Arial, Helvetica, sans-serif" size="+1"><b>Construction Space</b>:</font> '.
'<form name="dirs" method="post" action="'.$formaction.	'<form name="dirs" method="post" action="'.$formaction.
'" target="_parent"><tt><b>'.	'" target="_parent"><tt><b>'.
Line 208 sub startpage {	Line 206 sub startpage {
&Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);	&Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
if ($env{'environment.remote'} eq 'off') {	if ($env{'environment.remote'} eq 'off') {
$env{'request.noversionuri'}=$currdir.'/';	$env{'request.noversionuri'}=$currdir.'/';
$r->print(&Apache::loncommon::bodytag('Construction Space',undef,undef,undef,undef,undef,$pagetitle));	$r->print(&Apache::loncommon::start_page('Construction Space',undef,
	{'body_title' =>
	$pagetitle,}));
} else {	} else {
	$r->print(&Apache::loncommon::start_page('Construction Space',undef));
$r->print($pagetitle);	$r->print($pagetitle);
}	}

my $pubdirscript=(<<ENDPUBDIRSCRIPT);	my $pubdirscript=(<<ENDPUBDIRSCRIPT);
<script type="text/javascript">	<script type="text/javascript">
top.document.title = '$thisdisfn/ - LON-CAPA Construction Space';	top.document.title = '$thisdisfn/ - LON-CAPA Construction Space';
Line 233 parent.lastknownpriv='/~$uname$thisdisfn	Line 235 parent.lastknownpriv='/~$uname$thisdisfn
document.printdir.postdata.value=theform.filename.value	document.printdir.postdata.value=theform.filename.value
document.printdir.submit();	document.printdir.submit();
}	}
	if (theform.dirtask.options[theform.dirtask.selectedIndex].value == "delete") {
	var delform = document.delresource
	delform.filename.value = theform.filename.value
	delform.submit()
	}
}	}

function checkUpload(theform) {	function checkUpload(theform) {
Line 259 parent.lastknownpriv='/~$uname$thisdisfn	Line 266 parent.lastknownpriv='/~$uname$thisdisfn
theform.postdata.value = theform.filename.value	theform.postdata.value = theform.filename.value
theform.submit()	theform.submit()
}	}
	if (theform.diraction.options[theform.diraction.selectedIndex].value == "delete") {
	var delform = document.delresource
	delform.filename.value = theform.filename.value
	delform.submit()
	}
return	return
}	}
function SetResChoice(theform) {	function SetResChoice(theform) {
Line 297 parent.lastknownpriv='/~$uname$thisdisfn	Line 309 parent.lastknownpriv='/~$uname$thisdisfn
return	return
}	}
function changename(theform,activity) {	function changename(theform,activity) {
var newname=prompt('New Name');	var oldname=theform.dispfilename.value;
if (newname == "" \|\| !newname) {	var newname=prompt('New Name',oldname);
	if (newname == "" \|\| !newname \|\| newname == oldname) {
return	return
}	}
document.moveresource.newfilename.value = newname	document.moveresource.newfilename.value = newname
Line 319 ENDPUBDIRSCRIPT	Line 332 ENDPUBDIRSCRIPT

sub dircontrols {	sub dircontrols {
my ($r,$uname,$udom,$thisdisfn) = @_;	my ($r,$uname,$udom,$thisdisfn) = @_;
	my %lt=&Apache::lonlocal::texthash(
	cnpd => 'Cannot publish directory',
	cnrd => 'Cannot retrieve directory',
	mcdi => 'Must create new subdirectory inside a directory',
	pubr => 'Publish this Resource',
	pubd => 'Publish this Directory',
	dedr => 'Delete Directory',
	rtrv => 'Retrieve Old Version',
	list => 'List Directory',
	uplo => 'Upload file',
	dele => 'Delete',
	edit => 'Edit Catalog Information',
	sela => 'Select Action',
	nfil => 'New file',
	nhtm => 'New HTML file',
	nprb => 'New problem',
	npag => 'New assembled page',
	nseq => 'New assembled sequence',
	ncrf => 'New custom rights file',
	nsty => 'New style file',
	nlib => 'New library file',
	nsub => 'New subdirectory',
	renm => 'Rename current file to',
	move => 'Move current file to',
	copy => 'Copy current file to',
	type => 'Type Name Here',
	go => 'Go',
	prnt => 'Print contents of directory',
	crea => 'Create a new directory or LON-CAPA document',
	acti => 'Actions for current directory',
	updc => 'Upload a new document'
	);
$r->print(<<END);	$r->print(<<END);
<table cellspacing="4" cellpadding="4" width="100%">	<table id="LC_cstr_controls">
<tr>	<tr>
<td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Actions for current directory</b></font></td>	<th>$lt{'acti'}</th>
<td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Upload a new document</b></font></td>	<th>$lt{'updc'}</th>
<td bgcolor="#DDDDDD" align="middle"><font face="Arial, Helvetica, sans-serif" size="-1"><b>Create a new directory or LON-CAPA document</b></font></td>	<th>$lt{'crea'}</th>
</tr>	</tr>
<tr>	<tr>
<td bgcolor="#ccddaa" valign="top" align="center">	<td>
<form name="curractions" method="post" action="">	<form name="curractions" method="post" action="">
<select name="dirtask" onChange="currdiract(this.form)">	<select name="dirtask" onchange="currdiract(this.form)">
<option>Select action</option>	<option>$lt{'sela'}</option>
<option value="publish">Publish directory</option>	<option value="publish">$lt{'pubd'}</option>
<option value="editcat">Edit catalog information</option>	<option value="editcat">$lt{'edit'}</option>
<option value="printdir">Print contents of directory</option>	<option value="printdir">$lt{'prnt'}</option>
	<option value="delete">$lt{'dedr'}</option>
</select>	</select>
<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />	<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
</form>	</form>
Line 345 sub dircontrols {	Line 391 sub dircontrols {
<input type="hidden" name="postdata" value="" />	<input type="hidden" name="postdata" value="" />
</form>	</form>
</td>	</td>
<td bgcolor="#ccddaa" valign="top" align="center">	<td>
<form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">	<form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />	<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
<input type="file" name="upfile" size="20" />	<input type="file" name="upfile" size="20" />
<input type="button" value="Upload file" onclick="checkUpload(this.form)" />	<input type="button" value="$lt{'uplo'}" onclick="checkUpload(this.form)" />
</form>	</form>
</td>	</td>
<td bgcolor="#ccddaa" align="center">	<td>
<form name="fileaction" method="post" action="/adm/cfile" target="_parent">	<form name="fileaction" method="post" action="/adm/cfile" target="_parent">
<nobr>	<span style="white-space: nowrap">
<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />	<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
<select name="action">	<select name="action">
<option>Select Action</option>	<option value="Select Action">$lt{'sela'}</option>
<option value="newfile">New file:</option>	<option value="newfile">$lt{'nfil'}:</option>
<option value="newhtmlfile">New HTML file:</option>	<option value="newhtmlfile">$lt{'nhtm'}:</option>
<option value="newproblemfile">New problem:</option>	<option value="newproblemfile">$lt{'nprb'}:</option>
<option value="newpagefile">New assembled page:</option>	<option value="newpagefile">$lt{'npag'}:</option>
<option value="newsequencefile">New assembled sequence:</option>	<option value="newsequencefile">$lt{'nseq'}:</option>
<option value="newrightsfile">New custom rights file:</option>	<option value="newrightsfile">$lt{'ncrf'}:</option>
<option value="newstyfile">New style file:</option>	<option value="newstyfile">$lt{'nsty'}:</option>
<option value="newdir">New subdirectory:</option>	<option value="newlibraryfile">$lt{'nlib'}:</option>
	<option value="newdir">$lt{'nsub'}:</option>
</select> <input type="text" name="newfilename" value="Type Name Here" onfocus="if (this.value == 'Type Name Here') this.value=''" /> <input type="button" value="Go" onclick="document.fileaction.submit()" />	</select> <input type="text" name="newfilename" value="Type Name Here" onfocus="if (this.value == 'Type Name Here') this.value=''" /> <input type="button" value="Go" onclick="document.fileaction.submit()" />
</nobr>	</span>
</form>	</form>
</td>	</td>
</tr>	</tr>
Line 381 sub pubbuttons {	Line 428 sub pubbuttons {
'<table><tr><td><input type="hidden" name="filename" value="/~'.	'<table><tr><td><input type="hidden" name="filename" value="/~'.
$uname.$thisdisfn.'/" />'.	$uname.$thisdisfn.'/" />'.
'<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.	'<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.
'<input type="button" onClick="window.location='."'/~".	'<input type="button" onclick="window.location='."'/~".
$uname.$thisdisfn."/default.meta'".'" value="'.	$uname.$thisdisfn."/default.meta'".'" value="'.
&mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');	&mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');
}	}
Line 480 sub putdirectory {	Line 527 sub putdirectory {
$actionitem =	$actionitem =
'<form name="dirselect_'.$$numdir.	'<form name="dirselect_'.$$numdir.
'" action="/adm/publish" target="_parent">'.	'" action="/adm/publish" target="_parent">'.
'<select name="diraction" onChange="SetPubDir(this.form,document)">'.	'<select name="diraction" onchange="SetPubDir(this.form,document)">'.
'<option selected="selected">'.&mt('Select action').'</option>'.	'<option selected="selected">'.&mt('Select action').'</option>'.
'<option value="open">'.&mt('Open').'</option>'.	'<option value="open">'.&mt('Open').'</option>'.
'<option value="publish">'.&mt('Publish').'</option>'.	'<option value="publish">'.&mt('Publish').'</option>'.
'<option value="publishsub">'.&mt('Publish with subdirectories').'</option>'.
'<option value="editcat">'.&mt('Edit catalog information').'</option>'.	'<option value="editcat">'.&mt('Edit catalog information').'</option>'.
'<option value="printdir">'.&mt('Print directory').'</option>'.	'<option value="printdir">'.&mt('Print directory').'</option>'.
	'<option value="delete">'.&mt('Delete directory').'</option>'.
'</select>'.	'</select>'.
'<input type="hidden" name="filename" value="'.$dirpath.'/'.$dirname.'/" />'.	'<input type="hidden" name="filename" value="'.&HTML::Entities::encode($dirpath.'/'.$dirname,'<>&"').'/" />'.
'<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.	'<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.
'<input type="hidden" name="postdata" value="" />'.	'<input type="hidden" name="postdata" value="" />'.
'</form>';	'</form>';
$$numdir ++;	$$numdir ++;
}	}
$r->print('<tr bgcolor="#CCCCFF">'.	$r->print('<tr class="LC_browser_folder">'.
'<td><img src="'.	'<td><img src="'.
$Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" /></td>'.	$Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" alt="folder" /></td>'.
'<td>'.$actionitem.'</td>'.	'<td>'.$actionitem.'</td>'.
'<td><font face="arial"><a href="'.$here.'/'.$dirname.'/" target="_parent">'.	'<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" target="_parent">'.
$disfilename.'</a></font></td>'.	$disfilename.'</a></span></td>'.
'<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.	'<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});
$Apache::lonpublisher::metadatafields{'subject'}.'</i> '.	if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {
$Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.	$r->print(' <i>'.
	$Apache::lonpublisher::metadatafields{'subject'}.
	'</i> ');
	}
	$r->print($Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
'<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.	'<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
"</tr>\n");	"</tr>\n");
}	}
Line 518 sub putresource {	Line 569 sub putresource {
&Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);	&Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
my $pubstatus = 'unpublished';	my $pubstatus = 'unpublished';
my $status=&mt('Unpublished');	my $status=&mt('Unpublished');
my $bgcolor='#FFAA99';	my $css_class='LC_browser_file';
my $title=' ';	my $title=' ';
my $publish_button=&mt('Publish');	my $publish_button=&mt('Publish');
	my $cstr_dir = '/home/'.$uname.'/public_html/'.$thisdisfn.'/';
# my $action_buttons=	# my $action_buttons=
# '<br /><a target="_parent" href="/adm/cfile?action=delete&filename=/~'.	# '<br /><a target="_parent" href="/adm/cfile?action=delete&filename=/~'.
# $uname.'/'.$thisdisfn.'/'.$filename.'">'.	# $uname.'/'.$thisdisfn.'/'.$filename.'">'.
# &mt('Delete').'</a>';	# &mt('Delete').'</a>';
if (-e $resdir.'/'.$filename) {	if (-e $resdir.'/'.$filename) {
	my $same=0;
my ($rdev,$rino,$rmode,$rnlink,	my ($rdev,$rino,$rmode,$rnlink,
$ruid,$rgid,$rrdev,$rsize,	$ruid,$rgid,$rrdev,$rsize,
$ratime,$rmtime,$rctime,	$ratime,$rmtime,$rctime,
$rblksize,$rblocks)=stat($resdir.'/'.$filename);	$rblksize,$rblocks)=stat($resdir.'/'.$filename);
	if ($rmtime>=$cmtime) {
	$same=1;
	} else {
	if (&Apache::londiff::are_different_files($resdir.'/'.$filename,
	$cstr_dir.'/'.$filename)) {
	$same=0;
	} else {
	$same=1;
	}
	}
	my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9];
	my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
	my $meta_same = 1;
	if ($meta_rmtime < $meta_cmtime
	&& &Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta',
	$cstr_dir.'/'.$filename.'.meta')) {
	$meta_same = 0;
	}
$publish_button=&mt('Re-publish');	$publish_button=&mt('Re-publish');
if ($rmtime>=$cmtime) {	my $rights_status =
$pubstatus = 'published';	&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
$status=&mt('Published').'<br />'.	&mt(&getSourceRightString($targetdir.'/'.$filename));
&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.	$title = '<a href="/res/'.$targetdir.'/'.$filename.
&mt(&getSourceRightString($targetdir.'/'.$filename));	'.meta" target="cat">'.
$bgcolor='#CCFF88';	&getTitleString($targetdir.'/'.$filename).'</a>';
	&Apache::lonnet::logthis("same $same meta $meta_same");
	if ($same) {
if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {	if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
$pubstatus = 'obsolete';	$pubstatus = 'obsolete';
$status=&mt('Obsolete');	$status=&mt('Obsolete');
$bgcolor='#AAAAAA';	} else {
}	if (!$meta_same) {
	$pubstatus = 'metamodified';
	} else {
	$pubstatus = 'published';
	}
	$status=&mt('Published').
	'<br />'. $rights_status;
	}
# } else {	# } else {
# $action_buttons='';	# $action_buttons='';
# }	# }
$title='<a href="/res/'.$targetdir.'/'.$filename.
'.meta" target="cat">'.
&getTitleString($targetdir.'/'.$filename).'</a>';
} else {	} else {
$pubstatus = 'modified';	$pubstatus = 'modified';
$status=&mt('Modified').'<br />'.	$status=&mt('Modified').
&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.	'<br />'. $rights_status;
&mt(&getSourceRightString($targetdir.'/'.$filename));
$bgcolor='#FFFF77';
# $action_buttons='';	# $action_buttons='';
$title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target="cat">'.
&getTitleString($targetdir.'/'.$filename).'</a>';
if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {	if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
$status.='<br /><a href="/adm/diff?filename=/~'.$uname.	$status.='<br /><a href="/adm/diff?filename=/~'.$uname.
$thisdisfn.'/'.$filename.	$thisdisfn.'/'.$filename.
'&versiontwo=priv" target="cat">'.&mt('Diffs').'</a>';	'&versiontwo=priv" target="cat">'.&mt('Diffs').'</a>';
}	}
}	}

$title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'.	$title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'.
($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" />':'Edit Metadata').'</a>';	($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="bomb" />':'Edit Metadata').'</a>';

	if (!$meta_same) {
	$title = &mt('Metadata Modified').'<br />'.$title.
	'<br /><a href="/adm/diff?filename=/~'.$uname.
	$thisdisfn.'/'.$filename.'.meta'.
	'&versiontwo=priv" target="cat">'.&mt('Metadata Diffs').'</a>';
	$title.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
	$thisdisfn.'/'.$filename.'.meta" target="_parent">'.&mt('Retrieve Metadata').'</a>';
	}
$status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.	$status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
$thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';	$thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';
}	}
Line 578 sub putresource {	Line 661 sub putresource {
$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_parent">'.&mt('Edit').'</a>)';	$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_parent">'.&mt('Edit').'</a>)';
}	}
if ($filename=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|xml\|html\|htm\|xhtml\|xhtm\|sty)$/) {	if ($filename=~/\.(problem\|exam\|quiz\|assess\|survey\|form\|library\|xml\|html\|htm\|xhtml\|xhtm\|sty)$/) {
$editlink.='<a href="/adm/cleanup?filename=/~'.$uname.	$editlink.=' (<a href="/adm/cleanup?filename=/~'.$uname.
$thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Clean Up').'</a>';	$thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Clean Up').')</a>';
}	}
if ($filename=~/\.(zip\|tar\|bz2\|gz\|tar.gz\|tar.bz2\|tgz)$/) {	if ($filename=~/\.(zip\|tar\|bz2\|gz\|tar.gz\|tar.bz2\|tgz)$/) {
$editlink=' (<a target="_parent" href="/adm/cfile?decompress=/~'.	$editlink=' (<a target="_parent" href="/adm/cfile?decompress=/~'.
Line 587 sub putresource {	Line 670 sub putresource {
}	}
my $pub_select = '';	my $pub_select = '';
&create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);	&create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
$r->print('<tr bgcolor="'.$bgcolor.'">'.	$r->print('<tr class="LC_browser_file_'.$pubstatus.'">'.
'<td>'.($filename=~/[\#\~]$/?' ':	'<td>'.($filename=~/[\#\~]$/?' ':
'<img src="'.&Apache::loncommon::icon($filename).'" /></td>').	'<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.
'<td>'.$pub_select.'</td>'.	'<td>'.$pub_select.'</td>'.
'<td><font face="arial">'.	'<td><span class="LC_filename"> '.
'<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.	'<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.
$filename.'</a></font>'.$editlink2.$editlink.	$filename.'</a></span>'.$editlink2.$editlink.
'</td>'.	'</td>'.
'<td>'.$title.'</td>'.	'<td>'.$title.'</td>'.
'<td>'.$status.'</td>'.	'<td>'.$status.'</td>'.
Line 606 sub create_pubselect {	Line 689 sub create_pubselect {
my ($r,$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres) = @_;	my ($r,$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres) = @_;
$$pub_select = '	$$pub_select = '
<form name="resselect_'.$$numres.'" action="">	<form name="resselect_'.$$numres.'" action="">
<select name="reschoice" onChange="SetResChoice(this.form)">	<select name="reschoice" onchange="SetResChoice(this.form)">
<option>'.&mt('Select action').'</option>'.	<option>'.&mt('Select action').'</option>'.
'<option value="copy">'.&mt('Copy').'</option>';	'<option value="copy">'.&mt('Copy').'</option>';
if ($pubstatus eq 'obsolete' \|\| $pubstatus eq 'unpublished') {	if ($pubstatus eq 'obsolete' \|\| $pubstatus eq 'unpublished') {
Line 630 sub create_pubselect {	Line 713 sub create_pubselect {
'<option value="print">'.&mt('Print').'</option>'.	'<option value="print">'.&mt('Print').'</option>'.
'</select>	'</select>
<input type="hidden" name="filename" value="/~'.	<input type="hidden" name="filename" value="/~'.
$uname.$thisdisfn.'/'.$filename.'" /></form>';	&HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" />
	<input type="hidden" name="dispfilename" value="'.
	&HTML::Entities::encode($filename).'"</form>';
$$numres ++;	$$numres ++;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.82
changed lines
	Added in v.1.97