From 054e53d81a12ec2b36be42673fb56a69c12bb378 Mon Sep 17 00:00:00 2001 From: leosw Date: Wed, 17 Oct 2018 22:37:04 +0200 Subject: [PATCH] Repair user private mail --- models/d.users.php | 9 ++++----- views/blocks/d.nav.html | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/models/d.users.php b/models/d.users.php index e17eee6..ad52c02 100755 --- a/models/d.users.php +++ b/models/d.users.php @@ -399,7 +399,6 @@ class User global $config; global $user; - $this->populate(); $url = "http://".$_SERVER['SERVER_NAME'].$config['rel_root_folder']; $message = "Bonjour ".$this->name.",
\r\n"; @@ -413,16 +412,16 @@ class User $message .= "L'équipe Kabano.
\r\n"; $message .= "Fait avec ♥ depuis Toulouse.
\r\n"; - $headers = 'From: '. $from->mail . "\r\n" . - 'Reply-To: '. $from->mail . "\r\n" . + $headers = 'From: '. $from->email . "\r\n" . + 'Reply-To: '. $from->email . "\r\n" . 'X-Mailer: PHP/' . phpversion() . "\r\n" . 'MIME-Version: 1.0' . "\r\n" . 'Content-type: text/html; charset=UTF-8' . "\r\n"; - mail($this->mail, 'Kabano - Nouveau message privé', $message, $headers); + mail($this->email, 'Kabano - Nouveau message privé', $message, $headers); error_log( - date('r')." \t".$user->name." (".$user->id.") \tMAIL \tMail sent to ".$this->name." (".$this->id.")\r\n", + date('r')." \t".$user->name." (".$user->get_id().") \tMAIL \tMail sent to ".$this->name." (".$this->id.")\r\n", 3, $config['logs_folder'].'users.log'); } diff --git a/views/blocks/d.nav.html b/views/blocks/d.nav.html index d0b9a80..36d639b 100755 --- a/views/blocks/d.nav.html +++ b/views/blocks/d.nav.html @@ -10,12 +10,12 @@
  • Nouveautés
  • Contribuer
  • - avatar) AND $user->avatar=='t') { ?> - Avatar - avatar) AND $user->avatar=='f') { ?> + get_id() == 0) { ?> + + get_avatar() == NULL) { ?> - + Avatar