[LON-CAPA-cvs] cvs: loncom /interface lonbulletin.pm
bisitz
bisitz@source.lon-capa.org
Thu, 19 Nov 2009 18:05:32 -0000
This is a MIME encoded message
--bisitz1258653932
Content-Type: text/plain
bisitz Thu Nov 19 18:05:32 2009 EDT
Modified files:
/loncom/interface lonbulletin.pm
Log:
Code Style:
- Consistent code indention
- Replaced tabs by blanks
- Removed trailing blanks
Use
cvs diff -w -r1.48 -r1.49 lonbulletin.pm
to confirm that no logical changes occurred.
--bisitz1258653932
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20091119180532.txt"
Index: loncom/interface/lonbulletin.pm
diff -u loncom/interface/lonbulletin.pm:1.48 loncom/interface/lonbulletin.pm:1.49
--- loncom/interface/lonbulletin.pm:1.48 Sat Apr 4 21:47:40 2009
+++ loncom/interface/lonbulletin.pm Thu Nov 19 18:05:32 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Bulletin Board Handler
#
-# $Id: lonbulletin.pm,v 1.48 2009/04/04 21:47:40 bisitz Exp $
+# $Id: lonbulletin.pm,v 1.49 2009/11/19 18:05:32 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -48,21 +48,21 @@
# ------------------------------------------------------------ Print the screen
if ($target eq 'tex') {
- $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
+ $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
}
my (undef,undef,undef,undef,$marker)=split(/\//,$r->uri);
# Is this even in a course?
if (!$env{'request.course.id'}) {
- &Apache::loncommon::simple_error_page($r,'Not in a course',
- 'Not in a course');
+ &Apache::loncommon::simple_error_page($r,'Not in a course',
+ 'Not in a course');
return OK;
}
$marker=~s/\D//g;
if (!$marker) {
- &Apache::loncommon::simple_error_page($r,'Invalid Call',
- 'Invalid Call');
+ &Apache::loncommon::simple_error_page($r,'Invalid Call',
+ 'Invalid Call');
return OK;
}
@@ -83,7 +83,7 @@
# ----------------------------------------------------- Force menu registration
my %addentries;
if ($env{'form.origpage'}) {
- $addentries{'onload'} = "document.location='#newpost';";
+ $addentries{'onload'} = "document.location='#newpost';";
}
# --------------------------------------------------------------- Force Student
my $forcestudent='';
@@ -122,23 +122,23 @@
}
}
}
-
+
# --------------------------------------- There is such a user, get environment
- if ($target ne 'tex') {
- my $course_or_group;
- if($group eq ''){
- $course_or_group="Course";
- }else{
- $course_or_group="Group";
- }
- my $start_page =
- &Apache::loncommon::start_page("$course_or_group Discussion Board",undef,
- {'function' => $forcestudent,
- 'add_entries' => \%addentries,
- 'domain' => $dom,
- 'force_register' =>
- $env{'form.register'}});
- $r->print($start_page);
+ if ($target ne 'tex') {
+ my $course_or_group;
+ if($group eq '') {
+ $course_or_group="Course";
+ } else {
+ $course_or_group="Group";
+ }
+ my $start_page =
+ &Apache::loncommon::start_page("$course_or_group Discussion Board",undef,
+ {'function' => $forcestudent,
+ 'add_entries' => \%addentries,
+ 'domain' => $dom,
+ 'force_register' =>
+ $env{'form.register'}});
+ $r->print($start_page);
if ($group ne '' && $env{'form.group'} eq $group) {
my $gpterm = &Apache::loncommon::group_term();
my $ucgpterm = $gpterm;
@@ -164,9 +164,9 @@
if (!$allowed) {
if ((!&Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) &&
(!&Apache::lonnet::allowed('vgb',$env{'request.course.id'}.
- '/'.$group))) {
+ '/'.$group))) {
&print_end_page($r,$target);
- return OK;
+ return OK;
}
}
} else {
@@ -175,137 +175,137 @@
my $privileged=$allowed;
if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) {
- $forcestudent='student';
+ $forcestudent='student';
}
if ($target ne 'tex') { $r->print('<table><tr><td>'); }
- if ($forcestudent or $target eq 'tex') { $allowed=0; }
-
- if ($allowed) {
- my $query_str = 'forcestudent=1';
- if (($group ne '') && ($env{'form.group'} eq $group)) {
- $query_str.='&group='.$group.'&'.$refarg;
- }
- $r->print(
- '<p>'.
-&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'<br /><a href="'.$r->uri.'?'.$query_str.'"><font size="+1">'.&mt('Show Student View').'</font></a>'.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
- } elsif ($privileged and $target ne 'tex') {
- my $query_str = 'forceedit=edit';
- if (($group ne '') && ($env{'form.group'} eq $group)) {
- $query_str.='&group='.$group.'&'.$refarg;
- }
- $r->print('<a href="'.$r->uri.'?'.$query_str.'"><font size="+1">'
- .&mt('Edit').'</font></a>');
- }
-
- if (($env{'form.uploaddoc.filename'}) &&
- ($env{'form.storeupl'}) && ($allowed)) {
- if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
- if ($syllabus{'uploaded.photourl'}) {
- &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
- }
- if ($group ne '') {
- $syllabus{'uploaded.photourl'}=
- &Apache::lonnet::userfileupload('uploaddoc',1,
- 'bulletin/'.$group.'/'.$marker);
- } else {
- $syllabus{'uploaded.photourl'}=
- &Apache::lonnet::userfileupload('uploaddoc',1,
+ if ($forcestudent or $target eq 'tex') { $allowed=0; }
+
+ if ($allowed) {
+ my $query_str = 'forcestudent=1';
+ if (($group ne '') && ($env{'form.group'} eq $group)) {
+ $query_str.='&group='.$group.'&'.$refarg;
+ }
+ $r->print(
+ '<p>'.
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'<br /><a href="'.$r->uri.'?'.$query_str.'"><font size="+1">'.&mt('Show Student View').'</font></a>'.
+ &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
+ } elsif ($privileged and $target ne 'tex') {
+ my $query_str = 'forceedit=edit';
+ if (($group ne '') && ($env{'form.group'} eq $group)) {
+ $query_str.='&group='.$group.'&'.$refarg;
+ }
+ $r->print('<a href="'.$r->uri.'?'.$query_str.'"><font size="+1">'
+ .&mt('Edit').'</font></a>');
+ }
+
+ if (($env{'form.uploaddoc.filename'}) &&
+ ($env{'form.storeupl'}) && ($allowed)) {
+ if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
+ if ($syllabus{'uploaded.photourl'}) {
+ &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
+ }
+ if ($group ne '') {
+ $syllabus{'uploaded.photourl'}=
+ &Apache::lonnet::userfileupload('uploaddoc',1,
+ 'bulletin/'.$group.'/'.$marker);
+ } else {
+ $syllabus{'uploaded.photourl'}=
+ &Apache::lonnet::userfileupload('uploaddoc',1,
'bulletin/'.$marker);
- }
- }
- $syllabus{'uploaded.lastmodified'}=time;
- &Apache::lonnet::put('bulletinpage_'.$marker,\%syllabus,$dom,$crs);
- }
- if (($allowed) && ($env{'form.storesyl'})) {
- foreach my $syl_field (keys(%syllabusfields)) {
- my $field=$env{'form.'.$syl_field};
- $field=~s/\s+$//s;
- $field=&Apache::lonfeedback::clear_out_html($field,1);
- $syllabus{$syl_field}=$field;
- }
- $syllabus{'uploaded.lastmodified'}=time;
- &Apache::lonnet::put('bulletinpage_'.$marker,\%syllabus,$dom,$crs);
- }
+ }
+ }
+ $syllabus{'uploaded.lastmodified'}=time;
+ &Apache::lonnet::put('bulletinpage_'.$marker,\%syllabus,$dom,$crs);
+ }
+ if (($allowed) && ($env{'form.storesyl'})) {
+ foreach my $syl_field (keys(%syllabusfields)) {
+ my $field=$env{'form.'.$syl_field};
+ $field=~s/\s+$//s;
+ $field=&Apache::lonfeedback::clear_out_html($field,1);
+ $syllabus{$syl_field}=$field;
+ }
+ $syllabus{'uploaded.lastmodified'}=time;
+ &Apache::lonnet::put('bulletinpage_'.$marker,\%syllabus,$dom,$crs);
+ }
# ---------------------------------------------------------------- Get syllabus
if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
- if ($syllabus{'uploaded.photourl'}) {
- &Apache::lonnet::allowuploaded('/adm/syllabus',
- $syllabus{'uploaded.photourl'});
- $r->print('<img src="'.$syllabus{'uploaded.photourl'}.
- '" align="right" />');
- }
- if ($allowed) {
- $r->print(
- '<form method="post" enctype="multipart/form-data">'.
- '<input type="hidden" name="forceedit" value="edit" />'.
- '<h3>'.&mt('Upload a Photo').'</h3>'.
- '<input type="file" name="uploaddoc" size="50" />'.
- '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
- '</form><form method="post">'.
- '<input type="hidden" name="forceedit" value="edit" />');
- }
- foreach my $field (sort(keys(%syllabusfields))) {
- if (($syllabus{$field}) || ($allowed)) {
- my $message=$syllabus{$field};
- &Apache::lonfeedback::newline_to_br(\$message);
- $message
- =~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
- if ($allowed) {
- $message=&Apache::lonspeller::markeduptext($message);
- }
- $message=&Apache::lontexconvert::msgtexconverted($message);
- unless ($field eq 'aaa_title') {
- if (($field ne 'bbb_content') || ($allowed)) {
- if ($target ne 'tex') {
- $r->print('<h3>'.$syllabusfields{$field}.'</h3>');
- } else {
- $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\');
- }
- }
- if ($target ne 'tex') {
- $r->print('<blockquote>'.
- $message.'</blockquote>');
- } else {
- $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$message).' ');
- }
- if ($allowed) {
- $r->print('<br /><textarea cols="80" rows="10" name="'.$field.'">'.
- &HTML::Entities::encode($syllabus{$field},'&"<>').
- '</textarea><input type="submit" name="storesyl" value="'.&mt('Save').'" />');
- }
- } else {
- if ($target ne 'tex') {
- $r->print('<h1>'.$message.'</h1>');
- } else {
- $r->print('\\\\\textbf{'.&Apache::lonxml::xmlparse($r,'tex',$message).'}\\\\');
- }
+ if ($syllabus{'uploaded.photourl'}) {
+ &Apache::lonnet::allowuploaded('/adm/syllabus',
+ $syllabus{'uploaded.photourl'});
+ $r->print('<img src="'.$syllabus{'uploaded.photourl'}.
+ '" align="right" />');
+ }
+ if ($allowed) {
+ $r->print(
+ '<form method="post" enctype="multipart/form-data">'.
+ '<input type="hidden" name="forceedit" value="edit" />'.
+ '<h3>'.&mt('Upload a Photo').'</h3>'.
+ '<input type="file" name="uploaddoc" size="50" />'.
+ '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
+ '</form><form method="post">'.
+ '<input type="hidden" name="forceedit" value="edit" />');
+ }
+ foreach my $field (sort(keys(%syllabusfields))) {
+ if (($syllabus{$field}) || ($allowed)) {
+ my $message=$syllabus{$field};
+ &Apache::lonfeedback::newline_to_br(\$message);
+ $message
+ =~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
if ($allowed) {
- $r->print(
- '<br />'.&mt('Topic').'<br /><textarea cols="80" rows="2" name="'.$field.'">'.
- &HTML::Entities::encode($syllabus{$field},'&"<>').
- '</textarea><input type="submit" name="storesyl" value="'.&mt('Save').'" />');
+ $message=&Apache::lonspeller::markeduptext($message);
+ }
+ $message=&Apache::lontexconvert::msgtexconverted($message);
+ unless ($field eq 'aaa_title') {
+ if (($field ne 'bbb_content') || ($allowed)) {
+ if ($target ne 'tex') {
+ $r->print('<h3>'.$syllabusfields{$field}.'</h3>');
+ } else {
+ $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\');
+ }
+ }
+ if ($target ne 'tex') {
+ $r->print('<blockquote>'.
+ $message.'</blockquote>');
+ } else {
+ $r->print(' '.&Apache::lonxml::xmlparse($r,'tex',$message).' ');
+ }
+ if ($allowed) {
+ $r->print('<br /><textarea cols="80" rows="10" name="'.$field.'">'.
+ &HTML::Entities::encode($syllabus{$field},'&"<>').
+ '</textarea><input type="submit" name="storesyl" value="'.&mt('Save').'" />');
+ }
+ } else {
+ if ($target ne 'tex') {
+ $r->print('<h1>'.$message.'</h1>');
+ } else {
+ $r->print('\\\\\textbf{'.&Apache::lonxml::xmlparse($r,'tex',$message).'}\\\\');
+ }
+ if ($allowed) {
+ $r->print(
+ '<br />'.&mt('Topic').'<br /><textarea cols="80" rows="2" name="'.$field.'">'.
+ &HTML::Entities::encode($syllabus{$field},'&"<>').
+ '</textarea><input type="submit" name="storesyl" value="'.&mt('Save').'" />');
+ }
}
}
- }
- }
- if ($allowed) {
- $r->print('</form>');
- }
- if ($target ne 'tex') {$r->print('</p>');} else {$r->print('\\\\');}
+ }
+ if ($allowed) {
+ $r->print('</form>');
+ }
+ if ($target ne 'tex') {$r->print('</p>');} else {$r->print('\\\\');}
} else {
- $r->print('<p>'.&mt('No page information provided.').'</p>');
+ $r->print('<p>'.&mt('No page information provided.').'</p>');
}
if ($target ne 'tex') { $r->print('</td></tr></table>'); }
if ($target ne 'tex') {
- $r->print(&Apache::lonfeedback::list_discussion
- ('board','OPEN','bulletin___'.$marker.'___'.
- $r->uri,undef,$group));
+ $r->print(&Apache::lonfeedback::list_discussion
+ ('board','OPEN','bulletin___'.$marker.'___'.
+ $r->uri,undef,$group));
} else {
- $r->print('\\\\'.&Apache::lonxml::xmlparse($r,'tex',&Apache::lonfeedback::list_discussion
- ('board','OPEN','bulletin___'.$marker.'___'.
- $r->uri,undef,$group)));
+ $r->print('\\\\'.&Apache::lonxml::xmlparse($r,'tex',&Apache::lonfeedback::list_discussion
+ ('board','OPEN','bulletin___'.$marker.'___'.
+ $r->uri,undef,$group)));
}
&print_end_page($r,$target);
return OK;
--bisitz1258653932--