diff --git a/htdocs/public/adherents/pre.inc.php b/htdocs/public/adherents/pre.inc.php index 1124cebcfa8..b58c9c743a8 100644 --- a/htdocs/public/adherents/pre.inc.php +++ b/htdocs/public/adherents/pre.inc.php @@ -42,8 +42,11 @@ function llxHeader($head = "") function llxHeaderVierge($head = "") { - global $user, $conf, $langs; + global $user, $conf, $langs; + top_htmlhead(''); + print ''; + } ?> diff --git a/htdocs/public/adherents/priv_liste.php b/htdocs/public/adherents/priv_liste.php index 43d20d744ce..c632d5d9093 100644 --- a/htdocs/public/adherents/priv_liste.php +++ b/htdocs/public/adherents/priv_liste.php @@ -23,67 +23,78 @@ require("./pre.inc.php"); +$sortorder=$_GET["sortorder"]; +$sortfield=$_GET["sortfield"]; +$page=$_GET["page"]; +$filter=$_GET["filter"]; +$statut=isset($_GET["statut"])?$_GET["statut"]:''; -llxHeaderVierge(); - - -if ($sortorder == "") { $sortorder="ASC"; } -if ($sortfield == "") { $sortfield="nom"; } - +if (! $sortorder) { $sortorder="ASC"; } +if (! $sortfield) { $sortfield="nom"; } if ($page == -1) { $page = 0 ; } - $offset = $conf->liste_limit * $page ; $pageprev = $page - 1; $pagenext = $page + 1; -$sql = "select rowid,prenom,nom, societe, cp,ville,email,naiss,photo from ".MAIN_DB_PREFIX."adherent where statut=1 ORDER BY $sortfield $sortorder ". $db->plimit($conf->liste_limit, $offset); + +llxHeaderVierge(); + + +$sql = "select rowid,prenom,nom, societe, cp,ville,email,naiss,photo"; +$sql.= " from ".MAIN_DB_PREFIX."adherent where statut=1"; +$sql.= " ORDER BY $sortfield $sortorder"; +$sql.= " ".$db->plimit($conf->liste_limit+1, $offset); //$sql = "SELECT d.rowid, d.prenom, d.nom, d.societe, cp, ville, d.email, 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 AND d.statut = $statut"; //$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit, $offset); $result = $db->query($sql); -if ($result) +if ($result) { - $num = $db->num_rows(); - $i = 0; - - print_barre_liste("Liste des adhérents", $page, "priv_liste.php", "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield"); - print ""; + $num = $db->num_rows($result); + $i = 0; - print ''; - print "\n"; - print_liste_field_titre("Date naissance","priv_liste.php","naiss","&page=$page"); - print_liste_field_titre("Email","priv_liste.php","email","&page=$page"); - print_liste_field_titre("CP","priv_liste.php","cp","&page=$page"); - print_liste_field_titre("Vile","priv_liste.php","ville","&page=$page"); - print "\n"; - print "\n"; - - $var=True; - while ($i < $num) - { - $objp = $db->fetch_object( $i); - $var=!$var; - print ""; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - if (isset($objp->photo) && $objp->photo!= ''){ - print "\n"; - }else{ - print "\n"; - } - print ""; - $i++; - } - print "
Prenom Nom / SociétéPhoto
rowid\">".stripslashes($objp->prenom)." ".stripslashes($objp->nom)." / ".stripslashes($objp->societe)."$objp->naiss$objp->email$objp->cp$objp->villephoto\">photo\" HEIGHT=64 WIDTH=64> 
"; + $param="&statut=$statut&sortorder=$sortorder&sortfield=$sortfield"; + print_barre_liste($langs->trans("ListOfMembers"), $page, "priv_liste.php", $param); + print ""; + + print ''; + print "\n"; + print_liste_field_titre($langs->trans("Birthdate"),"priv_liste.php","naiss",$param); + print_liste_field_titre($langs->trans("EMail"),"priv_liste.php","email",$param); + print_liste_field_titre($langs->trans("Zip"),"priv_liste.php","cp",$param); + print_liste_field_titre($langs->trans("Town"),"priv_liste.php","ville",$param); + print "\n"; + print "\n"; + + $var=True; + while ($i < $num && $i < $conf->liste_limit) + { + $objp = $db->fetch_object($result); + $var=!$var; + print ""; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + if (isset($objp->photo) && $objp->photo!= '') + { + print "\n"; + } + else + { + print "\n"; + } + print ""; + $i++; + } + print "
Prenom Nom / Société".$langs->trans("Photo")."
rowid\">".stripslashes($objp->prenom)." ".stripslashes($objp->nom)." / ".stripslashes($objp->societe)."$objp->naiss$objp->email$objp->cp$objp->villephoto\">photo\" HEIGHT=64 WIDTH=64> 
"; } else { - dolibarr_print_error($db); + dolibarr_print_error($db); }