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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev

Browse Source
This commit is contained in:
Mario Vavti 2017-08-01 00:57:15 +02:00
commit b66cd8363e
7 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Zotlabs/Module/Filestorage.php
View File

@ -5,14 +5,6 @@ namespace Zotlabs\Module;
*
*/
require_once('include/attach.php');
/**
*
* @param object &$a
*/
class Filestorage extends \Zotlabs\Web\Controller {
function post() {
@ -36,7 +28,7 @@ class Filestorage extends \Zotlabs\Web\Controller {
$channel = \App::get_channel();
$acl = new \Zotlabs\Access\AccessList($channel);
$acl->set_from_array($_REQUEST);
$acl->set_from_array($_POST);
$x = $acl->get();
$url = get_cloud_url($channel_id, $channel['channel_address'], $resource);

5
Zotlabs/Module/Sharedwithme.php
View File

@ -4,6 +4,11 @@ require_once('include/conversation.php');
require_once('include/text.php');
/**
* @file Zotlabs/Module/Sharedwithme.php
*
*/
class Sharedwithme extends \Zotlabs\Web\Controller {
function get() {

2
boot.php
View File

@ -52,7 +52,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '2.7.0' );
define ( 'ZOT_REVISION', '1.3' );
define ( 'DB_UPDATE_VERSION', 1192 );
define ( 'DB_UPDATE_VERSION', 1193 );
define ( 'PROJECT_BASE', __DIR__ );

23
include/attach.php
View File

@ -1684,17 +1684,9 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
$arr['obj'] = $u_jsonobject;
$arr['body'] = '';
$post = item_store($arr);
$item_id = $post['item_id'];
if($item_id) {
Zotlabs\Daemon\Master::Summon(array('Notifier','activity',$item_id));
}
call_hooks('post_local_end', $arr);
post_activity_item($arr);
$update = false;
//notice( t('File activity updated') . EOL);
}
//don't create new activity if notify was not enabled
@ -1719,16 +1711,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
$arr['obj'] = (($update) ? $u_jsonobject : $jsonobject);
$arr['body'] = '';
$post = item_store($arr);
$item_id = $post['item_id'];
if($item_id) {
Zotlabs\Daemon\Master::Summon(array('Notifier','activity',$item_id));
}
call_hooks('post_local_end', $arr);
//(($verb === 'post') ? notice( t('File activity posted') . EOL) : notice( t('File activity dropped') . EOL));
post_activity_item($arr);
return;
}
@ -1894,7 +1877,7 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny
//if none is allowed restrict to self
if(($r_arr_allow_gid === false) && ($r_arr_allow_cid === false)) {
$ret['allow_cid'] = $poster['xchan_hash'];
$ret['allow_cid'] = [$poster['xchan_hash']];
} else {
$ret['allow_gid'] = $r_arr_allow_gid;
$ret['allow_cid'] = $r_arr_allow_cid;

1
install/schema_mysql.sql
View File

@ -660,6 +660,7 @@ CREATE TABLE IF NOT EXISTS `item` (
KEY `item_flags` (`item_flags`),
KEY `commented` (`commented`),
KEY `verb` (`verb`),
KEY `obj_type` (`obj_type`),
KEY `item_private` (`item_private`),
KEY `llink` (`llink`),
KEY `expires` (`expires`),

1
install/schema_postgres.sql
View File

@ -631,6 +631,7 @@ create index "item_restrict" on item ("item_restrict");
create index "item_flags" on item ("item_flags");
create index "item_commented" on item ("commented");
create index "item_verb" on item ("verb");
create index "item_obj_type" on item ("obj_type");
create index "item_private" on item ("item_private");
create index "item_llink" on item ("llink");
create index "item_expires" on item ("expires");

18
install/update.php
View File

@ -1,6 +1,6 @@
<?php
define( 'UPDATE_VERSION' , 1192 );
define( 'UPDATE_VERSION' , 1193 );
/**
*
@ -2963,6 +2963,18 @@ function update_r1191() {
return UPDATE_FAILED;
}
}
}
function update_r1192() {
if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
$r1 = q("CREATE INDEX item_obj_type ON item (obj_type)");
}
else {
$r1 = q("ALTER TABLE item ADD INDEX (obj_type)");
}
if($r1)
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}