version 1.366, 2006/05/09 15:09:27
|
version 1.374, 2006/05/17 23:25:56
|
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 2945 ENDROLE
|
Line 2952 ENDROLE
|
return(<<ENDBODY); |
return(<<ENDBODY); |
$bodytag |
$bodytag |
<table id="LC_title_bar" class="LC_with_remote"> |
<table id="LC_title_bar" class="LC_with_remote"> |
<tr><td>$upperleft</td> |
<tr><td class="LC_title_bar_role_logo">$upperleft</td> |
<td class="LC_title_bar_domain_logo">$messages </td> |
<td class="LC_title_bar_domain_logo">$messages </td> |
</tr> |
</tr> |
<tr><td>$titleinfo $dc_info $menu</td> |
<tr><td>$titleinfo $dc_info $menu</td> |
$roleinfo |
$roleinfo |
|
</tr> |
</table> |
</table> |
ENDBODY |
ENDBODY |
} |
} |
Line 3117 table#LC_title_bar {
|
Line 3125 table#LC_title_bar {
|
width: 100%; |
width: 100%; |
border: 0; |
border: 0; |
border-spacing: 0px 1px; |
border-spacing: 0px 1px; |
|
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 3145 span.LC_title_bar_title {
|
Line 3154 span.LC_title_bar_title {
|
table#LC_title_bar td.LC_title_bar_domain_logo { |
table#LC_title_bar td.LC_title_bar_domain_logo { |
background: $sidebg; |
background: $sidebg; |
text-align: right; |
text-align: right; |
|
padding: 0px; |
|
} |
|
table#LC_title_bar td.LC_title_bar_role_logo { |
|
background: $sidebg; |
|
padding: 0px; |
} |
} |
|
|
table#LC_menubuttons_mainmenu { |
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 3304 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 3540 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 3583 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 3646 sub simple_error_page {
|
Line 3659 sub simple_error_page {
|
sub end_data_table_row { |
sub end_data_table_row { |
return '</tr>'; |
return '</tr>'; |
} |
} |
|
|
|
sub start_data_table_header_row { |
|
return '<tr class="LC_header_row">'; |
|
} |
|
|
|
sub end_data_table_header_row { |
|
return '</tr>'; |
|
} |
} |
} |
|
|
############################################### |
############################################### |
Line 3739 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 3801 sub get_sections {
|
Line 3823 sub get_sections {
|
Retrieve information about groups in a course, |
Retrieve information about groups in a course, |
|
|
Input: |
Input: |
1. Reference to hash to populate with group information. |
1. Optional course domain |
2. Optional course domain |
2. Optional course number |
3. Optional course number |
3. Optional group name |
4. Optional group name |
|
|
|
Course domain and number will be taken from user's |
Course domain and number will be taken from user's |
environment if not supplied. Optional group name will' |
environment if not supplied. Optional group name will' |
Line 3812 be passed to lonnet::get_coursegroups()
|
Line 3833 be passed to lonnet::get_coursegroups()
|
use in the call to the dump function. |
use in the call to the dump function. |
|
|
Output |
Output |
Returns number of groups in the course (subject to the |
Returns hash of groups in the course (subject to the |
optional group name filter). |
optional group name filter). In the hash, the keys are |
|
group names, and their corresponding values |
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 |
are scalars containing group information in XML. This |
can be sent to &get_group_settings() to be parsed. |
can be sent to &get_group_settings() to be parsed. |
|
|
|
Side effects: |
|
None. |
=cut |
=cut |
|
|
############################################### |
############################################### |
Line 3895 sub get_group_settings {
|
Line 3915 sub get_group_settings {
|
} elsif ($entry eq 'role') { |
} elsif ($entry eq 'role') { |
if ($tool eq 'autosec') { |
if ($tool eq 'autosec') { |
$role = $token->[2]{id}; |
$role = $token->[2]{id}; |
|
@{$content{$tool}{$role}} = (); |
} |
} |
} else { |
} else { |
my $value=$parser->get_text('/'.$entry); |
my $value=$parser->get_text('/'.$entry); |
Line 3904 sub get_group_settings {
|
Line 3925 sub get_group_settings {
|
$content{$tool}{$function} = $value; |
$content{$tool}{$function} = $value; |
} |
} |
} elsif ($entry eq 'groupname') { |
} elsif ($entry eq 'groupname') { |
$content{$entry}=&Apache::lonnet::unescape($value); |
$content{$entry}=&unescape($value); |
} elsif (($entry eq 'roles') || ($entry eq 'types') || |
} elsif (($entry eq 'roles') || ($entry eq 'types') || |
($entry eq 'sectionpick') || ($entry eq 'defpriv')) { |
($entry eq 'sectionpick') || ($entry eq 'defpriv')) { |
push(@{$content{$entry}},$value); |
push(@{$content{$entry}},$value); |
Line 4091 sub get_unprocessed_cgi {
|
Line 4112 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 4720 sub DrawBarGraph {
|
Line 4741 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 4802 sub DrawXYGraph {
|
Line 4823 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 4899 sub DrawXYYGraph {
|
Line 4920 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 4973 Inputs:
|
Line 4994 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 5003 a hash ref describing the data to be sto
|
Line 5024 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 5036 sub store_course_settings {
|
Line 5058 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 5074 sub restore_course_settings {
|
Line 5096 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 5147 sub escape_double {
|
Line 5169 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 |