diff --git a/controllers/d.users.php b/controllers/d.users.php
index a16f9fc..eeb5824 100755
--- a/controllers/d.users.php
+++ b/controllers/d.users.php
@@ -39,7 +39,7 @@ if(isset($controller->splitted_url[1])) {
// PROCESS DATA FROM FORM
$user = new User();
$user->name = $_POST['login'];
- $user->email = strtolower($_POST['mail']);
+ $user->email = strtolower($_POST['email']);
$user->rank = "registered";
if($_POST['captcha'] == -2) {
@@ -54,7 +54,7 @@ if(isset($controller->splitted_url[1])) {
}
}
else {
- header('Location: '.$config['rel_root_folder'].'user/signin?error=mail');
+ header('Location: '.$config['rel_root_folder'].'user/signin?error=email');
}
}
else {
@@ -76,7 +76,7 @@ if(isset($controller->splitted_url[1])) {
if (isset($_POST['submit'])) {
// PROCESS DATA FROM FORM
$user = new User();
- $user->email = strtolower($_POST['mail']);
+ $user->email = strtolower($_POST['email']);
if($user->availableMail()) {
header('Location: '.$config['rel_root_folder'].'user/password_lost?error=1');
@@ -116,11 +116,11 @@ if(isset($controller->splitted_url[1])) {
$userProfile->name = $receivedUser->name;
else if($receivedUser->name != $userProfile->name)
$nameError=1;
- $receivedUser->mail = strtolower($_POST['mail']);
- if($receivedUser->mail != $userProfile->mail && $receivedUser->availableMail())
- $userProfile->mail = $receivedUser->mail;
- else if ($receivedUser->mail != $userProfile->mail)
- $mailError=1;
+ $receivedUser->email = strtolower($_POST['email']);
+ if($receivedUser->email != $userProfile->email && $receivedUser->availableMail())
+ $userProfile->email = $receivedUser->email;
+ else if ($receivedUser->email != $userProfile->email)
+ $emailError=1;
if($_POST['password']!='')
$userProfile->password=sha1($_POST['password']);
$userProfile->locale=$_POST['locale'];
diff --git a/models/d.users.php b/models/d.users.php
index 5dbf984..00d4ddd 100755
--- a/models/d.users.php
+++ b/models/d.users.php
@@ -11,12 +11,12 @@
require_once($config['models_folder']."d.locales.php");
$ranks = array(
- "administrator" => array(1000,"Administrateur", "red"),
- "moderator" => array(800,"Modérateur", "orangered"),
- "premium" => array(600,"Membre premium", "orange"),
- "registered" => array(400,"Utilisateur", "green"),
- "blocked" => array(200,"Membre archivé", "#aaa"),
- "visitor" => array(0,"Visiteur", "black")
+ "administrator" => array(1000,"Administrateur", "red", "administrator"),
+ "moderator" => array(800,"Modérateur", "orangered", "moderator"),
+ "premium" => array(600,"Membre premium", "orange", "premium"),
+ "registered" => array(400,"Utilisateur", "green", "registered"),
+ "blocked" => array(200,"Membre archivé", "#aaa", "blocked"),
+ "visitor" => array(0,"Visiteur", "black", "visitor")
);
class User
@@ -117,7 +117,7 @@ class User
global $ranks;
if( $no_html )
- return $ranks[$this->rank][1];
+ return $this->rank;
else
return ''.$ranks[$this->rank][1].'';
}
diff --git a/views/blocks/d.nav.html b/views/blocks/d.nav.html
index a0eefcd..54c88a6 100755
--- a/views/blocks/d.nav.html
+++ b/views/blocks/d.nav.html
@@ -11,9 +11,9 @@
Contribuer
if ($user->get_id() == 0) { ?>
-
+
} elseif ($user->get_avatar() == NULL) { ?>
-
+
} else { ?>
} ?>
@@ -37,7 +37,7 @@
} ?>
-
+