GC0202 / ThinkLibrary

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

Spacing +46 added lines, -46 removed lines

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

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

Spacing +7 added lines, -7 removed lines

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

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

Spacing +106 added lines, -106 removed lines

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

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

Spacing +16 added lines, -16 removed lines

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

src/service/ksyun/bin/Ks3EncryptionClient.class.php

Spacing +38 added lines, -38 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 //使用客户端加密的方式上传下载文件
 //检测API路径
-if(!defined('KS3_API_PATH'))
+if (!defined('KS3_API_PATH'))
 define('KS3_API_PATH', dirname(__FILE__));
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."Ks3Client.class.php";
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR."EncryptionUtil.php";
@@ -9,88 +9,88 @@ 
 
 //加密模式
 //暂时仅支持EO,使用AES/CBC/PKCS5Padding算法对数据进行加密
-if(!defined("ENCRYPTPTION_MODE"))
-define("ENCRYPTPTION_MODE","EO");
+if (!defined("ENCRYPTPTION_MODE"))
+define("ENCRYPTPTION_MODE", "EO");
 //加密信息存储模式,暂时支持 ObjectMetadata和InstructionFile
 //ObjectMetadata:存在用户元数据中
 //InstructionFile：存在一个.instruction文件中
-if(!defined("ENCRYPTPTION_STORAGE_MODE"))
-define("ENCRYPTPTION_STORAGE_MODE","ObjectMetadata");
+if (!defined("ENCRYPTPTION_STORAGE_MODE"))
+define("ENCRYPTPTION_STORAGE_MODE", "ObjectMetadata");
 
 
-if(function_exists('get_loaded_extensions')){
+if (function_exists('get_loaded_extensions')) {
 	//检测mcrypt,openssl扩展
 	$extensions = get_loaded_extensions();
-	if($extensions){
-		if(!in_array('mcrypt', $extensions)){
+	if ($extensions) {
+		if (!in_array('mcrypt', $extensions)) {
 			throw new Ks3ClientException("please install mcrypt extension");
 		}
-		if(!in_array('openssl', $extensions)){
+		if (!in_array('openssl', $extensions)) {
 			throw new Ks3ClientException("please install openssl extension");
 		}
-	}else{
+	}else {
 		throw new Ks3ClientException("please install extensions");
 	}
-}else{
+}else {
 	throw new Ks3ClientException();
 } 
-class Ks3EncryptionClient extends Ks3Client{
+class Ks3EncryptionClient extends Ks3Client {
 	private $encryptionHandler = NULL;
 	//用户提供的主密钥,可以是对称秘钥或非对称秘钥(array,分别是公钥和私钥)
 	private $encryptionMaterials = NULL;
 
-	public function __construct($accessKey, $secretKey,$encryptionMaterials, $endpoint = NULL ){
-		parent::__construct($accessKey,$secretKey,$endpoint);
-		if(is_array($encryptionMaterials)){
-			if(count($encryptionMaterials)==2){
+	public function __construct($accessKey, $secretKey, $encryptionMaterials, $endpoint = NULL) {
+		parent::__construct($accessKey, $secretKey, $endpoint);
+		if (is_array($encryptionMaterials)) {
+			if (count($encryptionMaterials) == 2) {
 				$pk = openssl_pkey_get_public($encryptionMaterials[0]);
 				$sk = openssl_pkey_get_private($encryptionMaterials[1]);
-				if(!$pk)
+				if (!$pk)
 					throw new Ks3ClientException("invalid RSA public key,you can generate key use openssl");
-				if(!$sk)
+				if (!$sk)
 					throw new Ks3ClientException("invalid RSA private key,you can generate key use openssl");
-				$encryptionMaterials = array($pk,$sk);
-			}else{
+				$encryptionMaterials = array($pk, $sk);
+			}else {
 				throw new Ks3ClientException("encryptionMaterials should be string or an array of size 2");
 			}
 		}
-		$ks3client = new Ks3Client($accessKey,$secretKey,$endpoint);
+		$ks3client = new Ks3Client($accessKey, $secretKey, $endpoint);
 		$this->encryptionMaterials = $encryptionMaterials;
-		if(ENCRYPTPTION_MODE == "EO"){
-			$this->encryptionHandler = new EncryptionEO($ks3client,$encryptionMaterials);
+		if (ENCRYPTPTION_MODE == "EO") {
+			$this->encryptionHandler = new EncryptionEO($ks3client, $encryptionMaterials);
 		}elseif (ENCRYPTPTION_MODE == "AE") {
 			throw new Ks3ClientException("Authenticated encryption will be supported in the futher");
 		}
-		else{
+		else {
 			throw new Ks3ClientException("unsupported encryption mode :".ENCRYPTPTION_MODE);
 		}
-		if(ENCRYPTPTION_STORAGE_MODE != "ObjectMetadata"&&ENCRYPTPTION_STORAGE_MODE!="InstructionFile"){
+		if (ENCRYPTPTION_STORAGE_MODE != "ObjectMetadata" && ENCRYPTPTION_STORAGE_MODE != "InstructionFile") {
 			throw new Ks3ClientException("unsupported encryption storage mode :".ENCRYPTPTION_STORAGE_MODE);
 		}
 	}
 
-	public function putObjectByContent($args=array()){
+	public function putObjectByContent($args = array()) {
 		return $this->encryptionHandler->putObjectByContentSecurely($args);
 	}
-	public function putObjectByFile($args=array()){
+	public function putObjectByFile($args = array()) {
 		return $this->encryptionHandler->putObjectByFileSecurely($args);
 	}
-	public function getObject($args=array()){
+	public function getObject($args = array()) {
 		return $this->encryptionHandler->getObjectSecurely($args);
 	}
-	public function initMultipartUpload($args=array()){
+	public function initMultipartUpload($args = array()) {
 		return $this->encryptionHandler->initMultipartUploadSecurely($args);
 	}
-	public function uploadPart($args=array()){
+	public function uploadPart($args = array()) {
 		return $this->encryptionHandler->uploadPartSecurely($args);
 	}
-	public function abortMultipartUpload($args=array()){
+	public function abortMultipartUpload($args = array()) {
 		return $this->encryptionHandler->abortMultipartUploadSecurely($args);
 	}
-	public function completeMultipartUpload($args=array()){
+	public function completeMultipartUpload($args = array()) {
 		return $this->encryptionHandler->completeMultipartUploadSecurely($args);
 	}
-	public function deleteObject($args=array()){
+	public function deleteObject($args = array()) {
 		$result = parent::deleteObject($args);
 		$args["Key"] = $args["Key"].EncryptionUtil::$INSTRUCTION_SUFFIX;
 		try {
@@ -100,17 +100,17 @@ 
 		}
 		return $result;
 	}
-	public function copyObject($args=array()){
-		if(parent::objectExists(array(
+	public function copyObject($args = array()) {
+		if (parent::objectExists(array(
 			"Bucket"=>$args["Bucket"],
 			"Key"=>$args["Key"]
-			))){
+			))) {
 			throw new Ks3ClientException("copy object faild,destination object exists");
 		}
-		if(parent::objectExists(array(
+		if (parent::objectExists(array(
 			"Bucket"=>$args["CopySource"]["Bucket"],
 			"Key"=>$args["CopySource"]["Key"].EncryptionUtil::$INSTRUCTION_SUFFIX
-			))){
+			))) {
 			parent::copyObject(
 				array(
 					"Bucket"=>$args["Bucket"],

src/service/ksyun/bin/samples/FormUpload.php

Spacing +9 added lines, -9 removed lines

@@ -2,9 +2,9 @@ 
 //更加详细的表单上传请参考js sdk
 require_once "../Ks3Client.class.php";
 
-$client = new Ks3Client("","");
+$client = new Ks3Client("", "");
 $bucket_name = "phpsdktestlijunwei";
-if(!$client->bucketExists(array("Bucket"=>$bucket_name))){
+if (!$client->bucketExists(array("Bucket"=>$bucket_name))) {
     $client->createBucket(array("Bucket"=>$bucket_name));
 }
 
@@ -24,7 +24,7 @@ 
 $unknowData = array(
 	"random"
 	);
-$result = $client->postObject($bucket_name,$postData,$unknowData);
+$result = $client->postObject($bucket_name, $postData, $unknowData);
 print_r($result);
 
 ?>
@@ -33,14 +33,14 @@ 
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 </head>
 <body>
-<form action="<?php echo $host_uri;?>" method="post" enctype="multipart/form-data">
-Key to upload: <input type="input" name="key" value="<?php echo $key;?>" /><br />
-<input type="hidden" name="success_action_redirect" value="<?php echo $redirect;?>" />
+<form action="<?php echo $host_uri; ?>" method="post" enctype="multipart/form-data">
+Key to upload: <input type="input" name="key" value="<?php echo $key; ?>" /><br />
+<input type="hidden" name="success_action_redirect" value="<?php echo $redirect; ?>" />
 <input type="hidden" name="Content-Type" value="text/html" />
 <input type="hidden" name="random" value="vfegf34egf3" />
-<input type="hidden" name="KSSAccessKeyId" value="<?php echo $result["KSSAccessKeyId"];?>" />
-<input type="hidden" name="Policy" value="<?php echo $result["Policy"];?>" />
-<input type="hidden" name="Signature" value="<?php echo $result["Signature"];?>" />
+<input type="hidden" name="KSSAccessKeyId" value="<?php echo $result["KSSAccessKeyId"]; ?>" />
+<input type="hidden" name="Policy" value="<?php echo $result["Policy"]; ?>" />
+<input type="hidden" name="Signature" value="<?php echo $result["Signature"]; ?>" />
 File: <input type="file" name="file" /> <br />
 <!-- The elements after this will be ignored -->
 <input type="submit" name="submit" value="Upload to KSS S3" />

src/service/ksyun/bin/samples/TestEncryptionClientMeta.php

Spacing +38 added lines, -38 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-define("ENCRYPTPTION_STORAGE_MODE","ObjectMetadata");
+define("ENCRYPTPTION_STORAGE_MODE", "ObjectMetadata");
 require_once "../Ks3EncryptionClient.class.php";
 require_once "../Ks3Client.class.php";
 $bucket = "test-encryption";
@@ -7,16 +7,16 @@ 
 
 $filename = "secret.key";
 $handle = fopen($filename, "r");
-$contents = fread($handle, filesize ($filename));
+$contents = fread($handle, filesize($filename));
 fclose($handle);
 
-$client = new Ks3EncryptionClient("lMQTr0hNlMpB0iOk/i+x","D4CsYLs75JcWEjbiI22zR3P7kJ/+5B1qdEje7A7I",$contents);
-putObjectByContentAndGetObjectUsingMeta($client,$bucket,$keyprefix);
-putObjectByFileAndGetObjectUsingMeta($client,$bucket,$keyprefix);
-multipartUpload($client,$bucket,$keyprefix);
+$client = new Ks3EncryptionClient("lMQTr0hNlMpB0iOk/i+x", "D4CsYLs75JcWEjbiI22zR3P7kJ/+5B1qdEje7A7I", $contents);
+putObjectByContentAndGetObjectUsingMeta($client, $bucket, $keyprefix);
+putObjectByFileAndGetObjectUsingMeta($client, $bucket, $keyprefix);
+multipartUpload($client, $bucket, $keyprefix);
 
-function putObjectByContentAndGetObjectUsingMeta($client,$bucket,$keyprefix){
-	for($i = 45 ;$i < 60;$i++){
+function putObjectByContentAndGetObjectUsingMeta($client, $bucket, $keyprefix) {
+	for ($i = 45; $i < 60; $i++) {
 
 		$content = EncryptionUtil::genereateOnceUsedKey($i);
 
@@ -27,11 +27,11 @@ 
 			"Content"=>$content
 		);
 		$client->putObjectByContent($args);
-		rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOMeta",
-			"D://testdown/down",base64_encode(md5($args["Content"])));
+		rangeGetAndCheckMd5($client, $bucket, $keyprefix."EOMeta",
+			"D://testdown/down", base64_encode(md5($args["Content"])));
 	}
 }
-function putObjectByFileAndGetObjectUsingMeta($client,$bucket,$keyprefix){
+function putObjectByFileAndGetObjectUsingMeta($client, $bucket, $keyprefix) {
 
 	$args = array(
 		"Bucket"=>$bucket,
@@ -42,39 +42,39 @@ 
 			)
 	);
 	$client->putObjectByFile($args);
-	rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOMeta",
-			"D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
+	rangeGetAndCheckMd5($client, $bucket, $keyprefix."EOMeta",
+			"D://testdown/down", base64_encode(md5_file("D://IMG.jpg")));
 }
-function multipartUpload($client,$bucket,$keyprefix){
+function multipartUpload($client, $bucket, $keyprefix) {
 	//初始化分开上传，获取uploadid
     $args = array(
         "Bucket"=>$bucket,
         "Key"=>$keyprefix."EOMeta",
     );
     $uploadid = $client->initMultipartUpload($args);
-    $uploadid = $uploadid["UploadId"];//获取到uploadid
+    $uploadid = $uploadid["UploadId"]; //获取到uploadid
         //开始上传
 
-    $file = "D://IMG.jpg";//要上传的文件
+    $file = "D://IMG.jpg"; //要上传的文件
     $partsize = 1024*100;
-    $resource = fopen($file,"r");
+    $resource = fopen($file, "r");
     $stat = fstat($resource);
-    $total = $stat["size"];//获取文件的总大小
+    $total = $stat["size"]; //获取文件的总大小
     fclose($resource);
-    $count = (int)(($total-1)/$partsize)+1;//计算文件需要分几块上传
-    for($i = 0;$i < $count;$i++){
+    $count = (int)(($total-1)/$partsize)+1; //计算文件需要分几块上传
+    for ($i = 0; $i < $count; $i++) {
         //依次上传每一块
         echo "upload".$i."\r\n";
-        $args=array(
+        $args = array(
             "Bucket"=>$bucket,
         	"Key"=>$keyprefix."EOMeta",
-        	"LastPart"=>($i===$count-1),
+        	"LastPart"=>($i === $count-1),
             "Options"=>array(
                 "partNumber"=>$i+1,
                 "uploadId"=>$uploadid
             ),
             "ObjectMeta"=>array(
-                "Content-Length"=>min($partsize,$total-$partsize*$i)//每次上传$partsize大小
+                "Content-Length"=>min($partsize, $total-$partsize*$i)//每次上传$partsize大小
             ),
             "Content"=>array(
                 "content"=>$file,
@@ -84,9 +84,9 @@ 
         $etag = $client->uploadPart($args);
         $etag = $etag["ETag"];
     }
-    $parts = $client->listParts(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOMeta","Options"=>array("uploadId"=>$uploadid)));
+    $parts = $client->listParts(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOMeta", "Options"=>array("uploadId"=>$uploadid)));
     //结束上传
-    $args=array(
+    $args = array(
         "Bucket"=>$bucket,
         "Key"=>$keyprefix."EOMeta",
         "Options"=>array("uploadId"=>$uploadid),
@@ -94,21 +94,21 @@ 
     );
     $result = $client->completeMultipartUpload($args);
 
-    rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOMeta",
-    	"D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
+    rangeGetAndCheckMd5($client, $bucket, $keyprefix."EOMeta",
+    	"D://testdown/down", base64_encode(md5_file("D://IMG.jpg")));
 }
-function rangeGetAndCheckMd5($client,$bucket,$key,$file,$expectedMd5){
-	$args = array("Bucket"=>$bucket,"Key"=>$key);
+function rangeGetAndCheckMd5($client, $bucket, $key, $file, $expectedMd5) {
+	$args = array("Bucket"=>$bucket, "Key"=>$key);
 	$meta = $client->getObjectMeta($args);
 	$contentlength = $meta["ObjectMeta"]["Content-Length"];
 
 	$filelist = array();
 
-	for($begin = 0;$begin <$contentlength;){
-		$index = rand((int)($contentlength/20),(int)($contentlength/10));
-		$range = array("start"=>$begin,"end"=>$begin+$index);
+	for ($begin = 0; $begin < $contentlength;) {
+		$index = rand((int)($contentlength/20), (int)($contentlength/10));
+		$range = array("start"=>$begin, "end"=>$begin+$index);
 		$destFile = $file.$begin."-".($begin+$index);
-		array_push($filelist,$destFile);
+		array_push($filelist, $destFile);
 		$begin += ($index+1);
 		$args = array(
 			"Bucket"=>$bucket,
@@ -120,17 +120,17 @@ 
 	}
 
 	foreach ($filelist as $key => $value) {
-		$handle = fopen($value,"r");
+		$handle = fopen($value, "r");
 		$size = filesize($value);
-		if($size > 0){
-			$content = fread($handle,$size);
-			file_put_contents($file,$content,FILE_APPEND);
+		if ($size > 0) {
+			$content = fread($handle, $size);
+			file_put_contents($file, $content, FILE_APPEND);
 		}
 		fclose($handle);
 		@unlink($value);
 	}
 	$md5 = base64_encode(md5_file($file));
-	if($md5 != $expectedMd5)
+	if ($md5 != $expectedMd5)
 		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
 	@unlink($file);	
 }

src/service/ksyun/bin/samples/TestEncryptionClientFile.php

Spacing +50 added lines, -50 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-define("ENCRYPTPTION_STORAGE_MODE","InstructionFile");
+define("ENCRYPTPTION_STORAGE_MODE", "InstructionFile");
 require_once "../Ks3EncryptionClient.class.php";
 require_once "../Ks3Client.class.php";
 $bucket = "test-encryption";
@@ -7,17 +7,17 @@ 
 
 $filename = "secret.key";
 $handle = fopen($filename, "r");
-$contents = fread($handle, filesize ($filename));
+$contents = fread($handle, filesize($filename));
 fclose($handle);
 
-$client = new Ks3EncryptionClient("lMQTr0hNlMpB0iOk/i+x","D4CsYLs75JcWEjbiI22zR3P7kJ/+5B1qdEje7A7I",$contents);
-putObjectByContentAndGetObjectUsingInstruction($client,$bucket,$keyprefix);
-putObjectByFileAndGetObjectUsingFile($client,$bucket,$keyprefix);
-multipartUpload($client,$bucket,$keyprefix);
-copyAnddeleteObject($client,$bucket,$keyprefix);
+$client = new Ks3EncryptionClient("lMQTr0hNlMpB0iOk/i+x", "D4CsYLs75JcWEjbiI22zR3P7kJ/+5B1qdEje7A7I", $contents);
+putObjectByContentAndGetObjectUsingInstruction($client, $bucket, $keyprefix);
+putObjectByFileAndGetObjectUsingFile($client, $bucket, $keyprefix);
+multipartUpload($client, $bucket, $keyprefix);
+copyAnddeleteObject($client, $bucket, $keyprefix);
 
-function putObjectByContentAndGetObjectUsingInstruction($client,$bucket,$keyprefix){
-	$content = EncryptionUtil::genereateOnceUsedKey(rand(100,1000));
+function putObjectByContentAndGetObjectUsingInstruction($client, $bucket, $keyprefix) {
+	$content = EncryptionUtil::genereateOnceUsedKey(rand(100, 1000));
 	$args = array(
 		"Bucket"=>$bucket,
 		"Key"=>$keyprefix."EOFile",
@@ -25,10 +25,10 @@ 
 		"Content"=>$content
 	);
 	$client->putObjectByContent($args);
-	rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOFile",
-			"D://testdown/down",base64_encode(md5($args["Content"])));
+	rangeGetAndCheckMd5($client, $bucket, $keyprefix."EOFile",
+			"D://testdown/down", base64_encode(md5($args["Content"])));
 }
-function putObjectByFileAndGetObjectUsingFile($client,$bucket,$keyprefix){
+function putObjectByFileAndGetObjectUsingFile($client, $bucket, $keyprefix) {
 
 	$args = array(
 		"Bucket"=>$bucket,
@@ -39,39 +39,39 @@ 
 			)
 	);
 	$client->putObjectByFile($args);
-	rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOFile",
-			"D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
+	rangeGetAndCheckMd5($client, $bucket, $keyprefix."EOFile",
+			"D://testdown/down", base64_encode(md5_file("D://IMG.jpg")));
 }
-function multipartUpload($client,$bucket,$keyprefix){
+function multipartUpload($client, $bucket, $keyprefix) {
 	//初始化分开上传，获取uploadid
     $args = array(
         "Bucket"=>$bucket,
         "Key"=>$keyprefix."EOFile",
     );
     $uploadid = $client->initMultipartUpload($args);
-    $uploadid = $uploadid["UploadId"];//获取到uploadid
+    $uploadid = $uploadid["UploadId"]; //获取到uploadid
         //开始上传
 
-    $file = "D://IMG.jpg";//要上传的文件
+    $file = "D://IMG.jpg"; //要上传的文件
     $partsize = 1024*100;
-    $resource = fopen($file,"r");
+    $resource = fopen($file, "r");
     $stat = fstat($resource);
-    $total = $stat["size"];//获取文件的总大小
+    $total = $stat["size"]; //获取文件的总大小
     fclose($resource);
-    $count = (int)(($total-1)/$partsize)+1;//计算文件需要分几块上传
-    for($i = 0;$i < $count;$i++){
+    $count = (int)(($total-1)/$partsize)+1; //计算文件需要分几块上传
+    for ($i = 0; $i < $count; $i++) {
         //依次上传每一块
         echo "upload".$i."\r\n";
-        $args=array(
+        $args = array(
             "Bucket"=>$bucket,
         	"Key"=>$keyprefix."EOFile",
-        	"LastPart"=>($i===$count-1),
+        	"LastPart"=>($i === $count-1),
             "Options"=>array(
                 "partNumber"=>$i+1,
                 "uploadId"=>$uploadid
             ),
             "ObjectMeta"=>array(
-                "Content-Length"=>min($partsize,$total-$partsize*$i)//每次上传$partsize大小
+                "Content-Length"=>min($partsize, $total-$partsize*$i)//每次上传$partsize大小
             ),
             "Content"=>array(
                 "content"=>$file,
@@ -81,9 +81,9 @@ 
         $etag = $client->uploadPart($args);
         $etag = $etag["ETag"];
     }
-    $parts = $client->listParts(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFile","Options"=>array("uploadId"=>$uploadid)));
+    $parts = $client->listParts(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFile", "Options"=>array("uploadId"=>$uploadid)));
     //结束上传
-    $args=array(
+    $args = array(
         "Bucket"=>$bucket,
         "Key"=>$keyprefix."EOFile",
         "Options"=>array("uploadId"=>$uploadid),
@@ -91,11 +91,11 @@ 
     );
     $result = $client->completeMultipartUpload($args);
 
-    rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOFile",
-    	"D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
+    rangeGetAndCheckMd5($client, $bucket, $keyprefix."EOFile",
+    	"D://testdown/down", base64_encode(md5_file("D://IMG.jpg")));
 }
-function copyAnddeleteObject($client,$bucket,$keyprefix){
-	$content = EncryptionUtil::genereateOnceUsedKey(rand(100,1000));
+function copyAnddeleteObject($client, $bucket, $keyprefix) {
+	$content = EncryptionUtil::genereateOnceUsedKey(rand(100, 1000));
 	$args = array(
 		"Bucket"=>$bucket,
 		"Key"=>$keyprefix."EOFile",
@@ -104,10 +104,10 @@ 
 	);
 	$client->putObjectByContent($args);
 
-	if($client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy")))
-		$client->deleteObject(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy"));
-	if($client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy.instruction")))
-		$client->deleteObject(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy.instruction"));
+	if ($client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy")))
+		$client->deleteObject(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy"));
+	if ($client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy.instruction")))
+		$client->deleteObject(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy.instruction"));
 
 	$copyReq = array(
 		"Bucket"=>$bucket,
@@ -119,30 +119,30 @@ 
 		);
 	$client->copyObject($copyReq);
 
-	if(!$client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy")))
+	if (!$client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy")))
 		throw new Exception("not found ".$keyprefix."EOFileCopy");
-	if(!$client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy.instruction")))
+	if (!$client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy.instruction")))
 		throw new Exception("not found ".$keyprefix."EOFileCopy.instruction");
 
-	$client->deleteObject(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy"));
+	$client->deleteObject(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy"));
 
-	if($client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy")))
+	if ($client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy")))
 		throw new Exception("found ".$keyprefix."EOFileCopy");
-	if($client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy.instruction")))
+	if ($client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy.instruction")))
 		throw new Exception("found ".$keyprefix."EOFileCopy.instruction");
 }
-function rangeGetAndCheckMd5($client,$bucket,$key,$file,$expectedMd5){
-	$args = array("Bucket"=>$bucket,"Key"=>$key);
+function rangeGetAndCheckMd5($client, $bucket, $key, $file, $expectedMd5) {
+	$args = array("Bucket"=>$bucket, "Key"=>$key);
 	$meta = $client->getObjectMeta($args);
 	$contentlength = $meta["ObjectMeta"]["Content-Length"];
 
 	$filelist = array();
 
-	for($begin = 0;$begin <$contentlength;){
-		$index = rand((int)($contentlength/20),(int)($contentlength/10));
-		$range = array("start"=>$begin,"end"=>$begin+$index);
+	for ($begin = 0; $begin < $contentlength;) {
+		$index = rand((int)($contentlength/20), (int)($contentlength/10));
+		$range = array("start"=>$begin, "end"=>$begin+$index);
 		$destFile = $file.$begin."-".($begin+$index);
-		array_push($filelist,$destFile);
+		array_push($filelist, $destFile);
 		$begin += ($index+1);
 		$args = array(
 			"Bucket"=>$bucket,
@@ -154,17 +154,17 @@ 
 	}
 
 	foreach ($filelist as $key => $value) {
-		$handle = fopen($value,"r");
+		$handle = fopen($value, "r");
 		$size = filesize($value);
-		if($size > 0){
-			$content = fread($handle,$size);
-			file_put_contents($file,$content,FILE_APPEND);
+		if ($size > 0) {
+			$content = fread($handle, $size);
+			file_put_contents($file, $content, FILE_APPEND);
 		}
 		fclose($handle);
 		@unlink($value);
 	}
 	$md5 = base64_encode(md5_file($file));
-	if($md5 != $expectedMd5)
+	if ($md5 != $expectedMd5)
 		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
 	@unlink($file);	
 }

src/service/ksyun/bin/samples/Samples.php

Spacing +55 added lines, -55 removed lines

@@ -2,7 +2,7 @@ 
 require_once "../Ks3Client.class.php";
 require_once "../core/Utils.class.php";
 
-$client = new Ks3Client("","","kss.ksyun.com");//!!第三个参数endpoint需要对应bucket所在region!! 详见http://ks3.ksyun.com/doc/api/index.html  Region（区域）一节
+$client = new Ks3Client("", "", "kss.ksyun.com"); //!!第三个参数endpoint需要对应bucket所在region!! 详见http://ks3.ksyun.com/doc/api/index.html  Region（区域）一节
 //print_r(listBuckets($client));
 //print_r(deleteBucket($client));
 //print_r(deleteBucketCORS($client));
@@ -32,16 +32,16 @@ 
 //print_r(multipartUploadWithAdpAndCallBack($client));
 //print_r(putAdp($client));
 //print_r(postObject($client));
-function listBuckets($client){
+function listBuckets($client) {
 	return $client->listBuckets();
 }
-function deleteBucket($client){
+function deleteBucket($client) {
 	return $client->deleteBucket(array("Bucket"=>"ksc-scm"));
 }
-function deleteBucketCORS($client){
+function deleteBucketCORS($client) {
 	return $client->deleteBucketCORS(array("Bucket"=>"ksc-scm"));
 }
-function listObjects($client){
+function listObjects($client) {
 	$args = array(
 		"Bucket"=>"lijunwei.test",
 		"Options"=>array(
@@ -53,49 +53,49 @@ 
 		);
 	return $client->listObjects($args);
 }
-function getBucketAcl($client){
+function getBucketAcl($client) {
 	return $client->getBucketAcl(array("Bucket"=>"aaphp"));
 }
-function getBucketCORS($client){
+function getBucketCORS($client) {
 	return $client->getBucketCORS(array("Bucket"=>"ksc-scm"));
 }
-function getBucketLocation($client){
+function getBucketLocation($client) {
 	return $client->getBucketLocation(array("Bucket"=>"ksc-scm"));
 }
-function getBucketLogging($client){
+function getBucketLogging($client) {
 	return $client->getBucketLogging(array("Bucket"=>"ksc-scm"));
 }
-function bucketExists($client){
+function bucketExists($client) {
 	$args = array("Bucket"=>"ksc-scm");
 	return $client->bucketExists($args);
 }
-function createBucket($client){
+function createBucket($client) {
 	$args = array(
 		"Bucket"=>"ksc-scm",
 		"ACL"=>"private"
 		);
 	return $client->createBucket($args);
 }
-function setBucketAcl($client){
+function setBucketAcl($client) {
 	$args = array(
 		"Bucket"=>"ksc-scm",
 		"ACL"=>"private"
 		);
 	return $client->setBucketAcl($args);
 }
-function setBucketCORS($client){
+function setBucketCORS($client) {
 	$args = array(
 		"Bucket"=>"ksc-scm",
 		"CORS"=>array(
 			array(
-				"AllowedMethod"=>array("GET","PUT"),
+				"AllowedMethod"=>array("GET", "PUT"),
 				"AllowedOrigin"=>array("http://www.kingsoft.com"),
 				"AllowedHeader"=>array("*"),
 				"ExposeHeader"=>array("*"),
 				"MaxAgeSeconds"=>10
 			),
 			array(
-				"AllowedMethod"=>array("GET","PUT"),
+				"AllowedMethod"=>array("GET", "PUT"),
 				"AllowedOrigin"=>array("*"),
 				"AllowedHeader"=>array("*"),
 				"ExposeHeader"=>array("*"),
@@ -105,7 +105,7 @@ 
 	);
 	return $client->setBucketCORS($args);
 }
-function setBucketLogging($client){
+function setBucketLogging($client) {
 	$args = array(
 		"Bucket"=>"ksc-scm",
 		"BucketLogging"=>array(
@@ -116,21 +116,21 @@ 
 		);
 	return $client->setBucketLogging($args);
 }
-function deleteObject($client){
+function deleteObject($client) {
 	$args = array(
 		"Bucket"=>"ksc-scm",
 		"Key"=>"123.pdf"
 		);
 	return $client->deleteObject($args);
 }
-function deleteObjects($client){
+function deleteObjects($client) {
 	$args = array(
 		"Bucket"=>"ksc-scm",
-		"DeleteKeys"=>array("copy/test.zip","copy/123.doc")
+		"DeleteKeys"=>array("copy/test.zip", "copy/123.doc")
 		);
 	return $client->deleteObjects($args);
 }
-function getObject($client){
+function getObject($client) {
 	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.exe",
@@ -142,28 +142,28 @@ 
 		);
 	return $client->getObject($args);
 }
-function getObjectAcl($client){
+function getObjectAcl($client) {
 	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.exe"
 		);
 	return $client->getObjectAcl($args);
 }
-function objectExists($client){
+function objectExists($client) {
 	$args = array(
 		"Bucket"=>"ksc-scm",
 		"Key"=>"123.pdf"
 		);
 	return $client->objectExists($args);
 }
-function getObjectMeta($client){
+function getObjectMeta($client) {
 	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"test.zip"
 		);
 	return $client->getObjectMeta($args);
 }
-function setObjectAcl($client){
+function setObjectAcl($client) {
 	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"test.zip",
@@ -171,7 +171,7 @@ 
 		);
 	return $client->setObjectAcl($args);
 }
-function copyObject($client){
+function copyObject($client) {
 	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"copy/test.zip",
@@ -182,10 +182,10 @@ 
 		);
 	return $client->copyObject($args);
 }
-function putObjectByFile($client){
+function putObjectByFile($client) {
 	$file = "D://phpput";
-	if(Utils::chk_chinese($file)){
-		$file = iconv('utf-8','gbk',$file);
+	if (Utils::chk_chinese($file)) {
+		$file = iconv('utf-8', 'gbk', $file);
 	}
 	$content = $file;
 	$args = array(
@@ -193,7 +193,7 @@ 
 		"Key"=>"stream_upload1.txt",
 		"ACL"=>"public-read",
 		"ObjectMeta"=>array(
-			"Content-Type"=>"image/jpg",//只传0-10字节,
+			"Content-Type"=>"image/jpg", //只传0-10字节,
 			),
 		"Content"=>array(
 			"content"=>$file,
@@ -202,7 +202,7 @@ 
 	);
 	return $client->putObjectByFile($args);
 }
-function multipartUpload($client){
+function multipartUpload($client) {
 	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.zip",
@@ -220,16 +220,16 @@ 
 	//开始上传
 
 	$file = "D://新建文件夹.rar";
-	if(Utils::chk_chinese($file)){
-		$file = iconv('utf-8','gbk',$file);
+	if (Utils::chk_chinese($file)) {
+		$file = iconv('utf-8', 'gbk', $file);
 	}
 	$total = Utils::getFileSize($file);
 	$partsize = 1024*1024*5;
 	$count = (int)(($total-1)/$partsize)+1;
 	echo $count."\r\n";
-	for($i = 0;$i < $count;$i++){
+	for ($i = 0; $i < $count; $i++) {
 		echo "upload".$i."\r\n";
-		$args=array(
+		$args = array(
 			"Bucket"=>"aaphp",
 			"Key"=>"multi.zip",
 			"Options"=>array(
@@ -248,10 +248,10 @@ 
 		print_r($etag);
 		$etag = $etag["ETag"];
 	}
-	$parts = $client->listParts(array("Bucket"=>"aaphp","Key"=>"multi.zip","Options"=>array("uploadId"=>$uploadid)));
+	$parts = $client->listParts(array("Bucket"=>"aaphp", "Key"=>"multi.zip", "Options"=>array("uploadId"=>$uploadid)));
 	print_r($parts);
 	//结束上传
-	$args=array(
+	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.zip",
 		"Options"=>array("uploadId"=>$uploadid),
@@ -260,16 +260,16 @@ 
 	$result = $client->completeMultipartUpload($args);
 	print_r($result);
 }
-function abortMultipartUpload($client){
-	$args=array(
+function abortMultipartUpload($client) {
+	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.zip",
 		"Options"=>array("uploadId"=>"1234")
 		);
 	return $client->abortMultipartUpload($args);
 }
-function generatePresignedUrl($client){
-	$args=array(
+function generatePresignedUrl($client) {
+	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.zip",
 		"Options"=>array(
@@ -279,7 +279,7 @@ 
 		);
 	return $client->generatePresignedUrl($args);
 }
-function putObjectWithAdpAndCallBack($client){
+function putObjectWithAdpAndCallBack($client) {
 	$content = "D://野生动物.3gp";
 	$args = array(
 		"Bucket"=>"aaphp",
@@ -299,13 +299,13 @@ 
 		),
 		"CallBack"=>array(
 			"Url"=>"http://10.4.2.38:19090/",
-			"BodyMagicVariables"=>array("bucket"=>"bucket","key"=>"key"),
+			"BodyMagicVariables"=>array("bucket"=>"bucket", "key"=>"key"),
 			"BodyVariables"=>array("name"=>"lijunwei")
 		)
 	);
 	return $client->putObjectByFile($args);
 }
-function  multipartUploadWithAdpAndCallBack($client){
+function  multipartUploadWithAdpAndCallBack($client) {
 	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.zip",
@@ -323,16 +323,16 @@ 
 	//开始上传
 
 	$file = "D://野生动物.3gp";
-	if(Utils::chk_chinese($file)){
-		$file = iconv('utf-8','gbk',$file);
+	if (Utils::chk_chinese($file)) {
+		$file = iconv('utf-8', 'gbk', $file);
 	}
 	$partsize = 1024*1024*5;
 	$total = Utils::getFileSize($file);
 	$count = (int)(($total-1)/$partsize)+1;
 	echo $count."\r\n";
-	for($i = 0;$i < $count;$i++){
+	for ($i = 0; $i < $count; $i++) {
 		echo "upload".$i."\r\n";
-		$args=array(
+		$args = array(
 			"Bucket"=>"aaphp",
 			"Key"=>"multi.zip",
 			"Options"=>array(
@@ -351,10 +351,10 @@ 
 		print_r($etag);
 		$etag = $etag["ETag"];
 	}
-	$parts = $client->listParts(array("Bucket"=>"aaphp","Key"=>"multi.zip","Options"=>array("uploadId"=>$uploadid)));
+	$parts = $client->listParts(array("Bucket"=>"aaphp", "Key"=>"multi.zip", "Options"=>array("uploadId"=>$uploadid)));
 	print_r($parts);
 	//结束上传
-	$args=array(
+	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.zip",
 		"Options"=>array("uploadId"=>$uploadid),
@@ -370,7 +370,7 @@ 
 		),
 		"CallBack"=>array(
 			"Url"=>"http://10.4.2.38:19090/",
-			"BodyMagicVariables"=>array("bucket"=>"bucket","key"=>"key"),
+			"BodyMagicVariables"=>array("bucket"=>"bucket", "key"=>"key"),
 			"BodyVariables"=>array("name"=>"lijunwei")
 		)
 	);
@@ -380,8 +380,8 @@ 
 	$task = $client->getAdp(array("TaskID"=>$taskid));
 	print_r($task);
 }
-function putAdp($client){
-	$args=array(
+function putAdp($client) {
+	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.zip",
 		"Adp"=>array(
@@ -400,14 +400,14 @@ 
 	$task = $client->getAdp(array("TaskID"=>$taskid));
 	print_r($task);
 }
-function postObject($client){
+function postObject($client) {
 
 	$postData = array(
 		"key"=>"~!@\\#$\%^&*()_+-=qw",
 		"acl"=>"public-read"
 		);
-	$unKnowData=array("122","334");
+	$unKnowData = array("122", "334");
 
-	print_r($client->postObject("ksc-scm",$postData,$unKnowData));
+	print_r($client->postObject("ksc-scm", $postData, $unKnowData));
 }
 ?>