New: Ajout info complémentaires sur "Espace utilisateurs et groupes"
This commit is contained in:
parent
b1ad2dfa1f
commit
b8b3a7fe13
@ -443,7 +443,7 @@ function dolibarr_trunc($string,$size=40)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\brief Affiche logo propre à une notion (fonction générique)
|
\brief Affiche picto propre à une notion/module (fonction générique)
|
||||||
\param alt Texte sur le alt de l'image
|
\param alt Texte sur le alt de l'image
|
||||||
\param object Objet pour lequel il faut afficher le logo (exemple: user, group, action, bill, contract, propal, product, ...)
|
\param object Objet pour lequel il faut afficher le logo (exemple: user, group, action, bill, contract, propal, product, ...)
|
||||||
\return string Retourne tags <img>
|
\return string Retourne tags <img>
|
||||||
@ -454,6 +454,18 @@ function img_object($alt, $object)
|
|||||||
return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/object_'.$object.'.png" border="0" alt="'.$alt.'" title="'.$alt.'">';
|
return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/object_'.$object.'.png" border="0" alt="'.$alt.'" title="'.$alt.'">';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
\brief Affiche picto (fonction générique)
|
||||||
|
\param alt Texte sur le alt de l'image
|
||||||
|
\param picto Nom de l'image a afficher
|
||||||
|
\return string Retourne tags <img>
|
||||||
|
*/
|
||||||
|
function img_picto($alt, $picto)
|
||||||
|
{
|
||||||
|
global $conf,$langs;
|
||||||
|
return '<img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/'.$picto.'.png" border="0" alt="'.$alt.'" title="'.$alt.'">';
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\brief Affiche logo action
|
\brief Affiche logo action
|
||||||
\param alt Texte sur le alt de l'image
|
\param alt Texte sur le alt de l'image
|
||||||
|
|||||||
@ -17,17 +17,16 @@
|
|||||||
*
|
*
|
||||||
* $Id$
|
* $Id$
|
||||||
* $Source$
|
* $Source$
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
\file htdocs/user/home.php
|
\file htdocs/user/home.php
|
||||||
\brief Page acceuil de la zone utilisateurs et groupes
|
\brief Page acceuil de la zone utilisateurs et groupes
|
||||||
\version $Revision$
|
\version $Revision$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
|
|
||||||
$langs->load("users");
|
$langs->load("users");
|
||||||
|
|
||||||
$user->getrights('users');
|
$user->getrights('users');
|
||||||
@ -42,36 +41,36 @@ print '<tr><td valign="top" width="30%">';
|
|||||||
|
|
||||||
if ($user->admin)
|
if ($user->admin)
|
||||||
{
|
{
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
|
|
||||||
$var=false;
|
$var=false;
|
||||||
print '<tr '.$bc[$var].'><td>';
|
print '<tr '.$bc[$var].'><td>';
|
||||||
print '<a href="admin">'.$langs->trans("Setup").'</a>';
|
print '<a href="admin">'.$langs->trans("Setup").'</a>';
|
||||||
print "</td></tr></table><br>\n";
|
print "</td></tr></table><br>\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Recherche Group
|
* Recherche Group
|
||||||
*/
|
*/
|
||||||
$var=false;
|
$var=false;
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<form method="post" action="'.DOL_URL_ROOT.'/user/group/index.php">';
|
print '<form method="post" action="'.DOL_URL_ROOT.'/user/group/index.php">';
|
||||||
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("SearchAGroup").'</td></tr>';
|
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("SearchAGroup").'</td></tr>';
|
||||||
print '<tr '.$bc[$var].'><td>';
|
print '<tr '.$bc[$var].'><td>';
|
||||||
print $langs->trans("Ref").' : <input class="flat" type="text" name="search_group"> <input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
|
print $langs->trans("Ref").' : <input class="flat" type="text" name="search_group"> <input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
|
||||||
print "</form></table><br>\n";
|
print "</form></table><br>\n";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Recherche User
|
* Recherche User
|
||||||
*/
|
*/
|
||||||
$var=false;
|
$var=false;
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<form method="post" action="'.DOL_URL_ROOT.'/user/index.php">';
|
print '<form method="post" action="'.DOL_URL_ROOT.'/user/index.php">';
|
||||||
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("SearchAUser").'</td></tr>';
|
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("SearchAUser").'</td></tr>';
|
||||||
print '<tr '.$bc[$var].'><td>';
|
print '<tr '.$bc[$var].'><td>';
|
||||||
print $langs->trans("Ref").' : <input class="flat" type="text" name="search_user"> <input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
|
print $langs->trans("Ref").' : <input class="flat" type="text" name="search_user"> <input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
|
||||||
print "</form></table><br>\n";
|
print "</form></table><br>\n";
|
||||||
|
|
||||||
|
|
||||||
print '</td><td valign="top" width="70%">';
|
print '</td><td valign="top" width="70%">';
|
||||||
@ -79,80 +78,92 @@ print '</td><td valign="top" width="70%">';
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Derniers groupes créés
|
* Derniers groupes créés
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
$max=0;
|
$max=5;
|
||||||
|
|
||||||
$sql = "SELECT g.rowid, g.nom, g.note, ".$db->pdate("g.datec")." as datec";
|
$sql = "SELECT g.rowid, g.nom, g.note, ".$db->pdate("g.datec")." as datec";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
|
$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
|
||||||
$sql .= " ORDER BY g.datec DESC";
|
$sql .= " ORDER BY g.datec DESC";
|
||||||
if ($max) $sql .= " LIMIT $max";
|
if ($max) $sql .= " LIMIT $max";
|
||||||
|
|
||||||
if ( $db->query($sql) )
|
if ( $db->query($sql) )
|
||||||
{
|
{
|
||||||
$num = $db->num_rows();
|
$num = $db->num_rows();
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("LastGroupsCreated").'</td></tr>';
|
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("LastGroupsCreated",$max).'</td></tr>';
|
||||||
$var = true;
|
$var = true;
|
||||||
$i = 0;
|
$i = 0;
|
||||||
|
|
||||||
while ($i < $num && (! $max || $i < $max))
|
while ($i < $num && (! $max || $i < $max))
|
||||||
{
|
{
|
||||||
$obj = $db->fetch_object();
|
$obj = $db->fetch_object();
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
|
|
||||||
print "<tr $bc[$var]>";
|
|
||||||
print "<td><a href=\"".DOL_URL_ROOT."/user/group/fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowGroup"),"group")." ".$obj->nom."</a></td>";
|
|
||||||
print "<td width=\"120\" align=\"center\">".dolibarr_print_date($obj->datec,"%d %b %Y")."</td>";
|
|
||||||
print '</tr>';
|
|
||||||
$i++;
|
|
||||||
}
|
|
||||||
print "</table><br>";
|
|
||||||
|
|
||||||
$db->free();
|
print "<tr $bc[$var]>";
|
||||||
}
|
print "<td><a href=\"".DOL_URL_ROOT."/user/group/fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowGroup"),"group")." ".$obj->nom."</a></td>";
|
||||||
|
print "<td width=\"80\" align=\"center\">".dolibarr_print_date($obj->datec)."</td>";
|
||||||
|
print '</tr>';
|
||||||
|
$i++;
|
||||||
|
}
|
||||||
|
print "</table><br>";
|
||||||
|
|
||||||
|
$db->free();
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
dolibarr_print_error($db);
|
dolibarr_print_error($db);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Derniers utilisateurs créés
|
* Derniers utilisateurs créés
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
$max=5;
|
$max=10;
|
||||||
|
|
||||||
$sql = "SELECT u.rowid, u.login, u.name, u.firstname, ".$db->pdate("u.datec")." as datec";
|
$sql = "SELECT u.rowid, u.name, u.firstname, u.admin, u.login, u.code, u.fk_societe, ".$db->pdate("u.datec")." as datec,";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
|
$sql.= " s.nom";
|
||||||
$sql .= " ORDER BY u.datec DESC limit $max";
|
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
|
||||||
|
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_societe=s.idp";
|
||||||
|
$sql.= " ORDER BY u.datec";
|
||||||
|
$sql.= " DESC limit $max";
|
||||||
|
|
||||||
if ( $db->query($sql) )
|
$resql=$db->query($sql);
|
||||||
|
if ($resql)
|
||||||
{
|
{
|
||||||
$num = $db->num_rows();
|
$num = $db->num_rows($resql);
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("LastUsersCreated",min($num,$max)).'</td></tr>';
|
print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("LastUsersCreated",min($num,$max)).'</td></tr>';
|
||||||
$var = true;
|
$var = true;
|
||||||
$i = 0;
|
$i = 0;
|
||||||
|
|
||||||
while ($i < $num && $i < $max)
|
while ($i < $num && $i < $max)
|
||||||
{
|
{
|
||||||
$obj = $db->fetch_object();
|
$obj = $db->fetch_object($resql);
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
|
|
||||||
print "<tr $bc[$var]>";
|
|
||||||
print "<td><a href=\"".DOL_URL_ROOT."/user/fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowUser"),"user")." ".$obj->firstname." ".$obj->name."</a></td>";
|
|
||||||
print "<td width=\"120\" align=\"center\">".strftime("%d %b %Y",$obj->datec)."</td>";
|
|
||||||
print '</tr>';
|
|
||||||
$i++;
|
|
||||||
}
|
|
||||||
print "</table><br>";
|
|
||||||
|
|
||||||
$db->free();
|
print "<tr $bc[$var]>";
|
||||||
}
|
print "<td><a href=\"".DOL_URL_ROOT."/user/fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowUser"),"user")." ".$obj->firstname." ".$obj->name."</a>";
|
||||||
|
if ($obj->admin) print img_picto($langs->trans("Administrator"),'star');
|
||||||
|
print "</td>";
|
||||||
|
print "<td align=\"left\">".$obj->login.' ('.$obj->code.')</td>';
|
||||||
|
print "<td>";
|
||||||
|
if ($obj->fk_societe)
|
||||||
|
{
|
||||||
|
print '<a href="'.DOL_URL_ROOT.'/soc.php?socid='.$obj->fk_societe.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a>';
|
||||||
|
}
|
||||||
|
else print ' ';
|
||||||
|
print '</td>';
|
||||||
|
print "<td width=\"80\" align=\"center\">".dolibarr_print_date($obj->datec)."</td>";
|
||||||
|
print '</tr>';
|
||||||
|
$i++;
|
||||||
|
}
|
||||||
|
print "</table><br>";
|
||||||
|
|
||||||
|
$db->free($resql);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
dolibarr_print_error($db);
|
dolibarr_print_error($db);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -161,7 +172,7 @@ print '</td></tr>';
|
|||||||
print '</table>';
|
print '</table>';
|
||||||
|
|
||||||
$db->close();
|
$db->close();
|
||||||
|
|
||||||
|
|
||||||
llxFooter("<em>Dernière modification $Date$ révision $Revision$</em>");
|
|
||||||
|
llxFooter('$Date$ - $Revision$');
|
||||||
?>
|
?>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user