[phpwiki-checkins] CVS: phpwiki/lib interwiki.map,1.1,1.2 interwiki.php,1.4,1.5

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv28844/lib

Modified Files:
	interwiki.map interwiki.php 
Log Message:
Added new intermap entries from http://usemod.com/intermap.txt.

Also fixed bug: only urlencode "page" name when it's really a
query arg.  (If it's in PATH_INFO, it shouldn't be urlencoded.)


Index: interwiki.map
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.map,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** interwiki.map	2001/02/08 10:29:44	1.1
--- interwiki.map	2001/03/03 19:29:48	1.2
***************
*** 35,37 ****
--- 35,43 ----
  BenefitsWiki http://www.benefitslink.com/cgi-bin/wiki.cgi?
  Why http://clublet.com/c/c/why?
+ SourceForge http://sourceforge.net/
+ MetaWiki http://sunir.org/apps/meta.pl?
+ AcadWiki http://xarch.tu-graz.ac.at/autocad/wiki/
+ CLiki http://www.telent.net/cliki/
  SenseisLibrary http://senseis.xmp.net/?
+ JargonFile http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=
+ WikiPedia http://www.wikipedia.com/wiki.cgi?

Index: interwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** interwiki.php	2001/02/14 22:02:05	1.4
--- interwiki.php	2001/03/03 19:29:48	1.5
***************
*** 27,31 ****
     list( $wiki, $page ) = split( ":", $link, 2 );
  
!    $url = $interwikimap[$wiki] . rawurlencode($page);
  
     if ($linktext)
--- 27,37 ----
     list( $wiki, $page ) = split( ":", $link, 2 );
  
!    $url = $interwikimap[$wiki];
! 
!    // Urlencode page only if it's a query arg.
!    if (strstr($url, '?'))
!       $url .= rawurlencode($page);
!    else
!       $url .= $page;
  
     if ($linktext)