aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-08-15 23:03:04 +1000
committerRedMatrix <info@friendica.com>2014-08-15 23:03:04 +1000
commitd6da6f5001aa70681401a8b811d4e431a7831bd8 (patch)
tree240a16b7ab1bf73b9e28d31d58c72c43a1278c03
parentb88e1e98624510ceb5cc63a12d9f229213f2d5a1 (diff)
parentf36253b7a8f3cc628b985df1ab257ff03189727c (diff)
downloadvolse-hubzilla-d6da6f5001aa70681401a8b811d4e431a7831bd8.tar.gz
volse-hubzilla-d6da6f5001aa70681401a8b811d4e431a7831bd8.tar.bz2
volse-hubzilla-d6da6f5001aa70681401a8b811d4e431a7831bd8.zip
Merge pull request #562 from cvogeley/master
Account deletion
-rw-r--r--include/Contact.php2
-rw-r--r--mod/admin.php2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/Contact.php b/include/Contact.php
index 47b1763cb..140f449af 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -185,6 +185,7 @@ function account_remove($account_id,$local = true,$unset_session=true) {
$r = q("select * from account where account_id = %d limit 1",
intval($account_id)
);
+ $account_email=$r[0]['account_email'];
if(! $r) {
logger('account_remove: No account with id: ' . $account_id);
@@ -207,6 +208,7 @@ function account_remove($account_id,$local = true,$unset_session=true) {
if ($unset_session) {
unset($_SESSION['authenticated']);
unset($_SESSION['uid']);
+ notice( sprintf(t("User '%s' deleted"),$account_email) . EOL);
goaway(get_app()->get_baseurl());
}
return $r;
diff --git a/mod/admin.php b/mod/admin.php
index 230ef3011..14657bd1a 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -639,7 +639,7 @@ function admin_page_users_post(&$a){
if (x($_POST,'page_users_delete')){
require_once("include/Contact.php");
foreach($users as $uid){
- account_remove($uid,true);
+ account_remove($uid,true,false);
}
notice( sprintf( tt("%s user deleted", "%s users deleted", count($users)), count($users)) );
}