Diff for /loncom/interface/lonuserutils.pm between versions 1.185 and 1.188

version 1.185, 2017/08/07 20:22:13 version 1.188, 2017/08/11 00:24:53
Line 943  sub print_upload_manager_footer { Line 943  sub print_upload_manager_footer {
                 &Apache::lonhtmlcommon::row_closure();                  &Apache::lonhtmlcommon::row_closure();
     }      }
   
     my ($trustedref,$untrustedref);      my ($trusted,$untrusted);
     if ($context eq 'course') {      if ($context eq 'course') {
         ($trustedref,$untrustedref) = &Apache::lonnet::trusted_domains('enroll',$defdom);          ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$defdom);
     } elsif ($context eq 'author') {      } elsif ($context eq 'author') {
         ($trustedref,$untrustedref) = &Apache::lonnet::trusted_domains('othcoau',$defdom);          ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('othcoau',$defdom);
     }      }
     $Str .= &Apache::lonhtmlcommon::row_title(&mt('Default domain'))      $Str .= &Apache::lonhtmlcommon::row_title(&mt('Default domain'))
            .&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1,undef,$trustedref,$untrustedref)             .&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1,undef,$trusted,$untrusted)
            .&Apache::lonhtmlcommon::row_closure();             .&Apache::lonhtmlcommon::row_closure();
   
     $Str .= &Apache::lonhtmlcommon::row_title(&mt('Starting and Ending Dates'))      $Str .= &Apache::lonhtmlcommon::row_title(&mt('Starting and Ending Dates'))
Line 2342  function setCourseCat(formname) { Line 2342  function setCourseCat(formname) {
     }      }
     courseSet('$codetitles[1]');      courseSet('$codetitles[1]');
     for (var j=0; j<formname.Department.length; j++) {      for (var j=0; j<formname.Department.length; j++) {
         if (formname.Department.options[j].value == "$env{'form.Department'}") {            formname.Department.options[j].selected = true;          if (formname.Department.options[j].value == "$env{'form.Department'}") {
               formname.Department.options[j].selected = true;
         }          }
     }      }
     if (formname.Department.options[formname.Department.selectedIndex].value == -1) {      if (formname.Department.options[formname.Department.selectedIndex].value == -1) {
Line 4182  sub upfile_drop_add { Line 4183  sub upfile_drop_add {
         } elsif ($context eq 'author') {          } elsif ($context eq 'author') {
             unless ($env{'form.defaultdomain'} eq $defdom) {              unless ($env{'form.defaultdomain'} eq $defdom) {
                 if ((&Apache::lonnet::will_trust('othcoau',$defdom,$env{'form.defaultdomain'})) &&                  if ((&Apache::lonnet::will_trust('othcoau',$defdom,$env{'form.defaultdomain'})) &&
                     (&Apache::lonnet::will_trust('coremau',$env{'form.defaultdomain'},$defdom))) {                      (&Apache::lonnet::will_trust('coaurem',$env{'form.defaultdomain'},$defdom))) {
                     $domain = $env{'form.defaultdomain'};                      $domain = $env{'form.defaultdomain'};
                 } else {                  } else {
                     $r->print('<span class="LC_error">'.&mt('Error').                      $r->print('<span class="LC_error">'.&mt('Error').

Removed from v.1.185  
changed lines
  Added in v.1.188


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