diff options
| author | RedMatrix <info@friendica.com> | 2014-08-15 09:58:43 +1000 |
|---|---|---|
| committer | RedMatrix <info@friendica.com> | 2014-08-15 09:58:43 +1000 |
| commit | f4229dbc3f17463d41a39e6b9038dd10fee6597a (patch) | |
| tree | bca29c3edd986b28098e56155af8ee367147097a /include | |
| parent | c1b89b413aea94ca81912437e8789f4cd719886e (diff) | |
| parent | fc94a638cd16dce8ed0d2772d29432f99396a70f (diff) | |
| download | volse-hubzilla-f4229dbc3f17463d41a39e6b9038dd10fee6597a.tar.gz volse-hubzilla-f4229dbc3f17463d41a39e6b9038dd10fee6597a.tar.bz2 volse-hubzilla-f4229dbc3f17463d41a39e6b9038dd10fee6597a.zip | |
Merge pull request #561 from cvogeley/master
Some work on account deletion
Diffstat (limited to 'include')
| -rw-r--r-- | include/Contact.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/Contact.php b/include/Contact.php index 100854f0d..47b1763cb 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -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()); |