GC0202 / ThinkLibrary

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

Indentation +23 added lines, -23 removed lines

@@ -1,29 +1,29 @@
 <?php
 class Headers{
-	static $Date = "Date";
-	static $Authorization = "Authorization";
-	static $ContentMd5 = "Content-MD5";
-	static $ContentType = "Content-Type";
-	static $ContentLength="Content-Length";
-	static $Acl = "x-kss-acl";
-	static $CopySource = "x-kss-copy-source";
-	static $ETag = "ETag";
-	static $TaskID = "TaskID";
-	static $Range = "Range";
-	static $AsynchronousProcessingList = "kss-async-process";
-	static $NotifyURL = "kss-notifyurl";
-	static $XKssCallbackUrl = "x-kss-callbackurl";
-	static $XKssCallbackBody = "x-kss-callbackbody";
-	static $UserAgent = "User-Agent";
-	static $SSEAlgm = "x-kss-server-side-encryption";
-	static $SSEKMSId = "x-kss-server-side-encryption-kss-kms-key-id";
-	static $SSECAlgm = "x-kss-server-side-encryption-customer-algorithm";
-	static $SSECKey = "x-kss-server-side-encryption-customer-key";
-	static $SSECMD5 = "x-kss-server-side-encryption-customer-key-MD5";
+    static $Date = "Date";
+    static $Authorization = "Authorization";
+    static $ContentMd5 = "Content-MD5";
+    static $ContentType = "Content-Type";
+    static $ContentLength="Content-Length";
+    static $Acl = "x-kss-acl";
+    static $CopySource = "x-kss-copy-source";
+    static $ETag = "ETag";
+    static $TaskID = "TaskID";
+    static $Range = "Range";
+    static $AsynchronousProcessingList = "kss-async-process";
+    static $NotifyURL = "kss-notifyurl";
+    static $XKssCallbackUrl = "x-kss-callbackurl";
+    static $XKssCallbackBody = "x-kss-callbackbody";
+    static $UserAgent = "User-Agent";
+    static $SSEAlgm = "x-kss-server-side-encryption";
+    static $SSEKMSId = "x-kss-server-side-encryption-kss-kms-key-id";
+    static $SSECAlgm = "x-kss-server-side-encryption-customer-algorithm";
+    static $SSECKey = "x-kss-server-side-encryption-customer-key";
+    static $SSECMD5 = "x-kss-server-side-encryption-customer-key-MD5";
 
-	static $SSECSourceAlgm = "x-kss-copy-source-server-side-encryption-customer-algorithm";
-	static $SSECSourceKey = "x-kss-copy-source-server-side-encryption-customer-key";
-	static $SSECSourceMD5 = "x-kss-copy-source-server-side-encryption-customer-key-MD5";
+    static $SSECSourceAlgm = "x-kss-copy-source-server-side-encryption-customer-algorithm";
+    static $SSECSourceKey = "x-kss-copy-source-server-side-encryption-customer-key";
+    static $SSECSourceMD5 = "x-kss-copy-source-server-side-encryption-customer-key-MD5";
 
 }
 ?>
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
 <?php
-class Headers{
+class Headers {
 	static $Date = "Date";
 	static $Authorization = "Authorization";
 	static $ContentMd5 = "Content-MD5";
 	static $ContentType = "Content-Type";
-	static $ContentLength="Content-Length";
+	static $ContentLength = "Content-Length";
 	static $Acl = "x-kss-acl";
 	static $CopySource = "x-kss-copy-source";
 	static $ETag = "ETag";

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

Indentation +37 added lines, -37 removed lines

@@ -1,46 +1,46 @@
 <?php
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."exceptions".DIRECTORY_SEPARATOR."Exceptions.php";
 class Logger{
-	function info($msg){
-		$this->log("INFO",$msg);
-	}
-	function error($msg){
-		$this->log("ERROR",$msg);
-	}
-	function warn($msg){
-		$this->log("WARN",$msg);
-	}
-	function debug($msg){
-		$this->log("DEBUG",$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') ){
-			$log_path = KS3_API_LOG_PATH;
-			if(empty($log_path)){
-				$log_path = KS3_API_PATH.DIRECTORY_SEPARATOR.'log'.DIRECTORY_SEPARATOR;
-			}
-		}else{
-			$log_path = KS3_API_PATH.DIRECTORY_SEPARATOR.'log'.DIRECTORY_SEPARATOR;
-		}
+    function info($msg){
+        $this->log("INFO",$msg);
+    }
+    function error($msg){
+        $this->log("ERROR",$msg);
+    }
+    function warn($msg){
+        $this->log("WARN",$msg);
+    }
+    function debug($msg){
+        $this->log("DEBUG",$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') ){
+            $log_path = KS3_API_LOG_PATH;
+            if(empty($log_path)){
+                $log_path = KS3_API_PATH.DIRECTORY_SEPARATOR.'log'.DIRECTORY_SEPARATOR;
+            }
+        }else{
+            $log_path = KS3_API_PATH.DIRECTORY_SEPARATOR.'log'.DIRECTORY_SEPARATOR;
+        }
 		
-		//检测日志目录是否存在
-		if(!file_exists($log_path)){
-			mkdir($log_path);
-		}
+        //检测日志目录是否存在
+        if(!file_exists($log_path)){
+            mkdir($log_path);
+        }
 
-		$log_name = $log_path.'ks3_php_sdk_'.date('Y-m-d').'.log';
+        $log_name = $log_path.'ks3_php_sdk_'.date('Y-m-d').'.log';
 
-		if(KS3_API_DISPLAY_LOG){
-			echo $log;
-		}
+        if(KS3_API_DISPLAY_LOG){
+            echo $log;
+        }
 		
-		if(KS3_API_LOG){
-			if(!error_log($log,3,$log_name)){
-				throw new Ks3ClientException("write to log file error");
-			}
-		}
-	}
+        if(KS3_API_LOG){
+            if(!error_log($log,3,$log_name)){
+                throw new Ks3ClientException("write to log file error");
+            }
+        }
+    }
 }
 ?>
\ No newline at end of file

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");
 			}
 		}

Braces +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 			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;
 		}
 		

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

Indentation +84 added lines, -84 removed lines

@@ -3,100 +3,100 @@
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."config".DIRECTORY_SEPARATOR."Consts.php";
 
 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"]);
-			return $xml->asXml();
-		}
-	}
+    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"]);
+            return $xml->asXml();
+        }
+    }
 }
 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)){
-				foreach ($cors as $key => $rule) {
-					$ruleXml = $xml->addChild("CORSRule");
-					if(is_array($rule)){
-						foreach ($rule as $key => $value) {
-							if(in_array($key,Consts::$CORSElements)){
-								if(is_array($value)){
-									foreach ($value as  $ele) {
-										$ruleXml->addChild($key,$ele);
-									}
-								}else{
-									$ruleXml->addChild($key,$value);
-								}
+    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)){
+                foreach ($cors as $key => $rule) {
+                    $ruleXml = $xml->addChild("CORSRule");
+                    if(is_array($rule)){
+                        foreach ($rule as $key => $value) {
+                            if(in_array($key,Consts::$CORSElements)){
+                                if(is_array($value)){
+                                    foreach ($value as  $ele) {
+                                        $ruleXml->addChild($key,$ele);
+                                    }
+                                }else{
+                                    $ruleXml->addChild($key,$value);
+                                }
 								
-							}
-						}
-					}
-				}
-			}
-			return $xml->asXml();
-		}
-	}
+                            }
+                        }
+                    }
+                }
+            }
+            return $xml->asXml();
+        }
+    }
 }
 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)){
+    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(!isset($logging["Enable"]))
-					throw new Ks3ClientException("bucket logging must provide Enable argument");
+                if(!isset($logging["Enable"]))
+                    throw new Ks3ClientException("bucket logging must provide Enable argument");
 				
-				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);
-						}
-					}
-				}
-			}
-			return $xml->asXml();
-		}
-	}
+                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);
+                        }
+                    }
+                }
+            }
+            return $xml->asXml();
+        }
+    }
 }
 class DeleteObjectsBuilder{
-	function build($args){
-		if(isset($args["DeleteKeys"])){
-			$keys = $args["DeleteKeys"];
-			$xml = new SimpleXmlElement('<Delete></Delete>');
-			if(is_array($keys)){
-				foreach ($keys as $key => $value) {
-					$object = $xml->addChild("Object");
-					$object->addChild("Key",$value);
-				}
-			}
-			return $xml->asXml();
-		}
-	}
+    function build($args){
+        if(isset($args["DeleteKeys"])){
+            $keys = $args["DeleteKeys"];
+            $xml = new SimpleXmlElement('<Delete></Delete>');
+            if(is_array($keys)){
+                foreach ($keys as $key => $value) {
+                    $object = $xml->addChild("Object");
+                    $object->addChild("Key",$value);
+                }
+            }
+            return $xml->asXml();
+        }
+    }
 }
 class CompleteMultipartUploadBuilder{
-	function build($args){
-		if(isset($args["Parts"])){
-			$parts = $args["Parts"];
-			$xml = new SimpleXmlElement('<CompleteMultipartUpload></CompleteMultipartUpload>');
-			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);
-						}
-					}
-				}
-			}
-			return $xml->asXml();
-		}
-	}
+    function build($args){
+        if(isset($args["Parts"])){
+            $parts = $args["Parts"];
+            $xml = new SimpleXmlElement('<CompleteMultipartUpload></CompleteMultipartUpload>');
+            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);
+                        }
+                    }
+                }
+            }
+            return $xml->asXml();
+        }
+    }
 }
 ?>
\ No newline at end of file

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);
 						}
 					}
 				}

Braces +7 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
 									foreach ($value as  $ele) {
 										$ruleXml->addChild($key,$ele);
 									}
-								}else{
+								} else{
 									$ruleXml->addChild($key,$value);
 								}
 								
@@ -47,12 +47,14 @@ 
 			$xml = new SimpleXmlElement('<BucketLoggingStatus xmlns="http://s3.amazonaws.com/doc/2006-03-01/" />');
 			if(is_array($logging)){
 
-				if(!isset($logging["Enable"]))
-					throw new Ks3ClientException("bucket logging must provide Enable argument");
+				if(!isset($logging["Enable"])) {
+									throw new Ks3ClientException("bucket logging must provide Enable argument");
+				}
 				
 				if($logging["Enable"]){
-					if(!isset($logging["TargetBucket"]))
-						throw new Ks3ClientException("bucket logging must provide TargetBucket argument");
+					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)){

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

Indentation +473 added lines, -473 removed lines

@@ -6,536 +6,536 @@
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."exceptions".DIRECTORY_SEPARATOR."Exceptions.php";
 
 interface Signer{
-	public function sign( Ks3Request $request,$args=array());
+    public function sign( Ks3Request $request,$args=array());
 }
 class DefaultUserAgentSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
-		$request->addHeader(Headers::$UserAgent,Consts::$UserAgent);
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $request->addHeader(Headers::$UserAgent,Consts::$UserAgent);
+    }
 }
 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");
-		}
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $contentType = $request->getHeader(Headers::$ContentType);
+        if(empty($contentType)){
+            $request->addHeader(Headers::$ContentType,"application/xml");
+        }
+    }
 }
 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");
-		}
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $contentType = $request->getHeader(Headers::$ContentType);
+        if(empty($contentType)){
+            $request->addHeader(Headers::$ContentType,"application/ocet-stream");
+        }
+    }
 }
 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 );
-		$content_type = Utils::get_mimetype(strtolower($extension));
-		$request->addHeader(Headers::$ContentType,$content_type);
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $key = $request->key;
+        $objArr = explode('/', $key);
+        $basename = array_pop($objArr);
+        $extension = explode ( '.', $basename );
+        $extension = array_pop ( $extension );
+        $content_type = Utils::get_mimetype(strtolower($extension));
+        $request->addHeader(Headers::$ContentType,$content_type);
+    }
 }
 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);
+    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)){
-			throw new Ks3ClientException("you should provide accessKey");
-		}
-		if(empty($sk)){
-			throw new Ks3ClientException("you should provide secretKey");
-		}
-		$authration = "KSS ";
-		$signList = array(
-			$request->method,
-			$request->getHeader(Headers::$ContentMd5),
-			$request->getHeader(Headers::$ContentType),
-			$date
-			);
-		$headers = AuthUtils::canonicalizedKssHeaders($request);
-		$resource = AuthUtils::canonicalizedResource($request);
-		if(!empty($headers)){
-			array_push($signList,$headers);
-		}
-		array_push($signList,$resource);
-		$stringToSign = join("\n",$signList);
-		$log.= $stringToSign;
-		$signature = base64_encode(hash_hmac('sha1', $stringToSign, $sk, true));
+        $ak = $args["accessKey"];
+        $sk = $args["secretKey"];
+        if(empty($ak)){
+            throw new Ks3ClientException("you should provide accessKey");
+        }
+        if(empty($sk)){
+            throw new Ks3ClientException("you should provide secretKey");
+        }
+        $authration = "KSS ";
+        $signList = array(
+            $request->method,
+            $request->getHeader(Headers::$ContentMd5),
+            $request->getHeader(Headers::$ContentType),
+            $date
+            );
+        $headers = AuthUtils::canonicalizedKssHeaders($request);
+        $resource = AuthUtils::canonicalizedResource($request);
+        if(!empty($headers)){
+            array_push($signList,$headers);
+        }
+        array_push($signList,$resource);
+        $stringToSign = join("\n",$signList);
+        $log.= $stringToSign;
+        $signature = base64_encode(hash_hmac('sha1', $stringToSign, $sk, true));
 
