--- loncom/publisher/Attic/lonconstruct.pm 2003/11/19 14:57:32 1.20
+++ loncom/publisher/Attic/lonconstruct.pm 2005/02/17 09:01:04 1.28
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Construction Space Page Wrapper for Construction
#
-# $Id: lonconstruct.pm,v 1.20 2003/11/19 14:57:32 taceyjo1 Exp $
+# $Id: lonconstruct.pm,v 1.28 2005/02/17 09:01:04 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -85,8 +85,6 @@ sub Debug {
}
-
-
# ================================================================ Main Handler
sub handler {
@@ -94,7 +92,7 @@ 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;
@@ -102,7 +100,7 @@ sub handler {
&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);
#
@@ -119,6 +117,16 @@ sub handler {
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'} ne 'off') {
+ $toprows = '110';
+ $topsrc = '/adm/localize/adm/publisher.html';
+ }
$r->print(<<ENDPAGE);
<html>
<head><title>LON-CAPA Construction Space</title>
@@ -126,8 +134,8 @@ sub handler {
var lastknownpriv="$lowerframe";
</script>
</head>
-<frameset rows="110,*" border="0">
-<frame src='/adm/publisher.html'>
+<frameset rows="$toprows,*" border="0">
+<frame src='$topsrc'>
<frame src="$lowerframe" name="LONCAPAToBePublished">
</frameset>
</html>