--- loncom/interface/loncommon.pm 2009/08/14 07:40:50 1.692.4.6
+++ loncom/interface/loncommon.pm 2009/04/25 21:35:13 1.797
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.692.4.6 2009/08/14 07:40:50 raeburn Exp $
+# $Id: loncommon.pm,v 1.797 2009/04/25 21:35:13 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -271,7 +271,7 @@ BEGIN {
}
}
&Apache::lonnet::logthis(
- "INFO: Read file types");
+ "INFO: Read file types");
$readit=1;
} # end of unless($readit)
@@ -407,7 +407,6 @@ sub studentbrowser_javascript {
) { return ''; }
return (<<'ENDSTDBRW');
ENDSTDBRW
}
@@ -452,7 +450,7 @@ sub selectstudent_link {
&mt('Select User').'';
}
if ($env{'request.role'}=~/^(au|dc|su)/) {
- $callargs .= ",1";
+ $callargs .= ",1";
return ''.
''.
&mt('Select User').'';
@@ -462,8 +460,7 @@ sub selectstudent_link {
sub authorbrowser_javascript {
return <<"ENDAUTHORBRW";
-
ENDAUTHORBRW
}
sub coursebrowser_javascript {
my ($domainfilter,$sec_element,$formname)=@_;
- my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Community - for which you wish to add/modify a user role');
+ 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');
my $output = '
';
return $output;
}
@@ -615,16 +610,12 @@ function setSect(sectionlist) {
sub selectcourse_link {
my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
- my $linktext = &mt('Select Course');
- if ($selecttype eq 'Community') {
- $linktext = &mt('Select Community');
- }
return ''
."".$linktext.''
+ ."'>".&mt('Select Course').''
.'';
}
@@ -834,7 +825,6 @@ sub linked_select_forms {
# output the javascript to do the changing
my $result = '';
$result.='
END
# output the initial values for the selection lists
@@ -962,20 +951,22 @@ sub help_open_topic {
}
# Add the text
- if ($text ne "") {
- $template .=
- "
".
- "
$text";
+ if ($text ne "") {
+ $template.=''
+ .''
+ .$text.'';
}
- # Add the graphic
+ # (Always) Add the graphic
my $title = &mt('Online Help');
my $helpicon=&lonhttpdurl("/adm/help/help.png");
- $template .= ''.
- '';
- if ($text ne '') {
- $template.='
';
+ $template.=' '
+ .'';
+ if ($text ne "") {
+ $template.='';
}
return $template;
@@ -988,25 +979,26 @@ sub helpLatexCheatsheet {
my $out;
my $addOther = '';
if ($topic) {
- $addOther = &Apache::loncommon::help_open_topic($topic,$text,
- undef, undef, 600) .
- '
$text";
}
# Add the graphic
@@ -1408,7 +1398,6 @@ sub resize_textarea_js {
my $geometry = &viewport_geometry_js();
return <<"RESIZE";
RESIZE
@@ -1802,7 +1790,7 @@ selected");
If the $showdomdesc flag is set, the domain name is followed by the domain description.
-If the $autosubmit flag is set, the form containing the domain selector will be auto-submitted by an onchange action.
+If the $autosubmit flag is set, the form containing the domain selector will be auto-submitted by an onchange action.
=cut
@@ -1871,7 +1859,7 @@ sub home_server_form_item {
if ($numlib > 1) {
$result .= ''."\n";
if ($default) {
- $result .= ''."\n";
}
foreach my $hostid (sort(keys(%servers))) {
@@ -2315,7 +2303,7 @@ sub authform_internal{
$result = &mt
('[_1] Internally authenticated (with initial password [_2])',
''.$autharg);
- $result.="';
+ $result.="';
return $result;
}
@@ -2829,25 +2817,6 @@ sub screenname {
return $names{'screenname'};
}
-# ------------------------------------------------------------- Confirm Wrapper
-=pod
-
-=item confirmwrapper
-
-Wrap messages about completion of operation in box
-
-=cut
-
-sub confirmwrapper {
- my ($message)=@_;
- if ($message) {
- return "\n".'
'."\n"
- .$message."\n"
- .'
'."\n";
- } else {
- return $message;
- }
-}
# ------------------------------------------------------------- Message Wrapper
@@ -2881,10 +2850,7 @@ sub aboutmewrapper {
sub syllabuswrapper {
- my ($linktext,$coursedir,$domain,$fontcolor)=@_;
- if ($fontcolor) {
- $linktext=''.$linktext.'';
- }
+ my ($linktext,$coursedir,$domain)=@_;
return qq{$linktext};
}
@@ -3189,6 +3155,7 @@ sub user_lang {
return $user_lh;
}
+
###############################################################
## Student Answer Attempts ##
###############################################################
@@ -3904,7 +3871,7 @@ sub blocking_status {
&Apache::lonnet::coursedescription($course);
$coursedesc = $courseinfo{'description'};
}
- $category = "Group portfolio files in the course '$coursedesc'";
+ $category = "Group portfolio in the course '$coursedesc'";
} else {
$category = 'Portfolio files belonging to ';
if ($env{'user.name'} eq 'public' &&
@@ -4038,7 +4005,7 @@ sub get_domainconf {
foreach my $key (keys(%{$domconfig{'login'}})) {
if (ref($domconfig{'login'}{$key}) eq 'HASH') {
foreach my $img (keys(%{$domconfig{'login'}{$key}})) {
- $designhash{$udom.'.login.'.$key.'_'.$img} =
+ $designhash{$udom.'.login.'.$key.'_'.$img} =
$domconfig{'login'}{$key}{$img};
}
} else {
@@ -4265,7 +4232,7 @@ sub bodytag {
my $font = &designparm($function.'.font',$domain);
my $pgbg = $bgcolor || &designparm($function.'.pgbg',$domain);
- my %design = ( 'style' => 'margin-top: 0',
+ my %design = ( 'style' => 'margin-top: 0px',
'bgcolor' => $pgbg,
'text' => $font,
'alink' => &designparm($function.'.alink',$domain),
@@ -4333,7 +4300,7 @@ $realm
ENDROLE
- my $titleinfo = ''.$title.'';
+ my $titleinfo = '
'."\n";;
}
@@ -6181,7 +6778,7 @@ sub get_users_function {
if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
$function='admin';
}
- if (($env{'request.role'}=~/^(au|ca|aa)/) ||
+ if (($env{'request.role'}=~/^(au|ca)/) ||
($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
$function='author';
}
@@ -6192,37 +6789,6 @@ sub get_users_function {
=pod
-=item * &show_course()
-
-Used by lonmenu.pm and lonroles.pm to determine whether to use the word
-'Courses' or 'Roles' in inline navigation and on screen displaying user's roles.
-Inputs:
-None
-
-Outputs:
-Scalar: 1 if 'Course' to be used, 0 otherwise.
-
-=cut
-
-###############################################
-sub show_course {
- my $course = !$env{'user.adv'};
- if (!$env{'user.adv'}) {
- foreach my $env (keys(%env)) {
- next if ($env !~ m/^user\.priv\./);
- if ($env !~ m/^user\.priv\.(?:st|cm)/) {
- $course = 0;
- last;
- }
- }
- }
- return $course;
-}
-
-###############################################
-
-=pod
-
=item * &check_user_status()
Determines current status of supplied role for a
@@ -6726,6 +7292,8 @@ If the user's status includes multiple t
the largest default quota which applies to the user determines the
default quota returned.
+=back
+
=cut
###############################################
@@ -6917,14 +7485,12 @@ sub user_picker {
if ($cancreate) {
$new_user_create = '
';
} else {
- my $helplink = 'javascript:helpMenu('."'display'".')';
+ my $helplink = ' href="javascript:helpMenu('."'display'".')"';
my %usertypetext = (
official => 'institutional',
unofficial => 'non-institutional',
);
- $new_user_create = '
'.
- &mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.
- &mt('Please contact the [_1]helpdesk[_2] for assistance.','','').'
';
+ $new_user_create = ' '.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the helpdesk for assistance.',$helplink).'
';
}
}
}
@@ -6961,7 +7527,6 @@ ENDSCRIPT
my $output = <<"END_BLOCK";
$new_user_create
@@ -7284,7 +7848,7 @@ sub get_institutional_codes {
=item * sorted_slots()
-Sorts an array of slot names in order of slot start time (earliest first).
+Sorts an array of slot names in order of slot start time (earliest first).
Inputs:
@@ -7326,9 +7890,8 @@ sub sorted_slots {
return @sorted;
}
-=pod
-=back
+=pod
=head1 HTTP Helpers
@@ -7619,9 +8182,9 @@ sub upload_embedded {
' '.
$orig_uploaded_filename.' ';
} else {
- $output .= ''.
+ $output .= ''.
&mt('View embedded file: [_1]',''.
- $orig_uploaded_filename.'').' ';
+ $orig_uploaded_filename.'').' ';
}
}
close($fh);
@@ -7926,8 +8489,7 @@ sub csv_print_samples {
$r->print(&mt('Samples').' '.&start_data_table().
&start_data_table_header_row());
foreach my $sample (sort({$a <=> $b} keys(%{ $samples->[0] }))) {
- $r->print('
'.&mt('Column [_1]',($sample+1)).'
');
- }
+ $r->print('
'.&mt('Column [_1]',($sample+1)).'
'); }
$r->print(&end_data_table_header_row());
foreach my $hash (@$samples) {
$r->print(&start_data_table_row());
@@ -8657,7 +9219,7 @@ sub build_recipient_list {
my @contacts = ('adminemail','supportemail');
foreach my $item (@contacts) {
if ($domconfig{'contacts'}{$mailing}{$item}) {
- my $addr = $domconfig{'contacts'}{$item};
+ my $addr = $domconfig{'contacts'}{$item};
if (!grep(/^\Q$addr\E$/,@recipients)) {
push(@recipients,$addr);
}
@@ -8937,7 +9499,7 @@ sub assign_categories_table {
my $checked = '';
if (@currcategories > 0) {
if (grep(/^\Q$item\E$/,@currcategories)) {
- $checked = ' checked="checked" ';
+ $checked = ' checked="checked"';
}
}
$output .= '
'.
@@ -9003,7 +9565,7 @@ sub assign_category_rows {
if (ref($currcategories) eq 'ARRAY') {
if (@{$currcategories} > 0) {
if (grep(/^\Q$item\E$/,@{$currcategories})) {
- $checked = ' checked="checked" ';
+ $checked = ' checked="checked"';
}
}
}
@@ -9575,8 +10137,8 @@ sub course_type {
sub group_term {
my $crstype = &course_type();
my %names = (
- 'Course' => 'group',
- 'Community' => 'group',
+ 'Course' => 'group',
+ 'Group' => 'team',
);
return $names{$crstype};
}
@@ -9640,22 +10202,6 @@ sub escape_url {
return join('/',@urlslices).'/'.$lastitem;
}
-sub compare_arrays {
- my ($arrayref1,$arrayref2) = @_;
- my (@difference,%count);
- @difference = ();
- %count = ();
- if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) {
- foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; }
- foreach my $element (keys(%count)) {
- if ($count{$element} == 1) {
- push(@difference,$element);
- }
- }
- }
- return @difference;
-}
-
# -------------------------------------------------------- Initliaze user login
sub init_user_environment {
my ($r, $username, $domain, $authhost, $form, $args) = @_;
@@ -9787,11 +10333,11 @@ sub init_user_environment {
}
foreach my $tool ('aboutme','blog','portfolio') {
- $userenv{'availabletools.'.$tool} =
+ $userenv{'availabletools.'.$tool} =
&Apache::lonnet::usertools_access($username,$domain,$tool,'reload');
}
- foreach my $crstype ('official','unofficial','community') {
+ foreach my $crstype ('official','unofficial') {
$userenv{'canrequest.'.$crstype} =
&Apache::lonnet::usertools_access($username,$domain,$crstype,
'reload','requestcourses');
@@ -9809,8 +10355,8 @@ sub init_user_environment {
}
untie(%disk_env);
} else {
- &Apache::lonnet::logthis("WARNING: ".
- 'Could not create environment storage in lonauth: '.$!.'');
+ &Apache::lonnet::logthis("WARNING: ".
+ 'Could not create environment storage in lonauth: '.$!.'');
return 'error: '.$!;
}
}