--- loncom/interface/loncommon.pm 2008/03/23 23:13:26 1.636.2.5 +++ loncom/interface/loncommon.pm 2008/02/13 12:41:11 1.640 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.636.2.5 2008/03/23 23:13:26 raeburn Exp $ +# $Id: loncommon.pm,v 1.640 2008/02/13 12:41:11 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -78,72 +78,6 @@ my $readit; ## Global Variables ## -# ----------------------------------------------- SSI with retries: -# - -=pod - -=head1 Server Side include with retries: - -=over 4 - -=item * &ssi_with_retries(resource,retries form) - -Performs an ssi with some number of retries. Retries continue either -until the result is ok or until the retry count supplied by the -caller is exhausted. - -Inputs: - -=over 4 - -resource - Identifies the resource to insert. - -retries - Count of the number of retries allowed. - -form - Hash that identifies the rendering options. - -=back - -Returns: - -=over 4 - -content - The content of the response. If retries were exhausted this is empty. - -response - The response from the last attempt (which may or may not have been successful. - -=back - -=back - -=cut - -sub ssi_with_retries { - my ($resource, $retries, %form) = @_; - - - my $ok = 0; # True if we got a good response. - my $content; - my $response; - - # Try to get the ssi done. within the retries count: - - do { - ($content, $response) = &Apache::lonnet::ssi($resource, %form); - $ok = $response->is_success; - $retries--; - } while (!$ok && ($retries > 0)); - - if (!$ok) { - $content = ''; # On error return an empty content. - } - return ($content, $response); - -} - - - # ----------------------------------------------- Filetypes/Languages/Copyright my %language; my %supported_language; @@ -4047,7 +3981,7 @@ ENDROLE $dc_info = '('.$dc_info.')'; } - if (($env{'environment.remote'} eq 'off') || ($args->{'suppress_header_logos'})) { + if ($env{'environment.remote'} eq 'off') { # No Remote if ($env{'request.state'} eq 'construct') { $forcereg=1; @@ -4072,8 +4006,8 @@ ENDROLE $titleinfo = &Apache::loncommon::help_open_menu('','',3,'Authoring') .''.&mt('Construction Space').': ' - .'
' + .'' .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv','','+1',1)."$lastitem
" .&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()') .'' @@ -8153,7 +8087,7 @@ sub construct_course { $outcome .= $clonemsg.$linefeed; my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum); # Copy all files - &Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid); + &Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid,$args->{'datemode'},$args->{'dateshift'}); # Restore URL $cenv{'url'}=$oldcenv{'url'}; # Restore title @@ -8200,7 +8134,6 @@ sub construct_course { } else { $cenv{'internal.courseowner'} = $args->{'curruser'}; } - my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner. if ($args->{'crssections'}) { $cenv{'internal.sectionnums'} = '';