Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust for send by ztcloud.

Browse Source
This commit is contained in:
wangyidong
2016-12-29 16:20:18 +08:00
parent 1b81e01332
commit 0866c20425
5 changed files with 112 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ztcloud/ztcloud.class.php
+2 -3
View File
@@ -115,9 +115,8 @@ class ztcloud
public function getSignature($param)
{
ksort($param);
$data = '';
foreach($param as $key => $value) $data .= $key . '=' . $value . '&';
return md5($this->secretKey . '&' . $data . $this->secretKey);
$data = http_build_query($param);
return md5($this->secretKey . '&' . $data . '&' . $this->secretKey);
}
/**
module/admin/lang/zh-cn.php
+2 -1
View File
@@ -30,12 +30,13 @@ $lang->admin->notice->register = "友情提示：您还未在禅道社区(www.ze
$lang->admin->notice->ignore = "不再提示";
$lang->admin->register = new stdclass();
$lang->admin->register->common = '注册新帐号绑定';
$lang->admin->register->caption = '禅道社区登记';
$lang->admin->register->click = '点击此处';
$lang->admin->register->lblAccount = '请设置您的用户名，英文字母和数字的组合，三位以上。';
$lang->admin->register->lblPasswd = '请设置您的密码。数字和字母的组合，六位以上。';
$lang->admin->register->submit = '登记';
$lang->admin->register->bind = "如果您已经拥有社区帐号，%s关联账户";
$lang->admin->register->bind = "绑定已有帐号";
$lang->admin->register->success = "登记账户成功";
$lang->admin->bind = new stdclass();
module/admin/view/register.html.php
+95 -73
View File
@@ -13,85 +13,107 @@
<?php include '../../common/view/header.html.php';?>
<style>
.input-group .input-group-btn .popover{font-size:12px;}
.input-group-btn .btn{border-left:0px; border-right:0px;}
.input-group-btn .btn{border-left:0px}
.input-group:last-child .input-group-addon {border-right:0px;}
</style>
<div class='container mw-700px'>
<div id='titlebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon('cloud');?></span>
<strong><?php echo $lang->admin->register->caption;?></strong>
<div id='featurebar'>
<div class='heading'>
<span class='prefix'><?php echo html::icon('cloud');?></span>
<strong><?php echo $lang->admin->register->caption;?></strong>
</div>
</div>
<div class='row'>
<div class='col-md-6'>
<div class='panel'>
<div class='panel-heading'><strong><?php echo $lang->admin->register->common?></strong></div>
<form class='form-condensed mw-600px' method="post" target="hiddenwin">
<table align='center' class='table table-form'>
<tr>
<th class='w-100px'><?php echo $lang->user->account;?></th>
<td>
<div class="required required-wrapper"></div>
<?php echo html::input('account', '', "class='form-control' placeholder='{$lang->admin->register->lblAccount}'");?>
</td>
</tr>
<tr>
<th><?php echo $lang->user->realname;?></th>
<td><div class="required required-wrapper"></div><?php echo html::input('realname', '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->company;?></th>
<td><?php echo html::input('company', $register->company, "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->mobile;?></th>
<td>
<div class="required required-wrapper"></div>
<div class='input-group'>
<?php echo html::input('mobile', '', "class='form-control'");?>
<span class='input-group-btn'><?php echo html::a(inlink('ajaxSendCode', 'type=mobile'), $lang->admin->getCaptcha, '', "id='mobileSender' class='btn'")?></span>
<span class='input-group-addon' style='border:0px;background:none'></span>
<span class='input-group-addon'><?php echo $lang->admin->captcha?></span>
<?php echo html::input('mobileCode', '', "class='form-control'");?>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->user->email;?></th>
<td>
<div class="required required-wrapper"></div>
<div class='input-group'>
<?php echo html::input('email', $register->email, "class='form-control'");?>
<span class='input-group-btn'><?php echo html::a(inlink('ajaxSendCode', 'type=email'), $lang->admin->getCaptcha, '', "id='mailSender' class='btn'")?></span>
<span class='input-group-addon' style='border:0px;background:none'></span>
<span class='input-group-addon'><?php echo $lang->admin->captcha?></span>
<?php echo html::input('emailCode', '', "class='form-control'");?>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->user->password;?></th>
<td>
<div class="required required-wrapper"></div>
<?php echo html::password('password1', '', "class='form-control' placeholder='{$lang->admin->register->lblPasswd}'");?>
</td>
</tr>
<tr>
<th><?php echo $lang->user->password2;?></th>
<td><?php echo html::password('password2', '', "class='form-control'") . '<span class="star">*</span>';?></td>
</tr>
<tr>
<th></th>
<td colspan="2">
<?php echo html::submitButton($lang->admin->register->submit) . html::hidden('sn', $sn) . html::hidden('bindSite', common::getSysURL());?>
</td>
</tr>
</table>
</form>
</div>
</div>
<div class='alert'>
<div class='pull-right'><?php echo html::a(inlink('bind', "from=$from"), $lang->admin->bind->caption, '', "class='btn btn-success'");?></div>
<i class='icon-info-sign'></i>
<div class='content'>
<?php echo sprintf($lang->admin->register->bind, html::a(inlink('bind', "from=$from"), $lang->admin->register->click));?>
<div class='col-md-6'>
<div class='panel'>
<div class='panel-heading'><strong><?php echo $lang->admin->register->bind?></strong></div>
<form class='form-condensed mw-400px' method="post" target="hiddenwin" action='<?php echo inlink('bind', "from=$from")?>'>
<table align='center' class='table table-form'>
<tr>
<th class='w-100px'><?php echo $lang->user->account;?></th>
<?php
$account = zget($config->global, 'community', '');
if($account == 'na') $account = '';
?>
<td><?php echo html::input('account', $account, "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->password;?></th>
<td><?php echo html::password('password', '', "class='form-control'");?></td>
</tr>
<tr>
<th></th><td class="text-center"><?php echo html::submitButton() . html::hidden('sn', $sn) . html::hidden('site', common::getSysURL());?></td>
</tr>
</table>
</form>
</div>
</div>
<form class='form-condensed mw-600px' method="post" target="hiddenwin">
<table align='center' class='table table-form'>
<tr>
<th class='w-100px'><?php echo $lang->user->account;?></th>
<td>
<div class="required required-wrapper"></div>
<?php echo html::input('account', '', "class='form-control' placeholder='{$lang->admin->register->lblAccount}'");?>
</td>
</tr>
<tr>
<th><?php echo $lang->user->realname;?></th>
<td><div class="required required-wrapper"></div><?php echo html::input('realname', '', "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->company;?></th>
<td><?php echo html::input('company', $register->company, "class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->user->mobile;?></th>
<td>
<div class="required required-wrapper"></div>
<div class='input-group'>
<?php echo html::input('mobile', '', "class='form-control'");?>
<span class='input-group-btn'><?php echo html::a(inlink('ajaxSendCode', 'type=mobile'), $lang->admin->getCaptcha, '', "id='mobileSender' class='btn'")?></span>
<span class='input-group-addon'></span>
<span class='input-group-addon'><?php echo $lang->admin->captcha?></span>
<?php echo html::input('mobileCode', '', "class='form-control'");?>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->user->email;?></th>
<td>
<div class="required required-wrapper"></div>
<div class='input-group'>
<?php echo html::input('email', $register->email, "class='form-control'");?>
<span class='input-group-btn'><?php echo html::a(inlink('ajaxSendCode', 'type=email'), $lang->admin->getCaptcha, '', "id='mailSender' class='btn'")?></span>
<span class='input-group-addon'></span>
<span class='input-group-addon'><?php echo $lang->admin->captcha?></span>
<?php echo html::input('emailCode', '', "class='form-control'");?>
</div>
</td>
</tr>
<tr>
<th><?php echo $lang->user->password;?></th>
<td>
<div class="required required-wrapper"></div>
<?php echo html::password('password1', '', "class='form-control' placeholder='{$lang->admin->register->lblPasswd}'");?>
</td>
</tr>
<tr>
<th><?php echo $lang->user->password2;?></th>
<td><?php echo html::password('password2', '', "class='form-control'") . '<span class="star">*</span>';?></td>
</tr>
<tr>
<th></th>
<td colspan="2">
<?php echo html::submitButton($lang->admin->register->submit) . html::hidden('sn', $sn) . html::hidden('bindSite', common::getSysURL());?>
</td>
</tr>
</table>
</form>
</div>
<script>
$(function()
module/mail/control.php
+3 -3
View File
@@ -506,15 +506,15 @@ class mail extends control
die(js::locate($this->createLink('admin', 'register', 'from=mail')));
}
$result = $this->loadModel('admin')->getSecretKey();
if(empty($result))die(js::alert($this->lang->mail->connectFail) . js::locate('back'));
if($result->result == 'fail' and empty($result->data)) die(js::alert($this->lang->mail->centifyFail));
if(empty($result))die(js::alert($this->lang->mail->connectFail) . js::locate($this->createLink('admin', 'register', "from=admin")));
if($result->result == 'fail' and empty($result->data)) die(js::alert($this->lang->mail->centifyFail) . js::locate($this->createLink('admin', 'register', "from=admin")));
$data = $result->data;
if($result->result == 'fail' and empty($data->emailCertified))
{
die(js::locate($this->createLink('admin', 'certifyZtEmail', 'email=' . helper::safe64Encode($data->email))));
}
if($result->result == 'fail' and (empty($data->mobileCertified) or $data->mobileCertified != $data->mobile))
if($result->result == 'fail' and empty($data->mobileCertified))
{
die(js::locate($this->createLink('admin', 'certifyZtMobile', 'mobile=' . helper::safe64Encode($data->mobile))));
}
module/mail/lang/zh-cn.php
+10 -5
View File
@@ -8,7 +8,7 @@ $lang->mail->test = '测试发信';
$lang->mail->reset = '重置';
$lang->mail->browse = '邮件列表';
$lang->mail->delete = '删除邮件';
$lang->mail->ztCloud = 'SendCloud发信';
$lang->mail->ztCloud = '禅道云发信';
$lang->mail->sendCloud = 'Notice发信';
$lang->mail->batchDelete = '批量删除';
$lang->mail->sendcloudUser = '同步联系人';
@@ -30,7 +30,7 @@ $lang->mail->debug = '调试级别';
$lang->mail->charset = '编码';
$lang->mail->accessKey = 'accessKey';
$lang->mail->secretKey = 'secretKey';
$lang->mail->license = 'Sendcloud发信须知';
$lang->mail->license = 'SendCloud发信须知';
$lang->mail->selectMTA = '请选择发信方式：';
$lang->mail->smtp = 'SMTP发信';
@@ -93,9 +93,14 @@ $lang->mail->sendCloudSuccess = '操作成功';
$lang->mail->closeSendCloud = '关闭SendCloud';
$lang->mail->addressWhiteList = '为防止邮件被屏蔽，请在邮件服务器里面将发信邮箱设为白名单';
$lang->mail->ztCloudNotice = <<<EOD
<p>1、用户需到禅道官网做账号绑定，并且认证手机和邮箱。同时填写公司信息以便完成禅道企业认证。绑定完成后，即可发信。但每天只能发50封，而且只能用三天。</p>
<p>2、禅道对用户提交的认证完成审核，并通过后，即可享受七天，每天200封的发信服务。</p>
<p>3、我们会将认证通过的用户信息提交到Sendcloud做认证。Sendcloud认证通过之后，即可享受每天定200封的完整服务。</p>
<p>禅道云发信是由禅道开发团队和<a href='http://sendcloud.sohu.com/' target='_blank'>SendCloud</a>联合推出的一个免费发信服务。</p>
<p>您只需要在禅道官网注册帐号，并完成手机和邮箱的验证，即可享受免费的发信服务。</p>
<p style='color:red'>您的认证信息我们会帮您提交到SendCloud的团队进行认证，以获得每天200封邮件的免费额度。</p>
<ul>
<li>您在禅道官网提交认证之后，即可享受每天<strong style='color:red'>50</strong>封的发信额度，为期<strong style='color:red'>3</strong>天。</li>
<li>您的信息经由禅道官网审核之后，即可享受每天<strong style='color:red'>200</strong>封的发信额度，为期<strong style='color:red'>7</strong>天。</li>
<li>您的信息经由SendCloud最终审核之后，即可长期享受每天<strong style='color:red'>200</strong>封的发信额度。</li>
</ul>
<p>如果不同意以上条款，就不能该服务。</p>
EOD;