harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dav: throw exception if channel for requested DAV directory is deleted

Browse Source
This commit is contained in:
friendica
2014-01-15 03:12:47 -08:00
parent 362e4060e1
commit 47b8071ca7
7 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/events.php
+1 -2
View File
@@ -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,
mod/page.php
+2 -2
View File
@@ -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
mod/pubsites.php
+4 -2
View File
@@ -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>';