[BACK]Return to loncommon.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.444 and 1.447

version 1.444, 2006/08/11 22:00:07 version 1.447, 2006/08/22 17:15:19
Line 2109  sub noteswrapper { Line 2109  sub noteswrapper {
   
 sub aboutmewrapper {  sub aboutmewrapper {
     my ($link,$username,$domain,$target)=@_;      my ($link,$username,$domain,$target)=@_;
       if (!defined($username)  && !defined($domain)) {
           return;
       }
     return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'.      return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'.
  ($target?' target="$target"':'').' title="'.&mt('View this users personal page').'">'.$link.'</a>';   ($target?' target="$target"':'').' title="'.&mt('View this users personal page').'">'.$link.'</a>';
 }  }
Line 5849  sub construct_course { Line 5852  sub construct_course {
 #  #
     unless (($args->{'nonstandard'}) || ($args->{'firstres'} eq 'blank')      unless (($args->{'nonstandard'}) || ($args->{'firstres'} eq 'blank')
     || ($cloneid)) {      || ($cloneid)) {
    use LONCAPA::map;
  $outcome .= &mt('Setting first resource').': ';   $outcome .= &mt('Setting first resource').': ';
         my ($errtext,$fatal)=  
            &Apache::londocs::mapread($$crsunum,$$crsudom,'default.sequence');   my $map = '/uploaded/'.$$crsudom.'/'.$$crsunum.'/default.sequence';
           my ($errtext,$fatal)=&LONCAPA::map::mapread($map);
   
         $outcome .= ($fatal?$errtext:'read ok').' - ';          $outcome .= ($fatal?$errtext:'read ok').' - ';
         my $title; my $url;          my $title; my $url;
         if ($args->{'firstres'} eq 'syl') {          if ($args->{'firstres'} eq 'syl') {
Line 5861  sub construct_course { Line 5867  sub construct_course {
             $title='Navigate Contents';              $title='Navigate Contents';
             $url='/adm/navmaps';              $url='/adm/navmaps';
         }          }
         $Apache::lonratedt::resources[1]=$title.':'.$url.':false:start:res';  
         ($errtext,$fatal)=          $LONCAPA::map::resources[1]=$title.':'.$url.':false:start:res';
            &Apache::londocs::storemap($$crsunum,$$crsudom,'default.sequence');   (my $outtext,$errtext) = &LONCAPA::map::storemap($map,1);
         $outcome .= ($fatal?$errtext:'write ok').'<br>';  
    if ($errtext) { $fatal=2; }
           $outcome .= ($fatal?$errtext:'write ok').'<br />';
     }      }
     return $outcome;      return $outcome;
 }  }
Line 5916  sub lonhttpdurl { Line 5924  sub lonhttpdurl {
     return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;      return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
 }  }
   
   sub absolute_url {
       my ($host_name) = @_;
       my $protocol = ($ENV{'SERVER_PORT'} == 443?'https://':'http://');
       if ($host_name eq '') {
    $host_name = $ENV{'SERVER_NAME'};
       }
       return $protocol.$host_name;
   }
   
 sub connection_aborted {  sub connection_aborted {
     my ($r)=@_;      my ($r)=@_;
     $r->print(" ");$r->rflush();      $r->print(" ");$r->rflush();
Removed from v.1.444  
changed lines
  Added in v.1.447

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