Diff for /loncom/interface/groupsort.pm between versions 1.45 and 1.50

version 1.45, 2006/07/21 00:21:28 version 1.50, 2006/12/05 02:55:51
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 174  sub readfromfile { Line 175  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 211  sub readfrombookmarks { Line 212  sub readfrombookmarks {
     return ($shash,$thash);      return ($shash,$thash);
 }  }
   
 # ---------------------------------------------------------- Clear the database  
   
 sub clear_basket {  
     my $diropendb =  
        "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db";  
     unlink ($diropendb);  
 }                                                                                                           
   
 # ---------------------------------------------------------------- Main Handler  # ---------------------------------------------------------------- Main Handler
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 357  END Line 350  END
 END  END
   
         # --- Continue Buttons          # --- Continue Buttons
         my $resurl = &Apache::loncommon::lastresurl();          my $resurl = 
      &Apache::loncommon::escape_single(&Apache::loncommon::lastresurl());
         $r->print(<<END);          $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;
Line 439  sub hidden { Line 433  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.45  
changed lines
  Added in v.1.50


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