Diff for /loncom/interface/lonparmset.pm between versions 1.560 and 1.561

version 1.560, 2016/07/12 20:30:20 version 1.561, 2016/07/15 18:03:52
Line 336  use LONCAPA qw(:DEFAULT :match); Line 336  use LONCAPA qw(:DEFAULT :match);
 ##################################################  ##################################################
   
 # Page header  # Page header
   #
   # @param {Apache2::RequestRec} $r - Apache request object
   # @param {string} $mode - selected tab, 'parmset' for course and problem settings, or 'coursepref' for course settings
   # @param {string} $crstype - course type ('Community' for community settings)
 sub startSettingsScreen {  sub startSettingsScreen {
     my ($r,$mode,$crstype)=@_;      my ($r,$mode,$crstype)=@_;
   
Line 367  sub endSettingsScreen { Line 371  sub endSettingsScreen {
 # (parmval is also used for the log of parameter changes)  # (parmval is also used for the log of parameter changes)
 ##################################################  ##################################################
   
   # Calls parmval_by_symb, getting the symb from $id (the big hash resource id) with &symbcache.
   #
   # @param {string} $what - part info and parameter name separated by a dot, e.g. '0.weight'
   # @param {string} $id - big hash resource id
   # @param {string} $def - the resource's default value for this parameter
   # @param {string} $uname - user name
   # @param {string} $udom - user domain
   # @param {string} $csec - section name
   # @param {string} $cgroup - group name
   # @param {hash reference} $courseopt - course parameters hash (result of lonnet::get_courseresdata, dump of course's resourcedata.db)
   # @returns {Array}
 sub parmval {  sub parmval {
     my ($what,$id,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;      my ($what,$id,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
     return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec,      return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec,
                                                            $cgroup,$courseopt);                                                             $cgroup,$courseopt);
 }  }
   
   # Returns an array containing
   # - the most specific level that is defined for that parameter (integer)
   # - an array with the level as index and the parameter value as value (when defined)
   #   (level 1 is the most specific and will have precedence)
   #
   # @param {string} $what - part info and parameter name separated by a dot, e.g. '0.weight'
   # @param {string} $symb - resource symb
   # @param {string} $def - the resource's default value for this parameter
   # @param {string} $uname - user name
   # @param {string} $udom - user domain
   # @param {string} $csec - section name
   # @param {string} $cgroup - group name
   # @param {hash reference} $courseopt - course parameters hash (result of lonnet::get_courseresdata, dump of course's resourcedata.db)
   # @returns {Array}
 sub parmval_by_symb {  sub parmval_by_symb {
     my ($what,$symb,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;      my ($what,$symb,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
   
     my $useropt;      my $useropt;
     if ($uname ne '' && $udom ne '') {      if ($uname ne '' && $udom ne '') {
     $useropt = &Apache::lonnet::get_userresdata($uname,$udom);          $useropt = &Apache::lonnet::get_userresdata($uname,$udom);
     }      }
   
     my $result='';      my $result='';
Line 386  sub parmval_by_symb { Line 415  sub parmval_by_symb {
 # ----------------------------------------------------- Cascading lookup scheme  # ----------------------------------------------------- Cascading lookup scheme
     my $map=(&Apache::lonnet::decode_symb($symb))[0];      my $map=(&Apache::lonnet::decode_symb($symb))[0];
     $map = &Apache::lonnet::deversion($map);      $map = &Apache::lonnet::deversion($map);
       
       # NOTE: some of that code looks redondant with code in lonnavmaps::parmval_real,
       # any change should be reflected there.
       
     my $symbparm=$symb.'.'.$what;      my $symbparm=$symb.'.'.$what;
     my $recurseparm=$map.'___(rec).'.$what;       my $recurseparm=$map.'___(rec).'.$what; 
     my $mapparm=$map.'___(all).'.$what;      my $mapparm=$map.'___(all).'.$what;
Line 409  sub parmval_by_symb { Line 441  sub parmval_by_symb {
   
 # --------------------------------------------------------- first, check course  # --------------------------------------------------------- first, check course
   
   # 18 - General Course
     if (defined($$courseopt{$courselevel})) {      if (defined($$courseopt{$courselevel})) {
         $outpar[18]=$$courseopt{$courselevel};          $outpar[18]=$$courseopt{$courselevel};
         $result=18;          $result=18;
     }      }
   
   # 17 - Map or Folder level in course (recursive) 
     if (defined($$courseopt{$courseleveli})) {      if (defined($$courseopt{$courseleveli})) {
         $outpar[17]=$$courseopt{$courseleveli};          $outpar[17]=$$courseopt{$courseleveli};
         $result=17;          $result=17;
     }      }
   
   # 16 - Map or Folder level in course (non-recursive)
     if (defined($$courseopt{$courselevelm})) {      if (defined($$courseopt{$courselevelm})) {
         $outpar[16]=$$courseopt{$courselevelm};          $outpar[16]=$$courseopt{$courselevelm};
         $result=16;          $result=16;
Line 426  sub parmval_by_symb { Line 461  sub parmval_by_symb {
   
 # ------------------------------------------------------- second, check default  # ------------------------------------------------------- second, check default
   
   # 15 - resource default
     if (defined($def)) { $outpar[15]=$def; $result=15; }      if (defined($def)) { $outpar[15]=$def; $result=15; }
   
 # ------------------------------------------------------ third, check map parms  # ------------------------------------------------------ third, check map parms
   
           
   # 14 - map default
     my $thisparm=&parmhash($symbparm);      my $thisparm=&parmhash($symbparm);
     if (defined($thisparm)) { $outpar[14]=$thisparm; $result=14; }      if (defined($thisparm)) { $outpar[14]=$thisparm; $result=14; }
   
   # 13 - resource level in course
     if (defined($$courseopt{$courselevelr})) {      if (defined($$courseopt{$courselevelr})) {
         $outpar[13]=$$courseopt{$courselevelr};          $outpar[13]=$$courseopt{$courselevelr};
         $result=13;          $result=13;
Line 441  sub parmval_by_symb { Line 479  sub parmval_by_symb {
   
 # ------------------------------------------------------ fourth, back to course  # ------------------------------------------------------ fourth, back to course
     if ($csec ne '') {      if ($csec ne '') {
   # 12 - General for section
         if (defined($$courseopt{$seclevel})) {          if (defined($$courseopt{$seclevel})) {
             $outpar[12]=$$courseopt{$seclevel};              $outpar[12]=$$courseopt{$seclevel};
             $result=12;              $result=12;
         }          }
   # 11 - Map or Folder level for section (recursive)
         if (defined($$courseopt{$secleveli})) {          if (defined($$courseopt{$secleveli})) {
             $outpar[11]=$$courseopt{$secleveli};              $outpar[11]=$$courseopt{$secleveli};
             $result=11;              $result=11;
         }          }
   # 10 - Map or Folder level for section (non-recursive)
         if (defined($$courseopt{$seclevelm})) {          if (defined($$courseopt{$seclevelm})) {
             $outpar[10]=$$courseopt{$seclevelm};              $outpar[10]=$$courseopt{$seclevelm};
             $result=10;              $result=10;
         }          }
   # 9 - resource level in section
         if (defined($$courseopt{$seclevelr})) {          if (defined($$courseopt{$seclevelr})) {
             $outpar[9]=$$courseopt{$seclevelr};              $outpar[9]=$$courseopt{$seclevelr};
             $result=9;              $result=9;
Line 460  sub parmval_by_symb { Line 502  sub parmval_by_symb {
     }      }
 # ------------------------------------------------------ fifth, check course group  # ------------------------------------------------------ fifth, check course group
     if ($cgroup ne '') {      if ($cgroup ne '') {
   # 8 - General for group
         if (defined($$courseopt{$grplevel})) {          if (defined($$courseopt{$grplevel})) {
             $outpar[8]=$$courseopt{$grplevel};              $outpar[8]=$$courseopt{$grplevel};
             $result=8;              $result=8;
         }          }
   # 7 - Map or Folder level for group (recursive)
         if (defined($$courseopt{$grpleveli})) {          if (defined($$courseopt{$grpleveli})) {
             $outpar[7]=$$courseopt{$grpleveli};              $outpar[7]=$$courseopt{$grpleveli};
             $result=7;              $result=7;
         }          }
   # 6 - Map or Folder level for group (non-recursive)
         if (defined($$courseopt{$grplevelm})) {          if (defined($$courseopt{$grplevelm})) {
             $outpar[6]=$$courseopt{$grplevelm};              $outpar[6]=$$courseopt{$grplevelm};
             $result=6;              $result=6;
         }          }
   # 5 - resource level in group
         if (defined($$courseopt{$grplevelr})) {          if (defined($$courseopt{$grplevelr})) {
             $outpar[5]=$$courseopt{$grplevelr};              $outpar[5]=$$courseopt{$grplevelr};
             $result=5;              $result=5;
Line 481  sub parmval_by_symb { Line 527  sub parmval_by_symb {
 # ---------------------------------------------------------- sixth, check user  # ---------------------------------------------------------- sixth, check user
   
     if ($uname ne '') {      if ($uname ne '') {
     if (defined($$useropt{$courselevel})) {  # 4 - General for specific student
         $outpar[4]=$$useropt{$courselevel};          if (defined($$useropt{$courselevel})) {
         $result=4;              $outpar[4]=$$useropt{$courselevel};
     }              $result=4;
           }
   
     if (defined($$useropt{$courseleveli})) {  # 3 - Map or Folder level for specific student (recursive)
         $outpar[3]=$$useropt{$courseleveli};          if (defined($$useropt{$courseleveli})) {
         $result=3;              $outpar[3]=$$useropt{$courseleveli};
     }              $result=3;
           }
   
     if (defined($$useropt{$courselevelm})) {  # 2 - Map or Folder level for specific student (non-recursive)
         $outpar[2]=$$useropt{$courselevelm};          if (defined($$useropt{$courselevelm})) {
         $result=2;              $outpar[2]=$$useropt{$courselevelm};
     }              $result=2;
           }
   
     if (defined($$useropt{$courselevelr})) {  # 1 - resource level for specific student
         $outpar[1]=$$useropt{$courselevelr};          if (defined($$useropt{$courselevelr})) {
         $result=1;              $outpar[1]=$$useropt{$courselevelr};
     }              $result=1;
           }
     }      }
     return ($result,@outpar);      return ($result,@outpar);
 }  }
Line 509  sub parmval_by_symb { Line 559  sub parmval_by_symb {
 # --- Caches local to lonparmset  # --- Caches local to lonparmset
   
   
   # Reset lonparmset caches (called at the beginning and end of the handler).
 sub reset_caches {  sub reset_caches {
     &resetparmhash();      &resetparmhash();
     &resetsymbcache();      &resetsymbcache();
     &resetrulescache();      &resetrulescache();
 }  }
   
   # cache for map parameters, stored temporarily in $env{'request.course.fn'}_parms.db
   # (these parameters come from param elements in .sequence files created with the advanced RAT)
 {  {
     my $parmhashid;      my $parmhashid; # course identifier, to initialize the cache only once for a course
     my %parmhash;      my %parmhash; # the parameter cache
       # reset map parameter hash
     sub resetparmhash {      sub resetparmhash {
         undef($parmhashid);          undef($parmhashid);
         undef(%parmhash);          undef(%parmhash);
     }      }
   
       # dump the _parms.db database into %parmhash
     sub cacheparmhash {      sub cacheparmhash {
         if ($parmhashid eq  $env{'request.course.fn'}) { return; }          if ($parmhashid eq  $env{'request.course.fn'}) { return; }
         my %parmhashfile;          my %parmhashfile;
Line 534  sub reset_caches { Line 589  sub reset_caches {
         }          }
     }      }
   
       # returns a parameter value for an identifier symb.parts.parameter, using the map parameter cache
     sub parmhash {      sub parmhash {
         my ($id) = @_;          my ($id) = @_;
         &cacheparmhash();          &cacheparmhash();
Line 541  sub reset_caches { Line 597  sub reset_caches {
     }      }
 }  }
   
   # cache big hash id -> symb, using lonnavmaps to find association
 {  {
     my $symbsid;      my $symbsid; # course identifier, to initialize the cache only once for a course
     my %symbs;      my %symbs; # hash id->symb
       # reset the id->symb cache
     sub resetsymbcache {      sub resetsymbcache {
         undef($symbsid);          undef($symbsid);
         undef(%symbs);          undef(%symbs);
     }      }
   
       # returns the symb corresponding to a big hash id (using lonnavmaps and a cache)
     sub symbcache {      sub symbcache {
         my $id=shift;          my $id=shift;
         if ($symbsid ne $env{'request.course.id'}) {          if ($symbsid ne $env{'request.course.id'}) {
Line 569  sub reset_caches { Line 628  sub reset_caches {
     }      }
 }  }
   
   # cache for parameter default actions (stored in parmdefactions.db)
 {  {
     my $rulesid;      my $rulesid; # course identifier, to initialize the cache only once for a course
     my %rules;      my %rules; # parameter default actions hash
     sub resetrulescache {      sub resetrulescache {
         undef($rulesid);          undef($rulesid);
         undef(%rules);          undef(%rules);
     }      }
   
       # returns the value for a given key in the parameter default action hash
     sub rulescache {      sub rulescache {
         my $id=shift;          my $id=shift;
         if ($rulesid ne $env{'request.course.id'}          if ($rulesid ne $env{'request.course.id'}
Line 591  sub reset_caches { Line 652  sub reset_caches {
 }  }
   
   
   # Returns the values of the parameter type default action
   # "default value when manually setting".
   # If none is defined, ('','','','','') is returned.
   #
   # @param {string} $type - parameter type
   # @returns {Array<string>} - (hours, min, sec, value)
 sub preset_defaults {  sub preset_defaults {
     my $type=shift;      my $type=shift;
     if (&rulescache($type.'_action') eq 'default') {      if (&rulescache($type.'_action') eq 'default') {
Line 607  sub preset_defaults { Line 673  sub preset_defaults {
 }  }
   
   
   # Checks that a date is after enrollment start date and before
   # enrollment end date.
   # Returns HTML with a warning if it is not, or the empty string otherwise.
   # This is used by both overview and table modes.
   #
   # @param {integer} $checkdate - the date to check.
   # @returns {string} - HTML possibly containing a localized warning message.
 sub date_sanity_info {  sub date_sanity_info {
    my $checkdate=shift;     my $checkdate=shift;
    unless ($checkdate) { return ''; }     unless ($checkdate) { return ''; }
Line 643  sub date_sanity_info { Line 714  sub date_sanity_info {
 #      }  #      }
    return $result;     return $result;
 }  }
 ##################################################  
 ##################################################  
 #  
 # Store a parameter by ID  
 #  
 # Takes  
 # - resource id  
 # - name of parameter  
 # - level  
 # - new value  
 # - new type  
 # - username  
 # - userdomain  
   
   
   # Store a parameter value and type by ID, also triggering more parameter changes based on parameter default actions.
   #
   # @param {string} $sresid - resource big hash id
   # @param {string} $spnam - part info and parameter name separated by a dot, e.g. '0.weight'
   # @param {integer} $snum - level
   # @param {string} $nval - new value
   # @param {string} $ntype - new type
   # @param {string} $uname - username
   # @param {string} $udom - userdomain
   # @param {string} $csec - section name
   # @param {string} $cgroup - group name
 sub storeparm {  sub storeparm {
     my ($sresid,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;      my ($sresid,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;
     &storeparm_by_symb(&symbcache($sresid),$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,'',$cgroup);      &storeparm_by_symb(&symbcache($sresid),$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,'',$cgroup);
 }  }
   
 my %recstack;  my %recstack; # hash parameter name -> 1 when a parameter was used before in a recursive call to storeparm_by_symb
   
   # Store a parameter value and type by symb, also triggering more parameter changes based on parameter default actions.
   # Uses storeparm_by_symb_inner to actually store the parameter, ignoring any returned error.
   #
   # @param {string} $symb - resource symb
   # @param {string} $spnam - part info and parameter name separated by a dot, e.g. '0.weight'
   # @param {integer} $snum - level
   # @param {string} $nval - new value
   # @param {string} $ntype - new type
   # @param {string} $uname - username
   # @param {string} $udom - userdomain
   # @param {string} $csec - section name
   # @param {boolean} $recflag - should be true for recursive calls to storeparm_by_symb, false otherwise
   # @param {string} $cgroup - group name
 sub storeparm_by_symb {  sub storeparm_by_symb {
     my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$recflag,$cgroup)=@_;      my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$recflag,$cgroup)=@_;
     unless ($recflag) {      unless ($recflag) {
Line 715  sub storeparm_by_symb { Line 799  sub storeparm_by_symb {
     return '';      return '';
 }  }
   
   # Adds all given arguments to the course parameter log.
   # @returns {string} - the answer to the lonnet query.
 sub log_parmset {  sub log_parmset {
     return &Apache::lonnet::write_log('course','parameterlog',@_);      return &Apache::lonnet::write_log('course','parameterlog',@_);
 }  }
   
   # Store a parameter value and type by symb, without using the parameter default actions.
   # Expire related sheets.
   #
   # @param {string} $symb - resource symb
   # @param {string} $spnam - part info and parameter name separated by a dot, e.g. '0.weight'
   # @param {integer} $snum - level
   # @param {string} $nval - new value
   # @param {string} $ntype - new type
   # @param {string} $uname - username
   # @param {string} $udom - userdomain
   # @param {string} $csec - section name
   # @param {string} $cgroup - group name
   # @returns {string} - HTML code with an error message if the parameter could not be stored.
 sub storeparm_by_symb_inner {  sub storeparm_by_symb_inner {
 # ---------------------------------------------------------- Get symb, map, etc  # ---------------------------------------------------------- Get symb, map, etc
     my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;      my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;
Line 826  sub storeparm_by_symb_inner { Line 925  sub storeparm_by_symb_inner {
 }  }
   
   
   # Returns HTML with the value of the given parameter,
   # using a readable format for dates, and
   # a warning if there is a problem with a date.
   # Used by table mode.
   # Returns HTML for the editmap.png image if no value is defined and $editable is true.
   #
   # @param {string} $value - the parameter value
   # @param {string} $type - the parameter type
   # @param {string} $name - the parameter name (unused)
   # @param {boolean} $editable - Set to true to get an icon when no value is defined.
 sub valout {  sub valout {
     my ($value,$type,$name,$editable)=@_;      my ($value,$type,$name,$editable)=@_;
     my $result = '';      my $result = '';
Line 904  sub valout { Line 1013  sub valout {
 }  }
   
   
   # Returns HTML containing a link on a parameter value, for table mode.
   # The link uses the javascript function 'pjump'.
   #
   # @param {string} $type - parameter type
   # @param {string} $dis - dialog title for editing the parameter value and type
   # @param {string} $value - parameter value
   # @param {string} $marker - identifier for the parameter, "resource id&part_parameter name&level", will be passed as pres_marker when the user submits a change.
   # @param {string} $return - prefix for the name of the form and field names that will be used to submit the form ('parmform.pres')
   # @param {string} $call - javascript function to call to submit the form ('psub')
 sub plink {  sub plink {
     my ($type,$dis,$value,$marker,$return,$call)=@_;      my ($type,$dis,$value,$marker,$return,$call)=@_;
     my $winvalue=$value;      my $winvalue=$value;
Line 930  sub plink { Line 1048  sub plink {
         $valout.'</a></td></tr></table>';          $valout.'</a></td></tr></table>';
 }  }
   
   # Javascript for table mode.
 sub page_js {  sub page_js {
   
     my $selscript=&Apache::loncommon::studentbrowser_javascript();      my $selscript=&Apache::loncommon::studentbrowser_javascript();
Line 979  ENDJS Line 1098  ENDJS
   
 }  }
   
   # Javascript to show or hide the map selection (function showHide_courseContent),
   # for table and overview modes.
 sub showhide_js {  sub showhide_js {
     return <<"COURSECONTENTSCRIPT";      return <<"COURSECONTENTSCRIPT";
   
Line 999  function showHide_courseContent() { Line 1120  function showHide_courseContent() {
 COURSECONTENTSCRIPT  COURSECONTENTSCRIPT
 }  }
   
   # Javascript functions showHideLenient and toggleParmTextbox, for overview mode
 sub toggleparmtextbox_js {  sub toggleparmtextbox_js {
     return <<"ENDSCRIPT";      return <<"ENDSCRIPT";
   
Line 1058  function toggleParmTextbox(form,key) { Line 1180  function toggleParmTextbox(form,key) {
 ENDSCRIPT  ENDSCRIPT
 }  }
   
   # Javascript function validateParms, for overview mode
 sub validateparms_js {  sub validateparms_js {
     return <<'ENDSCRIPT';      return <<'ENDSCRIPT';
   
Line 1131  function validateParms() { Line 1254  function validateParms() {
 ENDSCRIPT  ENDSCRIPT
 }  }
   
   # Javascript initialization, for overview mode
 sub ipacc_boxes_js  {  sub ipacc_boxes_js  {
     my $remove = &mt('Remove');      my $remove = &mt('Remove');
     return <<"END";      return <<"END";
Line 1155  sub ipacc_boxes_js  { Line 1279  sub ipacc_boxes_js  {
 END  END
 }  }
   
   # Javascript function toggleSecret, for overview mode.
 sub done_proctor_js {  sub done_proctor_js {
     return <<"END";      return <<"END";
 function toggleSecret(form,radio,key) {  function toggleSecret(form,radio,key) {
Line 1180  END Line 1305  END
   
 }  }
   
   # Prints HTML page start for table mode.
   # @param {Apache2::RequestRec} $r - the Apache request
   # @param {string} $psymb - resource symb
   # @param {string} $crstype - course type (Community / Course / Placement Test)
 sub startpage {  sub startpage {
     my ($r,$psymb,$crstype) = @_;      my ($r,$psymb,$crstype) = @_;
   
Line 1228  ENDHEAD Line 1357  ENDHEAD
 }  }
   
   
   # Prints a row for table mode (except for the tr start).
   # Every time a hash reference is passed, a single entry is used, so print_row
   # could just use these values, but why make it simple when it can be complicated ?
   #
   # @param {Apache2::RequestRec} $r - the Apache request
   # @param {string} $which - parameter key ('parameter_'.part.'_'.name)
   # @param {hash reference} $part - parameter key -> parameter part (can be problem part.'_'.response id for response parameters)
   # @param {hash reference} $name - parameter key -> parameter name
   # @param {hash reference} $symbp - resource id -> symb
   # @param {string} $rid - resource id
   # @param {hash reference} $default - parameter key -> resource parameter default value
   # @param {hash reference} $defaulttype - parameter key -> resource parameter default type
   # @param {hash reference} $display - parameter key -> full title for the parameter
   # @param {string} $defbgone - user level and other levels background color
   # @param {string} $defbgtwo - section level background color, also used for part number
   # @param {string} $defbgthree - group level background color
   # @param {string} $parmlev - parameter level (Resource:'full', Map:'map', Course:'general')
   # @param {string} $uname - user name
   # @param {string} $udom - user domain
   # @param {string} $csec - section name
   # @param {string} $cgroup - group name
   # @param {array reference} $usersgroups - list of groups the user belongs to, if any
   # @param {boolean} $noeditgrp - true if no edit is allowed for group level parameters
 sub print_row {  sub print_row {
     my ($r,$which,$part,$name,$symbp,$rid,$default,$defaulttype,$display,$defbgone,      my ($r,$which,$part,$name,$symbp,$rid,$default,$defaulttype,$display,$defbgone,
     $defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups,$noeditgrp)=@_;      $defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups,$noeditgrp)=@_;
Line 1364  sub print_row { Line 1516  sub print_row {
     $r->print("\n");      $r->print("\n");
 }  }
   
   # Prints a cell for table mode.
   #
   # FIXME: some of these parameter names are uninspired ($which and $value)
   # Also, it would make more sense to pass the display for this cell rather
   # than the full display hash and the key to use.
   #
   # @param {Apache2::RequestRec} $r - the Apache request
   # @param {integer} $which - level
   # @param {string} $defbg - cell background color
   # @param {integer} $result - the most specific level that is defined for that parameter
   # @param {array reference} $outpar - array level -> parameter value (when defined)
   # @param {string} $mprefix - resource id.'&'.part.'_'.parameter name.'&'
   # @param {string} $value - parameter key ('parameter_'.part.'_'.name)
   # @param {array reference} $typeoutpar - array level -> parameter type (when defined)
   # @param {hash reference} $display - parameter key -> full title for the parameter
   # @param {boolean} $noeditgrp - true if no edit is allowed for group level parameters
 sub print_td {  sub print_td {
     my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp)=@_;      my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp)=@_;
     $r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).      $r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).
Line 1388  sub print_td { Line 1556  sub print_td {
     }      }
     if ($nolink) {      if ($nolink) {
         $r->print(&valout($$outpar[$which],$$typeoutpar[$which],$mprefix));          $r->print(&valout($$outpar[$which],$$typeoutpar[$which],$mprefix));
   # FIXME: probably a good thing that mprefix is not used in valout, because it does not look like a parameter name !
     } else {      } else {
         $r->print(&plink($$typeoutpar[$which],          $r->print(&plink($$typeoutpar[$which],
                          $$display{$value},$$outpar[$which],                           $$display{$value},$$outpar[$which],
Line 1396  sub print_td { Line 1565  sub print_td {
     $r->print('</td>'."\n");      $r->print('</td>'."\n");
 }  }
   
   # FIXME: Despite the name, this does not print anything, the $r parameter is unused.
   # Returns HTML and other info for the cell added when a user is selected
   # and that user is in several groups. This is the cell with the title "Control by other group".
   #
   # @param {Apache2::RequestRec} $r - the Apache request (unused)
   # @param {string} $what - parameter part.'.'.parameter name
   # @param {string} $rid - resource id
   # @param {string} $cgroup - group name
   # @param {string} $defbg - cell background color
   # @param {array reference} $usersgroups - list of groups the user belongs to, if any
   # @param {integer} $result - level
   # @param {hash reference} $courseopt - course parameters hash (result of lonnet::get_courseresdata, dump of course's resourcedata.db)
   # @returns {Array} - array (parameter value for the other group, HTML for the cell, HTML with the value, name of the other group)
 sub print_usergroups {  sub print_usergroups {
     my ($r,$what,$rid,$cgroup,$defbg,$usersgroups,$result,$courseopt) = @_;      my ($r,$what,$rid,$cgroup,$defbg,$usersgroups,$result,$courseopt) = @_;
     my $courseid = $env{'request.course.id'};      my $courseid = $env{'request.course.id'};
Line 1429  sub print_usergroups { Line 1611  sub print_usergroups {
     return ($coursereply,$output,$grp_parm,$resultgroup);      return ($coursereply,$output,$grp_parm,$resultgroup);
 }  }
   
   # Looks for a group with a defined parameter for given user and parameter.
   # Used by print_usergroups.
   #
   # @param {string} $courseid - the course id
   # @param {array reference} $usersgroups - list of groups the user belongs to, if any
   # @param {string} $symbparm - end of the course parameter hash key for the group resource level
   # @param {string} $mapparm - end of the course parameter hash key for the group map/folder level
   # @param {string} $recurseparm - end of the course parameter hash key for the group recursive level
   # @param {string} $what - parameter part.'.'.parameter name
   # @param {hash reference} $courseopt - course parameters hash
   # @returns {Array} - (parameter value for the group, course parameter hash key for the parameter, name of the group, level name, parameter type)
 sub parm_control_group {  sub parm_control_group {
     my ($courseid,$usersgroups,$symbparm,$mapparm,$recurseparm,$what,$courseopt) = @_;      my ($courseid,$usersgroups,$symbparm,$mapparm,$recurseparm,$what,$courseopt) = @_;
     my ($coursereply,$resultitem,$resultgroup,$resultlevel,$resulttype);      my ($coursereply,$resultitem,$resultgroup,$resultlevel,$resulttype);
Line 1455  sub parm_control_group { Line 1648  sub parm_control_group {
   
   
   
   # extracts lots of information about all of the the course's resources into a variety of hashes.
 sub extractResourceInformation {  sub extractResourceInformation {
     my $ids = shift;      my $ids = shift;
     my $typep = shift;      my $typep = shift;

Removed from v.1.560  
changed lines
  Added in v.1.561


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