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.547 and 1.564.2.7

-version 1.547, 2007/07/07 00:53:24
+version 1.564.2.7, 2007/09/04 23:59:53
  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 709  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 802  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 1263  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 1416  sub select_level_form {
+ Line 1424  sub select_level_form {
  =pod
- =item * select_dom_form($defdom,$name,$includeempty)
+ =item * select_dom_form($defdom,$name,$includeempty,$showdomdesc)
  Returns a string containing a <select name='$name' size='1'> form to
  allow a user to select the domain to preform an operation in.
- Line 1425  See loncreateuser.pm for an example invo
+ Line 1433  See loncreateuser.pm for an example invo
  If the $includeempty flag is set, it also includes an empty choice ("no domain
  selected");
+ If the $showdomdesc flag is set, the domain name is followed by the domain description.
  =cut
  #-------------------------------------------
  sub select_dom_form {
-     my ($defdom,$name,$includeempty) = @_;
+     my ($defdom,$name,$includeempty,$showdomdesc) = @_;
-     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) {
          $selectdomain.="<option value=\"$dom\" ".
-             ($dom eq $defdom ? 'selected="selected" ' : '').
+             ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
-                 ">$dom</option>\n";
+         if ($showdomdesc) {
+             if ($dom ne '') {
+                 my $domdesc = &Apache::lonnet::domain($dom,'description');
+                 if ($domdesc ne '') {
+                     $selectdomain .= ' ('.$domdesc.')';
+                 }
+             }
+         }
+         $selectdomain .= "</option>\n";
      }
      $selectdomain.="</select>";
      return $selectdomain;
- Line 2154  sub getemails {
+ Line 2172  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 2227  sub track_student_link {
+ Line 2254  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 3338  sub designparm {
+ Line 3366  sub designparm {
  =back
- =head1 HTTP Helpers
+ =head1 HTML Helpers
  =over 4
- Line 3379  Inputs:
+ Line 3407  Inputs:
  =item * $args, optional argument valid values are
              no_auto_mt_title -> prevents &mt()ing the title arg
+             inherit_jsmath -> when creating popup window in a page,
+                               should it have jsmath forced on by the
+                               current page
  =back
- Line 3427  sub bodytag {
+ Line 3458  sub bodytag {
      if (!$realm) { $realm='&nbsp;'; }
  # Set messages
      my $messages=&domainlogo($domain);
- # Port for miniserver
-     my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
-     if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
      my $extra_body_attr = &make_attr_string($forcereg,\%design);
  # construct main body tag
      my $bodytag = "<body $extra_body_attr>".
- 	&Apache::lontexconvert::init_math_support();
+ 	&Apache::lontexconvert::init_math_support($args->{'inherit_jsmath'});
      if ($bodyonly) {
          return $bodytag;
- Line 3547  ENDROLE
+ Line 3575  ENDROLE
      my $imgsrc = $img;
      if ($img =~ /^\/adm/) {
-         $imgsrc = 'http://'.$ENV{'HTTP_HOST'}.':'.$lonhttpdPort.$img;
+         $imgsrc = &lonhttpdurl($img);
      }
      my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
- Line 3632  sub make_attr_string {
+ Line 3660  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 3662  sub endbodytag {
+ Line 3682  sub endbodytag {
  =pod
- =over 4
  =item * &standard_css()
  Returns a style sheet
- Line 3674  Inputs: (all optional)
+ Line 3692  Inputs: (all optional)
              function       -> force usage of a specific rolish color scheme
              bgcolor        -> override the default page bgcolor
- =back
  =cut
  sub standard_css {
- Line 4507  END
+ Line 4523  END
  =pod
- =over 4
  =item * &headtag()
  Returns a uniform footer for LON-CAPA web pages.
- Line 4532  Inputs: $title - optional title for the
+ Line 4546  Inputs: $title - optional title for the
              no_auto_mt_title
                             -> prevent &mt()ing the title arg
- =back
  =cut
  sub headtag {
- Line 4589  ADDMETA
+ Line 4601  ADDMETA
  =pod
- =over 4
  =item * &font_settings()
  Returns neccessary <meta> to set the proper encoding
  Inputs: none
- =back
  =cut
  sub font_settings {
- Line 4615  sub font_settings {
+ Line 4623  sub font_settings {
  =pod
- =over 4
  =item * &xml_begin()
  Returns the needed doctype and <html>
  Inputs: none
- =back
  =cut
  sub xml_begin {
- Line 4649  sub xml_begin {
+ Line 4653  sub xml_begin {
  =pod
- =over 4
  =item * &endheadtag()
  Returns a uniform </head> for LON-CAPA web pages.
  Inputs: none
- =back
  =cut
  sub endheadtag {
  Line 4667  sub endheadtag {
  =pod
- =over 4
  =item * &head()
  Returns a uniform complete <head>..</head> section for LON-CAPA web pages.
- Line 4676  Returns a uniform complete <head>..</hea
+ Line 4674  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 4687  sub head {
+ Line 4683  sub head {
  =pod
- =over 4
  =item * &start_page()
  Returns a complete <html> .. <body> section for LON-CAPA web pages.
- Line 4727  Inputs: $title - optional title for the
+ Line 4721  Inputs: $title - optional title for the
                    no_auto_mt_title -> prevent &mt()ing the title arg
- =back
+                   inherit_jsmath -> when creating popup window in a page,
+                                     should it have jsmath forced on by the
+                                     current page
  =cut
- Line 4780  sub start_page {
+ Line 4776  sub start_page {
  =pod
- =over 4
  =item * &head()
  Returns a complete </body></html> section for LON-CAPA web pages.
- Line 4939  sub simple_error_page {
+ Line 4933  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 5503  sub get_secgrprole_info {
+ Line 5548  sub get_secgrprole_info {
      return (\@sections,\@groups,$allroles,$rolehash,$accesshash);
  }
+ sub user_picker {
+     my ($dom,$srch,$forcenewuser,$caller) = @_;
+     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 criteria',
+                     'doma'      => 'Domain/institution to search',
+                     'uname'     => 'username',
+                     'lastname'  => 'last name',
+                     'lastfirst' => 'last name, first name',
+                     'crs'       => 'in this course',
+                     'dom'       => 'in selected domain',
+                     'alc'       => 'all LON-CAPA',
+                     'instd'     => 'in institutional directory for selected domain',
+                     'exact'     => 'is',
+                     'contains'  => 'contains',
+                     'begins'    => 'begins with',
+                     'youm'      => "You must include some text to search for.",
+                     'thte'      => "The text you are searching for must contain at least two characters when using a 'begins' type search.",
+                     'thet'      => "The text you are searching for must contain at least three characters when using a 'contains' type search.",
+                     'yomc'      => "You must choose a domain when using an institutional directory search.",
+                     'ymcd'      => "You must choose a domain when using a domain search.",
+                     'whus'      => "When using searching by last,first you must include a comma as separator between last name and first name.",
+                     'whse'      => "When searching by last,first you must include at least one character in the first name.",
+                      'thfo'     => "The following need to be corrected before the search can be run:",
+                                        );
+     my $domform = &select_dom_form($currdom,'srchdomain',1,1);
+     my $srchinsel = ' <select name="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'});
+         if ($curr_selected{'srchin'} eq $option) {
+             $srchinsel .= '
+    <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
+         } else {
+             $srchinsel .= '
+    <option value="'.$option.'">'.$lt{$option}.'</option>';
+         }
+     }
+     $srchinsel .= "\n  </select>\n";
+     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','begins','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\','.$caller.');" /> </p>';
+         $newuserscript = <<"ENDSCRIPT";
+ function setSearch(createnew,callingForm) {
+     if (createnew == 1) {
+         for (var i=0; i<callingForm.srchby.length; i++) {
+             if (callingForm.srchby.options[i].value == 'uname') {
+                 callingForm.srchby.selectedIndex = i;
+             }
+         }
+         for (var i=0; i<callingForm.srchin.length; i++) {
+             if ( callingForm.srchin.options[i].value == 'dom') {
+ 		callingForm.srchin.selectedIndex = i;
+             }
+         }
+         for (var i=0; i<callingForm.srchtype.length; i++) {
+             if (callingForm.srchtype.options[i].value == 'exact') {
+                 callingForm.srchtype.selectedIndex = i;
+             }
+         }
+         for (var i=0; i<callingForm.srchdomain.length; i++) {
+             if (callingForm.srchdomain.options[i].value == '$env{'request.role.domain'}') {
+                 callingForm.srchdomain.selectedIndex = i;
+             }
+         }
+     }
+ }
+ ENDSCRIPT
+     }
+     my $output = <<"END_BLOCK";
+ <script type="text/javascript">
+ function validateEntry(callingForm) {
+     var checkok = 1;
+     var srchin;
+     for (var i=0; i<callingForm.srchin.length; i++) {
+ 	if ( callingForm.srchin[i].checked ) {
+ 	    srchin = callingForm.srchin[i].value;
+ 	}
+     }
+     var srchtype = callingForm.srchtype.options[callingForm.srchtype.selectedIndex].value;
+     var srchby = callingForm.srchby.options[callingForm.srchby.selectedIndex].value;
+     var srchdomain = callingForm.srchdomain.options[callingForm.srchdomain.selectedIndex].value;
+     var srchterm =  callingForm.srchterm.value;
+     var srchin = callingForm.srchin.options[callingForm.srchin.selectedIndex].value;
+     var msg = "";
+     if (srchterm == "") {
+         checkok = 0;
+         msg += "$lt{'youm'}\\n";
+     }
+     if (srchtype== 'begins') {
+         if (srchterm.length < 2) {
+             checkok = 0;
+             msg += "$lt{'thte'}\\n";
+         }
+     }
+     if (srchtype== 'contains') {
+         if (srchterm.length < 3) {
+             checkok = 0;
+             msg += "$lt{'thet'}\\n";
+         }
+     }
+     if (srchin == 'instd') {
+         if (srchdomain == '') {
+             checkok = 0;
+             msg += "$lt{'yomc'}\\n";
+         }
+     }
+     if (srchin == 'dom') {
+         if (srchdomain == '') {
+             checkok = 0;
+             msg += "$lt{'ymcd'}\\n";
+         }
+     }
+     if (srchby == 'lastfirst') {
+         if (srchterm.indexOf(",") == -1) {
+             checkok = 0;
+             msg += "$lt{'whus'}\\n";
+         }
+         if (srchterm.indexOf(",") == srchterm.length -1) {
+             checkok = 0;
+             msg += "$lt{'whse'}\\n";
+         }
+     }
+     if (checkok == 0) {
+         alert("$lt{'thfo'}\\n"+msg);
+         return;
+     }
+     if (checkok == 1) {
+         callingForm.submit();
+     }
+ }
+ $newuserscript
+ </script>
+ $new_user_create
+ <table>
+  <tr>
+   <td>$lt{'doma'}:</td>
+   <td>$domform</td>
+   </td>
+  </tr>
+  <tr>
+   <td>$lt{'usr'}:</td>
+   <td>$srchbysel
+       $srchtypesel
+       <input type="text" size="15" name="srchterm" value="$srchterm" />
+       $srchinsel
+   </td>
+  </tr>
+ </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 5754  sub record_sep {
+ Line 6026  sub record_sep {
              $i++;
          }
      } else {
-         my @allfields;
+         my $separator=',';
          if ($env{'form.upfiletype'} eq 'semisv') {
-             @allfields=split(/;/,$record,-1);
+             $separator=';';
-         } else {
-             @allfields=split(/\,/,$record,-1);
          }
          my $i=0;
-         my $j;
+ # the character we are looking for to indicate the end of a quote or a record
-         for ($j=0;$j<=$#allfields;$j++) {
+         my $looking_for=$separator;
-             my $field=$allfields[$j];
+ # do not add the characters to the fields
-             if ($field=~/^\s*(\"|\')/) {
+         my $ignore=0;
- 		my $delimiter=$1;
+ # we just encountered a separator (or the beginning of the record)
-                 while (($field!~/$delimiter$/) && ($j<$#allfields)) {
+         my $just_found_separator=1;
- 		    $j++;
+ # store the field we are working on here
- 		    $field.=','.$allfields[$j];
+         my $field='';
- 		}
+ # work our way through all characters in record
-                 $field=~s/^\s*$delimiter//;
+         foreach my $character ($record=~/(.)/g) {
-                 $field=~s/$delimiter\s*$//;
+             if ($character eq $looking_for) {
-             }
+                if ($character ne $separator) {
-             $components{&takeleft($i)}=$field;
+ # Found the end of a quote, again looking for separator
- 	    $i++;
+                   $looking_for=$separator;
+                   $ignore=1;
+                } else {
+ # Found a separator, store away what we got
+                   $components{&takeleft($i)}=$field;
+ 	          $i++;
+                   $just_found_separator=1;
+                   $ignore=0;
+                   $field='';
+                }
+                next;
+             }
+ # single or double quotation marks after a separator indicate beginning of a quote
+ # we are now looking for the end of the quote and need to ignore separators
+             if ((($character eq '"') || ($character eq "'")) && ($just_found_separator))  {
+                $looking_for=$character;
+                next;
+             }
+ # ignore would be true after we reached the end of a quote
+             if ($ignore) { next; }
+             if (($just_found_separator) && ($character=~/\s/)) { next; }
+             $field.=$character;
+             $just_found_separator=0;
          }
+ # catch the very last entry, since we never encountered the separator
+         $components{&takeleft($i)}=$field;
      }
      return %components;
  }
- Line 6634  sub commit_studentrole {
+ Line 6928  sub commit_studentrole {
  ############################################################
  ############################################################
+ sub check_clone {
+     my ($args) = @_;
+     my $cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'};
+     my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid);
+     my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
+     my $clonemsg;
+     my $can_clone = 0;
+     if ($clonehome eq 'no_host') {
+ 	$clonemsg = &mt('Attempting to clone non-existing [_1]',
+ 			$args->{'crstype'});
+     } else {
+ 	my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
+ 	if ($env{'request.role.domain'} eq $args->{'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 new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
+ 	    }
+ 	}
+     }
+     return ($can_clone, $clonemsg, $cloneid, $clonehome);
+ }
  sub construct_course {
      my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context) = @_;
      my $outcome;
- Line 6641  sub construct_course {
+ Line 6969  sub construct_course {
      if ($context eq 'auto') {
          $linefeed = "\n";
      }
+ #
+ # Are we cloning?
+ #
+     my ($can_clone, $clonemsg, $cloneid, $clonehome);
+     if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) {
+ 	($can_clone, $clonemsg, $cloneid, $clonehome) = &check_clone($args);
+ 	if ($context ne 'auto') {
+ 	    $clonemsg = '<span class="LC_error">'.$clonemsg.'</span>';
+ 	}
+ 	$outcome .= $clonemsg.$linefeed;
+         if (!$can_clone) {
+ 	    return (0,$outcome);
+ 	}
+     }
  #
  # Open course
  #
- Line 6661  sub construct_course {
+ Line 7006  sub construct_course {
      # 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]',$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.$linefeed;
  #
- # Are we cloning?
+ # Do the cloning
  #
-     my $cloneid='';
+     if ($can_clone && $cloneid) {
-     if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) {
+ 	$clonemsg = &mt('Cloning [_1] from [_2]',$crstype,$clonehome);
-         my $can_clone = 0;
+ 	if ($context ne 'auto') {
- 	$cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'};
+ 	    $clonemsg = '<span class="LC_success">'.$clonemsg.'</span>';
-         my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid);
+ 	}
- 	my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
+ 	$outcome .= $clonemsg.$linefeed;
-         my $clonemsg;
+ 	my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum);
- 	if ($clonehome eq 'no_host') {
-             $clonemsg = &mt('Attempting to clone non-existing [_1]',$crstype);
-             if ($context eq 'auto') {
-                 $outcome .= $clonemsg;
-             } else {
- 	        $outcome .= '<font color="red">'.$clonemsg.'</font>';
-             }
-             $outcome .= $linefeed;
- 	} else {
-             my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
-             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);
+ 	&Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid);
  # Restore URL
- 	    $cenv{'url'}=$oldcenv{'url'};
+ 	$cenv{'url'}=$oldcenv{'url'};
  # Restore title
- 	    $cenv{'description'}=$oldcenv{'description'};
+ 	$cenv{'description'}=$oldcenv{'description'};
  # restore grading mode
- 	    if (defined($oldcenv{'grading'})) {
+ 	if (defined($oldcenv{'grading'})) {
- 		$cenv{'grading'}=$oldcenv{'grading'};
+ 	    $cenv{'grading'}=$oldcenv{'grading'};
- 	    }
- # Mark as cloned
- 	    $cenv{'clonedfrom'}=$cloneid;
- 	    delete($cenv{'default_enrollment_start_date'});
- 	    delete($cenv{'default_enrollment_end_date'});
  	}
+ # Mark as cloned
+ 	$cenv{'clonedfrom'}=$cloneid;
+ 	delete($cenv{'default_enrollment_start_date'});
+ 	delete($cenv{'default_enrollment_end_date'});
      }
  #
  # Set environment (will override cloned, if existing)
  #
- Line 6843  sub construct_course {
+ Line 7146  sub construct_course {
                             ' ('.$lt{'adby'}.')';
          if ($context eq 'auto') {
              $outcome .= $badclass_msg.$linefeed;
-             $outcome .= '<font color="red">'.$badclass_msg.$linefeed.'<ul>'."\n";
+             $outcome .= '<div class="LC_warning">'.$badclass_msg.$linefeed.'<ul>'."\n";
              foreach my $item (@badclasses) {
                  if ($context eq 'auto') {
                      $outcome .= " - $item\n";
- Line 6854  sub construct_course {
+ Line 7157  sub construct_course {
              if ($context eq 'auto') {
                  $outcome .= $linefeed;
              } else {
-                 $outcome .= "</ul><br /><br /></font>\n";
+                 $outcome .= "</ul><br /><br /></div>\n";
              }
          }
      }
- Line 6876  sub construct_course {
+ Line 7179  sub construct_course {
              if ($context eq 'auto') {
                  $outcome .= $krb_msg;
              } else {
-                 $outcome .= '<font color="red" size="+1">'.$krb_msg.'</font>';
+                 $outcome .= '<span class="LC_error">'.$krb_msg.'</span>';
              }
              $outcome .= $linefeed;
          }
- Line 6974  sub construct_course {
+ Line 7277  sub construct_course {
  	if ($errtext) { $fatal=2; }
          $outcome .= ($fatal?$errtext:'write ok').$linefeed;
      }
-     return $outcome;
+     return (1,$outcome);
  }
  ############################################################
- Line 7017  sub icon {
+ Line 7321  sub icon {
      return &lonhttpdurl($iconname);
  }
- sub lonhttpdurl {
+ sub lonhttpd_port {
-     my ($url)=@_;
      my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'};
      if (!defined($lonhttpd_port)) { $lonhttpd_port='8080'; }
+     # IE doesn't like a secure page getting images from a non-secure
+     # port (when logging we haven't parsed the browser type so default
+     # back to secure
+     if ((!exists($env{'browser.type'}) || $env{'browser.type'} eq 'explorer')
+ 	&& $ENV{'SERVER_PORT'} == 443) {
+ 	return 443;
+     }
+     return $lonhttpd_port;
+ }
+ sub lonhttpdurl {
+     my ($url)=@_;
+     my $lonhttpd_port = &lonhttpd_port();
+     if ($lonhttpd_port == 443) {
+ 	return 'https://'.$ENV{'SERVER_NAME'}.$url;
+     }
      return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
  }

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

Removed from v.1.547
changed lines
	Added in v.1.564.2.7