[LON-CAPA-cvs] cvs: loncom /interface lonchat.pm lonchatfetch.pm lonerrorhandler.pm lonevaluate.pm lonfeedback.pm lonindexer.pm lonpopulate.pm lonsimplepage.pm lontest.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Thu, 17 Feb 2005 08:50:21 -0000
albertel Thu Feb 17 03:50:21 2005 EDT
Modified files:
/loncom/interface lonchat.pm lonchatfetch.pm lonerrorhandler.pm
lonevaluate.pm lonfeedback.pm lonindexer.pm
lonpopulate.pm lonsimplepage.pm lontest.pm
Log:
- $r->content_type -> loncommon::content_type
Index: loncom/interface/lonchat.pm
diff -u loncom/interface/lonchat.pm:1.8 loncom/interface/lonchat.pm:1.9
--- loncom/interface/lonchat.pm:1.8 Thu Feb 17 03:29:42 2005
+++ loncom/interface/lonchat.pm Thu Feb 17 03:50:20 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Chat
#
-# $Id: lonchat.pm,v 1.8 2005/02/17 08:29:42 albertel Exp $
+# $Id: lonchat.pm,v 1.9 2005/02/17 08:50:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,7 +34,7 @@
sub handler {
my $r = shift;
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
if (! &Apache::lonnet::allowed('plc',$ENV{'request.course.id'}.
Index: loncom/interface/lonchatfetch.pm
diff -u loncom/interface/lonchatfetch.pm:1.15 loncom/interface/lonchatfetch.pm:1.16
--- loncom/interface/lonchatfetch.pm:1.15 Thu Feb 17 03:29:42 2005
+++ loncom/interface/lonchatfetch.pm Thu Feb 17 03:50:20 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Chat Fetching
#
-# $Id: lonchatfetch.pm,v 1.15 2005/02/17 08:29:42 albertel Exp $
+# $Id: lonchatfetch.pm,v 1.16 2005/02/17 08:50:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -50,7 +50,7 @@
$ENV{'course.'.$ENV{'request.course.id'}.'.home'});
if ($loaderror) { return $loaderror; }
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
Index: loncom/interface/lonerrorhandler.pm
diff -u loncom/interface/lonerrorhandler.pm:1.5 loncom/interface/lonerrorhandler.pm:1.6
--- loncom/interface/lonerrorhandler.pm:1.5 Thu Feb 17 03:29:42 2005
+++ loncom/interface/lonerrorhandler.pm Thu Feb 17 03:50:20 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Internal Server Error Handler
#
-# $Id: lonerrorhandler.pm,v 1.5 2005/02/17 08:29:42 albertel Exp $
+# $Id: lonerrorhandler.pm,v 1.6 2005/02/17 08:50:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,7 +34,7 @@
sub handler {
my $r = shift;
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
Index: loncom/interface/lonevaluate.pm
diff -u loncom/interface/lonevaluate.pm:1.15 loncom/interface/lonevaluate.pm:1.16
--- loncom/interface/lonevaluate.pm:1.15 Thu Feb 17 03:29:42 2005
+++ loncom/interface/lonevaluate.pm Thu Feb 17 03:50:20 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Evaluate
#
-# $Id: lonevaluate.pm,v 1.15 2005/02/17 08:29:42 albertel Exp $
+# $Id: lonevaluate.pm,v 1.16 2005/02/17 08:50:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -45,7 +45,7 @@
sub handler {
my $r = shift;
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.153 loncom/interface/lonfeedback.pm:1.154
--- loncom/interface/lonfeedback.pm:1.153 Thu Feb 17 03:29:42 2005
+++ loncom/interface/lonfeedback.pm Thu Feb 17 03:50:20 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Feedback
#
-# $Id: lonfeedback.pm,v 1.153 2005/02/17 08:29:42 albertel Exp $
+# $Id: lonfeedback.pm,v 1.154 2005/02/17 08:50:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1950,6 +1950,9 @@
sub print_showposters {
my ($r,$symb,$previous,$feedurl,$sortposts) = @_;
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+
&Apache::lonenc::check_encrypt(\$symb);
my $crs='/'.$ENV{'request.course.id'};
if ($ENV{'request.course.sec'}) {
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.129 loncom/interface/lonindexer.pm:1.130
--- loncom/interface/lonindexer.pm:1.129 Thu Feb 17 03:29:42 2005
+++ loncom/interface/lonindexer.pm Thu Feb 17 03:50:20 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.129 2005/02/17 08:29:42 albertel Exp $
+# $Id: lonindexer.pm,v 1.130 2005/02/17 08:50:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -136,7 +136,7 @@
}
#Hijack lonindexer to verify a title and be close down.
if ($ENV{'form.launch'} eq '2') {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
my $extra='';
if (defined($ENV{'form.titleelement'}) &&
$ENV{'form.titleelement'} ne '') {
Index: loncom/interface/lonpopulate.pm
diff -u loncom/interface/lonpopulate.pm:1.21 loncom/interface/lonpopulate.pm:1.22
--- loncom/interface/lonpopulate.pm:1.21 Thu Feb 17 03:29:43 2005
+++ loncom/interface/lonpopulate.pm Thu Feb 17 03:50:20 2005
@@ -1,5 +1,5 @@
# automated enrollment configuration handler
-# $Id: lonpopulate.pm,v 1.21 2005/02/17 08:29:43 albertel Exp $
+# $Id: lonpopulate.pm,v 1.22 2005/02/17 08:50:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2560,7 +2560,7 @@
sub handler {
my $r = shift;
if ($r->header_only) {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK;
}
@@ -2572,7 +2572,7 @@
return HTTP_NOT_ACCEPTABLE;
}
# Start page
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
my @tasks = ("information","chgsettings","setdates","setaccess","notify","crosslist","sections","photos","updatenow","viewclass");
Index: loncom/interface/lonsimplepage.pm
diff -u loncom/interface/lonsimplepage.pm:1.23 loncom/interface/lonsimplepage.pm:1.24
--- loncom/interface/lonsimplepage.pm:1.23 Thu Feb 17 03:29:43 2005
+++ loncom/interface/lonsimplepage.pm Thu Feb 17 03:50:20 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Page Editor
#
-# $Id: lonsimplepage.pm,v 1.23 2005/02/17 08:29:43 albertel Exp $
+# $Id: lonsimplepage.pm,v 1.24 2005/02/17 08:50:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,7 +40,7 @@
sub handler {
my $r = shift;
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
my $target=$ENV{'form.grade_target'};
Index: loncom/interface/lontest.pm
diff -u loncom/interface/lontest.pm:1.13 loncom/interface/lontest.pm:1.14
--- loncom/interface/lontest.pm:1.13 Thu Feb 17 03:29:43 2005
+++ loncom/interface/lontest.pm Thu Feb 17 03:50:20 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# A debugging harness.
#
-# $Id: lontest.pm,v 1.13 2005/02/17 08:29:43 albertel Exp $
+# $Id: lontest.pm,v 1.14 2005/02/17 08:50:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -48,7 +48,7 @@
sub handler {
my $r = shift;
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;