[php-blog-cvs] serendipity serendipity_admin_image_selector.php,1.9,1.10 serendipity_admin_images.inc.php,1.10,1.11 serendipity_functions.inc.php,1.112,1.113

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv24881

Modified Files:
	serendipity_admin_image_selector.php 
	serendipity_admin_images.inc.php serendipity_functions.inc.php 
Log Message:
o Fixed a parse error in serendipity_admin_image_selector
o Fixed a quote-sign in serendipity_admin_images.inc.php
o Exit-Callback Function now also catches links with any tags before the
'href'. '<a class="..." href="...">' did not work before.
o Fixed the entry-id-link in the comments RSS-Feed


Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_admin_image_selector.php	5 Aug 2003 14:07:40 -0000	1.9
+++ serendipity_admin_image_selector.php	8 Aug 2003 10:00:18 -0000	1.10
@@ -58,7 +58,7 @@
         // Display thumbnails
 ?>
         <td height="<?php echo $serendipity['thumbSize']; ?>" align="center" valign="middle">
-            <a href="?serendipity[step]=1&amp;serendipity[image]="<?php echo $files[$x]; ?>">
+            <a href="?serendipity[step]=1&amp;serendipity[image]=<?php echo $files[$x]; ?>">
                 <img src="<?php echo $imgsrc; ?>" hspace="15" border="0" />
             </a>
         </td>

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_admin_images.inc.php	5 Aug 2003 14:07:40 -0000	1.10
+++ serendipity_admin_images.inc.php	8 Aug 2003 10:00:19 -0000	1.11
@@ -125,7 +125,7 @@
             if ( @unlink($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file) ) {
                 printf(DELETE_IMAGE . '<br />', $file);
             } else {
-                printf(DELETE_IMAGE_FAIL . '<br />' $file);
+                printf(DELETE_IMAGE_FAIL . '<br />', $file);
             }
 
             if ( @unlink($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $fThumb) ) {

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- serendipity_functions.inc.php	5 Aug 2003 14:07:40 -0000	1.112
+++ serendipity_functions.inc.php	8 Aug 2003 10:00:20 -0000	1.113
@@ -611,6 +611,7 @@
                     co.*,
                     co.author AS username,
                     e.title,
+                    e.id AS entryid,
                     c.category_name
               FROM
                     ({$serendipity['dbPrefix']}comments co
@@ -857,7 +858,7 @@
 
     if ($version == '0.91' || $version == '2.0' && is_array($entries)) {
         foreach ($entries as $entry) {
-            $guid = serendipity_archiveURL($entry['id'], $entry['title']);
+            $guid = serendipity_archiveURL(($entry['entryid'] != '' ? $entry['entryid'] : $entry['id']), $entry['title']);
             if ($comments == true) {
                 // Display username as part of the title for easier feed-readability
                 $entry['title'] = $entry['username'] . ': ' . $entry['title'];
@@ -1039,7 +1040,7 @@
         $serendipity['encodeExitsCallback_entry_id'] = $entry_id;
 
         $ret = preg_replace_callback(
-          "#<a href=(\"|')http://([^\"']+)(\"|')#im",
+          "#<a(.*)href=(\"|')http://([^\"']+)(\"|')#im",
           'serendipity_encodeExitsCallback',
           $ret
         );
@@ -1059,11 +1060,12 @@
     global $serendipity;
     
     $entry_id = $serendipity['encodeExitsCallback_entry_id'];
-    $url      = 'http://' . $buffer[2];
+    $url      = 'http://' . $buffer[3];
     
     return sprintf(
-        '<a href="%sexit.php?url=%s%s" title="%s" onMouseOver="window.status=\'%s\';return true;" onMouseOut="window.status=\'\';return true;"',
-        $serendipity['baseURL'],
+        '<a%shref="%sexit.php?url=%s%s" title="%s" onMouseOver="window.status=\'%s\';return true;" onMouseOut="window.status=\'\';return true;"',
+        $buffer[1],
+        $serendipity['serendipityHTTPPath'],
         base64_encode($url),
         ($entry_id != 0) ? '&amp;entry_id=' . $entry_id : '',
         $url,