GC0202 / ThinkLibrary

src/service/taobao/bin/OapiTest.php

Spacing +3 added lines, -3 removed lines

@@ -2,11 +2,11 @@
 include "TopSdk.php";
 date_default_timezone_set('Asia/Shanghai');
 
-$c = new DingTalkClient(DingTalkConstant::$CALL_TYPE_OAPI, DingTalkConstant::$METHOD_POST , DingTalkConstant::$FORMAT_JSON);
+$c = new DingTalkClient(DingTalkConstant::$CALL_TYPE_OAPI, DingTalkConstant::$METHOD_POST, DingTalkConstant::$FORMAT_JSON);
 $req = new OapiMediaUploadRequest;
 $req->setType("image");
-$req->setMedia(array('type'=>'application/octet-stream','filename'=>'image.png', 'content' => file_get_contents('/Users/test/image.png')));
-$resp=$c->execute($req, "******","https://oapi.dingtalk.com/media/upload");
+$req->setMedia(array('type'=>'application/octet-stream', 'filename'=>'image.png', 'content' => file_get_contents('/Users/test/image.png')));
+$resp = $c->execute($req, "******", "https://oapi.dingtalk.com/media/upload");
 var_dump($resp)
 
 ?>
\ No newline at end of file

src/service/taobao/bin/QimenCloud/QimenCloudClient.php

Spacing +54 added lines, -54 removed lines

@@ -29,9 +29,9 @@ 
 		return $this->appkey;
 	}
 
-	public function __construct($appkey = "",$secretKey = ""){
+	public function __construct($appkey = "", $secretKey = "") {
 		$this->appkey = $appkey;
-		$this->secretKey = $secretKey ;
+		$this->secretKey = $secretKey;
 	}
 
 	protected function generateSign($params)
@@ -41,7 +41,7 @@ 
 		$stringToBeSigned = $this->secretKey;
 		foreach ($params as $k => $v)
 		{
-			if(!is_array($v) && "@" != substr($v, 0, 1))
+			if (!is_array($v) && "@" != substr($v, 0, 1))
 			{
 				$stringToBeSigned .= "$k$v";
 			}
@@ -64,9 +64,9 @@ 
 		if ($this->connectTimeout) {
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
 		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
+		curl_setopt($ch, CURLOPT_USERAGENT, "top-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);
 		}
@@ -77,14 +77,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));
 					}
 				}
@@ -95,7 +95,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);
 				    }
@@ -105,22 +105,22 @@ 
 			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);
@@ -138,44 +138,44 @@ 
 		if ($this->connectTimeout) {
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
 		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
+		curl_setopt($ch, CURLOPT_USERAGENT, "top-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['name'] . "\" \r\n";
-			    $data .= 'Content-Type: ' . $file['type'] . "\r\n\r\n";//多了个文档类型
+			    $data .= "--".$delimiter."\r\n";
+			    $data .= 'Content-Disposition: form-data; name="'.$name.'"; filename="'.$file['name']."\" \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);
@@ -185,14 +185,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);
@@ -203,7 +203,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_" . $this->appkey . "_" . date("Y-m-d") . ".log";
+		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/').'/'."logs/top_comm_err_".$this->appkey."_".date("Y-m-d").".log";
 		$logger->conf["separator"] = "^_^";
 		$logData = array(
 		date("Y-m-d H:i:s"),
@@ -214,19 +214,19 @@ 
 		$this->sdkVersion,
 		$requestUrl,
 		$errorCode,
-		str_replace("\n","",$responseTxt)
+		str_replace("\n", "", $responseTxt)
 		);
 		$logger->log($logData);
 	}
 
