fix
This commit is contained in:
parent
f0061bf487
commit
c23e4917db
@ -107,10 +107,10 @@ class MailController
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($usermailrows) {
|
foreach ($mailrows as $mailitem) {
|
||||||
foreach ($mailrows as $mailitem) {
|
$mailstatus = 0;
|
||||||
$mailstatus = 0;
|
$found = false;
|
||||||
$found = false;
|
if ($usermailrows) {
|
||||||
foreach ($usermailrows as $usermailitem) {
|
foreach ($usermailrows as $usermailitem) {
|
||||||
if ($mailitem['mail_id'] != $usermailitem['mail_id']) {
|
if ($mailitem['mail_id'] != $usermailitem['mail_id']) {
|
||||||
continue;
|
continue;
|
||||||
@ -122,22 +122,22 @@ class MailController
|
|||||||
}
|
}
|
||||||
$mailstatus = $usermailitem['state'];
|
$mailstatus = $usermailitem['state'];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$tmpmail = array(
|
$tmpmail = array(
|
||||||
'id' => $mailitem['mail_id'],
|
'id' => $mailitem['mail_id'],
|
||||||
'status' => $mailstatus,
|
'status' => $mailstatus,
|
||||||
'title' => $mailitem['subject'],
|
'title' => $mailitem['subject'],
|
||||||
'from' => 'system',
|
'from' => 'system',
|
||||||
'content' => $mailitem['content'],
|
'content' => $mailitem['content'],
|
||||||
'attachment' => json_decode($mailitem['attachments'])
|
'attachment' => json_decode($mailitem['attachments'])
|
||||||
);
|
);
|
||||||
array_push($usermails, $tmpmail);
|
array_push($usermails, $tmpmail);
|
||||||
if (!$found) {
|
if (!$found) {
|
||||||
array_push($newmails, array(
|
array_push($newmails, array(
|
||||||
'mail_id' => $mailitem['mail_id'],
|
'mail_id' => $mailitem['mail_id'],
|
||||||
'expiretime' => $mailitem['expiretime']
|
'expiretime' => $mailitem['expiretime']
|
||||||
));
|
));
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -461,7 +461,7 @@ class MailController
|
|||||||
|
|
||||||
$item_list = array();
|
$item_list = array();
|
||||||
$str_list = explode('|', $response['content']);
|
$str_list = explode('|', $response['content']);
|
||||||
foreach($str_list as $stritem) {
|
foreach ($str_list as $stritem) {
|
||||||
$itemstrs = explode(':', $stritem);
|
$itemstrs = explode(':', $stritem);
|
||||||
if (count($itemstrs) < 2) {
|
if (count($itemstrs) < 2) {
|
||||||
continue;
|
continue;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user