--- loncom/publisher/lonretrieve.pm 2011/11/07 13:38:45 1.42.2.1 +++ loncom/publisher/lonretrieve.pm 2011/10/24 22:10:21 1.44 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to retrieve an old version of a file # -# $Id: lonretrieve.pm,v 1.42.2.1 2011/11/07 13:38:45 raeburn Exp $ +# $Id: lonretrieve.pm,v 1.44 2011/10/24 22:10:21 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -209,7 +209,7 @@ sub phaseone { .'/'; $r->print(&Apache::lonhtmlcommon::start_funclist() .&Apache::lonhtmlcommon::add_item_funclist( - '' + '' .&mt('Back to Resource') .'') .&Apache::lonhtmlcommon::add_item_funclist( @@ -233,7 +233,7 @@ sub phasetwo { my ($main,$suffix,$is_meta) = &get_file_info($fn); my $logfile; - my $ctarget='/home/'.$uname.'/public_html'.$fn; + my $ctarget=$r->dir_config('lonDocRoot').'/priv/'.$udom.'/'.$uname.$fn; my $vfn=$fn; if ($version ne 'new') { $vfn=~s/\.(\Q$suffix\E)$/\.$version\.$1/; @@ -266,7 +266,7 @@ sub phasetwo { print $logfile "Copy failed: $error\n\n"; } $r->print('

' - .'

' + .'

' .&mt('Back to Resource') .'

'); } else { @@ -292,7 +292,7 @@ sub handler { my $r=shift; - my ($fn,$trailfile); + my $fn; # Get query string for limited number of parameters @@ -330,7 +330,6 @@ sub handler { } $fn=~s{/~($LONCAPA::username_re)}{}; - $trailfile = "/home/$uname/public_html".$fn; &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -349,7 +348,7 @@ sub handler { $r->print(&Apache::loncommon::start_page('Retrieve Published Resources') .&Apache::lonhtmlcommon::breadcrumbs() .&Apache::loncommon::head_subbox( - &Apache::loncommon::CSTR_pageheader($trailfile)) + &Apache::loncommon::CSTR_pageheader()) # FIXME crumbs broken? ); $r->print('

'