From 2035a5dd763f7524cdc1a678b0e8dbca94f270f5 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 30 Oct 2013 01:58:45 -0700
Subject: allow zot public providers to list their location, as a non US-based
 server could be a strong selling point.

---
 mod/dirsearch.php | 2 +-
 mod/pubsites.php  | 7 +++++--
 mod/zfinger.php   | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'mod')

diff --git a/mod/dirsearch.php b/mod/dirsearch.php
index 115bc2235..66f9a6f4c 100644
--- a/mod/dirsearch.php
+++ b/mod/dirsearch.php
@@ -242,7 +242,7 @@ function list_public_sites() {
 			else
 				$register = 'closed';
 
-			$ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage']);
+			$ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location']);
 		}
 	}
 	return $ret;
diff --git a/mod/pubsites.php b/mod/pubsites.php
index 9728d0704..78b107229 100644
--- a/mod/pubsites.php
+++ b/mod/pubsites.php
@@ -21,13 +21,16 @@ function pubsites_content(&$a) {
 
 	$o .= '<h1>' . t('Public Sites') . '</h1>';
 
+	$o .= '<div class="descriptive-text">' . 
+		t('The listed sites allow public registration. Some may require subscription or provide tiered service plans. The provider links may provide additional details.') . '</div>' . EOL;
+
 	$ret = z_fetch_url($url);
 	if($ret['success']) {
 		$j = json_decode($ret['body'],true);
 		if($j) {
-			$o .= '<table border="1"><tr><td>' . t('Site URL') . '</td><td>' . t('Access Type') . '</td><td>' . t('Registration Policy') . '</td></tr>';
+			$o .= '<table border="1"><tr><td>' . t('Site URL') . '</td><td>' . t('Access Type') . '</td><td>' . t('Registration Policy') . '</td><td>' . t('Location') . '</td></tr>';
 			foreach($j['sites'] as $jj) {
-				$o .= '<tr><td>' . '<a href="'. (($jj['sellpage']) ? $jj['sellpage'] : $jj['url']) . '" >' . $jj['url'] . '</a>' . '</td><td>' . $jj['access'] . '</td><td>' . $jj['register'] . '</td></tr>';
+				$o .= '<tr><td>' . '<a href="'. (($jj['sellpage']) ? $jj['sellpage'] : $jj['url']) . '" >' . $jj['url'] . '</a>' . '</td><td>' . $jj['access'] . '</td><td>' . $jj['register'] . '</td><td>' . $jj['location'] . '</td></tr>';
 			}
 	
 			$o .= '</table>';
diff --git a/mod/zfinger.php b/mod/zfinger.php
index 3671da56e..59cef5549 100644
--- a/mod/zfinger.php
+++ b/mod/zfinger.php
@@ -248,6 +248,7 @@ function zfinger_init(&$a) {
 		$ret['site']['sitehash'] = get_config('system','location_hash');
 		$ret['site']['sitename'] = get_config('system','sitename');
 		$ret['site']['sellpage'] = get_config('system','sellpage');
+		$ret['site']['location'] = get_config('system','site_location');
 
 	}
 	json_return_and_die($ret);
-- 
cgit v1.2.3