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

* fix for sync sendcloud user with '-'.

Browse Source
This commit is contained in:
wangyidong
2016-06-08 11:34:04 +08:00
parent 358725a035
commit 1c39368eb2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sendcloud/sendcloud.class.php
+3 -3
View File
@@ -67,7 +67,7 @@ class sendcloud
if(!empty($this->Subject) and empty($this->subject)) $this->subject = $this->Subject;
$param['accessKey'] = $this->accessKey;
$param['nickNames'] = $this->nickNames;
$param['nickNames'] = preg_replace('/[^a-zA-z0-9@\._;]/', '_', $this->nickNames);
$param['subject'] = $this->subject;
$param['content'] = $this->content;
@@ -98,7 +98,7 @@ class sendcloud
return false;
}
$members = array();
foreach($result->info->linkmanMembers as $member) $members[$member->nickName] = $member;
foreach($result->info->linkmanMembers as $member) $members[$member->email] = $member;
return $members;
}
@@ -114,7 +114,7 @@ class sendcloud
{
$url = 'http://api.notice.sendcloud.net/linkmanMember/add';
$param['accessKey'] = $this->accessKey;
$param['nickName'] = $member->nickName;
$param['nickName'] = preg_replace('/[^a-zA-z0-9@\._]/', '_', $member->nickName);
$param['email'] = $member->email;
if(isset($member->userName)) $param['userName'] = $member->userName;
if(isset($member->phone)) $param['phone'] = $member->phone;
module/mail/control.php
+1 -1
View File
@@ -424,7 +424,7 @@ class mail extends control
$result = $this->mail->syncSendCloud($action, $email, $realnameAndEmail->realname);
if(!$result->result)
{
echo(js::alert($this->lang->mail->sendCloudFail . $result->message . "(CODE: $result->statusCode)"));
echo(js::alert($this->lang->mail->sendCloudFail . str_replace("'", '"', $result->message) . "(CODE: $result->statusCode)"));
die(js::reload('parent'));
}