From a1f504b976ab3b1ba8f7b8b52247236c7b062142 Mon Sep 17 00:00:00 2001
From: dairiki <dairiki@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Tue, 4 Mar 2003 01:55:05 +0000
Subject: [PATCH] Fix to ensure absolute URL for logo in RSS recent changes.

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@2691 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/plugin/RecentChanges.php |  9 ++++++---
 lib/stdlib.php               | 30 +++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/lib/plugin/RecentChanges.php b/lib/plugin/RecentChanges.php
index a2a3c1ad6..b1e803433 100644
--- a/lib/plugin/RecentChanges.php
+++ b/lib/plugin/RecentChanges.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: RecentChanges.php,v 1.77 2003-02-27 23:23:38 dairiki Exp $');
+rcs_id('$Id: RecentChanges.php,v 1.78 2003-03-04 01:55:05 dairiki Exp $');
 /**
  Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
 
@@ -499,7 +499,7 @@ extends _RecentChanges_Formatter
     function image_properties () {
         global $Theme;
 
-        $img_url = SERVER_URL . $Theme->getImageURL('logo');
+        $img_url = AbsoluteURL($Theme->getImageURL('logo'));
         if (!$img_url)
             return false;
 
@@ -603,7 +603,7 @@ extends WikiPlugin
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.77 $");
+                            "\$Revision: 1.78 $");
     }
 
     function managesValidators() {
@@ -770,6 +770,9 @@ class DayButtonBar extends HtmlElement {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.77  2003/02/27 23:23:38  dairiki
+// Fix my breakage of CSS and sidebar RecentChanges output.
+//
 // Revision 1.76  2003/02/27 22:48:44  dairiki
 // Fixes invalid HTML generated by PageHistory plugin.
 //
diff --git a/lib/stdlib.php b/lib/stdlib.php
index a0b2f9d42..bb0d4526b 100644
--- a/lib/stdlib.php
+++ b/lib/stdlib.php
@@ -1,4 +1,4 @@
-<?php //rcs_id('$Id: stdlib.php,v 1.144 2003-02-26 00:39:30 dairiki Exp $');
+<?php //rcs_id('$Id: stdlib.php,v 1.145 2003-03-04 01:55:05 dairiki Exp $');
 
 /*
   Standard functions for Wiki functionality
@@ -128,6 +128,30 @@ function WikiURL($pagename, $args = '', $get_abs_url = false) {
     return $url;
 }
 
+/** Convert relative URL to absolute URL.
+ *
+ * This converts a relative URL to one of PhpWiki's support files
+ * to an absolute one.
+ *
+ * @param string $url
+ * @return string Absolute URL
+ */
+function AbsoluteURL ($url) {
+    if (preg_match('/^https?:/', $url))
+        return $url;
+    if ($url[0] != '/') {
+        $base = USE_PATH_INFO ? VIRTUAL_PATH : dirname(SCRIPT_NAME);
+        while ($base != '/' and substr($url, 0, 3) == "../") {
+            $url = substr($url, 3);
+            $base = dirname($base);
+        }
+        if ($base != '/')
+            $base .= '/';
+        $url = $base . $url;
+    }
+    return SERVER_URL . $url;
+}
+
 /**
  * Generates icon in front of links.
  *
@@ -1238,6 +1262,10 @@ class Alert {
                       
         
 // $Log: not supported by cvs2svn $
+// Revision 1.144  2003/02/26 00:39:30  dairiki
+// Bug fix: for magic PhpWiki URLs, "lock page to enable link" message was
+// being displayed at incorrect times.
+//
 // Revision 1.143  2003/02/26 00:10:26  dairiki
 // More/better/different checks for bad page names.
 //
-- 
2.45.0