From cce7e1a11881f62f53452f8824b0389f1a340c1f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 2 Jan 2005 15:27:37 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Meilleur=20gestion=20erreur=20de=20la=20?=
=?UTF-8?q?cr=E9ation=20d'un=20utilisateur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/langs/en_US/users.lang | 4 +-
htdocs/langs/fr_FR/users.lang | 4 +-
htdocs/user/fiche.php | 69 +++++++++++++++++++++--------------
3 files changed, 47 insertions(+), 30 deletions(-)
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 57c271495bb..7b7450fdb2f 100755
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -12,7 +12,9 @@ DisableAUser=Disable a user
ConfirmDisableUser=Are you sure you want to disable user %s ?
NewUser=New user
CreateUser=Create user
-LoginAlreadyExists=This login already exists
+LoginAlreadyExists=Login %s already exists.
+LoginNotDefined=Login is not defined.
+NameNotDefined=Name is not defined.
ListOfUsers=List of users
Administrator=Administrator
DefaultRights=Default permissions
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 364e6958abb..3aaccb70817 100755
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -12,7 +12,9 @@ DisableAUser=D
ConfirmDisableUser=Etes-vous s�r de vouloir d�sactiver l'utilisateur %s ?
NewUser=Nouvel utilisateur
CreateUser=Cr�er l'utilisateur
-LoginAlreadyExists=Ce login existe d�j�
+LoginAlreadyExists=Le login %s existe d�j�.
+LoginNotDefined=Le login n'est pas d�fini.
+NameNotDefined=Le nom n'est pas d�fini.
ListOfUsers=Liste des utilisateurs
Administrator=Administrateur
DefaultRights=Permissions par d�faut
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 14593bac78d..39352e246a2 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org>
- * Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -62,32 +62,45 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes")
}
}
+/**
+ * Action ajout user
+ */
if ($_POST["action"] == 'add' && $user->admin)
{
- $edituser = new User($db,0);
-
- $edituser->nom = $_POST["nom"];
- $edituser->note = $_POST["note"];
- $edituser->prenom = $_POST["prenom"];
- $edituser->login = $_POST["login"];
- $edituser->email = $_POST["email"];
- $edituser->admin = $_POST["admin"];
- $edituser->webcal_login = $_POST["webcal_login"];
-
- $id = $edituser->create();
-
- if ($id) {
- if (isset($_POST['password']) && $_POST['password']!='' )
- {
- $edituser->password($_POST['password'],$conf->password_encrypted);
+ $message="";
+ if (! $_POST["nom"]) {
+ $message='<div class="error">'.$langs->trans("NameNotDefined").'</div>';
+ $action="create"; // Go back to create page
+ }
+ if (! $_POST["login"]) {
+ $message='<div class="error">'.$langs->trans("LoginNotDefined").'</div>';
+ $action="create"; // Go back to create page
+ }
+ if (! $message) {
+ $edituser = new User($db,0);
+
+ $edituser->nom = trim($_POST["nom"]);
+ $edituser->note = trim($_POST["note"]);
+ $edituser->prenom = trim($_POST["prenom"]);
+ $edituser->login = trim($_POST["login"]);
+ $edituser->email = trim($_POST["email"]);
+ $edituser->admin = trim($_POST["admin"]);
+ $edituser->webcal_login = trim($_POST["webcal_login"]);
+
+ $id = $edituser->create();
+
+ if ($id) {
+ if (isset($_POST['password']) && trim($_POST['password']))
+ {
+ $edituser->password(trim($_POST['password']),$conf->password_encrypted);
+ }
+
+ Header("Location: fiche.php?id=$id");
+ }
+ else {
+ $message='<div class="error">'.$langs->trans("LoginAlreadyExists",$edituser->login).'</div>';
+ $action="create"; // Go back to create page
}
-
- Header("Location: fiche.php?id=$id");
- }
- else {
- //dolibarr_print_error($db,$edituser->error());
- $message=$langs->trans("LoginAlreadyExists");
- $action="create"; // Go back to create page
}
}
@@ -140,19 +153,19 @@ if ($action == 'create')
print_titre($langs->trans("NewUser"));
- if ($message) { print $message."<br>"; }
+ if ($message) { print "<br>".$message."<br>"; }
print '<form action="fiche.php" method="post">';
print '<input type="hidden" name="action" value="add">';
print '<table class="border" width="100%">';
- print '<tr><td valign="top" width="20%">'.$langs->trans("Firstname").'</td>';
- print '<td class="valeur"><input size="30" type="text" name="prenom" value=""></td></tr>';
-
print "<tr>".'<td valign="top">'.$langs->trans("Lastname").'</td>';
print '<td class="valeur"><input size="30" type="text" name="nom" value=""></td></tr>';
+ print '<tr><td valign="top" width="20%">'.$langs->trans("Firstname").'</td>';
+ print '<td class="valeur"><input size="30" type="text" name="prenom" value=""></td></tr>';
+
print "<tr>".'<td valign="top">'.$langs->trans("Login").'</td>';
print '<td class="valeur"><input size="20" type="text" name="login" value=""></td></tr>';
--
GitLab