--- loncom/publisher/lonpubdir.pm 2017/04/02 21:58:53 1.160.2.3 +++ loncom/publisher/lonpubdir.pm 2024/02/28 04:58:02 1.160.2.5.2.3 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Authoring Space Directory Lister # -# $Id: lonpubdir.pm,v 1.160.2.3 2017/04/02 21:58:53 raeburn Exp $ +# $Id: lonpubdir.pm,v 1.160.2.5.2.3 2024/02/28 04:58:02 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -80,14 +80,21 @@ sub handler { } } $thisdisfn=~s/^\Q$docroot\E\/priv//; - + my $resdir=$docroot.'/res'.$thisdisfn; # Resource directory my $targetdir='/res'.$thisdisfn; # Publication target directory. my $linkdir='/priv'.$thisdisfn; # Full URL name of constr space. 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 (-e $fn) { @@ -108,8 +115,8 @@ sub handler { return OK; } - &dircontrols($r,$uname,$udom,$thisdisfn); # Put out actions for directory, - # browse/upload + new file page. + # Put out actions for directory, 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. my $numdir = 0; @@ -187,7 +194,7 @@ sub handler { } else { $idx = 2; } # No arrow if column is not sorted $output .= (($columns{$key}{order}) ? '' .$columns{$key}{text}.$arrows[$idx].'' : ''.$columns{$key}{text}.''); @@ -283,6 +290,7 @@ sub handler { } # Print the sorted resources + my %editors = &Apache::loncommon::permitted_editors(); foreach my $filename (@sorted_files) { if ($filehash->{$filename}->{"cmode"}&$dirptr) { # Directories &putdirectory($r, $thisdisfn, $linkdir, $filename, @@ -295,7 +303,8 @@ sub handler { $filehash->{$filename}->{"linkfilename"}, $filehash->{$filename}->{"fulltitle"}, $filehash->{$filename}->{"status"}, - $filehash->{$filename}->{"pubstatus"}); + $filehash->{$filename}->{"pubstatus"}, + \%editors); } } @@ -311,14 +320,17 @@ sub handler { # - The HTML header # - 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. # $uname - User name. # $udom - Domain name the user is logged in under. # $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 { - my ($r, $uname, $udom, $thisdisfn) = @_; + my ($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota) = @_; &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -340,7 +352,7 @@ sub startpage { my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; 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 - $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( '
' @@ -463,7 +475,7 @@ ENDPUBDIRSCRIPT } sub dircontrols { - my ($r,$uname,$udom,$thisdisfn) = @_; + my ($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota) = @_; my %lt=&Apache::lonlocal::texthash( cnpd => 'Cannot publish directory', cnrd => 'Cannot retrieve directory', @@ -499,6 +511,9 @@ sub dircontrols { pick => 'Please select an action to perform using the new filename', ); 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(<
@@ -515,28 +530,29 @@ sub dircontrols { -
+
-
+
-
+
$lt{'updc'} - + +
-
+
$lt{'crea'} @@ -612,26 +628,26 @@ END sub resourceactions { my ($r,$uname,$udom,$thisdisfn) = @_; $r->print(< + -
+
-
+
-
+
-
+
-
+
END @@ -709,7 +725,7 @@ sub putdirectory { } else { $actionitem = '
'. + '" action="/adm/publish">'. '