[php-blog-cvs] serendipity/plugins/serendipity_event_trackexits serendipity_event_trackexits.php,1.15,1.16

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19031/plugins/serendipity_event_trackexits

Modified Files:
	serendipity_event_trackexits.php 
Log Message:
more fixes for https links and wrongly exit rewritten links


Index: serendipity_event_trackexits.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits/serendipity_event_trackexits.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_event_trackexits.php	19 Nov 2004 11:24:59 -0000	1.15
+++ serendipity_event_trackexits.php	25 Nov 2004 15:19:20 -0000	1.16
@@ -129,7 +129,7 @@
                             $element = $temp['element'];
 
                             $eventData[$element] = preg_replace_callback(
-                                "#<a(.*)href=(\"|')http://([^\"']+)(\"|')#isUm",
+                                "#<a(.*)href=(\"|')http(s?)://([^\"']+)(\"|')#isUm",
                                 array($this, '_encodeExitsCallback'),
                                 $eventData[$element]
                             );
@@ -180,13 +180,13 @@
         global $serendipity;
 
         $entry_id = $serendipity['encodeExitsCallback_entry_id'];
-        $url      = 'http://' . $buffer[3];
+        $url      = 'http' . $buffer[3] . '://' . $buffer[4];
 
         if ($url_only) {
             return sprintf(
                 '%sexit.php?url=%s%s',
                 $serendipity['baseURL'],
-                base64_encode($buffer[3]),
+                base64_encode($buffer[4]),
                 ($entry_id != 0) ? '&amp;entry_id=' . $entry_id : ''
             );
         }