From da5ee0992a66daf12a30730550c58e9faf3b14d1 Mon Sep 17 00:00:00 2001
From: jack <la5c@qq.com>
Date: Wed, 27 Jun 2018 15:01:15 +0800
Subject: [PATCH] update email function

---
 application/admin/controllers/UserController.php | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/application/admin/controllers/UserController.php b/application/admin/controllers/UserController.php
index a24fe5c1..98e27887 100755
--- a/application/admin/controllers/UserController.php
+++ b/application/admin/controllers/UserController.php
@@ -1132,11 +1132,9 @@ class Admin_UserController extends Zend_Controller_Action
 				ksort($replacements);
 				$send_body = preg_replace($patterns, $replacements, $body);
 				$send_subject = preg_replace($patterns, $replacements, $title);
-				
-				
-				/*
+
 				$mail=new WestdcMailer($this->view->config->smtp);
-				$mail->setFrom($this->view->config->service->email,'时空三极环境大数据平台服务组');
+				$mail->setFrom($this->view->config->service->email,'时空三极环境大数据平台');
 				$mail->setBodyText($send_body);
 				$mail->setSubject($send_subject);
 				@$mail->addTo($v['email']);
@@ -1147,20 +1145,16 @@ class Admin_UserController extends Zend_Controller_Action
 				}else{
 					$status = "失败";
 				}
-				*/
 				
 				$sended ++;
-				/*
-				调试时前台循环输出result
+
+				//调试时前台循环输出result
 				$result[$v['id']] = array(
 						'username'=>$v['username'],
 						'email'=>$v['email'],
 						'send_body'=>$send_body,
 						'send_subject'=>$send_subject
 				);
-				*/
-				
-				
 			}
 
 			$percent = round( ( $start / $total ) * 100 ,1);