loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.360 and 1.392

version 1.360, 2006/05/01 20:50:50	version 1.392, 2006/06/23 02:56:29
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 385 sub selectstudent_link {	Line 386 sub selectstudent_link {

sub coursebrowser_javascript {	sub coursebrowser_javascript {
my ($domainfilter)=@_;	my ($domainfilter)=@_;
	my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
return (<<ENDSTDBRW);	return (<<ENDSTDBRW);
<script type="text/javascript" language="Javascript" >	<script type="text/javascript" language="Javascript" >
var stdeditbrowser;	var stdeditbrowser;
function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag) {	function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
var url = '/adm/pickcourse?';	var url = '/adm/pickcourse?';
var filter;	var filter;
if (filter != null) {	if (filter != null) {
Line 414 sub coursebrowser_javascript {	Line 416 sub coursebrowser_javascript {
if (multflag !=null && multflag != '') {	if (multflag !=null && multflag != '') {
url += '&multiple='+multflag;	url += '&multiple='+multflag;
}	}
	if (crstype == 'Course/Group') {
	if (formname == 'cu') {
	crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value;
	if (crstype == "") {
	alert("$crs_or_grp_alert");
	return;
	}
	}
	}
	if (crstype !=null && crstype != '') {
	url += '&type='+crstype;
	}
var title = 'Course_Browser';	var title = 'Course_Browser';
var options = 'scrollbars=1,resizable=1,menubar=0';	var options = 'scrollbars=1,resizable=1,menubar=0';
options += ',width=700,height=600';	options += ',width=700,height=600';
Line 425 ENDSTDBRW	Line 439 ENDSTDBRW
}	}

sub selectcourse_link {	sub selectcourse_link {
my ($form,$unameele,$udomele,$desc,$extra_element,$multflag)=@_;	my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.	return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
'","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'");'."'>".&mt('Select Course')."</a>";	'","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select [_1]',$selecttype)."</a>";
}	}

sub check_uncheck_jscript {	sub check_uncheck_jscript {
Line 709 sub help_open_menu {	Line 723 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')";
} else {	} else {
$link = "javascript:helpMenu('display')";	$link = "javascript:helpMenu('display')";
}	}
my $banner_link = "/adm/helpmenu?page=banner&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";	my $banner_link = "/adm/helpmenu?page=banner&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";
my $details_link = "/adm/helpmenu?page=body&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp";	my $details_link = "/adm/helpmenu?page=body&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp";
my $template;	my $template;
if ($text ne "") {	if ($text ne "") {
$template .=	$template .=
Line 775 ENDTEMPLATE	Line 789 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 802 sub help_open_bug {	Line 816 sub help_open_bug {
$topic=~s/\W+/\+/g;	$topic=~s/\W+/\+/g;
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 2038 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 2409 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 2421 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 2543 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 2589 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 2619 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 2773 Inputs:	Line 2793 Inputs:

=item * $notitle, if true keep the nav controls, but remove the title bar	=item * $notitle, if true keep the nav controls, but remove the title bar

	=item * $no_inline_link, if true and in remote mode, don't show the
	'Switch To Inline Menu' link


=back	=back

Line 2785 other decorations will be returned.	Line 2808 other decorations will be returned.

sub bodytag {	sub bodytag {
my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,	my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
$notopbar,$bgcolor,$notitle)=@_;	$notopbar,$bgcolor,$notitle,$no_inline_link)=@_;

$title=&mt($title);	$title=&mt($title);

Line 2803 sub bodytag {	Line 2826 sub bodytag {
@$addentries{keys(%design)} = @design{keys(%design)};	@$addentries{keys(%design)} = @design{keys(%design)};

# role and realm	# role and realm
my ($role,$realm) =	my ($role,$realm) = split(/\./,$env{'request.role'},2);
&Apache::lonnet::plaintext((split(/\./,$env{'request.role'}))[0]);	if ($role eq 'ca') {
	my ($rdom,$rname) = ($realm =~ m-^/(\w+)/(\w+)$-);
	$realm = &plainname($rname,$rdom).':'.$rdom;
	}
# realm	# realm
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
	if ($env{'request.role'} !~ /^cr/) {
	$role = &Apache::lonnet::plaintext($role,&course_type());
	}
$realm = $env{'course.'.$env{'request.course.id'}.'.description'};	$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
	} else {
	$role = &Apache::lonnet::plaintext($role);
}	}
if (!$realm) { $realm=' '; }	if (!$realm) { $realm=' '; }
# Set messages	# Set messages
Line 2845 sub bodytag {	Line 2876 sub bodytag {
$env{'environment.middlename'}	$env{'environment.middlename'}
$env{'environment.lastname'}	$env{'environment.lastname'}
$env{'environment.generation'}	$env{'environment.generation'}

</div>	</div>
<div class="LC_title_bar_role">	<div class="LC_title_bar_role">
$role	$role
</div>	</div>
<div class="LC_title_bar_realm">	<div class="LC_title_bar_realm">
$realm	$realm
</div>	</div>
</td>	</td>
ENDROLE	ENDROLE
Line 2867 ENDROLE	Line 2899 ENDROLE
'.domain'}.'/'})) {	'.domain'}.'/'})) {
my $cid = $env{'request.course.id'};	my $cid = $env{'request.course.id'};
$dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};	$dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
	$dc_info =~ s/\s+$//;
$dc_info = '('.$dc_info.')';	$dc_info = '('.$dc_info.')';
}	}

Line 2932 ENDROLE	Line 2965 ENDROLE
$lonhttpdPort.$img.'" alt="'.$function.'" />';	$lonhttpdPort.$img.'" alt="'.$function.'" />';

# Explicit link to get inline menu	# Explicit link to get inline menu
my $menu='<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>';	my $menu= ($no_inline_link?''
	:'<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>');
#	#
if ($notitle) {	if ($notitle) {
return $bodytag;	return $bodytag;
Line 2940 ENDROLE	Line 2974 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 3063 sub standard_css {	Line 3098 sub standard_css {
my $tabbg = &designparm($function.'.tabbg', $domain);	my $tabbg = &designparm($function.'.tabbg', $domain);
my $font = &designparm($function.'.font', $domain);	my $font = &designparm($function.'.font', $domain);
my $sidebg = &designparm($function.'.sidebg',$domain);	my $sidebg = &designparm($function.'.sidebg',$domain);
my $pgbg = $bgcolor \|\|	my $pgbg_or_bgcolor =
	$bgcolor \|\|
&designparm($function.'.pgbg', $domain);	&designparm($function.'.pgbg', $domain);
	my $pgbg = &designparm($function.'.pgbg', $domain);
my $alink = &designparm($function.'.alink', $domain);	my $alink = &designparm($function.'.alink', $domain);
my $vlink = &designparm($function.'.vlink', $domain);	my $vlink = &designparm($function.'.vlink', $domain);
my $link = &designparm($function.'.link', $domain);	my $link = &designparm($function.'.link', $domain);
Line 3082 sub standard_css {	Line 3119 sub standard_css {
my $mail_replied_hover = '#888855';	my $mail_replied_hover = '#888855';
my $mail_other = '#99BBBB';	my $mail_other = '#99BBBB';
my $mail_other_hover = '#669999';	my $mail_other_hover = '#669999';
	my $table_header = '#DDDDDD';

	my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px'
	: '0px 3px 0px 4px';
return <<END;	return <<END;
<style type="text/css">
h1, h2, h3, th { font-family: $sans }	h1, h2, h3, th { font-family: $sans }
a:focus { color: red; background: yellow }	a:focus { color: red; background: yellow }
table.thinborder { border-collapse: collapse; }	table.thinborder { border-collapse: collapse; }
table.thinborder tr th, table.thinborder tr td { border-style: solid; border-width: 1px}	table.thinborder tr th, table.thinborder tr td { border-style: solid; border-width: 1px}
form, .inline { display: inline; }	form, .inline { display: inline; }
.center { text-align: center; }	.center { text-align: center; }
.filename {font-family: monospace;}	.LC_filename {font-family: monospace;}
.LC_error {	.LC_error {
color: red;	color: red;
font-size: larger;	font-size: larger;
Line 3100 form, .inline { display: inline; }	Line 3139 form, .inline { display: inline; }
color: green;	color: green;
}	}

table#LC_top_nav, table#LC_menubuttons, table#LC_nav_location, table#LC_breadcrumbs {	table#LC_top_nav, table#LC_menubuttons {
width: 100%;	width: 100%;
background: $pgbg;	background: $pgbg;
border: 0px;	border: 2px;
border-spacing: 1px;	border-collapse: seperate;
padding: 0px;
margin: 0px;
border-collapse: separate;
}	}
table#LC_title_bar {
	table#LC_title_bar, table#LC_breadcrumbs, table#LC_nav_location {
width: 100%;	width: 100%;
border: 0;	border-color: $pgbg;
border-spacing: 3px;	border-style: solid;
	border-width: $border;

background: $pgbg;	background: $pgbg;
font-family: $sans;	font-family: $sans;
	border-collapse: collapse;
}	}

table#LC_title_bar.LC_with_remote {	table#LC_title_bar.LC_with_remote {
width: 100%;	width: 100%;
border: 0;	border: 0;
Line 3140 span.LC_title_bar_title {	Line 3181 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 3155 table#LC_menubuttons img, table#LC_menub	Line 3201 table#LC_menubuttons img, table#LC_menub
}	}
table#LC_top_nav td {	table#LC_top_nav td {
background: $tabbg;	background: $tabbg;
	border: 0px;
}	}
table#LC_top_nav td a, div#LC_top_nav a {	table#LC_top_nav td a, div#LC_top_nav a {
color: $font;	color: $font;
font-family: $sans;	font-family: $sans;
}	}
	table#LC_top_nav td.LC_top_nav_logo {
	background: $tabbg;
	text-align: right;
	}