-		$authration.=$ak.":".$signature;
-		$request->addHeader(Headers::$Authorization, $authration);
-		return $log;
-	}
+        $authration.=$ak.":".$signature;
+        $request->addHeader(Headers::$Authorization, $authration);
+        return $log;
+    }
 }
 class QueryAuthSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
-		$log = "stringToSing->\r\n";
-		$ak = $args["accessKey"];
-		$sk = $args["secretKey"];
-		$expires = $args["args"]["Options"]["Expires"];
-		$expiresSencond = time()+$expires;
+    public function sign(Ks3Request $request,$args=array()){
+        $log = "stringToSing->\r\n";
+        $ak = $args["accessKey"];
+        $sk = $args["secretKey"];
+        $expires = $args["args"]["Options"]["Expires"];
+        $expiresSencond = time()+$expires;
 
-		$resource = AuthUtils::canonicalizedResource($request);
-		$signList = array(
-			$request->method,
-			$request->getHeader(Headers::$ContentMd5),
-			$request->getHeader(Headers::$ContentType),
-			$expiresSencond
-			);
-		$headers = AuthUtils::canonicalizedKssHeaders($request);
-		$resource = AuthUtils::canonicalizedResource($request);
-		if(!empty($headers)){
-			array_push($signList,$headers);
-		}
-		array_push($signList,$resource);
+        $resource = AuthUtils::canonicalizedResource($request);
+        $signList = array(
+            $request->method,
+            $request->getHeader(Headers::$ContentMd5),
+            $request->getHeader(Headers::$ContentType),
+            $expiresSencond
+            );
+        $headers = AuthUtils::canonicalizedKssHeaders($request);
+        $resource = AuthUtils::canonicalizedResource($request);
+        if(!empty($headers)){
+            array_push($signList,$headers);
+        }
+        array_push($signList,$resource);
 
-		$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);
-		return $log;
-	}
+        $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);
+        return $log;
+    }
 }
 class ACLSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
-		$args = $args["args"];
-		if(isset($args["ACL"])){
-			$acl = $args["ACL"];
-			if(!in_array($acl, Consts::$Acl)){
-				throw new Ks3ClientException("unsupport acl :".$acl);
-			}else{
-				$request->addHeader(Headers::$Acl,$acl);
-			}
-		}
-		if(isset($args["ACP"])){
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        if(isset($args["ACL"])){
+            $acl = $args["ACL"];
+            if(!in_array($acl, Consts::$Acl)){
+                throw new Ks3ClientException("unsupport acl :".$acl);
+            }else{
+                $request->addHeader(Headers::$Acl,$acl);
+            }
+        }
+        if(isset($args["ACP"])){
 
-		}
-	}
+        }
+    }
 }
 class ContentMD5Signer implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
-		$args = $args["args"];
-		$contentmd5 = "";
-		if(isset($args["ObjectMeta"][Headers::$ContentMd5])){
-			$contentmd5 = $args["ObjectMeta"][Headers::$ContentMd5];
-		}
-		if(empty($contentmd5)){
-			$body = $request->body;
-			if(!empty($body)){
-				$length = $request->getHeader(Headers::$ContentLength);
-				if(empty($length)){
-					if(isset($args["ObjectMeta"][Headers::$ContentLength]))
-						$length = $args["ObjectMeta"][Headers::$ContentLength];
-				}
-				if(!empty($length)){
-					$body = substr($body,0,$length);
-				}
-				$contentmd5 = Utils::hex_to_base64(md5($body));
-			}
-		}
-		if(!empty($contentmd5))
-			$request->addHeader(Headers::$ContentMd5,$contentmd5);
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        $contentmd5 = "";
+        if(isset($args["ObjectMeta"][Headers::$ContentMd5])){
+            $contentmd5 = $args["ObjectMeta"][Headers::$ContentMd5];
+        }
+        if(empty($contentmd5)){
+            $body = $request->body;
+            if(!empty($body)){
+                $length = $request->getHeader(Headers::$ContentLength);
+                if(empty($length)){
+                    if(isset($args["ObjectMeta"][Headers::$ContentLength]))
+                        $length = $args["ObjectMeta"][Headers::$ContentLength];
+                }
+                if(!empty($length)){
+                    $body = substr($body,0,$length);
+                }
+                $contentmd5 = Utils::hex_to_base64(md5($body));
+            }
+        }
+        if(!empty($contentmd5))
+            $request->addHeader(Headers::$ContentMd5,$contentmd5);
+    }
 }
 class ContentLengthSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
-		$args = $args["args"];
-		$contentlength = "";
-		if(isset($args["ObjectMeta"][Headers::$ContentLength])){
-			$contentlength = $args["ObjectMeta"][Headers::$ContentLength];
-		}
-		if(empty($contentlength)){
-			$body = $request->body;
-			if(!empty($body)){
-				$contentlength = strlen($body);
-			}
-		}
-		if(!empty($contentlength))
-			$request->addHeader(Headers::$ContentLength,$contentlength);
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        $contentlength = "";
+        if(isset($args["ObjectMeta"][Headers::$ContentLength])){
+            $contentlength = $args["ObjectMeta"][Headers::$ContentLength];
+        }
+        if(empty($contentlength)){
+            $body = $request->body;
+            if(!empty($body)){
+                $contentlength = strlen($body);
+            }
+        }
+        if(!empty($contentlength))
+            $request->addHeader(Headers::$ContentLength,$contentlength);
+    }
 }
 class ObjectMetaSigner implements Signer{
-	public function sign(Ks3Request $request,$args=array()){
-		$args = $args["args"];
-		if(isset($args["ObjectMeta"])){
-			$ObjectMeta = $args["ObjectMeta"];
-			if(is_array($ObjectMeta)){
-				foreach ($ObjectMeta as $key => $value) {
-					if(in_array($key,Consts::$ObjectMeta)&&!empty($value)){
-						$request->addHeader($key,$value);
-					}
-				}
-			}
-		}
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        if(isset($args["ObjectMeta"])){
+            $ObjectMeta = $args["ObjectMeta"];
+            if(is_array($ObjectMeta)){
+                foreach ($ObjectMeta as $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()){
-		$args = $args["args"];
-		if(isset($args["ObjectMeta"])){
-			$ObjectMeta = $args["ObjectMeta"];
-			if(is_array($ObjectMeta)){
-				foreach ($ObjectMeta as $key => $value) {
-					if(in_array($key,Consts::$MultipartObjectMeta)&&!empty($value)){
-						$request->addHeader($key,$value);
-					}
-				}
-			}
-		}
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        if(isset($args["ObjectMeta"])){
+            $ObjectMeta = $args["ObjectMeta"];
+            if(is_array($ObjectMeta)){
+                foreach ($ObjectMeta as $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()){
-		$args = $args["args"];
-		if(isset($args["UserMeta"])){
-			$UserMeta = $args["UserMeta"];
-			if(is_array($UserMeta)){
-				foreach ($UserMeta as $key => $value) {
-					if (substr(strtolower($key), 0, 10) === Consts::$UserMetaPrefix){
-						$request->addHeader($key,$value);
-					}
-				}
-			}
-		}
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        if(isset($args["UserMeta"])){
+            $UserMeta = $args["UserMeta"];
+            if(is_array($UserMeta)){
+                foreach ($UserMeta as $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()){
-		$args = $args["args"];
-		if(isset($args["CopySource"])){
-			$CopySource = $args["CopySource"];
-			if(is_array($CopySource)){
-				if(!isset($CopySource["Bucket"]))
-					throw new Ks3ClientException("you should provide copy source bucket");
-				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);
-			}
-		}
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        if(isset($args["CopySource"])){
+            $CopySource = $args["CopySource"];
+            if(is_array($CopySource)){
+                if(!isset($CopySource["Bucket"]))
+                    throw new Ks3ClientException("you should provide copy source bucket");
+                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);
+            }
+        }
+    }
 }
 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"])){
-			$content = $args["Content"]["content"];
-			$seek_position = 0;
-			$resourceLength = 0;
-			$length = -1;
-			$isFile = FALSE;
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        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)){
-				$isFile = TRUE;
-				//如果之前用户已经转化为GBK则不转换
-				if(Utils::chk_chinese($content)&&!Utils::check_char($content)){
-					$content = iconv('utf-8','gbk',$content);
-				}
-				if(!file_exists($content))
-					throw new Ks3ClientException("the specified file does not exist ");
-				$length = Utils::getFileSize($content);
-				$content = fopen($content,"r");
-			}else{
-				$stats = fstat($content);
-				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){
-				$seek_position = $args["Content"]["seek_position"];
-			}else if(!$isFile){
-				$seek_position = ftell($content);
-				if($seek_position<0)
-					$seek_position = 0;
-				fseek($content,0);
-			}
+            if (!is_resource($content)){
+                $isFile = TRUE;
+                //如果之前用户已经转化为GBK则不转换
+                if(Utils::chk_chinese($content)&&!Utils::check_char($content)){
+                    $content = iconv('utf-8','gbk',$content);
+                }
+                if(!file_exists($content))
+                    throw new Ks3ClientException("the specified file does not exist ");
+                $length = Utils::getFileSize($content);
+                $content = fopen($content,"r");
+            }else{
+                $stats = fstat($content);
+                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){
+                $seek_position = $args["Content"]["seek_position"];
+            }else if(!$isFile){
+                $seek_position = ftell($content);
+                if($seek_position<0)
+                    $seek_position = 0;
+                fseek($content,0);
+            }
 
-			$lengthInMeta = -1;
-			if(isset($args["ObjectMeta"]["Content-Length"])){
-				$lengthInMeta = $args["ObjectMeta"]["Content-Length"];
-			}
-			if($lengthInMeta > 0){
-				$length = $lengthInMeta;
-			}else if($resourceLength > 0){
-				//根据seek_position计算实际长度
-				$length = $resourceLength - $seek_position;
-			}
-			if($length <= 0)
-				throw new Ks3ClientException("calculate content length failed,unexpected contetn length ".$length);
-			$request->read_stream = $content;
-			$request->addHeader(Headers::$ContentLength,$length);
-			$request->seek_position = $seek_position;
-		}else{
-			throw new Ks3ClientException("please specifie upload content in args");
-		}
-	}
+            $lengthInMeta = -1;
+            if(isset($args["ObjectMeta"]["Content-Length"])){
+                $lengthInMeta = $args["ObjectMeta"]["Content-Length"];
+            }
+            if($lengthInMeta > 0){
+                $length = $lengthInMeta;
+            }else if($resourceLength > 0){
+                //根据seek_position计算实际长度
+                $length = $resourceLength - $seek_position;
+            }
+            if($length <= 0)
+                throw new Ks3ClientException("calculate content length failed,unexpected contetn length ".$length);
+            $request->read_stream = $content;
+            $request->addHeader(Headers::$ContentLength,$length);
+            $request->seek_position = $seek_position;
+        }else{
+            throw new Ks3ClientException("please specifie upload content in args");
+        }
+    }
 }
 class RangeSigner{
-	public function sign(Ks3Request $request,$args=array()){
-		$args = $args["args"];
-		if(isset($args["Range"])){
-			$Range = $args["Range"];
-			if(is_array($Range)){
-				$start = $Range["start"];
-				$end = $Range["end"];
-				$range = "bytes=".$start."-".$end;
-				$request->addHeader(Headers::$Range,$range);
-			}else
-				$request->addHeader(Headers::$Range,$Range);
-		}
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        if(isset($args["Range"])){
+            $Range = $args["Range"];
+            if(is_array($Range)){
+                $start = $Range["start"];
+                $end = $Range["end"];
+                $range = "bytes=".$start."-".$end;
+                $request->addHeader(Headers::$Range,$range);
+            }else
+                $request->addHeader(Headers::$Range,$Range);
+        }
+    }
 }
 class GetObjectSigner{
-	public function sign(Ks3Request $request,$args=array()){
-		$args = $args["args"];
-		if(isset($args["WriteTo"])){
-			$WriteTo = $args["WriteTo"];
-			if(is_resource($WriteTo)){
-				$request->write_stream = $WriteTo;
-			}else{
-				//如果之前用户已经转化为GBK则不转换
-				if(Utils::chk_chinese($WriteTo)&&!Utils::check_char($WriteTo)){
-					$WriteTo = iconv('utf-8','gbk',$WriteTo);
-				}
-				$request->write_stream = fopen($WriteTo,"w");
-			}
-		}
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        if(isset($args["WriteTo"])){
+            $WriteTo = $args["WriteTo"];
+            if(is_resource($WriteTo)){
+                $request->write_stream = $WriteTo;
+            }else{
+                //如果之前用户已经转化为GBK则不转换
+                if(Utils::chk_chinese($WriteTo)&&!Utils::check_char($WriteTo)){
+                    $WriteTo = iconv('utf-8','gbk',$WriteTo);
+                }
+                $request->write_stream = fopen($WriteTo,"w");
+            }
+        }
+    }
 }
 class AdpSigner{
-	public function sign(Ks3Request $request,$args=array()){
-		$args = $args["args"];
-		if(isset($args["Adp"])){
-			$AdpConf = $args["Adp"];
-			if(is_array($AdpConf)){
-				if(isset($AdpConf["NotifyURL"])){
-					$NotifyURL = $AdpConf["NotifyURL"];
-				}else{
-					throw new Ks3ClientException("adp should provide NotifyURL");
-				}
-				if(isset($AdpConf["Adps"])){
-					$Adps = $AdpConf["Adps"];
-				}else{
-					throw new Ks3ClientException("adp should provide Adps");
-				}
-				$AdpString = "";
-				foreach ($Adps as $Adp) {
-					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"])){
-							$bucket = $Adp["Bucket"];
-						}
-						if(isset($Adp["Key"])){
-							$key = $Adp["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.=";";
-					}
-				}
-				if(!empty($AdpString)&&!empty($NotifyURL)){
-					$request->addHeader(Headers::$AsynchronousProcessingList,$AdpString);
-					$request->addHeader(Headers::$NotifyURL,$NotifyURL);
-				}
-			}
-		}
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        if(isset($args["Adp"])){
+            $AdpConf = $args["Adp"];
+            if(is_array($AdpConf)){
+                if(isset($AdpConf["NotifyURL"])){
+                    $NotifyURL = $AdpConf["NotifyURL"];
+                }else{
+                    throw new Ks3ClientException("adp should provide NotifyURL");
+                }
+                if(isset($AdpConf["Adps"])){
+                    $Adps = $AdpConf["Adps"];
+                }else{
+                    throw new Ks3ClientException("adp should provide Adps");
+                }
+                $AdpString = "";
+                foreach ($Adps as $Adp) {
+                    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"])){
+                            $bucket = $Adp["Bucket"];
+                        }
+                        if(isset($Adp["Key"])){
+                            $key = $Adp["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.=";";
+                    }
+                }
+                if(!empty($AdpString)&&!empty($NotifyURL)){
+                    $request->addHeader(Headers::$AsynchronousProcessingList,$AdpString);
+                    $request->addHeader(Headers::$NotifyURL,$NotifyURL);
+                }
+            }
+        }
+    }
 }
 class CallBackSigner{
-	public function sign(Ks3Request $request,$args=array()){
-		$args = $args["args"];
-		if(isset($args["CallBack"])&&is_array($args["CallBack"])){
-			$CallBackConf = $args["CallBack"];
-			$url = NULL;
-			$body = NULL;
-			if(isset($CallBackConf["Url"])){
-				$url = $CallBackConf["Url"];
-			}
-			if(empty($url))
-				throw new Ks3ClientException("Url is needed in CallBack");
-			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(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);
-					}
-				}
-			}
-			if(!empty($body)){
-				$body=substr($body,0,strlen($body)-1);
-				$request->addHeader(Headers::$XKssCallbackBody,$body);
-			}
-			$request->addHeader(Headers::$XKssCallbackUrl,$url);
-		}
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        if(isset($args["CallBack"])&&is_array($args["CallBack"])){
+            $CallBackConf = $args["CallBack"];
+            $url = NULL;
+            $body = NULL;
+            if(isset($CallBackConf["Url"])){
+                $url = $CallBackConf["Url"];
+            }
+            if(empty($url))
+                throw new Ks3ClientException("Url is needed in CallBack");
+            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(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);
+                    }
+                }
+            }
+            if(!empty($body)){
+                $body=substr($body,0,strlen($body)-1);
+                $request->addHeader(Headers::$XKssCallbackBody,$body);
+            }
+            $request->addHeader(Headers::$XKssCallbackUrl,$url);
+        }
+    }
 }
 class SSESigner{
-	public function sign(Ks3Request $request,$args=array()){
-		$args = $args["args"];
-		if(isset($args["SSE"])){
-			if(isset($args["SSE"]["Algm"]))
-				$algm = $args["SSE"]["Algm"];
-			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);
-			}
-		}
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        if(isset($args["SSE"])){
+            if(isset($args["SSE"]["Algm"]))
+                $algm = $args["SSE"]["Algm"];
+            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);
+            }
+        }
+    }
 }
 class SSECSigner{
-	public function sign(Ks3Request $request,$args=array()){
-		$args = $args["args"];
-		if(isset($args["SSEC"])){
-			if(isset($args["SSEC"]["Algm"]))
-				$algm = $args["SSEC"]["Algm"];
-			if(isset($args["SSEC"]["Key"]))
-				$key = $args["SSEC"]["Key"];
-			if(isset($args["SSEC"]["KeyBase64"]))
-				$keybase64 = $args["SSEC"]["KeyBase64"];
-			if(isset($args["SSEC"]["KeyMD5"]))
-				$md5 = $args["SSEC"]["KeyMD5"];
-			if(!empty($key)||!empty($keybase64)){
-				if(empty($key))
-					$key = base64_decode($keybase64);
-				if(empty($algm))
-					$algm = Consts::$SSEDefaultAlgm;
-				if(empty($md5))
-					$md5 = Utils::hex_to_base64(md5($key));
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        if(isset($args["SSEC"])){
+            if(isset($args["SSEC"]["Algm"]))
+                $algm = $args["SSEC"]["Algm"];
+            if(isset($args["SSEC"]["Key"]))
+                $key = $args["SSEC"]["Key"];
+            if(isset($args["SSEC"]["KeyBase64"]))
+                $keybase64 = $args["SSEC"]["KeyBase64"];
+            if(isset($args["SSEC"]["KeyMD5"]))
+                $md5 = $args["SSEC"]["KeyMD5"];
+            if(!empty($key)||!empty($keybase64)){
+                if(empty($key))
+                    $key = base64_decode($keybase64);
+                if(empty($algm))
+                    $algm = Consts::$SSEDefaultAlgm;
+                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()){
-		$args = $args["args"];
-		if(isset($args["SSECSource"])){
-			if(isset($args["SSECSource"]["Algm"]))
-				$algm = $args["SSECSource"]["Algm"];
-			if(isset($args["SSECSource"]["Key"]))
-				$key = $args["SSECSource"]["Key"];
-			if(isset($args["SSECSource"]["KeyBase64"]))
-				$keybase64 = $args["SSECSource"]["KeyBase64"];
-			if(isset($args["SSECSource"]["KeyMD5"]))
-				$md5 = $args["SSECSource"]["KeyMD5"];
-			if(!empty($key)||!empty($keybase64)){
-				if(empty($key))
-					$key = base64_decode($keybase64);
-				if(empty($algm))
-					$algm = Consts::$SSEDefaultAlgm;
-				if(empty($md5))
-					$md5 = Utils::hex_to_base64(md5($key));
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        if(isset($args["SSECSource"])){
+            if(isset($args["SSECSource"]["Algm"]))
+                $algm = $args["SSECSource"]["Algm"];
+            if(isset($args["SSECSource"]["Key"]))
+                $key = $args["SSECSource"]["Key"];
+            if(isset($args["SSECSource"]["KeyBase64"]))
+                $keybase64 = $args["SSECSource"]["KeyBase64"];
+            if(isset($args["SSECSource"]["KeyMD5"]))
+                $md5 = $args["SSECSource"]["KeyMD5"];
+            if(!empty($key)||!empty($keybase64)){
+                if(empty($key))
+                    $key = base64_decode($keybase64);
+                if(empty($algm))
+                    $algm = Consts::$SSEDefaultAlgm;
+                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()){
-		$args = $args["args"];
-		$headers = isset($args["Headers"])?$args["Headers"]:"";
-		if(!empty($headers)&&is_array($headers)){
-			foreach ($headers as $key => $value) {
-				$request->addHeader($key,$value);
-			}
-		}
-	}
+    public function sign(Ks3Request $request,$args=array()){
+        $args = $args["args"];
+        $headers = isset($args["Headers"])?$args["Headers"]:"";
+        if(!empty($headers)&&is_array($headers)){
+            foreach ($headers as $key => $value) {
+                $request->addHeader($key,$value);
+            }
+        }
+    }
 }
 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;
-			}			
-		}
-		$header = substr($header, 1);
-		return $header;
-	}
-	public static function canonicalizedResource(Ks3Request $request){
-		$resource = "/";
-		$bucket = $request->bucket;
-		$key = $request->key;
-		$subResource = $request->subResource;
-		if(!empty($bucket)){
-			$resource.=$request->bucket."/";
-		}
-		if(!empty($key)){
-			$resource.=Utils::encodeUrl($request->key);
-		}
+    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;
+            }			
+        }
+        $header = substr($header, 1);
+        return $header;
+    }
+    public static function canonicalizedResource(Ks3Request $request){
+        $resource = "/";
+        $bucket = $request->bucket;
+        $key = $request->key;
+        $subResource = $request->subResource;
+        if(!empty($bucket)){
+            $resource.=$request->bucket."/";
+        }
+        if(!empty($key)){
+            $resource.=Utils::encodeUrl($request->key);
+        }
 
-		$encodeParams = "";
-		$querys = $request->queryParams;
-		if(!empty($subResource)){
-			$querys[$subResource] = NULL;
-		}
-		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;
-				}
-			}
-		}
-		$encodeParams = substr($encodeParams,1);
+        $encodeParams = "";
+        $querys = $request->queryParams;
+        if(!empty($subResource)){
+            $querys[$subResource] = NULL;
+        }
+        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;
+                }
+            }
+        }
+        $encodeParams = substr($encodeParams,1);
 
