mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 06:35:15 +00:00
Merge https://github.com/friendica/red into zpull
This commit is contained in:
commit
1ec7ffc774
4 changed files with 4751 additions and 4561 deletions
|
@ -188,11 +188,11 @@ function group_get_members($gid) {
|
|||
if(intval($gid)) {
|
||||
$r = q("SELECT * FROM `group_member`
|
||||
LEFT JOIN abook ON abook_xchan = `group_member`.`xchan` left join xchan on xchan_hash = abook_xchan
|
||||
WHERE `gid` = %d AND abook_channel = %d and `group_member`.`uid` = %d and not ( abook_flags & %d ) and not ( abook_flags & %d ) and not ( abook_flags & %d ) ORDER BY xchan_name ASC ",
|
||||
WHERE `gid` = %d AND abook_channel = %d and `group_member`.`uid` = %d and not ( xchan_flags & %d ) and not ( abook_flags & %d ) and not ( abook_flags & %d ) ORDER BY xchan_name ASC ",
|
||||
intval($gid),
|
||||
intval(local_user()),
|
||||
intval(local_user()),
|
||||
intval(ABOOK_FLAG_SELF),
|
||||
intval(XCHAN_FLAGS_DELETED),
|
||||
intval(ABOOK_FLAG_BLOCKED),
|
||||
intval(ABOOK_FLAG_PENDING)
|
||||
);
|
||||
|
|
|
@ -117,10 +117,10 @@ function group_content(&$a) {
|
|||
|
||||
check_form_security_token_ForbiddenOnErr('group_member_change', 't');
|
||||
|
||||
$r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) limit 1",
|
||||
$r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not (xchan_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) limit 1",
|
||||
dbesc(argv(2)),
|
||||
intval(local_user()),
|
||||
intval(ABOOK_FLAG_SELF),
|
||||
intval(XCHAN_FLAGS_DELETED),
|
||||
intval(ABOOK_FLAG_BLOCKED),
|
||||
intval(ABOOK_FLAG_PENDING)
|
||||
);
|
||||
|
@ -210,10 +210,10 @@ function group_content(&$a) {
|
|||
group_rmv_member(local_user(),$group['name'],$member['xchan_hash']);
|
||||
}
|
||||
|
||||
$r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND not (abook_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) order by xchan_name asc",
|
||||
$r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND not (abook_flags & %d) and not (xchan_flags & %d) and not (abook_flags & %d) order by xchan_name asc",
|
||||
intval(local_user()),
|
||||
intval(ABOOK_FLAG_BLOCKED),
|
||||
intval(ABOOK_FLAG_SELF),
|
||||
intval(XCHAN_FLAGS_DELETED),
|
||||
intval(ABOOK_FLAG_PENDING)
|
||||
);
|
||||
|
||||
|
|
7583
view/it/messages.po
7583
view/it/messages.po
File diff suppressed because it is too large
Load diff
1717
view/it/strings.php
1717
view/it/strings.php
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue