|
@@ -533,16 +533,18 @@ class UserManager
|
|
|
if (!in_array($language, $languages['folder'])) {
|
|
|
$language = api_get_setting('platformLanguage');
|
|
|
}
|
|
|
- $activate = 0;
|
|
|
-
|
|
|
- $sql_active = "SELECT * FROM $table_user WHERE user_id='$user_id' ";
|
|
|
+ $change_active = 0;
|
|
|
+ if ($user_info['active'] != $active) {
|
|
|
+ $change_active = 1;
|
|
|
+ }
|
|
|
+ /*$sql_active = "SELECT * FROM $table_user WHERE user_id='$user_id' ";
|
|
|
$return_active = Database::query($sql_active);
|
|
|
if (Database::num_rows($return_active) > 0) {
|
|
|
$result_active = Database::fetch_array($return_active);
|
|
|
if ($result_active['active'] != $active) {
|
|
|
$activate = 1;
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
$sql = "UPDATE $table_user SET
|
|
|
lastname='".Database::escape_string($lastname)."',
|
|
|
firstname='".Database::escape_string($firstname)."',
|
|
@@ -582,15 +584,14 @@ class UserManager
|
|
|
}
|
|
|
$sql .= " WHERE user_id='$user_id'";
|
|
|
$return = Database::query($sql);
|
|
|
- if ($activate == 1 && $return) {
|
|
|
- $user_id_manager = api_get_user_id();
|
|
|
+ if ($change_active == 1 && $return) {
|
|
|
$user_info = api_get_user_info($user_id);
|
|
|
if ($active == 1) {
|
|
|
- $event_title = LOG_USER_ACTIVE;
|
|
|
+ $event_title = LOG_USER_ENABLE;
|
|
|
} else {
|
|
|
- $event_title = LOG_USER_OFF;
|
|
|
+ $event_title = LOG_USER_DISABLE;
|
|
|
}
|
|
|
- event_system($event_title, LOG_USER_ID, $user_id, api_get_utc_datetime(), $user_id_manager, null, $user_info);
|
|
|
+ event_system($event_title, LOG_USER_ID, $user_id, api_get_utc_datetime(), null, null);
|
|
|
}
|
|
|
if (is_array($extra) && count($extra) > 0) {
|
|
|
$res = true;
|