This commit is contained in:
Laurent Destailleur 2011-07-08 15:50:28 +00:00
parent a972b202d2
commit b079e143a8
2 changed files with 67 additions and 68 deletions

View File

@ -23,7 +23,7 @@
/** /**
* \file htdocs/user/group/perms.php * \file htdocs/user/group/perms.php
* \brief Onglet user et permissions de la fiche utilisateur * \brief Onglet user et permissions de la fiche utilisateur
* \version $Id$ * \version $Id: perms.php,v 1.38 2011/07/08 15:50:28 eldy Exp $
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
@ -68,11 +68,9 @@ if ($_GET["action"] == 'delrights' && $caneditperms)
} }
/* ************************************************************************** */ /**
/* */ * View
/* Visu et edition */ */
/* */
/* ************************************************************************** */
$form = new Form($db); $form = new Form($db);
@ -295,5 +293,5 @@ if ($_GET["id"])
$db->close(); $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date: 2011/07/08 15:50:28 $ - $Revision: 1.38 $');
?> ?>

View File

@ -19,8 +19,8 @@
/** /**
* \file htdocs/user/passwordforgotten.php * \file htdocs/user/passwordforgotten.php
* \brief Page demande nouveau mot de passe * \brief Page to ask a new password
* \version $Id$ * \version $Id: passwordforgotten.php,v 1.74 2011/07/08 15:52:24 eldy Exp $
*/ */
define("NOLOGIN",1); // This means this output page does not require to be logged. define("NOLOGIN",1); // This means this output page does not require to be logged.
@ -55,7 +55,7 @@ $conf->entity = ( GETPOST('entity') ? GETPOST('entity') : 1 );
* Actions * Actions
*/ */
// Action modif mot de passe // Validate new password
if ($action == 'validatenewpassword' && $username && $passwordmd5) if ($action == 'validatenewpassword' && $username && $passwordmd5)
{ {
$edituser = new User($db); $edituser = new User($db);
@ -139,9 +139,10 @@ if ($action == 'buildnewpassword' && $username)
} }
/* /**
* Affichage page * View
*/ */
$php_self = $_SERVER['PHP_SELF']; $php_self = $_SERVER['PHP_SELF'];
$php_self.= $_SERVER["QUERY_STRING"]?'?'.$_SERVER["QUERY_STRING"]:''; $php_self.= $_SERVER["QUERY_STRING"]?'?'.$_SERVER["QUERY_STRING"]:'';