table#LC_breadcrumbs td {	table#LC_breadcrumbs td {
background: $tabbg;	background: $tabbg;
color: $font;	color: $font;
Line 3173 table#LC_breadcrumbs td.LC_breadcrumb_co	Line 3224 table#LC_breadcrumbs td.LC_breadcrumb_co
font-size: larger;	font-size: larger;
text-align: right;	text-align: right;
}	}
	td.LC_table_cell_checkbox {
	text-align: center;
	}

.LC_menubuttons_inline_text {	.LC_menubuttons_inline_text {
color: $font;	color: $font;
font-family: $sans;	font-family: $sans;
Line 3255 table.LC_mail_list tr.LC_mail_other {	Line 3310 table.LC_mail_list tr.LC_mail_other {
table.LC_mail_list tr.LC_mail_other:hover {	table.LC_mail_list tr.LC_mail_other:hover {
background-color: $mail_other_hover;	background-color: $mail_other_hover;
}	}
</style>
	table#LC_portfolio_actions {
	width: auto;
	background: $pgbg;
	border: 0px;
	border-spacing: 2px 2px;
	padding: 0px;
	margin: 0px;
	border-collapse: separate;
	}
	table#LC_portfolio_actions td.LC_label {
	background: $tabbg;
	text-align: right;
	}
	table#LC_portfolio_actions td.LC_value {
	background: $tabbg;
	}

	table#LC_cstr_controls {
	width: 100%;
	border-collapse: collapse;
	}
	table#LC_cstr_controls tr td {
	border: 4px solid $pgbg;
	padding: 4px;
	text-align: center;
	background: $tabbg;
	}
	table#LC_cstr_controls tr th {
	border: 4px solid $pgbg;
	background: $table_header;
	text-align: center;
	font-family: $sans;
	font-size: smaller;
	}

	table#LC_browser {

	}
	table#LC_browser tr th {
	background: $table_header;
	}
	table#LC_browser tr td {
	padding: 2px;
	}
	table#LC_browser tr.LC_browser_file,
	table#LC_browser tr.LC_browser_file_published {
	background: #CCFF88;
	}
	table#LC_browser tr.LC_browser_file_locked,
	table#LC_browser tr.LC_browser_file_unpublished {
	background: #FFAA99;
	}
	table#LC_browser tr.LC_browser_file_obsolete {
	background: #AAAAAA;
	}
	table#LC_browser tr.LC_browser_file_modified {
	background: #FFFF77;
	}
	table#LC_browser tr.LC_browser_folder {
	background: #CCCCFF;
	}
	span.LC_current_location {
	font-size: x-large;
	background: $pgbg;
	}

