--- loncom/publisher/Attic/lonconstruct.pm 2003/10/18 17:18:14 1.16
+++ loncom/publisher/Attic/lonconstruct.pm 2005/04/07 06:56:26 1.30
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Construction Space Page Wrapper for Construction
#
-# $Id: lonconstruct.pm,v 1.16 2003/10/18 17:18:14 taceyjo1 Exp $
+# $Id: lonconstruct.pm,v 1.30 2005/04/07 06:56:26 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,16 +26,7 @@
# 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;
@@ -45,7 +36,7 @@ use Apache::lonnet;
use Apache::Log ();
use HTML::Entities();
-my $DEBUG = 1;
+my $DEBUG = 0;
=pod
=item Debug($request, $message)
@@ -85,8 +76,6 @@ sub Debug {
}
-
-
# ================================================================ Main Handler
sub handler {
@@ -94,16 +83,15 @@ 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);
+ $lowerframe= &HTML::Entities::encode($lowerframe,'<>&"');
&Debug($r, "Lower frame URL after quote subst: ".$lowerframe);
#
@@ -112,29 +100,35 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi
($ENV{'QUERY_STRING'},['forceedit']);
- if ($ENV{'form.forceedit'}) {
+ if ($env{'form.forceedit'}) {
$lowerframe.='?editmode=Edit&problemmode=EditXML';
}
&Apache::loncommon::get_unprocessed_cgi
($ENV{'QUERY_STRING'},['forceColoredit']);
- if ($ENV{'form.forceColoredit'}) {
+ if ($env{'form.forceColoredit'}) {
$lowerframe.='?editmode=Edit&problemmode=Edit';
}
- &Apache::loncommon::get_unprocessed_cgi
- ($ENV{'QUERY_STRING'},['decompress']);
- if ($ENV{'form.decompress'}) {
- $lowerframe='http://$ENV{'SERVER_NAME'}/cgi-bin/decompress.pl?decompress';
+
+#
+# Checking to see if we should display the topframe
+#
+ my $toprows = 0;
+ my $topsrc = '';
+ if ($env{'environment.remote'} ne 'off') {
+ $toprows = '110';
+ $topsrc = '/adm/localize/adm/publisher.html';
}
+ my $html=&Apache::lonxml::xmlbegin();
$r->print(<<ENDPAGE);
-<html>
+$html
<head><title>LON-CAPA Construction Space</title>
-<script language="JavaScript">
+<script type="text/javascript">
var lastknownpriv="$lowerframe";
</script>
</head>
-<frameset rows="110,*" border="0">
-<frame src='/adm/publisher.html'>
-<frame src="$lowerframe" name="LONCAPAToBePublished">
+<frameset rows="$toprows,*" border="0">
+<frame src='$topsrc' />
+<frame src="$lowerframe" name="LONCAPAToBePublished" />
</frameset>
</html>
ENDPAGE