diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index af6d8b94c28..f817e7898d3 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -38,11 +38,12 @@ $langs->load("mails"); if (! $user->rights->mailing->lire || $user->societe_id > 0) accessforbidden(); +$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit; $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); $page = GETPOST("page",'int'); if ($page == -1) { $page = 0; } -$offset = $conf->liste_limit * $page; +$offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; if (! $sortorder) $sortorder="ASC"; @@ -367,11 +368,15 @@ if ($object->fetch($id) >= 0) if ($search_email) $sql.= " AND mc.email LIKE '%".$db->escape($search_email)."%'"; if (!empty($search_dest_status)) $sql.= " AND mc.statut=".$db->escape($search_dest_status)." "; $sql .= $db->order($sortfield,$sortorder); - $sql .= $db->plimit($conf->liste_limit+1, $offset); + + $totalnbofrecord=$object->nbemail; // nbemail is a denormalized field storing nb of targets + + $sql .= $db->plimit($limit+1, $offset); $resql=$db->query($sql); if ($resql) { + $num = $db->num_rows($resql); $param = "&id=".$object->id; @@ -389,7 +394,7 @@ if ($object->fetch($id) >= 0) $cleartext='
'.$langs->trans("ToClearAllRecipientsClickHere").': '.''; } - print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$object->nbemail,''); + print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$totalnbofrecord,'',0,'','',$limit); print ''; @@ -399,7 +404,8 @@ if ($object->fetch($id) >= 0) print ''; print ''; print ''; - + print ''; + if ($page) $param.= "&page=".$page; print '';