-		$resource = str_replace("//","/%2F", $resource);
+        $resource = str_replace("//","/%2F", $resource);
 
-		if(!empty($encodeParams)){
-			$resource.="?".$encodeParams;
-		}
-		return $resource;
-	}
+        if(!empty($encodeParams)){
+            $resource.="?".$encodeParams;
+        }
+        return $resource;
+    }
 }
 ?>
\ No newline at end of file

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;
 	}

Braces +95 added lines, -67 removed lines

@@ -114,7 +114,7 @@ 
 			$acl = $args["ACL"];
 			if(!in_array($acl, Consts::$Acl)){
 				throw new Ks3ClientException("unsupport acl :".$acl);
-			}else{
+			} else{
 				$request->addHeader(Headers::$Acl,$acl);
 			}
 		}
@@ -135,8 +135,9 @@ 
 			if(!empty($body)){
 				$length = $request->getHeader(Headers::$ContentLength);
 				if(empty($length)){
-					if(isset($args["ObjectMeta"][Headers::$ContentLength]))
-						$length = $args["ObjectMeta"][Headers::$ContentLength];
+					if(isset($args["ObjectMeta"][Headers::$ContentLength])) {
+											$length = $args["ObjectMeta"][Headers::$ContentLength];
+					}
 				}
 				if(!empty($length)){
 					$body = substr($body,0,$length);
@@ -144,8 +145,9 @@ 
 				$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{
@@ -161,8 +163,9 @@ 
 				$contentlength = strlen($body);
 			}
 		}
-		if(!empty($contentlength))
-			$request->addHeader(Headers::$ContentLength,$contentlength);
+		if(!empty($contentlength)) {
+					$request->addHeader(Headers::$ContentLength,$contentlength);
+		}
 	}
 }
 class ObjectMetaSigner implements Signer{
@@ -216,10 +219,12 @@ 
 		if(isset($args["CopySource"])){
 			$CopySource = $args["CopySource"];
 			if(is_array($CopySource)){
-				if(!isset($CopySource["Bucket"]))
-					throw new Ks3ClientException("you should provide copy source bucket");
-				if(!isset($CopySource["Key"]))
-					throw new Ks3ClientException("you should provide copy source key");
+				if(!isset($CopySource["Bucket"])) {
+									throw new Ks3ClientException("you should provide copy source bucket");
+				}
+				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);
@@ -243,11 +248,12 @@ 
 				if(Utils::chk_chinese($content)&&!Utils::check_char($content)){
 					$content = iconv('utf-8','gbk',$content);
 				}
-				if(!file_exists($content))
-					throw new Ks3ClientException("the specified file does not exist ");
+				if(!file_exists($content)) {
+									throw new Ks3ClientException("the specified file does not exist ");
+				}
 				$length = Utils::getFileSize($content);
 				$content = fopen($content,"r");
-			}else{
+			} else{
 				$stats = fstat($content);
 				if ($stats && $stats["size"] >= 0){
 					$length = $stats["size"];	
@@ -258,10 +264,11 @@ 
 			//优先取用户设置seek_position，没有的话取ftell
 			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)
-					$seek_position = 0;
+				if($seek_position<0) {
+									$seek_position = 0;
+				}
 				fseek($content,0);
 			}
 
@@ -271,16 +278,17 @@ 
 			}
 			if($lengthInMeta > 0){
 				$length = $lengthInMeta;
-			}else if($resourceLength > 0){
+			} else if($resourceLength > 0){
 				//根据seek_position计算实际长度
 				$length = $resourceLength - $seek_position;
 			}
-			if($length <= 0)
-				throw new Ks3ClientException("calculate content length failed,unexpected contetn length ".$length);
+			if($length <= 0) {
+							throw new Ks3ClientException("calculate content length failed,unexpected contetn length ".$length);
+			}
 			$request->read_stream = $content;
 			$request->addHeader(Headers::$ContentLength,$length);
 			$request->seek_position = $seek_position;
-		}else{
+		} else{
 			throw new Ks3ClientException("please specifie upload content in args");
 		}
 	}
@@ -295,8 +303,9 @@ 
 				$end = $Range["end"];
 				$range = "bytes=".$start."-".$end;
 				$request->addHeader(Headers::$Range,$range);
-			}else
-				$request->addHeader(Headers::$Range,$Range);
+			} else {
+							$request->addHeader(Headers::$Range,$Range);
+			}
 		}
 	}
 }
@@ -307,7 +316,7 @@ 
 			$WriteTo = $args["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);
@@ -325,12 +334,12 @@ 
 			if(is_array($AdpConf)){
 				if(isset($AdpConf["NotifyURL"])){
 					$NotifyURL = $AdpConf["NotifyURL"];
-				}else{
+				} else{
 					throw new Ks3ClientException("adp should provide NotifyURL");
 				}
 				if(isset($AdpConf["Adps"])){
 					$Adps = $AdpConf["Adps"];
-				}else{
+				} else{
 					throw new Ks3ClientException("adp should provide Adps");
 				}
 				$AdpString = "";
@@ -352,9 +361,9 @@ 
 						if(!(empty($bucket)&&empty($key))){
 							if(empty($bucket)){
 								$AdpString.="|tag=saveas&object=".base64_encode($key);
-							}elseif (empty($key)) {
+							} elseif (empty($key)) {
 								$AdpString.="|tag=saveas&bucket=".$bucket;
-							}else{
+							} else{
 								$AdpString.="|tag=saveas&bucket=".$bucket."&"."object=".base64_encode($key);
 							}
 						}
@@ -379,14 +388,16 @@ 
 			if(isset($CallBackConf["Url"])){
 				$url = $CallBackConf["Url"];
 			}
-			if(empty($url))
-				throw new Ks3ClientException("Url is needed in CallBack");
+			if(empty($url)) {
+							throw new Ks3ClientException("Url is needed in CallBack");
+			}
 			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."}&";
+						}
 					}
 				}
 			}
