}
- 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
// 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;
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) {
$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);
}