diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index 65dcab3c7be..5e9c11c4f23 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -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 object Objet pour lequel il faut afficher le logo (exemple: user, group, action, bill, contract, propal, product, ...) \return string Retourne tags @@ -454,6 +454,18 @@ function img_object($alt, $object) return ''.$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 +*/ +function img_picto($alt, $picto) +{ + global $conf,$langs; + return ''.$alt.''; +} + /** \brief Affiche logo action \param alt Texte sur le alt de l'image diff --git a/htdocs/user/home.php b/htdocs/user/home.php index f9d3f7a7932..034e6d7deb8 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -17,17 +17,16 @@ * * $Id$ * $Source$ - * */ /** - \file htdocs/user/home.php - \brief Page acceuil de la zone utilisateurs et groupes - \version $Revision$ + \file htdocs/user/home.php + \brief Page acceuil de la zone utilisateurs et groupes + \version $Revision$ */ - + require("./pre.inc.php"); - + $langs->load("users"); $user->getrights('users'); @@ -42,36 +41,36 @@ print ''; if ($user->admin) { - print ''; + print '
'; - $var=false; - print '
'; - print ''.$langs->trans("Setup").''; - print "

\n"; + $var=false; + print ''; + print ''.$langs->trans("Setup").''; + print "
\n"; } /* * Recherche Group */ - $var=false; - print ''; - print ''; - print ''; - print ''; - print "
'.$langs->trans("SearchAGroup").'
'; - print $langs->trans("Ref").' :  

\n"; +$var=false; +print ''; +print ''; +print ''; +print ''; +print "
'.$langs->trans("SearchAGroup").'
'; +print $langs->trans("Ref").' :  

\n"; /* * Recherche User */ - $var=false; - print ''; - print ''; - print ''; - print ''; - print "
'.$langs->trans("SearchAUser").'
'; - print $langs->trans("Ref").' :  

\n"; +$var=false; +print ''; +print ''; +print ''; +print ''; +print "
'.$langs->trans("SearchAUser").'
'; +print $langs->trans("Ref").' :  

\n"; print ''; @@ -79,80 +78,92 @@ print ''; /* * Derniers groupes créés - * */ -$max=0; +$max=5; $sql = "SELECT g.rowid, g.nom, g.note, ".$db->pdate("g.datec")." as datec"; $sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g"; $sql .= " ORDER BY g.datec DESC"; if ($max) $sql .= " LIMIT $max"; -if ( $db->query($sql) ) +if ( $db->query($sql) ) { - $num = $db->num_rows(); - print ''; - print ''; - $var = true; - $i = 0; + $num = $db->num_rows(); + print '
'.$langs->trans("LastGroupsCreated").'
'; + print ''; + $var = true; + $i = 0; - while ($i < $num && (! $max || $i < $max)) - { - $obj = $db->fetch_object(); - $var=!$var; - - print ""; - print ""; - print ""; - print ''; - $i++; - } - print "
'.$langs->trans("LastGroupsCreated",$max).'
rowid\">".img_object($langs->trans("ShowGroup"),"group")." ".$obj->nom."".dolibarr_print_date($obj->datec,"%d %b %Y")."

"; + while ($i < $num && (! $max || $i < $max)) + { + $obj = $db->fetch_object(); + $var=!$var; - $db->free(); -} + print ""; + print "rowid\">".img_object($langs->trans("ShowGroup"),"group")." ".$obj->nom.""; + print "".dolibarr_print_date($obj->datec).""; + print ''; + $i++; + } + print "
"; + + $db->free(); +} else { - dolibarr_print_error($db); + dolibarr_print_error($db); } /* * 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 .= " FROM ".MAIN_DB_PREFIX."user as u"; -$sql .= " ORDER BY u.datec DESC limit $max"; +$sql = "SELECT u.rowid, u.name, u.firstname, u.admin, u.login, u.code, u.fk_societe, ".$db->pdate("u.datec")." as datec,"; +$sql.= " s.nom"; +$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(); - print ''; - print ''; - $var = true; - $i = 0; + $num = $db->num_rows($resql); + print '
'.$langs->trans("LastUsersCreated",min($num,$max)).'
'; + print ''; + $var = true; + $i = 0; - while ($i < $num && $i < $max) - { - $obj = $db->fetch_object(); - $var=!$var; - - print ""; - print ""; - print ""; - print ''; - $i++; - } - print "
'.$langs->trans("LastUsersCreated",min($num,$max)).'
rowid\">".img_object($langs->trans("ShowUser"),"user")." ".$obj->firstname." ".$obj->name."".strftime("%d %b %Y",$obj->datec)."

"; + while ($i < $num && $i < $max) + { + $obj = $db->fetch_object($resql); + $var=!$var; - $db->free(); -} + print ""; + print "rowid\">".img_object($langs->trans("ShowUser"),"user")." ".$obj->firstname." ".$obj->name.""; + if ($obj->admin) print img_picto($langs->trans("Administrator"),'star'); + print ""; + print "".$obj->login.' ('.$obj->code.')'; + print ""; + if ($obj->fk_societe) + { + print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; + } + else print ' '; + print ''; + print "".dolibarr_print_date($obj->datec).""; + print ''; + $i++; + } + print "
"; + + $db->free($resql); +} else { - dolibarr_print_error($db); + dolibarr_print_error($db); } @@ -161,7 +172,7 @@ print ''; print ''; $db->close(); - -llxFooter("Dernière modification $Date$ révision $Revision$"); + +llxFooter('$Date$ - $Revision$'); ?>