diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 85941d318d6..3f381a93fe6 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -19,7 +19,6 @@ * * $Id$ * $Source$ - * */ /** @@ -150,15 +149,16 @@ print '
'; print ''; print ''; print ''; -print ''; +print ''; print "\n"; $var=false; print ""; print ''; +print ""; +print ''; print "
'.$langs->trans("SearchAMember").''.$langs->trans("SearchAMember").'
'; - -print $langs->trans("Name").' '; - -print ''; +print $langs->trans("Name").':'; +print '
'; +print $langs->trans("Other").':'; print '
"; diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php index 85c7c1284c2..c84a7ae5053 100644 --- a/htdocs/adherents/liste.php +++ b/htdocs/adherents/liste.php @@ -19,7 +19,6 @@ * * $Id$ * $Source$ - * */ /** @@ -36,6 +35,9 @@ require("./adherent.class.php"); llxHeader(); + +$sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"]; + $sortorder=$_GET["sortorder"]; $sortfield=$_GET["sortfield"]; $page=$_GET["page"]; @@ -50,10 +52,17 @@ $pageprev = $page - 1; $pagenext = $page + 1; $sql = "SELECT d.rowid, d.prenom, d.nom, d.societe, ".$db->pdate("d.datefin")." as datefin,"; -$sql .= " d.email, d.fk_adherent_type as type_id, t.libelle as type, d.morphy, d.statut, t.cotisation"; -$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."adherent_type as t"; -$sql .= " WHERE d.fk_adherent_type = t.rowid "; -if ($_GET["type"]) { +$sql.= " d.email, d.fk_adherent_type as type_id, t.libelle as type, d.morphy, d.statut, t.cotisation"; +$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."adherent_type as t"; +$sql.= " WHERE d.fk_adherent_type = t.rowid "; +if ($sall) +{ + $sql.=" AND (d.prenom like '%".$sall."%' OR d.nom like '%".$sall."%' OR d.societe like '%".$sall."%'"; + $sql.=" OR d.email like '%".$sall."%' OR d.login like '%".$sall."%' OR d.adresse like '%".$sall."%'"; + $sql.=" OR d.ville like '%".$sall."%' OR d.note like '%".$sall."%')"; +} +if ($_GET["type"]) +{ $sql.=" AND t.rowid=".$_GET["type"]; } if (isset($_GET["statut"])) diff --git a/htdocs/adherents/pre.inc.php b/htdocs/adherents/pre.inc.php index 6be5f33fefb..05ff1c5e4e4 100644 --- a/htdocs/adherents/pre.inc.php +++ b/htdocs/adherents/pre.inc.php @@ -18,7 +18,6 @@ * * $Id$ * $Source$ - * */ /** \file htdocs/adherents/pre.inc.php @@ -41,13 +40,15 @@ function llxHeader($head = "") { $menu->add(DOL_URL_ROOT."/adherents/index.php",$langs->trans("Members")); $menu->add_submenu(DOL_URL_ROOT."/adherents/fiche.php?action=create",$langs->trans("NewMember")); + $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php",$langs->trans("List")); $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=-1",$langs->trans("MenuMembersToValidate")); - $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1",$langs->trans("MenuMembersUpToDate")); + $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1",$langs->trans("MenuMembersValidated")); + $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1&filter=uptodate",$langs->trans("MenuMembersUpToDate")); $menu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=0",$langs->trans("MenuMembersResiliated")); $menu->add(DOL_URL_ROOT."/public/adherents/","Espace adherents public"); - $menu->add(DOL_URL_ROOT."/adherents/index.php","Export"); + $menu->add(DOL_URL_ROOT."/adherents/index.php",$langs->trans("Export")); $menu->add_submenu(DOL_URL_ROOT."/adherents/htpasswd.php","Format htpasswd"); $menu->add_submenu(DOL_URL_ROOT."/adherents/cartes/carte.php","Cartes d'adhérents"); $menu->add_submenu(DOL_URL_ROOT."/adherents/cartes/etiquette.php","Etiquettes d'adhérents"); diff --git a/htdocs/includes/menus/barre_left/eldy.php b/htdocs/includes/menus/barre_left/eldy.php index a742f153ae6..220b2909c7d 100644 --- a/htdocs/includes/menus/barre_left/eldy.php +++ b/htdocs/includes/menus/barre_left/eldy.php @@ -543,7 +543,7 @@ class MenuLeft { $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php",$langs->trans("List"),1,$user->rights->adherent->lire); $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=-1",$langs->trans("MenuMembersToValidate"),1,$user->rights->adherent->lire); $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1",$langs->trans("MenuMembersValidated"),1,$user->rights->adherent->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1&filter=uptodate",$langs->trans("MenuMembersUpToDate"),1,$user->rights->adherent->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=1&filter=uptodate",$langs->trans("MenuMembersUpToDate"),1,$user->rights->adherent->lire); $newmenu->add_submenu(DOL_URL_ROOT."/adherents/liste.php?statut=0",$langs->trans("MenuMembersResiliated"),1,$user->rights->adherent->lire); $langs->load("compta");