diff options
| author | friendica <info@friendica.com> | 2015-03-24 12:41:37 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-24 12:41:37 -0700 |
| commit | abf642be7fe250860f02e238da7152b9f7d464ce (patch) | |
| tree | be22cda10b8e8e53591eaec3ce2f987e2ffba47c /include | |
| parent | 00b3c4c881290427189185cdf4a247285aa79e5b (diff) | |
| parent | e41958111fd6c6947217ebfab1f003e409c99438 (diff) | |
| download | volse-hubzilla-abf642be7fe250860f02e238da7152b9f7d464ce.tar.gz volse-hubzilla-abf642be7fe250860f02e238da7152b9f7d464ce.tar.bz2 volse-hubzilla-abf642be7fe250860f02e238da7152b9f7d464ce.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/attach.php | 36 | ||||
| -rw-r--r-- | include/poller.php | 6 |
2 files changed, 41 insertions, 1 deletions
diff --git a/include/attach.php b/include/attach.php index 1daa42aef..2ca302949 100644 --- a/include/attach.php +++ b/include/attach.php @@ -976,6 +976,18 @@ function pipe_streams($in, $out) { return $size; } +/** + * @brief Activity for files + * + * @param $channel_id + * @param $object + * @param $allow_cid + * @param $allow_gid + * @param $deny_cid + * @param $deny_gid + * @param $verb + * @param $no_activity + */ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $verb, $no_activity) { require_once('include/items.php'); @@ -1030,7 +1042,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $jsonobject = json_encode($object); //check if item for this object exists - $y = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND resource_id = '%s' AND uid = %d LIMIT 1", + $y = q("SELECT mid FROM item WHERE verb = '%s' AND obj_type = '%s' AND resource_id = '%s' AND uid = %d LIMIT 1", dbesc(ACTIVITY_POST), dbesc($objtype), dbesc($object['hash']), @@ -1143,6 +1155,13 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, } +/** + * @brief Create file activity object + * + * @param $channel_id + * @param $hash + * @param $cloudpath + */ function get_file_activity_object($channel_id, $hash, $cloudpath) { $x = q("SELECT creator, filename, filetype, filesize, revision, folder, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid FROM attach WHERE uid = %d AND hash = '%s' LIMIT 1", @@ -1184,6 +1203,15 @@ function get_file_activity_object($channel_id, $hash, $cloudpath) { } +/** + * @brief Returns array of channels which have recursive permission for a file + * + * @param $arr_allow_cid + * @param $arr_allow_gid + * @param $arr_deny_cid + * @param $arr_deny_gid + * @param $folder_hash + */ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny_cid, $arr_deny_gid, $folder_hash) { $ret = array(); @@ -1295,6 +1323,12 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny return $ret; } + +/** + * @brief Returns members of a group + * + * @param $group_id + */ function in_group($group_id) { $group_members = array(); diff --git a/include/poller.php b/include/poller.php index b70ef75b0..4786188af 100644 --- a/include/poller.php +++ b/include/poller.php @@ -41,6 +41,12 @@ function poller_run($argv, $argc){ // run queue delivery process in the background proc_run('php',"include/queue.php"); + + + // maintenance for mod sharedwithme - check for updated items and remove them + + require_once('include/sharedwithme.php'); + apply_updates(); // expire any expired mail |