projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_email.php
[Pman.Core]
/
DataObjects
/
Core_email.php
diff --git
a/DataObjects/Core_email.php
b/DataObjects/Core_email.php
index
104c1c4
..
929e608
100644
(file)
--- a/
DataObjects/Core_email.php
+++ b/
DataObjects/Core_email.php
@@
-21,7
+21,7
@@
class Pman_Core_DataObjects_Core_email extends DB_DataObject
public $owner_id;
public $is_system;
public $active;
public $owner_id;
public $is_system;
public $active;
- public $bcc_group;
+ public $bcc_group
_id
;
public $test_class;
public $test_class;
@@
-41,17
+41,28
@@
class Pman_Core_DataObjects_Core_email extends DB_DataObject
$tn.subject LIKE '%{$this->escape($q['search']['nameortitle'])}%'
");
}
$tn.subject LIKE '%{$this->escape($q['search']['nameortitle'])}%'
");
}
-
+ $cgm = DB_DataObject::Factory('core_group_member')->tableName();;
+
$this->selectAdd("
(
SELECT
count(user_id)
FROM
$this->selectAdd("
(
SELECT
count(user_id)
FROM
- core_group_member
+ {$cgm}
WHERE
WHERE
- to_group_id =
core_group_member
.group_id
+ to_group_id =
{$cgm}
.group_id
)
)
- AS group_member_count
+ AS group_member_count,
+
+ (
+ SELECT
+ count(user_id)
+ FROM
+ {$cgm}
+ WHERE
+ bcc_group_id = {$cgm}.group_id
+ )
+ AS bcc_group_member_count
");
}
");
}
@@
-75,14
+86,19
@@
class Pman_Core_DataObjects_Core_email extends DB_DataObject
}
if ($this->to_group != -1) {
}
if ($this->to_group != -1) {
+
$c = DB_DataObject::factory('core_group_member');
$c->whereAdd("group_id = {$this->to_group}");
$c = DB_DataObject::factory('core_group_member');
$c->whereAdd("group_id = {$this->to_group}");
- if (!$c->find(true)) {
- $roo->jerr('not found');
- return;
+ if (!$c->count()) {
+ if (!empty($request['_ignore_group_count'])) {
+ if (!$request['_ignore_group_count']) {
+ $roo->jerr('no_member',array('errcode'=> 100));
+ }
+ } else {
+ $roo->jerr('no_member',array('errcode'=> 100));
+ }
}
}
-
}
}
}
}
@@
-346,8
+362,8
@@
class Pman_Core_DataObjects_Core_email extends DB_DataObject
// fill in BCC
// fill in BCC
- if (!empty($this->bcc_group) && empty($contents['rcpts_group'])) {
- $admin = DB_DAtaObject::Factory('core_group')->lookupMembersByGroupId($this->bcc_group,'email');
+ if (!empty($this->bcc_group
_id
) && empty($contents['rcpts_group'])) {
+ $admin = DB_DAtaObject::Factory('core_group')->lookupMembersByGroupId($this->bcc_group
_id
,'email');
if (empty($admin)) {
return $p->raiseError("template [{$contents['template']}] - bcc group is empty");
if (empty($admin)) {
return $p->raiseError("template [{$contents['template']}] - bcc group is empty");