Skip to content

Commit 3988600

Browse files
committed
Add index to popo mailer classes
1 parent 959c7d1 commit 3988600

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

src/Ubiquity/controllers/admin/popo/MailerClass.php

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
class MailerClass {
88

9+
protected $num;
10+
911
protected $name;
1012

1113
protected $shortname;
@@ -34,6 +36,22 @@ class MailerClass {
3436

3537
protected $attachmentsDir;
3638

39+
/**
40+
*
41+
* @return mixed
42+
*/
43+
public function getNum() {
44+
return $this->num;
45+
}
46+
47+
/**
48+
*
49+
* @param mixed $num
50+
*/
51+
public function setNum($num) {
52+
$this->num = $num;
53+
}
54+
3755
/**
3856
*
3957
* @return mixed
@@ -261,8 +279,10 @@ public function setSubject($subject) {
261279
public static function init() {
262280
$result = [];
263281
$classes = MailerManager::getMailClasses(true);
264-
foreach ($classes as $class) {
265-
$result[] = self::initOne($class);
282+
foreach ($classes as $index => $class) {
283+
$mailerClass = self::initOne($class);
284+
$mailerClass->setNum($index + 1);
285+
$result[] = $mailerClass;
266286
}
267287
return $result;
268288
}

src/Ubiquity/controllers/admin/popo/MailerQueuedClass.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,13 @@ public static function initQueue($dec = false) {
104104
} else {
105105
$mails = MailerManager::allInQueue();
106106
}
107-
foreach ($mails as $mail) {
107+
foreach ($mails as $index => $mail) {
108108
if (! $dec) {
109109
$mailerClass = self::initOne($mail['class']);
110110
} else {
111111
$mailerClass = self::initOneFromInfos($mail['class'], $mail);
112112
}
113+
$mailerClass->setNum($index + 1);
113114
$mailerClass->setAt($mail['at'] ?? null);
114115
$mailerClass->setBetween($mail['between'] ?? null);
115116
$mailerClass->setAnd($mail['and'] ?? null);

0 commit comments

Comments
 (0)