Diff for /loncom/interface/loncommon.pm between versions 1.222 and 1.223

version 1.222, 2004/10/21 11:17:00 version 1.223, 2004/10/23 00:38:01
Line 3732  sub connection_aborted { Line 3732  sub connection_aborted {
     return $c->aborted();      return $c->aborted();
 }  }
   
 #  
 #    Escapes strings that may have embedded 's that will be put into  #    Escapes strings that may have embedded 's that will be put into
 #    strings as 'strings'.  #    strings as 'strings'.
 #    The assumptions are:  
 #       There has been no effort to escape ' with \'  
 #       Any \'s in the string are intended to be there as part of the URL  
 #        and must also be escaped.  
 # Parameters:  
 #     input     - The string to escape.  
 # Returns:  
 #     The escaped string (' replaced by \' and \ replaced by \\).  
 #  
 sub escape_single {  sub escape_single {
     my ($input) = @_;      my ($input) = @_;
       $input =~ s/\\/\\\\/g; # Escape the \'s..(must be first)>
     #  I imagine a regexp wizard could combine the two expressions below.  
     #  If you do you might want to comment the result.  
   
     $input =~ s/\\/\\\\/g; # Escape the /'s..(must be first)>  
     $input =~ s/\'/\\\'/g; # Esacpe the 's....      $input =~ s/\'/\\\'/g; # Esacpe the 's....
   
     return $input;      return $input;
 }  }
   
 #  Same as escape_single, but escape's "'s  This   #  Same as escape_single, but escape's "'s  This 
 #  can be used for  "strings"  #  can be used for  "strings"
 #  
 # Parameters:  
 #     input     - The string to escape.  
 # Returns:  
 #     The escaped string (" replaced by \" and \ replaced by \\).  
 #  
 sub escape_double {  sub escape_double {
     my ($input) = @_;      my ($input) = @_;
   
     #  I imagine a regexp wizard could combine the two expressions below.  
     #  If you do you might want to comment the result.  
   
     $input =~ s/\\/\\\\/g; # Escape the /'s..(must be first)>      $input =~ s/\\/\\\\/g; # Escape the /'s..(must be first)>
     $input =~ s/\"/\\\"/g; # Esacpe the "s....      $input =~ s/\"/\\\"/g; # Esacpe the "s....
   
     return $input;      return $input;
 }  }
 #   
 #   Escapes the last element of a full URL.  #   Escapes the last element of a full URL.
 #  
 # Parameters:  
 #    url    - The url to escape.  
 # Returns:  
 #    The url with the last element escaped via lonnet::escape.  
 #  
 sub escape_url {  sub escape_url {
     my ($url)   = @_;      my ($url)   = @_;
     my @urlslices = split(/\//, $url);      my @urlslices = split(/\//, $url);
       my $lastitem = &Apache::lonnet::escape(pop(@urlslices));
     my $lastitem  = $urlslices[scalar(@urlslices) -1];      return join('/',@urlslices).'/'.$lastitem;
     $lastitem     = &Apache::lonnet::escape($lastitem);  
       
     my $escaped_url;  
     for (my $i = 0; $i < scalar(@urlslices) -1; $i++) {  
  $escaped_url .= $urlslices[$i] .'/';  
     }  
     $escaped_url     .= $lastitem ;  
   
     return $escaped_url;  
 }  }
 =pod  =pod
   

Removed from v.1.222  
changed lines
  Added in v.1.223


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