loncom/interface/lonsyllabus.pm - diff

Return to lonsyllabus.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonsyllabus.pm between versions 1.129 and 1.135

version 1.129, 2013/08/26 23:38:07	version 1.135, 2013/10/03 12:45:14
Line 35 use Apache::loncommon;	Line 35 use Apache::loncommon;
use Apache::lonnet;	use Apache::lonnet;
use Apache::lontexconvert;	use Apache::lontexconvert;
use Apache::lonfeedback;	use Apache::lonfeedback;
	use Apache::lonhtmlgateway;
use Apache::lonannounce;	use Apache::lonannounce;
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::lonhtmlcommon;	use Apache::lonhtmlcommon;
Line 53 sub handler {	Line 54 sub handler {
# ------------------------------------------------------------ Get query string	# ------------------------------------------------------------ Get query string
&Apache::loncommon::get_unprocessed_cgi	&Apache::loncommon::get_unprocessed_cgi
($ENV{'QUERY_STRING'},['register','forceedit','todocs',	($ENV{'QUERY_STRING'},['register','forceedit','todocs',
'folderpath','title']);	'folderpath','title','only_body']);
# ----------------------------------------------------- Is this even a course?	# ----------------------------------------------------- Is this even a course?
my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);	my $homeserver=&Apache::lonnet::homeserver($cnum,$cdom);
if ($homeserver eq 'no_host') {	if ($homeserver eq 'no_host') {
Line 73 sub handler {	Line 74 sub handler {
my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);	my %courseenv=&Apache::lonnet::dump('environment',$cdom,$cnum);
my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();

# ------------------------------------------------------------ Print the screen

if ($target eq 'tex') {
$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
}

# --------------------------------------------------------------- Force Student	# --------------------------------------------------------------- Force Student
my ($forceedit,$forcestudent);	my ($forceedit,$forcestudent);
if ($env{'form.forceedit'}) { $forceedit=1; }	if ($env{'form.forceedit'}) { $forceedit=1; }
Line 103 sub handler {	Line 98 sub handler {
my $uploaded=$courseenv{'uploadedsyllabus'};	my $uploaded=$courseenv{'uploadedsyllabus'};
my $minimal=$courseenv{'minimalsyllabus'};	my $minimal=$courseenv{'minimalsyllabus'};

if (($minimal =~/\w/) \|\| ($uploaded =~/\w/)) {	if (($minimal =~/\w/) \|\| ($uploaded =~/\w/)) {
my $item;	my $item;
if ($minimal =~/\w/) {	if ($minimal =~/\w/) {
if ($external =~ m{\Q$minimal\E$}) {	if ($external =~ m{\Q$minimal\E$}) {
Line 124 sub handler {	Line 119 sub handler {
if ($filecontents eq -1) {	if ($filecontents eq -1) {
$r->print(&mt('Syllabus file unavailable'));	$r->print(&mt('Syllabus file unavailable'));
} elsif ($filetype eq 'tex') {	} elsif ($filetype eq 'tex') {
my $result = &Apache::lontexconvert::converted(\$filecontents,	if ($target eq 'tex') {
$env{'form.texengine'});	$r->print($filecontents);
my %args;	} else {
&get_breadcrumbs($cdom,$cnum,$crstype,\%args);	my $result = &Apache::lontexconvert::converted(\$filecontents,
$r->print(&Apache::loncommon::start_page("Syllabus",undef,\%args).	$env{'form.texengine'});
$result.	my %args;
&Apache::loncommon::end_page());	&get_breadcrumbs($cdom,$cnum,$crstype,\%args);
	if ($env{'form.only_body'}) {
	$args{'only_body'} = 1;
	}
	$r->print(&Apache::loncommon::start_page("Syllabus",undef,\%args).
	$result.
	&Apache::loncommon::end_page());
	}
} else {	} else {
my %mystyle;	my %mystyle;
	unless ($target eq 'tex') {
	$target = 'web';
	}
&Apache::structuretags::reset_problem_globals();	&Apache::structuretags::reset_problem_globals();
my $oldfile = $env{'request.filename'};	my $oldfile = $env{'request.filename'};
$env{'request.filename'} = $item;	$env{'request.filename'} = $item;
my $result = &Apache::lonxml::xmlparse($r,'web',$filecontents,	my $result = &Apache::lonxml::xmlparse($r,$target,$filecontents,
'',%mystyle);	'',%mystyle);
&Apache::structuretags::reset_problem_globals();	&Apache::structuretags::reset_problem_globals();
&Apache::lonhomework::finished_parsing();	&Apache::lonhomework::finished_parsing();
Line 145 sub handler {	Line 150 sub handler {
$r->print($result);	$r->print($result);
}	}
} else {	} else {
$r->print(&Apache::lonwrapper::wrapper($item));	if ($target eq 'tex') {
	$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}).
	' \strut \\\\ \textbf{'.&mt('Syllabus').'} \strut \\\\ '.
	&mt('Unsupported file type.').' \strut \\\\ '.
	&mt('Print the syllabus directly from your web browser').
	'\end{document}');
	} else {
	$r->print(&Apache::lonwrapper::wrapper($item));
	}
}	}
return OK;	return OK;
}	}
} elsif ($external=~/\w/) {	} elsif ($external=~/\w/) {
unless ($allowed && $forceedit) {	unless ($allowed && $forceedit) {
$r->print(&Apache::lonwrapper::wrapper($external));	if ($target eq 'tex') {
	$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}).
	' \strut \\\\ \textbf{'.&mt('Syllabus').'} \strut \\\\ '.$external.' '.
	' \strut \\\\ '.&mt('Print the syllabus directly from your web browser').
	'\end{document}');
	} else {
	$r->print(&Apache::lonwrapper::wrapper($external));
	}
return OK;	return OK;
}	}
}	}

	# ------------------------------------------------------------ Print the screen

	if ($target eq 'tex') {
	$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
	}

# ------------------------------ The buck stops here: internal syllabus display	# ------------------------------ The buck stops here: internal syllabus display
# --------------------------------------------------------- The syllabus fields	# --------------------------------------------------------- The syllabus fields
Line 385 sub handler {	Line 410 sub handler {
}	}
$rsslinktext = &mt('Manage Course RSS Feeds/Blogs');	$rsslinktext = &mt('Manage Course RSS Feeds/Blogs');
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
$rsslinktext = &mt('Manage Communiity RSS Feeds/Blogs');	$rsslinktext = &mt('Manage Community RSS Feeds/Blogs');
}	}
}	}
my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';	my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';
Line 671 ENDSCRIPT	Line 696 ENDSCRIPT
);	);
$args->{'add_entries'} = \%loaditem;	$args->{'add_entries'} = \%loaditem;
}	}
	if ($env{'form.only_body'}) {
	$args->{'only_body'} = 1;
	}
