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

Diff for /loncom/interface/groupsort.pm between versions 1.44 and 1.53

version 1.44, 2006/06/19 09:40:17 version 1.53, 2007/07/06 08:34:37
Line 37  use GDBM_File; Line 37  use GDBM_File;
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use LONCAPA();
   
 my $iconpath; # variable to be accessible to multiple subroutines  my $iconpath; # variable to be accessible to multiple subroutines
 my %hash; # variable to tie to user specific database  my %hash; # variable to tie to user specific database
Line 64  sub readfromdb { Line 65  sub readfromdb {
  foreach (sort {$achash{$a} <=> $achash{$b}} (keys %ahash)) {   foreach (sort {$achash{$a} <=> $achash{$b}} (keys %ahash)) {
     my $key = $_;      my $key = $_;
     if ($ahash{$key} eq '1') {      if ($ahash{$key} eq '1') {
           if ($hash{'pre_'.$key.'_title'} eq 'Not_retrieved') {
               $hash{'pre_'.$key.'_title'} = &Apache::lonnet::gettitle($hash{'pre_'.$key.'_link'});
           }
  $hash{'store_'.$hash{'pre_'.$key.'_link'}} =   $hash{'store_'.$hash{'pre_'.$key.'_link'}} =
     $hash{'pre_'.$key.'_title'};      $hash{'pre_'.$key.'_title'};
  $hash{'storectr_'.$hash{'pre_'.$key.'_link'}} =   $hash{'storectr_'.$hash{'pre_'.$key.'_link'}} =
Line 174  sub readfromfile { Line 178  sub readfromfile {
   
     my $url=$token->[2]->{'src'};      my $url=$token->[2]->{'src'};
                     my $name=$token->[2]->{'title'};                      my $name=$token->[2]->{'title'};
     $name=~s/ \[\((\d+)\,(\w+)\,(\w+)\)\]$//;      $name=~s/ \[\((\d+)\,($LONCAPA::username_re)\,($LONCAPA::domain_re)\)\]$//;
     if ($1) {      if ($1) {
  $$nhash{$url}='<br />'.&mt('Removed by ').   $$nhash{$url}='<br />'.&mt('Removed by ').
     &Apache::loncommon::plainname($2,$3).', '.      &Apache::loncommon::plainname($2,$3).', '.
Line 327  END Line 331  END
  'ci' => 'Continue Import',   'ci' => 'Continue Import',
  'cs' => 'Continue Search',   'cs' => 'Continue Search',
  'fi' => 'Finish Import',   'fi' => 'Finish Import',
    're' => 'Recover Checked',
  'ca' => 'Cancel',   'ca' => 'Cancel',
  'co' => 'Change Order',   'co' => 'Change Order',
  'ti' => 'Title',   'ti' => 'Title',
Line 348  END Line 353  END
 <input type="hidden" name="recover" value="$env{'form.recover'}" />  <input type="hidden" name="recover" value="$env{'form.recover'}" />
 END  END
   
   
           # ---
       
           if ($env{'form.recover'}) {
       $r->print(<<END);
   <input type="button" name="alter" value="$lt{'re'}"
    onClick="finish_import()" />&nbsp;
   <input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
   END
    } else {
         # --- Continue Buttons          # --- Continue Buttons
         my $resurl = &Apache::loncommon::lastresurl();      my $resurl = 
         $r->print(<<END);   &Apache::loncommon::escape_single(&Apache::loncommon::lastresurl());
       $r->print(<<END);
 <input type="button" name="alter" value="$lt{'ci'}"  <input type="button" name="alter" value="$lt{'ci'}"
  onClick="window.location='$resurl?catalogmode=import'" />&nbsp;   onClick="window.location='$resurl?catalogmode=import'" />&nbsp;
 <input type="button" name="altersearch" value="$lt{'cs'}"  <input type="button" name="altersearch" value="$lt{'cs'}"
  onClick="window.location='/adm/searchcat?catalogmode=import'" />&nbsp;   onClick="window.location='/adm/searchcat?catalogmode=import'" />&nbsp;
 END  
         # ---  
   
  $r->print(<<END);  
 <input type="button" name="alter" value="$lt{'fi'}"  <input type="button" name="alter" value="$lt{'fi'}"
  onClick="finish_import()" />&nbsp;   onClick="finish_import()" />&nbsp;
 <input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />  <input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
 END  END
           }
         $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");          $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
  $r->print("<table border=0><tr>\n");   $r->print("<table border=0><tr>\n");
  if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {    if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { 
Line 431  sub hidden { Line 444  sub hidden {
     my ($sel,$title,$filelink) = @_;      my ($sel,$title,$filelink) = @_;
     my $string = '<input type="hidden" name="title'.$sel.'" value="'.$title.      my $string = '<input type="hidden" name="title'.$sel.'" value="'.$title.
  '" />';   '" />';
       $filelink=~s|^/ext/|http://|;
     $string .= '<input type="hidden" name="filelink'.$sel.'" value="'.      $string .= '<input type="hidden" name="filelink'.$sel.'" value="'.
  $filelink.'" />';   $filelink.'" />';
     return $string;      return $string;
Removed from v.1.44  
changed lines
  Added in v.1.53

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