@@ -411,14 +422,17 @@ 
 	public function sign(Ks3Request $request,$args=array()){
 		$args = $args["args"];
 		if(isset($args["SSE"])){
-			if(isset($args["SSE"]["Algm"]))
-				$algm = $args["SSE"]["Algm"];
-			if(isset($args["SSE"]["KMSId"]))
-				$id = $args["SSE"]["KMSId"];
+			if(isset($args["SSE"]["Algm"])) {
+							$algm = $args["SSE"]["Algm"];
+			}
+			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($id)) {
+									$request->addHeader(Headers::$SSEKMSId,$id);
+				}
 			}
 		}
 	}
@@ -427,21 +441,28 @@ 
 	public function sign(Ks3Request $request,$args=array()){
 		$args = $args["args"];
 		if(isset($args["SSEC"])){
-			if(isset($args["SSEC"]["Algm"]))
-				$algm = $args["SSEC"]["Algm"];
-			if(isset($args["SSEC"]["Key"]))
-				$key = $args["SSEC"]["Key"];
-			if(isset($args["SSEC"]["KeyBase64"]))
-				$keybase64 = $args["SSEC"]["KeyBase64"];
-			if(isset($args["SSEC"]["KeyMD5"]))
-				$md5 = $args["SSEC"]["KeyMD5"];
+			if(isset($args["SSEC"]["Algm"])) {
+							$algm = $args["SSEC"]["Algm"];
+			}
+			if(isset($args["SSEC"]["Key"])) {
+							$key = $args["SSEC"]["Key"];
+			}
+			if(isset($args["SSEC"]["KeyBase64"])) {
+							$keybase64 = $args["SSEC"]["KeyBase64"];
+			}
+			if(isset($args["SSEC"]["KeyMD5"])) {
+							$md5 = $args["SSEC"]["KeyMD5"];
+			}
 			if(!empty($key)||!empty($keybase64)){
-				if(empty($key))
-					$key = base64_decode($keybase64);
-				if(empty($algm))
-					$algm = Consts::$SSEDefaultAlgm;
-				if(empty($md5))
-					$md5 = Utils::hex_to_base64(md5($key));
+				if(empty($key)) {
+									$key = base64_decode($keybase64);
+				}
+				if(empty($algm)) {
+									$algm = Consts::$SSEDefaultAlgm;
+				}
+				if(empty($md5)) {
+									$md5 = Utils::hex_to_base64(md5($key));
+				}
 
 				$request->addHeader(Headers::$SSECAlgm,$algm);
 				$request->addHeader(Headers::$SSECKey,base64_encode($key));
@@ -454,21 +475,28 @@ 
 	public function sign(Ks3Request $request,$args=array()){
 		$args = $args["args"];
 		if(isset($args["SSECSource"])){
-			if(isset($args["SSECSource"]["Algm"]))
-				$algm = $args["SSECSource"]["Algm"];
-			if(isset($args["SSECSource"]["Key"]))
-				$key = $args["SSECSource"]["Key"];
-			if(isset($args["SSECSource"]["KeyBase64"]))
-				$keybase64 = $args["SSECSource"]["KeyBase64"];
-			if(isset($args["SSECSource"]["KeyMD5"]))
-				$md5 = $args["SSECSource"]["KeyMD5"];
+			if(isset($args["SSECSource"]["Algm"])) {
+							$algm = $args["SSECSource"]["Algm"];
+			}
+			if(isset($args["SSECSource"]["Key"])) {
+							$key = $args["SSECSource"]["Key"];
+			}
+			if(isset($args["SSECSource"]["KeyBase64"])) {
+							$keybase64 = $args["SSECSource"]["KeyBase64"];
+			}
+			if(isset($args["SSECSource"]["KeyMD5"])) {
+							$md5 = $args["SSECSource"]["KeyMD5"];
+			}
 			if(!empty($key)||!empty($keybase64)){
-				if(empty($key))
-					$key = base64_decode($keybase64);
-				if(empty($algm))
-					$algm = Consts::$SSEDefaultAlgm;
-				if(empty($md5))
-					$md5 = Utils::hex_to_base64(md5($key));
+				if(empty($key)) {
+									$key = base64_decode($keybase64);
+				}
+				if(empty($algm)) {
+									$algm = Consts::$SSEDefaultAlgm;
+				}
+				if(empty($md5)) {
+									$md5 = Utils::hex_to_base64(md5($key));
+				}
 
 				$request->addHeader(Headers::$SSECSourceAlgm,$algm);
 				$request->addHeader(Headers::$SSECSourceKey,base64_encode($key));
@@ -523,7 +551,7 @@ 
 			if(in_array($key,Consts::$SubResource)||in_array($key,Consts::$QueryParam)){
 				if(empty($value)){
 					$encodeParams.="&".$key;
-				}else{
+				} else{
 					$encodeParams.="&".$key."=".$value;
 				}
 			}

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

Indentation +1 added lines, -1 removed lines

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

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

Indentation +76 added lines, -76 removed lines

@@ -2,83 +2,83 @@
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."core".DIRECTORY_SEPARATOR."Utils.class.php";
 
 class Ks3Request{
-	private $bucket;
-	private $key;
-	private $queryParams=array();
-	private $headers=array();
-	private $subResource;
-	private $method;
-	private $endpoint;
-	private $scheme;
-	private $body;
-	private $read_stream;
-	private $seek_position;
-	private $write_stream;
+    private $bucket;
+    private $key;
+    private $queryParams=array();
+    private $headers=array();
+    private $subResource;
+    private $method;
+    private $endpoint;
+    private $scheme;
+    private $body;
+    private $read_stream;
+    private $seek_position;
+    private $write_stream;
 
-	public function __set($property_name, $value){
-		$this->$property_name=$value;
-	}
-	public function __get($property_name){
-		if(isset($this->$property_name))
-		{
-			return($this->$property_name);
-		}else
-		{
-			return(NULL);
-		}
-	}
-	public function getHeader($key){
-		if(isset($this->headers[$key])){
-			return  $this->headers[$key];
-		}else{
-			return(NULL);
-		}
-	}
-	public function addHeader($key,$value){
-		$this->headers[$key] = $value;
-	}
+    public function __set($property_name, $value){
+        $this->$property_name=$value;
+    }
+    public function __get($property_name){
+        if(isset($this->$property_name))
+        {
+            return($this->$property_name);
+        }else
+        {
+            return(NULL);
+        }
+    }
+    public function getHeader($key){
+        if(isset($this->headers[$key])){
+            return  $this->headers[$key];
+        }else{
+            return(NULL);
+        }
+    }
+    public function addHeader($key,$value){
+        $this->headers[$key] = $value;
+    }
 
-	public function getQueryParams($key){
-		if(isset($this->queryParams[$key])){
-			return  $this->queryParams[$key];
-		}else{
-			return(NULL);
-		}
-	}
-	public function addQueryParams($key,$value){
-		$this->queryParams[$key] = $value;
-	}
-	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;
-			}
-		}else{
-			$url.=$endpoint;
-		}
-		if(!empty($key)){
-			$url.="/".Utils::encodeUrl($key);
-		}
-		$url = str_replace("//","/%2F", $url);
-		$queryString = "";
-		if(!empty($subResource)){
-			$queryString.="&".$subResource;
-		}
-		foreach ($this->queryParams as $key => $value) {
-			$queryString.="&".$key."=".rawurlencode($value);
-		}
-		$queryString = substr($queryString, 1);
-		if(!empty($queryString)){
-			$url.="?".$queryString;
-		}
-		$url = $this->scheme.$url;
-		return $url;
-	}
+    public function getQueryParams($key){
+        if(isset($this->queryParams[$key])){
+            return  $this->queryParams[$key];
+        }else{
+            return(NULL);
+        }
+    }
+    public function addQueryParams($key,$value){
+        $this->queryParams[$key] = $value;
+    }
+    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;
+            }
+        }else{
+            $url.=$endpoint;
+        }
+        if(!empty($key)){
+            $url.="/".Utils::encodeUrl($key);
+        }
+        $url = str_replace("//","/%2F", $url);
+        $queryString = "";
+        if(!empty($subResource)){
+            $queryString.="&".$subResource;
+        }
+        foreach ($this->queryParams as $key => $value) {
+            $queryString.="&".$key."=".rawurlencode($value);
+        }
+        $queryString = substr($queryString, 1);
+        if(!empty($queryString)){
+            $url.="?".$queryString;
+        }
+        $url = $this->scheme.$url;
+        return $url;
+    }
 }
 ?>
\ No newline at end of file

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;

Braces +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
 		if(isset($this->$property_name))
 		{
 			return($this->$property_name);
-		}else
+		} else
 		{
 			return(NULL);
 		}
@@ -30,7 +30,7 @@ 
 	public function getHeader($key){
 		if(isset($this->headers[$key])){
 			return  $this->headers[$key];
-		}else{
+		} else{
 			return(NULL);
 		}
 	}
@@ -41,7 +41,7 @@ 
 	public function getQueryParams($key){
 		if(isset($this->queryParams[$key])){
 			return  $this->queryParams[$key];
-		}else{
+		} else{
 			return(NULL);
 		}
 	}
