projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c83e5ea
)
Notify.php
author
Alan Knowles
<alan@roojs.com>
Fri, 4 Jul 2014 03:12:55 +0000
(11:12 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 4 Jul 2014 03:12:55 +0000
(11:12 +0800)
Notify.php
patch
|
blob
|
history
diff --git
a/Notify.php
b/Notify.php
index
bad6700
..
4659e36
100644
(file)
--- a/
Notify.php
+++ b/
Notify.php
@@
-42,7
+42,7
@@
class Pman_Core_Notify extends Pman
),
'old' => array(
),
'old' => array(
- 'desc' => 'Show old messages..',
+ 'desc' => 'Show old messages..
(and new messages...)
',
'default' => 0,
'short' => 'o',
'min' => 0,
'default' => 0,
'short' => 'o',
'min' => 0,
@@
-175,7
+175,12
@@
class Pman_Core_Notify extends Pman
if (!empty($opts['old'])) {
if (!empty($opts['old'])) {
+ // show old and new...
+ $w->orderBy('act_when DESC'); // latest first
+ $w->limit($opts['limit']); // we can run
+
+ } else {
// standard
//$w->whereAdd('act_when > sent'); // eg.. sent is not valid..
// standard
//$w->whereAdd('act_when > sent'); // eg.. sent is not valid..
@@
-190,11
+195,9
@@
class Pman_Core_Notify extends Pman
$this->logecho("QUEUE is {$w->count()}");
$this->logecho("QUEUE is {$w->count()}");
- $w->limit($opts['limit']); // we can run 1000 ...
- } else {
- $w->orderBy('act_when DESC'); // latest first
$w->limit($opts['limit']); // we can run 1000 ...
}
$w->limit($opts['limit']); // we can run 1000 ...
}
+
if (!empty($this->evtype)) {
$w->evtype = $this->evtype;
}
if (!empty($this->evtype)) {
$w->evtype = $this->evtype;
}