[LON-CAPA-cvs] cvs: loncom /interface lonsimplepage.pm
amueller
amueller@source.lon-capa.org
Tue, 19 May 2009 09:59:48 -0000
This is a MIME encoded message
--amueller1242727188
Content-Type: text/plain
amueller Tue May 19 09:59:48 2009 EDT
Modified files:
/loncom/interface lonsimplepage.pm
Log:
Replaced tabsymbol with 4 whitespaces to avoid conflicts with editors where tabwidth expand to 8 whitespaces.
Use cvs diff -w to check, that between this revision (1.82) and the revision before (1.81) there is no
difference except the whitespaces.
--amueller1242727188
Content-Type: text/plain
Content-Disposition: attachment; filename="amueller-20090519095948.txt"
Index: loncom/interface/lonsimplepage.pm
diff -u loncom/interface/lonsimplepage.pm:1.81 loncom/interface/lonsimplepage.pm:1.82
--- loncom/interface/lonsimplepage.pm:1.81 Fri May 15 09:55:32 2009
+++ loncom/interface/lonsimplepage.pm Tue May 19 09:59:48 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Page Editor
#
-# $Id: lonsimplepage.pm,v 1.81 2009/05/15 09:55:32 amueller Exp $
+# $Id: lonsimplepage.pm,v 1.82 2009/05/19 09:59:48 amueller Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -51,10 +51,10 @@
my $db_name;
if ($dom && $crs && ($udom eq $dom) && ($uname eq $crs)) {
- $marker =~ s/\W//g;
- $db_name = 'grppage_'.$marker;
+ $marker =~ s/\W//g;
+ $db_name = 'grppage_'.$marker;
} else {
- $marker=~s/\D//g;
+ $marker=~s/\D//g;
$db_name = 'smppage_'.$marker;
}
return if (!defined($marker));
@@ -70,17 +70,17 @@
my $target=$env{'form.grade_target'};
# ------------------------------------------------------------ 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'}));
}
# Is this even in a course?
unless ($env{'request.course.id'}) {
- if ($target ne 'tex') {
- &Apache::loncommon::simple_error_page($r,'','Not in a course');
- } else {
- $r->print('\textbf{Not in a course}\end{document}');
- }
- return OK;
+ if ($target ne 'tex') {
+ &Apache::loncommon::simple_error_page($r,'','Not in a course');
+ } else {
+ $r->print('\textbf{Not in a course}\end{document}');
+ }
+ return OK;
}
my $db_name = &get_db_name($r->uri);
@@ -93,20 +93,20 @@
my %groupinfo = ();
if ($db_name =~ /^grppage_/) {
$group = (split(m{/},$r->uri))[4];
- $group =~ s/\W//g;
+ $group =~ s/\W//g;
my %curr_groups = &Apache::longroup::coursegroups($dom,$crs,$group);
if (!%curr_groups) {
- &Apache::loncommon::simple_error_page($r,'','Invalid group name');
- return OK;
+ &Apache::loncommon::simple_error_page($r,'','Invalid group name');
+ return OK;
}
%groupinfo =
- &Apache::longroup::get_group_settings($curr_groups{$group});
+ &Apache::longroup::get_group_settings($curr_groups{$group});
$group_desc = &unescape($groupinfo{'description'});
}
if (!$db_name) {
- &Apache::loncommon::simple_error_page($r,'','Invalid call');
- return OK;
+ &Apache::loncommon::simple_error_page($r,'','Invalid call');
+ return OK;
}
# --------------------------------------------------------- The syllabus fields
@@ -143,13 +143,13 @@
if ($group ne '') {
$title = 'Simple Group Page';
}
- my $start_page =
- &Apache::loncommon::start_page($title,undef,
- {'function' => $forcestudent,
- 'domain' => $dom,
- 'force_register' =>
- $env{'form.register'},});
- $r->print($start_page);
+ my $start_page =
+ &Apache::loncommon::start_page($title,undef,
+ {'function' => $forcestudent,
+ 'domain' => $dom,
+ 'force_register' =>
+ $env{'form.register'},});
+ $r->print($start_page);
}
if ($group ne '') {
@@ -179,15 +179,15 @@
return OK;
}
} else {
- my $msg =
- &mt('You do not currently have rights to view this group.');
+ my $msg =
+ &mt('You do not currently have rights to view this group.');
if ($target ne 'tex') {
$r->print("<p>$msg</p>".
- &Apache::loncommon::end_page());
+ &Apache::loncommon::end_page());
} else {
$r->print('\textbf{'.$msg.'}\end{document}');
}
- return OK;
+ return OK;
}
my ($blocked,$blocktext) =
&Apache::loncommon::blocking_status('groups');
@@ -210,27 +210,27 @@
}
my $privileged=$allowed;
if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) {
- $forcestudent='student';
+ $forcestudent='student';
}
if ($forcestudent or $target eq 'tex') { $allowed=0; }
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'});
- }
+ ($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,"grouppage/$group");
} else {
- $syllabus{'uploaded.photourl'}=
- &Apache::lonnet::userfileupload('uploaddoc',1,'simplepage');
+ $syllabus{'uploaded.photourl'}=
+ &Apache::lonnet::userfileupload('uploaddoc',1,'simplepage');
}
- }
- $syllabus{'uploaded.lastmodified'}=time;
- &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs);
+ }
+ $syllabus{'uploaded.lastmodified'}=time;
+ &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs);
}
if ($allowed && $env{'form.delupl'}) {
if ($syllabus{'uploaded.photourl'}) {
@@ -240,49 +240,49 @@
}
}
if (($allowed) && ($env{'form.storesyl'})) {
- foreach my $syl_field (keys(%syllabusfields)) {
- my $field=$env{'form.'.$syl_field};
- chomp($field);
- $field=~s/\s+$//s;
- $field=~s/^\s+//s;
- $field=~s/\<br\s*\/*\>$//s;
- $field=&Apache::lonfeedback::clear_out_html($field,1);
- $syllabus{$syl_field}=$field;
- }
- $syllabus{'uploaded.lastmodified'}=time;
- &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs);
+ foreach my $syl_field (keys(%syllabusfields)) {
+ my $field=$env{'form.'.$syl_field};
+ chomp($field);
+ $field=~s/\s+$//s;
+ $field=~s/^\s+//s;
+ $field=~s/\<br\s*\/*\>$//s;
+ $field=&Apache::lonfeedback::clear_out_html($field,1);
+ $syllabus{$syl_field}=$field;
+ }
+ $syllabus{'uploaded.lastmodified'}=time;
+ &Apache::lonnet::put($db_name,\%syllabus,$dom,$crs);
}
#---Print help Text
if($target ne 'tex'){
- if ($allowed) {
- $r->print(&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')));
- }
+ if ($allowed) {
+ $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) {
+ if ($target ne 'tex') {
+ if ($allowed || $privileged) {
$r->print(&Apache::lontemplate::start_functionslist());
- if ($allowed) {
+ 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');
- }
+ } 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) {
+ 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());
}
}
@@ -291,29 +291,29 @@
if ((($syllabus{'uploaded.lastmodified'}) &&
(($group ne '' && ($group_home_view || $group_edit_perm ||
$group_view_perm)) || ($group eq ''))) || ($allowed)) {
- my $image;
- if ($syllabus{'uploaded.photourl'}) {
- &Apache::lonnet::allowuploaded('/adm/smppg',
- $syllabus{'uploaded.photourl'});
+ my $image;
+ if ($syllabus{'uploaded.photourl'}) {
+ &Apache::lonnet::allowuploaded('/adm/smppg',
+ $syllabus{'uploaded.photourl'});
- $image='<img src="'.$syllabus{'uploaded.photourl'}.'"
+ $image='<img src="'.$syllabus{'uploaded.photourl'}.'"
/>';
- if ($target eq 'tex') {
- $image=&Apache::lonxml::xmlparse($r,'tex',$image);
+ if ($target eq 'tex') {
+ $image=&Apache::lonxml::xmlparse($r,'tex',$image);
}
}
- 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">'.
+ 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" />');
if ($syllabus{'uploaded.photourl'}) {
- $r->print('<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />' );
+ $r->print('<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />' );
}
}
if ($allowed) {
@@ -321,17 +321,17 @@
}
foreach my $field (sort(keys(%syllabusfields))) {
- if (($syllabus{$field}) || ($allowed) ||
+ if (($syllabus{$field}) || ($allowed) ||
($field eq 'abb_links' && $group ne '')) {
- 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);
- }
- if ($target ne 'tex') {
- $message=&Apache::lontexconvert::msgtexconverted($message);
- }
+ 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);
+ }
+ if ($target ne 'tex') {
+ $message=&Apache::lontexconvert::msgtexconverted($message);
+ }
if ($field eq 'abb_links' && $group ne '') {
$r->print('<br /><input type="hidden" name="'.$field.
'" value="'.$syllabus{$field}.'" />');
@@ -340,9 +340,9 @@
$r->print('<br />');
} elsif ($field eq 'aaa_title') {
if ($target ne 'tex') {
- if ($allowed) {
- $r->print('<p>');
- }
+ if ($allowed) {
+ $r->print('<p>');
+ }
$r->print('<h2>'.$message.'</h2>');
} else {
my $safeinit;
@@ -350,55 +350,55 @@
}
if ($allowed) {
if ($env{'form.grade_target'} ne 'tex') {
- &Apache::lontemplate::print_template($r, &mt('Title'), $message, $allowed, 'LC_ContentBoxSpecial');
- &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field);
- $r->print('</p>');
+ &Apache::lontemplate::print_template($r, &mt('Title'), $message, $allowed, 'LC_ContentBoxSpecial');
+ &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field);
+ $r->print('</p>');
} else {
my $safeinit;
$r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
}
}
- if (!$allowed) {$r->print($image); }
+ if (!$allowed) {$r->print($image); }
} else {
- if ($target ne 'tex') {
- if ($allowed) {
- $r->print('<p>');
- }
- &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial');
- } else {
- my $safeinit;
- $r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$field}.'</h3>'));
- $r->print(&Apache::lonxml::xmlparse($r,'tex',$message));
- }
- if ($allowed) {
- if ($target ne 'tex') {
- &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field);
- $r->print('</p>');
- } else {
- my $safeinit;
- $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
- }
- }
- }
+ if ($target ne 'tex') {
+ if ($allowed) {
+ $r->print('<p>');
+ }
+ &Apache::lontemplate::print_template($r,$syllabusfields{$field},$message,$allowed,'LC_ContentBoxSpecial');
+ } else {
+ my $safeinit;
+ $r->print(&Apache::lonxml::xmlparse($r,'tex','<h3>'.$syllabusfields{$field}.'</h3>'));
+ $r->print(&Apache::lonxml::xmlparse($r,'tex',$message));
+ }
+ if ($allowed) {
+ if ($target ne 'tex') {
+ &Apache::lontemplate::print_editbox_template($r,$syllabus{$field},$field);
+ $r->print('</p>');
+ } else {
+ my $safeinit;
+ $r->print(&Apache::lonxml::xmlparse($r,'tex',$syllabus{$field},$safeinit));
+ }
+ }
+ }
}
- }
- if ($allowed && ($env{'form.grade_target'} ne 'tex')) {
- $r->print(&Apache::lonhtmlcommon::htmlareaselectactive
- ('bbb_content').'</form>');
- }
- if ($env{'form.grade_target'} ne 'tex') {$r->print('</p>');}
+ }
+ if ($allowed && ($env{'form.grade_target'} ne 'tex')) {
+ $r->print(&Apache::lonhtmlcommon::htmlareaselectactive
+ ('bbb_content').'</form>');
+ }
+ if ($env{'form.grade_target'} ne 'tex') {$r->print('</p>');}
} else {
if ($group ne '') {
&display_group_links($r,$target,$group,'view',$refarg,%groupinfo);
} else {
- $r->print('<p>'.&mt('No page information provided.').'</p>');
+ $r->print('<p>'.&mt('No page information provided.').'</p>');
}
}
if ($env{'form.grade_target'} ne 'tex') {
$r->print(&Apache::loncommon::end_page());
} else {
- $r->print('\end{document}');
+ $r->print('\end{document}');
}
return OK;
}
--amueller1242727188--