From d84b17a65a80d5e6f5eae7b8bf23be339df8ec1f Mon Sep 17 00:00:00 2001
From: Michael Ang <mang@archive.org>
Date: Wed, 10 Feb 2010 00:40:10 +0000
Subject: [PATCH] Fix bustage in server and base URL calculations.  See
 https://bugs.edge.launchpad.net/bookreader/+bug/517424

---
 BookReaderIA/inc/BookReader.inc         | 6 +++---
 BookReaderIA/www/BookReaderJSLocate.php | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/BookReaderIA/inc/BookReader.inc b/BookReaderIA/inc/BookReader.inc
index 16e4615..4bfcbd7 100644
--- a/BookReaderIA/inc/BookReader.inc
+++ b/BookReaderIA/inc/BookReader.inc
@@ -165,7 +165,7 @@ class BookReader
   }
 
   
-  public static function adjustToHome($server)
+  public static function serverBaseURL($server)
   {
     // Check if we're on a dev vhost and point to JSIA in the user's public_html
     // on the datanode
@@ -175,7 +175,7 @@ class BookReader
       //     so we enable it only for known hosts
       $devhosts = array('mang', 'testflip', 'rkumar');
       if (in_array($match[1], $devhosts)) {
-        $serverBaseURL = $serverBaseURL . "/~" . $match[1];
+        $server = $server . "/~" . $match[1];
       }
     }
     return $server;
@@ -184,7 +184,7 @@ class BookReader
   
   public static function jsMetadataURL($server, $identifier, $mainDir, $subPrefix = '')
   {
-    $serverBaseURL = BookReader::adjustToHome($server);
+    $serverBaseURL = BookReader::serverBaseURL($server);
 
     $params = array( 'id' => $identifier, 'itemPath' => $mainDir, 'server' => $server );
     if ($subPrefix) {
diff --git a/BookReaderIA/www/BookReaderJSLocate.php b/BookReaderIA/www/BookReaderJSLocate.php
index 412c681..c71ffeb 100644
--- a/BookReaderIA/www/BookReaderJSLocate.php
+++ b/BookReaderIA/www/BookReaderJSLocate.php
@@ -32,9 +32,10 @@ $locator      = new Locator();
 
 $results = $locator->locateUDP($id, 1, false);
 
-$serverBaseURL = BookReader::adjustToHome($results[0][0]);
+$server = $results[0][0];
+$serverBaseURL = BookReader::serverBaseURL($server);
 
-$url = "http://{$vhost}/BookReader/BookReaderJSIA.php?id=" . urlencode($id) . "&itemPath={$results[0][1]}&server={$server}";
+$url = "http://{$serverBaseURL}/BookReader/BookReaderJSIA.php?id=" . urlencode($id) . "&itemPath={$results[0][1]}&server={$server}";
 if ($book) {
     $url .= "&subPrefix=" . urlencode($book);
 }
-- 
2.20.1