|
version 1.179, 2023/07/13 21:41:40
|
version 1.180, 2023/07/14 18:01:23
|
|
Line 48 sub handler {
|
Line 48 sub handler {
|
| |
|
| # Validate access to the construction space and get username:domain. |
# Validate access to the construction space and get username:domain. |
| |
|
| my ($uname,$udom)=&Apache::lonnet::constructaccess($r->uri); |
my ($uname,$udom)=&Apache::lonnet::constructaccess($r->uri); |
| unless (($uname) && ($udom)) { |
unless (($uname) && ($udom)) { |
| return HTTP_NOT_ACCEPTABLE; |
return HTTP_NOT_ACCEPTABLE; |
| } |
} |
|
Line 105 sub handler {
|
Line 105 sub handler {
|
| my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom, |
my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom, |
| $cstr,$crstype); # expressed in MB |
$cstr,$crstype); # expressed in MB |
| # Put out the start of page. |
# Put out the start of page. |
| |
|
| &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor); |
&startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota, $crsauthor); |
| |
|
| if (!-d $fn) { |
if (!-d $fn) { |
|
Line 133 sub handler {
|
Line 133 sub handler {
|
| |
|
| my $numdir = 0; |
my $numdir = 0; |
| my $numres = 0; |
my $numres = 0; |
| |
|
| if ((@files == 0) && ($thisdisfn =~ m{^/$match_domain/$match_username})) { |
if ((@files == 0) && ($thisdisfn =~ m{^/$match_domain/$match_username})) { |
| if ($thisdisfn =~ m{^/$match_domain/$match_username$}) { |
if ($thisdisfn =~ m{^/$match_domain/$match_username$}) { |
| $r->print('<p class="LC_info">'.&mt('This Authoring Space is currently empty.').'</p>'); |
$r->print('<p class="LC_info">'.&mt('This Authoring Space is currently empty.').'</p>'); |
|
Line 192 sub handler {
|
Line 192 sub handler {
|
| order => 'ascending', |
order => 'ascending', |
| text => &mt('Size').' (kB)', |
text => &mt('Size').' (kB)', |
| }, |
}, |
| ); |
); |
| |
|
| # Print column headers |
# Print column headers |
| my $output = ''; |
my $output = ''; |
|
Line 237 my $result = "<script type=\"text/javasc
|
Line 237 my $result = "<script type=\"text/javasc
|
| my ($cmode,$csize,$cmtime)=(stat($fn.'/'.$filename))[2,7,9]; |
my ($cmode,$csize,$cmtime)=(stat($fn.'/'.$filename))[2,7,9]; |
| my $linkfilename = &HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"'); |
my $linkfilename = &HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"'); |
| # Identify type of file according to icon used |
# Identify type of file according to icon used |
| my ($filetype) = (&Apache::loncommon::icon($filename) =~ m{/(\w+).gif$}); |
my ($filetype) = (&Apache::loncommon::icon($filename) =~ m{/(\w+).gif$}); |
| my $cstr_dir = $r->dir_config('lonDocRoot').'/priv'.$thisdisfn; |
my $cstr_dir = $r->dir_config('lonDocRoot').'/priv'.$thisdisfn; |
| my $meta_same = &isMetaSame($cstr_dir, $resdir, $filename); |
my $meta_same = &isMetaSame($cstr_dir, $resdir, $filename); |
| |
|
| # Store size, title, and status for files but not directories |
# Store size, title, and status for files but not directories |
| my $size = (!($cmode&$dirptr)) ? $csize/1024. : 0; |
my $size = (!($cmode&$dirptr)) ? $csize/1024. : 0; |
| my ($status, $pubstatus, $title, $fulltitle); |
my ($status, $pubstatus, $title, $fulltitle); |
| if (!($cmode&$dirptr)) { |
if (!($cmode&$dirptr)) { |
| ($status, $pubstatus) = &getStatus($resdir, $targetdir, $cstr_dir, |
($status, $pubstatus) = &getStatus($resdir, $targetdir, $cstr_dir, |
| $filename, $linkfilename, $cmtime, $meta_same); |
$filename, $linkfilename, $cmtime, $meta_same); |
| if (($crsauthor) && ($extension eq 'rights')) { |
if (($crsauthor) && ($extension eq 'rights')) { |
| $title = &getTitleString($targetdir.'/'.$filename); |
$title = &getTitleString($targetdir.'/'.$filename); |
| $fulltitle = $title; |
$fulltitle = $title; |
| } else { |
} else { |
| ($fulltitle, $title) = &getTitle($resdir, $targetdir, $filename, |
($fulltitle, $title) = &getTitle($resdir, $targetdir, $filename, |
| $linkfilename, $meta_same, \%bombs); |
$linkfilename, $meta_same, \%bombs); |
| } |
} |
| } else { |
} else { |
|
Line 272 my $result = "<script type=\"text/javasc
|
Line 272 my $result = "<script type=\"text/javasc
|
| "linkfilename" => $linkfilename, |
"linkfilename" => $linkfilename, |
| } |
} |
| } |
} |
| |
|
| my @sorted_files; |
my @sorted_files; |
| # Sorting by something other than "Name". Name is the secondary key. |
# Sorting by something other than "Name". Name is the secondary key. |
| if ($sortby =~ m{cmtime|size}) { # Numeric fields |
if ($sortby =~ m{cmtime|size}) { # Numeric fields |
|
Line 306 my $result = "<script type=\"text/javasc
|
Line 306 my $result = "<script type=\"text/javasc
|
| } |
} |
| |
|
| # Sort by "Name" is the default |
# Sort by "Name" is the default |
| } else { |
} else { |
| if ($sortorder eq "rev") { |
if ($sortorder eq "rev") { |
| @sorted_files = sort {uc($b) cmp uc($a)} (keys(%{$filehash})); |
@sorted_files = sort {uc($b) cmp uc($a)} (keys(%{$filehash})); |
| } else { |
} else { |
|
Line 317 my $result = "<script type=\"text/javasc
|
Line 317 my $result = "<script type=\"text/javasc
|
| # Print the sorted resources |
# Print the sorted resources |
| 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, |
| $filehash->{$filename}->{"cmtime"}, |
$filehash->{$filename}->{"cmtime"}, |
| $targetdir, \%bombs, \$numdir); |
$targetdir, \%bombs, \$numdir); |
| } else { # Files |
} else { # Files |
| &putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir, |
&putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir, |
| $targetdir, $linkdir, $crsauthor, |
$targetdir, $linkdir, $crsauthor, |
| $filehash->{$filename}->{"cmtime"}, |
$filehash->{$filename}->{"cmtime"}, |
| $filehash->{$filename}->{"size"}, \$numres, |
$filehash->{$filename}->{"size"}, \$numres, |
| $filehash->{$filename}->{"linkfilename"}, |
$filehash->{$filename}->{"linkfilename"}, |
| $filehash->{$filename}->{"fulltitle"}, |
$filehash->{$filename}->{"fulltitle"}, |
| $filehash->{$filename}->{"status"}, |
$filehash->{$filename}->{"status"}, |
|
Line 348 my $result = "<script type=\"text/javasc
|
Line 348 my $result = "<script type=\"text/javasc
|
| .'</div>' |
.'</div>' |
| .&Apache::loncommon::end_page() |
.&Apache::loncommon::end_page() |
| ); |
); |
| return OK; |
return OK; |
| } |
} |
| |
|
| |
|
| |
|
| # Output the header of the page. This includes: |
# Output the header of the page. This includes: |
| # - 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, $current_disk_usage, $disk_quota); |
# startpage($r, $uame, $udom, $thisdisfn, $current_disk_usage, $disk_quota); |
|
Line 387 sub startpage {
|
Line 387 sub startpage {
|
| 'text' => $title, |
'text' => $title, |
| 'href' => &Apache::loncommon::authorspace($formaction), |
'href' => &Apache::loncommon::authorspace($formaction), |
| }); |
}); |
| # breadcrumbs (and tools) will be created |
# breadcrumbs (and tools) will be created |
| # in start_page->bodytag->innerregister |
# in start_page->bodytag->innerregister |
| |
|
| $env{'request.noversionuri'}=$formaction; |
$env{'request.noversionuri'}=$formaction; |
| my $js = '<script type="text/javascript" |
my $js = '<script type="text/javascript" |
| src="/res/adm/includes/file_upload.js"></script>'; |
src="/res/adm/includes/file_upload.js"></script>'; |
| $r->print(&Apache::loncommon::start_page($title, $js)); |
$r->print(&Apache::loncommon::start_page($title, $js)); |
| |
|
|
Line 423 parent.lastknownpriv='/priv$esc_thisdisf
|
Line 423 parent.lastknownpriv='/priv$esc_thisdisf
|
| function checkUpload(theform) { |
function checkUpload(theform) { |
| if (theform.file == '') { |
if (theform.file == '') { |
| alert("Please use 'Browse..' to choose a file first, before uploading") |
alert("Please use 'Browse..' to choose a file first, before uploading") |
| return |
return |
| } |
} |
| theform.submit() |
theform.submit() |
| } |
} |
| |
|
| function SetPubDir(theform,printForm) { |
function SetPubDir(theform,printForm) { |
|
Line 511 sub dircontrols {
|
Line 511 sub dircontrols {
|
| pubr => 'Publish this Resource', |
pubr => 'Publish this Resource', |
| rtrv => 'Retrieve Old Version', |
rtrv => 'Retrieve Old Version', |
| list => 'List Directory', |
list => 'List Directory', |
| uplo => 'Upload file', |
uplo => 'Upload file', |
| dele => 'Delete', |
dele => 'Delete', |
| sela => 'Select Action', |
sela => 'Select Action', |
| nfil => 'New file', |
nfil => 'New file', |
|
Line 541 sub dircontrols {
|
Line 541 sub dircontrols {
|
| nanf => 'Name of New File', |
nanf => 'Name of New File', |
| nans => 'Name of New Subdirectory', |
nans => 'Name of New Subdirectory', |
| psfn => 'Please specify file name', |
psfn => 'Please specify file name', |
| ); |
); |
| &js_escape(\%js_lt); |
&js_escape(\%js_lt); |
| 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. |
# Calculate free space in bytes. |
|
Line 587 END
|
Line 587 END
|
| 'newtaskfile','newlibraryfile', |
'newtaskfile','newlibraryfile', |
| 'newdir')); |
'newdir')); |
| } |
} |
| my $selectbox = &Apache::loncommon::select_form('none','action',\%fileoptions); |
my $selectbox = &Apache::loncommon::select_form('none','action',\%fileoptions); |
| $r->print(<<END); |
$r->print(<<END); |
| <div style="padding-bottom: 2px"> |
<div style="padding-bottom: 2px"> |
| <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload"> |
<form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload"> |
|
Line 746 sub putdirectory {
|
Line 746 sub putdirectory {
|
| my ($r, $reqfile, $here, $dirname, $modtime, $targetdir, $bombs, $numdir) = @_; |
my ($r, $reqfile, $here, $dirname, $modtime, $targetdir, $bombs, $numdir) = @_; |
| |
|
| # construct the display filename: the directory name unless ..: |
# construct the display filename: the directory name unless ..: |
| |
|
| my $actionitem; |
my $actionitem; |
| |
|
| my $disfilename = $dirname; |
my $disfilename = $dirname; |
| # Don't display directory itself, and there is no way up from root directory |
# Don't display directory itself, and there is no way up from root directory |
| unless ((($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) { |
unless ((($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) { |
|
Line 771 sub putdirectory {
|
Line 771 sub putdirectory {
|
| $actionitem = &mt('Go to ...'); |
$actionitem = &mt('Go to ...'); |
| $disfilename = '<i>'.&mt('Parent Directory').'</i>'; |
$disfilename = '<i>'.&mt('Parent Directory').'</i>'; |
| } else { |
} else { |
| $actionitem = |
$actionitem = |
| '<form name="dirselect_'.$$numdir. |
'<form name="dirselect_'.$$numdir. |
| '" action="/adm/publish">'. |
'" action="/adm/publish">'. |
| '<select name="diraction" onchange="SetPubDir(this.form,document)">'. |
'<select name="diraction" onchange="SetPubDir(this.form,document)">'. |
|
Line 825 sub getTitle {
|
Line 825 sub getTitle {
|
| &Apache::loncommon::modal_link( |
&Apache::loncommon::modal_link( |
| '/adm/retrieve?filename='.$linkfilename.'.meta&inhibitmenu=yes&add_modal=yes', |
'/adm/retrieve?filename='.$linkfilename.'.meta&inhibitmenu=yes&add_modal=yes', |
| &mt('Retrieve Metadata'),600,500); |
&mt('Retrieve Metadata'),600,500); |
| } |
} |
| } |
} |
| # Allow editing metadata of published and unpublished resources |
# Allow editing metadata of published and unpublished resources |
| $title .= "\n".'<br />' if ($title); |
$title .= "\n".'<br />' if ($title); |
|
Line 844 sub isMetaSame {
|
Line 844 sub isMetaSame {
|
| my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9]; |
my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9]; |
| my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9]; |
my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9]; |
| return (&Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta', |
return (&Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta', |
| $cstr_dir.'/'.$filename.'.meta') && $meta_rmtime < $meta_cmtime) |
$cstr_dir.'/'.$filename.'.meta') && $meta_rmtime < $meta_cmtime) |
| ? 0 : 1; |
? 0 : 1; |
| } |
} |
| |
|
| |
|
| sub getStatus { |
sub getStatus { |
| my ($resdir, $targetdir, $cstr_dir, $filename, |
my ($resdir, $targetdir, $cstr_dir, $filename, |
| $linkfilename, $crsauthor, $cmtime, $meta_same) = @_; |
$linkfilename, $crsauthor, $cmtime, $meta_same) = @_; |
| my $pubstatus = 'unpublished'; |
my $pubstatus = 'unpublished'; |
| my $status = &mt('Unpublished'); |
my $status = &mt('Unpublished'); |
|
Line 924 sub getStatus {
|
Line 923 sub getStatus {
|
| sub putresource { |
sub putresource { |
| my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, |
my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, |
| $targetdir, $linkdir, $crsauthor, $cmtime, $size, |
$targetdir, $linkdir, $crsauthor, $cmtime, $size, |
| $numres, $linkfilename, $title, $status, $pubstatus) = @_; |
$numres, $linkfilename, $title, $status, $pubstatus) = @_; |
| &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename); |
&Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename); |
| |
|
| my $editlink=''; |
my $editlink=''; |
|
Line 979 sub create_pubselect {
|
Line 978 sub create_pubselect {
|
| <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') { |
| $$pub_select .= |
$$pub_select .= |
| '<option value="rename">'.&mt('Rename').'</option>'. |
'<option value="rename">'.&mt('Rename').'</option>'. |
| '<option value="move">'.&mt('Move').'</option>'. |
'<option value="move">'.&mt('Move').'</option>'. |
| '<option value="delete">'.&mt('Delete').'</option>'; |
'<option value="delete">'.&mt('Delete').'</option>'; |
|
Line 1018 sub check_for_versions {
|
Line 1017 sub check_for_versions {
|
| opendir(DIR,$resdir); |
opendir(DIR,$resdir); |
| while (my $filename=readdir(DIR)) { |
while (my $filename=readdir(DIR)) { |
| if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) { |
if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) { |
| $versions ++; |
$versions ++; |
| } |
} |
| } |
} |
| closedir(DIR); |
closedir(DIR); |
|
Line 1026 sub check_for_versions {
|
Line 1025 sub check_for_versions {
|
| } |
} |
| |
|
| sub prepareJsonTranslations { |
sub prepareJsonTranslations { |
| my $json = |
my $json = |
| '{"translations":{'. |
'{"translations":{'. |
| '"edit":"'.&mt('Edit').'",'. |
'"edit":"'.&mt('Edit').'",'. |
| '"editxml":"'.&mt('EditXML').'",'. |
'"editxml":"'.&mt('EditXML').'",'. |
|
Line 1097 sub prepareJsonData_rec {
|
Line 1096 sub prepareJsonData_rec {
|
| closedir(DIR); |
closedir(DIR); |
| # nothing to do here if both lists are empty |
# nothing to do here if both lists are empty |
| return unless ( @dirs || @resources ); |
return unless ( @dirs || @resources ); |
| |
|
| # Phase 2: Working |
# Phase 2: Working |
| $$firstfile = 1; |
$$firstfile = 1; |
| |
|
|
Line 1219 run through list of files and attempt to
|
Line 1218 run through list of files and attempt to
|
| =item startpage($r, $uame, $udom, $thisdisfn) |
=item startpage($r, $uame, $udom, $thisdisfn) |
| |
|
| Output the header of the page. This includes: |
Output the header of the page. This includes: |
| - 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); |
| $r - The apache request object. |
$r - The apache request object. |
| $uname - User name. |
$uname - User name. |
|
Line 1234 Output the header of the page. This inc
|
Line 1233 Output the header of the page. This inc
|
| Without the latter substitution, it's impossible to examine metadata for |
Without the latter substitution, it's impossible to examine metadata for |
| untitled resources. Resources may be legitimately untitled, to prevent |
untitled resources. Resources may be legitimately untitled, to prevent |
| searches from locating them. |
searches from locating them. |
| |
|
| $str = getTitleString($fullname); |
$str = getTitleString($fullname); |
| $fullname - Fully qualified filename to check. |
$fullname - Fully qualified filename to check. |
| |
|
|
Line 1242 Output the header of the page. This inc
|
Line 1241 Output the header of the page. This inc
|
| $numdir) |
$numdir) |
| |
|
| Put out a directory table row: |
Put out a directory table row: |
| |
|
| $r - Apache request object. |
$r - Apache request object. |
| $reqfile - File in request. |
$reqfile - File in request. |
| $here - Where we are in directory tree. |
$here - Where we are in directory tree. |
![[BACK]](/icons/back.gif){kind=icon}
Return to lonpubdir.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / publisher