diff --git a/htdocs/user/addon.php b/htdocs/user/addon.php index 136a27cbe80b43c09d778b665623b2b9a8073e6c..b497afeb44ed45a250ad38072e13476c7bbdfab1 100644 --- a/htdocs/user/addon.php +++ b/htdocs/user/addon.php @@ -1,5 +1,6 @@ <?php /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> + * Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,6 +20,12 @@ * $Source$ */ +/*! + \file htdocs/user/addon.php + \brief Onglet addon de la fiche utilisateur + \version $Revision$ +*/ + require("./pre.inc.php"); require_once DOL_DOCUMENT_ROOT."/bookmark4u.class.php"; @@ -78,16 +85,15 @@ if ($_GET["id"]) $head[$h][0] = DOL_URL_ROOT.'/user/addon.php?id='.$fuser->id; $head[$h][1] = $langs->trans("Addons"); $hselected=$h; - $h++; - dolibarr_fiche_head($head, $hselected, $fuser->nom." ".$fuser->prenom); + dolibarr_fiche_head($head, $hselected, $fuser->fullname); /* * Fiche en mode visu */ - print '<table class="border" width="100%" cellpadding="3" cellspacing="0">'; + print '<table class="border" width="100%">'; print "<tr>".'<td width="25%" valign="top">'.$langs->trans("LastName").'</td>'; print '<td width="25%" class="valeur">'.$fuser->nom.'</td>'; diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 81ae59fd9f02b9d821eff8dbbe39f9356893a784..8553bbe57bcc3929e8d24799160f413c073e40e4 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -23,7 +23,7 @@ /*! \file htdocs/user/fiche.php - \brief Page de la fiche utilisateur + \brief Onglet user et permissions de la fiche utilisateur \version $Revision$ */ @@ -425,11 +425,9 @@ else } - /* ************************************************************************** */ - /* */ - /* Edition */ - /* */ - /* ************************************************************************** */ + /* + * Fiche en mode edition + */ if ($_GET["action"] == 'edit' && $user->admin) { print '<form action="fiche.php?id='.$fuser->id.'" method="post">'; @@ -474,7 +472,7 @@ else print "<tr>".'<td align="center" colspan="2"><input value="'.$langs->trans("Save").'" type="submit"></td></tr>'; - print '</table>'; + print '</table><br>'; print '</form>'; } diff --git a/htdocs/user/index.php b/htdocs/user/index.php index fd84464c4cb26b3f6dd21052e26e6d25b17b8500..4d596f9d09c0b3d813080b755e9eedabd6f70267 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -20,6 +20,13 @@ * $Source$ * */ + +/*! + \file htdocs/user/index.php + \brief Page d'accueil de la gestion des utilisateurs + \version $Revision$ +*/ + require("./pre.inc.php"); $langs->load("users"); @@ -28,8 +35,9 @@ $langs->load("users"); llxHeader(); -$sortfield=$_GET["sortfield"]; -$sortorder=$_GET["sortorder"]; +$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"]; +$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; +$page=isset($_GET["page"])?$_GET["page"]:$_POST["page"]; print_titre($langs->trans("ListOfUsers")); @@ -43,47 +51,45 @@ else { $sql.="u.name"; } $result = $db->query($sql); if ($result) { - $num = $db->num_rows(); - $i = 0; - - print "<br>"; - - print "<table class=\"noborder\" width=\"100%\">"; - print '<tr class="liste_titre">'; - print_liste_field_titre($langs->trans("LastName"),"index.php","name"); - print_liste_field_titre($langs->trans("FirstName"),"index.php","firstname"); - print_liste_field_titre($langs->trans("Login"),"index.php","login"); - print_liste_field_titre($langs->trans("Code"),"index.php","code"); - print "</tr>\n"; - $var=True; - while ($i < $num) + $num = $db->num_rows(); + $i = 0; + + print "<br>"; + + print "<table class=\"noborder\" width=\"100%\">"; + print '<tr class="liste_titre">'; + print_liste_field_titre($langs->trans("LastName"),"index.php","name","","","",$sortfield); + print_liste_field_titre($langs->trans("FirstName"),"index.php","firstname","","","",$sortfield); + print_liste_field_titre($langs->trans("Login"),"index.php","login","","","",$sortfield); + print_liste_field_titre($langs->trans("Code"),"index.php","code","","","",$sortfield); + print "</tr>\n"; + $var=True; + while ($i < $num) { - $obj = $db->fetch_object( $i); - $var=!$var; - - print "<tr $bc[$var]>"; - print '<td><a href="fiche.php?id='.$obj->rowid.'">'; - print img_file(); - print '</a> '.ucfirst($obj->name).'</TD>'; - print '<td>'.ucfirst($obj->firstname).'</td>'; - if ($obj->login) - { - print '<td><a href="fiche.php?id='.$obj->rowid.'">'.$obj->login.'</a></td>'; - } - else - { - print '<td><a class="impayee" href="fiche.php?id='.$obj->rowid.'">Inactif</a></td>'; - } - print '<td>'.$obj->code.'</TD>'; - print "</tr>\n"; - $i++; + $obj = $db->fetch_object( $i); + $var=!$var; + + print "<tr $bc[$var]>"; + print '<td>'.ucfirst($obj->name).'</td>'; + print '<td>'.ucfirst($obj->firstname).'</td>'; + if ($obj->login) + { + print '<td><a href="fiche.php?id='.$obj->rowid.'">'.img_file().' '.$obj->login.'</a></td>'; + } + else + { + print '<td><a class="impayee" href="fiche.php?id='.$obj->rowid.'">'.img_file().' Inactif</a></td>'; + } + print '<td>'.$obj->code.'</td>'; + print "</tr>\n"; + $i++; } - print "</table>"; - $db->free(); + print "</table>"; + $db->free(); } -else +else { - print $db->error(); + dolibarr_print_error($db); } $db->close();