--- loncom/publisher/Attic/lonconstruct.pm 2002/09/10 02:31:26 1.8
+++ loncom/publisher/Attic/lonconstruct.pm 2010/04/12 15:05:51 1.37
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Construction Space Page Wrapper for Construction
#
-# $Id: lonconstruct.pm,v 1.8 2002/09/10 02:31:26 foxr Exp $
+# $Id: lonconstruct.pm,v 1.37 2010/04/12 15:05:51 droeschl Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,28 +26,24 @@
# http://www.lon-capa.org/
#
#
-# (Page Handler
-#
-# (TeX Content Handler
-#
-# 05/29/00,05/30 Gerd Kortemeyer)
-# 08/30,08/31,09/06,09/14,09/15,09/16,09/19,09/20,09/21,09/23,
-# 10/02,10/10,10/14,10/16,10/18,10/19,10/31,11/6,11/14,11/16 Gerd Kortemeyer)
-#
-# 11/22,11/23,11/28,
-# 03/30/01 Gerd Kortemeyer
-package Apache::lonconstruct;
-
-use strict;
-use Apache::Constants qw(:common :http :methods);
-use Apache::lonnet;
-use Apache::Log ();
-use HTML::Entities();
-my $DEBUG = 0;
=pod
+=head1
+
+=head1 NAME
+
+Apache::lonconstruct
+
+=head1 SYNOPSIS
+
+Page wrapper for handling construction space.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
=item Debug($request, $message)
If debugging is enabled puts out a debuggin message determined by the
@@ -69,23 +65,24 @@ my $DEBUG = 0;
=cut
-sub Debug {
-
- # Marshall the parameters.
-
- my $r = shift;
- my $log = $r->log;
- my $message = shift;
-
- # Put out the indicated message butonly if DEBUG is false.
-
- if ($DEBUG) {
- $log->debug($message);
- }
-}
+package Apache::lonconstruct;
+
+
+use strict;
+use Apache::Constants qw(:common :http :methods);
+use Apache::lonnet;
+use HTML::Entities();
+my $DEBUG = 0;
+sub Debug {
+ # Put out the indicated message but only if DEBUG is true.
+ if ($DEBUG) {
+ my ($r,$message) = @_;
+ $r->log_reason($message);
+ }
+}
# ================================================================ Main Handler
@@ -94,27 +91,38 @@ sub handler {
# -------------------------------------------------------------- Build frameset
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
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);
+ $lowerframe= &HTML::Entities::encode($lowerframe,'<>&"');
+ &Debug($r, "Lower frame URL after quote subst: ".$lowerframe);
+
+#
+# Are we forcing edit mode?
+#
- $r->print(<<ENDPAGE);
-<html>
-<head><title>LON-CAPA Construction Space</title></head>
-<frameset rows="110,*">
-<frame src='/adm/publisher.html'>
-<frame src="$lowerframe" name="LONCAPAToBePublished">
-</frameset>
-</html>
-ENDPAGE
+ &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';
+ }
+
+ # when the remote control existed we used to force the
+ # pages of construction space into a frameset.
+ # without remote control, we can elimnate this frameset
+ # and redirect to the url of the content frame.
+ # This keeps all URLs intact.
+ $r->internal_redirect($lowerframe);
return OK;
}
1;