Fix: Quelques messages oubliés et corrections pour register_globals.
This commit is contained in:
parent
2950c8a336
commit
9de6afd13c
@ -1,5 +1,7 @@
|
|||||||
# Dolibarr language file - en_US - users
|
# Dolibarr language file - en_US - users
|
||||||
UserCard=User card
|
UserCard=User card
|
||||||
|
ContactCard=Contact card
|
||||||
|
NoContactCard=No card among contacts
|
||||||
Permission=Permission
|
Permission=Permission
|
||||||
Permissions=Permissions
|
Permissions=Permissions
|
||||||
SendNewPassword=Send new password
|
SendNewPassword=Send new password
|
||||||
@ -9,3 +11,5 @@ DisableUser=Disable user
|
|||||||
NewUser=New user
|
NewUser=New user
|
||||||
CreateUser=Create user
|
CreateUser=Create user
|
||||||
LoginAlreadyExists=This login already exists
|
LoginAlreadyExists=This login already exists
|
||||||
|
ListOfUsers=List of users
|
||||||
|
Administrator=Administrator
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
# Dolibarr language file - fr_FR - users
|
# Dolibarr language file - fr_FR - users
|
||||||
UserCard=Fiche utilisateur
|
UserCard=Fiche utilisateur
|
||||||
|
ContactCard=Fiche contact
|
||||||
|
NoContactCard=Pas de fiche parmi les contacts
|
||||||
Permission=Droit
|
Permission=Droit
|
||||||
Permissions=Droits
|
Permissions=Droits
|
||||||
SendNewPassword=Envoyer nouveau mot de passe
|
SendNewPassword=Envoyer nouveau mot de passe
|
||||||
@ -9,3 +11,5 @@ DisableUser=D
|
|||||||
NewUser=Nouvel utilisateur
|
NewUser=Nouvel utilisateur
|
||||||
CreateUser=Créer l'utilisateur
|
CreateUser=Créer l'utilisateur
|
||||||
LoginAlreadyExists=Ce login existe déjà
|
LoginAlreadyExists=Ce login existe déjà
|
||||||
|
ListOfUsers=Liste des utilisateurs
|
||||||
|
Administrator=Administrateur
|
||||||
@ -153,7 +153,7 @@ if ($action == 'create')
|
|||||||
print "<tr>".'<td valign="top">'.$langs->trans("EMail").'</td>';
|
print "<tr>".'<td valign="top">'.$langs->trans("EMail").'</td>';
|
||||||
print '<td class="valeur"><input size="40" type="text" name="email" value=""></td></tr>';
|
print '<td class="valeur"><input size="40" type="text" name="email" value=""></td></tr>';
|
||||||
|
|
||||||
print "<tr>".'<td valign="top">Admin</td>';
|
print "<tr>".'<td valign="top">'.$langs->trans("Administrator").'</td>';
|
||||||
print '<td class="valeur">';
|
print '<td class="valeur">';
|
||||||
$form->selectyesnonum('admin',0);
|
$form->selectyesnonum('admin',0);
|
||||||
print "</td></tr>\n";
|
print "</td></tr>\n";
|
||||||
@ -314,7 +314,7 @@ else
|
|||||||
print '<td width="25%" class="valeur"><a href="mailto:'.$fuser->email.'">'.$fuser->email.'</a></td>';
|
print '<td width="25%" class="valeur"><a href="mailto:'.$fuser->email.'">'.$fuser->email.'</a></td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
print "<tr>".'<td width="25%" valign="top">Administrateur</td>';
|
print "<tr>".'<td width="25%" valign="top">'.$langs->trans("Administrator").'</td>';
|
||||||
print '<td colspan="3" class="valeur">'.yn($fuser->admin).'</td>';
|
print '<td colspan="3" class="valeur">'.yn($fuser->admin).'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
@ -327,15 +327,15 @@ else
|
|||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
print "<tr>".'<td width="25%" valign="top">Fiche contact</td>';
|
print "<tr>".'<td width="25%" valign="top">'.$langs->trans("ContactCard").'</td>';
|
||||||
print '<td colspan="3" valign="top">';
|
print '<td colspan="3" valign="top">';
|
||||||
if ($fuser->contact_id)
|
if ($fuser->contact_id)
|
||||||
{
|
{
|
||||||
print '<a href="../contact/fiche.php?id='.$fuser->contact_id.'">Fiche contact</a>';
|
print '<a href="../contact/fiche.php?id='.$fuser->contact_id.'">'.$langs->trans("ContactCard").'</a>';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print "Pas de fiche parmi les Contacts";
|
print $langs->trans("NoContactCard");
|
||||||
}
|
}
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
@ -436,7 +436,7 @@ else
|
|||||||
print "<tr>".'<td valign="top">'.$langs->trans("EMail").'</td>';
|
print "<tr>".'<td valign="top">'.$langs->trans("EMail").'</td>';
|
||||||
print '<td><input size="30" type="text" name="email" value="'.$fuser->email.'"></td></tr>';
|
print '<td><input size="30" type="text" name="email" value="'.$fuser->email.'"></td></tr>';
|
||||||
|
|
||||||
print "<tr>".'<td valign="top">'.$langs->trans("Admin").'</td>';
|
print "<tr>".'<td valign="top">'.$langs->trans("Administrator").'</td>';
|
||||||
if ($fuser->societe_id > 0)
|
if ($fuser->societe_id > 0)
|
||||||
{
|
{
|
||||||
print '<td class="valeur">';
|
print '<td class="valeur">';
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
<?PHP
|
<?PHP
|
||||||
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
/* Copyright (C) 2002-2003 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -21,9 +22,17 @@
|
|||||||
*/
|
*/
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
|
|
||||||
|
$langs->load("users");
|
||||||
|
|
||||||
|
|
||||||
llxHeader();
|
llxHeader();
|
||||||
|
|
||||||
print_titre("Liste des utilisateurs");
|
|
||||||
|
$sortfield=$_GET["sortfield"];
|
||||||
|
$sortorder=$_GET["sortorder"];
|
||||||
|
|
||||||
|
|
||||||
|
print_titre($langs->trans("ListOfUsers"));
|
||||||
|
|
||||||
$sql = "SELECT u.rowid, u.name, u.firstname, u.code, u.login, u.module_comm, u.module_compta";
|
$sql = "SELECT u.rowid, u.name, u.firstname, u.code, u.login, u.module_comm, u.module_compta";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
|
$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
|
||||||
@ -37,45 +46,47 @@ if ($result)
|
|||||||
$num = $db->num_rows();
|
$num = $db->num_rows();
|
||||||
$i = 0;
|
$i = 0;
|
||||||
|
|
||||||
print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"2\">";
|
print "<br>";
|
||||||
print '<TR class="liste_titre">';
|
|
||||||
print "<TD>";
|
print "<table class=\"noborder\" width=\"100%\" cellspacing=\"0\" cellpadding=\"2\">";
|
||||||
print_liste_field_titre("Nom","index.php","name");
|
print '<tr class="liste_titre">';
|
||||||
print "</TD>";
|
print "<td>";
|
||||||
print "<TD>";
|
print_liste_field_titre($langs->trans("LastName"),"index.php","name");
|
||||||
print_liste_field_titre("Prénom","index.php","firstname");
|
print "</td>";
|
||||||
print "</TD>";
|
print "<td>";
|
||||||
print "<TD>";
|
print_liste_field_titre($langs->trans("FirstName"),"index.php","firstname");
|
||||||
print_liste_field_titre("Login","index.php","login");
|
print "</td>";
|
||||||
print "</TD>";
|
print "<td>";
|
||||||
print "<TD>";
|
print_liste_field_titre($langs->trans("Login"),"index.php","login");
|
||||||
print_liste_field_titre("Code","index.php","code");
|
print "</td>";
|
||||||
print "</TD>";
|
print "<td>";
|
||||||
print "</TR>\n";
|
print_liste_field_titre($langs->trans("Code"),"index.php","code");
|
||||||
|
print "</td>";
|
||||||
|
print "</tr>\n";
|
||||||
$var=True;
|
$var=True;
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
$obj = $db->fetch_object( $i);
|
$obj = $db->fetch_object( $i);
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
|
|
||||||
print "<TR $bc[$var]>";
|
print "<tr $bc[$var]>";
|
||||||
print '<TD><a href="fiche.php?id='.$obj->rowid.'">';
|
print '<td><a href="fiche.php?id='.$obj->rowid.'">';
|
||||||
print img_file();
|
print img_file();
|
||||||
print '</a> '.ucfirst($obj->name).'</TD>';
|
print '</a> '.ucfirst($obj->name).'</TD>';
|
||||||
print '<TD>'.ucfirst($obj->firstname).'</td>';
|
print '<td>'.ucfirst($obj->firstname).'</td>';
|
||||||
if ($obj->login)
|
if ($obj->login)
|
||||||
{
|
{
|
||||||
print '<TD><a href="fiche.php?id='.$obj->rowid.'">'.$obj->login.'</a></TD>';
|
print '<td><a href="fiche.php?id='.$obj->rowid.'">'.$obj->login.'</a></td>';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print '<TD><a class="impayee" href="fiche.php?id='.$obj->rowid.'">Inactif</a></TD>';
|
print '<td><a class="impayee" href="fiche.php?id='.$obj->rowid.'">Inactif</a></td>';
|
||||||
}
|
}
|
||||||
print '<TD>'.$obj->code.'</TD>';
|
print '<td>'.$obj->code.'</TD>';
|
||||||
print "</TR>\n";
|
print "</tr>\n";
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
print "</TABLE>";
|
print "</table>";
|
||||||
$db->free();
|
$db->free();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user