kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Bugfix: mails listing better displayed and doesn't return wrong error anymore if we search a nonexistant mail

This commit is contained in:
Axel ROGER 2012-11-09 13:56:48 +00:00
parent 449bd834a8
commit bac1b39e7a
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bureau/admin/mail_list.php
View File

@ -47,9 +47,10 @@ if(!$domain_id ) {
$fatal=false; $fatal=false;
if ($domain=$dom->get_domain_byid($domain_id)) { if ($domain=$dom->get_domain_byid($domain_id)) {
if(!($mails_list = $mail->enum_domain_mails($domain_id,$search,$offset,$count,$show_systemmails))) { if(!($mails_list = $mail->enum_domain_mails($domain_id,$search,$offset,$count,$show_systemmails)) && $search) {
$error=$err->errstr(); $error=$err->errstr();
} }
$allmails_list = $mail->enum_domain_mails($domain_id,$search,$offset,$count,'true');
} else { } else {
$error=$err->errstr(); $error=$err->errstr();
$fatal=true; $fatal=true;
@ -83,18 +84,17 @@ if ($quota->cancreate("mail")) {
</td> </td>
</tr> </tr>
</table> </table>
<?php
if (empty($mails_list)) {
echo "<p><i>";
__("No mails for this domain.");
echo "</i></p>";
} else {
?>
<br /> <br />
<hr id="topbar"/> <hr id="topbar"/>
<h3><?php printf(_("Email addresses of the domain %s"),$domain); ?> : </h3> <h3><?php printf(_("Email addresses of the domain %s"),$domain); ?> : </h3>
<?php <?php
if (empty($allmails_list) && empty($search)) {
echo "<p><i>";
__("No mails for this domain.");
echo "</i></p><br/>";
} else {
if (isset($error) && !empty($error)) { if (isset($error) && !empty($error)) {
echo "<p class=\"error\">$error</p>"; echo "<p class=\"error\">$error</p>";
} }
@ -128,7 +128,8 @@ if (isset($error) && !empty($error)) {
$col=1; $i=0; $col=1; $i=0;
//listing of every mail of the current domain. //listing of every mail of the current domain.
while (list($key,$val)=each($mails_list)){ if(!empty($mails_list)) {
while (list($key,$val)=each($mails_list)) {
$col=3-$col; $grey=""; $col=3-$col; $grey="";
?> ?>
<tr class="lst<?php echo $col; ?>"> <tr class="lst<?php echo $col; ?>">
@ -166,6 +167,7 @@ if (date("Y-m-d")==substr($val["lastlogin"],0,10)) echo substr($val["lastlogin"]
</tr> </tr>
<?php <?php
$i++; $i++;
}
} }
?> ?>