...
|
...
|
@@ -152,7 +152,7 @@ class MailList extends Base { |
|
|
$filed = '`id`,`uid`,`subject`,`from`,`from_name`,`flagged`,`seen`,`udate`,`folder_id`,`is_file`,`description`,`lists`.`email_id`,`to_name`';
|
|
|
|
|
|
if($extSql){
|
|
|
$sql = "select %s from `lists` left join `fob_hot_mail` on `lists`.`id` = `fob_hot_mail`.`lists_id` where `fob_hot_mail`.`lists_id` > 0 and `fob_hot_mail`.`folder` = '{$extSql}' and ".dbWhere($where);
|
|
|
$sql = "select %s from `lists` left join `fob_hot_mail` on `lists`.`id` = `fob_hot_mail`.`lists_id` where `fob_hot_mail`.`folder` = '{$extSql}' and ".dbWhere($where);
|
|
|
}else{
|
|
|
if($folder == '收件箱' || $folder == '发件箱'){
|
|
|
$sql = "select %s from `lists` left join `fob_hot_mail` on `lists`.`id` = `fob_hot_mail`.`lists_id` where ISNULL(`lists_id`) and ".dbWhere($where);
|
...
|
...
|
@@ -212,11 +212,11 @@ class MailList extends Base { |
|
|
$where['lists|folder_id'] = $this->getFolderId('发件箱');
|
|
|
// 预热发件箱
|
|
|
$where['fob_hot_mail|folder'] = 'f';
|
|
|
$fCount = db()->count($sql.dbWhere($where)." and `lists_id` > 0");
|
|
|
$fCount = db()->count($sql.dbWhere($where));
|
|
|
// 预热收件箱
|
|
|
$where['lists|folder_id'] = $this->getFolderId('收件箱');
|
|
|
$where['fob_hot_mail|folder'] = 's';
|
|
|
$sCount = db()->count($sql.dbWhere($where)." and `lists_id` > 0");
|
|
|
$sCount = db()->count($sql.dbWhere($where));
|
|
|
|
|
|
unset($where['fob_hot_mail|folder']);
|
|
|
|
...
|
...
|
|