aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/chat.php6
-rw-r--r--mod/cover_photo.php2
-rwxr-xr-xmod/events.php4
-rw-r--r--mod/filestorage.php2
-rw-r--r--mod/item.php2
-rw-r--r--mod/mitem.php2
-rw-r--r--mod/photos.php4
-rw-r--r--mod/pubsites.php23
-rw-r--r--mod/rpost.php2
-rw-r--r--mod/settings.php4
-rw-r--r--mod/thing.php4
11 files changed, 31 insertions, 24 deletions
diff --git a/mod/chat.php b/mod/chat.php
index 79a5c050b..f219bde73 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -54,7 +54,7 @@ function chat_post(&$a) {
goaway(z_root() . '/chat/' . $channel['channel_address']);
}
- $acl = new AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
$acl->set_from_array($_REQUEST);
$arr = $acl->get();
@@ -162,7 +162,7 @@ function chat_content(&$a) {
intval($a->profile['profile_uid'])
);
if($x) {
- $acl = new AccessList(false);
+ $acl = new Zotlabs\Access\AccessList(false);
$acl->set($x[0]);
$private = $acl->is_private();
@@ -199,7 +199,7 @@ function chat_content(&$a) {
if(local_channel() && argc() > 2 && argv(2) === 'new') {
- $acl = new AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
$channel_acl = $acl->get();
require_once('include/acl_selectors.php');
diff --git a/mod/cover_photo.php b/mod/cover_photo.php
index de11857b0..9c99859ea 100644
--- a/mod/cover_photo.php
+++ b/mod/cover_photo.php
@@ -239,7 +239,7 @@ function send_cover_photo_activity($channel,$photo,$profile) {
$arr['body'] = sprintf($t,$channel['channel_name'],$ptext) . "\n\n" . $ltext;
- $acl = new AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
$x = $acl->get();
$arr['allow_cid'] = $x['allow_cid'];
diff --git a/mod/events.php b/mod/events.php
index ed9f0f2e3..b07ffa184 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -118,7 +118,7 @@ function events_post(&$a) {
$channel = $a->get_channel();
- $acl = new AccessList(false);
+ $acl = new Zotlabs\Access\AccessList(false);
if($event_id) {
$x = q("select * from event where id = %d and uid = %d limit 1",
@@ -422,7 +422,7 @@ function events_content(&$a) {
require_once('include/acl_selectors.php');
- $acl = new AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
$perm_defaults = $acl->get();
$tpl = get_markup_template('event_form.tpl');
diff --git a/mod/filestorage.php b/mod/filestorage.php
index 7ba8c1801..753300e89 100644
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -30,7 +30,7 @@ function filestorage_post(&$a) {
$channel = $a->get_channel();
- $acl = new AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
$acl->set_from_array($_REQUEST);
$x = $acl->get();
diff --git a/mod/item.php b/mod/item.php
index d861967a9..f23bff3ac 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -310,7 +310,7 @@ function item_post(&$a) {
}
}
- $acl = new AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
$public_policy = ((x($_REQUEST,'public_policy')) ? escape_tags($_REQUEST['public_policy']) : map_scope($channel['channel_r_stream'],true));
diff --git a/mod/mitem.php b/mod/mitem.php
index d6572bd56..7f582c649 100644
--- a/mod/mitem.php
+++ b/mod/mitem.php
@@ -127,7 +127,7 @@ function mitem_content(&$a) {
$menu_names[] = $menus['menu_name'];
}
- $acl = new AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
$lockstate = (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock');
diff --git a/mod/photos.php b/mod/photos.php
index 944686637..8f44f01b2 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -85,7 +85,7 @@ function photos_post(&$a) {
$owner_record = $s[0];
- $acl = new AccessList($a->data['channel']);
+ $acl = new Zotlabs\Access\AccessList($a->data['channel']);
if((argc() > 3) && (argv(2) === 'album')) {
@@ -595,7 +595,7 @@ function photos_content(&$a) {
if($_is_owner) {
$channel = $a->get_channel();
- $acl = new AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
$channel_acl = $acl->get();
$lockstate = (($acl->is_private()) ? 'lock' : 'unlock');
diff --git a/mod/pubsites.php b/mod/pubsites.php
index ae8601366..f401e301d 100644
--- a/mod/pubsites.php
+++ b/mod/pubsites.php
@@ -13,30 +13,37 @@ function pubsites_content(&$a) {
}
$url .= '/sites';
- $o .= '<div class="generic-content-wrapper-styled">';
+ $o .= '<div class="generic-content-wrapper">';
- $o .= '<h1>' . t('Public Sites') . '</h1>';
+ $o .= '<div class="section-title-wrapper"><h2>' . t('Public Hubs') . '</h2></div>';
- $o .= '<div class="descriptive-text">' .
- t('The listed sites allow public registration for the $Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details.') . '</div>' . EOL;
+ $o .= '<div class="section-content-tools-wrapper"><div class="descriptive-text">' .
+ t('The listed hubs allow public registration for the $Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The hub <strong>may</strong> provide additional details.') . '</div>' . EOL;
$ret = z_fetch_url($url);
if($ret['success']) {
$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('Project') . '</td><td>' . t('View hub ratings') . '</td>' . $rate_meta . '</tr>';
+ $o .= '<table class="table table-striped table-hover"><tr><td>' . t('Hub URL') . '</td><td>' . t('Access Type') . ' / ' . '<br />' . t('Registration Policy') . '</td><td>' . t('Project') . '</td><td colspan="2">' . t('Ratings') . '</td></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>' . $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>';
+ $location = '';
+ if(!empty($jj['location'])) {
+ $location = '<p title="' . t('Location') . '" style="margin: 5px 5px 0 0; text-align: right"><i class="icon-globe"></i> ' . $jj['location'] . '</p>';
+ }
+ else {
+ $location = '<br />&nbsp;';
+ }
+ $urltext = str_replace(array('https://'), '', $jj['url']);
+ $o .= '<tr><td><a href="'. (($jj['sellpage']) ? $jj['sellpage'] : $jj['url'] . '/register' ) . '" ><i class="icon-link"></i> ' . $urltext . '</a>' . $location . '</td><td>' . $jj['access'] . ' / ' . $jj['register'] . '</td><td>' . $jj['project'] . '</td><td><a href="ratings/' . $host . '" class="btn-btn-default"><i class="icon-eye-open"></i> ' . t('View') . '</a></td>' . $rate_links . '</tr>';
}
}
$o .= '</table>';
- $o .= '</div>';
+ $o .= '</div></div>';
}
}
diff --git a/mod/rpost.php b/mod/rpost.php
index ab5ef4ccd..915b1ca96 100644
--- a/mod/rpost.php
+++ b/mod/rpost.php
@@ -95,7 +95,7 @@ function rpost_content(&$a) {
$channel = $a->get_channel();
- $acl = new AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
$channel_acl = $acl->get();
diff --git a/mod/settings.php b/mod/settings.php
index 2f90b037f..a6655f46a 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -323,7 +323,7 @@ function settings_post(&$a) {
foreach($global_perms as $k => $v) {
$set_perms .= ', ' . $v[0] . ' = ' . intval($_POST[$k]) . ' ';
}
- $acl = new AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
$acl->set_from_array($_POST);
$x = $acl->get();
@@ -1002,7 +1002,7 @@ function settings_content(&$a) {
$stpl = get_markup_template('settings.tpl');
- $acl = new AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
$perm_defaults = $acl->get();
require_once('include/group.php');
diff --git a/mod/thing.php b/mod/thing.php
index 7c5020e62..7e7d1bdc7 100644
--- a/mod/thing.php
+++ b/mod/thing.php
@@ -65,7 +65,7 @@ function thing_init(&$a) {
if((! $name) || (! $translated_verb))
return;
- $acl = new AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
if(array_key_exists('contact_allow',$_REQUEST)
|| array_key_exists('group_allow',$_REQUEST)
@@ -271,7 +271,7 @@ function thing_content(&$a) {
return;
}
- $acl = new AccessList($channel);
+ $acl = new Zotlabs\Access\AccessList($channel);
$channel_acl = $acl->get();
$lockstate = (($acl->is_private()) ? 'lock' : 'unlock');