@@ -56,10 +56,10 @@ 
 		if(!empty($bucket)){
 			if(KS3_API_VHOST){
 				$url.=$bucket.".".$endpoint;
-			}else{
+			} else{
 				$url.=$endpoint."/".$bucket;
 			}
-		}else{
+		} else{
 			$url.=$endpoint;
 		}
 		if(!empty($key)){

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

Indentation +223 added lines, -223 removed lines

@@ -2,234 +2,234 @@
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."exceptions".DIRECTORY_SEPARATOR."Exceptions.php";
 
 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){
-			$url = str_replace("%2F", "/", $url);
-		}
-		return $url;
-	}
-	public static function hex_to_base64($str){
-		$result = '';
+    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){
+            $url = str_replace("%2F", "/", $url);
+        }
+        return $url;
+    }
+    public static function hex_to_base64($str){
+        $result = '';
 
-		for ($i = 0; $i < strlen($str); $i += 2){
-			$result .= chr(hexdec(substr($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){
-		$str = str_replace("<ns2:", "<", $str);
-		$str = str_replace("</ns2:", "</", $str);
-		return $str;
-	}
-	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', 
-			'aiff' => 'audio/x-aiff', 'asc' => 'text/plain', 
-			'atom' => 'application/atom+xml', 'au' => 'audio/basic', 
-			'avi' => 'video/x-msvideo', 'bcpio' => 'application/x-bcpio', 
-			'bin' => 'application/octet-stream', 'bmp' => 'image/bmp', 
-			'cdf' => 'application/x-netcdf', 'cgm' => 'image/cgm', 
-			'class' => 'application/octet-stream', 
-			'cpio' => 'application/x-cpio', 
-			'cpt' => 'application/mac-compactpro', 
-			'csh' => 'application/x-csh', 'css' => 'text/css', 
-			'dcr' => 'application/x-director', 'dif' => 'video/x-dv', 
-			'dir' => 'application/x-director', 'djv' => 'image/vnd.djvu', 
-			'djvu' => 'image/vnd.djvu', 
-			'dll' => 'application/octet-stream', 
-			'dmg' => 'application/octet-stream', 
-			'dms' => 'application/octet-stream', 
-			'doc' => 'application/msword', 'dtd' => 'application/xml-dtd', 
-			'dv' => 'video/x-dv', 'dvi' => 'application/x-dvi', 
-			'dxr' => 'application/x-director', 
-			'eps' => 'application/postscript', 'etx' => 'text/x-setext', 
-			'exe' => 'application/octet-stream', 
-			'ez' => 'application/andrew-inset', 'flv' => 'video/x-flv', 
-			'gif' => 'image/gif', 'gram' => 'application/srgs', 
-			'grxml' => 'application/srgs+xml', 
-			'gtar' => 'application/x-gtar', 'gz' => 'application/x-gzip', 
-			'hdf' => 'application/x-hdf', 
-			'hqx' => 'application/mac-binhex40', 'htm' => 'text/html', 
-			'html' => 'text/html', 'ice' => 'x-conference/x-cooltalk', 
-			'ico' => 'image/x-icon', 'ics' => 'text/calendar', 
-			'ief' => 'image/ief', 'ifb' => 'text/calendar', 
-			'iges' => 'model/iges', 'igs' => 'model/iges', 
-			'jnlp' => 'application/x-java-jnlp-file', 'jp2' => 'image/jp2', 
-			'jpe' => 'image/jpeg', 'jpeg' => 'image/jpeg', 
-			'jpg' => 'image/jpeg', 'js' => 'application/x-javascript', 
-			'kar' => 'audio/midi', 'latex' => 'application/x-latex', 
-			'lha' => 'application/octet-stream', 
-			'lzh' => 'application/octet-stream', 
-			'm3u' => 'audio/x-mpegurl', 'm4a' => 'audio/mp4a-latm', 
-			'm4p' => 'audio/mp4a-latm', 'm4u' => 'video/vnd.mpegurl', 
-			'm4v' => 'video/x-m4v', 'mac' => 'image/x-macpaint', 
-			'man' => 'application/x-troff-man', 
-			'mathml' => 'application/mathml+xml', 
-			'me' => 'application/x-troff-me', 'mesh' => 'model/mesh', 
-			'mid' => 'audio/midi', 'midi' => 'audio/midi', 
-			'mif' => 'application/vnd.mif', 'mov' => 'video/quicktime', 
-			'movie' => 'video/x-sgi-movie', 'mp2' => 'audio/mpeg', 
-			'mp3' => 'audio/mpeg', 'mp4' => 'video/mp4', 
-			'mpe' => 'video/mpeg', 'mpeg' => 'video/mpeg', 
-			'mpg' => 'video/mpeg', 'mpga' => 'audio/mpeg', 
-			'ms' => 'application/x-troff-ms', 'msh' => 'model/mesh', 
-			'mxu' => 'video/vnd.mpegurl', 'nc' => 'application/x-netcdf', 
-			'oda' => 'application/oda', 'ogg' => 'application/ogg', 
-			'ogv' => 'video/ogv', 'pbm' => 'image/x-portable-bitmap', 
-			'pct' => 'image/pict', 'pdb' => 'chemical/x-pdb', 
-			'pdf' => 'application/pdf', 
-			'pgm' => 'image/x-portable-graymap', 
-			'pgn' => 'application/x-chess-pgn', 'pic' => 'image/pict', 
-			'pict' => 'image/pict', 'png' => 'image/png', 
-			'pnm' => 'image/x-portable-anymap', 
-			'pnt' => 'image/x-macpaint', 'pntg' => 'image/x-macpaint', 
-			'ppm' => 'image/x-portable-pixmap', 
-			'ppt' => 'application/vnd.ms-powerpoint', 
-			'ps' => 'application/postscript', 'qt' => 'video/quicktime', 
-			'qti' => 'image/x-quicktime', 'qtif' => 'image/x-quicktime', 
-			'ra' => 'audio/x-pn-realaudio', 
-			'ram' => 'audio/x-pn-realaudio', 'ras' => 'image/x-cmu-raster', 
-			'rdf' => 'application/rdf+xml', 'rgb' => 'image/x-rgb', 
-			'rm' => 'application/vnd.rn-realmedia', 
-			'roff' => 'application/x-troff', 'rtf' => 'text/rtf', 
-			'rtx' => 'text/richtext', 'sgm' => 'text/sgml', 
-			'sgml' => 'text/sgml', 'sh' => 'application/x-sh', 
-			'shar' => 'application/x-shar', 'silo' => 'model/mesh', 
-			'sit' => 'application/x-stuffit', 
-			'skd' => 'application/x-koan', 'skm' => 'application/x-koan', 
-			'skp' => 'application/x-koan', 'skt' => 'application/x-koan', 
-			'smi' => 'application/smil', 'smil' => 'application/smil', 
-			'snd' => 'audio/basic', 'so' => 'application/octet-stream', 
-			'spl' => 'application/x-futuresplash', 
-			'src' => 'application/x-wais-source', 
-			'sv4cpio' => 'application/x-sv4cpio', 
-			'sv4crc' => 'application/x-sv4crc', 'svg' => 'image/svg+xml', 
-			'swf' => 'application/x-shockwave-flash', 
-			't' => 'application/x-troff', 'tar' => 'application/x-tar', 
-			'tcl' => 'application/x-tcl', 'tex' => 'application/x-tex', 
-			'texi' => 'application/x-texinfo', 
-			'texinfo' => 'application/x-texinfo', 'tif' => 'image/tiff', 
-			'tiff' => 'image/tiff', 'tr' => 'application/x-troff', 
-			'tsv' => 'text/tab-separated-values', 'txt' => 'text/plain', 
-			'ustar' => 'application/x-ustar', 
-			'vcd' => 'application/x-cdlink', 'vrml' => 'model/vrml', 
-			'vxml' => 'application/voicexml+xml', 'wav' => 'audio/x-wav', 
-			'wbmp' => 'image/vnd.wap.wbmp', 
-			'wbxml' => 'application/vnd.wap.wbxml', 'webm' => 'video/webm', 
-			'wml' => 'text/vnd.wap.wml', 
-			'wmlc' => 'application/vnd.wap.wmlc', 
-			'wmls' => 'text/vnd.wap.wmlscript', 
-			'wmlsc' => 'application/vnd.wap.wmlscriptc', 
-			'wmv' => 'video/x-ms-wmv', 'wrl' => 'model/vrml', 
-			'xbm' => 'image/x-xbitmap', 'xht' => 'application/xhtml+xml', 
-			'xhtml' => 'application/xhtml+xml', 
-			'xls' => 'application/vnd.ms-excel', 
-			'xml' => 'application/xml', 'xpm' => 'image/x-xpixmap', 
-			'xsl' => 'application/xml', 'xslt' => 'application/xslt+xml', 
-			'xul' => 'application/vnd.mozilla.xul+xml', 
-			'xwd' => 'image/x-xwindowdump', 'xyz' => 'chemical/x-xyz', 
-			'zip' => 'application/zip' );
+        return base64_encode($result);
+    }
+    public static function replaceNS2($str){
+        $str = str_replace("<ns2:", "<", $str);
+        $str = str_replace("</ns2:", "</", $str);
+        return $str;
+    }
+    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', 
+            'aiff' => 'audio/x-aiff', 'asc' => 'text/plain', 
+            'atom' => 'application/atom+xml', 'au' => 'audio/basic', 
+            'avi' => 'video/x-msvideo', 'bcpio' => 'application/x-bcpio', 
+            'bin' => 'application/octet-stream', 'bmp' => 'image/bmp', 
+            'cdf' => 'application/x-netcdf', 'cgm' => 'image/cgm', 
+            'class' => 'application/octet-stream', 
+            'cpio' => 'application/x-cpio', 
+            'cpt' => 'application/mac-compactpro', 
+            'csh' => 'application/x-csh', 'css' => 'text/css', 
+            'dcr' => 'application/x-director', 'dif' => 'video/x-dv', 
+            'dir' => 'application/x-director', 'djv' => 'image/vnd.djvu', 
+            'djvu' => 'image/vnd.djvu', 
+            'dll' => 'application/octet-stream', 
+            'dmg' => 'application/octet-stream', 
+            'dms' => 'application/octet-stream', 
+            'doc' => 'application/msword', 'dtd' => 'application/xml-dtd', 
+            'dv' => 'video/x-dv', 'dvi' => 'application/x-dvi', 
+            'dxr' => 'application/x-director', 
+            'eps' => 'application/postscript', 'etx' => 'text/x-setext', 
+            'exe' => 'application/octet-stream', 
+            'ez' => 'application/andrew-inset', 'flv' => 'video/x-flv', 
+            'gif' => 'image/gif', 'gram' => 'application/srgs', 
+            'grxml' => 'application/srgs+xml', 
+            'gtar' => 'application/x-gtar', 'gz' => 'application/x-gzip', 
+            'hdf' => 'application/x-hdf', 
+            'hqx' => 'application/mac-binhex40', 'htm' => 'text/html', 
+            'html' => 'text/html', 'ice' => 'x-conference/x-cooltalk', 
+            'ico' => 'image/x-icon', 'ics' => 'text/calendar', 
+            'ief' => 'image/ief', 'ifb' => 'text/calendar', 
+            'iges' => 'model/iges', 'igs' => 'model/iges', 
+            'jnlp' => 'application/x-java-jnlp-file', 'jp2' => 'image/jp2', 
+            'jpe' => 'image/jpeg', 'jpeg' => 'image/jpeg', 
+            'jpg' => 'image/jpeg', 'js' => 'application/x-javascript', 
+            'kar' => 'audio/midi', 'latex' => 'application/x-latex', 
+            'lha' => 'application/octet-stream', 
+            'lzh' => 'application/octet-stream', 
+            'm3u' => 'audio/x-mpegurl', 'm4a' => 'audio/mp4a-latm', 
+            'm4p' => 'audio/mp4a-latm', 'm4u' => 'video/vnd.mpegurl', 
+            'm4v' => 'video/x-m4v', 'mac' => 'image/x-macpaint', 
+            'man' => 'application/x-troff-man', 
+            'mathml' => 'application/mathml+xml', 
+            'me' => 'application/x-troff-me', 'mesh' => 'model/mesh', 
+            'mid' => 'audio/midi', 'midi' => 'audio/midi', 
+            'mif' => 'application/vnd.mif', 'mov' => 'video/quicktime', 
+            'movie' => 'video/x-sgi-movie', 'mp2' => 'audio/mpeg', 
+            'mp3' => 'audio/mpeg', 'mp4' => 'video/mp4', 
+            'mpe' => 'video/mpeg', 'mpeg' => 'video/mpeg', 
+            'mpg' => 'video/mpeg', 'mpga' => 'audio/mpeg', 
+            'ms' => 'application/x-troff-ms', 'msh' => 'model/mesh', 
+            'mxu' => 'video/vnd.mpegurl', 'nc' => 'application/x-netcdf', 
+            'oda' => 'application/oda', 'ogg' => 'application/ogg', 
+            'ogv' => 'video/ogv', 'pbm' => 'image/x-portable-bitmap', 
+            'pct' => 'image/pict', 'pdb' => 'chemical/x-pdb', 
+            'pdf' => 'application/pdf', 
+            'pgm' => 'image/x-portable-graymap', 
+            'pgn' => 'application/x-chess-pgn', 'pic' => 'image/pict', 
+            'pict' => 'image/pict', 'png' => 'image/png', 
+            'pnm' => 'image/x-portable-anymap', 
+            'pnt' => 'image/x-macpaint', 'pntg' => 'image/x-macpaint', 
+            'ppm' => 'image/x-portable-pixmap', 
+            'ppt' => 'application/vnd.ms-powerpoint', 
+            'ps' => 'application/postscript', 'qt' => 'video/quicktime', 
+            'qti' => 'image/x-quicktime', 'qtif' => 'image/x-quicktime', 
+            'ra' => 'audio/x-pn-realaudio', 
+            'ram' => 'audio/x-pn-realaudio', 'ras' => 'image/x-cmu-raster', 
+            'rdf' => 'application/rdf+xml', 'rgb' => 'image/x-rgb', 
+            'rm' => 'application/vnd.rn-realmedia', 
+            'roff' => 'application/x-troff', 'rtf' => 'text/rtf', 
+            'rtx' => 'text/richtext', 'sgm' => 'text/sgml', 
+            'sgml' => 'text/sgml', 'sh' => 'application/x-sh', 
+            'shar' => 'application/x-shar', 'silo' => 'model/mesh', 
+            'sit' => 'application/x-stuffit', 
+            'skd' => 'application/x-koan', 'skm' => 'application/x-koan', 
+            'skp' => 'application/x-koan', 'skt' => 'application/x-koan', 
+            'smi' => 'application/smil', 'smil' => 'application/smil', 
+            'snd' => 'audio/basic', 'so' => 'application/octet-stream', 
+            'spl' => 'application/x-futuresplash', 
+            'src' => 'application/x-wais-source', 
+            'sv4cpio' => 'application/x-sv4cpio', 
+            'sv4crc' => 'application/x-sv4crc', 'svg' => 'image/svg+xml', 
+            'swf' => 'application/x-shockwave-flash', 
+            't' => 'application/x-troff', 'tar' => 'application/x-tar', 
+            'tcl' => 'application/x-tcl', 'tex' => 'application/x-tex', 
+            'texi' => 'application/x-texinfo', 
+            'texinfo' => 'application/x-texinfo', 'tif' => 'image/tiff', 
+            'tiff' => 'image/tiff', 'tr' => 'application/x-troff', 
+            'tsv' => 'text/tab-separated-values', 'txt' => 'text/plain', 
+            'ustar' => 'application/x-ustar', 
+            'vcd' => 'application/x-cdlink', 'vrml' => 'model/vrml', 
+            'vxml' => 'application/voicexml+xml', 'wav' => 'audio/x-wav', 
+            'wbmp' => 'image/vnd.wap.wbmp', 
+            'wbxml' => 'application/vnd.wap.wbxml', 'webm' => 'video/webm', 
+            'wml' => 'text/vnd.wap.wml', 
+            'wmlc' => 'application/vnd.wap.wmlc', 
+            'wmls' => 'text/vnd.wap.wmlscript', 
+            'wmlsc' => 'application/vnd.wap.wmlscriptc', 
+            'wmv' => 'video/x-ms-wmv', 'wrl' => 'model/vrml', 
+            'xbm' => 'image/x-xbitmap', 'xht' => 'application/xhtml+xml', 
+            'xhtml' => 'application/xhtml+xml', 
+            'xls' => 'application/vnd.ms-excel', 
+            'xml' => 'application/xml', 'xpm' => 'image/x-xpixmap', 
+            'xsl' => 'application/xml', 'xslt' => 'application/xslt+xml', 
+            'xul' => 'application/vnd.mozilla.xul+xml', 
+            'xwd' => 'image/x-xwindowdump', 'xyz' => 'chemical/x-xyz', 
+            'zip' => 'application/zip' );
 	
-	public static function get_mimetype($ext) {
-		return (isset ( self::$mime_types [$ext] ) ? self::$mime_types [$ext] : 'application/octet-stream');
-	}
-	/**
-	 * 检测是否含有中文
-	 * @param string $subject
-	 * @return boolean
-	 */
-	public static function chk_chinese($str){
-		return preg_match('/[\x80-\xff]./', $str);
-	}
+    public static function get_mimetype($ext) {
+        return (isset ( self::$mime_types [$ext] ) ? self::$mime_types [$ext] : 'application/octet-stream');
+    }
+    /**
+     * 检测是否含有中文
+     * @param string $subject
+     * @return boolean
+     */
+    public static function chk_chinese($str){
+        return preg_match('/[\x80-\xff]./', $str);
+    }
 	
-	/**
-	 * 检测是否GB2312编码
-	 * @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编码  
-	                else  
-	                    return true;    //GB编码  
-	            }  
-	        }  
-	    }  
-	} 
+    /**
+     * 检测是否GB2312编码
+     * @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编码  
+                    else  
+                        return true;    //GB编码  
+                }  
+            }  
+        }  
+    } 
 
 
-	/**
-	 * 检测是否GBK编码
-	 * @param string $str 
-	 * @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;
-	                 }
-	            }
-	        }
-	    }
-	   return $gbk?TRUE: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){
-		$success = FALSE;
-		$isresource = FALSE;
-		if(!is_resource($path)){
-			$isresource = FALSE;
-			$resource = fopen($path,"r");
-		}else{
-			$isresource = TRUE;
-			$resource = $path;
-		}
-		$stat = fstat($resource);
-		$size = $stat["size"];
-		if($size<0){
-			$success = FALSE;
-		}else{
-			$success = TRUE;
-		}
-		if($success)
-			return $size;
-		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")){
-				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;
-		}
-		return $size;
-	}
+    /**
+     * 检测是否GBK编码
+     * @param string $str 
+     * @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;
+                        }
+                }
+            }
+        }
+        return $gbk?TRUE: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){
+        $success = FALSE;
+        $isresource = FALSE;
+        if(!is_resource($path)){
+            $isresource = FALSE;
+            $resource = fopen($path,"r");
+        }else{
+            $isresource = TRUE;
+            $resource = $path;
+        }
+        $stat = fstat($resource);
+        $size = $stat["size"];
+        if($size<0){
+            $success = FALSE;
+        }else{
+            $success = TRUE;
+        }
+        if($success)
+            return $size;
+        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")){
+                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;
+        }
+        return $size;
+    }
 }
 ?>
\ No newline at end of file

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;
 	}

Braces +28 added lines, -15 removed lines

@@ -158,13 +158,20 @@ 
 	        $v = ord( $str[$i] );  
 	        if( $v > 127) {  
 	            if( ($v >= 228) && ($v <= 233) ){  
-	                if( ($i+2) >= (strlen($str) - 1)) return true;  // not enough characters  
+	                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编码  
+	                if( ($v1 >= 128) && ($v1 <=191) && ($v2 >=128) && ($v2 <= 191) ) {
+	                	                    return false;
+	                }
+	                //UTF-8编码  
+	                else {
+	                	                    return true;
+	                }
+	                //GB编码  
 	            }  
 	        }  
 	    }  
@@ -182,11 +189,14 @@ 
 	        $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
+	                 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{
+	                 } else{
 	                      return (($v1 >= 128) && ($v1 <=191) && ($v2 >=128) && ($v2 <= 191))?TRUE:FALSE;
 	                 }
 	            }
@@ -195,7 +205,9 @@ 
 	   return $gbk?TRUE:FALSE;
 	}
 	public static function iso8601($time=false) {
-    	if ($time === false) $time = time();
+    	if ($time === false) {
+    	    $time = time();
+    	}
    		$date = date('Y-m-d\TH:i:s\.Z', $time);
    		return (substr($date, 0, strlen($date)-2).'Z');
 	}
@@ -205,7 +217,7 @@ 
 		if(!is_resource($path)){
 			$isresource = FALSE;
 			$resource = fopen($path,"r");
-		}else{
+		} else{
 			$isresource = TRUE;
 			$resource = $path;
 		}
@@ -213,16 +225,17 @@ 
 		$size = $stat["size"];
 		if($size<0){
 			$success = FALSE;
-		}else{
+		} else{
 			$success = TRUE;
 		}
-		if($success)
-			return $size;
-		else if($isresource)
-			throw new Ks3ClientException("please use file path instead resource");
+		if($success) {
+					return $size;
+		} 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命令
+		} 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");
 			}

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

Indentation +259 added lines, -259 removed lines

@@ -8,264 +8,264 @@
 handler：结果处理链
 */
 class API{
-	public static $API = array(
-		"getService"=>array(
-			"redirect"=>"listBuckets"
-		),
-		"listBuckets"=> array(
-			"method"=>"GET",
-			"needBucket"=>FALSE,
-			"needObject"=>FALSE,
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->ListBucketsHandler"
-		),
-		"deleteBucket"=>array(
-			"method"=>"DELETE",
-			"needBucket"=>TRUE,
-			"needObject"=>FALSE,
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->BooleanHandler"
-		),
-		"deleteBucketCORS"=>array(
-			"method"=>"DELETE",
-			"needBucket"=>TRUE,
-			"needObject"=>FALSE,
-			"subResource"=>"cors",
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->BooleanHandler"
-		),
-		"createBucket"=>array(
-			"method"=>"PUT",
-			"needBucket"=>TRUE,
-			"needObject"=>FALSE,
-			"signer"=>"DefaultUserAgentSigner->ACLSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"body"=>Array("builder"=>"LocationBuilder"),
-			"handler"=>"ErrorResponseHandler->BooleanHandler"
-		),
-		"setBucketAcl"=>array(
-			"method"=>"PUT",
-			"needBucket"=>TRUE,
-			"needObject"=>FALSE,
-			"signer"=>"DefaultUserAgentSigner->ACLSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"subResource"=>"acl",
-			"handler"=>"ErrorResponseHandler->BooleanHandler"
-		),
-		"setBucketCORS"=>array(
-			"method"=>"PUT",
-			"needBucket"=>TRUE,
-			"needObject"=>FALSE,
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->ContentMD5Signer->HeaderAuthSigner",
-			"subResource"=>"cors",
-			"body"=>Array("builder"=>"CORSBuilder"),
-			"handler"=>"ErrorResponseHandler->BooleanHandler"
-		),
-		"setBucketLogging"=>array(
-			"method"=>"PUT",
-			"needBucket"=>TRUE,
-			"needObject"=>FALSE,
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"subResource"=>"logging",
-			"body"=>Array("builder"=>"BucketLoggingBuilder"),
-			"handler"=>"ErrorResponseHandler->BooleanHandler"
-		),
-		"listObjects" => array(
-			"method"=>"GET",
-			"needBucket"=>TRUE,
-			"needObject"=>FALSE,
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"queryParams"=>array("Options->prefix","Options->delimiter","Options->marker","Options->max-keys"),
-			"handler"=>"ErrorResponseHandler->ListObjectsHandler"
-		),
-		"getBucketAcl" => array(
-			"method"=>"GET",
-			"needBucket"=>TRUE,
-			"needObject"=>FALSE,
-			"subResource"=>"acl",
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->GetAclHandler"
-		),
-		"getBucketCORS"=>array(
-			"method"=>"GET",
-			"needBucket"=>TRUE,
-			"needObject"=>FALSE,
-			"subResource"=>"cors",
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->GetBucketCORSHandler"
-		),
-		"getBucketLocation"=>array(
-			"method"=>"GET",
-			"needBucket"=>TRUE,
-			"needObject"=>FALSE,
-			"subResource"=>"location",
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->GetBucketLocationHandler"
-		),
-		"getBucketLogging"=>array(
-			"method"=>"GET",
-			"needBucket"=>TRUE,
-			"needObject"=>FALSE,
-			"subResource"=>"logging",
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->GetBucketLoggingHandler"
-		),
-		"listMutipartUploads"=>array(
-			"method"=>"GET",
-			"needBucket"=>TRUE,
-			"needObject"=>FALSE,
-			"subResource"=>"uploads",
-			"queryParams"=>array("Options->max-uploads","Options->key-marker","Options->prefix","Options->upload-id-​marker","Options->delimiter"),
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->ListMutipartUploadsHandler"
-		),
-		"bucketExists"=>array(
-			"method"=>"HEAD",
-			"needBucket"=>TRUE,
-			"needObject"=>FALSE,
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"handler"=>"ExistsHandler"
-		),
-		"putObjectByContent"=>array(
-			"method"=>"PUT",
-			"needBucket"=>TRUE,
-			"needObject"=>TRUE,
-			//将ContentMD5Signer放在最后的原因是，ContentMD5需要根据Content-Length计算
-			"signer"=>"DefaultUserAgentSigner->ACLSigner->SuffixContentTypeSigner->ContentLengthSigner->ObjectMetaSigner->ContentMD5Signer->UserMetaSigner->AdpSigner->CallBackSigner->SSESigner->SSECSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->UploadHandler",
-			"body"=>array("position"=>"Content")
-		),
-		"putObjectByFile"=>array(
-			"method"=>"PUT",
-			"needBucket"=>TRUE,
-			"needObject"=>TRUE,
-			"signer"=>"DefaultUserAgentSigner->ACLSigner->SuffixContentTypeSigner->ObjectMetaSigner->UserMetaSigner->AdpSigner->CallBackSigner->SSESigner->SSECSigner->StreamUploadSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->UploadHandler"
-		),
-		"setObjectAcl"=>array(
-			"method"=>"PUT",
-			"needBucket"=>TRUE,
-			"needObject"=>TRUE,
-			"signer"=>"DefaultUserAgentSigner->ACLSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"subResource"=>"acl",
-			"handler"=>"ErrorResponseHandler->BooleanHandler"
-		),
-		"copyObject"=>array(
-			"method"=>"PUT",
-			"needBucket"=>TRUE,
-			"needObject"=>TRUE,
-			"signer"=>"DefaultUserAgentSigner->CopySourceSigner->DefaultContentTypeSigner->CallBackSigner->SSESigner->SSECSigner->SSECSourceSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->CopyHandler"
-		),
-		"getObjectMeta"=>array(
-			"method"=>"HEAD",
-			"needBucket"=>TRUE,
-			"needObject"=>TRUE,
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->SSECSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->ObjectMetaHandler"
-		),
-		"objectExists"=>array(
-			"method"=>"HEAD",
-			"needBucket"=>TRUE,
-			"needObject"=>TRUE,
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->SSECSigner->HeaderAuthSigner",
-			"handler"=>"ExistsHandler"
-		),
-		"deleteObject"=>array(
-			"method"=>"DELETE",
-			"needBucket"=>TRUE,
-			"needObject"=>TRUE,
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->BooleanHandler"			
-		),
-		"deleteObjects"=>array(
-			"method"=>"POST",
-			"needBucket"=>TRUE,
-			"needObject"=>FALSE,
-			"subResource"=>"delete",
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->ContentMD5Signer->ContentLengthSigner->HeaderAuthSigner",
-			"body"=>array("builder"=>"DeleteObjectsBuilder"),
-			"handler"=>"ErrorResponseHandler->BooleanHandler"
-		),
-		"getObject"=>array(
-			"method"=>"GET",
-			"needBucket"=>TRUE,
-			"needObject"=>TRUE,
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->RangeSigner->SSECSigner->GetObjectSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->getObjectHandler"
-		),
-		"getObjectAcl" => array(
-			"method"=>"GET",
-			"needBucket"=>TRUE,
-			"needObject"=>TRUE,
-			"subResource"=>"acl",
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->GetAclHandler"
-		),
-		"initMultipartUpload"=>array(
-			"method"=>"POST",
-			"needBucket"=>TRUE,
-			"needObject"=>TRUE,
-			"subResource"=>"uploads",
-			"signer"=>"DefaultUserAgentSigner->ACLSigner->SuffixContentTypeSigner->MultipartObjectMetaSigner->UserMetaSigner->SSESigner->SSECSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->InitMultipartUploadHandler"
-		),
-		"uploadPart"=>array(
-			"method"=>"PUT",
-			"needBucket"=>TRUE,
-			"needObject"=>TRUE,
-			"queryParams"=>array("!Options->uploadId","!Options->partNumber"),
-			//这个请求没有body，所以使用了ContentLengthSigner->ContentMD5Signer而没用ObjectMetaSigner
-			"signer"=>"DefaultUserAgentSigner->ACLSigner->StreamContentTypeSigner->ContentLengthSigner->ContentMD5Signer->SSECSigner->StreamUploadSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->UploadHandler"
-		),
-		"abortMultipartUpload"=>array(
-			"method"=>"DELETE",
-			"needBucket"=>TRUE,
-			"needObject"=>TRUE,
-			"queryParams"=>array("!Options->uploadId"),
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->BooleanHandler"
-		),
-		"listParts"=>array(
-			"method"=>"GET",
-			"needBucket"=>TRUE,
-			"needObject"=>TRUE,
-			"queryParams"=>array("!Options->uploadId","Options->max-parts","Options->part-number​-marker"),
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->ListPartsHandler"
-		),
-		"completeMultipartUpload"=>array(
-			"method"=>"POST",
-			"needBucket"=>TRUE,
-			"needObject"=>TRUE,
-			"queryParams"=>array("!Options->uploadId"),
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->ContentLengthSigner->AdpSigner->CallBackSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->UploadHandler",
-			"body"=>array("builder"=>"CompleteMultipartUploadBuilder")
-		),
-		"generatePresignedUrl"=>array(
-			"method"=>"Method",
-			"needBucket"=>FALSE,
-			"needObject"=>FALSE,
-			"queryParams"=>array("!Options->Expires","Options->*"),
-			"signer"=>"AllHeaderSigner->QueryAuthSigner",
-		),
-		"putAdp"=>array(
-			"method"=>"PUT",
-			"needBucket"=>TRUE,
-			"needObject"=>TRUE,
-			"subResource"=>"adp",
-			"signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->AdpSigner->HeaderAuthSigner",
-			"handler"=>"ErrorResponseHandler->UploadHandler"
-		),
-		"getAdp"=>array(
-			"method"=>"GET",
-			"needBucket"=>FALSE,
-			"needObject"=>TRUE,
-			"objectPostion"=>"TaskID",//专门为这个接口定义的属性
-			"subResource"=>"queryadp",
-			"signer"=>"DefaultUserAgentSigner",
-			"handler"=>"ErrorResponseHandler->AdpHandler"
-		)
-	);
+    public static $API = array(
+        "getService"=>array(
+            "redirect"=>"listBuckets"
+        ),
+        "listBuckets"=> array(
+            "method"=>"GET",
+            "needBucket"=>FALSE,
+            "needObject"=>FALSE,
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->ListBucketsHandler"
+        ),
+        "deleteBucket"=>array(
+            "method"=>"DELETE",
+            "needBucket"=>TRUE,
+            "needObject"=>FALSE,
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->BooleanHandler"
+        ),
+        "deleteBucketCORS"=>array(
+            "method"=>"DELETE",
+            "needBucket"=>TRUE,
+            "needObject"=>FALSE,
+            "subResource"=>"cors",
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->BooleanHandler"
+        ),
+        "createBucket"=>array(
+            "method"=>"PUT",
+            "needBucket"=>TRUE,
+            "needObject"=>FALSE,
+            "signer"=>"DefaultUserAgentSigner->ACLSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "body"=>Array("builder"=>"LocationBuilder"),
+            "handler"=>"ErrorResponseHandler->BooleanHandler"
+        ),
+        "setBucketAcl"=>array(
+            "method"=>"PUT",
+            "needBucket"=>TRUE,
+            "needObject"=>FALSE,
+            "signer"=>"DefaultUserAgentSigner->ACLSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "subResource"=>"acl",
+            "handler"=>"ErrorResponseHandler->BooleanHandler"
+        ),
+        "setBucketCORS"=>array(
+            "method"=>"PUT",
+            "needBucket"=>TRUE,
+            "needObject"=>FALSE,
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->ContentMD5Signer->HeaderAuthSigner",
+            "subResource"=>"cors",
+            "body"=>Array("builder"=>"CORSBuilder"),
+            "handler"=>"ErrorResponseHandler->BooleanHandler"
+        ),
+        "setBucketLogging"=>array(
+            "method"=>"PUT",
+            "needBucket"=>TRUE,
+            "needObject"=>FALSE,
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "subResource"=>"logging",
+            "body"=>Array("builder"=>"BucketLoggingBuilder"),
+            "handler"=>"ErrorResponseHandler->BooleanHandler"
+        ),
+        "listObjects" => array(
+            "method"=>"GET",
+            "needBucket"=>TRUE,
+            "needObject"=>FALSE,
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "queryParams"=>array("Options->prefix","Options->delimiter","Options->marker","Options->max-keys"),
+            "handler"=>"ErrorResponseHandler->ListObjectsHandler"
+        ),
+        "getBucketAcl" => array(
+            "method"=>"GET",
+            "needBucket"=>TRUE,
+            "needObject"=>FALSE,
+            "subResource"=>"acl",
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->GetAclHandler"
+        ),
+        "getBucketCORS"=>array(
+            "method"=>"GET",
+            "needBucket"=>TRUE,
+            "needObject"=>FALSE,
+            "subResource"=>"cors",
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->GetBucketCORSHandler"
+        ),
+        "getBucketLocation"=>array(
+            "method"=>"GET",
+            "needBucket"=>TRUE,
+            "needObject"=>FALSE,
+            "subResource"=>"location",
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->GetBucketLocationHandler"
+        ),
+        "getBucketLogging"=>array(
+            "method"=>"GET",
+            "needBucket"=>TRUE,
+            "needObject"=>FALSE,
+            "subResource"=>"logging",
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->GetBucketLoggingHandler"
+        ),
+        "listMutipartUploads"=>array(
+            "method"=>"GET",
+            "needBucket"=>TRUE,
+            "needObject"=>FALSE,
+            "subResource"=>"uploads",
+            "queryParams"=>array("Options->max-uploads","Options->key-marker","Options->prefix","Options->upload-id-​marker","Options->delimiter"),
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->ListMutipartUploadsHandler"
+        ),
+        "bucketExists"=>array(
+            "method"=>"HEAD",
+            "needBucket"=>TRUE,
+            "needObject"=>FALSE,
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "handler"=>"ExistsHandler"
+        ),
+        "putObjectByContent"=>array(
+            "method"=>"PUT",
+            "needBucket"=>TRUE,
+            "needObject"=>TRUE,
+            //将ContentMD5Signer放在最后的原因是，ContentMD5需要根据Content-Length计算
+            "signer"=>"DefaultUserAgentSigner->ACLSigner->SuffixContentTypeSigner->ContentLengthSigner->ObjectMetaSigner->ContentMD5Signer->UserMetaSigner->AdpSigner->CallBackSigner->SSESigner->SSECSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->UploadHandler",
+            "body"=>array("position"=>"Content")
+        ),
+        "putObjectByFile"=>array(
+            "method"=>"PUT",
+            "needBucket"=>TRUE,
+            "needObject"=>TRUE,
+            "signer"=>"DefaultUserAgentSigner->ACLSigner->SuffixContentTypeSigner->ObjectMetaSigner->UserMetaSigner->AdpSigner->CallBackSigner->SSESigner->SSECSigner->StreamUploadSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->UploadHandler"
+        ),
+        "setObjectAcl"=>array(
+            "method"=>"PUT",
+            "needBucket"=>TRUE,
+            "needObject"=>TRUE,
+            "signer"=>"DefaultUserAgentSigner->ACLSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "subResource"=>"acl",
+            "handler"=>"ErrorResponseHandler->BooleanHandler"
+        ),
+        "copyObject"=>array(
+            "method"=>"PUT",
+            "needBucket"=>TRUE,
+            "needObject"=>TRUE,
+            "signer"=>"DefaultUserAgentSigner->CopySourceSigner->DefaultContentTypeSigner->CallBackSigner->SSESigner->SSECSigner->SSECSourceSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->CopyHandler"
+        ),
+        "getObjectMeta"=>array(
+            "method"=>"HEAD",
+            "needBucket"=>TRUE,
+            "needObject"=>TRUE,
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->SSECSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->ObjectMetaHandler"
+        ),
+        "objectExists"=>array(
+            "method"=>"HEAD",
+            "needBucket"=>TRUE,
+            "needObject"=>TRUE,
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->SSECSigner->HeaderAuthSigner",
+            "handler"=>"ExistsHandler"
+        ),
+        "deleteObject"=>array(
+            "method"=>"DELETE",
+            "needBucket"=>TRUE,
+            "needObject"=>TRUE,
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->BooleanHandler"			
+        ),
+        "deleteObjects"=>array(
+            "method"=>"POST",
+            "needBucket"=>TRUE,
+            "needObject"=>FALSE,
+            "subResource"=>"delete",
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->ContentMD5Signer->ContentLengthSigner->HeaderAuthSigner",
+            "body"=>array("builder"=>"DeleteObjectsBuilder"),
+            "handler"=>"ErrorResponseHandler->BooleanHandler"
+        ),
+        "getObject"=>array(
+            "method"=>"GET",
+            "needBucket"=>TRUE,
+            "needObject"=>TRUE,
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->RangeSigner->SSECSigner->GetObjectSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->getObjectHandler"
+        ),
+        "getObjectAcl" => array(
+            "method"=>"GET",
+            "needBucket"=>TRUE,
+            "needObject"=>TRUE,
+            "subResource"=>"acl",
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->GetAclHandler"
+        ),
+        "initMultipartUpload"=>array(
+            "method"=>"POST",
+            "needBucket"=>TRUE,
+            "needObject"=>TRUE,
+            "subResource"=>"uploads",
+            "signer"=>"DefaultUserAgentSigner->ACLSigner->SuffixContentTypeSigner->MultipartObjectMetaSigner->UserMetaSigner->SSESigner->SSECSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->InitMultipartUploadHandler"
+        ),
+        "uploadPart"=>array(
+            "method"=>"PUT",
+            "needBucket"=>TRUE,
+            "needObject"=>TRUE,
+            "queryParams"=>array("!Options->uploadId","!Options->partNumber"),
+            //这个请求没有body，所以使用了ContentLengthSigner->ContentMD5Signer而没用ObjectMetaSigner
+            "signer"=>"DefaultUserAgentSigner->ACLSigner->StreamContentTypeSigner->ContentLengthSigner->ContentMD5Signer->SSECSigner->StreamUploadSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->UploadHandler"
+        ),
+        "abortMultipartUpload"=>array(
+            "method"=>"DELETE",
+            "needBucket"=>TRUE,
+            "needObject"=>TRUE,
+            "queryParams"=>array("!Options->uploadId"),
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->BooleanHandler"
+        ),
+        "listParts"=>array(
+            "method"=>"GET",
+            "needBucket"=>TRUE,
+            "needObject"=>TRUE,
+            "queryParams"=>array("!Options->uploadId","Options->max-parts","Options->part-number​-marker"),
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->ListPartsHandler"
+        ),
+        "completeMultipartUpload"=>array(
+            "method"=>"POST",
+            "needBucket"=>TRUE,
+            "needObject"=>TRUE,
+            "queryParams"=>array("!Options->uploadId"),
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->ContentLengthSigner->AdpSigner->CallBackSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->UploadHandler",
+            "body"=>array("builder"=>"CompleteMultipartUploadBuilder")
+        ),
+        "generatePresignedUrl"=>array(
+            "method"=>"Method",
+            "needBucket"=>FALSE,
+            "needObject"=>FALSE,
+            "queryParams"=>array("!Options->Expires","Options->*"),
+            "signer"=>"AllHeaderSigner->QueryAuthSigner",
+        ),
+        "putAdp"=>array(
+            "method"=>"PUT",
+            "needBucket"=>TRUE,
+            "needObject"=>TRUE,
+            "subResource"=>"adp",
+            "signer"=>"DefaultUserAgentSigner->DefaultContentTypeSigner->AdpSigner->HeaderAuthSigner",
+            "handler"=>"ErrorResponseHandler->UploadHandler"
+        ),
+        "getAdp"=>array(
+            "method"=>"GET",
+            "needBucket"=>FALSE,
+            "needObject"=>TRUE,
+            "objectPostion"=>"TaskID",//专门为这个接口定义的属性
+            "subResource"=>"queryadp",
+            "signer"=>"DefaultUserAgentSigner",
+            "handler"=>"ErrorResponseHandler->AdpHandler"
+        )
+    );
 }
 ?>

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

Indentation +289 added lines, -289 removed lines

@@ -2,342 +2,342 @@
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."exceptions".DIRECTORY_SEPARATOR."Exceptions.php";
 
 interface Handler{
-	public function handle(ResponseCore $response);
+    public function handle(ResponseCore $response);
 }
 class ErrorResponseHandler implements Handler{
-	public function handle(ResponseCore $response){
-		$code = $response->status;
-		if($code >= 400){
-			$exception = new Ks3ServiceException();
-			$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();
-			}
-			throw $exception;
-		}else{
-			return $response;
-		}
-	}
+    public function handle(ResponseCore $response){
+        $code = $response->status;
+        if($code >= 400){
+            $exception = new Ks3ServiceException();
+            $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();
+            }
+            throw $exception;
+        }else{
+            return $response;
+        }
+    }
 }
 class ListBucketsHandler implements Handler{
 
-	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();
-			}
-			array_push($result, $bucket);
-		}
-		return $result;
-	}
+    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();
+            }
+            array_push($result, $bucket);
+        }
+        return $result;
+    }
 }
 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();
