From 0bfb6314dfd917ab5e1ab37a654821f9db22f7fb Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 7 Jun 2011 22:47:15 -0700 Subject: [PATCH 1/2] default uploaded photo permissions were wrong --- mod/wall_upload.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mod/wall_upload.php b/mod/wall_upload.php index bd6b805622..dd2197d7cd 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -76,7 +76,9 @@ function wall_upload_post(&$a) { $smallest = 0; - $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, '<0>'); + $defperm = '<' . $page_owner_uid . '>'; + + $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm); if(! $r) { echo ( t('Image upload failed.') . EOL); @@ -85,14 +87,14 @@ function wall_upload_post(&$a) { if($width > 640 || $height > 640) { $ph->scaleImage(640); - $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 1, 0, '<0>'); + $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 1, 0, $defperm); if($r) $smallest = 1; } if($width > 320 || $height > 320) { $ph->scaleImage(320); - $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 2, 0, '<0>' ); + $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 2, 0, $defperm); if($r) $smallest = 2; } From a10abd4860ee2e34b197fd7c1bba295cd35c1a9b Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 8 Jun 2011 00:47:00 -0700 Subject: [PATCH 2/2] remove event if attached item is deleted --- mod/item.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mod/item.php b/mod/item.php index 2c8cf256c6..d7c15ff025 100644 --- a/mod/item.php +++ b/mod/item.php @@ -772,6 +772,17 @@ function item_content(&$a) { // ignore the result } + // If item is a link to an event, nuke the event record. + + if(intval($item['event-id'])) { + q("DELETE FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1", + intval($item['event-id']), + intval($item['uid']) + ); + // ignore the result + } + + // If it's the parent of a comment thread, kill all the kids if($item['uri'] == $item['parent-uri']) {