diff --git a/application/api/controller/Email.php b/application/api/controller/Email.php index df94a0f..125f187 100644 --- a/application/api/controller/Email.php +++ b/application/api/controller/Email.php @@ -114,6 +114,9 @@ class Email extends Base */ public function pushEmailOnTemplate() { + + die(); + $data = $this->request->post(); $rule = new Validate([ 'email' => 'require', diff --git a/application/api/job/mail.php b/application/api/job/mail.php index 39f96c2..4cf2f85 100644 --- a/application/api/job/mail.php +++ b/application/api/job/mail.php @@ -15,13 +15,13 @@ class mail { public function tgpu(Job $job, $data){ - my_tg_pushmail($data); +// my_tg_pushmail($data); $job->delete(); } public function promotion(Job $job,$data){ - aliemail($data['email'],$data['title'],$data['content'],$data['has_hb']); $job->delete(); + aliemail($data['email'],$data['title'],$data['content'],$data['has_hb']); } /** diff --git a/application/api/job/ts.php b/application/api/job/ts.php index c821c07..901a6d2 100644 --- a/application/api/job/ts.php +++ b/application/api/job/ts.php @@ -8,14 +8,14 @@ class ts { //put your code here - public function fire(Job $job, $data) { - my_doiToFrag($data); + public function fire(Job $job, $data) { $job->delete(); + my_doiToFrag($data); } - public function fire1(Job $job, $data) { - my_doiToFrag2($data); + public function fire1(Job $job, $data) { $job->delete(); + my_doiToFrag2($data); } diff --git a/application/common.php b/application/common.php index a101a58..b9af0b9 100644 --- a/application/common.php +++ b/application/common.php @@ -728,18 +728,18 @@ function prgeAuthor($author) function my_tg_pushmail($data) { - $res = sendEmail($data['email'], $data['title'], $data['title'], $data['content'], $data['tmail'], $data['tpassword'], $data['attachmentFile']); - if (isset($res['status'])) { - $log_obj = Db::name('email_log'); - $insert['article_id'] = $data['article_id']; - $insert['email'] = $data['email']; - $insert['content'] = $data['content']; - $insert['is_success'] = $res['status']; - $insert['attachment'] = $data['attachmentFile'] != '' ? substr($data['attachmentFile'], strrpos($data['attachmentFile'], 'enclosure/') + 10) : ''; - $insert['ctime'] = time(); - $log_obj->insert($insert); - $log_obj->close(); - } +// $res = sendEmail($data['email'], $data['title'], $data['title'], $data['content'], $data['tmail'], $data['tpassword'], $data['attachmentFile']); +// if (isset($res['status'])) { +// $log_obj = Db::name('email_log'); +// $insert['article_id'] = $data['article_id']; +// $insert['email'] = $data['email']; +// $insert['content'] = $data['content']; +// $insert['is_success'] = $res['status']; +// $insert['attachment'] = $data['attachmentFile'] != '' ? substr($data['attachmentFile'], strrpos($data['attachmentFile'], 'enclosure/') + 10) : ''; +// $insert['ctime'] = time(); +// $log_obj->insert($insert); +// $log_obj->close(); +// } }