version 1.368, 2006/05/10 21:50:39
|
version 1.375, 2006/05/18 01:08:50
|
Line 64 use HTML::Entities;
|
Line 64 use HTML::Entities;
|
use Apache::lonhtmlcommon(); |
use Apache::lonhtmlcommon(); |
use Apache::loncoursedata(); |
use Apache::loncoursedata(); |
use Apache::lontexconvert(); |
use Apache::lontexconvert(); |
|
use LONCAPA; |
|
|
my $readit; |
my $readit; |
|
|
Line 709 sub help_open_menu {
|
Line 710 sub help_open_menu {
|
my $timestamp = time; |
my $timestamp = time; |
foreach my $datum (\$color,\$function,\$topic,\$component_help,\$faq, |
foreach my $datum (\$color,\$function,\$topic,\$component_help,\$faq, |
\$bug,\$origurl) { |
\$bug,\$origurl) { |
$$datum = &Apache::lonnet::escape($$datum); |
$$datum = &escape($$datum); |
} |
} |
if (!$stayOnPage) { |
if (!$stayOnPage) { |
$link = "javascript:helpMenu('open')"; |
$link = "javascript:helpMenu('open')"; |
Line 775 ENDTEMPLATE
|
Line 776 ENDTEMPLATE
|
$width,$height).' '.$template; |
$width,$height).' '.$template; |
} else { |
} else { |
my $help_text; |
my $help_text; |
$help_text=&Apache::lonnet::unescape($topic); |
$help_text=&unescape($topic); |
$template='<table><tr><td>'. |
$template='<table><tr><td>'. |
&help_open_topic($component_help,$help_text,$stayOnPage, |
&help_open_topic($component_help,$help_text,$stayOnPage, |
$width,$height).'</td><td>'.$template. |
$width,$height).'</td><td>'.$template. |
Line 803 sub help_open_bug {
|
Line 804 sub help_open_bug {
|
my $link=''; |
my $link=''; |
my $template=''; |
my $template=''; |
my $url=$Apache::lonnet::perlvar{'BugzillaHost'}.'enter_bug.cgi?product=LON-CAPA&bug_file_loc='. |
my $url=$Apache::lonnet::perlvar{'BugzillaHost'}.'enter_bug.cgi?product=LON-CAPA&bug_file_loc='. |
&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'&component='.$topic; |
&escape($ENV{'REQUEST_URI'}).'&component='.$topic; |
if (!$stayOnPage) |
if (!$stayOnPage) |
{ |
{ |
$link = "javascript:void(open('$url', 'Bugzilla', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))"; |
$link = "javascript:void(open('$url', 'Bugzilla', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))"; |
Line 2024 sub screenname {
|
Line 2025 sub screenname {
|
# ------------------------------------------------------------- Message Wrapper |
# ------------------------------------------------------------- Message Wrapper |
|
|
sub messagewrapper { |
sub messagewrapper { |
my ($link,$username,$domain)=@_; |
my ($link,$username,$domain,$subject,$text)=@_; |
return |
return |
'<a href="/adm/email?compose=individual&'. |
'<a href="/adm/email?compose=individual&'. |
'recname='.$username.'&recdom='.$domain.'" '. |
'recname='.$username.'&recdom='.$domain. |
|
'&subject='.&escape($subject).'&text='.&escape($text).'" '. |
'title="'.&mt('Send message').'">'.$link.'</a>'; |
'title="'.&mt('Send message').'">'.$link.'</a>'; |
} |
} |
# --------------------------------------------------------------- Notes Wrapper |
# --------------------------------------------------------------- Notes Wrapper |
Line 2394 sub get_previous_attempt {
|
Line 2396 sub get_previous_attempt {
|
} else { |
} else { |
$value=$returnhash{$version.':'.$key}; |
$value=$returnhash{$version.':'.$key}; |
} |
} |
$prevattempts.='<td>'.&Apache::lonnet::unescape($value).' </td>'; |
$prevattempts.='<td>'.&unescape($value).' </td>'; |
} |
} |
} |
} |
} |
} |
Line 2406 sub get_previous_attempt {
|
Line 2408 sub get_previous_attempt {
|
} else { |
} else { |
$value=$lasthash{$key}; |
$value=$lasthash{$key}; |
} |
} |
$value=&Apache::lonnet::unescape($value); |
$value=&unescape($value); |
if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)} |
if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)} |
$prevattempts.='<td>'.$value.' </td>'; |
$prevattempts.='<td>'.$value.' </td>'; |
} |
} |
Line 2528 sub submlink {
|
Line 2530 sub submlink {
|
if (!$symb) { $symb=$cursymb; } |
if (!$symb) { $symb=$cursymb; } |
} |
} |
if (!$symb) { $symb=&Apache::lonnet::symbread(); } |
if (!$symb) { $symb=&Apache::lonnet::symbread(); } |
$symb=&Apache::lonnet::escape($symb); |
$symb=&escape($symb); |
if ($target) { $target="target=\"$target\""; } |
if ($target) { $target="target=\"$target\""; } |
return '<a href="/adm/grades?&command=submission&'. |
return '<a href="/adm/grades?&command=submission&'. |
'symb='.$symb.'&student='.$uname. |
'symb='.$symb.'&student='.$uname. |
Line 2574 sub pprmlink {
|
Line 2576 sub pprmlink {
|
if (!$symb) { $symb=$cursymb; } |
if (!$symb) { $symb=$cursymb; } |
} |
} |
if (!$symb) { $symb=&Apache::lonnet::symbread(); } |
if (!$symb) { $symb=&Apache::lonnet::symbread(); } |
$symb=&Apache::lonnet::escape($symb); |
$symb=&escape($symb); |
if ($target) { $target="target=\"$target\""; } |
if ($target) { $target="target=\"$target\""; } |
return '<a href="/adm/parmset?&command=set&'. |
return '<a href="/adm/parmset?&command=set&'. |
'symb='.$symb.'&uname='.$uname. |
'symb='.$symb.'&uname='.$uname. |
Line 2604 sub timehash {
|
Line 2606 sub timehash {
|
'dlsav' => $ltime[8] ); |
'dlsav' => $ltime[8] ); |
} |
} |
|
|
|
sub utc_string { |
|
my ($date)=@_; |
|
return strftime("%Y%m%dT%H%M%SZ",gmtime($date)); |
|
} |
|
|
sub maketime { |
sub maketime { |
my %th=@_; |
my %th=@_; |
return POSIX::mktime( |
return POSIX::mktime( |
Line 3121 table#LC_title_bar {
|
Line 3128 table#LC_title_bar {
|
padding: 0px 2px 0px 2px; |
padding: 0px 2px 0px 2px; |
background: $pgbg; |
background: $pgbg; |
font-family: $sans; |
font-family: $sans; |
border-collapse: collapse; |
border-collapse: separate; |
} |
} |
table#LC_title_bar.LC_with_remote { |
table#LC_title_bar.LC_with_remote { |
width: 100%; |
width: 100%; |
Line 3158 table#LC_menubuttons_mainmenu {
|
Line 3165 table#LC_menubuttons_mainmenu {
|
background: $pgbg; |
background: $pgbg; |
border: 0px; |
border: 0px; |
border-spacing: 1px; |
border-spacing: 1px; |
padding: 0px; |
padding: 0px 1px; |
margin: 0px; |
margin: 0px; |
border-collapse: separate; |
border-collapse: separate; |
} |
} |
Line 3311 sub headtag {
|
Line 3318 sub headtag {
|
$env{'environment.color.timestamp'}, |
$env{'environment.color.timestamp'}, |
$function,$domain,$bgcolor); |
$function,$domain,$bgcolor); |
|
|
$url = '/adm/css/'.&Apache::lonnet::escape($url).'.css'; |
$url = '/adm/css/'.&escape($url).'.css'; |
|
|
my $result = |
my $result = |
'<head>'. |
'<head>'. |
Line 3547 Inputs: $args - additional optio
|
Line 3554 Inputs: $args - additional optio
|
|
|
sub end_page { |
sub end_page { |
my ($args) = @_; |
my ($args) = @_; |
#&Apache::lonnet::logthis("end_page ".join(':',caller(0))); |
|
$env{'internal.end_page'}++; |
$env{'internal.end_page'}++; |
my $result; |
my $result; |
if ($args->{'discussion'}) { |
if ($args->{'discussion'}) { |
Line 3590 sub js_ready {
|
Line 3596 sub js_ready {
|
$result =~ s/[\n\r]/ /xmsg; |
$result =~ s/[\n\r]/ /xmsg; |
$result =~ s/\\/\\\\/xmsg; |
$result =~ s/\\/\\\\/xmsg; |
$result =~ s/'/\\'/xmsg; |
$result =~ s/'/\\'/xmsg; |
$result =~ s{</script>}{</scrip'+'t>}xmsg; |
$result =~ s{</}{<\\/}xmsg; |
|
|
return $result; |
return $result; |
} |
} |
Line 3703 specific user. Roles can be active, prev
|
Line 3709 specific user. Roles can be active, prev
|
|
|
Inputs: |
Inputs: |
user's domain, user's username, course's domain, |
user's domain, user's username, course's domain, |
course's number, optional section/group. |
course's number, optional section ID. |
|
|
Outputs: |
Outputs: |
role status: active, previous or future. |
role status: active, previous or future. |
Line 3754 sub check_user_status {
|
Line 3760 sub check_user_status {
|
|
|
Determines all the sections for a course including |
Determines all the sections for a course including |
sections with students and sections containing other roles. |
sections with students and sections containing other roles. |
Incoming parameters: domain, course number, reference to |
Incoming parameters: domain, course number, |
section hash (keys to be section/group IDs), reference to |
reference to array containing roles for which sections should |
array containing roles for which sections should be gathered |
be gathered (optional). If the third argument is undefined, |
(optional). If the fourth argument is undefined, sections |
sections are gathered for any role. |
are gathered for any role. |
|
|
|
Returns number of sections. |
Returns section hash (keys are section IDs, values are |
|
number of users in each section), subject to the |
|
optional roles filter. |
|
|
=cut |
=cut |
|
|
Line 3808 sub get_sections {
|
Line 3815 sub get_sections {
|
} |
} |
|
|
############################################### |
############################################### |
|
|
=pod |
|
|
|
=item coursegroups |
|
|
|
Retrieve information about groups in a course, |
|
|
|
Input: |
|
1. Reference to hash to populate with group information. |
|
2. Optional course domain |
|
3. Optional course number |
|
4. Optional group name |
|
|
|
Course domain and number will be taken from user's |
|
environment if not supplied. Optional group name will' |
|
be passed to lonnet::get_coursegroups() as a regexp to |
|
use in the call to the dump function. |
|
|
|
Output |
|
Returns number of groups in the course (subject to the |
|
optional group name filter). |
|
|
|
Side effects: |
|
Populates the referenced curr_groups hash, with key, |
|
value pairs. Keys are group names, corresponding values |
|
are scalars containing group information in XML. This |
|
can be sent to &get_group_settings() to be parsed. |
|
|
|
=cut |
|
|
|
############################################### |
|
|
|
sub coursegroups { |
|
my ($cdom,$cnum,$group) = @_; |
|
if (!defined($cdom) || !defined($cnum)) { |
|
my $cid = $env{'request.course.id'}; |
|
|
|
return if (!defined($cid)); |
|
|
|
$cdom = $env{'course.'.$cid.'.domain'}; |
|
$cnum = $env{'course.'.$cid.'.num'}; |
|
} |
|
my %curr_groups = &Apache::lonnet::get_coursegroups($cdom,$cnum,$group); |
|
my ($tmp) = keys(%curr_groups); |
|
if ($tmp=~/^(con_lost|no_such_host|error: [^2] )/) { |
|
undef(%curr_groups); |
|
&logthis('Error retrieving groups: '.$tmp.' in '.$cnum.':'.$cdom); |
|
} elsif ($tmp=~/^error: 2 /) { |
|
undef(%curr_groups); |
|
} |
|
return %curr_groups; |
|
} |
|
|
|
############################################### |
|
|
|
=pod |
|
|
|
=item get_group_settings |
|
|
|
Uses TokeParser to extract group information from the |
|
XML used to describe course groups. |
|
|
|
Input: |
|
Scalar containing XML - as retrieved from &coursegroups(). |
|
|
|
Output: |
|
Hash containing group information as key=values for (a), and |
|
hash of hashes for (b) |
|
|
|
Keys (in two categories): |
|
(a) groupname, creator, creation, modified, startdate,enddate. |
|
Corresponding values are name of the group, creator of the group |
|
(username:domain), UNIX time for date group was created, and |
|
settings were last modified, and default start and end access |
|
times for group members. |
|
|
|
(b) functions returned in hash of hashes. |
|
Outer hash key is functions. |
|
Inner hash keys are chat,discussion,email,files,homepage,roster. |
|
Corresponding values are either on or off, depending on |
|
whether this type of functionality is available for the group. |
|
|
|
=cut |
|
|
|
############################################### |
|
|
|
sub get_group_settings { |
|
my ($groupinfo)=@_; |
|
my $parser=HTML::TokeParser->new(\$groupinfo); |
|
my $token; |
|
my $tool = ''; |
|
my $role = ''; |
|
my %content=(); |
|
while ($token=$parser->get_token) { |
|
if ($token->[0] eq 'S') { |
|
my $entry=$token->[1]; |
|
if ($entry eq 'functions' || $entry eq 'autosec') { |
|
%{$content{$entry}} = (); |
|
$tool = $entry; |
|
} elsif ($entry eq 'role') { |
|
if ($tool eq 'autosec') { |
|
$role = $token->[2]{id}; |
|
} |
|
} else { |
|
my $value=$parser->get_text('/'.$entry); |
|
if ($entry eq 'name') { |
|
if ($tool eq 'functions') { |
|
my $function = $token->[2]{id}; |
|
$content{$tool}{$function} = $value; |
|
} |
|
} elsif ($entry eq 'groupname') { |
|
$content{$entry}=&Apache::lonnet::unescape($value); |
|
} elsif (($entry eq 'roles') || ($entry eq 'types') || |
|
($entry eq 'sectionpick') || ($entry eq 'defpriv')) { |
|
push(@{$content{$entry}},$value); |
|
} elsif ($entry eq 'section') { |
|
if ($tool eq 'autosec' && $role ne '') { |
|
push(@{$content{$tool}{$role}},$value); |
|
} |
|
} else { |
|
$content{$entry}=$value; |
|
} |
|
} |
|
} elsif ($token->[0] eq 'E') { |
|
if ($token->[1] eq 'functions' || $token->[1] eq 'autosec') { |
|
$tool = ''; |
|
} elsif ($token->[1] eq 'role') { |
|
$role = ''; |
|
} |
|
|
|
} |
|
} |
|
return %content; |
|
} |
|
|
|
sub check_group_access { |
|
my ($group) = @_; |
|
my $access = 1; |
|
my $now = time; |
|
my ($start,$end) = split(/\./,$env{'user.role.gr/'.$env{'request.course,id'}.'/'.$group}); |
|
if (($end!=0) && ($end<$now)) { $access = 0; } |
|
if (($start!=0) && ($start>$now)) { $access=0; } |
|
return $access; |
|
} |
|
|
|
############################################### |
|
|
|
=pod |
=pod |
|
|
Line 4106 sub get_unprocessed_cgi {
|
Line 3967 sub get_unprocessed_cgi {
|
# $Apache::lonxml::debug=1; |
# $Apache::lonxml::debug=1; |
foreach my $pair (split(/&/,$query)) { |
foreach my $pair (split(/&/,$query)) { |
my ($name, $value) = split(/=/,$pair); |
my ($name, $value) = split(/=/,$pair); |
$name = &Apache::lonnet::unescape($name); |
$name = &unescape($name); |
if (!defined($possible_names) || (grep {$_ eq $name} @$possible_names)) { |
if (!defined($possible_names) || (grep {$_ eq $name} @$possible_names)) { |
$value =~ tr/+/ /; |
$value =~ tr/+/ /; |
$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; |
$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; |
Line 4735 sub DrawBarGraph {
|
Line 4596 sub DrawBarGraph {
|
$Title = '' if (! defined($Title)); |
$Title = '' if (! defined($Title)); |
$xlabel = '' if (! defined($xlabel)); |
$xlabel = '' if (! defined($xlabel)); |
$ylabel = '' if (! defined($ylabel)); |
$ylabel = '' if (! defined($ylabel)); |
$ValuesHash{$id.'.title'} = &Apache::lonnet::escape($Title); |
$ValuesHash{$id.'.title'} = &escape($Title); |
$ValuesHash{$id.'.xlabel'} = &Apache::lonnet::escape($xlabel); |
$ValuesHash{$id.'.xlabel'} = &escape($xlabel); |
$ValuesHash{$id.'.ylabel'} = &Apache::lonnet::escape($ylabel); |
$ValuesHash{$id.'.ylabel'} = &escape($ylabel); |
$ValuesHash{$id.'.y_max_value'} = $Max; |
$ValuesHash{$id.'.y_max_value'} = $Max; |
$ValuesHash{$id.'.NumBars'} = $NumBars; |
$ValuesHash{$id.'.NumBars'} = $NumBars; |
$ValuesHash{$id.'.NumSets'} = $NumSets; |
$ValuesHash{$id.'.NumSets'} = $NumSets; |
Line 4817 sub DrawXYGraph {
|
Line 4678 sub DrawXYGraph {
|
$ylabel = '' if (! defined($ylabel)); |
$ylabel = '' if (! defined($ylabel)); |
my %ValuesHash = |
my %ValuesHash = |
( |
( |
$id.'.title' => &Apache::lonnet::escape($Title), |
$id.'.title' => &escape($Title), |
$id.'.xlabel' => &Apache::lonnet::escape($xlabel), |
$id.'.xlabel' => &escape($xlabel), |
$id.'.ylabel' => &Apache::lonnet::escape($ylabel), |
$id.'.ylabel' => &escape($ylabel), |
$id.'.y_max_value'=> $Max, |
$id.'.y_max_value'=> $Max, |
$id.'.labels' => join(',',@$Xlabels), |
$id.'.labels' => join(',',@$Xlabels), |
$id.'.PlotType' => 'XY', |
$id.'.PlotType' => 'XY', |
Line 4914 sub DrawXYYGraph {
|
Line 4775 sub DrawXYYGraph {
|
$ylabel = '' if (! defined($ylabel)); |
$ylabel = '' if (! defined($ylabel)); |
my %ValuesHash = |
my %ValuesHash = |
( |
( |
$id.'.title' => &Apache::lonnet::escape($Title), |
$id.'.title' => &escape($Title), |
$id.'.xlabel' => &Apache::lonnet::escape($xlabel), |
$id.'.xlabel' => &escape($xlabel), |
$id.'.ylabel' => &Apache::lonnet::escape($ylabel), |
$id.'.ylabel' => &escape($ylabel), |
$id.'.labels' => join(',',@$Xlabels), |
$id.'.labels' => join(',',@$Xlabels), |
$id.'.PlotType' => 'XY', |
$id.'.PlotType' => 'XY', |
$id.'.NumSets' => 2, |
$id.'.NumSets' => 2, |
Line 4988 Inputs:
|
Line 4849 Inputs:
|
sub chartlink { |
sub chartlink { |
my ($linktext, $sname, $sdomain) = @_; |
my ($linktext, $sname, $sdomain) = @_; |
my $link = '<a href="/adm/statistics?reportSelected=student_assessment'. |
my $link = '<a href="/adm/statistics?reportSelected=student_assessment'. |
'&SelectedStudent='.&Apache::lonnet::escape($sname.':'.$sdomain). |
'&SelectedStudent='.&escape($sname.':'.$sdomain). |
'&chartoutputmode='.HTML::Entities::encode('html, with all links'). |
'&chartoutputmode='.HTML::Entities::encode('html, with all links'). |
'">'.$linktext.'</a>'; |
'">'.$linktext.'</a>'; |
} |
} |
Line 5018 a hash ref describing the data to be sto
|
Line 4879 a hash ref describing the data to be sto
|
'chartoutputmode' => 'scalar', |
'chartoutputmode' => 'scalar', |
'chartoutputdata' => 'scalar', |
'chartoutputdata' => 'scalar', |
'Section' => 'array', |
'Section' => 'array', |
|
'Group' => 'array', |
'StudentData' => 'array', |
'StudentData' => 'array', |
'Maps' => 'array'); |
'Maps' => 'array'); |
|
|
Line 5051 sub store_course_settings {
|
Line 4913 sub store_course_settings {
|
if (ref($env{'form.'.$setting})) { |
if (ref($env{'form.'.$setting})) { |
$stored_form = join(',', |
$stored_form = join(',', |
map { |
map { |
&Apache::lonnet::escape($_); |
&escape($_); |
} sort(@{$env{'form.'.$setting}})); |
} sort(@{$env{'form.'.$setting}})); |
} else { |
} else { |
$stored_form = |
$stored_form = |
&Apache::lonnet::escape($env{'form.'.$setting}); |
&escape($env{'form.'.$setting}); |
} |
} |
# Determine if the array contents are the same. |
# Determine if the array contents are the same. |
if ($stored_form ne $env{$envname}) { |
if ($stored_form ne $env{$envname}) { |
Line 5089 sub restore_course_settings {
|
Line 4951 sub restore_course_settings {
|
} elsif ($type eq 'array') { |
} elsif ($type eq 'array') { |
$env{'form.'.$setting} = [ |
$env{'form.'.$setting} = [ |
map { |
map { |
&Apache::lonnet::unescape($_); |
&unescape($_); |
} split(',',$env{$envname}) |
} split(',',$env{$envname}) |
]; |
]; |
} |
} |
Line 5162 sub escape_double {
|
Line 5024 sub escape_double {
|
sub escape_url { |
sub escape_url { |
my ($url) = @_; |
my ($url) = @_; |
my @urlslices = split(/\//, $url,-1); |
my @urlslices = split(/\//, $url,-1); |
my $lastitem = &Apache::lonnet::escape(pop(@urlslices)); |
my $lastitem = &escape(pop(@urlslices)); |
return join('/',@urlslices).'/'.$lastitem; |
return join('/',@urlslices).'/'.$lastitem; |
} |
} |
=pod |
=pod |