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

Diff for /loncom/publisher/londiff.pm between versions 1.27 and 1.29

version 1.27, 2009/05/14 14:24:18 version 1.29, 2011/10/23 23:46:07
Line 114  sub handler { Line 114  sub handler {
       ' <span class="LC_filename">'.$efn.'</span>');        ' <span class="LC_filename">'.$efn.'</span>');
         
     if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) {      if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) {
         $r->print('<p><span class="LC_warning">'          $r->print('<p><span class="LC_info">'
                  .&mt('Co-Author [_1]'                   .&mt('Co-Author [_1]'
                      ,&Apache::loncommon::plainname($cuname,$cudom)                       ,&Apache::loncommon::plainname($cuname,$cudom)
                      .' ('.$cuname.':'.$cudom.')')                       .' ('.$cuname.':'.$cudom.')')
Line 127  sub handler { Line 127  sub handler {
  || $efn =~ /\.meta$/) {   || $efn =~ /\.meta$/) {
  $r->print('<p><span class="LC_diff_removed">');   $r->print('<p><span class="LC_diff_removed">');
  if ($env{'form.versionone'} eq 'priv') {   if ($env{'form.versionone'} eq 'priv') {
     my $fn='/home/'.$cuname.'/public_html/'.$efn;      my $fn='/home/httpd/html/priv/'.$cudom.'/'.$cuname.'/'.$efn;
     @f1=&get_split_file($fn,'local');      @f1=&get_split_file($fn,'local');
     $r->print('<b>'.&mt('Construction Space Version').'</b>');      $r->print('<b>'.&mt('Construction Space Version').'</b>');
  } else {   } else {
Line 153  sub handler { Line 153  sub handler {
  if ($env{'form.filetwo'}) {   if ($env{'form.filetwo'}) {
     my $efn2=$env{'form.filetwo'};      my $efn2=$env{'form.filetwo'};
     $efn2=~s{/\~($LONCAPA::username_re)}{}g;      $efn2=~s{/\~($LONCAPA::username_re)}{}g;
     my $fn='/home/'.$cuname.'/public_html/'.$efn2;      my $fn='/home/httpd/html/priv/'.$cudom.'/'.$cuname.'/'.$efn2;
     @f2=&get_split_file($fn,'local');      @f2=&get_split_file($fn,'local');
     $r->print('<tt>'.$efn2.'</tt>');      $r->print('<tt>'.$efn2.'</tt>');
  } elsif ($env{'form.versiontwo'} eq 'priv') {   } elsif ($env{'form.versiontwo'} eq 'priv') {
     my $fn='/home/'.$cuname.'/public_html/'.$efn;      my $fn='/home/httpd/html/priv/'.$cudom.'/'.$cuname.'/'.$efn;
     @f2=&get_split_file($fn,'local');      @f2=&get_split_file($fn,'local');
     $r->print('<b>'.&mt('Construction Space Version').'</b>');      $r->print('<b>'.&mt('Construction Space Version').'</b>');
  } else {   } else {
Removed from v.1.27  
changed lines
  Added in v.1.29

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