--- loncom/interface/lonsimplepage.pm 2004/04/30 23:13:52 1.17 +++ loncom/interface/lonsimplepage.pm 2004/05/11 18:43:21 1.18 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.17 2004/04/30 23:13:52 albertel Exp $ +# $Id: lonsimplepage.pm,v 1.18 2004/05/11 18:43:21 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -43,9 +43,9 @@ sub handler { $r->content_type('text/html'); $r->send_http_header; return OK if $r->header_only; - + my $target=$ENV{'form.grade_target'}; # ------------------------------------------------------------ Print the screen - if ($ENV{'form.grade_target'} ne 'tex') { + if ($target ne 'tex') { $r->print(< @@ -57,7 +57,7 @@ ENDDOCUMENT my (undef,undef,undef,undef,$marker)=split(/\//,$r->uri); # Is this even in a course? unless ($ENV{'request.course.id'}) { - if ($ENV{'form.grade_target'} ne 'tex') { + if ($target ne 'tex') { $r->print('Not in a course'); return OK; } else { @@ -94,7 +94,7 @@ ENDDOCUMENT } # --------------------------------------------------------------- Force Student my $forcestudent=''; - if ($ENV{'form.forcestudent'} ||$ENV{'form.grade_target'} eq 'tex' ) { $forcestudent='student'; }; + if ($ENV{'form.forcestudent'} || $target eq 'tex' ) { $forcestudent='student'; }; my $forceedit=''; if ($ENV{'form.forceedit'}) { $forceedit='edit'; } @@ -103,7 +103,7 @@ ENDDOCUMENT # --------------------------------------- There is such a user, get environment - if ($ENV{'form.grade_target'} ne 'tex') { + if ($target ne 'tex') { $r->print(''.&Apache::loncommon::bodytag ("Course Page",$forcestudent,$addentries,'',$dom,$ENV{'form.register'})); } @@ -114,119 +114,122 @@ ENDDOCUMENT $forcestudent='student'; } - if ($forcestudent) { $allowed=0; } - - if ($ENV{'form.grade_target'} ne 'tex') { - if ($allowed) { - $r->print('

