diff --git a/service/Application/Admin/Controller/CommonController.class.php b/service/Application/Admin/Controller/CommonController.class.php
index fa16348e0..7388d7d85 100755
--- a/service/Application/Admin/Controller/CommonController.class.php
+++ b/service/Application/Admin/Controller/CommonController.class.php
@@ -312,8 +312,10 @@ class CommonController extends Controller
// 不实例化的字段
$no_all = array(
'home_footer_info',
- 'common_agreement_kehu',
- 'common_agreement_shanghu',
+ 'home_email_user_reg',
+ 'home_email_user_forget_pwd',
+ 'home_email_user_email_binding',
+ 'home_site_close_reason',
);
// 开始更新数据
diff --git a/service/Application/Admin/Controller/EmailController.class.php b/service/Application/Admin/Controller/EmailController.class.php
new file mode 100755
index 000000000..1e7c72b82
--- /dev/null
+++ b/service/Application/Admin/Controller/EmailController.class.php
@@ -0,0 +1,97 @@
+Is_Login();
+
+ // 权限校验
+ $this->Is_Power();
+ }
+
+ /**
+ * [Index 配置列表]
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 0.0.1
+ * @datetime 2016-12-06T21:31:53+0800
+ */
+ public function Index()
+ {
+ // 配置信息
+ $data = M('Config')->getField('only_tag,name,describe,value,error_tips');
+ $this->assign('data', $data);
+ $type = I('type', 'email');
+ $this->assign('nav_type', $type);
+ if($type == 'email')
+ {
+ $this->display('Index');
+ } else {
+ $this->display('Message');
+ }
+ }
+
+ /**
+ * [Save 配置数据保存]
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 0.0.1
+ * @datetime 2017-01-02T23:08:19+0800
+ */
+ public function Save()
+ {
+ $this->MyConfigSave();
+ }
+
+ /**
+ * [EmailTest 邮件测试]
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 0.0.1
+ * @datetime 2017-03-10T15:30:10+0800
+ */
+ public function EmailTest()
+ {
+ // 验证码公共基础参数
+ $verify_param = array(
+ 'expire_time' => MyC('common_verify_expire_time'),
+ 'time_interval' => MyC('common_verify_time_interval'),
+ );
+
+ $obj = new \Library\Email($verify_param);
+ $email_param = array(
+ 'email' => I('email'),
+ 'content' => L('email_test_email_send_content'),
+ 'title' => MyC('home_site_name').' - '.L('common_operation_test'),
+ );
+ // 发送
+ if($obj->SendHtml($email_param))
+ {
+ $this->ajaxReturn(L('common_send_success'));
+ } else {
+ $this->ajaxReturn(L('common_send_error').'['.$obj->error.']', -100);
+ }
+ }
+}
+?>
\ No newline at end of file
diff --git a/service/Application/Admin/Controller/SiteController.class.php b/service/Application/Admin/Controller/SiteController.class.php
index 6812d8335..1b7dd5d7b 100755
--- a/service/Application/Admin/Controller/SiteController.class.php
+++ b/service/Application/Admin/Controller/SiteController.class.php
@@ -83,16 +83,16 @@ class SiteController extends CommonController
// 文件类型
list($type, $suffix) = explode('/', $_FILES['home_site_logo_img']['type']);
- $path = 'Public/Upload/Home/image/';
+ $path = 'Public'.DS.'Upload'.DS.'common'.DS.'images'.DS;
if(!is_dir($path))
{
mkdir(ROOT_PATH.$path, 0777, true);
}
- $filename = 'home_logo.'.$suffix;
+ $filename = date('YmdHis').'_logo.'.$suffix;
$home_site_logo = $path.$filename;
if(move_uploaded_file($_FILES['home_site_logo_img']['tmp_name'], ROOT_PATH.$home_site_logo))
{
- $_POST['home_site_logo'] = '/'.$home_site_logo;
+ $_POST['home_site_logo'] = DS.$home_site_logo;
}
}
diff --git a/service/Application/Admin/Lang/zh-cn/email.php b/service/Application/Admin/Lang/zh-cn/email.php
new file mode 100755
index 000000000..347a7a89d
--- /dev/null
+++ b/service/Application/Admin/Lang/zh-cn/email.php
@@ -0,0 +1,17 @@
+ '邮箱设置',
+ 'email_message_nav_name' => '消息模板',
+ 'email_test_email_text' => '测试接收的邮件地址',
+ 'email_test_email_tips' => '请先保存配置后,再进行测试',
+ 'email_test_email_send_content' => '邮件配置-发送测试内容',
+);
+?>
\ No newline at end of file
diff --git a/service/Application/Admin/View/Default/Email/Index.html b/service/Application/Admin/View/Default/Email/Index.html
new file mode 100755
index 000000000..7c1bd800a
--- /dev/null
+++ b/service/Application/Admin/View/Default/Email/Index.html
@@ -0,0 +1,58 @@
+