END	END
}	}

Line 3289 Inputs: $title - optional title for the	Line 3410 Inputs: $title - optional title for the
sub headtag {	sub headtag {
my ($title,$head_extra,$args) = @_;	my ($title,$head_extra,$args) = @_;

	my $function = $args->{'function'} \|\| &get_users_function();
	my $domain = $args->{'domain'} \|\| &determinedomain();
	my $bgcolor = $args->{'bgcolor'} \|\| &designparm($function.'.pgbg',$domain);
	my $url = join(':',$env{'user.name'},$env{'user.domain'},time(),
	#$env{'environment.color.timestamp'},
	$function,$domain,$bgcolor);

	$url = '/adm/css/'.&escape($url).'.css';

my $result =	my $result =
'<head>'.	'<head>'.
&standard_css($args->{'function'},$args->{'domain'},	'<link rel="stylesheet" type="text/css" href="'.$url.'" />'.
$args->{'bgcolor'}).
&font_settings().	&font_settings().
&Apache::lonhtmlcommon::htmlareaheaders();	&Apache::lonhtmlcommon::htmlareaheaders();

Line 3451 Inputs: $title - optional title for the	Line 3580 Inputs: $title - optional title for the
head -> skip the <html><head> generation	head -> skip the <html><head> generation
body -> skip all <body> generation	body -> skip all <body> generation

	no_inline_link -> if true and in remote mode, don't show the
	'Switch To Inline Menu' link

=back	=back

=cut	=cut
Line 3486 sub start_page {	Line 3618 sub start_page {
$args->{'only_body'}, $args->{'domain'},	$args->{'only_body'}, $args->{'domain'},
$args->{'force_register'}, $args->{'body_title'},	$args->{'force_register'}, $args->{'body_title'},
$args->{'no_nav_bar'}, $args->{'bgcolor'},	$args->{'no_nav_bar'}, $args->{'bgcolor'},
$args->{'no_title'});	$args->{'no_title'}, $args->{'no_inline_link'});
}	}
}	}