-		$contents = array();
-		foreach ($xml->Contents as $contentXml) {
-			$content = array();
-			foreach ($contentXml->children() as $key => $value) {
-				$owner = array();
-				if($key === "Owner"){
-					foreach ($value->children() as $ownerkey => $ownervalue) {
-						$owner[$ownerkey]=$ownervalue->__toString();
-					}
-					$content["Owner"] = $owner;
-				}else{
-					$content[$key]=$value->__toString();
-				}
-			}
-			array_push($contents, $content);
-		}
-		$result["Contents"] = $contents;
+    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();
+        $contents = array();
+        foreach ($xml->Contents as $contentXml) {
+            $content = array();
+            foreach ($contentXml->children() as $key => $value) {
+                $owner = array();
+                if($key === "Owner"){
+                    foreach ($value->children() as $ownerkey => $ownervalue) {
+                        $owner[$ownerkey]=$ownervalue->__toString();
+                    }
+                    $content["Owner"] = $owner;
+                }else{
+                    $content[$key]=$value->__toString();
+                }
+            }
+            array_push($contents, $content);
+        }
+        $result["Contents"] = $contents;
 
-		$commonprefix = array();
-		foreach ($xml->CommonPrefixes as $commonprefixXml) {
-			foreach ($commonprefixXml->children() as $key => $value) {
-				array_push($commonprefix, $value->__toString());
-			}
-		}
-		$result["CommonPrefixes"] = $commonprefix;
-		return $result;
-	}
+        $commonprefix = array();
+        foreach ($xml->CommonPrefixes as $commonprefixXml) {
+            foreach ($commonprefixXml->children() as $key => $value) {
+                array_push($commonprefix, $value->__toString());
+            }
+        }
+        $result["CommonPrefixes"] = $commonprefix;
+        return $result;
+    }
 }
 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")
