loncom/interface/lonmsgdisplay.pm - diff

Return to lonmsgdisplay.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.56 and 1.57

version 1.56, 2006/12/23 06:19:10	version 1.57, 2006/12/23 07:21:00
Line 132 use LONCAPA;	Line 132 use LONCAPA;
# Querystring component with sorting type	# Querystring component with sorting type
my $sqs;	my $sqs;
my $startdis;	my $startdis;
my $interdis;

# ============================================================ List all folders	# ============================================================ List all folders

Line 230 function folder_choice(targetform,caller	Line 229 function folder_choice(targetform,caller
}	}
}	}
</script>\|;	</script>\|;
	my %show = ('select_form_order' => [10,20,50,100,200],
	map {$_=>$_} (10,20,50,100,200));


$output .= '	$output .= '
<form method="post" action="/adm/email" name="folderlist">	<form method="post" action="/adm/email" name="folderlist">
<table border="0" cellspacing="2" cellpadding="2">	<table border="0" cellspacing="2" cellpadding="2">
Line 240 function folder_choice(targetform,caller	Line 243 function folder_choice(targetform,caller
<td align="center"><b>'.$lt{'fold'}.'</b><br />'."\n".	<td align="center"><b>'.$lt{'fold'}.'</b><br />'."\n".
&Apache::loncommon::select_form($folder,'folder',%formhash).'	&Apache::loncommon::select_form($folder,'folder',%formhash).'
</td>	</td>
<td align="center"><b>'.$lt{'show'}.'</b><br />	<td align="center"><b>'.$lt{'show'}.'</b><br />'."\n".
<select name="interdis">'.	&Apache::loncommon::select_form($env{'form.interdis'},'interdis',
join("\n",map { '<option value="'.$_.'"'.	%show).'
($_==$interdis?' selected="selected"':'').'>'.$_.'</option>'
}
(10,20,50,100,200)).'</select>
</td>	</td>
<td align="center"><b>'.$lt{'status'}.'</b><br />'."\n".	<td align="center"><b>'.$lt{'status'}.'</b><br />'."\n".
&Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).'	&Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).'
Line 892 sub get_course_desc {	Line 892 sub get_course_desc {

sub disall {	sub disall {
my ($r,$folder,$msgstatus)=@_;	my ($r,$folder,$msgstatus)=@_;
	my %saveable = ('folder' => 'scalar',
	'msgstatus' => 'scalar',
	'sortedby' => 'scalar',
	'interdis' => 'scalar',
	);
	&Apache::loncommon::store_settings('user','mail',\%saveable);
	&Apache::loncommon::restore_settings('user','mail',\%saveable);
	$folder \|\|= $env{'form.folder'};
	$msgstatus \|\|= $env{'form.msgstatus'};
	$env{'form.interdis'} \|\|= 20;

$r->print(&folderlist($folder,$msgstatus));	$r->print(&folderlist($folder,$msgstatus));
if ($folder eq 'critical') {	if ($folder eq 'critical') {
&discrit($r);	&discrit($r);
Line 974 ENDDISHEADER	Line 985 ENDDISHEADER
}	}
return;	return;
}	}
unless ($interdis) {	my $interdis = $env{'form.interdis'};
$interdis=20;
}
my $number=int($totalnumber/$interdis);	my $number=int($totalnumber/$interdis);
if ($interdis) {	if ($totalnumber%$interdis == 0) {
if ($totalnumber%$interdis == 0) {	$number--;
$number--;
}
}	}

if (($startdis<0) \|\| ($startdis>$number)) { $startdis=$number; }	if (($startdis<0) \|\| ($startdis>$number)) { $startdis=$number; }
Line 2399 sub handler {	Line 2406 sub handler {
}	}
unless ($startdis) { $startdis=0; }	unless ($startdis) { $startdis=0; }

$interdis=$env{'form.interdis'};
unless ($interdis) { $interdis=20; }
$sqs.='&interdis='.$interdis;

if ($env{'form.firstview'}) {	if ($env{'form.firstview'}) {
$startdis=0;	$startdis=0;
}	}

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

Removed from v.1.56
changed lines
	Added in v.1.57