version 1.175, 2005/04/07 07:34:52
|
version 1.180, 2005/06/08 19:36:54
|
Line 852 sub group_import {
|
Line 852 sub group_import {
|
} |
} |
} |
} |
if ($url) { |
if ($url) { |
my $idx = $#Apache::lonratedt::resources + 1; |
my $idx = &Apache::lonratedt::getresidx($url); |
$Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx; |
$Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx; |
my $ext = 'false'; |
my $ext = 'false'; |
if ($url=~/^http:\/\//) { $ext = 'true'; } |
if ($url=~/^http:\/\//) { $ext = 'true'; } |
Line 914 sub editor {
|
Line 914 sub editor {
|
($errtext,$fatal)= |
($errtext,$fatal)= |
&mapread($coursenum,$coursedom,$folder.'.'.$container); |
&mapread($coursenum,$coursedom,$folder.'.'.$container); |
if ($#Apache::lonratedt::order<1) { |
if ($#Apache::lonratedt::order<1) { |
$Apache::lonratedt::order[0]=1; |
my $idx=&Apache::lonratedt::getresidx(); |
$Apache::lonratedt::resources[1]=''; |
if ($idx<=0) { $idx=1; } |
|
$Apache::lonratedt::order[0]=$idx; |
|
$Apache::lonratedt::resources[$idx]=''; |
} |
} |
if (defined($env{'form.markcopy'})) { |
if (defined($env{'form.markcopy'})) { |
# Mark for copying |
# Mark for copying |
Line 1018 sub editor {
|
Line 1020 sub editor {
|
if ($url=~/^http\:\/\//) { $ext='true'; } |
if ($url=~/^http\:\/\//) { $ext='true'; } |
$url=~s/\:/\:/g; |
$url=~s/\:/\:/g; |
# Now insert the URL at the bottom |
# Now insert the URL at the bottom |
my $newidx=1+$#Apache::lonratedt::resources; |
my $newidx=&Apache::lonratedt::getresidx($url); |
$Apache::lonratedt::resources[$newidx]= |
$Apache::lonratedt::resources[$newidx]= |
$title.':'.$url.':'.$ext.':normal:res'; |
$title.':'.$url.':'.$ext.':normal:res'; |
$Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx; |
$Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx; |
Line 1034 sub editor {
|
Line 1036 sub editor {
|
if (($env{'form.uploaddoc.filename'}) && |
if (($env{'form.uploaddoc.filename'}) && |
($env{'form.cmd'}=~/^upload_(\w+)/)) { |
($env{'form.cmd'}=~/^upload_(\w+)/)) { |
if ( ($folder=~/^$1/) || ($1 eq 'default') ) { |
if ( ($folder=~/^$1/) || ($1 eq 'default') ) { |
|
my $destination = 'docs/'; |
|
if ($folder eq 'default') { |
|
$destination .= 'default/'; |
|
} elsif ($folder =~ /^default_(\d+)$/) { |
|
$destination .= $1.'/'; |
|
} |
# this is for a course, not a user, so set coursedoc flag |
# this is for a course, not a user, so set coursedoc flag |
# probably the only place in the system where this should be "1" |
# probably the only place in the system where this should be "1" |
my $newidx=$#Apache::lonratedt::resources+1; |
my $newidx=$#Apache::lonratedt::resources+1; |
my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs/'.$newidx); |
$destination .= $newidx; |
|
my $url=&Apache::lonnet::userfileupload('uploaddoc',1,$destination); |
my $ext='false'; |
my $ext='false'; |
if ($url=~/^http\:\/\//) { $ext='true'; } |
if ($url=~/^http\:\/\//) { $ext='true'; } |
$url=~s/\:/\:/g; |
$url=~s/\:/\:/g; |
Line 1068 sub editor {
|
Line 1077 sub editor {
|
if ($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) { |
if ($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) { |
&Apache::lonnet::removeuploadedurl($url); |
&Apache::lonnet::removeuploadedurl($url); |
} |
} |
|
&Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]); |
for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) { |
for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) { |
$Apache::lonratedt::order[$i]= |
$Apache::lonratedt::order[$i]= |
$Apache::lonratedt::order[$i+1]; |
$Apache::lonratedt::order[$i+1]; |
Line 1075 sub editor {
|
Line 1085 sub editor {
|
$#Apache::lonratedt::order--; |
$#Apache::lonratedt::order--; |
} elsif ($cmd eq 'cut') { |
} elsif ($cmd eq 'cut') { |
my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]); |
my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]); |
|
&Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]); |
for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) { |
for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) { |
$Apache::lonratedt::order[$i]= |
$Apache::lonratedt::order[$i]= |
$Apache::lonratedt::order[$i+1]; |
$Apache::lonratedt::order[$i+1]; |
Line 1837 sub is_hash_old {
|
Line 1848 sub is_hash_old {
|
} |
} |
|
|
sub changewarning { |
sub changewarning { |
my ($r,$postexec)=@_; |
my ($r,$postexec,$message,$url)=@_; |
if (!&is_hash_old()) { return; } |
if (!&is_hash_old()) { return; } |
my $pathvar='folderpath'; |
my $pathvar='folderpath'; |
my $path=&Apache::lonnet::escape($env{'form.folderpath'}); |
my $path=&Apache::lonnet::escape($env{'form.folderpath'}); |
if (defined($env{'form.pagepath'})) { |
if (!defined($url)) { |
$pathvar='pagepath'; |
if (defined($env{'form.pagepath'})) { |
$path=&Apache::lonnet::escape($env{'form.pagepath'}); |
$pathvar='pagepath'; |
$path.='&symb='.&Apache::lonnet::escape($env{'form.pagesymb'}); |
$path=&Apache::lonnet::escape($env{'form.pagepath'}); |
|
$path.='&symb='.&Apache::lonnet::escape($env{'form.pagesymb'}); |
|
} |
|
$url='/adm/coursedocs?'.$pathvar.'='.$path; |
|
} |
|
if (!defined($message)) { |
|
$message='Changes will become active for your current session after [_1], or the next time you log in.'; |
} |
} |
$r->print( |
$r->print( |
'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. |
'<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. |
'<form method="post" action="/adm/roles" target="loncapaclient">'. |
'<form method="post" action="/adm/roles" target="loncapaclient">'. |
'<input type="hidden" name="orgurl" value="/adm/coursedocs?'. |
'<input type="hidden" name="orgurl" value="'.$url. |
$pathvar.'='.$path. |
|
'" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'. |
'" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'. |
&mt('Changes will become active for your current session after'). |
&mt($message,' <input type="hidden" name="'. |
' <input type="hidden" name="'. |
$env{'request.role'}.'" value="1" /><input type="button" value="'. |
$env{'request.role'}.'" value="1" /><input type="button" value="'. |
&mt('re-initializing course').'" onClick="reinit(this.form)" />'). |
&mt('re-initializing course').'" onClick="reinit(this.form)"/>'.&mt(', or the next time you log in.'). |
|
$help{'Caching'}.'</font></h3></form>'); |
$help{'Caching'}.'</font></h3></form>'); |
} |
} |
|
|
Line 1960 sub handler {
|
Line 1975 sub handler {
|
|
|
# graphics settings |
# graphics settings |
|
|
$iconpath = $r->dir_config('lonIconsURL') . "/"; |
$iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/"); |
|
|
my $now=time; |
my $now=time; |
|
|