loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.539 and 1.559

-version 1.539, 2007/06/27 22:43:28
+version 1.559, 2007/08/08 19:13:43
  Line 240  Inputs: formname, elementname
  formname and elementname specify the name of the html form and the name
  of the element the selection from the search results will be placed in.
- =back
  =cut
  sub browser_and_searcher_javascript {
  Line 334  sub studentbrowser_javascript {
     return (<<'ENDSTDBRW');
  <script type="text/javascript" language="Javascript" >
      var stdeditbrowser;
-     function openstdbrowser(formname,uname,udom,roleflag) {
+     function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) {
          var url = '/adm/pickstudent?';
          var filter;
-         eval('filter=document.'+formname+'.'+uname+'.value;');
+ 	if (!ignorefilter) {
+ 	    eval('filter=document.'+formname+'.'+uname+'.value;');
+ 	}
          if (filter != null) {
             if (filter != '') {
                 url += 'filter='+filter+'&';
- Line 365  sub selectstudent_link {
+ Line 367  sub selectstudent_link {
  	   return '';
         }
         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)/) {
         return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
- Line 524  function uncheckAll(field) {
+ Line 526  function uncheckAll(field) {
      if (field.length > 0) {
          for (i = 0; i < field.length; i++) {
              field[i].checked = false ;
-         }     } else {
+         }
+     } else {
          field.checked = false ;
      }
  }
- Line 708  sub help_open_topic {
+ Line 711  sub help_open_topic {
      my ($topic, $text, $stayOnPage, $width, $height) = @_;
      $text = "" if (not defined $text);
      $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;
      }
      $width = 350 if (not defined $width);
- Line 801  ENDOUTPUT
+ Line 803  ENDOUTPUT
  # now just updates the help link and generates a blue icon
  sub help_open_menu {
      my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text)
  	= @_;
      $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;
      if ($component_help) {
- Line 1078  sub changable_area {
+ Line 1085  sub changable_area {
  =pod
  =back
  =head1 Excel and CSV file utility routines
  =over 4
- Line 1212  sub create_workbook {
+ Line 1219  sub create_workbook {
  =item * create_text_file
- Create a file to write to and eventually make available to the usre.
+ Create a file to write to and eventually make available to the user.
  If file creation fails, outputs an error message on the request object and
  return undefs.
- Line 1262  sub domain_select {
+ Line 1269  sub domain_select {
      } &Apache::lonnet::all_domains();
      if ($multiple) {
  	$domains{''}=&mt('Any domain');
+ 	$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];
  	return &multiple_select_form($name,$value,4,\%domains);
      } else {
+ 	$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];
  	return &select_form($name,$value,%domains);
      }
  }
- Line 1429  selected");
+ Line 1438  selected");
  #-------------------------------------------
  sub select_dom_form {
      my ($defdom,$name,$includeempty) = @_;
-     my @domains = sort(&Apache::lonnet::all_domains());
+     my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
      if ($includeempty) { @domains=('',@domains); }
      my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
      foreach my $dom (@domains) {
- Line 2119  sub getnames {
+ Line 2128  sub getnames {
      }
  }
+ # -------------------------------------------------------------------- getemails
+ =pod
+ =item * getemails($uname,$udom)
+ Gets a user's email information and returns it as a hash with keys:
+ notification, critnotification, permanentemail
+ For notification and critnotification, values are comma-separated lists
+ of e-mail address(es); for permanentemail, value is a single e-mail address.
+ =cut
  sub getemails {
      my ($uname,$udom)=@_;
      if ($udom eq 'public' && $uname eq 'public') {
- Line 2140  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
  =pod
- Line 2213  sub track_student_link {
+ Line 2244  sub track_student_link {
          $target = '';
      }
      if ($start) { $link.='&amp;start='.$start; }
+     $title = &mt($title);
+     $linktext = &mt($linktext);
      return qq{<a href="$link" title="$title" $target>$linktext</a>}.
  	&help_open_topic('View_recent_activity');
  }
- Line 2666  sub get_student_answers {
+ Line 2698  sub get_student_answers {
    $moreenv{'grade_target'}='answer';
    %moreenv=(%form,%moreenv);
    $feedurl = &Apache::lonnet::clutter($feedurl);
-   &Apache::lonenc::check_encrypt(\$feedurl);
    my $userview=&Apache::lonnet::ssi($feedurl,%moreenv);
    return $userview;
  }
- Line 3325  sub designparm {
+ Line 3356  sub designparm {
  =back
- =head1 HTTP Helpers
+ =head1 HTML Helpers
  =over 4
- Line 3619  sub make_attr_string {
+ Line 3650  sub make_attr_string {
  =pod
- =back
- =head1 HTML Helpers
- =over 4
  =item * &endbodytag()
  Returns a uniform footer for LON-CAPA web pages.
  Inputs: none
- =back
  =cut
  sub endbodytag {
- Line 3649  sub endbodytag {
+ Line 3672  sub endbodytag {
  =pod
- =over 4
  =item * &standard_css()
  Returns a style sheet
- Line 3661  Inputs: (all optional)
+ Line 3682  Inputs: (all optional)
              function       -> force usage of a specific rolish color scheme
              bgcolor        -> override the default page bgcolor
- =back
  =cut
  sub standard_css {
- Line 3734  form, .inline { display: inline; }
+ Line 3753  form, .inline { display: inline; }
  .LC_diff_added {
    color: green;
  }
+ .LC_unknown {
+   color: yellow;
+ }
  .LC_icon {
    border: 0px;
  }
- Line 3741  form, .inline { display: inline; }
+ Line 3764  form, .inline { display: inline; }
    border: 0px;
    height: 22px;
  }
+ .LC_docs_spacer {
+   width: 25px;
+   height: 1px;
+   border: 0px;
+ }
  .LC_internal_info {
    color: #999;
- Line 4410  table.LC_prior_match tr td {
+ Line 4438  table.LC_prior_match tr td {
  }
  span.LC_nobreak {
-     white-space: nowrap;
+   white-space: nowrap;
+ }
+ table.LC_docs_documents {
+   background: #BBBBBB;
+   border-width: 0px;
+   border-collapse: collapse;
+ }
+ table.LC_docs_documents td.LC_docs_document {
+   border: 2px solid black;
+   padding: 4px;
+ }
+ .LC_docs_course_commands div {
+   float: left;
+   border: 4px solid #AAAAAA;
+   padding: 4px;
+   background: #DDDDCC;
+ }
+ .LC_docs_entry_move {
+   border: 0px;
+   border-collapse: collapse;
+ }
+ .LC_docs_entry_move td {
+   border: 2px solid #BBBBBB;
+   background: #DDDDDD;
+ }
+ .LC_docs_editor td.LC_docs_entry_commands {
+   background: #DDDDDD;
+   font-size: x-small;
+ }
+ .LC_docs_copy {
+   color: #000099;
+ }
+ .LC_docs_cut {
+   color: #550044;
+ }
+ .LC_docs_rename {
+   color: #009900;
+ }
+ .LC_docs_remove {
+   color: #990000;
+ }
+ .LC_docs_reinit_warn,
+ .LC_docs_ext_edit {
+   font-size: x-small;
+ }
+ .LC_docs_editor td.LC_docs_entry_title,
+ .LC_docs_editor td.LC_docs_entry_icon {
+   background: #FFFFBB;
+ }
+ .LC_docs_editor td.LC_docs_entry_parameter {
+   background: #BBBBFF;
+   font-size: x-small;
+   white-space: nowrap;
+ }
+ table.LC_docs_adddocs td,
+ table.LC_docs_adddocs th {
+   border: 1px solid #BBBBBB;
+   padding: 4px;
+   background: #DDDDDD;
  }
  END
- Line 4418  END
+ Line 4513  END
  =pod
- =over 4
  =item * &headtag()
  Returns a uniform footer for LON-CAPA web pages.
- Line 4443  Inputs: $title - optional title for the
+ Line 4536  Inputs: $title - optional title for the
              no_auto_mt_title
                             -> prevent &mt()ing the title arg
- =back
  =cut
  sub headtag {
- Line 4500  ADDMETA
+ Line 4591  ADDMETA
  =pod
- =over 4
  =item * &font_settings()
  Returns neccessary <meta> to set the proper encoding
  Inputs: none
- =back
  =cut
  sub font_settings {
- Line 4526  sub font_settings {
+ Line 4613  sub font_settings {
  =pod
- =over 4
  =item * &xml_begin()
  Returns the needed doctype and <html>
  Inputs: none
- =back
  =cut
  sub xml_begin {
- Line 4560  sub xml_begin {
+ Line 4643  sub xml_begin {
  =pod
- =over 4
  =item * &endheadtag()
  Returns a uniform </head> for LON-CAPA web pages.
  Inputs: none
- =back
  =cut
  sub endheadtag {
- Line 4578  sub endheadtag {
+ Line 4657  sub endheadtag {
  =pod
- =over 4
  =item * &head()
  Returns a uniform complete <head>..</head> section for LON-CAPA web pages.
- Line 4587  Returns a uniform complete <head>..</hea
+ Line 4664  Returns a uniform complete <head>..</hea
  Inputs: $title - optional title for the page
          $head_extra - optional extra HTML to put inside the <head>
- =back
  =cut
  sub head {
- Line 4598  sub head {
+ Line 4673  sub head {
  =pod
- =over 4
  =item * &start_page()
  Returns a complete <html> .. <body> section for LON-CAPA web pages.
- Line 4638  Inputs: $title - optional title for the
+ Line 4711  Inputs: $title - optional title for the
                    no_auto_mt_title -> prevent &mt()ing the title arg
- =back
  =cut
  sub start_page {
- Line 4691  sub start_page {
+ Line 4762  sub start_page {
  =pod
- =over 4
  =item * &head()
  Returns a complete </body></html> section for LON-CAPA web pages.
- Line 4850  sub simple_error_page {
+ Line 4919  sub simple_error_page {
      }
  }
+ =pod
+ =item * &inhibit_menu_check($arg)
+ Checks for a inhibitmenu state and generates output to preserve it
+ Inputs:         $arg - can be any of
+                      - undef - in which case the return value is a string
+                                to add  into arguments list of a uri
+                      - 'input' - in which case the return value is a HTML
+                                  <form> <input> field of type hidden to
+                                  preserve the value
+                      - a url - in which case the return value is the url with
+                                the neccesary cgi args added to preserve the
+                                inhibitmenu state
+                      - a ref to a url - no return value, but the string is
+                                         updated to include the neccessary cgi
+                                         args to preserve the inhibitmenu state
+ =cut
+ sub inhibit_menu_check {
+     my ($arg) = @_;
+     &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
+     if ($arg eq 'input') {
+ 	if ($env{'form.inhibitmenu'}) {
+ 	    return '<input type="hidden" name="inhibitmenu" value="'.$env{'form.inhibitmenu'}.'" />';
+ 	} else {
+ 	    return
+ 	}
+     }
+     if ($env{'form.inhibitmenu'}) {
+ 	if (ref($arg)) {
+ 	    $$arg .= '?inhibitmenu='.$env{'form.inhibitmenu'};
+ 	} elsif ($arg eq '') {
+ 	    $arg .= 'inhibitmenu='.$env{'form.inhibitmenu'};
+ 	} else {
+ 	    $arg .= '?inhibitmenu='.$env{'form.inhibitmenu'};
+ 	}
+     }
+     if (!ref($arg)) {
+ 	return $arg;
+     }
+ }
  ###############################################
  =pod
+ =back
+ =head1 User Information Routines
+ =over 4
  =item * &get_users_function()
  Used by &bodytag to determine the current users primary role.
- Line 4881  sub get_users_function {
+ Line 5001  sub get_users_function {
  =pod
- =item * &check_user_status
+ =item * &check_user_status()
  Determines current status of supplied role for a
  specific user. Roles can be active, previous or future.
- Line 5414  sub get_secgrprole_info {
+ Line 5534  sub get_secgrprole_info {
      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
+ =back
+ =head1 HTTP Helpers
+ =over 4
  =item * get_unprocessed_cgi($query,$possible_names)
  Modify the %env hash to contain unprocessed CGI form parameters held in
- Line 6453  sub commit_customrole {
+ Line 6782  sub commit_customrole {
  }
  sub commit_standardrole {
-     my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
+     my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_;
-     my $output;
+     my ($output,$logmsg,$linefeed);
-     my $logmsg;
+     if ($context eq 'auto') {
+         $linefeed = "\n";
+     } else {
+         $linefeed = "<br />\n";
+     }
      if ($three eq 'st') {
-         my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec);
+         my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,
-         if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) {
+                                          $one,$two,$sec,$context);
+         if (($result =~ /^error/) || ($result eq 'not_in_class') ||
+             ($result eq 'unknown_course')) {
              $output = "Error: $result\n";
          } else {
-             $output = &mt('Assigning').' '.$three.' in '.$url.
+             $output = $logmsg.$linefeed.&mt('Assigning').' '.$three.' in '.$url.
                 ($start?', '.&mt('starting').' '.localtime($start):'').
-                ($end?', '.&mt('ending').' '.localtime($end):'').
+                ($end?', '.&mt('ending').' '.localtime($end):'').': ';
-                ': <b>'.$result.'</b><br />'.
+             if ($context eq 'auto') {
-                &mt('Add to classlist').': <b>ok</b><br />';
+                 $output .= $result.$linefeed.&mt('Add to classlist').': ok';
+             } else {
+                $output .= '<b>'.$result.'</b>'.$linefeed.
+                &mt('Add to classlist').': <b>ok</b>';
+             }
+             $output .= $linefeed;
          }
      } else {
          $output = &mt('Assigning').' '.$three.' in '.$url.
                 ($start?', '.&mt('starting').' '.localtime($start):'').
-                ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
+                ($end?', '.&mt('ending').' '.localtime($end):'').': ';
-                &Apache::lonnet::assignrole(
+         my $result = &Apache::lonnet::assignrole($udom,$uname,$url,$three,$end,$start);
-                    $udom,$uname,$url,$three,$end,$start).
+         if ($context eq 'auto') {
-                    '</b><br />';
+             $output .= $result.$linefeed;
+         } else {
+             $output .= '<b>'.$result.'</b>'.$linefeed;
+         }
      }
      return $output;
  }
  sub commit_studentrole {
-     my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
+     my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_;
-     my $linefeed =  '<br />'."\n";
+     my ($result,$linefeed);
-     my $result;
+     if ($context eq 'auto') {
+         $linefeed = "\n";
+     } else {
+         $linefeed = '<br />'."\n";
+     }
      if (defined($one) && defined($two)) {
          my $cid=$one.'_'.$two;
          my $oldsec=&Apache::lonnet::getsection($udom,$uname,$cid);
- Line 6528  sub commit_studentrole {
+ Line 6875  sub commit_studentrole {
  ############################################################
  sub construct_course {
-     my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname) = @_;
+     my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context) = @_;
      my $outcome;
+     my $linefeed =  '<br />'."\n";
+     if ($context eq 'auto') {
+         $linefeed = "\n";
+     }
  #
  # Open course
  #
- Line 6550  sub construct_course {
+ Line 6900  sub construct_course {
      # Utils::Course. This needs to at least be output as a comment
      # if anyone ever decides to not show this, and Utils::Course::new
      # will need to be suitably modified.
-     $outcome .= &mt('New LON-CAPA [_1] ID: [_2]<br />',$crstype,$$courseid);
+     $outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed;
  #
  # Check if created correctly
  #
      ($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid);
      my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom);
-     $outcome .= &mt('Created on').': '.$crsuhome.'<br>';
+     $outcome .= &mt('Created on').': '.$crsuhome.$linefeed;
  #
  # Are we cloning?
  #
      my $cloneid='';
      if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) {
+         my $can_clone = 0;
  	$cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'};
          my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid);
  	my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
+         my $clonemsg;
  	if ($clonehome eq 'no_host') {
- 	    $outcome .=
+             $clonemsg = &mt('Attempting to clone non-existing [_1]',$crstype);
-     '<br /><font color="red">'.&mt('Attempting to clone non-existing [_1]',$crstype).' '.$cloneid.'</font>';
+             if ($context eq 'auto') {
+                 $outcome .= $clonemsg;
+             } else {
+ 	        $outcome .= '<font color="red">'.$clonemsg.'</font>';
+             }
+             $outcome .= $linefeed;
  	} else {
- 	    $outcome .=
+             my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
-     '<br /><font color="green">'.&mt('Cloning [_1] from [_2]',$crstype,$clonehome).'</font>';
+             if ($env{'request.role.domain'} eq $args->{'form.clonedomain'}) {
+                 $can_clone = 1;
+             } else {
+                 my %clonehash = &Apache::lonnet::get('environment',['cloners'],
+                             $args->{'clonedomain'},$args->{'clonecourse'});
+                 my @cloners = split(/,/,$clonehash{'cloners'});
+                 my %roleshash =
+                     &Apache::lonnet::get_my_roles($args->{'ccuname'},
+                         $args->{'ccdomain'},'userroles',['active'],['cc'],
+                         [$args->{'clonedomain'}]);
+                 if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':cc'}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
+                     $can_clone = 1;
+                 } else {
+                     $clonemsg = &mt('The new course was not cloned from an existing course because the course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
+                     if ($context eq 'auto') {
+                         $outcome .= $clonemsg;
+                     } else {
+                         $outcome .= '<font color="red">'.$clonemsg.'</font>';
+                     }
+                     $outcome .= $linefeed;
+                 }
+             }
+         }
+         if ($can_clone) {
+ 	    $clonemsg = &mt('Cloning [_1] from [_2]',$crstype,$clonehome);
+             if ($context eq 'auto') {
+                 $outcome = $clonemsg;
+             } else {
+                 $outcome .= '<font color="green">'.$clonemsg.'</font>';
+             }
+             $outcome .= $linefeed;
  	    my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum);
  # Copy all files
  	    &Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid);
- Line 6691  sub construct_course {
+ Line 7079  sub construct_course {
                  'dnhr' => 'does not have rights to access enrollment in these classes',
                  'adby' => 'as determined by the policies of your institution on access to official classlists'
          );
-         $outcome .= '<font color="red">'.$lt{'tclb'}.' ('.$cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.' ('.$lt{'adby'}.').<br /><ul>'."\n";
+         my $badclass_msg = $cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.
-         foreach (@badclasses) {
+                            ' ('.$lt{'adby'}.')';
-             $outcome .= "<li>$_</li>\n";
+         if ($context eq 'auto') {
-         }
+             $outcome .= $badclass_msg.$linefeed;
-         $outcome .= "</ul><br /><br /></font>\n";
+             $outcome .= '<font color="red">'.$badclass_msg.$linefeed.'<ul>'."\n";
+             foreach my $item (@badclasses) {
+                 if ($context eq 'auto') {
+                     $outcome .= " - $item\n";
+                 } else {
+                     $outcome .= "<li>$item</li>\n";
+                 }
+             }
+             if ($context eq 'auto') {
+                 $outcome .= $linefeed;
+             } else {
+                 $outcome .= "</ul><br /><br /></font>\n";
+             }
+         }
      }
      if ($args->{'no_end_date'}) {
          $args->{'endaccess'} = 0;
- Line 6711  sub construct_course {
+ Line 7112  sub construct_course {
      $cenv{'internal.autharg'} = $args->{'autharg'};
      if ( ($cenv{'internal.authtype'} =~ /^krb/) && ($cenv{'internal.autoadds'} == 1)) {
          if (! defined($cenv{'internal.autharg'}) || $cenv{'internal.autharg'}  eq '') {
-             $outcome .= '<font color="red" size="+1">'.
+             my $krb_msg = &mt('As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student');
-                       &mt('As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student').'</font></p>';
+             if ($context eq 'auto') {
+                 $outcome .= $krb_msg;
+             } else {
+                 $outcome .= '<font color="red" size="+1">'.$krb_msg.'</font>';
+             }
+             $outcome .= $linefeed;
          }
      }
      if (($args->{'ccdomain'}) && ($args->{'ccuname'})) {
- Line 6768  sub construct_course {
+ Line 7174  sub construct_course {
      # By default, use standard grading
      if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; }
-     $outcome .= ('<br />'.&mt('Setting environment').': '.
+     $outcome .= $linefeed.&mt('Setting environment').': '.
-           &Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).'<br>');
+           &Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).$linefeed;
  #
  # Open all assignments
  #
- Line 6779  sub construct_course {
+ Line 7185  sub construct_course {
                             $storeunder.'.type' => 'date_start');
         $outcome .= &mt('Opening all assignments').': '.&Apache::lonnet::cput
-                  ('resourcedata',\%storecontent,$$crsudom,$$crsunum).'<br>';
+                  ('resourcedata',\%storecontent,$$crsudom,$$crsunum).$linefeed;
     }
  #
  # Set first page
- Line 6806  sub construct_course {
+ Line 7212  sub construct_course {
  	(my $outtext,$errtext) = &LONCAPA::map::storemap($map,1);
  	if ($errtext) { $fatal=2; }
-         $outcome .= ($fatal?$errtext:'write ok').'<br />';
+         $outcome .= ($fatal?$errtext:'write ok').$linefeed;
      }
      return $outcome;
  }

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

Removed from v.1.539
changed lines
	Added in v.1.559