'. - &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'
'.&mt('Show Student View').''. - &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); - } elsif ($privileged) { - $r->print(''.&mt('Edit').''); - } - } - 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'}); - } - $syllabus{'uploaded.photourl'}= - &Apache::lonnet::userfileupload('uploaddoc',1,'simplepage'); - } - $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put('smppage_'.$marker,\%syllabus,$dom,$crs); - } - if (($allowed) && ($ENV{'form.storesyl'})) { - foreach (keys %syllabusfields) { - my $field=$ENV{'form.'.$_}; - $field=~s/\s+$//s; - $field=&Apache::lonfeedback::clear_out_html($field,1); - $syllabus{$_}=$field; - } - $syllabus{'uploaded.lastmodified'}=time; - &Apache::lonnet::put('smppage_'.$marker,\%syllabus,$dom,$crs); - } + if ($forcestudent or $target eq 'tex') { $allowed=0; } + + if ($allowed) { + $r->print('

'. + &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'
'.&mt('Show Student View').''. + &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'

'); + } elsif ($privileged and $target ne 'tex') { + $r->print(''.&mt('Edit').''); + } + if (($ENV{'form.uploaddoc.filename'} and $target ne 'tex') && + ($ENV{'form.storeupl'}) && ($allowed)) { + if ($ENV{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { + if ($syllabus{'uploaded.photourl'}) { + &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); + } + $syllabus{'uploaded.photourl'}= + &Apache::lonnet::userfileupload('uploaddoc',1,'simplepage'); + } + $syllabus{'uploaded.lastmodified'}=time; + &Apache::lonnet::put('smppage_'.$marker,\%syllabus,$dom,$crs); + } + if (($allowed) && ($ENV{'form.storesyl'})) { + foreach (keys %syllabusfields) { + my $field=$ENV{'form.'.$_}; + $field=~s/\s+$//s; + $field=&Apache::lonfeedback::clear_out_html($field,1); + $syllabus{$_}=$field; + } + $syllabus{'uploaded.lastmodified'}=time; + &Apache::lonnet::put('smppage_'.$marker,\%syllabus,$dom,$crs); + } # ---------------------------------------------------------------- Get syllabus if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) { - if ($syllabus{'uploaded.photourl'}) { - if ($ENV{'form.grade_target'} ne 'tex') { - &Apache::lonnet::allowuploaded('/adm/smppg', - $syllabus{'uploaded.photourl'}); - $r->print(''); - } - } - if ($allowed && ($ENV{'form.grade_target'} ne 'tex')) { - $r->print( - '
'. - ''. - '

Upload a Photo

'. - ''. - ''. - '
'); - } - foreach (sort keys %syllabusfields) { - if (($syllabus{$_}) || ($allowed)) { - my $message=$syllabus{$_}; - $message=~s/\n/\
/g; - $message - =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; - $message=&Apache::lontexconvert::msgtexconverted($message); - unless ($_ eq 'aaa_title') { - if (($_ ne 'bbb_content') || ($allowed)) { - if ($ENV{'form.grade_target'} ne 'tex') { - $r->print('

'.$syllabusfields{$_}.'

'); - } else { - my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$syllabusfields{$_}.'

')); + if ($syllabus{'uploaded.photourl'}) { + if ($target ne 'tex') { + &Apache::lonnet::allowuploaded('/adm/smppg', + $syllabus{'uploaded.photourl'}); + $r->print(''); + } else { + &Apache::lonnet::allowuploaded('/adm/smppg', + $syllabus{'uploaded.photourl'}); + $r->print(&Apache::lonxml::xmlparse($r,'tex','')); + } + } + if ($allowed) { + $r->print( + ''. + ''. + '

Upload a Photo

'. + ''. + ''. + '
'); + } + foreach (sort keys %syllabusfields) { + if (($syllabus{$_}) || ($allowed)) { + my $message=$syllabus{$_}; + $message=~s/\n/\
/g; + $message + =~s/(https*\:\/\/[^\s]+)/\\$1\<\/tt\>\<\/a\>/g; + $message=&Apache::lontexconvert::msgtexconverted($message); + unless ($_ eq 'aaa_title') { + if (($_ ne 'bbb_content') || ($allowed)) { + if ($target ne 'tex') { + $r->print('

'.$syllabusfields{$_}.'

'); + } else { + my $safeinit; + $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$syllabusfields{$_}.'

')); + } } - } - if ($ENV{'form.grade_target'} ne 'tex') { - $r->print('
'. - $message.'
'); - } else { + if ($target ne 'tex') { + $r->print('
'. + $message.'
'); + } else { my $safeinit; $r->print(&Apache::lonxml::xmlparse($r,'tex',$message)); - } - if ($allowed) { - if ($ENV{'form.grade_target'} ne 'tex') { - $r->print('
'); - } else { - my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$_},$safeinit)); - } - } - } else { - if ($ENV{'form.grade_target'} ne 'tex') { - $r->print('

'.$message.'

'); + } + if ($allowed) { + if ($target ne 'tex') { + $r->print('
'); + } else { + my $safeinit; + $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$_},$safeinit)); + } + } } else { - my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$message.'

')); - } - if ($allowed) { - if ($ENV{'form.grade_target'} ne 'tex') { - $r->print( - '
Title
'); + if ($target ne 'tex') { + $r->print('

'.$message.'

'); } else { my $safeinit; - $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$_},$safeinit)); + $r->print(&Apache::lonxml::xmlparse($r,'tex','

'.$message.'

')); + } + if ($allowed) { + if ($ENV{'form.grade_target'} ne 'tex') { + $r->print( + '
Title
'); + } else { + my $safeinit; + $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$_},$safeinit)); + } } - } - } - } - } - if ($allowed && ($ENV{'form.grade_target'} ne 'tex')) { - $r->print(''); - } - if ($ENV{'form.grade_target'} ne 'tex') {$r->print('

');} + } + } + } + if ($allowed && ($ENV{'form.grade_target'} ne 'tex')) { + $r->print(''); + } + if ($ENV{'form.grade_target'} ne 'tex') {$r->print('

');} } else { - $r->print('

No page information provided.

'); + $r->print('

No page information provided.

'); } if ($ENV{'form.grade_target'} ne 'tex') { $r->print('');