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

Diff for /loncom/interface/lonindexer.pm between versions 1.213.4.4 and 1.226

version 1.213.4.4, 2013/06/05 17:02:23 version 1.226, 2017/05/22 19:18:40
Line 92  sub handler { Line 92  sub handler {
     undef (@Omit);      undef (@Omit);
     %fieldnames=&Apache::lonmeta::fieldnames();      %fieldnames=&Apache::lonmeta::fieldnames();
   
 # ------------------------------------- read in machine configuration variables  # --------------------------------------------------------------- get icon path
     my $iconpath= $r->dir_config('lonIconsURL') . "/";      my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my $domain  = $r->dir_config('lonDefDomain');  
     my $role    = $r->dir_config('lonRole');  
     my $loadlim = $r->dir_config('lonLoadLim');  
     my $servadm = $r->dir_config('lonAdmEMail');  
     my $sysadm  = $r->dir_config('lonSysEMail');  
     my $lonhost = $r->dir_config('lonHostID');  
     my $tabdir  = $r->dir_config('lonTabDir');  
   
 #SB my $fileclr='#ffffe6';  #SB my $fileclr='#ffffe6';
     my $line;      my $line;
Line 572  END Line 565  END
     } else {      } else {
  $r->print($reshome);   $r->print($reshome);
     }      }
     $r->print("'>".&mt('Home').'</a></span>');      $r->print("'>".&mt('Home directory').'</a></span>');
  }   }
  $r->print('</form>');   $r->print('</form>');
 # ------------------------------------------------------ Remember where we were  # ------------------------------------------------------ Remember where we were
