--- loncom/publisher/Attic/lonconstruct.pm 2003/05/28 21:07:19 1.10 +++ loncom/publisher/Attic/lonconstruct.pm 2004/10/29 18:40:40 1.23 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Construction Space Page Wrapper for Construction # -# $Id: lonconstruct.pm,v 1.10 2003/05/28 21:07:19 www Exp $ +# $Id: lonconstruct.pm,v 1.23 2004/10/29 18:40:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,12 +40,10 @@ package Apache::lonconstruct; use strict; -use Apache::Constants qw(:common :http :methods); +use Apache::Constants qw(:common :http :methods REDIRECT); use Apache::lonnet; use Apache::Log (); use HTML::Entities(); -use Apache::loncommon; -use Apache::lonmenu; my $DEBUG = 0; =pod @@ -87,8 +85,6 @@ sub Debug { } - - # ================================================================ Main Handler sub handler { @@ -101,24 +97,45 @@ sub handler { return OK if $r->header_only; my $lowerframe=$r->path_info; - &Debug($r, "Initial URL for lower frame: ".$lowerframe); $lowerframe=~s/^\//\/\~/; &Debug($r, "Lower frame URL afer ~ subst: ".$lowerframe); - $lowerframe= &HTML::Entities::encode($lowerframe); - &Debug($r, "LOwer frame URL after quote subst: ".$lowerframe); - my $loadevents=&Apache::lonmenu::loadevents(); - my $unloadevents=&Apache::lonmenu::unloadevents(); - my $script=&Apache::lonmenu::registerurl(); + $lowerframe= &HTML::Entities::encode($lowerframe,'<>&"'); + &Debug($r, "Lower frame URL after quote subst: ".$lowerframe); + +# +# Are we forcing edit mode? +# + + &Apache::loncommon::get_unprocessed_cgi + ($ENV{'QUERY_STRING'},['forceedit']); + if ($ENV{'form.forceedit'}) { + $lowerframe.='?editmode=Edit&problemmode=EditXML'; + } + &Apache::loncommon::get_unprocessed_cgi + ($ENV{'QUERY_STRING'},['forceColoredit']); + if ($ENV{'form.forceColoredit'}) { + $lowerframe.='?editmode=Edit&problemmode=Edit'; + } + +# +# Checking to see if we should display the topframe +# + my $toprows = 0; + my $topsrc = ''; + if ($ENV{'environment.remote'} eq 'on') { + $toprows = '110'; + $topsrc = '/adm/localize/adm/publisher.html'; + } $r->print(< LON-CAPA Construction Space -$script + - - + +