GC0202 / ThinkLibrary

src/service/ksyun/bin/core/Logger.php

Spacing +17 added lines, -17 removed lines

@@ -1,43 +1,43 @@
 <?php
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."exceptions".DIRECTORY_SEPARATOR."Exceptions.php";
-class Logger{
-	function info($msg){
-		$this->log("INFO",$msg);
+class Logger {
+	function info($msg) {
+		$this->log("INFO", $msg);
 	}
-	function error($msg){
-		$this->log("ERROR",$msg);
+	function error($msg) {
+		$this->log("ERROR", $msg);
 	}
-	function warn($msg){
-		$this->log("WARN",$msg);
+	function warn($msg) {
+		$this->log("WARN", $msg);
 	}
-	function debug($msg){
-		$this->log("DEBUG",$msg);
+	function debug($msg) {
+		$this->log("DEBUG", $msg);
 	}
-	private function log($level,$msg){
+	private function log($level, $msg) {
 		$date = gmdate('D, d M Y H:i:s \G\M\T');
 		$log = $date." ".$level."\r\n".$msg."\r\n";
-		if(defined('KS3_API_LOG_PATH') ){
+		if (defined('KS3_API_LOG_PATH')) {
 			$log_path = KS3_API_LOG_PATH;
-			if(empty($log_path)){
+			if (empty($log_path)) {
 				$log_path = KS3_API_PATH.DIRECTORY_SEPARATOR.'log'.DIRECTORY_SEPARATOR;
 			}
-		}else{
+		}else {
 			$log_path = KS3_API_PATH.DIRECTORY_SEPARATOR.'log'.DIRECTORY_SEPARATOR;
 		}
 		
 		//检测日志目录是否存在
-		if(!file_exists($log_path)){
+		if (!file_exists($log_path)) {
 			mkdir($log_path);
 		}
 
 		$log_name = $log_path.'ks3_php_sdk_'.date('Y-m-d').'.log';
 
-		if(KS3_API_DISPLAY_LOG){
+		if (KS3_API_DISPLAY_LOG) {
 			echo $log;
 		}
 		
-		if(KS3_API_LOG){
-			if(!error_log($log,3,$log_name)){
+		if (KS3_API_LOG) {
+			if (!error_log($log, 3, $log_name)) {
 				throw new Ks3ClientException("write to log file error");
 			}
 		}

src/service/ksyun/bin/core/Builders.php

Spacing +34 added lines, -34 removed lines

@@ -2,33 +2,33 @@ 
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."exceptions".DIRECTORY_SEPARATOR."Exceptions.php";
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."config".DIRECTORY_SEPARATOR."Consts.php";
 
-class LocationBuilder{
-	function build($args){
-		if(isset($args["Location"])){
+class LocationBuilder {
+	function build($args) {
+		if (isset($args["Location"])) {
 			$location = $args["Location"];
 			$xml = new SimpleXmlElement('<CreateBucketConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/"></CreateBucketConfiguration>');
-			$xml->addChild("LocationConstraint",$args["Location"]);
+			$xml->addChild("LocationConstraint", $args["Location"]);
 			return $xml->asXml();
 		}
 	}
 }
-class CORSBuilder{
-	function build($args){
-		if(isset($args["CORS"])){
+class CORSBuilder {
+	function build($args) {
+		if (isset($args["CORS"])) {
 			$cors = $args["CORS"];
 			$xml = new SimpleXmlElement('<CORSConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/"></CORSConfiguration>');
-			if(is_array($cors)){
+			if (is_array($cors)) {
 				foreach ($cors as $key => $rule) {
 					$ruleXml = $xml->addChild("CORSRule");
-					if(is_array($rule)){
+					if (is_array($rule)) {
 						foreach ($rule as $key => $value) {
-							if(in_array($key,Consts::$CORSElements)){
-								if(is_array($value)){
+							if (in_array($key, Consts::$CORSElements)) {
+								if (is_array($value)) {
 									foreach ($value as  $ele) {
-										$ruleXml->addChild($key,$ele);
+										$ruleXml->addChild($key, $ele);
 									}
-								}else{
-									$ruleXml->addChild($key,$value);
+								}else {
+									$ruleXml->addChild($key, $value);
 								}
 								
 							}
@@ -40,23 +40,23 @@ 
 		}
 	}
 }
-class BucketLoggingBuilder{
-	function build($args){
-		if(isset($args["BucketLogging"])){
+class BucketLoggingBuilder {
+	function build($args) {
+		if (isset($args["BucketLogging"])) {
 			$logging = $args["BucketLogging"];
 			$xml = new SimpleXmlElement('<BucketLoggingStatus xmlns="http://s3.amazonaws.com/doc/2006-03-01/" />');
-			if(is_array($logging)){
+			if (is_array($logging)) {
 
-				if(!isset($logging["Enable"]))
+				if (!isset($logging["Enable"]))
 					throw new Ks3ClientException("bucket logging must provide Enable argument");
 				
-				if($logging["Enable"]){
-					if(!isset($logging["TargetBucket"]))
+				if ($logging["Enable"]) {
+					if (!isset($logging["TargetBucket"]))
 						throw new Ks3ClientException("bucket logging must provide TargetBucket argument");
 					$loggingConfig = $xml->addChild("LoggingEnabled");
 					foreach ($logging as $key => $value) {
-						if(in_array($key,Consts::$BucketLoggingElements)){
-							$loggingConfig->addChild($key,$value);
+						if (in_array($key, Consts::$BucketLoggingElements)) {
+							$loggingConfig->addChild($key, $value);
 						}
 					}
 				}
@@ -65,32 +65,32 @@ 
 		}
 	}
 }
-class DeleteObjectsBuilder{
-	function build($args){
-		if(isset($args["DeleteKeys"])){
+class DeleteObjectsBuilder {
+	function build($args) {
+		if (isset($args["DeleteKeys"])) {
 			$keys = $args["DeleteKeys"];
 			$xml = new SimpleXmlElement('<Delete></Delete>');
-			if(is_array($keys)){
+			if (is_array($keys)) {
 				foreach ($keys as $key => $value) {
 					$object = $xml->addChild("Object");
-					$object->addChild("Key",$value);
+					$object->addChild("Key", $value);
 				}
 			}
 			return $xml->asXml();
 		}
 	}
 }
-class CompleteMultipartUploadBuilder{
-	function build($args){
-		if(isset($args["Parts"])){
+class CompleteMultipartUploadBuilder {
+	function build($args) {
+		if (isset($args["Parts"])) {
 			$parts = $args["Parts"];
 			$xml = new SimpleXmlElement('<CompleteMultipartUpload></CompleteMultipartUpload>');
-			if(is_array($parts)){
+			if (is_array($parts)) {
 				foreach ($parts as $part) {
 					$partXml = $xml->addChild("Part");
 					foreach ($part as $key => $value) {
-						if(in_array($key,Consts::$PartsElement)){
-							$partXml->addChild($key,$value);
+						if (in_array($key, Consts::$PartsElement)) {
+							$partXml->addChild($key, $value);
 						}
 					}
 				}

src/service/ksyun/bin/core/Signers.php

Spacing +227 added lines, -227 removed lines

@@ -5,53 +5,53 @@ 
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."config".DIRECTORY_SEPARATOR."Consts.php";
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."exceptions".DIRECTORY_SEPARATOR."Exceptions.php";
 
-interface Signer{
-	public function sign( Ks3Request $request,$args=array());
+interface Signer {
+	public function sign(Ks3Request $request, $args = array());
 }
-class DefaultUserAgentSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
-		$request->addHeader(Headers::$UserAgent,Consts::$UserAgent);
+class DefaultUserAgentSigner implements Signer {
+	public function sign(Ks3Request $request, $args = array()) {
+		$request->addHeader(Headers::$UserAgent, Consts::$UserAgent);
 	}
 }
-class DefaultContentTypeSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
+class DefaultContentTypeSigner implements Signer {
+	public function sign(Ks3Request $request, $args = array()) {
 		$contentType = $request->getHeader(Headers::$ContentType);
-		if(empty($contentType)){
-			$request->addHeader(Headers::$ContentType,"application/xml");
+		if (empty($contentType)) {
+			$request->addHeader(Headers::$ContentType, "application/xml");
 		}
 	}
 }
-class StreamContentTypeSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
+class StreamContentTypeSigner implements Signer {
+	public function sign(Ks3Request $request, $args = array()) {
 		$contentType = $request->getHeader(Headers::$ContentType);
-		if(empty($contentType)){
-			$request->addHeader(Headers::$ContentType,"application/ocet-stream");
+		if (empty($contentType)) {
+			$request->addHeader(Headers::$ContentType, "application/ocet-stream");
 		}
 	}
 }
-class SuffixContentTypeSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
+class SuffixContentTypeSigner implements Signer {
+	public function sign(Ks3Request $request, $args = array()) {
 		$key = $request->key;
 		$objArr = explode('/', $key);
 		$basename = array_pop($objArr);
-		$extension = explode ( '.', $basename );
-		$extension = array_pop ( $extension );
+		$extension = explode('.', $basename);
+		$extension = array_pop($extension);
 		$content_type = Utils::get_mimetype(strtolower($extension));
-		$request->addHeader(Headers::$ContentType,$content_type);
+		$request->addHeader(Headers::$ContentType, $content_type);
 	}
 }
-class HeaderAuthSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
+class HeaderAuthSigner implements Signer {
+	public function sign(Ks3Request $request, $args = array()) {
 		$log = "stringToSing->\r\n";
 		$date = gmdate('D, d M Y H:i:s \G\M\T');
 		$request->addHeader(Headers::$Date, $date);
 
 		$ak = $args["accessKey"];
 		$sk = $args["secretKey"];
-		if(empty($ak)){
+		if (empty($ak)) {
 			throw new Ks3ClientException("you should provide accessKey");
 		}
-		if(empty($sk)){
+		if (empty($sk)) {
 			throw new Ks3ClientException("you should provide secretKey");
 		}
 		$authration = "KSS ";
@@ -63,21 +63,21 @@ 
 			);
 		$headers = AuthUtils::canonicalizedKssHeaders($request);
 		$resource = AuthUtils::canonicalizedResource($request);
-		if(!empty($headers)){
-			array_push($signList,$headers);
+		if (!empty($headers)) {
+			array_push($signList, $headers);
 		}
-		array_push($signList,$resource);
-		$stringToSign = join("\n",$signList);
-		$log.= $stringToSign;
+		array_push($signList, $resource);
+		$stringToSign = join("\n", $signList);
+		$log .= $stringToSign;
 		$signature = base64_encode(hash_hmac('sha1', $stringToSign, $sk, true));
 
-		$authration.=$ak.":".$signature;
+		$authration .= $ak.":".$signature;
 		$request->addHeader(Headers::$Authorization, $authration);
 		return $log;
 	}
 }
-class QueryAuthSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
+class QueryAuthSigner implements Signer {
+	public function sign(Ks3Request $request, $args = array()) {
 		$log = "stringToSing->\r\n";
 		$ak = $args["accessKey"];
 		$sk = $args["secretKey"];
@@ -93,447 +93,447 @@ 
 			);
 		$headers = AuthUtils::canonicalizedKssHeaders($request);
 		$resource = AuthUtils::canonicalizedResource($request);
-		if(!empty($headers)){
-			array_push($signList,$headers);
+		if (!empty($headers)) {
+			array_push($signList, $headers);
 		}
-		array_push($signList,$resource);
+		array_push($signList, $resource);
 
-		$stringToSign = join("\n",$signList);
-		$log.= $stringToSign;
+		$stringToSign = join("\n", $signList);
+		$log .= $stringToSign;
 		$signature = base64_encode(hash_hmac('sha1', $stringToSign, $sk, true));
-		$request->addQueryParams("KSSAccessKeyId",$ak);
-		$request->addQueryParams("Signature",$signature);
-		$request->addQueryParams("Expires",$expiresSencond);
+		$request->addQueryParams("KSSAccessKeyId", $ak);
+		$request->addQueryParams("Signature", $signature);
+		$request->addQueryParams("Expires", $expiresSencond);
 		return $log;
 	}
 }
-class ACLSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
+class ACLSigner implements Signer {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
-		if(isset($args["ACL"])){
+		if (isset($args["ACL"])) {
 			$acl = $args["ACL"];
-			if(!in_array($acl, Consts::$Acl)){
+			if (!in_array($acl, Consts::$Acl)) {
 				throw new Ks3ClientException("unsupport acl :".$acl);
-			}else{
-				$request->addHeader(Headers::$Acl,$acl);
+			}else {
+				$request->addHeader(Headers::$Acl, $acl);
 			}
 		}
-		if(isset($args["ACP"])){
+		if (isset($args["ACP"])) {
 
 		}
 	}
 }
-class ContentMD5Signer implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
+class ContentMD5Signer implements Signer {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
 		$contentmd5 = "";
-		if(isset($args["ObjectMeta"][Headers::$ContentMd5])){
+		if (isset($args["ObjectMeta"][Headers::$ContentMd5])) {
 			$contentmd5 = $args["ObjectMeta"][Headers::$ContentMd5];
 		}
-		if(empty($contentmd5)){
+		if (empty($contentmd5)) {
 			$body = $request->body;
-			if(!empty($body)){
+			if (!empty($body)) {
 				$length = $request->getHeader(Headers::$ContentLength);
-				if(empty($length)){
-					if(isset($args["ObjectMeta"][Headers::$ContentLength]))
+				if (empty($length)) {
+					if (isset($args["ObjectMeta"][Headers::$ContentLength]))
 						$length = $args["ObjectMeta"][Headers::$ContentLength];
 				}
-				if(!empty($length)){
-					$body = substr($body,0,$length);
+				if (!empty($length)) {
+					$body = substr($body, 0, $length);
 				}
 				$contentmd5 = Utils::hex_to_base64(md5($body));
 			}
 		}
-		if(!empty($contentmd5))
-			$request->addHeader(Headers::$ContentMd5,$contentmd5);
+		if (!empty($contentmd5))
+			$request->addHeader(Headers::$ContentMd5, $contentmd5);
 	}
 }
-class ContentLengthSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
+class ContentLengthSigner implements Signer {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
 		$contentlength = "";
-		if(isset($args["ObjectMeta"][Headers::$ContentLength])){
+		if (isset($args["ObjectMeta"][Headers::$ContentLength])) {
 			$contentlength = $args["ObjectMeta"][Headers::$ContentLength];
 		}
-		if(empty($contentlength)){
+		if (empty($contentlength)) {
 			$body = $request->body;
-			if(!empty($body)){
+			if (!empty($body)) {
 				$contentlength = strlen($body);
 			}
 		}
-		if(!empty($contentlength))
-			$request->addHeader(Headers::$ContentLength,$contentlength);
+		if (!empty($contentlength))
+			$request->addHeader(Headers::$ContentLength, $contentlength);
 	}
 }
-class ObjectMetaSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
+class ObjectMetaSigner implements Signer {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
-		if(isset($args["ObjectMeta"])){
+		if (isset($args["ObjectMeta"])) {
 			$ObjectMeta = $args["ObjectMeta"];
-			if(is_array($ObjectMeta)){
+			if (is_array($ObjectMeta)) {
 				foreach ($ObjectMeta as $key => $value) {
-					if(in_array($key,Consts::$ObjectMeta)&&!empty($value)){
-						$request->addHeader($key,$value);
+					if (in_array($key, Consts::$ObjectMeta) && !empty($value)) {
+						$request->addHeader($key, $value);
 					}
 				}
 			}
 		}
 	}
 }
-class MultipartObjectMetaSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
+class MultipartObjectMetaSigner implements Signer {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
-		if(isset($args["ObjectMeta"])){
+		if (isset($args["ObjectMeta"])) {
 			$ObjectMeta = $args["ObjectMeta"];
-			if(is_array($ObjectMeta)){
+			if (is_array($ObjectMeta)) {
 				foreach ($ObjectMeta as $key => $value) {
-					if(in_array($key,Consts::$MultipartObjectMeta)&&!empty($value)){
-						$request->addHeader($key,$value);
+					if (in_array($key, Consts::$MultipartObjectMeta) && !empty($value)) {
+						$request->addHeader($key, $value);
 					}
 				}
 			}
 		}
 	}
 }
-class UserMetaSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
+class UserMetaSigner implements Signer {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
-		if(isset($args["UserMeta"])){
+		if (isset($args["UserMeta"])) {
 			$UserMeta = $args["UserMeta"];
-			if(is_array($UserMeta)){
+			if (is_array($UserMeta)) {
 				foreach ($UserMeta as $key => $value) {
-					if (substr(strtolower($key), 0, 10) === Consts::$UserMetaPrefix){
-						$request->addHeader($key,$value);
+					if (substr(strtolower($key), 0, 10) === Consts::$UserMetaPrefix) {
+						$request->addHeader($key, $value);
 					}
 				}
 			}
 		}
 	}
 }
-class CopySourceSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
+class CopySourceSigner implements Signer {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
-		if(isset($args["CopySource"])){
+		if (isset($args["CopySource"])) {
 			$CopySource = $args["CopySource"];
-			if(is_array($CopySource)){
-				if(!isset($CopySource["Bucket"]))
+			if (is_array($CopySource)) {
+				if (!isset($CopySource["Bucket"]))
 					throw new Ks3ClientException("you should provide copy source bucket");
-				if(!isset($CopySource["Key"]))
+				if (!isset($CopySource["Key"]))
 					throw new Ks3ClientException("you should provide copy source key");
 				$bucket = $CopySource["Bucket"];
 				$key = Utils::encodeUrl($CopySource["Key"]);
-				$request->addHeader(Headers::$CopySource,"/".$bucket."/".$key);
+				$request->addHeader(Headers::$CopySource, "/".$bucket."/".$key);
 			}
 		}
 	}
 }
-class StreamUploadSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
+class StreamUploadSigner implements Signer {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
-		if(isset($args["Content"])&&is_array($args["Content"])&&isset($args["Content"]["content"])){
+		if (isset($args["Content"]) && is_array($args["Content"]) && isset($args["Content"]["content"])) {
 			$content = $args["Content"]["content"];
 			$seek_position = 0;
 			$resourceLength = 0;
 			$length = -1;
 			$isFile = FALSE;
 
-			if (!is_resource($content)){
+			if (!is_resource($content)) {
 				$isFile = TRUE;
 				//如果之前用户已经转化为GBK则不转换
-				if(Utils::chk_chinese($content)&&!Utils::check_char($content)){
-					$content = iconv('utf-8','gbk',$content);
+				if (Utils::chk_chinese($content) && !Utils::check_char($content)) {
+					$content = iconv('utf-8', 'gbk', $content);
 				}
-				if(!file_exists($content))
+				if (!file_exists($content))
 					throw new Ks3ClientException("the specified file does not exist ");
 				$length = Utils::getFileSize($content);
-				$content = fopen($content,"r");
-			}else{
+				$content = fopen($content, "r");
+			}else {
 				$stats = fstat($content);
-				if ($stats && $stats["size"] >= 0){
+				if ($stats && $stats["size"] >= 0) {
 					$length = $stats["size"];	
 				}
 			}
 			//之所以取resourceLength是为了防止Content-Length大于实际数据的大小，导致一直等待。
 			$resourceLength = $length;
 			//优先取用户设置seek_position，没有的话取ftell
-			if(isset($args["Content"]["seek_position"])&&$args["Content"]["seek_position"]>0){
+			if (isset($args["Content"]["seek_position"]) && $args["Content"]["seek_position"] > 0) {
 				$seek_position = $args["Content"]["seek_position"];
-			}else if(!$isFile){
+			}else if (!$isFile) {
 				$seek_position = ftell($content);
-				if($seek_position<0)
+				if ($seek_position < 0)
 					$seek_position = 0;
-				fseek($content,0);
+				fseek($content, 0);
 			}
 
 			$lengthInMeta = -1;
-			if(isset($args["ObjectMeta"]["Content-Length"])){
+			if (isset($args["ObjectMeta"]["Content-Length"])) {
 				$lengthInMeta = $args["ObjectMeta"]["Content-Length"];
 			}
-			if($lengthInMeta > 0){
+			if ($lengthInMeta > 0) {
 				$length = $lengthInMeta;
-			}else if($resourceLength > 0){
+			}else if ($resourceLength > 0) {
 				//根据seek_position计算实际长度
-				$length = $resourceLength - $seek_position;
+				$length = $resourceLength-$seek_position;
 			}
-			if($length <= 0)
+			if ($length <= 0)
 				throw new Ks3ClientException("calculate content length failed,unexpected contetn length ".$length);
 			$request->read_stream = $content;
-			$request->addHeader(Headers::$ContentLength,$length);
+			$request->addHeader(Headers::$ContentLength, $length);
 			$request->seek_position = $seek_position;
-		}else{
+		}else {
 			throw new Ks3ClientException("please specifie upload content in args");
 		}
 	}
 }
-class RangeSigner{
-	public function sign(Ks3Request $request,$args=array()){
+class RangeSigner {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
-		if(isset($args["Range"])){
+		if (isset($args["Range"])) {
 			$Range = $args["Range"];
-			if(is_array($Range)){
+			if (is_array($Range)) {
 				$start = $Range["start"];
 				$end = $Range["end"];
 				$range = "bytes=".$start."-".$end;
-				$request->addHeader(Headers::$Range,$range);
+				$request->addHeader(Headers::$Range, $range);
 			}else
-				$request->addHeader(Headers::$Range,$Range);
+				$request->addHeader(Headers::$Range, $Range);
 		}
 	}
 }
-class GetObjectSigner{
-	public function sign(Ks3Request $request,$args=array()){
+class GetObjectSigner {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
-		if(isset($args["WriteTo"])){
+		if (isset($args["WriteTo"])) {
 			$WriteTo = $args["WriteTo"];
-			if(is_resource($WriteTo)){
+			if (is_resource($WriteTo)) {
 				$request->write_stream = $WriteTo;
-			}else{
+			}else {
 				//如果之前用户已经转化为GBK则不转换
-				if(Utils::chk_chinese($WriteTo)&&!Utils::check_char($WriteTo)){
-					$WriteTo = iconv('utf-8','gbk',$WriteTo);
+				if (Utils::chk_chinese($WriteTo) && !Utils::check_char($WriteTo)) {
+					$WriteTo = iconv('utf-8', 'gbk', $WriteTo);
 				}
-				$request->write_stream = fopen($WriteTo,"w");
+				$request->write_stream = fopen($WriteTo, "w");
 			}
 		}
 	}
 }
-class AdpSigner{
-	public function sign(Ks3Request $request,$args=array()){
+class AdpSigner {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
-		if(isset($args["Adp"])){
+		if (isset($args["Adp"])) {
 			$AdpConf = $args["Adp"];
-			if(is_array($AdpConf)){
-				if(isset($AdpConf["NotifyURL"])){
+			if (is_array($AdpConf)) {
+				if (isset($AdpConf["NotifyURL"])) {
 					$NotifyURL = $AdpConf["NotifyURL"];
-				}else{
+				}else {
 					throw new Ks3ClientException("adp should provide NotifyURL");
 				}
-				if(isset($AdpConf["Adps"])){
+				if (isset($AdpConf["Adps"])) {
 					$Adps = $AdpConf["Adps"];
-				}else{
+				}else {
 					throw new Ks3ClientException("adp should provide Adps");
 				}
 				$AdpString = "";
 				foreach ($Adps as $Adp) {
-					if(is_array($Adp)){
-						if(!isset($Adp["Command"])){
+					if (is_array($Adp)) {
+						if (!isset($Adp["Command"])) {
 							throw new Ks3ClientException("command is needed in adp");
 						}
 						$command = $Adp["Command"];
 						$bucket = NULL;
 						$key = NULL;
-						if(isset($Adp["Bucket"])){
+						if (isset($Adp["Bucket"])) {
 							$bucket = $Adp["Bucket"];
 						}
-						if(isset($Adp["Key"])){
+						if (isset($Adp["Key"])) {
 							$key = $Adp["Key"];
 						}
-						$AdpString.=$command;
-						if(!(empty($bucket)&&empty($key))){
-							if(empty($bucket)){
-								$AdpString.="|tag=saveas&object=".base64_encode($key);
+						$AdpString .= $command;
+						if (!(empty($bucket) && empty($key))) {
+							if (empty($bucket)) {
+								$AdpString .= "|tag=saveas&object=".base64_encode($key);
 							}elseif (empty($key)) {
-								$AdpString.="|tag=saveas&bucket=".$bucket;
-							}else{
-								$AdpString.="|tag=saveas&bucket=".$bucket."&"."object=".base64_encode($key);
+								$AdpString .= "|tag=saveas&bucket=".$bucket;
+							}else {
+								$AdpString .= "|tag=saveas&bucket=".$bucket."&"."object=".base64_encode($key);
 							}
 						}
-						$AdpString.=";";
+						$AdpString .= ";";
 					}
 				}
-				if(!empty($AdpString)&&!empty($NotifyURL)){
-					$request->addHeader(Headers::$AsynchronousProcessingList,$AdpString);
-					$request->addHeader(Headers::$NotifyURL,$NotifyURL);
+				if (!empty($AdpString) && !empty($NotifyURL)) {
+					$request->addHeader(Headers::$AsynchronousProcessingList, $AdpString);
+					$request->addHeader(Headers::$NotifyURL, $NotifyURL);
 				}
 			}
 		}
 	}
 }
-class CallBackSigner{
-	public function sign(Ks3Request $request,$args=array()){
+class CallBackSigner {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
-		if(isset($args["CallBack"])&&is_array($args["CallBack"])){
+		if (isset($args["CallBack"]) && is_array($args["CallBack"])) {
 			$CallBackConf = $args["CallBack"];
 			$url = NULL;
 			$body = NULL;
-			if(isset($CallBackConf["Url"])){
+			if (isset($CallBackConf["Url"])) {
 				$url = $CallBackConf["Url"];
 			}
-			if(empty($url))
+			if (empty($url))
 				throw new Ks3ClientException("Url is needed in CallBack");
-			if(isset($CallBackConf["BodyMagicVariables"])){
-				if(is_array($CallBackConf["BodyMagicVariables"])){
+			if (isset($CallBackConf["BodyMagicVariables"])) {
+				if (is_array($CallBackConf["BodyMagicVariables"])) {
 					$magics = $CallBackConf["BodyMagicVariables"];
 					foreach ($magics as $key => $value) {
-						if(in_array($value,Consts::$CallBackMagics))
-							$body.=$key."=\${".$value."}&";
+						if (in_array($value, Consts::$CallBackMagics))
+							$body .= $key."=\${".$value."}&";
 					}
 				}
 			}
-			if(isset($CallBackConf["BodyVariables"])){
-				if(is_array($CallBackConf["BodyVariables"])){
+			if (isset($CallBackConf["BodyVariables"])) {
+				if (is_array($CallBackConf["BodyVariables"])) {
 					$variables = $CallBackConf["BodyVariables"];
 					foreach ($variables as $key => $value) {
-						$body.=$key."=\${kss-".$key."}&";
-						$request->addHeader("kss-".$key,$value);
+						$body .= $key."=\${kss-".$key."}&";
+						$request->addHeader("kss-".$key, $value);
 					}
 				}
 			}
-			if(!empty($body)){
-				$body=substr($body,0,strlen($body)-1);
-				$request->addHeader(Headers::$XKssCallbackBody,$body);
+			if (!empty($body)) {
+				$body = substr($body, 0, strlen($body)-1);
+				$request->addHeader(Headers::$XKssCallbackBody, $body);
 			}
-			$request->addHeader(Headers::$XKssCallbackUrl,$url);
+			$request->addHeader(Headers::$XKssCallbackUrl, $url);
 		}
 	}
 }
-class SSESigner{
-	public function sign(Ks3Request $request,$args=array()){
+class SSESigner {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
-		if(isset($args["SSE"])){
-			if(isset($args["SSE"]["Algm"]))
+		if (isset($args["SSE"])) {
+			if (isset($args["SSE"]["Algm"]))
 				$algm = $args["SSE"]["Algm"];
-			if(isset($args["SSE"]["KMSId"]))
+			if (isset($args["SSE"]["KMSId"]))
 				$id = $args["SSE"]["KMSId"];
-			if(!empty($algm)){		
-				$request->addHeader(Headers::$SSEAlgm,$algm);
-				if(!empty($id))
-					$request->addHeader(Headers::$SSEKMSId,$id);
+			if (!empty($algm)) {		
+				$request->addHeader(Headers::$SSEAlgm, $algm);
+				if (!empty($id))
+					$request->addHeader(Headers::$SSEKMSId, $id);
 			}
 		}
 	}
 }
-class SSECSigner{
-	public function sign(Ks3Request $request,$args=array()){
+class SSECSigner {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
-		if(isset($args["SSEC"])){
-			if(isset($args["SSEC"]["Algm"]))
+		if (isset($args["SSEC"])) {
+			if (isset($args["SSEC"]["Algm"]))
 				$algm = $args["SSEC"]["Algm"];
-			if(isset($args["SSEC"]["Key"]))
+			if (isset($args["SSEC"]["Key"]))
 				$key = $args["SSEC"]["Key"];
-			if(isset($args["SSEC"]["KeyBase64"]))
+			if (isset($args["SSEC"]["KeyBase64"]))
 				$keybase64 = $args["SSEC"]["KeyBase64"];
-			if(isset($args["SSEC"]["KeyMD5"]))
+			if (isset($args["SSEC"]["KeyMD5"]))
 				$md5 = $args["SSEC"]["KeyMD5"];
-			if(!empty($key)||!empty($keybase64)){
-				if(empty($key))
+			if (!empty($key) || !empty($keybase64)) {
+				if (empty($key))
 					$key = base64_decode($keybase64);
-				if(empty($algm))
+				if (empty($algm))
 					$algm = Consts::$SSEDefaultAlgm;
-				if(empty($md5))
+				if (empty($md5))
 					$md5 = Utils::hex_to_base64(md5($key));
 
-				$request->addHeader(Headers::$SSECAlgm,$algm);
-				$request->addHeader(Headers::$SSECKey,base64_encode($key));
-				$request->addHeader(Headers::$SSECMD5,$md5);
+				$request->addHeader(Headers::$SSECAlgm, $algm);
+				$request->addHeader(Headers::$SSECKey, base64_encode($key));
+				$request->addHeader(Headers::$SSECMD5, $md5);
 			}
 		}
 	}	
 }
-class SSECSourceSigner{
-	public function sign(Ks3Request $request,$args=array()){
+class SSECSourceSigner {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
-		if(isset($args["SSECSource"])){
-			if(isset($args["SSECSource"]["Algm"]))
+		if (isset($args["SSECSource"])) {
+			if (isset($args["SSECSource"]["Algm"]))
 				$algm = $args["SSECSource"]["Algm"];
-			if(isset($args["SSECSource"]["Key"]))
+			if (isset($args["SSECSource"]["Key"]))
 				$key = $args["SSECSource"]["Key"];
-			if(isset($args["SSECSource"]["KeyBase64"]))
+			if (isset($args["SSECSource"]["KeyBase64"]))
 				$keybase64 = $args["SSECSource"]["KeyBase64"];
-			if(isset($args["SSECSource"]["KeyMD5"]))
+			if (isset($args["SSECSource"]["KeyMD5"]))
 				$md5 = $args["SSECSource"]["KeyMD5"];
-			if(!empty($key)||!empty($keybase64)){
-				if(empty($key))
+			if (!empty($key) || !empty($keybase64)) {
+				if (empty($key))
 					$key = base64_decode($keybase64);
-				if(empty($algm))
+				if (empty($algm))
 					$algm = Consts::$SSEDefaultAlgm;
-				if(empty($md5))
+				if (empty($md5))
 					$md5 = Utils::hex_to_base64(md5($key));
 
-				$request->addHeader(Headers::$SSECSourceAlgm,$algm);
-				$request->addHeader(Headers::$SSECSourceKey,base64_encode($key));
-				$request->addHeader(Headers::$SSECSourceMD5,$md5);
+				$request->addHeader(Headers::$SSECSourceAlgm, $algm);
+				$request->addHeader(Headers::$SSECSourceKey, base64_encode($key));
+				$request->addHeader(Headers::$SSECSourceMD5, $md5);
 			}
 		}
 	}
 }
-class AllHeaderSigner{
-	public function sign(Ks3Request $request,$args=array()){
+class AllHeaderSigner {
+	public function sign(Ks3Request $request, $args = array()) {
 		$args = $args["args"];
-		$headers = isset($args["Headers"])?$args["Headers"]:"";
-		if(!empty($headers)&&is_array($headers)){
+		$headers = isset($args["Headers"]) ? $args["Headers"] : "";
+		if (!empty($headers) && is_array($headers)) {
 			foreach ($headers as $key => $value) {
-				$request->addHeader($key,$value);
+				$request->addHeader($key, $value);
 			}
 		}
 	}
 }
-class AuthUtils{
-	public static function canonicalizedKssHeaders(Ks3Request $request){
+class AuthUtils {
+	public static function canonicalizedKssHeaders(Ks3Request $request) {
 		$header = "";
 		$headers = $request->headers;
-		ksort($headers,SORT_STRING);
-		foreach ( $headers as $header_key => $header_value ) {
-			if (substr(strtolower($header_key), 0, 6) === Consts::$KS3HeaderPrefix){
-				$header .= "\n".strtolower($header_key) . ':' .$header_value;
+		ksort($headers, SORT_STRING);
+		foreach ($headers as $header_key => $header_value) {
+			if (substr(strtolower($header_key), 0, 6) === Consts::$KS3HeaderPrefix) {
+				$header .= "\n".strtolower($header_key).':'.$header_value;
 			}			
 		}
 		$header = substr($header, 1);
 		return $header;
 	}
-	public static function canonicalizedResource(Ks3Request $request){
+	public static function canonicalizedResource(Ks3Request $request) {
 		$resource = "/";
 		$bucket = $request->bucket;
 		$key = $request->key;
 		$subResource = $request->subResource;
-		if(!empty($bucket)){
-			$resource.=$request->bucket."/";
+		if (!empty($bucket)) {
+			$resource .= $request->bucket."/";
 		}
-		if(!empty($key)){
-			$resource.=Utils::encodeUrl($request->key);
+		if (!empty($key)) {
+			$resource .= Utils::encodeUrl($request->key);
 		}
 
 		$encodeParams = "";
 		$querys = $request->queryParams;
-		if(!empty($subResource)){
+		if (!empty($subResource)) {
 			$querys[$subResource] = NULL;
 		}
-		ksort($querys,SORT_STRING);
+		ksort($querys, SORT_STRING);
 		foreach ($querys as $key => $value) {
-			if(in_array($key,Consts::$SubResource)||in_array($key,Consts::$QueryParam)){
-				if(empty($value)){
-					$encodeParams.="&".$key;
-				}else{
-					$encodeParams.="&".$key."=".$value;
+			if (in_array($key, Consts::$SubResource) || in_array($key, Consts::$QueryParam)) {
+				if (empty($value)) {
+					$encodeParams .= "&".$key;
+				}else {
+					$encodeParams .= "&".$key."=".$value;
 				}
 			}
 		}
-		$encodeParams = substr($encodeParams,1);
+		$encodeParams = substr($encodeParams, 1);
 
-		$resource = str_replace("//","/%2F", $resource);
+		$resource = str_replace("//", "/%2F", $resource);
 
-		if(!empty($encodeParams)){
-			$resource.="?".$encodeParams;
+		if (!empty($encodeParams)) {
+			$resource .= "?".$encodeParams;
 		}
 		return $resource;
 	}

src/service/ksyun/bin/core/MessageHolder.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-class MessageHolder{
+class MessageHolder {
 	public $msg;
 }
 ?>
\ No newline at end of file

src/service/ksyun/bin/core/Ks3Request.class.php

Spacing +31 added lines, -31 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."core".DIRECTORY_SEPARATOR."Utils.class.php";
 
-class Ks3Request{
+class Ks3Request {
 	private $bucket;
 	private $key;
-	private $queryParams=array();
-	private $headers=array();
+	private $queryParams = array();
+	private $headers = array();
 	private $subResource;
 	private $method;
 	private $endpoint;
@@ -15,11 +15,11 @@ 
 	private $seek_position;
 	private $write_stream;
 
-	public function __set($property_name, $value){
-		$this->$property_name=$value;
+	public function __set($property_name, $value) {
+		$this->$property_name = $value;
 	}
-	public function __get($property_name){
-		if(isset($this->$property_name))
+	public function __get($property_name) {
+		if (isset($this->$property_name))
 		{
 			return($this->$property_name);
 		}else
@@ -27,55 +27,55 @@ 
 			return(NULL);
 		}
 	}
-	public function getHeader($key){
-		if(isset($this->headers[$key])){
+	public function getHeader($key) {
+		if (isset($this->headers[$key])) {
 			return  $this->headers[$key];
-		}else{
+		}else {
 			return(NULL);
 		}
 	}
-	public function addHeader($key,$value){
+	public function addHeader($key, $value) {
 		$this->headers[$key] = $value;
 	}
 
-	public function getQueryParams($key){
-		if(isset($this->queryParams[$key])){
+	public function getQueryParams($key) {
+		if (isset($this->queryParams[$key])) {
 			return  $this->queryParams[$key];
-		}else{
+		}else {
 			return(NULL);
 		}
 	}
-	public function addQueryParams($key,$value){
+	public function addQueryParams($key, $value) {
 		$this->queryParams[$key] = $value;
 	}
-	public function toUrl($endpoint){
+	public function toUrl($endpoint) {
 		$url = "";
 		$bucket = $this->bucket;
 		$key = $this->key;
 		$subResource = $this->subResource;
-		if(!empty($bucket)){
-			if(KS3_API_VHOST){
-				$url.=$bucket.".".$endpoint;
-			}else{
-				$url.=$endpoint."/".$bucket;
+		if (!empty($bucket)) {
+			if (KS3_API_VHOST) {
+				$url .= $bucket.".".$endpoint;
+			}else {
+				$url .= $endpoint."/".$bucket;
 			}
-		}else{
-			$url.=$endpoint;
+		}else {
+			$url .= $endpoint;
 		}
-		if(!empty($key)){
-			$url.="/".Utils::encodeUrl($key);
+		if (!empty($key)) {
+			$url .= "/".Utils::encodeUrl($key);
 		}
-		$url = str_replace("//","/%2F", $url);
+		$url = str_replace("//", "/%2F", $url);
 		$queryString = "";
-		if(!empty($subResource)){
-			$queryString.="&".$subResource;
+		if (!empty($subResource)) {
+			$queryString .= "&".$subResource;
 		}
 		foreach ($this->queryParams as $key => $value) {
-			$queryString.="&".$key."=".rawurlencode($value);
+			$queryString .= "&".$key."=".rawurlencode($value);
 		}
 		$queryString = substr($queryString, 1);
-		if(!empty($queryString)){
-			$url.="?".$queryString;
+		if (!empty($queryString)) {
+			$url .= "?".$queryString;
 		}
 		$url = $this->scheme.$url;
 		return $url;

src/service/ksyun/bin/core/Utils.class.php

Spacing +46 added lines, -46 removed lines

@@ -1,32 +1,32 @@ 
 <?php
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."exceptions".DIRECTORY_SEPARATOR."Exceptions.php";
 
-class Utils{
-	public static function encodeUrl($url,$path=TRUE){
+class Utils {
+	public static function encodeUrl($url, $path = TRUE) {
 		$url = rawurlencode($url);
 		$url = str_replace("+", "%20", $url);
 		$url = str_replace("*", "%2A", $url);
 		$url = str_replace("%7A", "~", $url);
-		if($path){
+		if ($path) {
 			$url = str_replace("%2F", "/", $url);
 		}
 		return $url;
 	}
-	public static function hex_to_base64($str){
+	public static function hex_to_base64($str) {
 		$result = '';
 
-		for ($i = 0; $i < strlen($str); $i += 2){
+		for ($i = 0; $i < strlen($str); $i += 2) {
 			$result .= chr(hexdec(substr($str, $i, 2)));
 		}
 
 		return base64_encode($result);
 	}
-	public static function replaceNS2($str){
+	public static function replaceNS2($str) {
 		$str = str_replace("<ns2:", "<", $str);
 		$str = str_replace("</ns2:", "</", $str);
 		return $str;
 	}
-	public static $mime_types = array (
+	public static $mime_types = array(
 			'apk' => 'application/vnd.android.package-archive',
 			'3gp' => 'video/3gpp', 'ai' => 'application/postscript', 
 			'aif' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff', 
@@ -137,14 +137,14 @@ 
 			'zip' => 'application/zip' );
 	
 	public static function get_mimetype($ext) {
-		return (isset ( self::$mime_types [$ext] ) ? self::$mime_types [$ext] : 'application/octet-stream');
+		return (isset (self::$mime_types [$ext]) ? self::$mime_types [$ext] : 'application/octet-stream');
 	}
 	/**
 	 * 检测是否含有中文
 	 * @param string $subject
 	 * @return boolean
 	 */
-	public static function chk_chinese($str){
+	public static function chk_chinese($str) {
 		return preg_match('/[\x80-\xff]./', $str);
 	}
 	
@@ -153,18 +153,18 @@ 
 	 * @param string $str 
 	 * @return boolean false UTF-8编码  TRUE GB2312编码
 	 */
-	public static function  is_gb2312($str)  {  
-	    for($i=0; $i<strlen($str); $i++) {  
-	        $v = ord( $str[$i] );  
-	        if( $v > 127) {  
-	            if( ($v >= 228) && ($v <= 233) ){  
-	                if( ($i+2) >= (strlen($str) - 1)) return true;  // not enough characters  
-	                $v1 = ord( $str[$i+1] );  
-	                $v2 = ord( $str[$i+2] );  
-	                if( ($v1 >= 128) && ($v1 <=191) && ($v2 >=128) && ($v2 <= 191) )  
-	                    return false;   //UTF-8编码  
+	public static function  is_gb2312($str) {  
+	    for ($i = 0; $i < strlen($str); $i++) {  
+	        $v = ord($str[$i]);  
+	        if ($v > 127) {  
+	            if (($v >= 228) && ($v <= 233)) {  
+	                if (($i+2) >= (strlen($str)-1)) return true; // not enough characters  
+	                $v1 = ord($str[$i+1]);  
+	                $v2 = ord($str[$i+2]);  
+	                if (($v1 >= 128) && ($v1 <= 191) && ($v2 >= 128) && ($v2 <= 191))  
+	                    return false; //UTF-8编码  
 	                else  
-	                    return true;    //GB编码  
+	                    return true; //GB编码  
 	            }  
 	        }  
 	    }  
@@ -177,57 +177,57 @@ 
 	 * @param boolean $gbk
 	 * @return boolean 
 	 */	
-	public static function check_char($str, $gbk = true){ 
-	    for($i=0; $i<strlen($str); $i++) {
-	        $v = ord( $str[$i] );
-	        if( $v > 127){
-	            if( ($v >= 228) && ($v <= 233) ){
-	                 if(($i+2)>= (strlen($str)-1)) return $gbk?true:FALSE;  // not enough characters
-	                 $v1 = ord( $str[$i+1] ); $v2 = ord( $str[$i+2] );
-	                 if($gbk){
-	                      return (($v1 >= 128) && ($v1 <=191) && ($v2 >=128) && ($v2 <= 191))?FALSE:TRUE;//GBK
-	                 }else{
-	                      return (($v1 >= 128) && ($v1 <=191) && ($v2 >=128) && ($v2 <= 191))?TRUE:FALSE;
+	public static function check_char($str, $gbk = true) { 
+	    for ($i = 0; $i < strlen($str); $i++) {
+	        $v = ord($str[$i]);
+	        if ($v > 127) {
+	            if (($v >= 228) && ($v <= 233)) {
+	                 if (($i+2) >= (strlen($str)-1)) return $gbk ?true:FALSE; // not enough characters
+	                 $v1 = ord($str[$i+1]); $v2 = ord($str[$i+2]);
+	                 if ($gbk) {
+	                      return (($v1 >= 128) && ($v1 <= 191) && ($v2 >= 128) && ($v2 <= 191)) ?FALSE:TRUE; //GBK
+	                 }else {
+	                      return (($v1 >= 128) && ($v1 <= 191) && ($v2 >= 128) && ($v2 <= 191)) ?TRUE:FALSE;
 	                 }
 	            }
 	        }
 	    }
-	   return $gbk?TRUE:FALSE;
+	   return $gbk ?TRUE:FALSE;
 	}
-	public static function iso8601($time=false) {
+	public static function iso8601($time = false) {
     	if ($time === false) $time = time();
    		$date = date('Y-m-d\TH:i:s\.Z', $time);
    		return (substr($date, 0, strlen($date)-2).'Z');
 	}
-	public static function getFileSize($path){
+	public static function getFileSize($path) {
 		$success = FALSE;
 		$isresource = FALSE;
-		if(!is_resource($path)){
+		if (!is_resource($path)) {
 			$isresource = FALSE;
-			$resource = fopen($path,"r");
-		}else{
+			$resource = fopen($path, "r");
+		}else {
 			$isresource = TRUE;
 			$resource = $path;
 		}
 		$stat = fstat($resource);
 		$size = $stat["size"];
-		if($size<0){
+		if ($size < 0) {
 			$success = FALSE;
-		}else{
+		}else {
 			$success = TRUE;
 		}
-		if($success)
+		if ($success)
 			return $size;
-		else if($isresource)
+		else if ($isresource)
 			throw new Ks3ClientException("please use file path instead resource");
-		if(!((strtoupper(substr(PHP_OS,0,3))=="WIN"))){//如果不是windows系统，尝试使用stat命令
-			$size=trim(`stat -c%s $path`);
-		}else{//如果是windows系统，尝试cmd命令
-			if(!class_exists("COM")){
+		if (!((strtoupper(substr(PHP_OS, 0, 3)) == "WIN"))) {//如果不是windows系统，尝试使用stat命令
+			$size = trim(`stat -c%s $path`);
+		}else {//如果是windows系统，尝试cmd命令
+			if (!class_exists("COM")) {
 				throw new Ks3ClientException("please add 'extension=php_com_dotnet.dll' and set 'com.allow_dcom = true' in php.ini and restart");
 			}
 			 $fs = new COM("Scripting.FileSystemObject");
-   			 $size=$fs->GetFile($path)->Size;
+   			 $size = $fs->GetFile($path)->Size;
 		}
 		return $size;
 	}

src/service/ksyun/bin/core/API.php

Spacing +7 added lines, -7 removed lines

@@ -7,7 +7,7 @@ 
 signer：请求构造链
 handler：结果处理链
 */
-class API{
+class API {
 	public static $API = array(
 		"getService"=>array(
 			"redirect"=>"listBuckets"
@@ -73,7 +73,7 @@ 
 			"needBucket"=>TRUE,
 			"needObject"=>FALSE,
 			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"queryParams"=>array("Options->prefix","Options->delimiter","Options->marker","Options->max-keys"),
+			"queryParams"=>array("Options->prefix", "Options->delimiter", "Options->marker", "Options->max-keys"),
 			"handler"=>"ErrorResponseHandler->ListObjectsHandler"
 		),
 		"getBucketAcl" => array(
@@ -113,7 +113,7 @@ 
 			"needBucket"=>TRUE,
 			"needObject"=>FALSE,
 			"subResource"=>"uploads",
-			"queryParams"=>array("Options->max-uploads","Options->key-marker","Options->prefix","Options->upload-id-​marker","Options->delimiter"),
+			"queryParams"=>array("Options->max-uploads", "Options->key-marker", "Options->prefix", "Options->upload-id-​marker", "Options->delimiter"),
 			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
 			"handler"=>"ErrorResponseHandler->ListMutipartUploadsHandler"
 		),
@@ -212,7 +212,7 @@ 
 			"method"=>"PUT",
 			"needBucket"=>TRUE,
 			"needObject"=>TRUE,
-			"queryParams"=>array("!Options->uploadId","!Options->partNumber"),
+			"queryParams"=>array("!Options->uploadId", "!Options->partNumber"),
 			//这个请求没有body，所以使用了ContentLengthSigner->ContentMD5Signer而没用ObjectMetaSigner
 			"signer"=>"DefaultUserAgentSigner->ACLSigner->StreamContentTypeSigner->ContentLengthSigner->ContentMD5Signer->SSECSigner->StreamUploadSigner->HeaderAuthSigner",
 			"handler"=>"ErrorResponseHandler->UploadHandler"
@@ -229,7 +229,7 @@ 
 			"method"=>"GET",
 			"needBucket"=>TRUE,
 			"needObject"=>TRUE,
-			"queryParams"=>array("!Options->uploadId","Options->max-parts","Options->part-number​-marker"),
+			"queryParams"=>array("!Options->uploadId", "Options->max-parts", "Options->part-number​-marker"),
 			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
 			"handler"=>"ErrorResponseHandler->ListPartsHandler"
 		),
@@ -246,7 +246,7 @@ 
 			"method"=>"Method",
 			"needBucket"=>FALSE,
 			"needObject"=>FALSE,
-			"queryParams"=>array("!Options->Expires","Options->*"),
+			"queryParams"=>array("!Options->Expires", "Options->*"),
 			"signer"=>"AllHeaderSigner->QueryAuthSigner",
 		),
 		"putAdp"=>array(
@@ -261,7 +261,7 @@ 
 			"method"=>"GET",
 			"needBucket"=>FALSE,
 			"needObject"=>TRUE,
-			"objectPostion"=>"TaskID",//专门为这个接口定义的属性
+			"objectPostion"=>"TaskID", //专门为这个接口定义的属性
 			"subResource"=>"queryadp",
 			"signer"=>"DefaultUserAgentSigner",
 			"handler"=>"ErrorResponseHandler->AdpHandler"

src/service/ksyun/bin/core/Handlers.php

Spacing +106 added lines, -106 removed lines

@@ -1,66 +1,66 @@ 
 <?php
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."exceptions".DIRECTORY_SEPARATOR."Exceptions.php";
 
-interface Handler{
+interface Handler {
 	public function handle(ResponseCore $response);
 }
-class ErrorResponseHandler implements Handler{
-	public function handle(ResponseCore $response){
+class ErrorResponseHandler implements Handler {
+	public function handle(ResponseCore $response) {
 		$code = $response->status;
-		if($code >= 400){
+		if ($code >= 400) {
 			$exception = new Ks3ServiceException();
-			$exception->statusCode=$code;
-			if(!empty($response->body)){
+			$exception->statusCode = $code;
+			if (!empty($response->body)) {
 				$xml = new SimpleXMLElement($response->body);
 				$exception ->requestId = $xml->RequestId->__toString();
 				$exception->errorCode = $xml->Code->__toString();
-				$exception->errorMessage=$xml->Message->__toString();
-				$exception->resource=$xml->Resource->__toString();
+				$exception->errorMessage = $xml->Message->__toString();
+				$exception->resource = $xml->Resource->__toString();
 			}
 			throw $exception;
-		}else{
+		}else {
 			return $response;
 		}
 	}
 }
-class ListBucketsHandler implements Handler{
+class ListBucketsHandler implements Handler {
 
-	public function handle(ResponseCore $response){
+	public function handle(ResponseCore $response) {
 		$result = array();
 		$xml = new SimpleXMLElement($response->body);
 		foreach ($xml->Buckets->Bucket as $bucketXml) {
 			$bucket = array();
 			foreach ($bucketXml->children() as $key => $value) {
-				$bucket[$key]=$value->__toString();
+				$bucket[$key] = $value->__toString();
 			}
 			array_push($result, $bucket);
 		}
 		return $result;
 	}
 }
-class ListObjectsHandler implements Handler{
-	public function handle(ResponseCore $response){
+class ListObjectsHandler implements Handler {
+	public function handle(ResponseCore $response) {
 		$result = array();
 		$xml = new SimpleXMLElement($response->body);
-		$result["Name"]=$xml->Name->__toString();
-		$result["Prefix"]=$xml->Prefix->__toString();
-		$result["Marker"]=$xml->Marker->__toString();
-		$result["Delimiter"]=$xml->Delimiter->__toString();
-		$result["MaxKeys"]=$xml->MaxKeys->__toString();
-		$result["IsTruncated"]=$xml->IsTruncated->__toString();
-		$result["NextMarker"]=$xml->NextMarker->__toString();
+		$result["Name"] = $xml->Name->__toString();
+		$result["Prefix"] = $xml->Prefix->__toString();
+		$result["Marker"] = $xml->Marker->__toString();
+		$result["Delimiter"] = $xml->Delimiter->__toString();
+		$result["MaxKeys"] = $xml->MaxKeys->__toString();
+		$result["IsTruncated"] = $xml->IsTruncated->__toString();
+		$result["NextMarker"] = $xml->NextMarker->__toString();
 		$contents = array();
 		foreach ($xml->Contents as $contentXml) {
 			$content = array();
 			foreach ($contentXml->children() as $key => $value) {
 				$owner = array();
-				if($key === "Owner"){
+				if ($key === "Owner") {
 					foreach ($value->children() as $ownerkey => $ownervalue) {
-						$owner[$ownerkey]=$ownervalue->__toString();
+						$owner[$ownerkey] = $ownervalue->__toString();
 					}
 					$content["Owner"] = $owner;
-				}else{
-					$content[$key]=$value->__toString();
+				}else {
+					$content[$key] = $value->__toString();
 				}
 			}
 			array_push($contents, $content);
@@ -77,62 +77,62 @@ 
 		return $result;
 	}
 }
-class GetBucketCORSHandler implements Handler{
-	public function handle(ResponseCore $response){
+class GetBucketCORSHandler implements Handler {
+	public function handle(ResponseCore $response) {
 		$xml = new SimpleXMLElement($response->body);
 		$cors = array();
 		foreach ($xml->CORSRule as $rule) {
 			$acors = array();
 			foreach ($rule as $key => $value) {
-				if($key === "MaxAgeSeconds")
+				if ($key === "MaxAgeSeconds")
 				{
 					$acors[$key] = $value->__toString();
-				}else{
-					if(!isset($acors[$key])){
+				}else {
+					if (!isset($acors[$key])) {
 						$acors[$key] = array();
 					}
-					array_push($acors[$key],$value->__toString());
+					array_push($acors[$key], $value->__toString());
 				}
 			}
-			array_push($cors,$acors);
+			array_push($cors, $acors);
 		}
 		return $cors;
 	}
 }
-class GetBucketLocationHandler implements Handler{
-	public function handle(ResponseCore $response){
+class GetBucketLocationHandler implements Handler {
+	public function handle(ResponseCore $response) {
 		$xml = new SimpleXMLElement($response->body);
 		$location = $xml->__toString();
 
 		return $location;
 	}
 }
-class GetBucketLoggingHandler implements Handler{
-	public function handle(ResponseCore $response){
+class GetBucketLoggingHandler implements Handler {
+	public function handle(ResponseCore $response) {
 		$logging = array();
 		$xml = new SimpleXMLElement($response->body);
 		$loggingXml = $xml->LoggingEnabled;
-		if($loggingXml&&$loggingXml!==NULL)
+		if ($loggingXml && $loggingXml !== NULL)
 		{
 			foreach ($loggingXml->children() as $key => $value) {
 				$logging["Enable"] = TRUE;
 				$logging[$key] = $value->__toString();
 			}
-		}else{
+		}else {
 			$logging["Enable"] = FALSE;
 		}
 		return $logging;
 	}
 }
-class ObjectMetaHandler implements Handler{
-	public function handle(ResponseCore $response){
+class ObjectMetaHandler implements Handler {
+	public function handle(ResponseCore $response) {
 		$ObjectMeta = array();
 		$UserMeta = array();
 		foreach ($response->header as $key => $value) {
-			if (substr(strtolower($key), 0, 10) === Consts::$UserMetaPrefix){
-				$UserMeta[$key]=$value;
-			}else if(isset(Consts::$ResponseObjectMeta[strtolower($key)])){
-				$ObjectMeta[Consts::$ResponseObjectMeta[strtolower($key)]]=$value;
+			if (substr(strtolower($key), 0, 10) === Consts::$UserMetaPrefix) {
+				$UserMeta[$key] = $value;
+			}else if (isset(Consts::$ResponseObjectMeta[strtolower($key)])) {
+				$ObjectMeta[Consts::$ResponseObjectMeta[strtolower($key)]] = $value;
 			}
 		}
 		$Meta = array(
@@ -142,15 +142,15 @@ 
 		return $Meta;
 	}
 }
-class getObjectHandler implements Handler{
-	public function handle(ResponseCore $response){
+class getObjectHandler implements Handler {
+	public function handle(ResponseCore $response) {
 		$ObjectMeta = array();
 		$UserMeta = array();
 		foreach ($response->header as $key => $value) {
-			if (substr(strtolower($key), 0, 10) === Consts::$UserMetaPrefix){
-				$UserMeta[$key]=$value;
-			}else if(isset(Consts::$ResponseObjectMeta[strtolower($key)])){
-				$ObjectMeta[Consts::$ResponseObjectMeta[strtolower($key)]]=$value;
+			if (substr(strtolower($key), 0, 10) === Consts::$UserMetaPrefix) {
+				$UserMeta[$key] = $value;
+			}else if (isset(Consts::$ResponseObjectMeta[strtolower($key)])) {
+				$ObjectMeta[Consts::$ResponseObjectMeta[strtolower($key)]] = $value;
 			}
 		}
 		$Meta = array(
@@ -164,21 +164,21 @@ 
 		return $ks3Object;
 	}
 }
-class CopyHandler implements Handler{
-	public function handle(ResponseCore $response){
+class CopyHandler implements Handler {
+	public function handle(ResponseCore $response) {
 		$headers = array();
 
 		foreach ($response->header as $key => $value) {
-			if(isset(Consts::$SSEHandler[strtolower($key)])&&!empty($value)){
-				$headers[Consts::$SSEHandler[strtolower($key)]]=$value;
+			if (isset(Consts::$SSEHandler[strtolower($key)]) && !empty($value)) {
+				$headers[Consts::$SSEHandler[strtolower($key)]] = $value;
 			}
 		}
 
 		return $headers;
 	}	
 }
-class InitMultipartUploadHandler implements Handler{
-	public function handle(ResponseCore $response){
+class InitMultipartUploadHandler implements Handler {
+	public function handle(ResponseCore $response) {
 		$upload = array();
 		$xml = new SimpleXMLElement($response->body);
 		foreach ($xml->children() as $key => $value) {
@@ -186,27 +186,27 @@ 
 		}
 
 		foreach ($response->header as $key => $value) {
-			if(isset(Consts::$SSEHandler[strtolower($key)])&&!empty($value)){
-				$upload[Consts::$SSEHandler[strtolower($key)]]=$value;
+			if (isset(Consts::$SSEHandler[strtolower($key)]) && !empty($value)) {
+				$upload[Consts::$SSEHandler[strtolower($key)]] = $value;
 			}
 		}
 
 		return $upload;
 	}
 }
-class ListPartsHandler implements Handler{
-	public function handle(ResponseCore $response){
+class ListPartsHandler implements Handler {
+	public function handle(ResponseCore $response) {
 		$listParts = array();
 		$xml = new SimpleXMLElement($response->body);
 
-		$listParts["Bucket"]=$xml->Bucket->__toString();
-		$listParts["Key"]=$xml->Key->__toString();
-		$listParts["UploadId"]=$xml->UploadId->__toString();
-		$listParts["StorageClass"]=$xml->StorageClass->__toString();
-		$listParts["PartNumberMarker"]=$xml->PartNumberMarker->__toString();
-		$listParts["NextPartNumberMarker"]=$xml->NextPartNumberMarker->__toString();
-		$listParts["MaxParts"]=$xml->MaxParts->__toString();
-		$listParts["IsTruncated"]=$xml->IsTruncated->__toString();
+		$listParts["Bucket"] = $xml->Bucket->__toString();
+		$listParts["Key"] = $xml->Key->__toString();
+		$listParts["UploadId"] = $xml->UploadId->__toString();
+		$listParts["StorageClass"] = $xml->StorageClass->__toString();
+		$listParts["PartNumberMarker"] = $xml->PartNumberMarker->__toString();
+		$listParts["NextPartNumberMarker"] = $xml->NextPartNumberMarker->__toString();
+		$listParts["MaxParts"] = $xml->MaxParts->__toString();
+		$listParts["IsTruncated"] = $xml->IsTruncated->__toString();
 
 		$initer = array();
 		$owner = array();
@@ -218,7 +218,7 @@ 
 			$owner[$key] = $value->__toString();
 		}
 		$listParts["Owner"] = $owner;
-		$listParts["Initiator"]=$initer;
+		$listParts["Initiator"] = $initer;
 
 		$parts = array();
 		foreach ($xml->Part as $partxml) {
@@ -226,25 +226,25 @@ 
 			foreach ($partxml->children() as $key => $value) {
 				$part[$key] = $value->__toString();
 			}
-			array_push($parts,$part);
+			array_push($parts, $part);
 		}
 		$listParts["Parts"] = $parts;
 		return $listParts;
 	}
 }
-class UploadHandler implements Handler{
-	public function handle(ResponseCore $response){
+class UploadHandler implements Handler {
+	public function handle(ResponseCore $response) {
 		$Headers = array();
 		foreach ($response->header as $key => $value) {
-			if(isset(Consts::$UploadHandler[strtolower($key)])&&!empty($value)){
-				$Headers[Consts::$UploadHandler[strtolower($key)]]=$value;
+			if (isset(Consts::$UploadHandler[strtolower($key)]) && !empty($value)) {
+				$Headers[Consts::$UploadHandler[strtolower($key)]] = $value;
 			}
 		}
 		return $Headers;
 	}
 }
-class GetAclHandler implements Handler{
-	public function handle(ResponseCore $response){
+class GetAclHandler implements Handler {
+	public function handle(ResponseCore $response) {
 		$hasread = FALSE;
 		$haswrite = FALSE;
 		$xml = new SimpleXMLElement($response->body);
@@ -254,88 +254,88 @@ 
 			$hasURI = FALSE;
 			$grantee = $grant->Grantee;
 			foreach ($grantee->children() as $key => $value) {
-				if($key === "URI"&&$value->__toString() === Consts::$Grantee_Group_All){
+				if ($key === "URI" && $value->__toString() === Consts::$Grantee_Group_All) {
 					$hasURI = TRUE;
 				}
 			}
-			if($hasURI){
-				if($permission===Consts::$Permission_Read){
+			if ($hasURI) {
+				if ($permission === Consts::$Permission_Read) {
 					$hasread = TRUE;
-				}elseif($permission===Consts::$Permission_Write){
+				}elseif ($permission === Consts::$Permission_Write) {
 					$haswrite = TRUE;
 				}
 			}
 		}
-		if($hasread&&$haswrite){
+		if ($hasread && $haswrite) {
 			return "public-read-write";
-		}else{
-			if($hasread)
+		}else {
+			if ($hasread)
 				return "public-read";
 			else
 				return "private";
 		}
 	}
 }
-class ListMutipartUploadsHandler implements Handler{
-	public function handle(ResponseCore $response){
+class ListMutipartUploadsHandler implements Handler {
+	public function handle(ResponseCore $response) {
 		$mutiUploads = array();
 		$xml = new SimpleXMLElement($response->body);
 
-		$mutiUploads["Bucket"]=$xml->Bucket->__toString();
-		$mutiUploads["KeyMarker"]=$xml->KeyMarker->__toString();
-		$mutiUploads["UploadIdMarker"]=$xml->UploadIdMarker->__toString();
-		$mutiUploads["NextKeyMarker"]=$xml->NextKeyMarker->__toString();
-		$mutiUploads["NextUploadIdMarker"]=$xml->NextUploadIdMarker->__toString();
-		$mutiUploads["MaxUploads"]=$xml->MaxUploads->__toString();
-		$mutiUploads["IsTruncated"]=$xml->IsTruncated->__toString();
+		$mutiUploads["Bucket"] = $xml->Bucket->__toString();
+		$mutiUploads["KeyMarker"] = $xml->KeyMarker->__toString();
+		$mutiUploads["UploadIdMarker"] = $xml->UploadIdMarker->__toString();
+		$mutiUploads["NextKeyMarker"] = $xml->NextKeyMarker->__toString();
+		$mutiUploads["NextUploadIdMarker"] = $xml->NextUploadIdMarker->__toString();
+		$mutiUploads["MaxUploads"] = $xml->MaxUploads->__toString();
+		$mutiUploads["IsTruncated"] = $xml->IsTruncated->__toString();
 
 
 		$uploads = array();
 		foreach ($xml->Upload as $uploadxml) {
 			$upload = array();
 			foreach ($uploadxml->children() as $key => $value) {
-				if($key === "Initiator"){
+				if ($key === "Initiator") {
 					$initer = array();
 					foreach ($value->children() as $key1 => $value1) {
 						$initer[$key1] = $value1->__toString();
 					}
 					$upload["Initiator"] = $initer;
-				}elseif($key === "Owner"){
+				}elseif ($key === "Owner") {
 					$owner = array();
 					foreach ($value->children() as $key1 => $value1) {
 						$owner[$key1] = $value1->__toString();
 					}
 					$upload["Owner"] = $owner;
-				}else{
+				}else {
 					$upload[$key] = $value->__toString();
 				}
 			}
-			array_push($uploads,$upload);
+			array_push($uploads, $upload);
 		}
 		$mutiUploads["Uploads"] = $uploads;
 		return $mutiUploads;
 	}
 }
-class AdpHandler implements Handler{
-	public function handle(ResponseCore $response){
+class AdpHandler implements Handler {
+	public function handle(ResponseCore $response) {
 		return $response->body;
 	}
 }
-class BooleanHandler implements Handler{
-	public function handle(ResponseCore $response){
-		if($response->isOk()){
+class BooleanHandler implements Handler {
+	public function handle(ResponseCore $response) {
+		if ($response->isOk()) {
 			return TRUE;
-		}else{
+		}else {
 			return FALSE;
 		}
 	}
 }
-class ExistsHandler implements Handler{
-	public function handle(ResponseCore $response){
+class ExistsHandler implements Handler {
+	public function handle(ResponseCore $response) {
 		$status = $response->status;
-		if($status === 404){
+		if ($status === 404) {
 			return FALSE;
-		}else{
+		}else {
 			return TRUE;
 		}
 	}

src/service/ksyun/bin/lib/RequestCore.class.php

Spacing +16 added lines, -16 removed lines

@@ -387,7 +387,7 @@ 
 
 				if ($position !== false && $position >= 0)
 				{
-					$size = $stats['size'] - $position;
+					$size = $stats['size']-$position;
 				}
 			}
 		}
@@ -462,7 +462,7 @@ 
 	 */
 	public function set_seek_position($position)
 	{
-		$this->seek_position = isset($position) ? (integer) $position : null;
+		$this->seek_position = isset($position) ? (integer)$position : null;
 
 		return $this;
 	}
@@ -533,7 +533,7 @@ 
 		// Execute callback function
 		if ($this->registered_streaming_read_callback)
 		{
-			return $this->registered_streaming_read_callback->streaming_read_callback($curl_handle, $file_handle, $length,$this->read_stream,$this->seek_position);
+			return $this->registered_streaming_read_callback->streaming_read_callback($curl_handle, $file_handle, $length, $this->read_stream, $this->seek_position);
 		}
 		// Once we've sent as much as we're supposed to send...
 		if ($this->read_stream_read >= $this->read_stream_size)
@@ -551,7 +551,7 @@ 
 			}
 		}
 
-		$read = fread($this->read_stream, min($this->read_stream_size - $this->read_stream_read, $length)); // Remaining upload data or cURL's requested chunk size
+		$read = fread($this->read_stream, min($this->read_stream_size-$this->read_stream_read, $length)); // Remaining upload data or cURL's requested chunk size
 		$this->read_stream_read += strlen($read);
 
 		$out = $read === false ? '' : $read;
@@ -568,8 +568,8 @@ 
 	 */
 	public function streaming_write_callback($curl_handle, $data)
 	{
-		if ($this->registered_streaming_write_callback){
-			return $this->registered_streaming_write_callback->streaming_write_callback($curl_handle,$data,$this->write_stream);
+		if ($this->registered_streaming_write_callback) {
+			return $this->registered_streaming_write_callback->streaming_write_callback($curl_handle, $data, $this->write_stream);
 		}
 		$length = strlen($data);
 		$written_total = 0;
@@ -631,7 +631,7 @@ 
 		// chmod the file as 0755
 		if ($this->cacert_location === true)
 		{
-			curl_setopt($curl_handle, CURLOPT_CAINFO, dirname(__FILE__) . '/cacert.pem');
+			curl_setopt($curl_handle, CURLOPT_CAINFO, dirname(__FILE__).'/cacert.pem');
 		}
 		elseif (is_string($this->cacert_location))
 		{
@@ -656,12 +656,12 @@ 
 			curl_setopt($curl_handle, CURLOPT_HTTPPROXYTUNNEL, true);
 
 			$host = $this->proxy['host'];
-			$host .= ($this->proxy['port']) ? ':' . $this->proxy['port'] : '';
+			$host .= ($this->proxy['port']) ? ':'.$this->proxy['port'] : '';
 			curl_setopt($curl_handle, CURLOPT_PROXY, $host);
 
 			if (isset($this->proxy['user']) && isset($this->proxy['pass']))
 			{
-				curl_setopt($curl_handle, CURLOPT_PROXYUSERPWD, $this->proxy['user'] . ':' . $this->proxy['pass']);
+				curl_setopt($curl_handle, CURLOPT_PROXYUSERPWD, $this->proxy['user'].':'.$this->proxy['pass']);
 			}
 		}
 
@@ -669,7 +669,7 @@ 
 		if ($this->username && $this->password)
 		{
 			curl_setopt($curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-			curl_setopt($curl_handle, CURLOPT_USERPWD, $this->username . ':' . $this->password);
+			curl_setopt($curl_handle, CURLOPT_USERPWD, $this->username.':'.$this->password);
 		}
 
 		// Handle the encoding if we can.
@@ -685,7 +685,7 @@ 
 
 			foreach ($this->request_headers as $k => $v)
 			{
-				$temp_headers[] = $k . ': ' . $v;
+				$temp_headers[] = $k.': '.$v;
 			}
 
 			curl_setopt($curl_handle, CURLOPT_HTTPHEADER, $temp_headers);
@@ -787,7 +787,7 @@ 
 			foreach ($this->response_headers as $header)
 			{
 				$kv = explode(': ', $header);
-				$header_assoc[strtolower($kv[0])] = isset($kv[1])?$kv[1]:'';
+				$header_assoc[strtolower($kv[0])] = isset($kv[1]) ? $kv[1] : '';
 			}
 
 			// Reset the headers to the appropriate property.
@@ -820,7 +820,7 @@ 
 
 		if ($this->response === false)
 		{
-			throw new RequestCore_Exception('cURL resource: ' . (string) $curl_handle . '; cURL error: ' . curl_error($curl_handle) . ' (' . curl_errno($curl_handle) . ')');
+			throw new RequestCore_Exception('cURL resource: '.(string)$curl_handle.'; cURL error: '.curl_error($curl_handle).' ('.curl_errno($curl_handle).')');
 		}
 
 		$parsed_response = $this->process_response($curl_handle, $this->response);
@@ -893,13 +893,13 @@ 
 				// Since curl_errno() isn't reliable for handles that were in multirequests, we check the 'result' of the info read, which contains the curl error number, (listed here http://curl.haxx.se/libcurl/c/libcurl-errors.html )
 				if ($done['result'] > 0)
 				{
-					throw new RequestCore_Exception('cURL resource: ' . (string) $done['handle'] . '; cURL error: ' . curl_error($done['handle']) . ' (' . $done['result'] . ')');
+					throw new RequestCore_Exception('cURL resource: '.(string)$done['handle'].'; cURL error: '.curl_error($done['handle']).' ('.$done['result'].')');
 				}
 
 				// Because curl_multi_info_read() might return more than one message about a request, we check to see if this request is already in our array of completed requests
-				elseif (!isset($to_process[(int) $done['handle']]))
+				elseif (!isset($to_process[(int)$done['handle']]))
 				{
-					$to_process[(int) $done['handle']] = $done;
+					$to_process[(int)$done['handle']] = $done;
 				}
 			}