Line 3521 Inputs: $args - additional optio	Line 3653 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 3564 sub js_ready {	Line 3695 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 3611 sub simple_error_page {	Line 3742 sub simple_error_page {
my $row_count;	my $row_count;
sub start_data_table {	sub start_data_table {
undef($row_count);	undef($row_count);
return '<table class="LC_data_table">';	return '<table class="LC_data_table">'."\n";
}	}

sub end_data_table {	sub end_data_table {
undef($row_count);	undef($row_count);
return '</table>';	return '</table>'."\n";;
}	}

sub start_data_table_row {	sub start_data_table_row {
$row_count++;	$row_count++;
return '<tr '.(($row_count % 2)?'':'class="LC_even_row"').'>';	return '<tr '.(($row_count % 2)?'':'class="LC_even_row"').'>'."\n";;
}	}

sub end_data_table_row {	sub end_data_table_row {
return '</tr>';	return '</tr>'."\n";;
	}

	sub start_data_table_header_row {
	return '<tr class="LC_header_row">'."\n";;
	}

	sub end_data_table_header_row {
	return '</tr>'."\n";;
}	}
}	}

Line 3669 specific user. Roles can be active, prev	Line 3808 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 3720 sub check_user_status {	Line 3859 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

###############################################	###############################################
sub get_sections {	sub get_sections {
my ($cdom,$cnum,$sectioncount,$possible_roles) = @_;	my ($cdom,$cnum,$possible_roles) = @_;
if (!($cdom && $cnum)) { return 0; }	if (!defined($cdom) \|\| !defined($cnum)) {
my $numsections = 0;	my $cid = $env{'request.course.id'};

	return if (!defined($cid));

	$cdom = $env{'course.'.$cid.'.domain'};
	$cnum = $env{'course.'.$cid.'.num'};
	}

if (!defined($possible_roles) \|\| (grep/^st$/,@$possible_roles)) {	my %sectioncount;

	if (!defined($possible_roles) \|\| (grep(/^st$/,@$possible_roles))) {
my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum);	my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum);
my $sec_index = &Apache::loncoursedata::CL_SECTION();	my $sec_index = &Apache::loncoursedata::CL_SECTION();
my $status_index = &Apache::loncoursedata::CL_STATUS();	my $status_index = &Apache::loncoursedata::CL_STATUS();
while (my ($student,$data) = each %$classlist) {	while (my ($student,$data) = each(%$classlist)) {
my ($section,$status) = ($data->[$sec_index],	my ($section,$status) = ($data->[$sec_index],
$data->[$status_index]);	$data->[$status_index]);
unless ($section eq '-1' \|\| $section =~ /^\s*$/) {	unless ($section eq '-1' \|\| $section =~ /^\s*$/) {
if (!defined($$sectioncount{$section})) { $numsections++; }	$sectioncount{$section}++;
$$sectioncount{$section}++;
}	}
}	}
}	}
Line 3761 sub get_sections {	Line 3908 sub get_sections {
}	}
if ($user =~ /^$role:[^:]:[^:]:(\w+)/) { $section=$1; }	if ($user =~ /^$role:[^:]:[^:]:(\w+)/) { $section=$1; }
if (!defined($section) \|\| $section eq '-1') { next; }	if (!defined($section) \|\| $section eq '-1') { next; }
if (!defined($$sectioncount{$section})) { $numsections++; }	$sectioncount{$section}++;
$$sectioncount{$section}++;
}
return $numsections;
}

