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
2014-08-14 17:25:45 -07:00
parent 9d2335ebc8 f4229dbc3f
commit 1d4fde71e0
11 changed files with 7080 additions and 7096 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/Contact.php
View File

@@ -162,7 +162,7 @@ function user_remove($uid) {
}
function account_remove($account_id,$local = true) {
function account_remove($account_id,$local = true,$unset_session=true) {
logger('account_remove: ' . $account_id);
@@ -196,7 +196,7 @@ function account_remove($account_id,$local = true) {
);
if($x) {
foreach($x as $xx) {
channel_remove($xx['channel_id'],$local);
channel_remove($xx['channel_id'],$local,false);
}
}
@@ -204,11 +204,16 @@ function account_remove($account_id,$local = true) {
intval($account_id)
);
if ($unset_session) {
unset($_SESSION['authenticated']);
unset($_SESSION['uid']);
goaway(get_app()->get_baseurl());
}
return $r;
}
function channel_remove($channel_id, $local = true) {
function channel_remove($channel_id, $local = true, $unset_session=true) {
if(! $channel_id)
return;
@@ -292,7 +297,7 @@ function channel_remove($channel_id, $local = true) {
proc_run('php','include/directory.php',$channel_id);
if($channel_id == local_user()) {
if($channel_id == local_user() && $unset_session) {
unset($_SESSION['authenticated']);
unset($_SESSION['uid']);
goaway($a->get_baseurl());

8
include/apps.php
View File

@@ -141,7 +141,13 @@ function translate_system_apps(&$arr) {
'Chat' => t('Chat'),
'Search' => t('Search'),
'Probe' => t('Probe'),
'Suggest' => t('Suggest')
'Suggest' => t('Suggest'),
'Random Channel' => t('Random Channel'),
'Invite' => t('Invite'),
'Features' => t('Features'),
'Language' => t('Language'),
'Post' => t('Post'),
'Profile Photo' => t('Profile Photo')
);
if(array_key_exists($arr['name'],$apps))

2
include/permissions.php
View File

@@ -23,7 +23,7 @@ function get_perms() {
'post_comments' => array('channel_w_comment', intval(PERMS_W_COMMENT), false, t('Can comment on or like my posts'), ''),
'post_mail' => array('channel_w_mail', intval(PERMS_W_MAIL), false, t('Can send me private mail messages'), ''),
'post_photos' => array('channel_w_photos', intval(PERMS_W_PHOTOS), false, t('Can post photos to my photo albums'), ''),
'post_like' => array('channel_w_like', intval(PERMS_W_LIKE), false, t('Can like/dislike stuff'), 'Profiles and things other than posts/comments'),
'post_like' => array('channel_w_like', intval(PERMS_W_LIKE), false, t('Can like/dislike stuff'), t('Profiles and things other than posts/comments')),
'tag_deliver' => array('channel_w_tagwall', intval(PERMS_W_TAGWALL), false, t('Can forward to all my channel contacts via post @mentions'), t('Advanced - useful for creating group forum channels')),
'chat' => array('channel_w_chat', intval(PERMS_W_CHAT), false, t('Can chat with me (when available)'), t('')),