aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-19 20:36:22 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-19 20:36:22 -0700
commit54059b2f153433f7154a754a77dafba1cc97a1a2 (patch)
treea66e5aa65cb598f4bd7ad7550cca7700a68e75ff
parent08a5884c9f39c95200d9895cfc3739e77f07901a (diff)
parentf00887ea42e04caecb9cbc56d92c2e70513768af (diff)
downloadvolse-hubzilla-54059b2f153433f7154a754a77dafba1cc97a1a2.tar.gz
volse-hubzilla-54059b2f153433f7154a754a77dafba1cc97a1a2.tar.bz2
volse-hubzilla-54059b2f153433f7154a754a77dafba1cc97a1a2.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
-rw-r--r--mod/dirsearch.php4
-rw-r--r--mod/pubsites.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/mod/dirsearch.php b/mod/dirsearch.php
index ec730b28d..937564a79 100644
--- a/mod/dirsearch.php
+++ b/mod/dirsearch.php
@@ -436,9 +436,9 @@ function list_public_sites() {
$register = 'closed';
if(strpos($rr['site_url'],'https://') !== false)
- $ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location']);
+ $ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location'], 'project' => $rr['site_project']);
else
- $insecure[] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location']);
+ $insecure[] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage'], 'location' => $rr['site_location'], 'project' => $rr['site_project']);
}
if($insecure) {
$ret['sites'] = array_merge($ret['sites'],$insecure);
diff --git a/mod/pubsites.php b/mod/pubsites.php
index 62990c70c..726c681fa 100644
--- a/mod/pubsites.php
+++ b/mod/pubsites.php
@@ -23,12 +23,12 @@ function pubsites_content(&$a) {
$j = json_decode($ret['body'],true);
if($j) {
$rate_meta = ((local_channel()) ? '<td>' . t('Rate this hub') . '</td>' : '');
- $o .= '<table border="1"><tr><td>' . t('Site URL') . '</td><td>' . t('Access Type') . '</td><td>' . t('Registration Policy') . '</td><td>' . t('Location') . '</td><td>' . t('View hub ratings') . '</td>' . $rate_meta . '</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><td>' . t('Project') . '</td><td>' . t('View hub ratings') . '</td>' . $rate_meta . '</tr>';
if($j['sites']) {
foreach($j['sites'] as $jj) {
$host = strtolower(substr($jj['url'],strpos($jj['url'],'://')+3));
$rate_links = ((local_channel()) ? '<td><a href="rate?f=&target=' . $host . '" class="btn-btn-default"><i class="icon-check"></i> ' . t('Rate') . '</a></td>' : '');
- $o .= '<tr><td>' . '<a href="'. (($jj['sellpage']) ? $jj['sellpage'] : $jj['url'] . '/register' ) . '" >' . $jj['url'] . '</a>' . '</td><td>' . $jj['access'] . '</td><td>' . $jj['register'] . '</td><td>' . $jj['location'] . '</td><td><a href="ratings/' . $host . '" class="btn-btn-default"><i class="icon-eye-open"></i> ' . t('View ratings') . '</a></td>' . $rate_links . '</tr>';
+ $o .= '<tr><td>' . '<a href="'. (($jj['sellpage']) ? $jj['sellpage'] : $jj['url'] . '/register' ) . '" >' . $jj['url'] . '</a>' . '</td><td>' . $jj['access'] . '</td><td>' . $jj['register'] . '</td><td>' . $jj['location'] . '</td><td>' . $jj['project'] . '</td><td><a href="ratings/' . $host . '" class="btn-btn-default"><i class="icon-eye-open"></i> ' . t('View ratings') . '</a></td>' . $rate_links . '</tr>';
}
}