Skip to content

Commit f459659

Browse files
committed
better values on uuls
1 parent a88bff5 commit f459659

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

app/Http/Controllers/SystemController.php

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,15 +224,23 @@ public function sysGetSpoolList(){
224224
$count=count($fields);
225225
$emails=array();
226226
$size= 0;
227-
if($count>11){
227+
228+
//handle size and emails when is a multiple email
229+
if($fields[6] == "crmail" && $count > 11){
228230
for($j = 7 ; $j < $count-3 ; $j++){
229231
$emails[]=$fields[$j];
230232
}
231233
$size = $fields[$count-2];
232234
}
233-
else{
235+
//handle size when is a simple email
236+
elseif($fields[6] == "crmail" && $count <= 11){
234237
$size = $fields[9];
235-
$emails[] = $fields[7];
238+
$emails[]=$fields[7];
239+
}
240+
241+
else{
242+
$size = explode("(",$fields[7])[1];
243+
$emails = null;
236244

237245
}
238246
$uuid = explode(".",$fields[0]);
@@ -243,9 +251,10 @@ public function sysGetSpoolList(){
243251
'user' => $fields[2],
244252
'date' => $fields[3],
245253
'time' => $fields[4],
246-
'type' => $fields[5] == "Executing" ? "Mail" : "HMP",
247-
'size' => $size,
248-
'destpath' => $fields[5] == "Executing" ? null: $fields[10] ,
254+
'type' => $fields[6] == "crmail" ? "Mail" : "HMP",
255+
//'size' => $fields[5] == "Executing" ? $fields[9] : explode("(",$fields[7])[1],
256+
'size' => intval($size),
257+
'destpath' => $fields[6] == "crmail" ? null: $fields[10] ,
249258
'emails' => $emails,
250259
];
251260
}

0 commit comments

Comments
 (0)