--- loncom/interface/londocs.pm 2011/09/10 03:18:34 1.459
+++ loncom/interface/londocs.pm 2011/11/07 20:05:55 1.463
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.459 2011/09/10 03:18:34 raeburn Exp $
+# $Id: londocs.pm,v 1.463 2011/11/07 20:05:55 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -176,7 +176,7 @@ sub dumpcourse {
$newfilename=&clean($newfilename);
$newfilename.='.'.$ext;
my @dirs=split(/\//,$newfilename);
- my $path='/home/'.$ca.'/public_html';
+ my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca";
my $makepath=$path;
my $fail=0;
for (my $i=0;$i<$#dirs;$i++) {
@@ -1577,7 +1577,7 @@ sub handle_edit_cmd {
if ($cmd eq 'del') {
if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
- ($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
+ ($url!~/$LONCAPA::assess_page_seq_re/)) {
&Apache::lonnet::removeuploadedurl($url);
} else {
&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
@@ -1787,9 +1787,11 @@ sub editor {
if ($supplementalflag) {
$tid = 2;
}
- $r-print(&generate_edit_table($tid,$orderhash,$to_show));
if ($allowed) {
+ $r->print(&generate_edit_table($tid,$orderhash,$to_show));
&print_paste_buffer($r,$container);
+ } else {
+ $r->print($to_show);
}
return;
}
@@ -2629,7 +2631,7 @@ ENDHEADERS
$r->print(' '.&mt('Diffs').'');
+ '" target="diffs">'.&mt('Diffs').'');
}
$r->print('
');
if (++$entries_count % $entries_per_col == 0) {