File tree Expand file tree Collapse file tree 2 files changed +24
-3
lines changed
src/Ubiquity/controllers/admin/popo Expand file tree Collapse file tree 2 files changed +24
-3
lines changed Original file line number Diff line number Diff line change 6
6
7
7
class MailerClass {
8
8
9
+ protected $ num ;
10
+
9
11
protected $ name ;
10
12
11
13
protected $ shortname ;
@@ -34,6 +36,22 @@ class MailerClass {
34
36
35
37
protected $ attachmentsDir ;
36
38
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
+
37
55
/**
38
56
*
39
57
* @return mixed
@@ -261,8 +279,10 @@ public function setSubject($subject) {
261
279
public static function init () {
262
280
$ result = [];
263
281
$ 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 ;
266
286
}
267
287
return $ result ;
268
288
}
Original file line number Diff line number Diff line change @@ -104,12 +104,13 @@ public static function initQueue($dec = false) {
104
104
} else {
105
105
$ mails = MailerManager::allInQueue ();
106
106
}
107
- foreach ($ mails as $ mail ) {
107
+ foreach ($ mails as $ index => $ mail ) {
108
108
if (! $ dec ) {
109
109
$ mailerClass = self ::initOne ($ mail ['class ' ]);
110
110
} else {
111
111
$ mailerClass = self ::initOneFromInfos ($ mail ['class ' ], $ mail );
112
112
}
113
+ $ mailerClass ->setNum ($ index + 1 );
113
114
$ mailerClass ->setAt ($ mail ['at ' ] ?? null );
114
115
$ mailerClass ->setBetween ($ mail ['between ' ] ?? null );
115
116
$ mailerClass ->setAnd ($ mail ['and ' ] ?? null );
You can’t perform that action at this time.
0 commit comments