Line 630  END Line 623  END
         
   
 # ----------------- read in what directories have previously been set to "open"  # ----------------- read in what directories have previously been set to "open"
  foreach (keys %hash) {   foreach (keys(%hash)) {
     if ($_ =~ /^diropen_status_/) {      if ($_ =~ /^diropen_status_/) {
  my $key = $_;   my $key = $_;
  $key =~ s/^diropen_status_//;   $key =~ s/^diropen_status_//;
Line 716  sub scanDir { Line 709  sub scanDir {
         return if ($c->aborted());          return if ($c->aborted());
  #This is a kludge, sorry aboot this   #This is a kludge, sorry aboot this
  my ($strip,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);    my ($strip,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
  next if($strip =~ /.*\.meta$/ | $obs eq '1');   next if (($strip =~ /\.meta$/) || ($obs));
           if ($dom ne 'domain') {
               my ($udom,$uname);
               if ($dom eq 'user') {
                   ($udom) = ($startdir =~ m{^/res/($match_domain)});
                   $uname = $strip;
               } else {
                   ($udom,$uname) = ($startdir =~ m{^/res/($match_domain)/($match_courseid)});
               }
               if ($udom ne '' && $uname ne '') {
                   # Don't display "course author" directory.
                   next if (&Apache::lonnet::is_course($udom,$uname));
               }
           }
  my (@fileparts) = split(/\./,$strip);   my (@fileparts) = split(/\./,$strip);
  if ($hash{'display_attrs_9'} != 1) {   if ($hash{'display_attrs_9'} != 1) {
             # if not all versions to be shown              # if not all versions to be shown
Line 761  sub get_list { Line 767  sub get_list {
           
     (my $luri = $uri) =~ s/\//_/g;      (my $luri = $uri) =~ s/\//_/g;
     if ($env{'form.updatedisplay'}) {      if ($env{'form.updatedisplay'}) {
  foreach (keys %hash) {   foreach (keys(%hash)) {
     delete $hash{$_} if ($_ =~ /^dirlist_files_/);      delete $hash{$_} if ($_ =~ /^dirlist_files_/);
     delete $hash{$_} if ($_ =~ /^dirlist_timestamp_files_/);      delete $hash{$_} if ($_ =~ /^dirlist_timestamp_files_/);
  }   }
Line 996  $r->print ('<input type="hidden" name="a Line 1002  $r->print ('<input type="hidden" name="a
  $r->print (' alt="'.$msg.'"/></a>'.   $r->print (' alt="'.$msg.'"/></a>'.
    "\n");     "\n");
  my $quotable_curdir = &Apache::loncommon::escape_single($curdir);   my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
           my $quotable_startdir = &Apache::loncommon::escape_single($startdir);
           my $quotable_listname = &Apache::loncommon::escape_single($listname);
   
  $r->print ('<a href="javascript:gothere(\''.$quotable_curdir   $r->print ('<a href="javascript:gothere(\''.$quotable_curdir
    .'\')"><img alt="'.$msg.'" src="'.     .'\')"><img alt="'.$msg.'" src="'.
    $iconpath.'quill.gif" class="LC_fileicon" />');     $iconpath.'quill.gif" class="LC_fileicon" />');
Line 1007  $r->print ('<input type="hidden" name="a Line 1016  $r->print ('<input type="hidden" name="a
 # Wishlistlink  # Wishlistlink
         $r->print('</form></td><td><a href="javascript:;" '.          $r->print('</form></td><td><a href="javascript:;" '.
                   'title="'.&mt('Save a link for this folder in your personal Stored Links repository').'" '.                    'title="'.&mt('Save a link for this folder in your personal Stored Links repository').'" '.
                   'onclick="set_wishlistlink('."'$plainname','$startdir$listname'".')">'.                    'onclick="set_wishlistlink('."'$plainname','$quotable_startdir$quotable_listname"."/'".')">'.
                   '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.                    '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
                   'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a>'.$tabtag);                    'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a>'.$tabtag);
         $r->print(&Apache::loncommon::end_data_table_row());          $r->print(&Apache::loncommon::end_data_table_row());
Line 1090  $r->print ('<input type="hidden" name="a Line 1099  $r->print ('<input type="hidden" name="a
 # Filetype icons  # Filetype icons
  $r->print("<img alt=\"\" src='$iconname' class='LC_fileicon' />\n");   $r->print("<img alt=\"\" src='$iconname' class='LC_fileicon' />\n");
  my $quotable_filelink = &Apache::loncommon::escape_single($filelink);   my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
           my $quotable_startdir = Apache::loncommon::escape_single($startdir);
           my $quotable_listname = &Apache::loncommon::escape_single($listname);
   
  $r->print (" <a href=\"javascript:openMyModal('".$quotable_filelink."?inhibitmenu=yes',500,500,'yes');\">$listname</a> ");   $r->print (" <a href=\"javascript:openMyModal('".$quotable_filelink."?inhibitmenu=yes',500,500,'yes');\">$listname</a> ");
  $quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');   $quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');
Line 1103  $r->print ('<input type="hidden" name="a Line 1114  $r->print ('<input type="hidden" name="a
 # Wishlistlink  # Wishlistlink
         $r->print('<td><a href="javascript:;" title="'.&mt('Save a link for this resource in your personal Stored Links repository').'" '.          $r->print('<td><a href="javascript:;" title="'.&mt('Save a link for this resource in your personal Stored Links repository').'" '.
                   'onclick="set_wishlistlink('."'".&Apache::lonnet::gettitle($filelink).                    'onclick="set_wishlistlink('."'".&Apache::lonnet::gettitle($filelink).
                   "','$startdir$listname'".')">'.                    "','$quotable_startdir$quotable_listname'".')">'.
                   '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.                    '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
                   'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a></td>');                    'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a></td>');
  if ($hash{'display_attrs_0'} == 1) {   if ($hash{'display_attrs_0'} == 1) {
Line 1245  $r->print ('<input type="hidden" name="a Line 1256  $r->print ('<input type="hidden" name="a
  $r->print (' alt="'.$msg.'" class="LC_fileicon" /></a>'.   $r->print (' alt="'.$msg.'" class="LC_fileicon" /></a>'.
    "\n");     "\n");
  my $quotable_curdir = &Apache::loncommon::escape_single($curdir);   my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
                   my $quotable_startdir = &Apache::loncommon::escape_single($startdir);
           my $quotable_listname = &Apache::loncommon::escape_single($listname);
   
         my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons");          my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons");
  my $icon = "navmap.folder.".($nowOpen ? "open":"closed").'.gif';   my $icon = "navmap.folder.".($nowOpen ? "open":"closed").'.gif';
         $r->print ('<a href="javascript:gothere('          $r->print ('<a href="javascript:gothere('
Line 1257  $r->print ('<input type="hidden" name="a Line 1270  $r->print ('<input type="hidden" name="a
 # Wishlistlink  # Wishlistlink
         $r->print('</td><td><a href="javascript:;" '.          $r->print('</td><td><a href="javascript:;" '.
                   'title="'.&mt('Save a link for this folder in Stored Links').'" '.                    'title="'.&mt('Save a link for this folder in Stored Links').'" '.
                   'onclick="set_wishlistlink('."'$listname','$startdir$listname'".')">'.                    'onclick="set_wishlistlink('."'$listname','$quotable_startdir$quotable_listname"."/'".')">'.
                   '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.                    '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
                   'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a></td>');                    'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a></td>');
 # Attributes  # Attributes
Line 1304  $r->print ('<input type="hidden" name="a Line 1317  $r->print ('<input type="hidden" name="a
  }   }
  if ($hash{'display_attrs_7'} == 1) {   if ($hash{'display_attrs_7'} == 1) {
    $r->print('<td>&nbsp;</td>');     $r->print('<td>&nbsp;</td>');
     }               }
     if ($hash{'display_attrs_11'} == 1) {          if ($hash{'display_attrs_11'} == 1) {
    $r->print('<td>&nbsp;</td>');     $r->print('<td>&nbsp;</td>');
  }   }
  if ($hash{'display_attrs_12'} == 1) {   if ($hash{'display_attrs_12'} == 1) {
Line 1348  sub coursecontext { Line 1361  sub coursecontext {
     my $filesymb=&Apache::lonnet::symbread($filelink);      my $filesymb=&Apache::lonnet::symbread($filelink);
     if ($filesymb) {      if ($filesymb) {
  my ($map,$index,$resource)=&Apache::lonnet::decode_symb($filesymb);   my ($map,$index,$resource)=&Apache::lonnet::decode_symb($filesymb);
  $r->print(&mt('Already in this course:<br />[_1] in folder/map [_2].<br />',   $r->print(
       &Apache::lonnet::gettitle($resource),              &mt('Already in this course:').'<br />'
       &Apache::lonnet::gettitle($map)));             .&mt('[_1] in folder/map [_2]',
                       &Apache::lonnet::gettitle($resource),
                       &Apache::lonnet::gettitle($map))
              .'<br />');
     }      }
 }  }
   
Line 1436  sub start_fresh_session { Line 1452  sub start_fresh_session {
     delete $hash->{'form.element'};      delete $hash->{'form.element'};
     delete $hash->{'form.omit'};      delete $hash->{'form.omit'};
     delete $hash->{'form.only'};      delete $hash->{'form.only'};
     foreach (keys %{$hash}) {      foreach (keys(%{$hash})) {
         delete $hash->{$_} if (/^(pre_|store)/);          delete $hash->{$_} if (/^(pre_|store)/);
     }      }
 }  }
Removed from v.1.213.4.4  
changed lines
  Added in v.1.226

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