-	public function execute($request, $session = null,$bestUrl = null)
+	public function execute($request, $session = null, $bestUrl = null)
 	{
-		if($this->gatewayUrl == null) {
+		if ($this->gatewayUrl == null) {
 			throw new Exception("client-check-error:Need Set gatewayUrl.", 40);
 		}
 
-		$result =  new ResultSet(); 
-		if($this->checkRequest) {
+		$result = new ResultSet(); 
+		if ($this->checkRequest) {
 			try {
 				$request->check();
 			} catch (Exception $e) {
@@ -254,10 +254,10 @@ 
 
 
 		//系统参数放入GET请求串
-		if($bestUrl){
+		if ($bestUrl) {
 			$requestUrl = $bestUrl."?";
 			$sysParams["partner_id"] = $this->getClusterTag();
-		}else{
+		}else {
 			$requestUrl = $this->gatewayUrl."?";
 			$sysParams["partner_id"] = $this->sdkVersion;
 		}
@@ -267,12 +267,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]);
@@ -285,15 +285,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;
@@ -315,7 +315,7 @@ 
 				}
 			}
 		}
-		else if("xml" == $this->format)
+		else if ("xml" == $this->format)
 		{
 			$respObject = @simplexml_load_string($resp);
 			if (false !== $respObject)
@@ -327,7 +327,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;
@@ -337,7 +337,7 @@ 
 		if (isset($respObject->code))
 		{
 			$logger = new TopLogger;
-			$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_biz_err_" . $this->appkey . "_" . date("Y-m-d") . ".log";
+			$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/').'/'."logs/top_biz_err_".$this->appkey."_".date("Y-m-d").".log";
 			$logger->log(array(
 				date("Y-m-d H:i:s"),
 				$resp
@@ -354,21 +354,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 api: " . $paramsArray["method"]);
+			trigger_error("No such 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);
@@ -379,6 +379,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);
     }
 }

src/service/taobao/bin/top/test.php

Spacing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
 
     $req = new HttpdnsGetRequest;
 
-    $req->putOtherTextParam("name","test");
-    $req->putOtherTextParam("value",0);
+    $req->putOtherTextParam("name", "test");
+    $req->putOtherTextParam("value", 0);
 
     var_dump($c->execute($req));
 ?>
\ No newline at end of file

src/service/taobao/bin/top/HttpdnsGetRequest.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 		return $this->apiParas;
 	}
 	
-	public function check(){}
+	public function check() {}
 	
 	public function putOtherTextParam($key, $value) {
 		$this->apiParas[$key] = $value;

src/service/taobao/bin/top/SpiUtils.php

Spacing +50 added lines, -50 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-class SpiUtils{
+class SpiUtils {
 	private static $top_sign_list = "HTTP_TOP_SIGN_LIST";
 	private static $timestamp = "timestamp";
 	private static $header_real_ip = array("X_Real_IP", "X_Forwarded_For", "Proxy_Client_IP",
@@ -11,8 +11,8 @@ 
 	 * @param secret app对应的secret
 	 * @return true：校验通过；false：校验不通过
 	 */
-	public static function checkSign4FormRequest($secret){
-		return self::checkSign(null,null,$secret);
+	public static function checkSign4FormRequest($secret) {
+		return self::checkSign(null, null, $secret);
 	}
 
 	/**
@@ -23,8 +23,8 @@ 
 	 * @param secret app对应的secret
 	 * @return true：校验通过；false：校验不通过
 	 */
-	public static function checkSign4TextRequest($body,$secret){
-		return self::checkSign(null,$body,$secret);
+	public static function checkSign4TextRequest($body, $secret) {
+		return self::checkSign(null, $body, $secret);
 	}
 	
 	/**
@@ -35,7 +35,7 @@ 
 	 * @param secret app对应的secret
 	 * @return true：校验通过；false：校验不通过
 	 */
-	public static function checkSign4FileRequest($form, $secret){
+	public static function checkSign4FileRequest($form, $secret) {
 		return self::checkSign($form, null, $secret);
 	}
 
@@ -43,29 +43,29 @@ 
 		$params = array();
 		// 1. 获取header参数
 		$headerMap = self::getHeaderMap();
-		foreach ($headerMap as $k => $v){
-			$params[$k] = $v ;
+		foreach ($headerMap as $k => $v) {
+			$params[$k] = $v;
 		}
 
 		// 2. 获取url参数
 		$queryMap = self::getQueryMap();
-		foreach ($queryMap as $k => $v){
-			$params[$k] = $v ;
+		foreach ($queryMap as $k => $v) {
+			$params[$k] = $v;
 		}
 
 		// 3. 获取form参数
 		if ($form == null && $body == null) {
 			$formMap = self::getFormMap();
-			foreach ($formMap as $k => $v){
-				$params[$k] = $v ;
+			foreach ($formMap as $k => $v) {
+				$params[$k] = $v;
 			}
-		} else if ($form != null) {
-			foreach ($form as $k => $v){
-				$params[$k] = $v ;
+		}else if ($form != null) {
+			foreach ($form as $k => $v) {
+				$params[$k] = $v;
 			}
 		}
 
-		if($body == null){
+		if ($body == null) {
 			$body = file_get_contents('php://input');
 		}
 
@@ -73,9 +73,9 @@ 
 		$localSign = self::sign($params, $body, $secret);
 		if (strcmp($remoteSign, $localSign) == 0) {
 			return true;
-		} else {
+		}else {
 			$paramStr = self::getParamStrFromMap($params);
-			self::logCommunicationError($remoteSign,$localSign,$paramStr,$body);
+			self::logCommunicationError($remoteSign, $localSign, $paramStr, $body);
 			return false;
 		}
 	}
@@ -84,18 +84,18 @@ 
 		$headerMap = array();
 		$signList = $_SERVER['HTTP_TOP_SIGN_LIST']; // 只获取参与签名的头部字段
 
-		if(!$signList) {
+		if (!$signList) {
 			return $headerMap;
 		}
 
 		$signList = trim($signList);
-		if (strlen($signList) > 0){
+		if (strlen($signList) > 0) {
 			$params = split(",", $signList);
-			foreach ($_SERVER as $k => $v){
-				if (substr($k, 0, 5) == 'HTTP_'){
-					foreach($params as $kk){
+			foreach ($_SERVER as $k => $v) {
+				if (substr($k, 0, 5) == 'HTTP_') {
+					foreach ($params as $kk) {
 						$upperkey = strtoupper($kk);
-						if(self::endWith($k,$upperkey)){
+						if (self::endWith($k, $upperkey)) {
 							$headerMap[$kk] = $v;
 						}
 					}
@@ -105,7 +105,7 @@ 
 		return $headerMap;
 	}
 
-	private static function getQueryMap(){
+	private static function getQueryMap() {
 		$queryStr = $_SERVER["QUERY_STRING"];
 		$resultArray = array();
 		foreach (explode('&', $queryStr) as $pair) {
@@ -115,35 +115,35 @@ 
 
 		        if (preg_match('/(?P<name>\w+)\[(?P<index>\w+)\]/', $subKey, $matches)) {
 		            $resultArray[$matches['name']][$matches['index']][$subVal] = $value;
-		        } else {
+		        }else {
 		            $resultArray[$subKey][$subVal] = urldecode($value);
 		        }
-		    } else {
+		    }else {
 		        $resultArray[$key] = urldecode($value);
 		    }
 		}
 		return $resultArray;
 	}
 
-	private static function checkRemoteIp(){
+	private static function checkRemoteIp() {
 		$remoteIp = $_SERVER["REMOTE_ADDR"];
-		foreach ($header_real_ip as $k){
+		foreach ($header_real_ip as $k) {
 			$realIp = $_SERVER[$k];
 			$realIp = trim($realIp);
-			if(strlen($realIp) > 0 && strcasecmp("unknown",$realIp)){
+			if (strlen($realIp) > 0 && strcasecmp("unknown", $realIp)) {
 				$remoteIp = $realIp;
 				break;
 			}
 		}
-		return self::startsWith($remoteIp,"140.205.144.") || self::startsWith($remoteIp,"40.205.145.");
+		return self::startsWith($remoteIp, "140.205.144.") || self::startsWith($remoteIp, "40.205.145.");
 	}
 
-	private static function getFormMap(){
+	private static function getFormMap() {
 		$resultArray = array();
-		foreach($_POST as $key=>$v) { 
-			$resultArray[$key] = $v ;
+		foreach ($_POST as $key=>$v) { 
+			$resultArray[$key] = $v;
 		}
-		return $resultArray ;	
+		return $resultArray;	
 	}
 
 	private static function startsWith($haystack, $needle) {
@@ -152,30 +152,30 @@ 
 
 	private static function endWith($haystack, $needle) {   
 	    $length = strlen($needle);  
-	    if($length == 0)
+	    if ($length == 0)
 	    {    
 	        return true;  
 	    }  
 	    return (substr($haystack, -$length) === $needle);
  	}
 
-	private static function checkTimestamp(){
+	private static function checkTimestamp() {
 		$ts = $_POST['timestamp'];
-		if($ts){
+		if ($ts) {
 			$clientTimestamp = strtotime($ts);
 			$current = $_SERVER['REQUEST_TIME'];
-			return ($current - $clientTimestamp) <= 5*60*1000;
-		}else{
+			return ($current-$clientTimestamp) <= 5*60*1000;
+		}else {
 			return false;
 		}
 	}
 
-	private static function getParamStrFromMap($params){
+	private static function getParamStrFromMap($params) {
 		ksort($params);
 		$stringToBeSigned = "";
 		foreach ($params as $k => $v)
 		{
-			if(strcmp("sign", $k) != 0)
+			if (strcmp("sign", $k) != 0)
 			{
 				$stringToBeSigned .= "$k$v";
 			}
@@ -184,13 +184,13 @@ 
 		return $stringToBeSigned;
 	}
 
-	private static function sign($params,$body,$secret){
+	private static function sign($params, $body, $secret) {
 		ksort($params);
 
 		$stringToBeSigned = $secret;
 		$stringToBeSigned .= self::getParamStrFromMap($params);
 
-		if($body)
+		if ($body)
 			$stringToBeSigned .= $body;
 		$stringToBeSigned .= $secret;
 		return strtoupper(md5($stringToBeSigned));
@@ -200,18 +200,18 @@ 
 	{
 		$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(
-		"checkTopSign error" ,
-		"remoteSign=".$remoteSign ,
-		"localSign=".$localSign ,
-		"paramStr=".$paramStr ,
+		"checkTopSign error",
+		"remoteSign=".$remoteSign,
+		"localSign=".$localSign,
+		"paramStr=".$paramStr,
 		"body=".$body
 		);
 		$logger->log($logData);
 	}
-	private static function clear_blank($str, $glue='')
+	private static function clear_blank($str, $glue = '')
 	{
 		$replace = array(" ", "\r", "\n", "\t"); return str_replace($replace, $glue, $str);
 	}

src/service/taobao/bin/top/TopClient.php

Spacing +53 added lines, -53 removed lines

@@ -27,9 +27,9 @@ 
 		return $this->appkey;
 	}
 
-	public function __construct($appkey = "",$secretKey = ""){
+	public function __construct($appkey = "", $secretKey = "") {
 		$this->appkey = $appkey;
-		$this->secretKey = $secretKey ;
+		$this->secretKey = $secretKey;
 	}
 
 	protected function generateSign($params)
@@ -39,7 +39,7 @@ 
 		$stringToBeSigned = $this->secretKey;
 		foreach ($params as $k => $v)
 		{
-			if(!is_array($v) && "@" != substr($v, 0, 1))
+			if (!is_array($v) && "@" != substr($v, 0, 1))
 			{
 				$stringToBeSigned .= "$k$v";
 			}
@@ -62,9 +62,9 @@ 
 		if ($this->connectTimeout) {
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
 		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
+		curl_setopt($ch, CURLOPT_USERAGENT, "top-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);
 		}
@@ -75,14 +75,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));
 					}
 				}
@@ -93,7 +93,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);
 				    }
@@ -103,22 +103,22 @@ 
 			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);
@@ -136,44 +136,44 @@ 
 		if ($this->connectTimeout) {
 			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
 		}
-		curl_setopt ( $ch, CURLOPT_USERAGENT, "top-sdk-php" );
+		curl_setopt($ch, CURLOPT_USERAGENT, "top-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['name'] . "\" \r\n";
-			    $data .= 'Content-Type: ' . $file['type'] . "\r\n\r\n";//多了个文档类型
+			    $data .= "--".$delimiter."\r\n";
+			    $data .= 'Content-Disposition: form-data; name="'.$name.'"; filename="'.$file['name']."\" \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);
@@ -183,14 +183,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);
@@ -201,7 +201,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_" . $this->appkey . "_" . date("Y-m-d") . ".log";
+		$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/').'/'."logs/top_comm_err_".$this->appkey."_".date("Y-m-d").".log";
 		$logger->conf["separator"] = "^_^";
 		$logData = array(
 		date("Y-m-d H:i:s"),
@@ -212,15 +212,15 @@ 
 		$this->sdkVersion,
 		$requestUrl,
 		$errorCode,
-		str_replace("\n","",$responseTxt)
+		str_replace("\n", "", $responseTxt)
 		);
 		$logger->log($logData);
 	}
 
-	public function execute($request, $session = null,$bestUrl = null)
+	public 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) {
@@ -247,10 +247,10 @@ 
 
 
 		//系统参数放入GET请求串
-		if($bestUrl){
+		if ($bestUrl) {
 			$requestUrl = $bestUrl."?";
 			$sysParams["partner_id"] = $this->getClusterTag();
-		}else{
+		}else {
 			$requestUrl = $this->gatewayUrl."?";
 			$sysParams["partner_id"] = $this->sdkVersion;
 		}
@@ -260,12 +260,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]);
@@ -278,15 +278,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;
@@ -308,7 +308,7 @@ 
 				}
 			}
 		}
-		else if("xml" == $this->format)
+		else if ("xml" == $this->format)
 		{
 			$respObject = @simplexml_load_string($resp);
 			if (false !== $respObject)
@@ -320,7 +320,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;
@@ -330,7 +330,7 @@ 
 		if (isset($respObject->code))
 		{
 			$logger = new TopLogger;
-			$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/') . '/' . "logs/top_biz_err_" . $this->appkey . "_" . date("Y-m-d") . ".log";
+			$logger->conf["log_file"] = rtrim(TOP_SDK_WORK_DIR, '\\/').'/'."logs/top_biz_err_".$this->appkey."_".date("Y-m-d").".log";
 			$logger->log(array(
 				date("Y-m-d H:i:s"),
 				$resp
@@ -347,21 +347,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 api: " . $paramsArray["method"]);
+			trigger_error("No such 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);
@@ -372,6 +372,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);
     }
 }

src/service/taobao/bin/top/security/iCache.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 	public function getCache($key);
 
 	//更新缓存
-	public function setCache($key,$var);
+	public function setCache($key, $var);
 
 }
 ?>
\ No newline at end of file

src/service/taobao/bin/top/security/YacCache.php

Spacing +5 added lines, -5 removed lines

@@ -15,21 +15,21 @@
 	public function getCache($key)
 	{
 		$key = md5($key);
-		if($this->isEnable){
+		if ($this->isEnable) {
 			$yac = new Yac();
 			return $yac->get($key);
-		}else{
+		}else {
 			echo "yac is not enable ,skip getCache";
 		}
 	}
 
-	public function setCache($key,$var)
+	public function setCache($key, $var)
 	{
 		$key = md5($key);
-		if($this->isEnable){
+		if ($this->isEnable) {
 			$yac = new Yac();
 			$yac->set($key, $var);
-		}else{
+		}else {
 			echo "yac is not enable ,skip setCache";
 		}
 	}

src/service/taobao/bin/top/security/MagicCrypt.php

Spacing +5 added lines, -5 removed lines

@@ -20,12 +20,12 @@ 
 
         public static function hmac_md5($input, $key) {
             $key = base64_decode($key);
-            return hash_hmac('md5', $input, $key,true);
+            return hash_hmac('md5', $input, $key, true);
         }
      
-        private static function pkcs5_pad ($text, $blocksize) {
-            $pad = $blocksize - (strlen($text) % $blocksize);
-            return $text . str_repeat(chr($pad), $pad);
+        private static function pkcs5_pad($text, $blocksize) {
+            $pad = $blocksize-(strlen($text)%$blocksize);
+            return $text.str_repeat(chr($pad), $pad);
         }
      
         public static function decrypt($sStr, $key) {
@@ -42,7 +42,7 @@ 
 
             mcrypt_generic_deinit($module);
             mcrypt_module_close($module);
-            if(!$decrypted){
+            if (!$decrypted) {
                 throw new Exception("Decrypt Error,Please Check SecretKey");
             }
             return $decrypted;