diff --git troll.module troll.module index 50abdf0..99607b5 100644 --- troll.module +++ troll.module @@ -476,16 +476,18 @@ function troll_block_user($uid) { $user_edit['status'] = 0; // remove all their permissions roles $user_edit['roles'] = array(); - $user = user_load(array('uid' => $uid)); - user_save($user, $user_edit); + $account = user_load(array('uid' => $uid)); + user_save($account, $user_edit); sess_destroy_uid($uid); if (variable_get('troll_block_role', NULL)) { $role = db_result(db_query("SELECT name FROM {role} WHERE rid = %d", variable_get('troll_block_role', 0))); db_query('INSERT INTO {users_roles} (uid, rid) VALUES (%d, %d)', $uid, variable_get('troll_block_role', '0')); - drupal_set_message(t('Blocked user !link and assigned role %role.', array('!link' => l($name, "admin/user/troll/search/view/$uid"), '%role' => $role))); + drupal_set_message(t('Blocked user !link and assigned role %role.', array('!link' => l($account->name, "admin/user/troll/search/view/$uid"), '%role' => $role))); + watchdog('troll', 'User %account was blocked and assigned role %role', array('%account' => $account->name, '%role' => $role)); } else { - drupal_set_message(t('Blocked user !link.', array('!link' => l($name, "admin/user/troll/search/view/$uid")))); + drupal_set_message(t('Blocked user !link.', array('!link' => l($account->name, "admin/user/troll/search/view/$uid")))); + watchdog('troll', 'User %account was blocked', array('%account' => $account->name)); } }