--- loncom/interface/loncommon.pm 2003/04/03 21:32:23 1.94 +++ loncom/interface/loncommon.pm 2003/09/17 14:30:13 1.118 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.94 2003/04/03 21:32:23 www Exp $ +# $Id: loncommon.pm,v 1.118 2003/09/17 14:30:13 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -47,29 +47,15 @@ Apache::loncommon - pile of common routi =head1 SYNOPSIS -Referenced by other mod_perl Apache modules. +Common routines for manipulating connections, student answers, + domains, common Javascript fragments, etc. -Invocation: - &Apache::loncommon::SUBROUTINENAME(ARGUMENTS); +=head1 OVERVIEW -=head1 INTRODUCTION - -Common collection of used subroutines. This collection helps remove +A collection of commonly used subroutines that don't have a natural +home anywhere else. This collection helps remove redundancy from other modules and increase efficiency of memory usage. -Current things done: - - Makes a table out of the previous homework attempts - Inputs result_from_symbread, user, domain, course_id - Reads in non-network-related .tab files - -This is part of the LearningOnline Network with CAPA project -described at http://www.lon-capa.org. - -=head2 General Subroutines - -=over 4 - =cut # End of POD header @@ -79,18 +65,19 @@ use strict; use Apache::lonnet(); use GDBM_File; use POSIX qw(strftime mktime); -use Apache::Constants qw(:common); +use Apache::Constants qw(:common :http :methods); use Apache::lonmsg(); use Apache::lonmenu(); +use Apache::lonlocal; + my $readit; =pod -=item Global Variables - -=over 4 +=head1 Global Variables =cut + # ----------------------------------------------- Filetypes/Languages/Copyright my %language; my %cprtag; @@ -103,37 +90,45 @@ my %designhash; # ---------------------------------------------- Thesaurus variables +# FIXME: I don't think it's necessary to document these things; +# they're privately used - Jeremy + =pod -=item %Keywords +=over 4 + +=item * %Keywords A hash used by &keyword to determine if a word is considered a keyword. -=item $thesaurus_db_file +=item * $thesaurus_db_file Scalar containing the full path to the thesaurus database. +=back + =cut my %Keywords; my $thesaurus_db_file; +# ----------------------------------------------------------------------- BEGIN +# FIXME: I don't think this needs to be documented, it prepares +# private data structures - Jeremy =pod -=back - -=cut - -# ----------------------------------------------------------------------- BEGIN +=head1 General Subroutines -=pod +=over 4 -=item BEGIN() +=item * BEGIN() Initialize values from language.tab, copyright.tab, filetypes.tab, thesaurus.tab, and filecategories.tab. +=back + =cut # ----------------------------------------------------------------------- BEGIN @@ -151,8 +146,8 @@ BEGIN { while (<$fh>) { next if /^\#/; chomp; - my ($key,$val)=(split(/\s+/,$_,2)); - $language{$key}=$val; + my ($key,$two,$country,$three,$enc,$val)=(split(/\t/,$_)); + $language{$key}=$val.' - '.$enc; } } } @@ -228,21 +223,27 @@ BEGIN { } # end of unless($readit) } -# ============================================================= END BEGIN BLOCK + ############################################################### ## HTML and Javascript Helper Functions ## ############################################################### =pod -=item browser_and_searcher_javascript +=head1 HTML and Javascript Functions + +=over 4 + +=item * browser_and_searcher_javascript () -Returns scalar containing javascript to open a browser window -or a searcher window. Also creates +XXReturns a string +containing javascript with two functions, C and +C. Returned string does not contain EscriptE +tags. =over 4 -=item openbrowser(formname,elementname,only,omit) [javascript] +=item * openbrowser(formname,elementname,only,omit) [javascript] inputs: formname, elementname, only, omit @@ -255,7 +256,7 @@ with the given extension. Can be a comm Specifying 'omit' will restrict the browser to NOT displaying files with the given extension. Can be a comma seperated list. -=item opensearcher(formname, elementname) [javascript] +=item * opensearcher(formname, elementname) [javascript] Inputs: formname, elementname @@ -266,7 +267,6 @@ of the element the selection from the se =cut -############################################################### sub browser_and_searcher_javascript { return < var stdeditbrowser; - function openstdbrowser(formname,uname,udom) { + function openstdbrowser(formname,uname,udom,roleflag) { var url = '/adm/pickstudent?'; var filter; eval('filter=document.'+formname+'.'+uname+'.value;'); @@ -329,7 +330,8 @@ sub studentbrowser_javascript { } url += 'form=' + formname + '&unameelement='+uname+ '&udomelement='+udom; - var title = 'Student Browser'; + if (roleflag) { url+="&roles=1"; } + var title = 'Student_Browser'; var options = 'scrollbars=1,resizable=1,menubar=0'; options += ',width=700,height=600'; stdeditbrowser = open(url,title,options,'1'); @@ -340,13 +342,19 @@ ENDSTDBRW } sub selectstudent_link { - my ($form,$unameele,$udomele)=@_; - unless ($ENV{'request.course.id'}) { return ''; } - unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { - return ''; - } - return "Select User"; + } + if ($ENV{'request.role'}=~/^(au|dc|su)/) { + return "Select User"; + } + return ''; } sub coursebrowser_javascript { @@ -363,7 +371,7 @@ sub coursebrowser_javascript { } url += 'form=' + formname + '&cnumelement='+uname+ '&cdomelement='+udom; - var title = 'Course Browser'; + var title = 'Course_Browser'; var options = 'scrollbars=1,resizable=1,menubar=0'; options += ',width=700,height=600'; stdeditbrowser = open(url,title,options,'1'); @@ -379,11 +387,9 @@ sub selectcourse_link { '","'.$udomele.'");'."'>Select Course"; } -############################################################### - =pod -=item linked_select_forms(...) +=item * linked_select_forms(...) linked_select_forms returns a string containing a block and html for two tags +=item * $middletext, the text which appears between the tag +=item * $firstselectname, the name of the first tag +=item * $secondselectname, the name of the second form to allow a user to select options from a hash option_name => displayed text. @@ -657,7 +778,7 @@ sub select_form { =pod -=item select_dom_form($defdom,$name,$includeempty) +=item * select_dom_form($defdom,$name,$includeempty) Returns a string containing a form input. See loncreateuser.pm for an example. @@ -729,16 +850,24 @@ sub home_server_option_list { } return $result; } -############################################################### -## End of home server