-				{
-					$acors[$key] = $value->__toString();
-				}else{
-					if(!isset($acors[$key])){
-						$acors[$key] = array();
-					}
-					array_push($acors[$key],$value->__toString());
-				}
-			}
-			array_push($cors,$acors);
-		}
-		return $cors;
-	}
+    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")
+                {
+                    $acors[$key] = $value->__toString();
+                }else{
+                    if(!isset($acors[$key])){
+                        $acors[$key] = array();
+                    }
+                    array_push($acors[$key],$value->__toString());
+                }
+            }
+            array_push($cors,$acors);
+        }
+        return $cors;
+    }
 }
 class GetBucketLocationHandler implements Handler{
-	public function handle(ResponseCore $response){
-		$xml = new SimpleXMLElement($response->body);
-		$location = $xml->__toString();
+    public function handle(ResponseCore $response){
+        $xml = new SimpleXMLElement($response->body);
+        $location = $xml->__toString();
 
-		return $location;
-	}
+        return $location;
+    }
 }
 class GetBucketLoggingHandler implements Handler{
-	public function handle(ResponseCore $response){
-		$logging = array();
-		$xml = new SimpleXMLElement($response->body);
-		$loggingXml = $xml->LoggingEnabled;
-		if($loggingXml&&$loggingXml!==NULL)
-		{
-			foreach ($loggingXml->children() as $key => $value) {
-				$logging["Enable"] = TRUE;
-				$logging[$key] = $value->__toString();
-			}
-		}else{
-			$logging["Enable"] = FALSE;
-		}
-		return $logging;
-	}
+    public function handle(ResponseCore $response){
+        $logging = array();
+        $xml = new SimpleXMLElement($response->body);
+        $loggingXml = $xml->LoggingEnabled;
+        if($loggingXml&&$loggingXml!==NULL)
+        {
+            foreach ($loggingXml->children() as $key => $value) {
+                $logging["Enable"] = TRUE;
+                $logging[$key] = $value->__toString();
+            }
+        }else{
+            $logging["Enable"] = FALSE;
+        }
+        return $logging;
+    }
 }
 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;
