GC0202 / ThinkLibrary

src/helper/Files.php

Spacing +7 added lines, -7 removed lines

@@ -17,7 +17,7 @@ 
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-declare (strict_types=1);
+declare(strict_types=1);
 
 namespace DtApp\ThinkLibrary\helper;
 
@@ -67,10 +67,10 @@ 
         $dh = opendir($name);
         while ($file = readdir($dh)) {
             if ($file !== "." && $file !== "..") {
-                $fullpath = $name . "/" . $file;
+                $fullpath = $name."/".$file;
                 if (!is_dir($fullpath)) {
                     unlink($fullpath);
-                } else {
+                }else {
                     $this->deletes($fullpath);
                 }
             }
@@ -97,7 +97,7 @@ 
         if (empty($name)) {
             throw new DtaException('请检查需要打包的路径名称');
         }
-        $list = glob($name . "{$file_name}.{$suffix_name}");
+        $list = glob($name."{$file_name}.{$suffix_name}");
         $fileList = $list;
         $zip = new ZipArchive();
         // 打开压缩包
@@ -120,13 +120,13 @@ 
     {
         $files = [];
         if (is_dir($path)) {
-            $path = dirname($path) . '/' . basename($path) . '/';
+            $path = dirname($path).'/'.basename($path).'/';
             $file = dir($path);
             while (false !== ($entry = $file->read())) {
                 if ($entry !== '.' && $entry !== '..') {
-                    $cur = $path . $entry;
+                    $cur = $path.$entry;
                     if (is_dir($cur)) {
-                        $subPath = $cur . '/';
+                        $subPath = $cur.'/';
                         $this->getFiles($subPath);
                     }
                     $files[] = $cur;

src/helper/Randoms.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-declare (strict_types=1);
+declare(strict_types=1);
 
 namespace DtApp\ThinkLibrary\helper;
 
@@ -58,13 +58,13 @@ 
             $charset = array_merge($lowerLetter, $upperLetter);
         } elseif ($type === 7) {
             $charset = array_merge($number, $lowerLetter, $upperLetter);
-        } else {
+        }else {
             $charset = $number;
         }
         $str = '';
         // 生成字符串
         for ($i = 0; $i < $length; $i++) {
-            $str .= $charset[random_int(0, count($charset) - 1)];
+            $str .= $charset[random_int(0, count($charset)-1)];
             // 验证规则
             if ($type === 4 && strlen($str) >= 2) {
                 if (!preg_match('/\d+/', $str) || !preg_match('/[a-z]+/', $str)) {

src/service/tencent/LbsService.php

Spacing +2 added lines, -2 removed lines

@@ -243,7 +243,7 @@ 
     {
         //组织参数
         $strParam = $this->createStrParam();
-        $result = file_get_contents($this->api_url . "?{$strParam}");
+        $result = file_get_contents($this->api_url."?{$strParam}");
         $result = json_decode($result, true);
         $this->output = $result;
     }
@@ -257,7 +257,7 @@ 
         $strParam = '';
         foreach ($this->param as $key => $val) {
             if ($key !== '' && $val !== '') {
-                $strParam .= $key . '=' . urlencode($val) . '&';
+                $strParam .= $key.'='.urlencode($val).'&';
             }
         }
         return $strParam;

src/service/decent/EJiAoFei.php

Spacing +2 added lines, -2 removed lines

@@ -210,8 +210,8 @@
         //生成签名
         $sign = $this->createSign();
         //组织参数
-        $this->param .= '&userkey=' . $sign;
-        $url = "http://" . $this->api . "/" . $this->method . ".do?{$this->param}";
+        $this->param .= '&userkey='.$sign;
+        $url = "http://".$this->api."/".$this->method.".do?{$this->param}";
         $result = file_get_contents($url);
         $result = Xmls::toArray($result);
         $this->output = $result;

src/service/qiniu/SmsService.php

Spacing +5 added lines, -5 removed lines

@@ -311,7 +311,7 @@ 
     {
         if (is_object($object)) {
             $arr = (array)($object);
-        } else {
+        }else {
             $arr = &$object;
         }
         if (is_array($arr)) {
@@ -345,8 +345,8 @@ 
         $recToken = $auth->authorizationV2($this->url, $this->method, json_encode($this->param), $this->contentType);
         $rtcToken['Content-Type'] = $this->contentType;
         dump($recToken);
-        dump($this->url . "?" . http_build_query($this->param));
-        $ret = Client::get($this->url . "?" . http_build_query($this->param), $recToken);
+        dump($this->url."?".http_build_query($this->param));
+        $ret = Client::get($this->url."?".http_build_query($this->param), $recToken);
         dump($ret);
         $this->output = $ret->json();
         return $this;
@@ -362,7 +362,7 @@ 
         $url = parse_url($this->url);
         $data = $url['path'] ?? '';
         if (isset($url['query'])) {
-            $data .= '?' . $url['query'];
+            $data .= '?'.$url['query'];
         }
         $data .= "\n";
         if (isset($this->param) && $this->contentType === 'application/x-www-form-urlencoded') {
@@ -378,7 +378,7 @@ 
     private function sign($data)
     {
         $sign = hash_hmac('sha1', $data, $this->secretKey, true);
-        return "Qiniu " . sprintf('%s:%s', $this->accessKey, $this->encode($sign));
+        return "Qiniu ".sprintf('%s:%s', $this->accessKey, $this->encode($sign));
     }
 
     /**

src/service/ExcelService.php

Spacing +2 added lines, -2 removed lines

@@ -167,12 +167,12 @@
         //设置单元格内容
         foreach ($this->head as $key => $value) {
             foreach ($value as $k => $v) {
-                $sheet->setCellValueByColumnAndRow($v['index'], $key + 1, $v['value']);
+                $sheet->setCellValueByColumnAndRow($v['index'], $key+1, $v['value']);
             }
         }
         foreach ($this->content as $key => $value) {
             foreach ($value as $k => $v) {
-                $sheet->setCellValueByColumnAndRow($v['index'], $key + $this->head_length, $v['value']);
+                $sheet->setCellValueByColumnAndRow($v['index'], $key+$this->head_length, $v['value']);
             }
         }
         $writer = new Xlsx($spreadsheet);

src/service/QqWryService.php

Spacing +34 added lines, -34 removed lines

@@ -68,10 +68,10 @@ 
     public function __construct(App $app)
     {
         $this->fp = 0;
-        if (($this->fp = fopen(__DIR__ . '/bin/qqwry.dat', 'rb')) !== false) {
+        if (($this->fp = fopen(__DIR__.'/bin/qqwry.dat', 'rb')) !== false) {
             $this->firstIp = $this->getLong();
             $this->lastIp = $this->getLong();
-            $this->totalIp = ($this->lastIp - $this->firstIp) / 7;
+            $this->totalIp = ($this->lastIp-$this->firstIp)/7;
         }
         parent::__construct($app);
     }
@@ -152,49 +152,49 @@ 
                 // 如果数据文件没有被正确打开，则直接返回错误
                 throw new DtaException('数据库文件不存在!');
             }
-            $location['ip'] = $ip;   // 将输入的域名转化为IP地址
-            $ip = $this->packIp($location['ip']);   // 将输入的IP地址转化为可比较的IP地址
+            $location['ip'] = $ip; // 将输入的域名转化为IP地址
+            $ip = $this->packIp($location['ip']); // 将输入的IP地址转化为可比较的IP地址
             // 不合法的IP地址会被转化为255.255.255.255
             // 对分搜索
-            $l = 0;                         // 搜索的下边界
-            $u = $this->totalIp;            // 搜索的上边界
-            $findip = $this->lastIp;        // 如果没有找到就返回最后一条IP记录（QQWry.Dat的版本信息）
+            $l = 0; // 搜索的下边界
+            $u = $this->totalIp; // 搜索的上边界
+            $findip = $this->lastIp; // 如果没有找到就返回最后一条IP记录（QQWry.Dat的版本信息）
             while ($l <= $u) {              // 当上边界小于下边界时，查找失败
-                $i = floor(($l + $u) / 2);  // 计算近似中间记录
-                fseek($this->fp, $this->firstIp + $i * 7);
-                $beginip = strrev(fread($this->fp, 4));     // 获取中间记录的开始IP地址
+                $i = floor(($l+$u)/2); // 计算近似中间记录
+                fseek($this->fp, $this->firstIp+$i*7);
+                $beginip = strrev(fread($this->fp, 4)); // 获取中间记录的开始IP地址
                 // strrev函数在这里的作用是将little-endian的压缩IP地址转化为big-endian的格式
                 // 以便用于比较，后面相同。
                 if ($ip < $beginip) {       // 用户的IP小于中间记录的开始IP地址时
-                    $u = $i - 1;            // 将搜索的上边界修改为中间记录减一
-                } else {
+                    $u = $i-1; // 将搜索的上边界修改为中间记录减一
+                }else {
                     fseek($this->fp, $this->getLong3());
-                    $endip = strrev(fread($this->fp, 4));   // 获取中间记录的结束IP地址
+                    $endip = strrev(fread($this->fp, 4)); // 获取中间记录的结束IP地址
                     if ($ip > $endip) {     // 用户的IP大于中间记录的结束IP地址时
-                        $l = $i + 1;        // 将搜索的下边界修改为中间记录加一
-                    } else {                  // 用户的IP在中间记录的IP范围内时
-                        $findip = $this->firstIp + $i * 7;
-                        break;              // 则表示找到结果，退出循环
+                        $l = $i+1; // 将搜索的下边界修改为中间记录加一
+                    }else {                  // 用户的IP在中间记录的IP范围内时
+                        $findip = $this->firstIp+$i*7;
+                        break; // 则表示找到结果，退出循环
                     }
                 }
             }
             //获取查找到的IP地理位置信息
             fseek($this->fp, $findip);
-            $location['beginip'] = long2ip($this->getLong());   // 用户IP所在范围的开始地址
+            $location['beginip'] = long2ip($this->getLong()); // 用户IP所在范围的开始地址
             $offset = $this->getLong3();
             fseek($this->fp, $offset);
-            $location['endip'] = long2ip($this->getLong());     // 用户IP所在范围的结束地址
-            $byte = fread($this->fp, 1);    // 标志字节
+            $location['endip'] = long2ip($this->getLong()); // 用户IP所在范围的结束地址
+            $byte = fread($this->fp, 1); // 标志字节
             switch (ord($byte)) {
                 case 1:                     // 标志字节为1，表示国家和区域信息都被同时重定向
-                    $countryOffset = $this->getLong3();         // 重定向地址
+                    $countryOffset = $this->getLong3(); // 重定向地址
                     fseek($this->fp, $countryOffset);
-                    $byte = fread($this->fp, 1);    // 标志字节
+                    $byte = fread($this->fp, 1); // 标志字节
                     switch (ord($byte)) {
                         case 2:             // 标志字节为2，表示国家信息又被重定向
                             fseek($this->fp, $this->getLong3());
                             $location['all'] = $this->getString();
-                            fseek($this->fp, $countryOffset + 4);
+                            fseek($this->fp, $countryOffset+4);
                             $location['extend'] = $this->getExtendString();
                             break;
                         default:            // 否则，表示国家信息没有被重定向
@@ -206,7 +206,7 @@ 
                 case 2:                     // 标志字节为2，表示国家信息被重定向
                     fseek($this->fp, $this->getLong3());
                     $location['all'] = $this->getString();
-                    fseek($this->fp, $offset + 8);
+                    fseek($this->fp, $offset+8);
                     $location['extend'] = $this->getExtendString();
                     break;
                 default:                    // 否则，表示国家信息没有被重定向
@@ -264,14 +264,14 @@ 
             if (count($preg) == 4) {        //匹配 "浙江省杭州市"
                 $state = $preg[1] ? $preg[1] : ($preg[2] ? $preg[2] : $preg[3]);
                 $city = $preg[3];
-            } else if (count($preg) == 7) { //匹配 "浙江省杭州市江干区"
+            }else if (count($preg) == 7) { //匹配 "浙江省杭州市江干区"
                 $state = $preg[1] ? $preg[1] : ($preg[2] ? $preg[2] : $preg[3]);
                 $city = $preg[3];
                 $area = $preg[5];
-            } else if (count($preg) == 3) { //匹配 "香港"
+            }else if (count($preg) == 3) { //匹配 "香港"
                 $state = $preg[1] ? $preg[1] : $preg[2];
                 $city = $state;
-            } else if (count($preg) == 2) {  //匹配 "浙江省"
+            }else if (count($preg) == 2) {  //匹配 "浙江省"
                 $state = $preg[1] ? $preg[1] : $this->unknown;
             }
         }
@@ -296,7 +296,7 @@ 
     private function getLong3()
     {
         //将读取的little-endian编码的3个字节转化为长整型数
-        $result = unpack('Vlong', fread($this->fp, 3) . chr(0));
+        $result = unpack('Vlong', fread($this->fp, 3).chr(0));
         return $result['long'];
     }
 
@@ -323,7 +323,7 @@ 
     {
         $char = fread($this->fp, 1);
         while (ord($char) > 0) {        // 字符串按照C格式保存，以\0结束
-            $data .= $char;             // 将读取的字符连接到给定字符串之后
+            $data .= $char; // 将读取的字符连接到给定字符串之后
             $char = fread($this->fp, 1);
         }
         return $data;
@@ -335,7 +335,7 @@ 
      */
     private function getExtendString()
     {
-        $byte = fread($this->fp, 1);    // 标志字节
+        $byte = fread($this->fp, 1); // 标志字节
         switch (ord($byte)) {
             case 0:                     // 没有区域信息
                 $area = "";
@@ -382,7 +382,7 @@ 
                 }
                 $IPParts[$i] = str_pad(decHex($IPPart), 2, '0', STR_PAD_LEFT);
             }
-            return '0000:0000:0000:0000:0000:ffff:' . $IPParts[1] . $IPParts[2] . ':' . $IPParts[3] . $IPParts[4];
+            return '0000:0000:0000:0000:0000:ffff:'.$IPParts[1].$IPParts[2].':'.$IPParts[3].$IPParts[4];
         }
         return '';
     }
@@ -414,7 +414,7 @@ 
         $district['lng'] = '';
 
         if (!empty($province_name)) {
-            $json_province = json_decode(file_get_contents(__DIR__ . '/bin/province.json'), true);
+            $json_province = json_decode(file_get_contents(__DIR__.'/bin/province.json'), true);
             foreach ($json_province['rows'] as $key => $value) {
                 if ($value['name'] == $province_name) {
                     $province['name'] = $value['name'];
@@ -425,7 +425,7 @@ 
             }
         }
         if (!empty($city_name)) {
-            $json_city = json_decode(file_get_contents(__DIR__ . '/bin/city.json'), true);
+            $json_city = json_decode(file_get_contents(__DIR__.'/bin/city.json'), true);
             foreach ($json_city['rows'] as $key => $value) {
                 if ($value['name'] == $city_name) {
                     $city['name'] = $value['name'];
@@ -436,7 +436,7 @@ 
             }
         }
         if (!empty($district_name)) {
-            $json_district = json_decode(file_get_contents(__DIR__ . '/bin/district.json'), true);
+            $json_district = json_decode(file_get_contents(__DIR__.'/bin/district.json'), true);
             foreach ($json_district['rows'] as $key => $value) {
                 if ($value['name'] == $district_name) {
                     $district['name'] = $value['name'];

src/service/Ip/IpIpService.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     public function __construct(App $app)
     {
-        $this->reader = new IpIpReader(__DIR__ . '../bin/ipipfree.ipdb');
+        $this->reader = new IpIpReader(__DIR__.'../bin/ipipfree.ipdb');
         parent::__construct($app);
     }
 

src/service/taobao/bin/dingtalk/DingTalkClient.php

Indentation +322 added lines, -322 removed lines

@@ -1,27 +1,27 @@ 
 <?php
 class DingTalkClient
 {
-	/**@Author chaohui.zch copy from TopClient and modify 2016-12-14 **/
+    /**@Author chaohui.zch copy from TopClient and modify 2016-12-14 **/
 
     /**@Author chaohui.zch modify $gatewayUrl 2017-07-18 **/
     public $gatewayUrl = "https://eco.taobao.com/router/rest";
 
-	public $format = "xml";
+    public $format = "xml";
 
-	public $connectTimeout;
+    public $connectTimeout;
 
-	public $readTimeout;
+    public $readTimeout;
 
     public $apiCallType;
 
     public $httpMethod;
 
-	/** 是否打开入参check**/
-	public $checkRequest = true;
+    /** 是否打开入参check**/
+    public $checkRequest = true;
 
-	protected $apiVersion = "2.0";
+    protected $apiVersion = "2.0";
 
-	protected $sdkVersion = "dingtalk-sdk-php-20161214";
+    protected $sdkVersion = "dingtalk-sdk-php-20161214";
 
     public function __construct($apiCallType = null, $httpMethod = null, $format = "xml"){
         $this->apiCallType = $apiCallType;
@@ -29,80 +29,80 @@ 
         $this->format = $format;
     }
 
-	public function curl($url, $postFields = null)
-	{
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_FAILONERROR, false);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		if ($this->readTimeout) {
-			curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
-		}
-		if ($this->connectTimeout) {
-			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
-		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "dingtalk-sdk-php" );
-		//https 请求
-		if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-		}
-
-		if (is_array($postFields) && 0 < count($postFields))
-		{
-			$postBodyString = "";
-			$postMultipart = false;
-			foreach ($postFields as $k => $v)
-			{
-				if("@" != substr($v, 0, 1))//判断是不是文件上传
-				{
-					$postBodyString .= "$k=" . urlencode($v) . "&"; 
-				}
-				else//文件上传用multipart/form-data，否则用www-form-urlencoded
-				{
-					$postMultipart = true;
-					if(class_exists('\CURLFile')){
-						$postFields[$k] = new \CURLFile(substr($v, 1));
-					}
-				}
-			}
-			unset($k, $v);
-			curl_setopt($ch, CURLOPT_POST, true);
-			if ($postMultipart)
-			{
-				if (class_exists('\CURLFile')) {
-				    curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);
-				} else {
-				    if (defined('CURLOPT_SAFE_UPLOAD')) {
-				        curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false);
-				    }
-				}
-				curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
-			}
-			else
-			{
-				$header = array("content-type: application/x-www-form-urlencoded; charset=UTF-8");
-				curl_setopt($ch,CURLOPT_HTTPHEADER,$header);
-				curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString,0,-1));
-			}
-		}
-		$reponse = curl_exec($ch);
+    public function curl($url, $postFields = null)
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_FAILONERROR, false);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        if ($this->readTimeout) {
+            curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
+        }
+        if ($this->connectTimeout) {
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
+        }
+        curl_setopt ( $ch, CURLOPT_USERAGENT, "dingtalk-sdk-php" );
+        //https 请求
+        if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+        }
+
+        if (is_array($postFields) && 0 < count($postFields))
+        {
+            $postBodyString = "";
+            $postMultipart = false;
+            foreach ($postFields as $k => $v)
+            {
+                if("@" != substr($v, 0, 1))//判断是不是文件上传
+                {
+                    $postBodyString .= "$k=" . urlencode($v) . "&"; 
+                }
+                else//文件上传用multipart/form-data，否则用www-form-urlencoded
+                {
+                    $postMultipart = true;
+                    if(class_exists('\CURLFile')){
+                        $postFields[$k] = new \CURLFile(substr($v, 1));
+                    }
+                }
+            }
+            unset($k, $v);
+            curl_setopt($ch, CURLOPT_POST, true);
+            if ($postMultipart)
+            {
+                if (class_exists('\CURLFile')) {
+                    curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);
+                } else {
+                    if (defined('CURLOPT_SAFE_UPLOAD')) {
+                        curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false);
+                    }
+                }
+                curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
+            }
+            else
+            {
+                $header = array("content-type: application/x-www-form-urlencoded; charset=UTF-8");
+                curl_setopt($ch,CURLOPT_HTTPHEADER,$header);
+                curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString,0,-1));
+            }
+        }
+        $reponse = curl_exec($ch);
 		
-		if (curl_errno($ch))
-		{
-			throw new Exception(curl_error($ch),0);
-		}
-		else
-		{
-			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			if (200 !== $httpStatusCode)
-			{
-				throw new Exception($reponse,$httpStatusCode);
-			}
-		}
-		curl_close($ch);
-		return $reponse;
-	}
+        if (curl_errno($ch))
+        {
+            throw new Exception(curl_error($ch),0);
+        }
+        else
+        {
+            $httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+            if (200 !== $httpStatusCode)
+            {
+                throw new Exception($reponse,$httpStatusCode);
+            }
+        }
+        curl_close($ch);
+        return $reponse;
+    }
 
     public function curl_get($url,$apiFields = null)
     {
@@ -234,97 +234,97 @@ 
         return $reponse;
     }
 
-	public function curl_with_memory_file($url, $postFields = null, $fileFields = null)
-	{
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_FAILONERROR, false);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		if ($this->readTimeout) {
-			curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
-		}
-		if ($this->connectTimeout) {
-			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
-		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "dingtalk-sdk-php" );
-		//https 请求
-		if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
-			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-		}
-		//生成分隔符
-		$delimiter = '-------------' . uniqid();
-		//先将post的普通数据生成主体字符串
-		$data = '';
-		if($postFields != null){
-			foreach ($postFields as $name => $content) {
-			    $data .= "--" . $delimiter . "\r\n";
-			    $data .= 'Content-Disposition: form-data; name="' . $name . '"';
-			    //multipart/form-data 不需要urlencode，参见 http:stackoverflow.com/questions/6603928/should-i-url-encode-post-data
-			    $data .= "\r\n\r\n" . $content . "\r\n";
-			}
-			unset($name,$content);
-		}
-
-		//将上传的文件生成主体字符串
-		if($fileFields != null){
-			foreach ($fileFields as $name => $file) {
-			    $data .= "--" . $delimiter . "\r\n";
-			    $data .= 'Content-Disposition: form-data; name="' . $name . '"; filename="' . $file['filename'] . "\" \r\n";
-			    $data .= 'Content-Type: ' . $file['type'] . "\r\n\r\n";//多了个文档类型
-
-			    $data .= $file['content'] . "\r\n";
-			}
-			unset($name,$file);
-		}
-		//主体结束的分隔符
-		$data .= "--" . $delimiter . "--";
-
-		curl_setopt($ch, CURLOPT_POST, true);
-		curl_setopt($ch, CURLOPT_HTTPHEADER , array(
-		    'Content-Type: multipart/form-data; boundary=' . $delimiter,
-		    'Content-Length: ' . strlen($data))
-		); 
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-
-		$reponse = curl_exec($ch);
-		unset($data);
-
-		if (curl_errno($ch))
-		{
-			throw new Exception(curl_error($ch),0);
-		}
-		else
-		{
-			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			if (200 !== $httpStatusCode)
-			{
-				throw new Exception($reponse,$httpStatusCode);
-			}
-		}
-		curl_close($ch);
-		return $reponse;
-	}
-
-	protected function logCommunicationError($apiName, $requestUrl, $errorCode, $responseTxt)
-	{
-		$localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
-		$logger = new TopLogger;
-		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_" . "_" . date("Y-m-d") . ".log";
-		$logger->conf["separator"] = "^_^";
-		$logData = array(
-		date("Y-m-d H:i:s"),
-		$apiName,
-		$localIp,
-		PHP_OS,
-		$this->sdkVersion,
-		$requestUrl,
-		$errorCode,
-		str_replace("\n","",$responseTxt)
-		);
-		$logger->log($logData);
-	}
+    public function curl_with_memory_file($url, $postFields = null, $fileFields = null)
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_FAILONERROR, false);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        if ($this->readTimeout) {
+            curl_setopt($ch, CURLOPT_TIMEOUT, $this->readTimeout);
+        }
+        if ($this->connectTimeout) {
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
+        }
+        curl_setopt ( $ch, CURLOPT_USERAGENT, "dingtalk-sdk-php" );
+        //https 请求
+        if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+        }
+        //生成分隔符
+        $delimiter = '-------------' . uniqid();
+        //先将post的普通数据生成主体字符串
+        $data = '';
+        if($postFields != null){
+            foreach ($postFields as $name => $content) {
+                $data .= "--" . $delimiter . "\r\n";
+                $data .= 'Content-Disposition: form-data; name="' . $name . '"';
+                //multipart/form-data 不需要urlencode，参见 http:stackoverflow.com/questions/6603928/should-i-url-encode-post-data
+                $data .= "\r\n\r\n" . $content . "\r\n";
+            }
+            unset($name,$content);
+        }
+
+        //将上传的文件生成主体字符串
+        if($fileFields != null){
+            foreach ($fileFields as $name => $file) {
+                $data .= "--" . $delimiter . "\r\n";
+                $data .= 'Content-Disposition: form-data; name="' . $name . '"; filename="' . $file['filename'] . "\" \r\n";
+                $data .= 'Content-Type: ' . $file['type'] . "\r\n\r\n";//多了个文档类型
+
+                $data .= $file['content'] . "\r\n";
+            }
+            unset($name,$file);
+        }
+        //主体结束的分隔符
+        $data .= "--" . $delimiter . "--";
+
+        curl_setopt($ch, CURLOPT_POST, true);
+        curl_setopt($ch, CURLOPT_HTTPHEADER , array(
+            'Content-Type: multipart/form-data; boundary=' . $delimiter,
+            'Content-Length: ' . strlen($data))
+        ); 
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+
+        $reponse = curl_exec($ch);
+        unset($data);
+
+        if (curl_errno($ch))
+        {
+            throw new Exception(curl_error($ch),0);
+        }
+        else
+        {
+            $httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+            if (200 !== $httpStatusCode)
+            {
+                throw new Exception($reponse,$httpStatusCode);
+            }
+        }
+        curl_close($ch);
+        return $reponse;
+    }
+
+    protected function logCommunicationError($apiName, $requestUrl, $errorCode, $responseTxt)
+    {
+        $localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
+        $logger = new TopLogger;
+        $logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_" . "_" . date("Y-m-d") . ".log";
+        $logger->conf["separator"] = "^_^";
+        $logData = array(
+        date("Y-m-d H:i:s"),
+        $apiName,
+        $localIp,
+        PHP_OS,
+        $this->sdkVersion,
+        $requestUrl,
+        $errorCode,
+        str_replace("\n","",$responseTxt)
+        );
+        $logger->log($logData);
+    }
 
     public function execute($request, $session = null,$bestUrl = null){
         if(DingTalkConstant::$CALL_TYPE_OAPI == $this->apiCallType){
@@ -342,7 +342,7 @@ 
         return $this->executeWithCorpId($request,$bestUrl, $accessKey, $accessSecret, $suiteTicket, null);
     }
 
-	public function executeWithCorpId($request, $bestUrl = null, $accessKey, $accessSecret, $suiteTicket, $corpId) {
+    public function executeWithCorpId($request, $bestUrl = null, $accessKey, $accessSecret, $suiteTicket, $corpId) {
         if(DingTalkConstant::$CALL_TYPE_OAPI == $this->apiCallType){
             return $this->_executeOapi($request, null, $bestUrl,$accessKey, $accessSecret, $suiteTicket, $corpId);
         }else{
@@ -494,160 +494,160 @@ 
     }
 
     private function _execute($request, $session = null,$bestUrl = null)
-	{
-		$result =  new ResultSet(); 
-		if($this->checkRequest) {
-			try {
-				$request->check();
-			} catch (Exception $e) {
-
-				$result->code = $e->getCode();
-				$result->msg = $e->getMessage();
-				return $result;
-			}
-		}
-		//组装系统参数
-		$sysParams["v"] = $this->apiVersion;
-		$sysParams["format"] = $this->format;
-		$sysParams["method"] = $request->getApiMethodName();
-		$sysParams["timestamp"] = date("Y-m-d H:i:s");
-		if (null != $session)
-		{
-			$sysParams["session"] = $session;
-		}
-		$apiParams = array();
-		//获取业务参数
-		$apiParams = $request->getApiParas();
-
-
-		//系统参数放入GET请求串
-		if($bestUrl){
+    {
+        $result =  new ResultSet(); 
+        if($this->checkRequest) {
+            try {
+                $request->check();
+            } catch (Exception $e) {
+
+                $result->code = $e->getCode();
+                $result->msg = $e->getMessage();
+                return $result;
+            }
+        }
+        //组装系统参数
+        $sysParams["v"] = $this->apiVersion;
+        $sysParams["format"] = $this->format;
+        $sysParams["method"] = $request->getApiMethodName();
+        $sysParams["timestamp"] = date("Y-m-d H:i:s");
+        if (null != $session)
+        {
+            $sysParams["session"] = $session;
+        }
+        $apiParams = array();
+        //获取业务参数
+        $apiParams = $request->getApiParas();
+
+
+        //系统参数放入GET请求串
+        if($bestUrl){
             if(strpos($bestUrl,'?') === false){
                 $requestUrl = $bestUrl."?";
             }else{
                 $requestUrl = $bestUrl;
             }
-			$sysParams["partner_id"] = $this->getClusterTag();
-		}else{
-			$requestUrl = $this->gatewayUrl."?";
-			$sysParams["partner_id"] = $this->sdkVersion;
-		}
-
-		foreach ($sysParams as $sysParamKey => $sysParamValue)
-		{
-			// if(strcmp($sysParamKey,"timestamp") != 0)
-			$requestUrl .= "$sysParamKey=" . urlencode($sysParamValue) . "&";
-		}
-
-		$fileFields = array();
-		foreach ($apiParams as $key => $value) {
-			if(is_array($value) && array_key_exists('type',$value) && array_key_exists('content',$value) ){
-				$value['name'] = $key;
-				$fileFields[$key] = $value;
-				unset($apiParams[$key]);
-			}
-		}
-
-		// $requestUrl .= "timestamp=" . urlencode($sysParams["timestamp"]) . "&";
-		$requestUrl = substr($requestUrl, 0, -1);
-
-		//发起HTTP请求
-		try
-		{
-			if(count($fileFields) > 0){
-				$resp = $this->curl_with_memory_file($requestUrl, $apiParams, $fileFields);
-			}else{
-				$resp = $this->curl($requestUrl, $apiParams);
-			}
-		}
-		catch (Exception $e)
-		{
-			$this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
-			$result->code = $e->getCode();
-			$result->msg = $e->getMessage();
-			return $result;
-		}
-
-		unset($apiParams);
-		unset($fileFields);
-		//解析TOP返回结果
-		$respWellFormed = false;
-		if ("json" == $this->format)
-		{
-			$respObject = json_decode($resp);
-			if (null !== $respObject)
-			{
-				$respWellFormed = true;
-				foreach ($respObject as $propKey => $propValue)
-				{
-					$respObject = $propValue;
-				}
-			}
-		}
-		else if("xml" == $this->format)
-		{
-			$respObject = @simplexml_load_string($resp);
-			if (false !== $respObject)
-			{
-				$respWellFormed = true;
-			}
-		}
-
-		//返回的HTTP文本不是标准JSON或者XML，记下错误日志
-		if (false === $respWellFormed)
-		{
-			$this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_RESPONSE_NOT_WELL_FORMED",$resp);
-			$result->code = 0;
-			$result->msg = "HTTP_RESPONSE_NOT_WELL_FORMED";
-			return $result;
-		}
-
-		//如果TOP返回了错误码，记录到业务错误日志中
-		if (isset($respObject->code))
-		{
-			$logger = new TopLogger;
-			$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_biz_err_" .  "_" . date("Y-m-d") . ".log";
-			$logger->log(array(
-				date("Y-m-d H:i:s"),
-				$resp
-			));
-		}
-		return $respObject;
-	}
-
-	public function exec($paramsArray)
-	{
-		if (!isset($paramsArray["method"]))
-		{
-			trigger_error("No api name passed");
-		}
-		$inflector = new LtInflector;
-		$inflector->conf["separator"] = ".";
-		$requestClassName = ucfirst($inflector->camelize(substr($paramsArray["method"], 7))) . "Request";
-		if (!class_exists($requestClassName))
-		{
-			trigger_error("No such dingtalk-api: " . $paramsArray["method"]);
-		}
-
-		$session = isset($paramsArray["session"]) ? $paramsArray["session"] : null;
-
-		$req = new $requestClassName;
-		foreach($paramsArray as $paraKey => $paraValue)
-		{
-			$inflector->conf["separator"] = "_";
-			$setterMethodName = $inflector->camelize($paraKey);
-			$inflector->conf["separator"] = ".";
-			$setterMethodName = "set" . $inflector->camelize($setterMethodName);
-			if (method_exists($req, $setterMethodName))
-			{
-				$req->$setterMethodName($paraValue);
-			}
-		}
-		return $this->execute($req, $session);
-	}
-
-	private function getClusterTag()
+            $sysParams["partner_id"] = $this->getClusterTag();
+        }else{
+            $requestUrl = $this->gatewayUrl."?";
+            $sysParams["partner_id"] = $this->sdkVersion;
+        }
+
+        foreach ($sysParams as $sysParamKey => $sysParamValue)
+        {
+            // if(strcmp($sysParamKey,"timestamp") != 0)
+            $requestUrl .= "$sysParamKey=" . urlencode($sysParamValue) . "&";
+        }
+
+        $fileFields = array();
+        foreach ($apiParams as $key => $value) {
+            if(is_array($value) && array_key_exists('type',$value) && array_key_exists('content',$value) ){
+                $value['name'] = $key;
+                $fileFields[$key] = $value;
+                unset($apiParams[$key]);
+            }
+        }
+
+        // $requestUrl .= "timestamp=" . urlencode($sysParams["timestamp"]) . "&";
+        $requestUrl = substr($requestUrl, 0, -1);
+
+        //发起HTTP请求
+        try
+        {
+            if(count($fileFields) > 0){
+                $resp = $this->curl_with_memory_file($requestUrl, $apiParams, $fileFields);
+            }else{
+                $resp = $this->curl($requestUrl, $apiParams);
+            }
+        }
+        catch (Exception $e)
+        {
+            $this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
+            $result->code = $e->getCode();
+            $result->msg = $e->getMessage();
+            return $result;
+        }
+
+        unset($apiParams);
+        unset($fileFields);
+        //解析TOP返回结果
+        $respWellFormed = false;
+        if ("json" == $this->format)
+        {
+            $respObject = json_decode($resp);
+            if (null !== $respObject)
+            {
+                $respWellFormed = true;
+                foreach ($respObject as $propKey => $propValue)
+                {
+                    $respObject = $propValue;
+                }
+            }
+        }
+        else if("xml" == $this->format)
+        {
+            $respObject = @simplexml_load_string($resp);
+            if (false !== $respObject)
+            {
+                $respWellFormed = true;
+            }
+        }
+
+        //返回的HTTP文本不是标准JSON或者XML，记下错误日志
+        if (false === $respWellFormed)
+        {
+            $this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_RESPONSE_NOT_WELL_FORMED",$resp);
+            $result->code = 0;
+            $result->msg = "HTTP_RESPONSE_NOT_WELL_FORMED";
+            return $result;
+        }
+
+        //如果TOP返回了错误码，记录到业务错误日志中
+        if (isset($respObject->code))
+        {
+            $logger = new TopLogger;
+            $logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_biz_err_" .  "_" . date("Y-m-d") . ".log";
+            $logger->log(array(
+                date("Y-m-d H:i:s"),
+                $resp
+            ));
+        }
+        return $respObject;
+    }
+
+    public function exec($paramsArray)
+    {
+        if (!isset($paramsArray["method"]))
+        {
+            trigger_error("No api name passed");
+        }
+        $inflector = new LtInflector;
+        $inflector->conf["separator"] = ".";
+        $requestClassName = ucfirst($inflector->camelize(substr($paramsArray["method"], 7))) . "Request";
+        if (!class_exists($requestClassName))
+        {
+            trigger_error("No such dingtalk-api: " . $paramsArray["method"]);
+        }
+
+        $session = isset($paramsArray["session"]) ? $paramsArray["session"] : null;
+
+        $req = new $requestClassName;
+        foreach($paramsArray as $paraKey => $paraValue)
+        {
+            $inflector->conf["separator"] = "_";
+            $setterMethodName = $inflector->camelize($paraKey);
+            $inflector->conf["separator"] = ".";
+            $setterMethodName = "set" . $inflector->camelize($setterMethodName);
+            if (method_exists($req, $setterMethodName))
+            {
+                $req->$setterMethodName($paraValue);
+            }
+        }
+        return $this->execute($req, $session);
+    }
+
+    private function getClusterTag()
     {
-	    return substr($this->sdkVersion,0,11)."-cluster".substr($this->sdkVersion,11);
+        return substr($this->sdkVersion,0,11)."-cluster".substr($this->sdkVersion,11);
     }
 }

Spacing +104 added lines, -104 removed lines

@@ -23,7 +23,7 @@ 
 
 	protected $sdkVersion = "dingtalk-sdk-php-20161214";
 
-    public function __construct($apiCallType = null, $httpMethod = null, $format = "xml"){
+    public function __construct($apiCallType = null, $httpMethod = null, $format = "xml") {
         $this->apiCallType = $apiCallType;
         $this->httpMethod = $httpMethod;
         $this->format = $format;
@@ -41,9 +41,9 @@ 
 		if ($this->connectTimeout) {
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
 		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "dingtalk-sdk-php" );
+		curl_setopt($ch, CURLOPT_USERAGENT, "dingtalk-sdk-php");
 		//https 请求
-		if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
+		if (strlen($url) > 5 && strtolower(substr($url, 0, 5)) == "https") {
 			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 		}
@@ -54,14 +54,14 @@ 
 			$postMultipart = false;
 			foreach ($postFields as $k => $v)
 			{
-				if("@" != substr($v, 0, 1))//判断是不是文件上传
+				if ("@" != substr($v, 0, 1))//判断是不是文件上传
 				{
-					$postBodyString .= "$k=" . urlencode($v) . "&"; 
+					$postBodyString .= "$k=".urlencode($v)."&"; 
 				}
 				else//文件上传用multipart/form-data，否则用www-form-urlencoded
 				{
 					$postMultipart = true;
-					if(class_exists('\CURLFile')){
+					if (class_exists('\CURLFile')) {
 						$postFields[$k] = new \CURLFile(substr($v, 1));
 					}
 				}
@@ -72,7 +72,7 @@ 
 			{
 				if (class_exists('\CURLFile')) {
 				    curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);
-				} else {
+				}else {
 				    if (defined('CURLOPT_SAFE_UPLOAD')) {
 				        curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false);
 				    }
@@ -82,35 +82,35 @@ 
 			else
 			{
 				$header = array("content-type: application/x-www-form-urlencoded; charset=UTF-8");
-				curl_setopt($ch,CURLOPT_HTTPHEADER,$header);
-				curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString,0,-1));
+				curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
+				curl_setopt($ch, CURLOPT_POSTFIELDS, substr($postBodyString, 0, -1));
 			}
 		}
 		$reponse = curl_exec($ch);
 		
 		if (curl_errno($ch))
 		{
-			throw new Exception(curl_error($ch),0);
+			throw new Exception(curl_error($ch), 0);
 		}
 		else
 		{
 			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 			if (200 !== $httpStatusCode)
 			{
-				throw new Exception($reponse,$httpStatusCode);
+				throw new Exception($reponse, $httpStatusCode);
 			}
 		}
 		curl_close($ch);
 		return $reponse;
 	}
 
-    public function curl_get($url,$apiFields = null)
+    public function curl_get($url, $apiFields = null)
     {
         $ch = curl_init();
 
         foreach ($apiFields as $key => $value)
         {
-            $url .= "&" ."$key=" . urlencode($value);
+            $url .= "&"."$key=".urlencode($value);
         }
 
         curl_setopt($ch, CURLOPT_URL, $url);
@@ -130,10 +130,10 @@ 
             curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
         }
 
-        curl_setopt ( $ch, CURLOPT_USERAGENT, "dingtalk-sdk-php" );
+        curl_setopt($ch, CURLOPT_USERAGENT, "dingtalk-sdk-php");
 
         //https ignore ssl check ?
-        if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" )
+        if (strlen($url) > 5 && strtolower(substr($url, 0, 5)) == "https")
         {
             curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
             curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
@@ -143,14 +143,14 @@ 
 
         if (curl_errno($ch))
         {
-            throw new Exception(curl_error($ch),0);
+            throw new Exception(curl_error($ch), 0);
         }
         else
         {
             $httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
             if (200 !== $httpStatusCode)
             {
-                throw new Exception($reponse,$httpStatusCode);
+                throw new Exception($reponse, $httpStatusCode);
             }
         }
         curl_close($ch);
@@ -169,9 +169,9 @@ 
         if ($this->connectTimeout) {
             curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
         }
-        curl_setopt ( $ch, CURLOPT_USERAGENT, "dingtalk-sdk-php" );
+        curl_setopt($ch, CURLOPT_USERAGENT, "dingtalk-sdk-php");
         //https 请求
-        if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
+        if (strlen($url) > 5 && strtolower(substr($url, 0, 5)) == "https") {
             curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
             curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
         }
@@ -182,17 +182,17 @@ 
             $postMultipart = false;
             foreach ($postFields as $k => $v)
             {
-                if(!is_string($v)){
+                if (!is_string($v)) {
                     $v = json_encode($v);
                 }
-                if("@" != substr($v, 0, 1))//判断是不是文件上传
+                if ("@" != substr($v, 0, 1))//判断是不是文件上传
                 {
-                    $postBodyString .= "$k=" . urlencode($v) . "&";
+                    $postBodyString .= "$k=".urlencode($v)."&";
                 }
                 else//文件上传用multipart/form-data，否则用www-form-urlencoded
                 {
                     $postMultipart = true;
-                    if(class_exists('\CURLFile')){
+                    if (class_exists('\CURLFile')) {
                         $postFields[$k] = new \CURLFile(substr($v, 1));
                     }
                 }
@@ -203,7 +203,7 @@ 
             {
                 if (class_exists('\CURLFile')) {
                     curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);
-                } else {
+                }else {
                     if (defined('CURLOPT_SAFE_UPLOAD')) {
                         curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false);
                     }
@@ -212,7 +212,7 @@ 
             }
             else {
                 $header = array("Content-Type: application/json; charset=utf-8", "Content-Length:".strlen(json_encode($postFields)));
-                curl_setopt($ch,CURLOPT_HTTPHEADER,$header);
+                curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
                 curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($postFields));
             }
         }
@@ -220,14 +220,14 @@ 
 
         if (curl_errno($ch))
         {
-            throw new Exception(curl_error($ch),0);
+            throw new Exception(curl_error($ch), 0);
         }
         else
         {
             $httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
             if (200 !== $httpStatusCode)
             {
-                throw new Exception($reponse,$httpStatusCode);
+                throw new Exception($reponse, $httpStatusCode);
             }
         }
         curl_close($ch);
@@ -246,44 +246,44 @@ 
 		if ($this->connectTimeout) {
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
 		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "dingtalk-sdk-php" );
+		curl_setopt($ch, CURLOPT_USERAGENT, "dingtalk-sdk-php");
 		//https 请求
-		if(strlen($url) > 5 && strtolower(substr($url,0,5)) == "https" ) {
+		if (strlen($url) > 5 && strtolower(substr($url, 0, 5)) == "https") {
 			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 			curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 		}
 		//生成分隔符
-		$delimiter = '-------------' . uniqid();
+		$delimiter = '-------------'.uniqid();
 		//先将post的普通数据生成主体字符串
 		$data = '';
-		if($postFields != null){
+		if ($postFields != null) {
 			foreach ($postFields as $name => $content) {
-			    $data .= "--" . $delimiter . "\r\n";
-			    $data .= 'Content-Disposition: form-data; name="' . $name . '"';
+			    $data .= "--".$delimiter."\r\n";
+			    $data .= 'Content-Disposition: form-data; name="'.$name.'"';
 			    //multipart/form-data 不需要urlencode，参见 http:stackoverflow.com/questions/6603928/should-i-url-encode-post-data
-			    $data .= "\r\n\r\n" . $content . "\r\n";
+			    $data .= "\r\n\r\n".$content."\r\n";
 			}
-			unset($name,$content);
+			unset($name, $content);
 		}
 
 		//将上传的文件生成主体字符串
-		if($fileFields != null){
+		if ($fileFields != null) {
 			foreach ($fileFields as $name => $file) {
-			    $data .= "--" . $delimiter . "\r\n";
-			    $data .= 'Content-Disposition: form-data; name="' . $name . '"; filename="' . $file['filename'] . "\" \r\n";
-			    $data .= 'Content-Type: ' . $file['type'] . "\r\n\r\n";//多了个文档类型
+			    $data .= "--".$delimiter."\r\n";
+			    $data .= 'Content-Disposition: form-data; name="'.$name.'"; filename="'.$file['filename']."\" \r\n";
+			    $data .= 'Content-Type: '.$file['type']."\r\n\r\n"; //多了个文档类型
 
-			    $data .= $file['content'] . "\r\n";
+			    $data .= $file['content']."\r\n";
 			}
-			unset($name,$file);
+			unset($name, $file);
 		}
 		//主体结束的分隔符
-		$data .= "--" . $delimiter . "--";
+		$data .= "--".$delimiter."--";
 
 		curl_setopt($ch, CURLOPT_POST, true);
-		curl_setopt($ch, CURLOPT_HTTPHEADER , array(
-		    'Content-Type: multipart/form-data; boundary=' . $delimiter,
-		    'Content-Length: ' . strlen($data))
+		curl_setopt($ch, CURLOPT_HTTPHEADER, array(
+		    'Content-Type: multipart/form-data; boundary='.$delimiter,
+		    'Content-Length: '.strlen($data))
 		); 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
@@ -293,14 +293,14 @@ 
 
 		if (curl_errno($ch))
 		{
-			throw new Exception(curl_error($ch),0);
+			throw new Exception(curl_error($ch), 0);
 		}
 		else
 		{
 			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 			if (200 !== $httpStatusCode)
 			{
-				throw new Exception($reponse,$httpStatusCode);
+				throw new Exception($reponse, $httpStatusCode);
 			}
 		}
 		curl_close($ch);
@@ -311,7 +311,7 @@ 
 	{
 		$localIp = isset($_SERVER["SERVER_ADDR"]) ? $_SERVER["SERVER_ADDR"] : "CLI";
 		$logger = new TopLogger;
-		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_comm_err_" . "_" . date("Y-m-d") . ".log";
+		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/').'/'."logs/top_comm_err_"."_".date("Y-m-d").".log";
 		$logger->conf["separator"] = "^_^";
 		$logData = array(
 		date("Y-m-d H:i:s"),
@@ -321,38 +321,38 @@ 
 		$this->sdkVersion,
 		$requestUrl,
 		$errorCode,
-		str_replace("\n","",$responseTxt)
+		str_replace("\n", "", $responseTxt)
 		);
 		$logger->log($logData);
 	}
 
-    public function execute($request, $session = null,$bestUrl = null){
-        if(DingTalkConstant::$CALL_TYPE_OAPI == $this->apiCallType){
+    public function execute($request, $session = null, $bestUrl = null) {
+        if (DingTalkConstant::$CALL_TYPE_OAPI == $this->apiCallType) {
             return $this->_executeOapi($request, $session, $bestUrl, null, null, null, null);
-        }else{
+        }else {
             return $this->_execute($request, $session, $bestUrl);
         }
     }
 
-    public function executeWithAccessKey($request, $bestUrl = null, $accessKey, $accessSecret){
+    public function executeWithAccessKey($request, $bestUrl = null, $accessKey, $accessSecret) {
         return $this->executeWithCorpId($request, $bestUrl, $accessKey, $accessSecret, null, null);
     }
 
-    public function executeWithSuiteTicket($request,$bestUrl = null, $accessKey, $accessSecret, $suiteTicket){
-        return $this->executeWithCorpId($request,$bestUrl, $accessKey, $accessSecret, $suiteTicket, null);
+    public function executeWithSuiteTicket($request, $bestUrl = null, $accessKey, $accessSecret, $suiteTicket) {
+        return $this->executeWithCorpId($request, $bestUrl, $accessKey, $accessSecret, $suiteTicket, null);
     }
 
 	public function executeWithCorpId($request, $bestUrl = null, $accessKey, $accessSecret, $suiteTicket, $corpId) {
-        if(DingTalkConstant::$CALL_TYPE_OAPI == $this->apiCallType){
-            return $this->_executeOapi($request, null, $bestUrl,$accessKey, $accessSecret, $suiteTicket, $corpId);
-        }else{
+        if (DingTalkConstant::$CALL_TYPE_OAPI == $this->apiCallType) {
+            return $this->_executeOapi($request, null, $bestUrl, $accessKey, $accessSecret, $suiteTicket, $corpId);
+        }else {
             return $this->_execute($request, null, $bestUrl);
         }
     }
 
-    private function _executeOapi($request, $session = null,$bestUrl = null,$accessKey, $accessSecret, $suiteTicket, $corpId){
-        $result =  new ResultSet();
-        if($this->checkRequest) {
+    private function _executeOapi($request, $session = null, $bestUrl = null, $accessKey, $accessSecret, $suiteTicket, $corpId) {
+        $result = new ResultSet();
+        if ($this->checkRequest) {
             try {
                 $request->check();
             } catch (Exception $e) {
@@ -365,16 +365,16 @@ 
 
         $sysParams["method"] = $request->getApiMethodName();
         //系统参数放入GET请求串
-        if($bestUrl){
-            if(strpos($bestUrl,'?') === false){
+        if ($bestUrl) {
+            if (strpos($bestUrl, '?') === false) {
                 $requestUrl = $bestUrl."?";
-            }else{
+            }else {
                 $requestUrl = $bestUrl;
             }
-        }else{
+        }else {
             $requestUrl = $this->gatewayUrl."?";
         }
-        if(null != $accessKey){
+        if (null != $accessKey) {
             $timestamp = $this->getMillisecond();
             // 验证签名有效性
             $canonicalString = $this->getCanonicalStringForIsv($timestamp, $suiteTicket);
@@ -383,17 +383,17 @@ 
             $queryParams["accessKey"] = $accessKey;
             $queryParams["signature"] = $signature;
             $queryParams["timestamp"] = $timestamp+"";
-            if($suiteTicket != null) {
+            if ($suiteTicket != null) {
                 $queryParams["suiteTicket"] = $suiteTicket;
             }
-            if($corpId != null){
-                $queryParams["corpId"] =  $corpId;
+            if ($corpId != null) {
+                $queryParams["corpId"] = $corpId;
             }
             foreach ($queryParams as $queryParamKey => $queryParamValue) {
-                $requestUrl .= "$queryParamKey=" . urlencode($queryParamValue) . "&";
+                $requestUrl .= "$queryParamKey=".urlencode($queryParamValue)."&";
             }
-        }else{
-            $requestUrl .= "access_token=" . urlencode($session) . "&";
+        }else {
+            $requestUrl .= "access_token=".urlencode($session)."&";
         }
 
         $apiParams = array();
@@ -401,7 +401,7 @@ 
         $apiParams = $request->getApiParas();
         $fileFields = array();
         foreach ($apiParams as $key => $value) {
-            if(is_array($value) && array_key_exists('type',$value) && array_key_exists('content',$value) ){
+            if (is_array($value) && array_key_exists('type', $value) && array_key_exists('content', $value)) {
                 $value['name'] = $key;
                 $fileFields[$key] = $value;
                 unset($apiParams[$key]);
@@ -414,19 +414,19 @@ 
         //发起HTTP请求
         try
         {
-            if(count($fileFields) > 0){
+            if (count($fileFields) > 0) {
                 $resp = $this->curl_with_memory_file($requestUrl, $apiParams, $fileFields);
-            }else{
-                if(DingTalkConstant::$METHOD_POST == $this->httpMethod){
+            }else {
+                if (DingTalkConstant::$METHOD_POST == $this->httpMethod) {
                     $resp = $this->curl_json($requestUrl, $apiParams);
-                }else{
+                }else {
                     $resp = $this->curl_get($requestUrl, $apiParams);
                 }
             }
         }
         catch (Exception $e)
         {
-            $this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
+            $this->logCommunicationError($sysParams["method"], $requestUrl, "HTTP_ERROR_".$e->getCode(), $e->getMessage());
             $result->code = $e->getCode();
             $result->msg = $e->getMessage();
             return $result;
@@ -444,7 +444,7 @@ 
                 $respWellFormed = true;
             }
         }
-        else if("xml" == $this->format)
+        else if ("xml" == $this->format)
         {
             $respObject = @simplexml_load_string($resp);
             if (false !== $respObject)
@@ -456,7 +456,7 @@ 
         //返回的HTTP文本不是标准JSON或者XML，记下错误日志
         if (false === $respWellFormed)
         {
-            $this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_RESPONSE_NOT_WELL_FORMED",$resp);
+            $this->logCommunicationError($sysParams["method"], $requestUrl, "HTTP_RESPONSE_NOT_WELL_FORMED", $resp);
             $result->code = 0;
             $result->msg = "HTTP_RESPONSE_NOT_WELL_FORMED";
             return $result;
@@ -466,7 +466,7 @@ 
         if (isset($respObject->code))
         {
             $logger = new TopLogger;
-            $logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_biz_err_" .  "_" . date("Y-m-d") . ".log";
+            $logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/').'/'."logs/top_biz_err_"."_".date("Y-m-d").".log";
             $logger->log(array(
                 date("Y-m-d H:i:s"),
                 $resp
@@ -477,26 +477,26 @@ 
 
     private function getMillisecond() {
         list($s1, $s2) = explode(' ', microtime());
-        return (float)sprintf('%.0f', (floatval($s1) + floatval($s2)) * 1000);
+        return (float)sprintf('%.0f', (floatval($s1)+floatval($s2))*1000);
     }
 
     private function getCanonicalStringForIsv($timestamp, $suiteTicket) {
         $result = $timestamp;
-        if($suiteTicket != null) {
+        if ($suiteTicket != null) {
             $result .= "\n".$suiteTicket;
         }
         return $result;
     }
 
-    private function computeSignature($accessSecret, $canonicalString){
+    private function computeSignature($accessSecret, $canonicalString) {
         $s = hash_hmac('sha256', $canonicalString, $accessSecret, true);
         return base64_encode($s);
     }
 
-    private function _execute($request, $session = null,$bestUrl = null)
+    private function _execute($request, $session = null, $bestUrl = null)
 	{
-		$result =  new ResultSet(); 
-		if($this->checkRequest) {
+		$result = new ResultSet(); 
+		if ($this->checkRequest) {
 			try {
 				$request->check();
 			} catch (Exception $e) {
@@ -521,14 +521,14 @@ 
 
 
 		//系统参数放入GET请求串
-		if($bestUrl){
-            if(strpos($bestUrl,'?') === false){
+		if ($bestUrl) {
+            if (strpos($bestUrl, '?') === false) {
                 $requestUrl = $bestUrl."?";
-            }else{
+            }else {
                 $requestUrl = $bestUrl;
             }
 			$sysParams["partner_id"] = $this->getClusterTag();
-		}else{
+		}else {
 			$requestUrl = $this->gatewayUrl."?";
 			$sysParams["partner_id"] = $this->sdkVersion;
 		}
@@ -536,12 +536,12 @@ 
 		foreach ($sysParams as $sysParamKey => $sysParamValue)
 		{
 			// if(strcmp($sysParamKey,"timestamp") != 0)
-			$requestUrl .= "$sysParamKey=" . urlencode($sysParamValue) . "&";
+			$requestUrl .= "$sysParamKey=".urlencode($sysParamValue)."&";
 		}
 
 		$fileFields = array();
 		foreach ($apiParams as $key => $value) {
-			if(is_array($value) && array_key_exists('type',$value) && array_key_exists('content',$value) ){
+			if (is_array($value) && array_key_exists('type', $value) && array_key_exists('content', $value)) {
 				$value['name'] = $key;
 				$fileFields[$key] = $value;
 				unset($apiParams[$key]);
@@ -554,15 +554,15 @@ 
 		//发起HTTP请求
 		try
 		{
-			if(count($fileFields) > 0){
+			if (count($fileFields) > 0) {
 				$resp = $this->curl_with_memory_file($requestUrl, $apiParams, $fileFields);
-			}else{
+			}else {
 				$resp = $this->curl($requestUrl, $apiParams);
 			}
 		}
 		catch (Exception $e)
 		{
-			$this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
+			$this->logCommunicationError($sysParams["method"], $requestUrl, "HTTP_ERROR_".$e->getCode(), $e->getMessage());
 			$result->code = $e->getCode();
 			$result->msg = $e->getMessage();
 			return $result;
@@ -584,7 +584,7 @@ 
 				}
 			}
 		}
-		else if("xml" == $this->format)
+		else if ("xml" == $this->format)
 		{
 			$respObject = @simplexml_load_string($resp);
 			if (false !== $respObject)
@@ -596,7 +596,7 @@ 
 		//返回的HTTP文本不是标准JSON或者XML，记下错误日志
 		if (false === $respWellFormed)
 		{
-			$this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_RESPONSE_NOT_WELL_FORMED",$resp);
+			$this->logCommunicationError($sysParams["method"], $requestUrl, "HTTP_RESPONSE_NOT_WELL_FORMED", $resp);
 			$result->code = 0;
 			$result->msg = "HTTP_RESPONSE_NOT_WELL_FORMED";
 			return $result;
@@ -606,7 +606,7 @@ 
 		if (isset($respObject->code))
 		{
 			$logger = new TopLogger;
-			$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_biz_err_" .  "_" . date("Y-m-d") . ".log";
+			$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/').'/'."logs/top_biz_err_"."_".date("Y-m-d").".log";
 			$logger->log(array(
 				date("Y-m-d H:i:s"),
 				$resp
@@ -623,21 +623,21 @@ 
 		}
 		$inflector = new LtInflector;
 		$inflector->conf["separator"] = ".";
-		$requestClassName = ucfirst($inflector->camelize(substr($paramsArray["method"], 7))) . "Request";
+		$requestClassName = ucfirst($inflector->camelize(substr($paramsArray["method"], 7)))."Request";
 		if (!class_exists($requestClassName))
 		{
-			trigger_error("No such dingtalk-api: " . $paramsArray["method"]);
+			trigger_error("No such dingtalk-api: ".$paramsArray["method"]);
 		}
 
 		$session = isset($paramsArray["session"]) ? $paramsArray["session"] : null;
 
 		$req = new $requestClassName;
-		foreach($paramsArray as $paraKey => $paraValue)
+		foreach ($paramsArray as $paraKey => $paraValue)
 		{
 			$inflector->conf["separator"] = "_";
 			$setterMethodName = $inflector->camelize($paraKey);
 			$inflector->conf["separator"] = ".";
-			$setterMethodName = "set" . $inflector->camelize($setterMethodName);
+			$setterMethodName = "set".$inflector->camelize($setterMethodName);
 			if (method_exists($req, $setterMethodName))
 			{
 				$req->$setterMethodName($paraValue);
@@ -648,6 +648,6 @@ 
 
 	private function getClusterTag()
     {
-	    return substr($this->sdkVersion,0,11)."-cluster".substr($this->sdkVersion,11);
+	    return substr($this->sdkVersion, 0, 11)."-cluster".substr($this->sdkVersion, 11);
     }
 }

Braces +27 added lines, -35 removed lines

@@ -54,11 +54,12 @@ 
 			$postMultipart = false;
 			foreach ($postFields as $k => $v)
 			{
-				if("@" != substr($v, 0, 1))//判断是不是文件上传
+				if("@" != substr($v, 0, 1)) {
+				    //判断是不是文件上传
 				{
-					$postBodyString .= "$k=" . urlencode($v) . "&"; 
+					$postBodyString .= "$k=" . urlencode($v) . "&";
 				}
-				else//文件上传用multipart/form-data，否则用www-form-urlencoded
+				} else//文件上传用multipart/form-data，否则用www-form-urlencoded
 				{
 					$postMultipart = true;
 					if(class_exists('\CURLFile')){
@@ -78,8 +79,7 @@ 
 				    }
 				}
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
-			}
-			else
+			} else
 			{
 				$header = array("content-type: application/x-www-form-urlencoded; charset=UTF-8");
 				curl_setopt($ch,CURLOPT_HTTPHEADER,$header);
@@ -91,8 +91,7 @@ 
 		if (curl_errno($ch))
 		{
 			throw new Exception(curl_error($ch),0);
-		}
-		else
+		} else
 		{
 			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 			if (200 !== $httpStatusCode)
@@ -144,8 +143,7 @@ 
         if (curl_errno($ch))
         {
             throw new Exception(curl_error($ch),0);
-        }
-        else
+        } else
         {
             $httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
             if (200 !== $httpStatusCode)
@@ -185,11 +183,12 @@ 
                 if(!is_string($v)){
                     $v = json_encode($v);
                 }
-                if("@" != substr($v, 0, 1))//判断是不是文件上传
+                if("@" != substr($v, 0, 1)) {
+                    //判断是不是文件上传
                 {
                     $postBodyString .= "$k=" . urlencode($v) . "&";
                 }
-                else//文件上传用multipart/form-data，否则用www-form-urlencoded
+                } else//文件上传用multipart/form-data，否则用www-form-urlencoded
                 {
                     $postMultipart = true;
                     if(class_exists('\CURLFile')){
@@ -209,8 +208,7 @@ 
                     }
                 }
                 curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
-            }
-            else {
+            } else {
                 $header = array("Content-Type: application/json; charset=utf-8", "Content-Length:".strlen(json_encode($postFields)));
                 curl_setopt($ch,CURLOPT_HTTPHEADER,$header);
                 curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($postFields));
@@ -221,8 +219,7 @@ 
         if (curl_errno($ch))
         {
             throw new Exception(curl_error($ch),0);
-        }
-        else
+        } else
         {
             $httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
             if (200 !== $httpStatusCode)
@@ -294,8 +291,7 @@ 
 		if (curl_errno($ch))
 		{
 			throw new Exception(curl_error($ch),0);
-		}
-		else
+		} else
 		{
 			$httpStatusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 			if (200 !== $httpStatusCode)
@@ -329,7 +325,7 @@ 
     public function execute($request, $session = null,$bestUrl = null){
         if(DingTalkConstant::$CALL_TYPE_OAPI == $this->apiCallType){
             return $this->_executeOapi($request, $session, $bestUrl, null, null, null, null);
-        }else{
+        } else{
             return $this->_execute($request, $session, $bestUrl);
         }
     }
@@ -345,7 +341,7 @@ 
 	public function executeWithCorpId($request, $bestUrl = null, $accessKey, $accessSecret, $suiteTicket, $corpId) {
         if(DingTalkConstant::$CALL_TYPE_OAPI == $this->apiCallType){
             return $this->_executeOapi($request, null, $bestUrl,$accessKey, $accessSecret, $suiteTicket, $corpId);
-        }else{
+        } else{
             return $this->_execute($request, null, $bestUrl);
         }
     }
@@ -368,10 +364,10 @@ 
         if($bestUrl){
             if(strpos($bestUrl,'?') === false){
                 $requestUrl = $bestUrl."?";
-            }else{
+            } else{
                 $requestUrl = $bestUrl;
             }
-        }else{
+        } else{
             $requestUrl = $this->gatewayUrl."?";
         }
         if(null != $accessKey){
@@ -392,7 +388,7 @@ 
             foreach ($queryParams as $queryParamKey => $queryParamValue) {
                 $requestUrl .= "$queryParamKey=" . urlencode($queryParamValue) . "&";
             }
-        }else{
+        } else{
             $requestUrl .= "access_token=" . urlencode($session) . "&";
         }
 
@@ -416,15 +412,14 @@ 
         {
             if(count($fileFields) > 0){
                 $resp = $this->curl_with_memory_file($requestUrl, $apiParams, $fileFields);
-            }else{
+            } else{
                 if(DingTalkConstant::$METHOD_POST == $this->httpMethod){
                     $resp = $this->curl_json($requestUrl, $apiParams);
-                }else{
+                } else{
                     $resp = $this->curl_get($requestUrl, $apiParams);
                 }
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
             $result->code = $e->getCode();
@@ -443,8 +438,7 @@ 
             {
                 $respWellFormed = true;
             }
-        }
-        else if("xml" == $this->format)
+        } else if("xml" == $this->format)
         {
             $respObject = @simplexml_load_string($resp);
             if (false !== $respObject)
@@ -524,11 +518,11 @@ 
 		if($bestUrl){
             if(strpos($bestUrl,'?') === false){
                 $requestUrl = $bestUrl."?";
-            }else{
+            } else{
                 $requestUrl = $bestUrl;
             }
 			$sysParams["partner_id"] = $this->getClusterTag();
-		}else{
+		} else{
 			$requestUrl = $this->gatewayUrl."?";
 			$sysParams["partner_id"] = $this->sdkVersion;
 		}
@@ -556,11 +550,10 @@ 
 		{
 			if(count($fileFields) > 0){
 				$resp = $this->curl_with_memory_file($requestUrl, $apiParams, $fileFields);
-			}else{
+			} else{
 				$resp = $this->curl($requestUrl, $apiParams);
 			}
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->logCommunicationError($sysParams["method"],$requestUrl,"HTTP_ERROR_" . $e->getCode(),$e->getMessage());
 			$result->code = $e->getCode();
@@ -583,8 +576,7 @@ 
 					$respObject = $propValue;
 				}
 			}
-		}
-		else if("xml" == $this->format)
+		} else if("xml" == $this->format)
 		{
 			$respObject = @simplexml_load_string($resp);
 			if (false !== $respObject)