- $this->selectAdd($d->data_select);
-
- $this->_join .= $d->join;
- echo '<PRE>';print_R($d);
- exit;
-
-
-
-
-
-
+ //$this->selectAdd($d->_query['data_select']); -- this will cause the same dataIndex...
+ $this->_join .= "
+ LEFT JOIN {$d->tableName()} ON {$this->tableName()}.onid = {$d->tableName()}.id
+ {$d->_join}
+ ";
+ $this->selectAs($d, 'core_notify_%s');
+ }
+ if (isset($q['query']['person_id_name']) ) {
+ $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'");
+
+ }
+ if (!empty($q['query']['status'])) {
+ switch ($q['query']['status']) {
+
+ case 'SUCCESS';
+ $this->whereAdd("msg_id != ''");
+ break;
+ case 'FAILED';
+
+ $this->whereAdd('msg_id = '' AND event_id > 0 ');
+
+ break;
+ case 'PENDING';
+ $this->whereAdd('event_id = 0 OR (event_id > 0 AND act_when > NOW() )');
+ break;
+ case 'ALL':
+ default:
+ break;
+ }