version 1.550, 2007/07/17 18:07:18
|
version 1.561, 2007/08/11 15:18:24
|
Line 334 sub studentbrowser_javascript {
|
Line 334 sub studentbrowser_javascript {
|
return (<<'ENDSTDBRW'); |
return (<<'ENDSTDBRW'); |
<script type="text/javascript" language="Javascript" > |
<script type="text/javascript" language="Javascript" > |
var stdeditbrowser; |
var stdeditbrowser; |
function openstdbrowser(formname,uname,udom,roleflag) { |
function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) { |
var url = '/adm/pickstudent?'; |
var url = '/adm/pickstudent?'; |
var filter; |
var filter; |
eval('filter=document.'+formname+'.'+uname+'.value;'); |
if (!ignorefilter) { |
|
eval('filter=document.'+formname+'.'+uname+'.value;'); |
|
} |
if (filter != null) { |
if (filter != null) { |
if (filter != '') { |
if (filter != '') { |
url += 'filter='+filter+'&'; |
url += 'filter='+filter+'&'; |
Line 365 sub selectstudent_link {
|
Line 367 sub selectstudent_link {
|
return ''; |
return ''; |
} |
} |
return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele. |
return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele. |
'","'.$udomele.'");'."'>".&mt('Select User')."</a>"; |
'","'.$udomele.'","","1");'."'>".&mt('Select User')."</a>"; |
} |
} |
if ($env{'request.role'}=~/^(au|dc|su)/) { |
if ($env{'request.role'}=~/^(au|dc|su)/) { |
return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele. |
return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele. |
Line 709 sub help_open_topic {
|
Line 711 sub help_open_topic {
|
my ($topic, $text, $stayOnPage, $width, $height) = @_; |
my ($topic, $text, $stayOnPage, $width, $height) = @_; |
$text = "" if (not defined $text); |
$text = "" if (not defined $text); |
$stayOnPage = 0 if (not defined $stayOnPage); |
$stayOnPage = 0 if (not defined $stayOnPage); |
if ($env{'browser.interface'} eq 'textual' || |
if ($env{'browser.interface'} eq 'textual') { |
$env{'environment.remote'} eq 'off' ) { |
|
$stayOnPage=1; |
$stayOnPage=1; |
} |
} |
$width = 350 if (not defined $width); |
$width = 350 if (not defined $width); |
Line 802 ENDOUTPUT
|
Line 803 ENDOUTPUT
|
# now just updates the help link and generates a blue icon |
# now just updates the help link and generates a blue icon |
sub help_open_menu { |
sub help_open_menu { |
my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) |
my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) |
= @_; |
= @_; |
|
|
$stayOnPage = 0 if (not defined $stayOnPage); |
$stayOnPage = 0 if (not defined $stayOnPage); |
if ($env{'browser.interface'} eq 'textual' || |
# formerly only used pop-up help (stayOnPage = 0) |
$env{'environment.remote'} eq 'off' ) { |
# if environment.remote is on (using remote control UI) |
$stayOnPage=1; |
# if ($env{'browser.interface'} eq 'textual' || |
|
# $env{'environment.remote'} eq 'off' ) { |
|
# $stayOnPage=1; |
|
#} |
|
# Now making pop-up help the default even with remote control |
|
if ($env{'browser.interface'} eq 'textual') { |
|
$stayOnPage=1; |
} |
} |
my $output; |
my $output; |
if ($component_help) { |
if ($component_help) { |
Line 2156 sub getemails {
|
Line 2162 sub getemails {
|
} |
} |
} |
} |
|
|
|
sub flush_email_cache { |
|
my ($uname,$udom)=@_; |
|
if (!$udom) { $udom =$env{'user.domain'}; } |
|
if (!$uname) { $uname=$env{'user.name'}; } |
|
return if ($udom eq 'public' && $uname eq 'public'); |
|
my $id=$uname.':'.$udom; |
|
&Apache::lonnet::devalidate_cache_new('emailscache',$id); |
|
} |
|
|
# ------------------------------------------------------------------ Screenname |
# ------------------------------------------------------------------ Screenname |
|
|
=pod |
=pod |
Line 2229 sub track_student_link {
|
Line 2244 sub track_student_link {
|
$target = ''; |
$target = ''; |
} |
} |
if ($start) { $link.='&start='.$start; } |
if ($start) { $link.='&start='.$start; } |
|
$title = &mt($title); |
|
$linktext = &mt($linktext); |
return qq{<a href="$link" title="$title" $target>$linktext</a>}. |
return qq{<a href="$link" title="$title" $target>$linktext</a>}. |
&help_open_topic('View_recent_activity'); |
&help_open_topic('View_recent_activity'); |
} |
} |
Line 5518 sub get_secgrprole_info {
|
Line 5534 sub get_secgrprole_info {
|
return (\@sections,\@groups,$allroles,$rolehash,$accesshash); |
return (\@sections,\@groups,$allroles,$rolehash,$accesshash); |
} |
} |
|
|
|
sub user_picker { |
|
my ($dom,$srch,$forcenewuser) = @_; |
|
my $currdom = $dom; |
|
my %curr_selected = ( |
|
srchin => 'dom', |
|
srchby => 'uname', |
|
); |
|
my $srchterm; |
|
if (ref($srch) eq 'HASH') { |
|
if ($srch->{'srchby'} ne '') { |
|
$curr_selected{'srchby'} = $srch->{'srchby'}; |
|
} |
|
if ($srch->{'srchin'} ne '') { |
|
$curr_selected{'srchin'} = $srch->{'srchin'}; |
|
} |
|
if ($srch->{'srchtype'} ne '') { |
|
$curr_selected{'srchtype'} = $srch->{'srchtype'}; |
|
} |
|
if ($srch->{'srchdomain'} ne '') { |
|
$currdom = $srch->{'srchdomain'}; |
|
} |
|
$srchterm = $srch->{'srchterm'}; |
|
} |
|
my %lt=&Apache::lonlocal::texthash( |
|
'usr' => 'Search for', |
|
'or' => 'or', |
|
'doma' => 'domain', |
|
'uname' => 'username', |
|
'lastname' => 'last name', |
|
'lastfirst' => 'last name, first name', |
|
'crs' => 'in this course', |
|
'dom' => 'in this domain', |
|
'alc' => 'all LON-CAPA', |
|
'instd' => 'in institutional directory', |
|
'exact' => 'is', |
|
'contains' => 'contains', |
|
); |
|
my $domform = &select_dom_form($currdom,'srchdomain',1); |
|
|
|
my $srchin; |
|
|
|
my @srchins = ('crs','dom','alc','instd'); |
|
|
|
foreach my $option (@srchins) { |
|
# FIXME 'alc' option unavailable until |
|
# loncreateuser::print_user_query_page() |
|
# has been completed. |
|
next if ($option eq 'alc'); |
|
next if ($option eq 'crs' && !$env{'request.course.id'}); |
|
my $checked =($curr_selected{'srchin'} eq $option) ?'checked="checked"' |
|
:''; |
|
my $extra = ($option eq 'dom') ? $domform |
|
: ''; |
|
$srchin.=<<ROW |
|
<tr> |
|
<td> |
|
<label><input type="radio" name="srchin" value="$option" $checked /> $lt{$option}</label> $extra |
|
</td> |
|
</tr> |
|
ROW |
|
} |
|
|
|
my $srchbysel = ' <select name="srchby">'; |
|
foreach my $option ('uname','lastname','lastfirst') { |
|
if ($curr_selected{'srchby'} eq $option) { |
|
$srchbysel .= ' |
|
<option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>'; |
|
} else { |
|
$srchbysel .= ' |
|
<option value="'.$option.'">'.$lt{$option}.'</option>'; |
|
} |
|
} |
|
$srchbysel .= "\n </select>\n"; |
|
|
|
my $srchtypesel = ' <select name="srchtype">'; |
|
foreach my $option ('exact','contains') { |
|
if ($curr_selected{'srchtype'} eq $option) { |
|
$srchtypesel .= ' |
|
<option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>'; |
|
} else { |
|
$srchtypesel .= ' |
|
<option value="'.$option.'">'.$lt{$option}.'</option>'; |
|
} |
|
} |
|
$srchtypesel .= "\n </select>\n"; |
|
|
|
my ($newuserscript,$new_user_create); |
|
|
|
if ($forcenewuser) { |
|
$new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\');" /> </p>'; |
|
$newuserscript = <<"ENDSCRIPT"; |
|
|
|
function setSearch(createnew) { |
|
if (createnew == 1) { |
|
for (var i=0; i<document.crtuser.srchby.length; i++) { |
|
if (document.crtuser.srchby.options[i].value == 'uname') { |
|
document.crtuser.srchby.selectedIndex = i; |
|
} |
|
} |
|
for (var i=0; i<document.crtuser.srchin.length; i++) { |
|
if ( document.crtuser.srchin[i].value == 'dom') { |
|
document.crtuser.srchin[i].checked = 1; |
|
} |
|
} |
|
for (var i=0; i<document.crtuser.srchtype.length; i++) { |
|
if (document.crtuser.srchtype.options[i].value == 'exact') { |
|
document.crtuser.srchtype.selectedIndex = i; |
|
} |
|
} |
|
for (var i=0; i<document.crtuser.srchdomain.length; i++) { |
|
if (document.crtuser.srchdomain.options[i].value == '$env{'request.role.domain'}') { |
|
document.crtuser.srchdomain.selectedIndex = i; |
|
} |
|
} |
|
} |
|
} |
|
ENDSCRIPT |
|
|
|
} |
|
|
|
my $output = <<"END_BLOCK"; |
|
<script type="text/javascript"> |
|
function validateEntry() { |
|
|
|
var checkok = 1; |
|
var srchin; |
|
for (var i=0; i<document.crtuser.srchin.length; i++) { |
|
if ( document.crtuser.srchin[i].checked ) { |
|
srchin = document.crtuser.srchin[i].value; |
|
} |
|
} |
|
|
|
var srchtype = document.crtuser.srchtype.options[document.crtuser.srchtype.selectedIndex].value; |
|
var srchby = document.crtuser.srchby.options[document.crtuser.srchby.selectedIndex].value; |
|
var srchdomain = document.crtuser.srchdomain.options[document.crtuser.srchdomain.selectedIndex].value; |
|
var srchterm = document.crtuser.srchterm.value; |
|
var msg = ""; |
|
|
|
if (srchterm == "") { |
|
checkok = 0; |
|
msg += "You must include some text to search for.\\n"; |
|
} |
|
|
|
if (srchtype== 'contains') { |
|
if (srchterm.length < 3) { |
|
checkok = 0; |
|
msg += "The text you are searching for must contain at least three characters when using a 'contained in' type search.\\n"; |
|
} |
|
} |
|
if (srchin == 'instd') { |
|
if (srchdomain == '') { |
|
checkok = 0; |
|
msg += "You must choose a domain when using an institutional directory search.\\n"; |
|
} |
|
} |
|
if (srchin == 'dom') { |
|
if (srchdomain == '') { |
|
checkok = 0; |
|
msg += "You must choose a domain when using a domain search.\\n"; |
|
} |
|
} |
|
if (srchby == 'lastfirst') { |
|
if (srchterm.indexOf(",") == -1) { |
|
checkok = 0; |
|
msg += "When using searching by last,first you must include a comma as separator between last name and first name.\\n"; |
|
} |
|
if (srchterm.indexOf(",") == srchterm.length -1) { |
|
checkok = 0; |
|
msg += "When searching by last,first you must include at least one character in the first name.\\n"; |
|
} |
|
} |
|
if (checkok == 0) { |
|
alert("The following need to be corrected before the search can be run:\\n"+msg); |
|
return; |
|
} |
|
if (checkok == 1) { |
|
document.crtuser.submit(); |
|
} |
|
} |
|
|
|
$newuserscript |
|
|
|
</script> |
|
|
|
$new_user_create |
|
|
|
<table> |
|
<tr> |
|
<td> $srchbysel |
|
$srchtypesel |
|
<input type="text" size="15" name="srchterm" value="$srchterm" /> |
|
</td> |
|
</tr> |
|
$srchin |
|
</table> |
|
<br /> |
|
END_BLOCK |
|
|
|
return $output; |
|
} |
|
|
|
|
|
|
=pod |
=pod |
|
|
=back |
=back |
Line 5775 sub record_sep {
|
Line 5994 sub record_sep {
|
$i++; |
$i++; |
} |
} |
} else { |
} else { |
my @allfields; |
my $separator=','; |
if ($env{'form.upfiletype'} eq 'semisv') { |
if ($env{'form.upfiletype'} eq 'semisv') { |
@allfields=split(/;/,$record,-1); |
$separator=';'; |
} else { |
|
@allfields=split(/\,/,$record,-1); |
|
} |
} |
my $i=0; |
my $i=0; |
my $j; |
# the character we are looking for to indicate the end of a quote or a record |
for ($j=0;$j<=$#allfields;$j++) { |
my $looking_for=$separator; |
my $field=$allfields[$j]; |
# do not add the characters to the fields |
if ($field=~/^\s*(\"|\')/) { |
my $ignore=0; |
my $delimiter=$1; |
# we just encountered a separator (or the beginning of the record) |
while (($field!~/$delimiter$/) && ($j<$#allfields)) { |
my $just_found_separator=1; |
$j++; |
# store the field we are working on here |
$field.=','.$allfields[$j]; |
my $field=''; |
} |
# work our way through all characters in record |
$field=~s/^\s*$delimiter//; |
foreach my $character ($record=~/(.)/g) { |
$field=~s/$delimiter\s*$//; |
if ($character eq $looking_for) { |
} |
if ($character ne $separator) { |
$components{&takeleft($i)}=$field; |
# Found the end of a quote, again looking for separator |
$i++; |
$looking_for=$separator; |
|
$ignore=1; |
|
} else { |
|
# Found a separator, store away what we got |
|
$components{&takeleft($i)}=$field; |
|
$i++; |
|
$just_found_separator=1; |
|
$ignore=0; |
|
$field=''; |
|
} |
|
next; |
|
} |
|
# single or double quotation marks after a separator indicate beginning of a quote |
|
# we are now looking for the end of the quote and need to ignore separators |
|
if ((($character eq '"') || ($character eq "'")) && ($just_found_separator)) { |
|
$looking_for=$character; |
|
next; |
|
} |
|
# ignore would be true after we reached the end of a quote |
|
if ($ignore) { next; } |
|
if (($just_found_separator) && ($character=~/\s/)) { next; } |
|
$field.=$character; |
|
$just_found_separator=0; |
} |
} |
|
# catch the very last entry, since we never encountered the separator |
|
$components{&takeleft($i)}=$field; |
} |
} |
return %components; |
return %components; |
} |
} |