my $start_page =	my $start_page =
&Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args);	&Apache::loncommon::start_page("Syllabus", $rss_link.$js,$args);
if ($start_page) {	if ($start_page) {
Line 1060 sub get_personnel {	Line 1088 sub get_personnel {
sub save_changes {	sub save_changes {
my ($cnum,$cdom,$uploaded,$external,$minimal,$syllabus,$syllabusfields,$courseenv) = @_;	my ($cnum,$cdom,$uploaded,$external,$minimal,$syllabus,$syllabusfields,$courseenv) = @_;
my ($earlyout,$output);	my ($earlyout,$output);
unless ((ref($syllabus) eq 'HASH') && (ref($syllabusfields) eq 'HASH')) {	unless ((ref($syllabus) eq 'HASH') && (ref($syllabusfields) eq 'HASH') \|\|
	(ref($courseenv) eq 'HASH')) {
return ($earlyout,$uploaded,$external,$minimal,$output);	return ($earlyout,$uploaded,$external,$minimal,$output);
}	}
if (($env{'form.deleteuploaded_file'}) \|\| ($env{'form.deleteuploaded_minimal'})) {	if (($env{'form.deleteuploaded_file'}) \|\| ($env{'form.deleteuploaded_minimal'})) {
my %storehash;	my %storehash;
if (($env{'form.choice'} eq 'file') &&	if (($env{'form.choice'} eq 'file') &&
($env{'form.deleteuploaded_file'}) && ($uploaded =~ /\w/)) {	($env{'form.deleteuploaded_file'}) && ($uploaded =~ /\w/)) {
	if ($courseenv->{'uploadedsyllabus'} =~ m{^\Q/uploaded/$cdom/$cnum/portfolio\E(/syllabus/.+)$}) {
	my $filename = $1;
	&update_access_permissions($cdom,$cnum,$filename);
	}
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');	&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus');
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');	&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');
$storehash{'uploadedsyllabus'} = '';	$storehash{'uploadedsyllabus'} = '';
Line 1076 sub save_changes {	Line 1109 sub save_changes {
undef($external);	undef($external);
} elsif (($env{'form.choice'} eq 'minimal') &&	} elsif (($env{'form.choice'} eq 'minimal') &&
($env{'form.deleteuploaded_minimal'}) && ($minimal =~ /\w/)) {	($env{'form.deleteuploaded_minimal'}) && ($minimal =~ /\w/)) {
	my $minimalurl = "/uploaded/$cdom/$cnum/portfolio/syllabus/loncapa.html";
	if ($courseenv->{'minimalsyllabus'} eq "$minimalurl") {
	my $filecontents=&Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$minimalurl));
	unless ($filecontents eq -1) {
	$env{'form.output'} = $filecontents;
	&Apache::lonnet::finishuserfileupload($cnum,$cdom,'output',
	'portfolio/syllabus/loncapa.html.bak');
	$minimalurl = &default_minimal_syllabus($cnum,$cdom);
	}
	}
	&update_access_permissions($cdom,$cnum,'/syllabus/loncapa.html');
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');	&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus');
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.minimalsyllabus');	&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.minimalsyllabus');
$storehash{'externalsyllabus'} = '';	$storehash{'externalsyllabus'} = '';
Line 1131 sub save_changes {	Line 1175 sub save_changes {
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;	my $gateway = Apache::lonhtmlgateway->new();
$field=~s/^\s+//s;	$field = $gateway->process_incoming_html($field,1);
$field=~s/\<br\s\/\>$//s;
$field=&Apache::lonfeedback::clear_out_html($field,1);
#here it will be stored	#here it will be stored
$syllabus->{$syl_field}=$field;	$syllabus->{$syl_field}=$field;
if ($syl_field eq 'lll_includeurl') { # clean up included URLs	if ($syl_field eq 'lll_includeurl') { # clean up included URLs
Line 1229 sub save_changes {	Line 1271 sub save_changes {
($url,$needlink) = &process_upload(\$output,$cnum,$cdom,	($url,$needlink) = &process_upload(\$output,$cnum,$cdom,
\%allfiles,\%codebase);	\%allfiles,\%codebase);
} else {	} else {
$output = '<div class="LC_info">';	$output = '<div class="LC_info">'.
&mt('No file uploaded').	&mt('No file uploaded').
'</div>';	'</div>';
}	}
} elsif ($env{'form.choice'} eq 'minimal') {	} elsif ($env{'form.choice'} eq 'minimal') {
my $title = $env{'form.syllabustitle'};	$url = "/uploaded/$cdom/$cnum/portfolio/syllabus/loncapa.html";
$title =~ s{`}{}g;	my $filecontents=&Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$url));
$title=~s/^\s+//;	if ($filecontents eq -1) {
$title=~s/\s+$//;	$url = &default_minimal_syllabus($cnum,$cdom);
if ($title eq '') {
$title = &mt('Syllabus');
}	}
my $initialtext = &mt('Replace with your own content.');
my $newhtml = <<END;
<html>
<head>
<title>$title</title>
</head>
<body bgcolor="#ffffff">
<h2>$title</h2>
$initialtext
</body>
</html>
END
$env{'form.output'}=$newhtml;
$url =
&Apache::lonnet::finishuserfileupload($cnum,$cdom,'output',
'portfolio/syllabus/loncapa.html');
}	}
if ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E.*/[^/]+$}) {	if ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E.*/[^/]+$}) {
my $exturl = &home_http_host($cdom,$cnum);	my $exturl = &home_http_host($cdom,$cnum);
Line 1345 END	Line 1369 END
return ($earlyout,$uploaded,$external,$minimal,$output);	return ($earlyout,$uploaded,$external,$minimal,$output);
}	}

	sub default_minimal_syllabus {
	my ($cnum,$cdom) = @_;
	my $title;
	if ($env{'form.syllabustitle'}) {
	$title = $env{'form.syllabustitle'};
	$title =~ s{`}{}g;
	$title=~s/^\s+//;
	$title=~s/\s+$//;
	}
	if ($title eq '') {
	$title = &mt('Syllabus');
	}
	my $initialtext = &mt('Replace with your own content.');
	my $newhtml = <<END;
	<html>
	<head>
	<title>$title</title>
	</head>
	<body bgcolor="#ffffff">
	<h2>$title</h2>
	$initialtext
	</body>
	</html>
	END
	$env{'form.output'}=$newhtml;
	return &Apache::lonnet::finishuserfileupload($cnum,$cdom,'output',
	'portfolio/syllabus/loncapa.html');
	}

sub update_syllabus_env {	sub update_syllabus_env {
my ($cdom,$cnum,$courseenv,$saved,$uploaded,$minimal,$external) = @_;	my ($cdom,$cnum,$courseenv,$saved,$uploaded,$minimal,$external) = @_;
return ($uploaded,$minimal,$external) unless(ref($courseenv) eq 'HASH');	return ($uploaded,$minimal,$external) unless(ref($courseenv) eq 'HASH');
my $now = time;	my $now = time;
my (@envkeys,%storehash);	my (@envkeys,%storehash);
if ($saved eq 'template') {	if ($saved eq 'template') {
if ($uploaded) {	if ($uploaded \|\| $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
push(@envkeys,'uploaded');	push(@envkeys,'uploaded');
}	}
if ($minimal) {	if ($minimal \|\| $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
push(@envkeys,'minimal');	push(@envkeys,'minimal');
}	}
if ($external) {	if ($external \|\| $env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) {
push(@envkeys,'external');	push(@envkeys,'external');
}	}
$storehash{'updatedsyllabus'} = $now;	$storehash{'updatedsyllabus'} = $now;
&Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.updatedsyllabus' => $now	&Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.updatedsyllabus' => $now
});	});

} elsif ($saved eq 'url') {	} elsif ($saved eq 'url') {
my $prefix = &home_http_host($cdom,$cnum);	my $prefix = &home_http_host($cdom,$cnum);
if ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus/\E(.+)$}) {	if ($external =~ m{^\Q$prefix/uploaded/$cdom/$cnum/portfolio/syllabus/\E(.+)$}) {
my $file = $1;	my $file = $1;
if ($file eq 'loncapa.html') {	if ($file eq 'loncapa.html') {
if ($uploaded) {	if ($uploaded \|\| $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
push(@envkeys,'uploaded');	push(@envkeys,'uploaded');
}	}
} elsif ($minimal) {	} elsif ($minimal \|\| $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
push(@envkeys,'minimal');	push(@envkeys,'minimal');
}	}
} else {	} else {
if ($uploaded) {	if ($uploaded \|\| $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
push(@envkeys,'uploaded');	push(@envkeys,'uploaded');
}	}
if ($minimal) {	if ($minimal \|\| $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
push(@envkeys,'minimal');	push(@envkeys,'minimal');
}	}
}	}
} elsif ($saved eq 'file') {	} elsif ($saved eq 'file') {
if ($minimal) {	if ($minimal \|\| $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}) {
push(@envkeys,'minimal');	push(@envkeys,'minimal');
}	}
} elsif ($saved eq 'minimal') {	} elsif ($saved eq 'minimal') {
if ($uploaded) {	if ($uploaded \|\| $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) {
push(@envkeys,'uploaded');	push(@envkeys,'uploaded');
}	}
}	}
if (@envkeys > 0) {	if (@envkeys > 0) {
foreach my $item (@envkeys) {	foreach my $item (@envkeys) {
my $key = $item.'syllabus';	my $key = $item.'syllabus';
if ($courseenv->{$key}) {	if ($courseenv->{$key} ne '') {
&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key);	&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key);
	if ($item eq 'minimal') {
	&update_access_permissions($cdom,$cnum,'/syllabus/loncapa.html');
	} elsif ($item eq 'uploaded') {
	if ($courseenv->{$key} =~ m{^\Q/uploaded/$cdom/$cnum/portfolio\E(/syllabus/.+)$}) {
	my $filename = $1;
	&update_access_permissions($cdom,$cnum,$filename);
	}
	}
$storehash{$key} = '';	$storehash{$key} = '';
	} elsif ($env{'course.'.$env{'request.course.id'}.'.'.$key} ne '') {
	&Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key);
}	}
if ($item eq 'uploaded') {	if ($item eq 'uploaded') {
undef($uploaded);	undef($uploaded);
Line 1416 sub update_syllabus_env {	Line 1478 sub update_syllabus_env {
return ($uploaded,$minimal,$external);	return ($uploaded,$minimal,$external);
}	}

	sub update_access_permissions {
	my ($cdom,$cnum,$file_name) = @_;
	my $current_permissions = &Apache::lonnet::get_portfile_permissions($cdom,$cnum);
	my %access_controls =
	&Apache::lonnet::get_access_controls($current_permissions,'',$file_name);
	if (keys(%access_controls) > 0) {
	my %changes;
	foreach my $key (keys(%{$access_controls{$file_name}})) {
	$changes{'delete'}{$key} = 1;
	}
	if (keys(%changes) > 0) {
	my ($outcome,$deloutcome,$new_values,$translation) =
	&Apache::lonnet::modify_access_controls($file_name,\%changes,
	$cdom,$cnum);
	}
	}
	return;
	}

sub home_http_host {	sub home_http_host {
my ($cdom,$cnum) = @_;	my ($cdom,$cnum) = @_;
my $home=&Apache::lonnet::homeserver($cnum,$cdom);	my $home=&Apache::lonnet::homeserver($cnum,$cdom);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.129
changed lines
	Added in v.1.135