La recherche sur les utilisateurs et groupe se fait aussi sur les notes, emails, logins
This commit is contained in:
Laurent Destailleur
parent
92c5b10a52
commit
0a8071fe67
@ -18,19 +18,22 @@
|
||||
*
|
||||
* $Id$
|
||||
* $Source$
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
\file htdocs/user/index.php
|
||||
\brief Page d'accueil de la gestion des utilisateurs
|
||||
\file htdocs/user/group/index.php
|
||||
\brief Page d'accueil de la gestion des groupes
|
||||
\version $Revision$
|
||||
*/
|
||||
|
||||
require("./pre.inc.php");
|
||||
|
||||
if (! $user->rights->user->group->lire && !$user->admin) accessforbidden();
|
||||
|
||||
$langs->load("users");
|
||||
|
||||
$sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];
|
||||
|
||||
$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
|
||||
$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
|
||||
$page=isset($_GET["page"])?$_GET["page"]:$_POST["page"];
|
||||
@ -50,39 +53,40 @@ print_titre($langs->trans("ListOfGroups"));
|
||||
$sql = "SELECT g.rowid, g.nom, ".$db->pdate("g.datec")." as datec";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
|
||||
$sql .= " WHERE 1=1";
|
||||
if ($_POST["search_group"]) {
|
||||
if ($_POST["search_group"])
|
||||
{
|
||||
$sql .= " AND (g.nom like '%".$_POST["search_group"]."%' OR g.note like '%".$_POST["search_group"]."%')";
|
||||
}
|
||||
if ($sortfield) {
|
||||
$sql .= " ORDER BY ".$sortfield;
|
||||
}
|
||||
if ($sortorder) {
|
||||
$sql .= " ".$sortorder;
|
||||
}
|
||||
$result = $db->query($sql);
|
||||
if ($result)
|
||||
if ($sall) $sql.= " AND (g.nom like '%".$sall."%' OR g.note like '%".$sall."%')";
|
||||
if ($sortfield)
|
||||
{
|
||||
$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("Group"),"index.php","g.nom","","","",$sortfield);
|
||||
print_liste_field_titre($langs->trans("DateCreation"),"index.php","g.datec","","","",$sortfield);
|
||||
print "</tr>\n";
|
||||
$var=True;
|
||||
while ($i < $num)
|
||||
$sql .= " ORDER BY ".$sortfield." ".$sortorder;
|
||||
}
|
||||
$resql = $db->query($sql);
|
||||
if ($resql)
|
||||
{
|
||||
$num = $db->num_rows($resql);
|
||||
$i = 0;
|
||||
|
||||
print "<br>";
|
||||
|
||||
$param="search_group=$search_group&sall=$sall";
|
||||
print "<table class=\"noborder\" width=\"100%\">";
|
||||
print '<tr class="liste_titre">';
|
||||
print_liste_field_titre($langs->trans("Group"),"index.php","g.nom",$param,"","",$sortfield);
|
||||
print_liste_field_titre($langs->trans("DateCreation"),"index.php","g.datec",$param,"","",$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.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.'</a></td>';
|
||||
print '<td width="100" align="center">'.dolibarr_print_date($obj->datec,"%d %b %Y").'</td>';
|
||||
print "</tr>\n";
|
||||
$i++;
|
||||
$obj = $db->fetch_object($resql);
|
||||
$var=!$var;
|
||||
|
||||
print "<tr $bc[$var]>";
|
||||
print '<td><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.'</a></td>';
|
||||
print '<td width="100" align="center">'.dolibarr_print_date($obj->datec,"%d %b %Y").'</td>';
|
||||
print "</tr>\n";
|
||||
$i++;
|
||||
}
|
||||
print "</table>";
|
||||
$db->free();
|
||||
@ -94,5 +98,6 @@ else
|
||||
|
||||
$db->close();
|
||||
|
||||
llxFooter("<em>Dernière modification $Date$ révision $Revision$</em>");
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
|
||||
?>
|
||||
|
||||
@ -51,71 +51,33 @@ print '<tr><td valign="top" width="30%" class="notopnoleft">';
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Recherche Group
|
||||
*/
|
||||
$var=false;
|
||||
print '<table class="noborder" width="100%">';
|
||||
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 '.$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 "</form></table><br>\n";
|
||||
|
||||
/*
|
||||
* Recherche User
|
||||
*/
|
||||
$var=false;
|
||||
print '<table class="noborder" width="100%">';
|
||||
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="3">'.$langs->trans("SearchAUser").'</td></tr>';
|
||||
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").'</td><td><input class="flat" type="text" name="search_user" size="18"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
|
||||
print '<tr '.$bc[$var].'><td nowrap>'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td></tr>';
|
||||
print "</form></table><br>\n";
|
||||
|
||||
/*
|
||||
* Recherche Group
|
||||
*/
|
||||
$var=false;
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<form method="post" action="'.DOL_URL_ROOT.'/user/group/index.php">';
|
||||
print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchAGroup").'</td></tr>';
|
||||
print '<tr '.$bc[$var].'><td>';
|
||||
print $langs->trans("Ref").':</td><td><input class="flat" type="text" name="search_group" size="18"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
|
||||
print '<tr '.$bc[$var].'><td nowrap>'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td></tr>';
|
||||
print "</form></table><br>\n";
|
||||
|
||||
print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
|
||||
|
||||
|
||||
/*
|
||||
* Derniers groupes créés
|
||||
*/
|
||||
$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) )
|
||||
{
|
||||
$num = $db->num_rows();
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("LastGroupsCreated",$max).'</td></tr>';
|
||||
$var = true;
|
||||
$i = 0;
|
||||
|
||||
while ($i < $num && (! $max || $i < $max))
|
||||
{
|
||||
$obj = $db->fetch_object();
|
||||
$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=\"80\" align=\"center\">".dolibarr_print_date($obj->datec)."</td>";
|
||||
print '</tr>';
|
||||
$i++;
|
||||
}
|
||||
print "</table><br>";
|
||||
|
||||
$db->free();
|
||||
}
|
||||
else
|
||||
{
|
||||
dolibarr_print_error($db);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Derniers utilisateurs créés
|
||||
*/
|
||||
@ -168,6 +130,44 @@ else
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Derniers groupes créés
|
||||
*/
|
||||
$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) )
|
||||
{
|
||||
$num = $db->num_rows();
|
||||
print '<table class="noborder" width="100%">';
|
||||
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("LastGroupsCreated",$max).'</td></tr>';
|
||||
$var = true;
|
||||
$i = 0;
|
||||
|
||||
while ($i < $num && (! $max || $i < $max))
|
||||
{
|
||||
$obj = $db->fetch_object();
|
||||
$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=\"80\" align=\"center\">".dolibarr_print_date($obj->datec)."</td>";
|
||||
print '</tr>';
|
||||
$i++;
|
||||
}
|
||||
print "</table><br>";
|
||||
|
||||
$db->free();
|
||||
}
|
||||
else
|
||||
{
|
||||
dolibarr_print_error($db);
|
||||
}
|
||||
|
||||
|
||||
print '</td></tr>';
|
||||
print '</table>';
|
||||
|
||||
@ -18,7 +18,6 @@
|
||||
*
|
||||
* $Id$
|
||||
* $Source$
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -33,6 +32,8 @@ if (! $user->rights->user->user->lire && !$user->admin) accessforbidden();
|
||||
|
||||
$langs->load("users");
|
||||
|
||||
$sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];
|
||||
|
||||
$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
|
||||
$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
|
||||
$page=isset($_GET["page"])?$_GET["page"]:$_POST["page"];
|
||||
@ -56,6 +57,7 @@ $sql .= " WHERE 1=1";
|
||||
if ($_POST["search_user"]) {
|
||||
$sql .= " AND (u.name like '%".$_POST["search_user"]."%' OR u.firstname like '%".$_POST["search_user"]."%')";
|
||||
}
|
||||
if ($sall) $sql.= " AND (u.login like '%".$sall."%' OR u.name like '%".$sall."%' OR u.firstname like '%".$sall."%' OR u.code like '%".$sall."%' OR u.email like '%".$sall."%' OR u.note like '%".$sall."%')";
|
||||
if ($sortfield) { $sql.=" ORDER BY $sortfield $sortorder"; }
|
||||
|
||||
$result = $db->query($sql);
|
||||
@ -66,13 +68,14 @@ if ($result)
|
||||
|
||||
print "<br>";
|
||||
|
||||
$param="search_user=$search_user&sall=$sall";
|
||||
print "<table class=\"noborder\" width=\"100%\">";
|
||||
print '<tr class="liste_titre">';
|
||||
print_liste_field_titre($langs->trans("Login"),"index.php","u.login","","","",$sortfield);
|
||||
print_liste_field_titre($langs->trans("Lastname"),"index.php","u.name","","","",$sortfield);
|
||||
print_liste_field_titre($langs->trans("Firstname"),"index.php","u.firstname","","","",$sortfield);
|
||||
print_liste_field_titre($langs->trans("Code"),"index.php","u.code","","","",$sortfield);
|
||||
print_liste_field_titre($langs->trans("DateCreation"),"index.php","u.datec","","","",$sortfield);
|
||||
print_liste_field_titre($langs->trans("Login"),"index.php","u.login",$param,"","",$sortfield);
|
||||
print_liste_field_titre($langs->trans("Lastname"),"index.php","u.name",$param,"","",$sortfield);
|
||||
print_liste_field_titre($langs->trans("Firstname"),"index.php","u.firstname",$param,"","",$sortfield);
|
||||
print_liste_field_titre($langs->trans("Code"),"index.php","u.code",$param,"","",$sortfield);
|
||||
print_liste_field_titre($langs->trans("DateCreation"),"index.php","u.datec",$param,"","",$sortfield);
|
||||
print "</tr>\n";
|
||||
$var=True;
|
||||
while ($i < $num)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user