--- loncom/interface/lonpickcourse.pm 2010/07/08 23:19:19 1.99 +++ loncom/interface/lonpickcourse.pm 2011/09/01 02:32:50 1.103 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.99 2010/07/08 23:19:19 raeburn Exp $ +# $Id: lonpickcourse.pm,v 1.103 2011/09/01 02:32:50 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -439,10 +439,10 @@ sub display_matched_courses { } } } - push(@owners,&unescape($courses{$course}{'owner'})); - if (ref($courses{$course}{'co-owners'}) eq 'ARRAY') { - foreach my $item (@{$courses{$course}{'co-owners'}}) { - push(@owners,&unescape($item)); + push(@owners,$courses{$course}{'owner'}); + if ($courses{$course}{'co-owners'} ne '') { + foreach my $item (split(/,/,$courses{$course}{'co-owners'})) { + push(@owners,$item); } } } else { @@ -830,7 +830,11 @@ sub timebased_select_form { sub get_coordinator_cloneable { my ($cloneruname,$clonerudom,$type) = @_; - if (&Apache::lonnet::homeserver($cloneruname,$clonerudom) eq 'no_host') { + if (($cloneruname!~/\w/) || ($clonerudom!~/\w/)) { + my $warning = '
'.&mt('Intended course owner not specified'). + '
'; + return ('',$warning); + } elsif (&Apache::lonnet::homeserver($cloneruname,$clonerudom) eq 'no_host') { my $warning = '
'.&mt('Intended course owner does not exist'). '
'; return ('',$warning); @@ -1057,8 +1061,13 @@ ENDSCRIPT } else { my ($name_code,$type_code); if ($env{'form.cnameelement'} ne '') { - $name_code = 'opener.document.'.$env{'form.form'}.'.'. - $env{'form.cnameelement'}.'.value=cdesc;'; + $name_code = < 25) { + showcdesc = cdesc.substr(0,25)+' ...'; +} +opener.document.$env{'form.form'}.$env{'form.cnameelement'}.value=showcdesc; +ENDNAMECODE } if ($env{'form.typeelement'} ne '') { $type_code = 'opener.document.'.$env{'form.form'}.'.'. @@ -1285,7 +1294,7 @@ javascript functions used when user sele =item -(g) Scantron Operator uploading a scantron file to a course - course number is written to visible form element in opener window. Child window closes. +(g) Bubblesheet Scanning Operator uploading a bubblesheet file to a course - course number is written to visible form element in opener window. Child window closes. =item