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

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2015-01-21 18:34:31 -08:00
commit 0010eaa411
4 changed files with 118 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boot.php
View File

@ -84,7 +84,8 @@ $DIRECTORY_FALLBACK_SERVERS = array(
'https://red.zottel.red', 'https://red.zottel.red',
'https://red.pixelbits.de', 'https://red.pixelbits.de',
'https://my.federated.social', 'https://my.federated.social',
'https://whogotzot.com' 'https://whogotzot.com',
'https://redmatrix.nl'
); );
@ -501,7 +502,6 @@ define ( 'ACTIVITY_FAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
define ( 'ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke' ); define ( 'ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke' );
define ( 'ACTIVITY_MOOD', NAMESPACE_ZOT . '/activity/mood' ); define ( 'ACTIVITY_MOOD', NAMESPACE_ZOT . '/activity/mood' );
define ( 'ACTIVITY_FILE', NAMESPACE_ZOT . '/activity/file' );
define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' ); define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' );
define ( 'ACTIVITY_OBJ_NOTE', NAMESPACE_ACTIVITY_SCHEMA . 'note' ); define ( 'ACTIVITY_OBJ_NOTE', NAMESPACE_ACTIVITY_SCHEMA . 'note' );
@ -515,6 +515,7 @@ define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_ZOT . '/activity/tagterm' );
define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_ZOT . '/activity/profile' ); define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_ZOT . '/activity/profile' );
define ( 'ACTIVITY_OBJ_THING', NAMESPACE_ZOT . '/activity/thing' ); define ( 'ACTIVITY_OBJ_THING', NAMESPACE_ZOT . '/activity/thing' );
define ( 'ACTIVITY_OBJ_LOCATION',NAMESPACE_ZOT . '/activity/location' ); define ( 'ACTIVITY_OBJ_LOCATION',NAMESPACE_ZOT . '/activity/location' );
define ( 'ACTIVITY_OBJ_FILE', NAMESPACE_ZOT . '/activity/file' );
/** /**
* item weight for query ordering * item weight for query ordering

105
include/attach.php
View File

@ -753,7 +753,7 @@ function attach_delete($channel_id, $resource) {
$channel_address = (($c) ? $c[0]['channel_address'] : 'notfound'); $channel_address = (($c) ? $c[0]['channel_address'] : 'notfound');
$r = q("SELECT hash, filename, flags, folder FROM attach WHERE hash = '%s' AND uid = %d limit 1", $r = q("SELECT hash, flags, folder FROM attach WHERE hash = '%s' AND uid = %d limit 1",
dbesc($resource), dbesc($resource),
intval($channel_id) intval($channel_id)
); );
@ -762,8 +762,6 @@ function attach_delete($channel_id, $resource) {
if(! $r) if(! $r)
return; return;
$url = get_parent_cloudpath($channel_id, $channel_address, $resource) . $r[0]['filename'];
// If resource is a directory delete everything in the directory recursive // If resource is a directory delete everything in the directory recursive
if($r[0]['flags'] & ATTACH_FLAG_DIR) { if($r[0]['flags'] & ATTACH_FLAG_DIR) {
$x = q("SELECT hash, flags FROM attach WHERE folder = '%s' AND uid = %d", $x = q("SELECT hash, flags FROM attach WHERE folder = '%s' AND uid = %d",
@ -806,7 +804,7 @@ function attach_delete($channel_id, $resource) {
intval($channel_id) intval($channel_id)
); );
file_activity($channel_id, $resource, $allow_cid='', $allow_gid='', $deny_cid='', $deny_gid='', $url, 'drop', $no_activity=false); file_activity($channel_id, $resource, $cloudpath='', $allow_cid='', $allow_gid='', $deny_cid='', $deny_gid='', 'drop', $no_activity=false);
} }
/** /**
@ -942,32 +940,76 @@ function pipe_streams($in, $out) {
return $size; return $size;
} }
function file_activity($channel_id, $hash, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $url, $action, $no_activity) { function file_activity($channel_id, $hash, $cloudpath, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $verb, $no_activity) {
require_once('include/items.php'); require_once('include/items.php');
$url = rawurlencode($url);
$poster = get_app()->get_observer(); $poster = get_app()->get_observer();
$verb = ACTIVITY_FILE . '/' . $action . '/' . $hash; switch($verb) {
case 'post':
$activity = ACTIVITY_POST;
$x = q("SELECT creator, filename, filetype, filesize, revision, folder, flags, created, edited FROM attach WHERE uid = %d AND hash = '%s' LIMIT 1",
intval($channel_id),
dbesc($hash)
);
break;
case 'drop':
$activity = ACTIVITY_UPDATE;
break;
default:
return;
break;
}
$url = (($cloudpath && $x[0]['filename']) ? rawurlencode($cloudpath . $x[0]['filename']) : 'unavailable');
$mid = item_message_id(); $mid = item_message_id();
$item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_UNSEEN; $item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_UNSEEN;
if($action == 'post') { $links = array(
//check if activity item exists 'rel' => 'alternate',
//if yes send drop activity and create a new one 'type' => 'text/html',
'href' => $url
$r = q("SELECT * FROM item WHERE verb = '%s'",
dbesc($verb)
); );
if($r) { $objtype = ACTIVITY_OBJ_FILE;
$object = array(
'type' => ACTIVITY_OBJ_FILE,
'title' => (($x[0]['filename']) ? $x[0]['filename'] : 'unavailable'),
'id' => $url,
'link' => $links,
'hash' => $hash,
'creator' => (($x[0]['creator']) ? $x[0]['creator'] : ''),
'filename' => (($x[0]['filename']) ? $x[0]['filename'] : ''),
'filetype' => (($x[0]['filetype']) ? $x[0]['filetype'] : ''),
'filesize' => (($x[0]['filesize']) ? $x[0]['filesize'] : ''),
'revision' => (($x[0]['revision']) ? $x[0]['revision'] : ''),
'folder' => (($x[0]['folder']) ? $x[0]['folder'] : ''),
'flags' => (($x[0]['flags']) ? $x[0]['flags'] : ''),
'created' => (($x[0]['created']) ? $x[0]['created'] : ''),
'edited' => (($x[0]['edited']) ? $x[0]['edited'] : '')
);
$private = (($allow_cid || $allow_gid || $deny_cid || $deny_gid) ? 1 : 0);
if($verb == 'post') {
//check if activity item exists
//if yes send update (drop) activity and create a new one
$y = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND object LIKE '%s'",
dbesc(ACTIVITY_POST),
dbesc(ACTIVITY_OBJ_FILE),
dbesc('%"hash":"' . $hash . '"%')
);
if($y) {
$dmid = item_message_id(); $dmid = item_message_id();
$updateverb = ACTIVITY_FILE . '/drop/' . $hash . '#' . $mid;
$object['mid'] = $mid; //attach mid for update object
$arr = array(); $arr = array();
@ -979,14 +1021,17 @@ function file_activity($channel_id, $hash, $allow_cid, $allow_gid, $deny_cid, $d
$arr['author_xchan'] = $poster['xchan_hash']; $arr['author_xchan'] = $poster['xchan_hash'];
$arr['owner_xchan'] = $poster['xchan_hash']; $arr['owner_xchan'] = $poster['xchan_hash'];
$arr['title'] = ''; $arr['title'] = '';
$arr['allow_cid'] = $allow_cid; //updates must be visible to everybody -> perms may have changed
$arr['allow_gid'] = $allow_gid; $arr['allow_cid'] = '';
$arr['deny_cid'] = $deny_cid; $arr['allow_gid'] = '';
$arr['deny_gid'] = $deny_gid; $arr['deny_cid'] = '';
$arr['deny_gid'] = '';
$arr['item_restrict'] = ITEM_HIDDEN; $arr['item_restrict'] = ITEM_HIDDEN;
$arr['item_private'] = 0; $arr['item_private'] = 0;
$arr['verb'] = $updateverb; $arr['verb'] = ACTIVITY_UPDATE;
$arr['body'] = $url; $arr['obj_type'] = $objtype;
$arr['object'] = json_encode($object);
$arr['body'] = '';
$post = item_store($arr); $post = item_store($arr);
$item_id = $post['item_id']; $item_id = $post['item_id'];
@ -995,7 +1040,9 @@ function file_activity($channel_id, $hash, $allow_cid, $allow_gid, $deny_cid, $d
proc_run('php',"include/notifier.php","activity",$item_id); proc_run('php',"include/notifier.php","activity",$item_id);
} }
//call_hooks('post_local_end', $arr); call_hooks('post_local_end', $arr);
unset($object['mid']); //remove mid for new object
//notice( t('File activity updated') . EOL); //notice( t('File activity updated') . EOL);
@ -1025,9 +1072,11 @@ function file_activity($channel_id, $hash, $allow_cid, $allow_gid, $deny_cid, $d
$arr['deny_cid'] = $deny_cid; $arr['deny_cid'] = $deny_cid;
$arr['deny_gid'] = $deny_gid; $arr['deny_gid'] = $deny_gid;
$arr['item_restrict'] = ITEM_HIDDEN; $arr['item_restrict'] = ITEM_HIDDEN;
$arr['item_private'] = 0; $arr['item_private'] = $private;
$arr['verb'] = $verb; $arr['verb'] = $activity;
$arr['body'] = $url; $arr['obj_type'] = $objtype;
$arr['object'] = json_encode($object);
$arr['body'] = '';
$post = item_store($arr); $post = item_store($arr);
$item_id = $post['item_id']; $item_id = $post['item_id'];
@ -1036,9 +1085,9 @@ function file_activity($channel_id, $hash, $allow_cid, $allow_gid, $deny_cid, $d
proc_run('php',"include/notifier.php","activity",$item_id); proc_run('php',"include/notifier.php","activity",$item_id);
} }
//call_hooks('post_local_end', $arr); call_hooks('post_local_end', $arr);
//(($action === 'post') ? notice( t('File activity posted') . EOL) : notice( t('File activity dropped') . EOL)); //(($verb === 'post') ? notice( t('File activity posted') . EOL) : notice( t('File activity dropped') . EOL));
return; return;

6
mod/filestorage.php
View File

@ -21,7 +21,6 @@ function filestorage_post(&$a) {
$recurse = ((x($_POST, 'recurse')) ? intval($_POST['recurse']) : 0); $recurse = ((x($_POST, 'recurse')) ? intval($_POST['recurse']) : 0);
$resource = ((x($_POST, 'filehash')) ? notags($_POST['filehash']) : ''); $resource = ((x($_POST, 'filehash')) ? notags($_POST['filehash']) : '');
$no_activity = ((x($_POST, 'no_activity')) ? intval($_POST['no_activity']) : 0); $no_activity = ((x($_POST, 'no_activity')) ? intval($_POST['no_activity']) : 0);
if(! $resource) { if(! $resource) {
@ -40,10 +39,7 @@ function filestorage_post(&$a) {
$channel = $a->get_channel(); $channel = $a->get_channel();
$cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource); $cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource);
$filename = find_filename_by_hash($channel_id, $resource); file_activity($channel_id, $resource, $cloudPath, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, 'post', $no_activity);
$url = $cloudPath . $filename;
file_activity($channel_id, $resource, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $url, 'post', $no_activity);
goaway($cloudPath); goaway($cloudPath);
} }

62
mod/sharedwithme.php
View File

@ -1,5 +1,4 @@
<?php <?php
require_once('include/text.php');
require_once('include/conversation.php'); require_once('include/conversation.php');
function sharedwithme_content(&$a) { function sharedwithme_content(&$a) {
@ -12,12 +11,10 @@ function sharedwithme_content(&$a) {
$is_owner = (local_user() && (local_user() == $channel['channel_id'])); $is_owner = (local_user() && (local_user() == $channel['channel_id']));
$postverb = ACTIVITY_FILE . '/post/';
$dropverb = ACTIVITY_FILE . '/drop/';
//maintenance - see if a file got dropped and remove it systemwide //maintenance - see if a file got dropped and remove it systemwide
$x = q("SELECT * FROM item WHERE verb LIKE '%s' AND uid = %d", $x = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d",
dbesc($dropverb . '%'), dbesc(ACTIVITY_UPDATE),
dbesc(ACTIVITY_OBJ_FILE),
intval(local_user()) intval(local_user())
); );
@ -25,25 +22,33 @@ function sharedwithme_content(&$a) {
foreach($x as $xx) { foreach($x as $xx) {
$hash = substr($xx['verb'], 39); $object = json_decode($xx['object'],true);
$hash = $object['hash'];
$update = strpos($hash, '#'); //If object has a mid it's an update - the inlcuded mid is the latest and should not be removed
$update = (($object['mid']) ? true : false);
if($update === false) { if($update) {
q("DELETE FROM item WHERE verb = '%s' OR verb = '%s'",
dbesc($postverb . $hash), $mid = $object['mid'];
dbesc($dropverb . $hash)
$y = q("DELETE FROM item WHERE (mid != '%s' AND obj_type = '%s' AND object LIKE '%s') AND (verb = '%s' OR verb = '%s')",
dbesc($mid),
dbesc(ACTIVITY_OBJ_FILE),
dbesc('%"hash":"' . $hash . '"%'),
dbesc(ACTIVITY_POST),
dbesc(ACTIVITY_UPDATE)
); );
} }
else { else {
$arr = explode('#', $hash); $z = q("DELETE FROM item WHERE (obj_type = '%s' AND object LIKE '%s') AND (verb = '%s' OR verb = '%s')",
dbesc(ACTIVITY_OBJ_FILE),
q("DELETE FROM item WHERE mid != '%s' AND verb = '%s' OR verb = '%s'", dbesc('%"hash":"' . $hash . '"%'),
dbesc($arr[1]), dbesc(ACTIVITY_POST),
dbesc($postverb . $arr[0]), dbesc(ACTIVITY_UPDATE)
dbesc($dropverb . $hash)
); );
} }
@ -68,8 +73,9 @@ function sharedwithme_content(&$a) {
//drop all files - localuser //drop all files - localuser
if((argc() > 1) && (argv(1) === 'dropall')) { if((argc() > 1) && (argv(1) === 'dropall')) {
q("DELETE FROM item WHERE verb LIKE '%s' AND uid = %d", q("DELETE FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d",
dbesc($postverb . '%'), dbesc(ACTIVITY_POST),
dbesc(ACTIVITY_OBJ_FILE),
intval(local_user()) intval(local_user())
); );
@ -77,9 +83,11 @@ function sharedwithme_content(&$a) {
} }
//list files //list files
$r = q("SELECT * FROM item WHERE verb LIKE '%s' AND uid = %d", $r = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s'",
dbesc($postverb . '%'), dbesc(ACTIVITY_POST),
intval(local_user()) dbesc(ACTIVITY_OBJ_FILE),
intval(local_user()),
dbesc($channel['channel_hash'])
); );
$o = profile_tabs($a, $is_owner, $channel['channel_address']); $o = profile_tabs($a, $is_owner, $channel['channel_address']);
@ -96,19 +104,15 @@ function sharedwithme_content(&$a) {
if($r) { if($r) {
foreach($r as $rr) { foreach($r as $rr) {
//don't display the files we shared with others $object = json_decode($rr['object'],true);
if($rr['owner_xchan'] != $channel['channel_hash']) { $url = rawurldecode($object['link']['href']);
unobscure($rr);
$url = rawurldecode($rr['body']);
$o .= '<a href="' . $url . '?f=&zid=' . $channel['xchan_addr'] . '">' . $url . '</a>&nbsp;<a href="/sharedwithme/' . $rr['id'] . '/drop" onclick="return confirmDelete();"><i class="icon-trash drop-icons"></i></a><br><br>'; $o .= '<a href="' . $url . '?f=&zid=' . $channel['xchan_addr'] . '">' . $url . '</a>&nbsp;<a href="/sharedwithme/' . $rr['id'] . '/drop" onclick="return confirmDelete();"><i class="icon-trash drop-icons"></i></a><br><br>';
} }
} }
}
$o .= '</div>'; $o .= '</div>';
return $o; return $o;
} }