version 1.81, 2009/05/15 09:55:32
|
version 1.86, 2009/11/26 05:21:43
|
Line 51 sub get_db_name {
|
Line 51 sub get_db_name {
|
my $db_name; |
my $db_name; |
|
|
if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) { |
if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) { |
$marker =~ s/\W//g; |
$marker =~ s/\W//g; |
$db_name = 'grppage_'.$marker; |
$db_name = 'grppage_'.$marker; |
} else { |
} else { |
$marker=~s/\D//g; |
$marker=~s/\D//g; |
$db_name = 'smppage_'.$marker; |
$db_name = 'smppage_'.$marker; |
} |
} |
return if (!defined($marker)); |
return if (!defined($marker)); |
Line 70 sub handler {
|
Line 70 sub handler {
|
my $target=$env{'form.grade_target'}; |
my $target=$env{'form.grade_target'}; |
# ------------------------------------------------------------ Print the screen |
# ------------------------------------------------------------ Print the screen |
if ($target eq 'tex') { |
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'})); |
} |
} |
|
|
# Is this even in a course? |
# Is this even in a course? |
unless ($env{'request.course.id'}) { |
unless ($env{'request.course.id'}) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
&Apache::loncommon::simple_error_page($r,'','Not in a course'); |
&Apache::loncommon::simple_error_page($r,'','Not in a course'); |
} else { |
} else { |
$r->print('\textbf{Not in a course}\end{document}'); |
$r->print('\textbf{Not in a course}\end{document}'); |
} |
} |
return OK; |
return OK; |
} |
} |
|
|
my $db_name = &get_db_name($r->uri); |
my $db_name = &get_db_name($r->uri); |
Line 93 sub handler {
|
Line 93 sub handler {
|
my %groupinfo = (); |
my %groupinfo = (); |
if ($db_name =~ /^grppage_/) { |
if ($db_name =~ /^grppage_/) { |
$group = (split(m{/},$r->uri))[4]; |
$group = (split(m{/},$r->uri))[4]; |
$group =~ s/\W//g; |
$group =~ s/\W//g; |
my %curr_groups = &Apache::longroup::coursegroups($dom,$crs,$group); |
my %curr_groups = &Apache::longroup::coursegroups($dom,$crs,$group); |
if (!%curr_groups) { |
if (!%curr_groups) { |
&Apache::loncommon::simple_error_page($r,'','Invalid group name'); |
&Apache::loncommon::simple_error_page($r,'','Invalid group name'); |
return OK; |
return OK; |
} |
} |
%groupinfo = |
%groupinfo = |
&Apache::longroup::get_group_settings($curr_groups{$group}); |
&Apache::longroup::get_group_settings($curr_groups{$group}); |
$group_desc = &unescape($groupinfo{'description'}); |
$group_desc = &unescape($groupinfo{'description'}); |
} |
} |
|
|
if (!$db_name) { |
if (!$db_name) { |
&Apache::loncommon::simple_error_page($r,'','Invalid call'); |
&Apache::loncommon::simple_error_page($r,'','Invalid call'); |
return OK; |
return OK; |
} |
} |
|
|
# --------------------------------------------------------- The syllabus fields |
# --------------------------------------------------------- The syllabus fields |
Line 143 sub handler {
|
Line 143 sub handler {
|
if ($group ne '') { |
if ($group ne '') { |
$title = 'Simple Group Page'; |
$title = 'Simple Group Page'; |
} |
} |
my $start_page = |
my $start_page = |
&Apache::loncommon::start_page($title,undef, |
&Apache::loncommon::start_page($title,undef, |
{'function' => $forcestudent, |
{'function' => $forcestudent, |
'domain' => $dom, |
'domain' => $dom, |
'force_register' => |
'force_register' => |
$env{'form.register'},}); |
$env{'form.register'},}); |
$r->print($start_page); |
$r->print($start_page); |
} |
} |
|
|
if ($group ne '') { |
if ($group ne '') { |
Line 179 sub handler {
|
Line 179 sub handler {
|
return OK; |
return OK; |
} |
} |
} else { |
} else { |
my $msg = |
my $msg = |
&mt('You do not currently have rights to view this group.'); |
&mt('You do not currently have rights to view this group.'); |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
$r->print("<p>$msg</p>". |
$r->print('<p class="LC_warning">'.$msg.'</p>'. |
&Apache::loncommon::end_page()); |
&Apache::loncommon::end_page()); |
} else { |
} else { |
$r->print('\textbf{'.$msg.'}\end{document}'); |
$r->print('\textbf{'.$msg.'}\end{document}'); |
} |
} |
return OK; |
return OK; |
} |
} |
my ($blocked,$blocktext) = |
my ($blocked,$blocktext) = |
&Apache::loncommon::blocking_status('groups'); |
&Apache::loncommon::blocking_status('groups'); |
Line 210 sub handler {
|
Line 210 sub handler {
|
} |
} |
my $privileged=$allowed; |
my $privileged=$allowed; |
if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { |
if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) { |
$forcestudent='student'; |
$forcestudent='student'; |
} |
} |
|
|
if ($forcestudent or $target eq 'tex') { $allowed=0; } |
if ($forcestudent or $target eq 'tex') { $allowed=0; } |
|
|
if (($env{'form.uploaddoc.filename'} and $target ne 'tex') && |
if (($env{'form.uploaddoc.filename'} and $target ne 'tex') && |
($env{'form.storeupl'}) && ($allowed)) { |
($env{'form.storeupl'}) && ($allowed)) { |
if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { |
if ($env{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) { |
if ($syllabus{'uploaded.photourl'}) { |
if ($syllabus{'uploaded.photourl'}) { |
&Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); |
&Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'}); |
} |
} |
if ($group ne '') { |
if ($group ne '') { |
$syllabus{'uploaded.photourl'}=&Apache::lonnet::userfileupload( |
$syllabus{'uploaded.photourl'}=&Apache::lonnet::userfileupload( |
'uploaddoc',1,"grouppage/$group"); |
'uploaddoc',1,"grouppage/$group"); |
} else { |
} else { |
$syllabus{'uploaded.photourl'}= |
$syllabus{'uploaded.photourl'}= |
&Apache::lonnet::userfileupload('uploaddoc',1,'simplepage'); |
&Apache::lonnet::userfileupload('uploaddoc',1,'simplepage'); |
} |
} |
} |
} |
$syllabus{'uploaded.lastmodified'}=time; |
$syllabus{'uploaded.lastmodified'}=time; |
&Apache::lonnet::put($db_name,\%syllabus,$dom,$crs); |
&Apache::lonnet::put($db_name,\%syllabus,$dom,$crs); |
} |
} |
if ($allowed && $env{'form.delupl'}) { |
if ($allowed && $env{'form.delupl'}) { |
if ($syllabus{'uploaded.photourl'}) { |
if ($syllabus{'uploaded.photourl'}) { |
Line 240 sub handler {
|
Line 240 sub handler {
|
} |
} |
} |
} |
if (($allowed) && ($env{'form.storesyl'})) { |
if (($allowed) && ($env{'form.storesyl'})) { |
foreach my $syl_field (keys(%syllabusfields)) { |
foreach my $syl_field (keys(%syllabusfields)) { |
my $field=$env{'form.'.$syl_field}; |
my $field=$env{'form.'.$syl_field}; |
chomp($field); |
chomp($field); |
$field=~s/\s+$//s; |
$field=~s/\s+$//s; |
$field=~s/^\s+//s; |
$field=~s/^\s+//s; |
$field=~s/\<br\s*\/*\>$//s; |
$field=~s/\<br\s*\/*\>$//s; |
$field=&Apache::lonfeedback::clear_out_html($field,1); |
$field=&Apache::lonfeedback::clear_out_html($field,1); |
$syllabus{$syl_field}=$field; |
$syllabus{$syl_field}=$field; |
} |
} |
$syllabus{'uploaded.lastmodified'}=time; |
$syllabus{'uploaded.lastmodified'}=time; |
&Apache::lonnet::put($db_name,\%syllabus,$dom,$crs); |
&Apache::lonnet::put($db_name,\%syllabus,$dom,$crs); |
|
} |
|
|
|
#---Print Function |
|
if ($target ne 'tex') { |
|
if ($allowed || $privileged) { |
|
my $functions=&Apache::lonhtmlcommon::start_funclist(); |
|
if ($allowed) { |
|
$functions.=&Apache::lonhtmlcommon::add_item_funclist( |
|
'<a href="'.$r->uri.'?forcestudent=1">' |
|
.&mt('Show Student View').'</a>' |
|
.&Apache::loncommon::help_open_topic( |
|
'Uploaded_Templates_PublicView')); |
|
} elsif ($privileged) { |
|
my $edittext = &mt('Edit'); |
|
if ($group ne '') { |
|
$edittext = &mt('Edit Group Homepage'); |
|
} |
|
$functions.=&Apache::lonhtmlcommon::add_item_funclist( |
|
'<a href="'.$r->uri.'?forceedit=edit'.$refarg.'">' |
|
.$edittext.'</a>'); |
|
if ($group ne '') { |
|
if ($group_edit_perm) { |
|
$functions.=&Apache::lonhtmlcommon::add_item_funclist( |
|
'<a href="/adm/coursegroups' |
|
.'?action=modify&refpage=grouplist' |
|
.'&state=pick_task&groupname=' |
|
.$group.'">' |
|
.&mt('Edit Group Settings') |
|
.'</a>'); |
|
} |
|
} |
|
} |
|
$functions.=&Apache::lonhtmlcommon::end_funclist(); |
|
$r->print(&Apache::loncommon::head_subbox($functions)); |
|
} |
} |
} |
|
|
#---Print help Text |
#---Print help Text |
if($target ne 'tex'){ |
if($target ne 'tex'){ |
if ($allowed) { |
if ($allowed) { |
$r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))); |
$r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes'))); |
} |
|
} |
|
#---Print Function |
|
if ($target ne 'tex') { |
|
if ($allowed || $privileged) { |
|
$r->print(&Apache::lontemplate::start_functionslist()); |
|
if ($allowed) { |
|
$r->print(&Apache::lontemplate::item_functionslist( |
|
'<a href="'.$r->uri.'?forcestudent=1">'.&mt('Show Student View').'</a>' |
|
.&Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView'))); |
|
} elsif ($privileged) { |
|
my $edittext = &mt('Edit'); |
|
if ($group ne '') { |
|
$edittext = &mt('Edit Group Homepage'); |
|
} |
|
$r->print(&Apache::lontemplate::item_functionslist( |
|
'<a href="'.$r->uri.'?forceedit=edit'.$refarg.'">'.$edittext.'</a>')); |
|
if ($group ne '') { |
|
if ($group_edit_perm) { |
|
$r->print(&Apache::lontemplate::item_functionslist( |
|
'<a href="/adm/coursegroups?action=modify&refpage=grouplist' |
|
.'&state=pick_task&groupname='.$group.'">' |
|
.&mt('Edit Group Settings').'</a>')); |
|
} |
|
} |
|
} |
|
$r->print(&Apache::lontemplate::end_functionslist()); |
|
} |
} |
} |
} |
|
|
Line 291 sub handler {
|
Line 299 sub handler {
|
if ((($syllabus{'uploaded.lastmodified'}) && |
if ((($syllabus{'uploaded.lastmodified'}) && |
(($group ne '' && ($group_home_view || $group_edit_perm || |
(($group ne '' && ($group_home_view || $group_edit_perm || |
$group_view_perm)) || ($group eq ''))) || ($allowed)) { |
$group_view_perm)) || ($group eq ''))) || ($allowed)) { |
my $image; |
my $image; |
if ($syllabus{'uploaded.photourl'}) { |
if ($syllabus{'uploaded.photourl'}) { |
&Apache::lonnet::allowuploaded('/adm/smppg', |
&Apache::lonnet::allowuploaded('/adm/smppg', |
$syllabus{'uploaded.photourl'}); |
$syllabus{'uploaded.photourl'}); |
|
|
$image='<img src="'.$syllabus{'uploaded.photourl'}.'" |
$image='<img src="'.$syllabus{'uploaded.photourl'} |
/>'; |
.'" alt="'.&mt('Image').'" />'; |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$image=&Apache::lonxml::xmlparse($r,'tex',$image); |
$image=&Apache::lonxml::xmlparse($r,'tex',$image); |
} |
} |
} |
} |
|
|
if ($allowed) { |
if ($allowed) { |
$r->print( |
$r->print( |
'<form method="post" enctype="multipart/form-data">'. |
'<form method="post" action="" enctype="multipart/form-data">'. |
'<input type="hidden" name="forceedit" value="edit" />'. |
'<input type="hidden" name="forceedit" value="edit" />'. |
'<h3>'.&mt('Upload a Photo').'</h3>'. |
'<h3>'.&mt('Upload a Photo').'</h3>'. |
'<input type="file" name="uploaddoc" size="50" />'. |
'<input type="file" name="uploaddoc" size="50" />'. |
'<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'. |
'<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'. |
'</form><form method="post">'. |
'</form><form method="post" action="">'. |
'<input type="hidden" name="forceedit" value="edit" />'); |
'<input type="hidden" name="forceedit" value="edit" />'); |
if ($syllabus{'uploaded.photourl'}) { |
if ($syllabus{'uploaded.photourl'}) { |
$r->print('<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />' ); |
$r->print('<input type="submit" name="delupl"' |
|
.' value="'.&mt('Delete Photo').'" />'); |
} |
} |
} |
} |
if ($allowed) { |
if ($allowed) { |
$r->print($image.'<div class="clear"> </div>'); |
$r->print($image.'<div class="LC_footer_clear"> </div>'); |
} |
} |
|
|
foreach my $field (sort(keys(%syllabusfields))) { |
foreach my $field (sort(keys(%syllabusfields))) { |
if (($syllabus{$field}) || ($allowed) || |
if (($syllabus{$field}) || ($allowed) || |
($field eq 'abb_links' && $group ne '')) { |
($field eq 'abb_links' && $group ne '')) { |
my $message=$syllabus{$field}; |
my $message=$syllabus{$field}; |
&Apache::lonfeedback::newline_to_br(\$message); |
if (!&Apache::lonfeedback::contains_block_html($message)) { |
$message=~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g; |
&Apache::lonfeedback::newline_to_br(\$message); |
if ($allowed) { |
} |
$message=&Apache::lonspeller::markeduptext($message); |
$message=~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g; |
} |
if ($allowed) { |
if ($target ne 'tex') { |
$message=&Apache::lonspeller::markeduptext($message); |
$message=&Apache::lontexconvert::msgtexconverted($message); |
} |
} |
if ($target ne 'tex') { |
|
$message=&Apache::lontexconvert::msgtexconverted($message); |
|
} |
if ($field eq 'abb_links' && $group ne '') { |
if ($field eq 'abb_links' && $group ne '') { |
$r->print('<br /><input type="hidden" name="'.$field. |
$r->print('<br /><input type="hidden" name="'.$field. |
'" value="'.$syllabus{$field}.'" />'); |
'" value="'.$syllabus{$field}.'" />'); |
Line 340 sub handler {
|
Line 351 sub handler {
|
$r->print('<br />'); |
$r->print('<br />'); |
} elsif ($field eq 'aaa_title') { |
} elsif ($field eq 'aaa_title') { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
if ($allowed) { |
if ($allowed) { |
$r->print('<p>'); |
$r->print('<p>'); |
} |
} |
$r->print('<h2>'.$message.'</h2>'); |
$r->print('<h2>'.$message.'</h2>'); |
} else { |
} else { |
my $safeinit; |
my $safeinit; |
Line 350 sub handler {
|
Line 361 sub handler {
|
} |
} |
if ($allowed) { |
if ($allowed) { |
if ($env{'form.grade_target'} ne 'tex') { |
if ($env{'form.grade_target'} ne 'tex') { |
&Apache::lontemplate::print_template($r, &mt('Title'), $message, $allowed, 'LC_ContentBoxSpecial'); |
&Apache::lontemplate::print_template($r, &mt('Title'), $message, $allowed, 'LC_Box'); |
&Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); |
&Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); |
$r->print('</p>'); |
$r->print('</p>'); |
} else { |
} else { |
my $safeinit; |
my $safeinit; |
$r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); |
$r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); |
} |
} |
} |
} |
if (!$allowed) {$r->print($image); } |
if (!$allowed) {$r->print($image); } |
} else { |
} else { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
if ($allowed) { |
if ($allowed) { |
$r->print('<p>'); |
$r->print('<p>'); |
} |
} |
&Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial'); |
&Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_Box'); |
} else { |
} else { |
my $safeinit; |
my $safeinit; |
$r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$field}.'</h3>')); |
$r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$field}.'</h3>')); |
$r->print(&Apache::lonxml::xmlparse($r,'tex',$message)); |
$r->print(&Apache::lonxml::xmlparse($r,'tex',$message)); |
} |
} |
if ($allowed) { |
if ($allowed) { |
if ($target ne 'tex') { |
if ($target ne 'tex') { |
&Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); |
&Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field); |
$r->print('</p>'); |
$r->print('</p>'); |
} else { |
} else { |
my $safeinit; |
my $safeinit; |
$r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); |
$r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit)); |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
if ($allowed && ($env{'form.grade_target'} ne 'tex')) { |
if ($allowed && ($env{'form.grade_target'} ne 'tex')) { |
$r->print(&Apache::lonhtmlcommon::htmlareaselectactive |
$r->print(&Apache::lonhtmlcommon::htmlareaselectactive |
('bbb_content').'</form>'); |
('bbb_content').'</form>'); |
} |
} |
if ($env{'form.grade_target'} ne 'tex') {$r->print('</p>');} |
if ($env{'form.grade_target'} ne 'tex') {$r->print('</p>');} |
|
|
} else { |
} else { |
if ($group ne '') { |
if ($group ne '') { |
&display_group_links($r,$target,$group,'view',$refarg,%groupinfo); |
&display_group_links($r,$target,$group,'view',$refarg,%groupinfo); |
} else { |
} else { |
$r->print('<p>'.&mt('No page information provided.').'</p>'); |
my $text=&mt('No page information provided.'); |
|
if ($target ne 'tex') { |
|
$r->print('<p class="LC_info">'.$text.'</p>'); |
|
} else { |
|
$r->print($text) |
|
} |
} |
} |
} |
} |
if ($env{'form.grade_target'} ne 'tex') { |
if ($env{'form.grade_target'} ne 'tex') { |
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
} else { |
} else { |
$r->print('\end{document}'); |
$r->print('\end{document}'); |
} |
} |
return OK; |
return OK; |
} |
} |