GC0202 / ThinkLibrary

src/helper/UnIqIds.php

Braces +9 added lines, -3 removed lines

@@ -50,7 +50,9 @@ 
         }
         $string = $prefix . $chars[rand(1, strlen($chars) - 1)];
         if (isset($chars)) {
-            while (strlen($string) < $size) $string .= $chars[rand(0, strlen($chars) - 1)];
+            while (strlen($string) < $size) {
+                $string .= $chars[rand(0, strlen($chars) - 1)];
+            }
         }
         return $string;
     }
@@ -67,7 +69,9 @@ 
             $size = 14;
         }
         $string = $prefix . date('Ymd') . (date('H') + date('i')) . date('s');
-        while (strlen($string) < $size) $string .= rand(0, 9);
+        while (strlen($string) < $size) {
+            $string .= rand(0, 9);
+        }
         return $string;
     }
 
@@ -84,7 +88,9 @@ 
             $size = 10;
         }
         $string = $prefix . ($time[0] . $time[1]) . substr($time, 2) . rand(0, 9);
-        while (strlen($string) < $size) $string .= rand(0, 9);
+        while (strlen($string) < $size) {
+            $string .= rand(0, 9);
+        }
         return $string;
     }
 }

src/Controller.php

Braces +9 added lines, -3 removed lines

@@ -73,7 +73,9 @@ 
      */
     public function error($info, $data = '{-null-}', $code = 0)
     {
-        if ($data === '{-null-}') $data = new stdClass();
+        if ($data === '{-null-}') {
+            $data = new stdClass();
+        }
         throw new HttpResponseException(json([
             'code' => $code, 'info' => $info, 'data' => $data,
         ]));
@@ -87,7 +89,9 @@ 
      */
     public function success($info, $data = '{-null-}', $code = 1)
     {
-        if ($data === '{-null-}') $data = new stdClass();
+        if ($data === '{-null-}') {
+            $data = new stdClass();
+        }
         throw new HttpResponseException(json([
             'code' => $code, 'info' => $info, 'data' => $data,
         ]));
@@ -110,7 +114,9 @@ 
      */
     public function fetch($tpl = '', $vars = [])
     {
-        foreach ($this as $name => $value) $vars[$name] = $value;
+        foreach ($this as $name => $value) {
+            $vars[$name] = $value;
+        }
         throw new HttpResponseException(view($tpl, $vars));
     }
 

src/service/ksyun/bin/exceptions/Exceptions.php

Indentation +27 added lines, -27 removed lines

@@ -3,32 +3,32 @@
 	
 }
 class Ks3ServiceException extends Ks3ClientException{
-	private $requestId;
-	private $errorCode;
-	private $errorMessage;
-	private $resource;
-	private $statusCode;
-	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 __toString()
-  	{
-      		$message = get_class($this) . ': '
-      			."(errorCode:".$this->errorCode.";"
-      			."errorMessage:".$this->errorMessage.";"
-      			."resource:".$this->resource.";"
-      			."requestId:".$this->requestId.";"
-      			."statusCode:".$this->statusCode.")";
-		return $message;
-      	}
+    private $requestId;
+    private $errorCode;
+    private $errorMessage;
+    private $resource;
+    private $statusCode;
+    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 __toString()
+        {
+                $message = get_class($this) . ': '
+                    ."(errorCode:".$this->errorCode.";"
+                    ."errorMessage:".$this->errorMessage.";"
+                    ."resource:".$this->resource.";"
+                    ."requestId:".$this->requestId.";"
+                    ."statusCode:".$this->statusCode.")";
+        return $message;
+            }
 }
 ?>
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 		if(isset($this->$property_name))
 		{
 			return($this->$property_name);
-		}else
+		} else
 		{
 			return(NULL);
 		}

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

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

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

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

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

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

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)){