version 1.97, 2006/11/22 20:50:44
|
version 1.105, 2007/11/02 19:24:44
|
Line 41 use Apache::lonlocal;
|
Line 41 use Apache::lonlocal;
|
use Apache::lonmsg; |
use Apache::lonmsg; |
use Apache::lonmenu; |
use Apache::lonmenu; |
use Apache::lonnet; |
use Apache::lonnet; |
|
use LONCAPA; |
|
|
sub handler { |
sub handler { |
|
|
Line 157 sub getEffectiveUrl {
|
Line 158 sub getEffectiveUrl {
|
# |
# |
$fn=~s/^http\:\/\/[^\/]+\///; |
$fn=~s/^http\:\/\/[^\/]+\///; |
$fn=~s/^\///; |
$fn=~s/^\///; |
$fn=~s/\~(\w+)/\/home\/$1\/public_html/; |
$fn=~s{~($LONCAPA::username_re)}{/home/$1/public_html}; |
|
|
# Remove trailing / strings (?) |
# Remove trailing / strings (?) |
|
|
Line 170 sub getEffectiveUrl {
|
Line 171 sub getEffectiveUrl {
|
#internal authentication, needs fixup. |
#internal authentication, needs fixup. |
$fn = $r->uri(); # non users do not get the full path request |
$fn = $r->uri(); # non users do not get the full path request |
# through SCRIPT_FILENAME |
# through SCRIPT_FILENAME |
$fn=~s|^/~(\w+)|/home/$1/public_html|; |
$fn=~s{^/~($LONCAPA::username_re)}{/home/$1/public_html}; |
} |
} |
} |
} |
$fn=~s/\/+/\//g; |
$fn=~s/\/+/\//g; |
Line 210 sub startpage {
|
Line 211 sub startpage {
|
{'body_title' => |
{'body_title' => |
$pagetitle,})); |
$pagetitle,})); |
} else { |
} else { |
$r->print(&Apache::loncommon::start_page('Construction Space',undef)); |
$r->print(&Apache::loncommon::start_page('Construction Space',undef, |
|
{ 'only_body' => 1,})); |
$r->print($pagetitle); |
$r->print($pagetitle); |
} |
} |
|
|
|
my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn); |
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 = '$esc_thisdisfn/ - LON-CAPA Construction Space'; |
// Store directory location for menu bar to find |
// Store directory location for menu bar to find |
|
|
parent.lastknownpriv='/~$uname$thisdisfn/'; |
parent.lastknownpriv='/~$uname$esc_thisdisfn/'; |
|
|
// Confirmation dialogues |
// Confirmation dialogues |
|
|
Line 353 sub dircontrols {
|
Line 356 sub dircontrols {
|
ncrf => 'New custom rights file', |
ncrf => 'New custom rights file', |
nsty => 'New style file', |
nsty => 'New style file', |
nlib => 'New library file', |
nlib => 'New library file', |
|
nbt => 'New bridgetask file', |
nsub => 'New subdirectory', |
nsub => 'New subdirectory', |
renm => 'Rename current file to', |
renm => 'Rename current file to', |
move => 'Move current file to', |
move => 'Move current file to', |
copy => 'Copy current file to', |
copy => 'Copy current file to', |
type => 'Type Name Here', |
type => 'Type Name Here', |
go => 'Go', |
go => 'Go', |
prnt => 'Print contents of directory', |
prnt => 'Print contents of directory', |
crea => 'Create a new directory or LON-CAPA document', |
crea => 'Create a new directory or LON-CAPA document', |
acti => 'Actions for current directory', |
acti => 'Actions for current directory', |
updc => 'Upload a new document' |
updc => 'Upload a new document', |
|
pick => 'Please select an action to perform using the new filename', |
); |
); |
$r->print(<<END); |
$r->print(<<END); |
<table id="LC_cstr_controls"> |
<table id="LC_cstr_controls"> |
Line 402 sub dircontrols {
|
Line 407 sub dircontrols {
|
<form name="fileaction" method="post" action="/adm/cfile" target="_parent"> |
<form name="fileaction" method="post" action="/adm/cfile" target="_parent"> |
<span style="white-space: nowrap"> |
<span style="white-space: nowrap"> |
<input type="hidden" name="filename" value="/~$uname$thisdisfn/" /> |
<input type="hidden" name="filename" value="/~$uname$thisdisfn/" /> |
<select name="action"> |
<script type="text/javascript"> |
<option value="Select Action">$lt{'sela'}</option> |
function validate_go() { |
<option value="newfile">$lt{'nfil'}:</option> |
var selected = document.fileaction.action.selectedIndex; |
<option value="newhtmlfile">$lt{'nhtm'}:</option> |
if (selected == 0) { |
<option value="newproblemfile">$lt{'nprb'}:</option> |
alert('$lt{'pick'}'); |
<option value="newpagefile">$lt{'npag'}:</option> |
} else { |
<option value="newsequencefile">$lt{'nseq'}:</option> |
document.fileaction.submit(); |
<option value="newrightsfile">$lt{'ncrf'}:</option> |
} |
<option value="newstyfile">$lt{'nsty'}:</option> |
} |
<option value="newlibraryfile">$lt{'nlib'}:</option> |
</script> |
<option value="newdir">$lt{'nsub'}:</option> |
<select name="action"> |
</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()" /> |
<option value="none">$lt{'sela'}</option> |
|
<option value="newfile">$lt{'nfil'}:</option> |
|
<option value="newhtmlfile">$lt{'nhtm'}:</option> |
|
<option value="newproblemfile">$lt{'nprb'}:</option> |
|
<option value="newpagefile">$lt{'npag'}:</option> |
|
<option value="newsequencefile">$lt{'nseq'}:</option> |
|
<option value="newrightsfile">$lt{'ncrf'}:</option> |
|
<option value="newstyfile">$lt{'nsty'}:</option> |
|
<option value="newtaskfile">$lt{'nbt'}:</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="validate_go();" /> |
</span> |
</span> |
</form> |
</form> |
</td> |
</td> |
Line 514 sub putdirectory {
|
Line 530 sub putdirectory {
|
%Apache::lonpublisher::metadatafields=(); |
%Apache::lonpublisher::metadatafields=(); |
%Apache::lonpublisher::metadatakeys=(); |
%Apache::lonpublisher::metadatakeys=(); |
my $construct=$here; |
my $construct=$here; |
$construct=~s:^/priv/(\w+)$:/home/$1/public_html:; |
$construct=~s{^/priv/($LONCAPA::username_re)$}{/home/$1/public_html}; |
my $dirpath = $here; |
my $dirpath = $here; |
$dirpath=~s:^/priv/:/~:; |
$dirpath=~s{^/priv/}{/~}; |
&Apache::lonpublisher::metaeval(&Apache::lonnet::getfile( |
&Apache::lonpublisher::metaeval(&Apache::lonnet::getfile( |
$construct.'/'.$dirname.'/default.meta' |
$construct.'/'.$dirname.'/default.meta' |
)); |
)); |
Line 608 sub putresource {
|
Line 624 sub putresource {
|
$title = '<a href="/res/'.$targetdir.'/'.$filename. |
$title = '<a href="/res/'.$targetdir.'/'.$filename. |
'.meta" target="cat">'. |
'.meta" target="cat">'. |
&getTitleString($targetdir.'/'.$filename).'</a>'; |
&getTitleString($targetdir.'/'.$filename).'</a>'; |
&Apache::lonnet::logthis("same $same meta $meta_same"); |
|
if ($same) { |
if ($same) { |
if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) { |
if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) { |
$pubstatus = 'obsolete'; |
$pubstatus = 'obsolete'; |
Line 674 sub putresource {
|
Line 689 sub putresource {
|
'<td>'.($filename=~/[\#\~]$/?' ': |
'<td>'.($filename=~/[\#\~]$/?' ': |
'<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.'" target="_parent">'. |
$filename.'</a></span>'.$editlink2.$editlink. |
$filename.'</a></span>'.$editlink2.$editlink. |
'</td>'. |
'</td>'. |
Line 715 sub create_pubselect {
|
Line 730 sub create_pubselect {
|
<input type="hidden" name="filename" value="/~'. |
<input type="hidden" name="filename" value="/~'. |
&HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" /> |
&HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" /> |
<input type="hidden" name="dispfilename" value="'. |
<input type="hidden" name="dispfilename" value="'. |
&HTML::Entities::encode($filename).'"</form>'; |
&HTML::Entities::encode($filename).'" /></form>'; |
$$numres ++; |
$$numres ++; |
} |
} |
|
|