--- loncom/publisher/Attic/lonconstruct.pm 2003/10/18 17:19:49 1.17
+++ 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.17 2003/10/18 17:19:49 taceyjo1 Exp $
+# $Id: lonconstruct.pm,v 1.23 2004/10/29 18:40:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,7 +40,7 @@ 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();
@@ -85,8 +85,6 @@ sub Debug {
}
-
-
# ================================================================ Main Handler
sub handler {
@@ -99,11 +97,10 @@ 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);
+ $lowerframe= &HTML::Entities::encode($lowerframe,'<>&"');
&Debug($r, "Lower frame URL after quote subst: ".$lowerframe);
#
@@ -120,10 +117,15 @@ sub handler {
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'} eq 'on') {
+ $toprows = '110';
+ $topsrc = '/adm/localize/adm/publisher.html';
}
$r->print(<<ENDPAGE);
<html>
@@ -132,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>