*** TWiki.pm.orig	Tue Jan  8 12:07:38 2002
--- TWiki.pm	Tue Jan  8 12:08:55 2002
***************
*** 742,748 ****
  
      # inline search renders text, 
      # so prevent linking of external and internal links:
!     $htext =~ s/([\-\*\s])((http|ftp|gopher|news|file|https)\:)/$1<nop>$2/go;
      $htext =~ s/([\s\(])([A-Z]+[a-z0-9]*\.[A-Z]+[a-z]+[A-Z]+[a-zA-Z0-9]*)/$1<nop>$2/go;
      $htext =~ s/([\s\(])([A-Z]+[a-z]+[A-Z]+[a-zA-Z0-9]*)/$1<nop>$2/go;
      $htext =~ s/([\s\(])([A-Z]{3,})/$1<nop>$2/go;
--- 742,748 ----
  
      # inline search renders text, 
      # so prevent linking of external and internal links:
!     $htext =~ s/([\-\*\s])((http|ftp|gopher|news|file|https|telnet)\:)/$1<nop>$2/go;
      $htext =~ s/([\s\(])([A-Z]+[a-z0-9]*\.[A-Z]+[a-z]+[A-Z]+[a-zA-Z0-9]*)/$1<nop>$2/go;
      $htext =~ s/([\s\(])([A-Z]+[a-z]+[A-Z]+[a-zA-Z0-9]*)/$1<nop>$2/go;
      $htext =~ s/([\s\(])([A-Z]{3,})/$1<nop>$2/go;
***************
*** 804,810 ****
      } elsif( $url =~ /^\./ ) {
          # fix relative URL
          $url = "$theHost$theAbsPath/$url";
!     } elsif( $url =~ /^(http|ftp|gopher|news|file|https)\:/ ) {
          # full qualified URL, do nothing
      } elsif( $url ) {
          # FIXME: is this test enough to detect relative URLs?
--- 804,810 ----
      } elsif( $url =~ /^\./ ) {
          # fix relative URL
          $url = "$theHost$theAbsPath/$url";
!     } elsif( $url =~ /^(http|ftp|gopher|news|file|https|telnet)\:/ ) {
          # full qualified URL, do nothing
      } elsif( $url ) {
          # FIXME: is this test enough to detect relative URLs?
***************
*** 1797,1803 ****
      $theLink =~ s/^\s*//o;
      $theLink =~ s/\s*$//o;
  
!     if( $theLink =~ /^(http|ftp|gopher|news|file|https)\:/ ) {
          # found external link
          return "$thePreamble<a href=\"$theLink\" target=\"_top\">$theText</a>";
      }
--- 1797,1803 ----
      $theLink =~ s/^\s*//o;
      $theLink =~ s/\s*$//o;
  
!     if( $theLink =~ /^(http|ftp|gopher|news|file|https|telnet)\:/ ) {
          # found external link
          return "$thePreamble<a href=\"$theLink\" target=\"_top\">$theText</a>";
      }
***************
*** 1957,1963 ****
              s/$TranslationToken(\!\-\-)/\<$1/go;
  
  # Handle embedded URLs
!             s@(^|[\-\*\s])((http|ftp|gopher|news|file|https)\:(\S+[^\s\.,!\?;:]))@&externalLink($1,$2)@geo;
  
  # Entities
              s/&(\w+?)\;/$TranslationToken$1\;/go;      # "&abc;"
--- 1957,1963 ----
              s/$TranslationToken(\!\-\-)/\<$1/go;
  
  # Handle embedded URLs
!             s@(^|[\-\*\s])((http|ftp|gopher|news|file|https|telnet)\:(\S+[^\s\.,!\?;:]))@&externalLink($1,$2)@geo;
  
  # Entities
              s/&(\w+?)\;/$TranslationToken$1\;/go;      # "&abc;"