aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-15 03:12:47 -0800
committerfriendica <info@friendica.com>2014-01-15 03:12:47 -0800
commit47b8071ca7968ea489bd00c0746a2be39d6a6f2d (patch)
tree9c817b18bffb1d4cdedf081a419901fbb1715810 /mod
parent362e4060e19e910a50886b660532dd35fd0385bb (diff)
downloadvolse-hubzilla-47b8071ca7968ea489bd00c0746a2be39d6a6f2d.tar.gz
volse-hubzilla-47b8071ca7968ea489bd00c0746a2be39d6a6f2d.tar.bz2
volse-hubzilla-47b8071ca7968ea489bd00c0746a2be39d6a6f2d.zip
dav: throw exception if channel for requested DAV directory is deleted
Diffstat (limited to 'mod')
-rwxr-xr-xmod/events.php3
-rw-r--r--mod/page.php4
-rw-r--r--mod/pubsites.php6
3 files changed, 7 insertions, 6 deletions
diff --git a/mod/events.php b/mod/events.php
index 5cf0e425b..2a6067e65 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -355,8 +355,7 @@ function events_content(&$a) {
'$new_event'=> array($a->get_baseurl().'/events/new',t('Create New Event'),'',''),
'$previus' => array($a->get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
'$next' => array($a->get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
- '$calendar' => cal($y,$m,$links, ' eventcal'),
-
+ '$calendar' => cal($y,$m,$links, ' eventcal'),
'$events' => $events,
diff --git a/mod/page.php b/mod/page.php
index df17dbf52..56592116f 100644
--- a/mod/page.php
+++ b/mod/page.php
@@ -38,7 +38,7 @@ function page_content(&$a) {
$channel_address = argv(1);
$page_id = argv(2);
-
+dbg(1);
$u = q("select channel_id from channel where channel_address = '%s' limit 1",
dbesc($channel_address)
);
@@ -63,7 +63,7 @@ function page_content(&$a) {
dbesc($page_id),
intval(ITEM_WEBPAGE)
);
-
+dbg(0);
if(! $r) {
// Check again with no permissions clause to see if it is a permissions issue
diff --git a/mod/pubsites.php b/mod/pubsites.php
index c15ba31ac..c08ca2ae5 100644
--- a/mod/pubsites.php
+++ b/mod/pubsites.php
@@ -29,8 +29,10 @@ function pubsites_content(&$a) {
$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><td>' . t('Location') . '</td></tr>';
- foreach($j['sites'] as $jj) {
- $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></tr>';
+ if($j['sites']) {
+ foreach($j['sites'] as $jj) {
+ $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></tr>';
+ }
}
$o .= '</table>';