[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.54,1.55

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

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

Modified Files:
	stdlib.php 
Log Message:
Cleaned up the external URL link icon code a bit.


Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** stdlib.php	2001/12/06 18:29:15	1.54
--- stdlib.php	2001/12/06 19:15:05	1.55
***************
*** 102,153 ****
  }
     
!    function LinkURL($url, $linktext='') {
!       // FIXME: Is this needed (or sufficient?)
!       if(ereg("[<>\"]", $url)) {
!           return Element('strong',
!                          QElement('u', array('class' => 'baduri'),
!                                   'BAD URL -- remove all of <, >, "')); //"
!       }
  
!       if (empty($linktext)) {
!           $linktext = $url;
!           $class = 'rawurl';
!       }
!       else {
!           $class = 'namedurl';
!       }
  
!       if (!defined('USE_LINK_ICONS')) {
!           return QElement('a',
!                      array('href' => $url, 'class' => $class),
!                      $linktext);
!       } else {
!           //ideally the link image would be specified by a map file
!           //similar to the interwiki.map
!           $linkproto = substr($url, 0, strrpos($url, ":"));
!           switch($linkproto) {
!           case "mailto":
!               $linkimg = "/images/mailto.png";
!               break;
!           case "http":
!               $linkimg = "/images/http.png";
!               break;
!           case "https":
!               $linkimg = "/images/https.png";
!               break;
!           case "ftp":
!               $linkimg = "/images/ftp.png";
!               break;
!           default:
!               $linkimg = "/images/http.png";
!               break;
!           }
!       return Element('a',
!                      array('href' => $url, 'class' => $class),
!                      Element('img', array('src' => DATA_PATH . $linkimg,
!                                           'alt' => $linkproto))
!                      . $linktext);
!       }
!    }
  
  function LinkWikiWord($wikiword, $linktext='') {
--- 102,137 ----
  }
     
! function LinkURL($url, $linktext = '') {
!     // FIXME: Is this needed (or sufficient?)
!     if(ereg("[<>\"]", $url)) {
!         return Element('strong',
!                        QElement('u', array('class' => 'baduri'),
!                                 _('BAD URL -- remove all of <, >, "'))); //"
!     }
  
!     $attr['href'] = $url;
  
!     if (empty($linktext)) {
!         $linktext = $url;
!         $attr['class'] = 'rawurl';
!     }
!     else {
!         $attr['class'] = 'namedurl';
!     }
!     $linktext = htmlspecialchars($linktext);
!       
!     $linkproto = substr($url, 0, strpos($url, ":"));
!     $ICONS = &$GLOBALS['URL_LINK_ICONS'];
!       
!     $linkimg = isset($ICONS[$linkproto]) ? $ICONS[$linkproto] : $ICONS['*'];
!     if (!empty($linkimg)) {
!         $imgtag = Element('img', array('src' => DataURL($linkimg),
!                                        'alt' => $linkproto,
!                                        'class' => 'linkicon'));
!         $linktext = $imgtag . $linktext;
!     }
! 
!     return Element('a', $attr, $linktext);
! }
  
  function LinkWikiWord($wikiword, $linktext='') {