From 1c39368eb2ceb5ad2a99e8ea14d5a397e46946fc Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 8 Jun 2016 11:34:04 +0800
Subject: [PATCH]  * fix for sync sendcloud user with '-'.

---
 lib/sendcloud/sendcloud.class.php | 6 +++---
 module/mail/control.php           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/sendcloud/sendcloud.class.php b/lib/sendcloud/sendcloud.class.php
index 2a0a52bdac..8e9c699cd7 100644
--- a/lib/sendcloud/sendcloud.class.php
+++ b/lib/sendcloud/sendcloud.class.php
@@ -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;
diff --git a/module/mail/control.php b/module/mail/control.php
index 773717b440..c10b80cd5e 100755
--- a/module/mail/control.php
+++ b/module/mail/control.php
@@ -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'));
                 }