###############################################

=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 ($curr_groups,$cdom,$cnum,$group) = @_;
my $numgroups;
if (!defined($cdom) \|\| !defined($cnum)) {
my $cid = $env{'request.course.id'};
$cdom = $env{'course.'.$cid.'.domain'};
$cnum = $env{'course.'.$cid.'.num'};
}
%{$curr_groups} = &Apache::lonnet::get_coursegroups($cdom,$cnum,$group);
my ($tmp) = keys(%{$curr_groups});
if ($tmp=~/^error:/) {
unless ($tmp eq 'error: 2 tie(GDBM) Failed while attempting dump') {
&logthis('Error retrieving groups: '.$tmp.' in '.$cnum.':'.
$cdom);
}
$numgroups = 0;
} else {
$numgroups = keys(%{$curr_groups});
}	}
return $numgroups;	return %sectioncount;
}

###############################################

=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;
}	}

###############################################	###############################################
Line 4047 sub get_user_info {	Line 4046 sub get_user_info {
return;	return;
}	}

	sub get_secgrprole_info {
	my ($cdom,$cnum,$needroles,$type) = @_;
	my %sections_count = &get_sections($cdom,$cnum);
	my @sections = (sort {$a <=> $b} keys(%sections_count));
	my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
	my @groups = sort(keys(%curr_groups));
	my $allroles = [];
	my $rolehash;
	my $accesshash = {
	active => 'Currently has access',
	future => 'Will have future access',
	previous => 'Previously had access',
	};
	if ($needroles) {
	$rolehash = {'all' => 'all'};
	my %user_roles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
	if (&Apache::lonnet::error(%user_roles)) {
	undef(%user_roles);
	}
	foreach my $item (keys(%user_roles)) {
	my ($role)=split(/\:/,$item,2);
	if ($role eq 'cr') { next; }
	if ($role =~ /^cr/) {
	$$rolehash{$role} = (split('/',$role))[3];
	} else {
	$$rolehash{$role} = &Apache::lonnet::plaintext($role,$type);
	}
	}
	foreach my $key (sort(keys(%{$rolehash}))) {
	push(@{$allroles},$key);
	}
	push (@{$allroles},'st');
	$$rolehash{'st'} = &Apache::lonnet::plaintext('st',$type);
	}
	return (\@sections,\@groups,$allroles,$rolehash,$accesshash);
	}

=pod	=pod

=item * get_unprocessed_cgi($query,$possible_names)	=item * get_unprocessed_cgi($query,$possible_names)
Line 4067 sub get_unprocessed_cgi {	Line 4103 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 4696 sub DrawBarGraph {	Line 4732 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 4778 sub DrawXYGraph {	Line 4814 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 4875 sub DrawXYYGraph {	Line 4911 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 4949 Inputs:	Line 4985 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 4979 a hash ref describing the data to be sto	Line 5015 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 5012 sub store_course_settings {	Line 5049 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 5050 sub restore_course_settings {	Line 5087 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 5061 sub restore_course_settings {	Line 5098 sub restore_course_settings {
############################################################	############################################################
############################################################	############################################################

sub propath {	sub course_type {
my ($udom,$uname)=@_;	my ($cid) = @_;
$udom=~s/\W//g;	if (!defined($cid)) {
$uname=~s/\W//g;	$cid = $env{'request.course.id'};
my $subdir=$uname.'__';	}
$subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;	if (defined($env{'course.'.$cid.'type'})) {
my $proname="$Apache::lonnet::perlvar{'lonUsersDir'}/$udom/$subdir/$uname";	return $env{'course.'.$cid.'type'};
return $proname;	} else {
}	return 'Course';
	}
	}

sub icon {	sub icon {
my ($file)=@_;	my ($file)=@_;
Line 5123 sub escape_double {	Line 5162 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

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

Removed from v.1.360
changed lines
	Added in v.1.392