From 5b3d0d302fd8041a56c8cb6695dd991506f34997 Mon Sep 17 00:00:00 2001
From: Felix Favre <gnomus@gnomus.de>
Date: Fri, 12 Dec 2014 23:39:54 +0100
Subject: [PATCH] on api-key reset also log the username

---
 includes/model/User_model.php | 38 +++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/includes/model/User_model.php b/includes/model/User_model.php
index 2d2b1afb..95ba32be 100644
--- a/includes/model/User_model.php
+++ b/includes/model/User_model.php
@@ -39,14 +39,14 @@ function User_sortable_columns() {
       'Aktiv',
       'force_active',
       'Tshirt',
-      'lastLogIn' 
+      'lastLogIn'
   );
 }
 
 /**
  * Get all users, ordered by Nick by default or by given param.
  *
- * @param string $order_by          
+ * @param string $order_by
  */
 function Users($order_by = 'Nick') {
   return sql_select("SELECT * FROM `User` ORDER BY `" . sql_escape($order_by) . "` ASC");
@@ -55,23 +55,23 @@ function Users($order_by = 'Nick') {
 /**
  * Returns true if user is freeloader
  *
- * @param User $user          
+ * @param User $user
  */
 function User_is_freeloader($user) {
   global $max_freeloadable_shifts, $user;
-  
+
   return count(ShiftEntries_freeloaded_by_user($user)) >= $max_freeloadable_shifts;
 }
 
 /**
  * Returns all users that are not member of given angeltype.
  *
- * @param Angeltype $angeltype          
+ * @param Angeltype $angeltype
  */
 function Users_by_angeltype_inverted($angeltype) {
   return sql_select("
-      SELECT `User`.* 
-      FROM `User` 
+      SELECT `User`.*
+      FROM `User`
       LEFT JOIN `UserAngelTypes` ON (`User`.`UID`=`UserAngelTypes`.`user_id` AND `angeltype_id`=" . sql_escape($angeltype['id']) . ")
       WHERE `UserAngelTypes`.`id` IS NULL
       ORDER BY `Nick`");
@@ -80,13 +80,13 @@ function Users_by_angeltype_inverted($angeltype) {
 /**
  * Returns all members of given angeltype.
  *
- * @param Angeltype $angeltype          
+ * @param Angeltype $angeltype
  */
 function Users_by_angeltype($angeltype) {
   return sql_select("
-      SELECT 
-      `User`.*, 
-      `UserAngelTypes`.`id` as `user_angeltype_id`, 
+      SELECT
+      `User`.*,
+      `UserAngelTypes`.`id` as `user_angeltype_id`,
       `UserAngelTypes`.`confirm_user_id`,
       `UserAngelTypes`.`coordinator`
       FROM `User`
@@ -105,7 +105,7 @@ function User_ids() {
 /**
  * Strip unwanted characters from a users nick.
  *
- * @param string $nick          
+ * @param string $nick
  */
 function User_validate_Nick($nick) {
   return preg_replace("/([^a-z0-9üöäß. _+*-]{1,})/ui", '', $nick);
@@ -114,7 +114,7 @@ function User_validate_Nick($nick) {
 /**
  * Returns user by id.
  *
- * @param $id UID          
+ * @param $id UID
  */
 function User($id) {
   $user_source = sql_select("SELECT * FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1");
@@ -129,7 +129,7 @@ function User($id) {
  * TODO: Merge into normal user function
  * Returns user by id (limit informations.
  *
- * @param $id UID          
+ * @param $id UID
  */
 function mUser_Limit($id) {
   $user_source = sql_select("SELECT `UID`, `Nick`, `Name`, `Vorname`, `Telefon`, `DECT`, `Handy`, `email`, `jabber`, `Avatar` FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1");
@@ -159,7 +159,7 @@ function User_by_api_key($api_key) {
 /**
  * Returns User by email.
  *
- * @param string $email          
+ * @param string $email
  * @return Matching user, null or false on error
  */
 function User_by_email($email) {
@@ -174,7 +174,7 @@ function User_by_email($email) {
 /**
  * Returns User by password token.
  *
- * @param string $token          
+ * @param string $token
  * @return Matching user, null or false on error
  */
 function User_by_password_recovery_token($token) {
@@ -189,20 +189,20 @@ function User_by_password_recovery_token($token) {
 /**
  * Generates a new api key for given user.
  *
- * @param User $user          
+ * @param User $user
  */
 function User_reset_api_key(&$user) {
   $user['api_key'] = md5($user['Nick'] . time() . rand());
   $result = sql_query("UPDATE `User` SET `api_key`='" . sql_escape($user['api_key']) . "' WHERE `UID`='" . sql_escape($user['UID']) . "' LIMIT 1");
   if ($result === false)
     return false;
-  engelsystem_log("API key resetted.");
+  engelsystem_log(sprintf("API key resetted (%s).",User_Nick_render($user)));
 }
 
 /**
  * Generates a new password recovery token for given user.
  *
- * @param User $user          
+ * @param User $user
  */
 function User_generate_password_recovery_token(&$user) {
   $user['password_recovery_token'] = md5($user['Nick'] . time() . rand());