-			}
-		}
-		$Meta = array(
-			"ObjectMeta"=>$ObjectMeta,
-			"UserMeta"=>$UserMeta
-			);
-		return $Meta;
-	}
+    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;
+            }
+        }
+        $Meta = array(
+            "ObjectMeta"=>$ObjectMeta,
+            "UserMeta"=>$UserMeta
+            );
+        return $Meta;
+    }
 }
 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;
-			}
-		}
-		$Meta = array(
-			"ObjectMeta"=>$ObjectMeta,
-			"UserMeta"=>$UserMeta
-			);
-		$ks3Object = array(
-			"Content"=>$response->body,
-			"Meta"=>$Meta
-			);
-		return $ks3Object;
-	}
+    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;
+            }
+        }
+        $Meta = array(
+            "ObjectMeta"=>$ObjectMeta,
+            "UserMeta"=>$UserMeta
+            );
+        $ks3Object = array(
+            "Content"=>$response->body,
+            "Meta"=>$Meta
+            );
+        return $ks3Object;
+    }
 }
 class CopyHandler implements Handler{
-	public function handle(ResponseCore $response){
-		$headers = array();
+    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;
-			}
-		}
+        foreach ($response->header as $key => $value) {
+            if(isset(Consts::$SSEHandler[strtolower($key)])&&!empty($value)){
+                $headers[Consts::$SSEHandler[strtolower($key)]]=$value;
+            }
+        }
 
-		return $headers;
-	}	
+        return $headers;
+    }	
 }
 class InitMultipartUploadHandler implements Handler{
-	public function handle(ResponseCore $response){
-		$upload = array();
-		$xml = new SimpleXMLElement($response->body);
-		foreach ($xml->children() as $key => $value) {
-			$upload[$key] = $value->__toString();
-		}
+    public function handle(ResponseCore $response){
+        $upload = array();
+        $xml = new SimpleXMLElement($response->body);
+        foreach ($xml->children() as $key => $value) {
+            $upload[$key] = $value->__toString();
+        }
 
-		foreach ($response->header as $key => $value) {
-			if(isset(Consts::$SSEHandler[strtolower($key)])&&!empty($value)){
-				$upload[Consts::$SSEHandler[strtolower($key)]]=$value;
-			}
-		}
+        foreach ($response->header as $key => $value) {
+            if(isset(Consts::$SSEHandler[strtolower($key)])&&!empty($value)){
+                $upload[Consts::$SSEHandler[strtolower($key)]]=$value;
+            }
+        }
 
-		return $upload;
-	}
+        return $upload;
+    }
 }
 class ListPartsHandler implements Handler{
-	public function handle(ResponseCore $response){
-		$listParts = array();
-		$xml = new SimpleXMLElement($response->body);
+    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();
+        $initer = array();
+        $owner = array();
 
-		foreach ($xml->Initiator->children() as $key => $value) {
-			$initer[$key] = $value->__toString();
-		}
-		foreach ($xml->Owner->children() as $key => $value) {
-			$owner[$key] = $value->__toString();
-		}
-		$listParts["Owner"] = $owner;
-		$listParts["Initiator"]=$initer;
+        foreach ($xml->Initiator->children() as $key => $value) {
+            $initer[$key] = $value->__toString();
+        }
+        foreach ($xml->Owner->children() as $key => $value) {
+            $owner[$key] = $value->__toString();
+        }
+        $listParts["Owner"] = $owner;
+        $listParts["Initiator"]=$initer;
 
-		$parts = array();
-		foreach ($xml->Part as $partxml) {
-			$part = array();
-			foreach ($partxml->children() as $key => $value) {
-				$part[$key] = $value->__toString();
-			}
-			array_push($parts,$part);
-		}
-		$listParts["Parts"] = $parts;
-		return $listParts;
-	}
+        $parts = array();
+        foreach ($xml->Part as $partxml) {
+            $part = array();
+            foreach ($partxml->children() as $key => $value) {
+                $part[$key] = $value->__toString();
+            }
+            array_push($parts,$part);
+        }
+        $listParts["Parts"] = $parts;
+        return $listParts;
+    }
 }
 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;
-			}
-		}
-		return $Headers;
-	}
+    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;
+            }
+        }
+        return $Headers;
+    }
 }
 class GetAclHandler implements Handler{
-	public function handle(ResponseCore $response){
-		$hasread = FALSE;
-		$haswrite = FALSE;
-		$xml = new SimpleXMLElement($response->body);
-		$acl = $xml->AccessControlList;
-		foreach ($acl->children() as $grant) {
-			$permission = $grant->Permission->__toString();
-			$hasURI = FALSE;
-			$grantee = $grant->Grantee;
-			foreach ($grantee->children() as $key => $value) {
-				if($key === "URI"&&$value->__toString() === Consts::$Grantee_Group_All){
-					$hasURI = TRUE;
-				}
-			}
-			if($hasURI){
-				if($permission===Consts::$Permission_Read){
-					$hasread = TRUE;
-				}elseif($permission===Consts::$Permission_Write){
-					$haswrite = TRUE;
-				}
-			}
-		}
-		if($hasread&&$haswrite){
-			return "public-read-write";
-		}else{
-			if($hasread)
-				return "public-read";
-			else
-				return "private";
-		}
-	}
+    public function handle(ResponseCore $response){
+        $hasread = FALSE;
+        $haswrite = FALSE;
+        $xml = new SimpleXMLElement($response->body);
+        $acl = $xml->AccessControlList;
+        foreach ($acl->children() as $grant) {
+            $permission = $grant->Permission->__toString();
+            $hasURI = FALSE;
+            $grantee = $grant->Grantee;
+            foreach ($grantee->children() as $key => $value) {
+                if($key === "URI"&&$value->__toString() === Consts::$Grantee_Group_All){
+                    $hasURI = TRUE;
+                }
+            }
+            if($hasURI){
+                if($permission===Consts::$Permission_Read){
+                    $hasread = TRUE;
+                }elseif($permission===Consts::$Permission_Write){
+                    $haswrite = TRUE;
+                }
+            }
+        }
+        if($hasread&&$haswrite){
+            return "public-read-write";
+        }else{
+            if($hasread)
+                return "public-read";
+            else
+                return "private";
+        }
+    }
 }
 class ListMutipartUploadsHandler implements Handler{
-	public function handle(ResponseCore $response){
-		$mutiUploads = array();
-		$xml = new SimpleXMLElement($response->body);
+    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"){
-					$initer = array();
-					foreach ($value->children() as $key1 => $value1) {
-						$initer[$key1] = $value1->__toString();
-					}
-					$upload["Initiator"] = $initer;
-				}elseif($key === "Owner"){
-					$owner = array();
-					foreach ($value->children() as $key1 => $value1) {
-						$owner[$key1] = $value1->__toString();
-					}
-					$upload["Owner"] = $owner;
-				}else{
-					$upload[$key] = $value->__toString();
-				}
-			}
-			array_push($uploads,$upload);
-		}
-		$mutiUploads["Uploads"] = $uploads;
-		return $mutiUploads;
-	}
+        $uploads = array();
+        foreach ($xml->Upload as $uploadxml) {
+            $upload = array();
+            foreach ($uploadxml->children() as $key => $value) {
+                if($key === "Initiator"){
+                    $initer = array();
+                    foreach ($value->children() as $key1 => $value1) {
+                        $initer[$key1] = $value1->__toString();
+                    }
+                    $upload["Initiator"] = $initer;
+                }elseif($key === "Owner"){
+                    $owner = array();
+                    foreach ($value->children() as $key1 => $value1) {
+                        $owner[$key1] = $value1->__toString();
+                    }
+                    $upload["Owner"] = $owner;
+                }else{
+                    $upload[$key] = $value->__toString();
+                }
+            }
+            array_push($uploads,$upload);
+        }
+        $mutiUploads["Uploads"] = $uploads;
+        return $mutiUploads;
+    }
 }
 class AdpHandler implements Handler{
-	public function handle(ResponseCore $response){
-		return $response->body;
-	}
+    public function handle(ResponseCore $response){
+        return $response->body;
+    }
 }
 class BooleanHandler implements Handler{
-	public function handle(ResponseCore $response){
-		if($response->isOk()){
-			return TRUE;
-		}else{
-			return FALSE;
-		}
-	}
+    public function handle(ResponseCore $response){
+        if($response->isOk()){
+            return TRUE;
+        }else{
+            return FALSE;
+        }
+    }
 }
 class ExistsHandler implements Handler{
-	public function handle(ResponseCore $response){
-		$status = $response->status;
-		if($status === 404){
-			return FALSE;
-		}else{
-			return TRUE;
-		}
-	}
+    public function handle(ResponseCore $response){
+        $status = $response->status;
+        if($status === 404){
+            return FALSE;
+        }else{
+            return TRUE;
+        }
+    }
 }
 ?>
\ No newline at end of file

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;
 		}
 	}

Braces +17 added lines, -16 removed lines

@@ -18,7 +18,7 @@ 
 				$exception->resource=$xml->Resource->__toString();
 			}
 			throw $exception;
-		}else{
+		} else{
 			return $response;
 		}
 	}
@@ -59,7 +59,7 @@ 
 						$owner[$ownerkey]=$ownervalue->__toString();
 					}
 					$content["Owner"] = $owner;
-				}else{
+				} else{
 					$content[$key]=$value->__toString();
 				}
 			}
@@ -87,7 +87,7 @@ 
 				if($key === "MaxAgeSeconds")
 				{
 					$acors[$key] = $value->__toString();
-				}else{
+				} else{
 					if(!isset($acors[$key])){
 						$acors[$key] = array();
 					}
@@ -118,7 +118,7 @@ 
 				$logging["Enable"] = TRUE;
 				$logging[$key] = $value->__toString();
 			}
-		}else{
+		} else{
 			$logging["Enable"] = FALSE;
 		}
 		return $logging;
@@ -131,7 +131,7 @@ 
 		foreach ($response->header as $key => $value) {
 			if (substr(strtolower($key), 0, 10) === Consts::$UserMetaPrefix){
 				$UserMeta[$key]=$value;
-			}else if(isset(Consts::$ResponseObjectMeta[strtolower($key)])){
+			} else if(isset(Consts::$ResponseObjectMeta[strtolower($key)])){
 				$ObjectMeta[Consts::$ResponseObjectMeta[strtolower($key)]]=$value;
 			}
 		}
@@ -149,7 +149,7 @@ 
 		foreach ($response->header as $key => $value) {
 			if (substr(strtolower($key), 0, 10) === Consts::$UserMetaPrefix){
 				$UserMeta[$key]=$value;
-			}else if(isset(Consts::$ResponseObjectMeta[strtolower($key)])){
+			} else if(isset(Consts::$ResponseObjectMeta[strtolower($key)])){
 				$ObjectMeta[Consts::$ResponseObjectMeta[strtolower($key)]]=$value;
 			}
 		}
@@ -261,18 +261,19 @@ 
 			if($hasURI){
 				if($permission===Consts::$Permission_Read){
 					$hasread = TRUE;
-				}elseif($permission===Consts::$Permission_Write){
+				} elseif($permission===Consts::$Permission_Write){
 					$haswrite = TRUE;
 				}
 			}
 		}
 		if($hasread&&$haswrite){
 			return "public-read-write";
-		}else{
-			if($hasread)
-				return "public-read";
-			else
-				return "private";
+		} else{
+			if($hasread) {
+							return "public-read";
+			} else {
+							return "private";
+			}
 		}
 	}
 }
@@ -300,13 +301,13 @@ 
 						$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();
 				}
 			}
@@ -325,7 +326,7 @@ 
 	public function handle(ResponseCore $response){
 		if($response->isOk()){
 			return TRUE;
-		}else{
+		} else{
 			return FALSE;
 		}
 	}
@@ -335,7 +336,7 @@ 
 		$status = $response->status;
 		if($status === 404){
 			return FALSE;
-		}else{
+		} else{
 			return TRUE;
 		}
 	}