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.160.2.2 and 1.160.2.5.2.3

version 1.160.2.2, 2016/09/14 16:48:02	version 1.160.2.5.2.3, 2024/02/28 04:58:02
Line 80 sub handler {	Line 80 sub handler {
}	}
}	}
$thisdisfn=~s/^\Q$docroot\E\/priv//;	$thisdisfn=~s/^\Q$docroot\E\/priv//;

my $resdir=$docroot.'/res'.$thisdisfn; # Resource directory	my $resdir=$docroot.'/res'.$thisdisfn; # Resource directory
my $targetdir='/res'.$thisdisfn; # Publication target directory.	my $targetdir='/res'.$thisdisfn; # Publication target directory.
my $linkdir='/priv'.$thisdisfn; # Full URL name of constr space.	my $linkdir='/priv'.$thisdisfn; # Full URL name of constr space.

my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);	my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);

&startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page.	my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
	my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,
	"$londocroot/priv/$udom/$uname"); # expressed in kB
	my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,
	'author'); # expressed in MB

	# Put out the start of page.
	&startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota);

if (!-d $fn) {	if (!-d $fn) {
if (-e $fn) {	if (-e $fn) {
Line 108 sub handler {	Line 115 sub handler {
return OK;	return OK;
}	}

&dircontrols($r,$uname,$udom,$thisdisfn); # Put out actions for directory,	# Put out actions for directory, browse/upload + new file page.
# browse/upload + new file page.	&dircontrols($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota);
&resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc.	&resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc.

my $numdir = 0;	my $numdir = 0;
Line 187 sub handler {	Line 194 sub handler {
} else { $idx = 2; } # No arrow if column is not sorted	} else { $idx = 2; } # No arrow if column is not sorted
$output .= (($columns{$key}{order}) ?	$output .= (($columns{$key}{order}) ?
'<th'.($columns{$key}{colspan} ? ' colspan="'.$columns{$key}{colspan}.'"' : '')	'<th'.($columns{$key}{colspan} ? ' colspan="'.$columns{$key}{colspan}.'"' : '')
.'><a href="'.$linkdir.'/?sortby='.$key.'&sortorder='	.'><a href="'.$linkdir.'/?sortby='.$key.'&sortorder='
.((($sortby eq $key) && ($sortorder ne 'rev')) ? 'rev' : '').'">'	.((($sortby eq $key) && ($sortorder ne 'rev')) ? 'rev' : '').'">'
.$columns{$key}{text}.$arrows[$idx].'</a></th>' :	.$columns{$key}{text}.$arrows[$idx].'</a></th>' :
'<th>'.$columns{$key}{text}.'</th>');	'<th>'.$columns{$key}{text}.'</th>');
Line 283 sub handler {	Line 290 sub handler {
}	}

# Print the sorted resources	# Print the sorted resources
	my %editors = &Apache::loncommon::permitted_editors();
foreach my $filename (@sorted_files) {	foreach my $filename (@sorted_files) {
if ($filehash->{$filename}->{"cmode"}&$dirptr) { # Directories	if ($filehash->{$filename}->{"cmode"}&$dirptr) { # Directories
&putdirectory($r, $thisdisfn, $linkdir, $filename,	&putdirectory($r, $thisdisfn, $linkdir, $filename,
Line 295 sub handler {	Line 303 sub handler {
$filehash->{$filename}->{"linkfilename"},	$filehash->{$filename}->{"linkfilename"},
$filehash->{$filename}->{"fulltitle"},	$filehash->{$filename}->{"fulltitle"},
$filehash->{$filename}->{"status"},	$filehash->{$filename}->{"status"},
$filehash->{$filename}->{"pubstatus"});	$filehash->{$filename}->{"pubstatus"},
	\%editors);
}	}
}	}

Line 311 sub handler {	Line 320 sub handler {
# - The HTML header	# - The HTML header
# - The H1/H3 stuff which includes the directory.	# - The H1/H3 stuff which includes the directory.
#	#
# startpage($r, $uame, $udom, $thisdisfn);	# startpage($r, $uame, $udom, $thisdisfn, $current_disk_usage, $disk_quota);
# $r - The apache request object.	# $r - The apache request object.
# $uname - User name.	# $uname - User name.
# $udom - Domain name the user is logged in under.	# $udom - Domain name the user is logged in under.
# $thisdisfn - Displayable version of the filename.	# $thisdisfn - Displayable version of the filename.
	# $current_disk_usage - User's current disk usage (in kB).
	# $disk_quota - Disk quota for user's authoring space (in MB).
	# $crstype - Course type, if this is for "course author"

sub startpage {	sub startpage {
my ($r, $uname, $udom, $thisdisfn) = @_;	my ($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota) = @_;
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;

Line 340 sub startpage {	Line 352 sub startpage {
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};	my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,"$londocroot/priv/$udom/$uname");	my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,"$londocroot/priv/$udom/$uname");
my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,'author'); #expressed in MB	my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,'author'); #expressed in MB
$disk_quota = 1000 * $disk_quota; # convert from MB to kB	$disk_quota = 1024 * $disk_quota; # convert from MB to kB

$r->print(&Apache::loncommon::head_subbox(	$r->print(&Apache::loncommon::head_subbox(
'<div style="float:right;padding-top:0;margin-top;0">'	'<div style="float:right;padding-top:0;margin-top;0">'
Line 463 ENDPUBDIRSCRIPT	Line 475 ENDPUBDIRSCRIPT
}	}

sub dircontrols {	sub dircontrols {
my ($r,$uname,$udom,$thisdisfn) = @_;	my ($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota) = @_;
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
cnpd => 'Cannot publish directory',	cnpd => 'Cannot publish directory',
cnrd => 'Cannot retrieve directory',	cnrd => 'Cannot retrieve directory',
Line 499 sub dircontrols {	Line 511 sub dircontrols {
pick => 'Please select an action to perform using the new filename',	pick => 'Please select an action to perform using the new filename',
);	);
my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript	my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript
	# Calculate free space in bytes.
	# $disk_quota is in MB and $current_disk_usage is in kB
	my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage);
$r->print(<<END);	$r->print(<<END);
<div class="LC_columnSection">	<div class="LC_columnSection">
<div>	<div>
Line 515 sub dircontrols {	Line 530 sub dircontrols {
<input type="hidden" name="filename" value="/priv$thisdisfn/" />	<input type="hidden" name="filename" value="/priv$thisdisfn/" />
</fieldset>	</fieldset>
</form>	</form>
<form name="publishdir" method="post" action="/adm/publish" target="_parent">	<form name="publishdir" method="post" action="/adm/publish">
<input type="hidden" name="pubrec" value="" />	<input type="hidden" name="pubrec" value="" />
<input type="hidden" name="filename" value="" />	<input type="hidden" name="filename" value="" />
</form>	</form>
<form name="printdir" method="post" action="/adm/printout" target="_parent">	<form name="printdir" method="post" action="/adm/printout">
<input type="hidden" name="postdata" value="" />	<input type="hidden" name="postdata" value="" />
</form>	</form>
</div>	</div>

<div>	<div style="padding-bottom: 2px">
<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">
<fieldset>	<fieldset>
<legend>$lt{'updc'}</legend>	<legend>$lt{'updc'}</legend>
<input type="hidden" name="filename" value="/priv$thisdisfn/" />	<input type="hidden" name="filename" value="/priv$thisdisfn/" />
<input type="file" name="upfile" size="20" />	<input type="file" name="upfile" class="LC_flUpload" size="20" />
	<input type="hidden" id="LC_free_space" value="$free_space" />
<input type="button" value="$lt{'uplo'}" onclick="checkUpload(this.form)" />	<input type="button" value="$lt{'uplo'}" onclick="checkUpload(this.form)" />
</fieldset>	</fieldset>
</form>	</form>
</div>	</div>

<div>	<div>
<form name="fileaction" method="post" action="/adm/cfile" target="_parent">	<form name="fileaction" method="post" action="/adm/cfile">
<fieldset>	<fieldset>
<legend>$lt{'crea'}</legend>	<legend>$lt{'crea'}</legend>
<span class="LC_nobreak">	<span class="LC_nobreak">
Line 612 END	Line 628 END
sub resourceactions {	sub resourceactions {
my ($r,$uname,$udom,$thisdisfn) = @_;	my ($r,$uname,$udom,$thisdisfn) = @_;
$r->print(<<END);	$r->print(<<END);
<form name="moveresource" action="/adm/cfile" target="_parent" method="post">	<form name="moveresource" action="/adm/cfile" method="post">
<input type="hidden" name="filename" value="" />	<input type="hidden" name="filename" value="" />
<input type="hidden" name="newfilename" value="" />	<input type="hidden" name="newfilename" value="" />
<input type="hidden" name="action" value="" />	<input type="hidden" name="action" value="" />
</form>	</form>
<form name="delresource" action="/adm/cfile" target="_parent" method="post">	<form name="delresource" action="/adm/cfile" method="post">
<input type="hidden" name="filename" value="" />	<input type="hidden" name="filename" value="" />
<input type="hidden" name="action" value="delete" />	<input type="hidden" name="action" value="delete" />
</form>	</form>
<form name="pubresource" action="/adm/publish" target="_parent" method="post">	<form name="pubresource" action="/adm/publish" method="post">
<input type="hidden" name="filename" value="" />	<input type="hidden" name="filename" value="" />
<input type="hidden" name="makeobsolete" value="0" />	<input type="hidden" name="makeobsolete" value="0" />
</form>	</form>
<form name="printresource" action="/adm/printout" target="_parent" method="post">	<form name="printresource" action="/adm/printout" method="post">
<input type="hidden" name="postdata" value="" />	<input type="hidden" name="postdata" value="" />
</form>	</form>
<form name="retrieveres" action="/adm/retrieve" target="_parent" method="post">	<form name="retrieveres" action="/adm/retrieve" method="post">
<input type="hidden" name="filename" value="" />	<input type="hidden" name="filename" value="" />
</form>	</form>
<form name="cleanup" action="/adm/cleanup" target="_parent" method="post">	<form name="cleanup" action="/adm/cleanup" method="post">
<input type="hidden" name="filename" value="" />	<input type="hidden" name="filename" value="" />
</form>	</form>
END	END
Line 709 sub putdirectory {	Line 725 sub putdirectory {
} else {	} else {
$actionitem =	$actionitem =
'<form name="dirselect_'.$$numdir.	'<form name="dirselect_'.$$numdir.
'" action="/adm/publish" target="_parent">'.	'" action="/adm/publish">'.
'<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>'.
Line 728 sub putdirectory {	Line 744 sub putdirectory {
'<td><img src="'.	'<td><img src="'.
$Apache::lonnet::perlvar{'lonIconsURL'}.'/navmap.folder.closed.gif" alt="folder" /></td>'.	$Apache::lonnet::perlvar{'lonIconsURL'}.'/navmap.folder.closed.gif" alt="folder" /></td>'.
'<td>'.$actionitem.'</td>'.	'<td>'.$actionitem.'</td>'.
'<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" target="_parent">'.	'<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/">'.
$disfilename.'</a></span></td>'.	$disfilename.'</a></span></td>'.
'<td colspan="3">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($targetdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});	'<td colspan="3">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($targetdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});
if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {	if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {
Line 854 sub getStatus {	Line 870 sub getStatus {
sub putresource {	sub putresource {
my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir,	my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir,
$linkdir, $cmtime, $size, $numres, $linkfilename, $title,	$linkdir, $cmtime, $size, $numres, $linkfilename, $title,
$status, $pubstatus) = @_;	$status, $pubstatus, $editors) = @_;
&Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);	&Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);

my $editlink='';	my $editlink='';
my $editlink2='';	my $editlink2='';
if ($filename=~/\.(xml\|html\|htm\|xhtml\|xhtm\|sty)$/) {	if ($filename=~/\.(xml\|html\|htm\|xhtml\|xhtm\|sty\|txt\|css\|js)$/) {
$editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=edit">'.&mt('Edit').'</a>)';	$editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=edit">'.&mt('Edit').'</a>)';
}	}
if ($filename=~/$LONCAPA::assess_re/) {	if ($filename=~/$LONCAPA::assess_re/) {
$editlink=' (<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=editxml">'.&mt('EditXML').'</a>)';	if ($editors->{'xml'}) {
$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=edit">'.&mt('Edit').'</a>)';	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=editxml">'.&mt('EditXML').'</a>)';
	}
	if ($editors->{'edit'}) {
	$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=edit">'.&mt('Edit').'</a>)';
	}
	}
	if ($filename=~/\.(xml\|html\|htm\|xhtml\|xhtm)$/ \|\| $filename=~/$LONCAPA::assess_re/) {
	if (($editors->{'daxe'}) &&
	($env{'browser.type'} ne 'explorer' \|\| $env{'browser.version'} > 9)) {
	my $daxeurl = '/daxepage'.$linkdir.'/'.$filename;
	$editlink .= ' (<a href="'.$daxeurl.'">Daxe</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='.$linkfilename.'" target="_parent">'.&mt('Clean Up').')</a>';	$editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'">'.&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='.$linkfilename.'">'.&mt('Decompress').'</a>)';	$editlink=' (<a href="/adm/cfile?decompress='.$linkfilename.'">'.&mt('Decompress').'</a>)';
}	}
my $publish_button = (-e $resdir.'/'.$filename) ? &mt('Re-publish') : &mt('Publish');	my $publish_button = (-e $resdir.'/'.$filename) ? &mt('Re-publish') : &mt('Publish');
my $pub_select = '';	my $pub_select = '';
Line 880 sub putresource {	Line 907 sub putresource {
'<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.	'<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.
'<td>'.$pub_select.'</td>'.	'<td>'.$pub_select.'</td>'.
'<td><span class="LC_filename">'.	'<td><span class="LC_filename">'.
'<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.	'<a href="'.$linkdir.'/'.$filename.'">'.
$filename.'</a></span>'.$editlink2.$editlink.	$filename.'</a></span>'.$editlink2.$editlink.
'</td>'.	'</td>'.
'<td>'.$title.'</td>'.	'<td>'.$title.'</td>'.

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

Removed from v.1.160.2.2
changed lines
	Added in v.1.160.2.5.2.3