Set a default directory server from a hard-wired list if one was not previously chosen.

4 files changed, 5 insertions, 28 deletions

diff --git a/mod/acl.php b/mod/acl.php
index 9bd1a9eb4..fa399a9b5 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -304,13 +304,7 @@ function navbar_complete(&$a) {
 	if(! $url) {
 		require_once("include/dir_fns.php");
 		$directory = find_upstream_directory($dirmode);
-
-		if($directory) {
-			$url = $directory['url'] . '/dirsearch';
-		}
-		else {
-			$url = DIRECTORY_FALLBACK_MASTER . '/dirsearch';
-		}
+		$url = $directory['url'] . '/dirsearch';
 	}
 
 	if($url) {
diff --git a/mod/directory.php b/mod/directory.php
index 6e0e2e7dc..b11b0d410 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -56,14 +56,9 @@ function directory_content(&$a) {
 	}
 	if(! $url) {
 		$directory = find_upstream_directory($dirmode);
-
-		if($directory) {
-			$url = $directory['url'] . '/dirsearch';
-		}
-		else {
-			$url = DIRECTORY_FALLBACK_MASTER . '/dirsearch';
-		}
+		$url = $directory['url'] . '/dirsearch';
 	}
+
 	logger('mod_directory: URL = ' . $url, LOGGER_DEBUG);
 
 	$contacts = array();
diff --git a/mod/dirprofile.php b/mod/dirprofile.php
index d88144f52..e9b12ada7 100644
--- a/mod/dirprofile.php
+++ b/mod/dirprofile.php
@@ -23,13 +23,7 @@ function dirprofile_init(&$a) {
 	}
 	if(! $url) {
 		$directory = find_upstream_directory($dirmode);
-
-		if($directory) {
-			$url = $directory['url'] . '/dirsearch';
-		}
-		else {
-			$url = DIRECTORY_FALLBACK_MASTER . '/dirsearch';
-		}
+		$url = $directory['url'] . '/dirsearch';
 	}
 	logger('mod_directory: URL = ' . $url, LOGGER_DEBUG);
 
diff --git a/mod/pubsites.php b/mod/pubsites.php
index c08ca2ae5..c31bbcf97 100644
--- a/mod/pubsites.php
+++ b/mod/pubsites.php
@@ -9,13 +9,7 @@ function pubsites_content(&$a) {
 	}
 	if(! $url) {
 		$directory = find_upstream_directory($dirmode);
-
-		if($directory) {
-			$url = $directory['url'] . '/dirsearch';
-		}
-		else {
-			$url = DIRECTORY_FALLBACK_MASTER . '/dirsearch';
-		}
+		$url = $directory['url'] . '/dirsearch';
 	}
 	$url .= '/sites';