[LON-CAPA-cvs] cvs: loncom /interface lonaboutme.pm lonsyllabus.pm
www
lon-capa-cvs@mail.lon-capa.org
Tue, 27 Aug 2002 20:29:54 -0000
www Tue Aug 27 16:29:54 2002 EDT
Modified files:
/loncom/interface lonaboutme.pm lonsyllabus.pm
Log:
"about me" is a lot like syllabus, but not quite
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.1 loncom/interface/lonaboutme.pm:1.2
--- loncom/interface/lonaboutme.pm:1.1 Tue Aug 27 08:48:46 2002
+++ loncom/interface/lonaboutme.pm Tue Aug 27 16:29:54 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
-# About a Person
+# "About Me" Personal Information
#
-# $Id: lonaboutme.pm,v 1.1 2002/08/27 12:48:46 www Exp $
+# $Id: lonaboutme.pm,v 1.2 2002/08/27 20:29:54 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,6 +32,7 @@
use Apache::Constants qw(:common);
use Apache::loncommon;
use Apache::lonnet;
+use Apache::lontexconvert;
sub handler {
my $r = shift;
@@ -39,7 +40,6 @@
$r->send_http_header;
return OK if $r->header_only;
-
# ------------------------------------------------------------ Print the screen
$r->print(<<ENDDOCUMENT);
<html>
@@ -47,13 +47,94 @@
<title>The LearningOnline Network with CAPA</title>
</head>
ENDDOCUMENT
- $r->print(&Apache::loncommon::bodytag("Personal Information"));
-# does this user have privileges to post, etc?
- my $allowed=0;
- if ($ENV{'request.course.id'}) {
- $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});
+ my (undef,undef,$cdom,$cnum)=split(/\//,$r->uri);
+# Is this even a user?
+ if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
+ $r->print('<body>No user information available</body>');
+ return OK;
}
+# --------------------------------------------------------- The syllabus fields
+ my %syllabusfields=(
+ 'aaa_instructorinfo' => 'Instructor Information',
+ 'bbb_description' => 'Course Description',
+ 'ccc_prereq' => 'Prerequisites',
+ 'ddd_officehours' => 'Office Hours',
+ 'eee_helproom' => 'Helproom Hours',
+ 'fff_examinfo' => 'Exam Information',
+ 'ggg_grading' => 'Grading Information',
+ 'hhh_readings' => 'Readings');
+
+# --------------------------------------------------------------- Force Student
+ &Apache::loncommon::get_unprocessed_cgi
+ ($ENV{'QUERY_STRING'},['forcestudent']);
+ my $forcestudent='';
+ if ($ENV{'form.forcestudent'}) { $forcestudent='student'; };
+
+# --------------------------------------- There is such a user, get environment
+ my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
+ $r->print(&Apache::loncommon::bodytag
+ ("Personal Information",$forcestudent,'','',$cdom));
+ $r->print('<h1>'.&Apache::loncommon::plainname($cnum,$cdom).'</h1><h3>'.
+ $Apache::lonnet::domaindescription{$cdom}.'</h3>');
+ my %syllabus=&Apache::lonnet::dump('aboutme',$cdom,$cnum);
+ my $allowed=0;
+# does this user have privileges to post, etc?
+
+ $allowed=(($ENV{'user.name'} eq $cnum) &&
+ ($ENV{'user.domain'} eq $cdom));
+ if ($forcestudent) { $allowed=0; }
+
+ if ($allowed) {
+ $r->print(
+ '<p><a href="'.$r->uri.'?forcestudent=1">Show Student View</a></p>');
+ }
+ if (($allowed) && ($ENV{'form.storesyl'})) {
+ foreach (keys %syllabusfields) {
+ my $field=$ENV{'form.'.$_};
+ $field=~s/\s+$//s;
+ $field=~s/\</\<\;/g;
+ $field=~s/\>/\>\;/g;
+ if ($field) {
+ $syllabus{$_}=$field;
+ } else {
+ delete $syllabus{$_};
+ }
+ }
+ $syllabus{'uploaded.lastmodified'}=time;
+ &Apache::lonnet::put('aboutme',\%syllabus,$cdom,$cnum);
+ }
+
+# ---------------------------------------------------------------- Get syllabus
+ if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
+ $r->print('Last updated:'.
+ localtime($syllabus{'uploaded.lastmodified'}));
+ if ($allowed) {
+ $r->print('<form method="post">');
+ }
+ foreach (sort keys %syllabusfields) {
+ if (($syllabus{$_}) || ($allowed)) {
+ my $message=$syllabus{$_};
+ $message=~s/\n/\<br \/\>/g;
+ $message
+ =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
+ $message=&Apache::lontexconvert::msgtexconverted($message);
+ $r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'.
+ $message.'</blockquote>');
+ if ($allowed) {
+ $r->print('<br /><textarea cols="80" rows="6" name="'.$_.'">'.
+ $syllabus{$_}.
+ '</textarea><input type="submit" name="storesyl" value="Store" />');
+ }
+ }
+ }
+ if ($allowed) {
+ $r->print('</form>');
+ }
+ $r->print('</p>');
+ } else {
+ $r->print('<p>No syllabus information provided.</p>');
+ }
$r->print('</body></html>');
return OK;
}
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.5 loncom/interface/lonsyllabus.pm:1.6
--- loncom/interface/lonsyllabus.pm:1.5 Tue Aug 27 15:59:08 2002
+++ loncom/interface/lonsyllabus.pm Tue Aug 27 16:29:54 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Syllabus
#
-# $Id: lonsyllabus.pm,v 1.5 2002/08/27 19:59:08 www Exp $
+# $Id: lonsyllabus.pm,v 1.6 2002/08/27 20:29:54 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -64,10 +64,16 @@
'ggg_grading' => 'Grading Information',
'hhh_readings' => 'Readings');
+# --------------------------------------------------------------- Force Student
+ &Apache::loncommon::get_unprocessed_cgi
+ ($ENV{'QUERY_STRING'},['forcestudent']);
+ my $forcestudent='';
+ if ($ENV{'form.forcestudent'}) { $forcestudent='student'; };
# ------------------------------------- There is such a course, get environment
my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
- $r->print(&Apache::loncommon::bodytag("Syllabus",'','','',$cdom));
+ $r->print(&Apache::loncommon::bodytag
+ ("Syllabus",$forcestudent,'','',$cdom));
$r->print('<h1>'.$courseenv{'description'}.'</h1><h3>'.
$Apache::lonnet::domaindescription{$cdom}.'</h3>');
my %syllabus=&Apache::lonnet::dump('syllabus',$cdom,$cnum);
@@ -79,7 +85,12 @@
# does this user have privileges to post, etc?
if ($ENV{'request.course.id'}) {
$allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});
+ if ($forcestudent) { $allowed=0; }
}
+ if ($allowed) {
+ $r->print(
+ '<p><a href="'.$r->uri.'?forcestudent=1">Show Student View</a></p>');
+ }
if (($allowed) && ($ENV{'form.storesyl'})) {
foreach (keys %syllabusfields) {
my $field=$ENV{'form.'.$_};