GC0202 / ThinkLibrary

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

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/Logger.php

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

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

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/Ks3Request.class.php

Braces +5 added lines, -5 removed lines

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

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

Braces +28 added lines, -15 removed lines

@@ -158,13 +158,20 @@ 
 	        $v = ord( $str[$i] );  
 	        if( $v > 127) {  
 	            if( ($v >= 228) && ($v <= 233) ){  
-	                if( ($i+2) >= (strlen($str) - 1)) return true;  // not enough characters  
+	                if( ($i+2) >= (strlen($str) - 1)) {
+	                    return true;
+	                }
+	                // not enough characters  
 	                $v1 = ord( $str[$i+1] );  
 	                $v2 = ord( $str[$i+2] );  
-	                if( ($v1 >= 128) && ($v1 <=191) && ($v2 >=128) && ($v2 <= 191) )  
-	                    return false;   //UTF-8编码  
-	                else  
-	                    return true;    //GB编码  
+	                if( ($v1 >= 128) && ($v1 <=191) && ($v2 >=128) && ($v2 <= 191) ) {
+	                	                    return false;
+	                }
+	                //UTF-8编码  
+	                else {
+	                	                    return true;
+	                }
+	                //GB编码  
 	            }  
 	        }  
 	    }  
@@ -182,11 +189,14 @@ 
 	        $v = ord( $str[$i] );
 	        if( $v > 127){
 	            if( ($v >= 228) && ($v <= 233) ){
-	                 if(($i+2)>= (strlen($str)-1)) return $gbk?true:FALSE;  // not enough characters
+	                 if(($i+2)>= (strlen($str)-1)) {
+	                     return $gbk?true:FALSE;
+	                 }
+	                 // not enough characters
 	                 $v1 = ord( $str[$i+1] ); $v2 = ord( $str[$i+2] );
 	                 if($gbk){
 	                      return (($v1 >= 128) && ($v1 <=191) && ($v2 >=128) && ($v2 <= 191))?FALSE:TRUE;//GBK
-	                 }else{
+	                 } else{
 	                      return (($v1 >= 128) && ($v1 <=191) && ($v2 >=128) && ($v2 <= 191))?TRUE:FALSE;
 	                 }
 	            }
@@ -195,7 +205,9 @@ 
 	   return $gbk?TRUE:FALSE;
 	}
 	public static function iso8601($time=false) {
-    	if ($time === false) $time = time();
+    	if ($time === false) {
+    	    $time = time();
+    	}
    		$date = date('Y-m-d\TH:i:s\.Z', $time);
    		return (substr($date, 0, strlen($date)-2).'Z');
 	}
@@ -205,7 +217,7 @@ 
 		if(!is_resource($path)){
 			$isresource = FALSE;
 			$resource = fopen($path,"r");
-		}else{
+		} else{
 			$isresource = TRUE;
 			$resource = $path;
 		}
@@ -213,16 +225,17 @@ 
 		$size = $stat["size"];
 		if($size<0){
 			$success = FALSE;
-		}else{
+		} else{
 			$success = TRUE;
 		}
-		if($success)
-			return $size;
-		else if($isresource)
-			throw new Ks3ClientException("please use file path instead resource");
+		if($success) {
+					return $size;
+		} else if($isresource) {
+					throw new Ks3ClientException("please use file path instead resource");
+		}
 		if(!((strtoupper(substr(PHP_OS,0,3))=="WIN"))){//如果不是windows系统，尝试使用stat命令
 			$size=trim(`stat -c%s $path`);
-		}else{//如果是windows系统，尝试cmd命令
+		} else{//如果是windows系统，尝试cmd命令
 			if(!class_exists("COM")){
 				throw new Ks3ClientException("please add 'extension=php_com_dotnet.dll' and set 'com.allow_dcom = true' in php.ini and restart");
 			}

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

Braces +17 added lines, -16 removed lines

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

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

Braces +16 added lines, -12 removed lines

@@ -621,8 +621,7 @@ 
 		{
 			curl_setopt($curl_handle, CURLOPT_SSL_VERIFYPEER, true);
 			curl_setopt($curl_handle, CURLOPT_SSL_VERIFYHOST, 2);
-		}
-		else
+		} else
 		{
 			curl_setopt($curl_handle, CURLOPT_SSL_VERIFYPEER, false);
 			curl_setopt($curl_handle, CURLOPT_SSL_VERIFYHOST, false);
@@ -632,8 +631,7 @@ 
 		if ($this->cacert_location === true)
 		{
 			curl_setopt($curl_handle, CURLOPT_CAINFO, dirname(__FILE__) . '/cacert.pem');
-		}
-		elseif (is_string($this->cacert_location))
+		} elseif (is_string($this->cacert_location))
 		{
 			curl_setopt($curl_handle, CURLOPT_CAINFO, $this->cacert_location);
 		}
@@ -705,8 +703,7 @@ 
 
 					curl_setopt($curl_handle, CURLOPT_INFILESIZE, $this->read_stream_size);
 					curl_setopt($curl_handle, CURLOPT_UPLOAD, true);
-				}
-				else
+				} else
 				{
 					curl_setopt($curl_handle, CURLOPT_POSTFIELDS, $this->request_body);
 				}
@@ -728,8 +725,7 @@ 
 				{
 					curl_setopt($curl_handle, CURLOPT_WRITEFUNCTION, array($this, 'streaming_write_callback'));
 					curl_setopt($curl_handle, CURLOPT_HEADER, false);
-				}
-				else
+				} else
 				{
 					curl_setopt($curl_handle, CURLOPT_POSTFIELDS, $this->request_body);
 				}
@@ -849,9 +845,13 @@ 
 		set_time_limit(0);
 
 		// Skip everything if there are no handles to process.
-		if (count($handles) === 0) return array();
+		if (count($handles) === 0) {
+		    return array();
+		}
 
-		if (!$opt) $opt = array();
+		if (!$opt) {
+		    $opt = array();
+		}
 
 		// Initialize any missing options
 		$limit = isset($opt['limit']) ? $opt['limit'] : -1;
@@ -869,7 +869,9 @@ 
 		// Loop through the cURL handles and add as many as it set by the limit parameter.
 		while ($i < $added)
 		{
-			if ($limit > 0 && $i >= $limit) break;
+			if ($limit > 0 && $i >= $limit) {
+			    break;
+			}
 			curl_multi_add_handle($multi_handle, array_shift($handles));
 			$i++;
 		}
@@ -882,7 +884,9 @@ 
 			while (($status = curl_multi_exec($multi_handle, $active)) === CURLM_CALL_MULTI_PERFORM)
 			{
 				// Start looking for possible responses immediately when we have to add more handles
-				if (count($handles) > 0) break;
+				if (count($handles) > 0) {
+				    break;
+				}
 			}
 
 			// Figure out which requests finished.

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

Braces +20 added lines, -16 removed lines

@@ -1,21 +1,24 @@ 
 <?php
 //使用客户端加密的方式上传下载文件
 //检测API路径
-if(!defined('KS3_API_PATH'))
-define('KS3_API_PATH', dirname(__FILE__));
+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";
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR."EncryptionHandlers.php";
 
 //加密模式
 //暂时仅支持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')){
@@ -28,10 +31,10 @@ 
 		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{
@@ -45,12 +48,14 @@ 
 			if(count($encryptionMaterials)==2){
 				$pk = openssl_pkey_get_public($encryptionMaterials[0]);
 				$sk = openssl_pkey_get_private($encryptionMaterials[1]);
-				if(!$pk)
-					throw new Ks3ClientException("invalid RSA public key,you can generate key use openssl");
-				if(!$sk)
-					throw new Ks3ClientException("invalid RSA private key,you can generate key use openssl");
+				if(!$pk) {
+									throw new Ks3ClientException("invalid RSA public key,you can generate key use openssl");
+				}
+				if(!$sk) {
+									throw new Ks3ClientException("invalid RSA private key,you can generate key use openssl");
+				}
 				$encryptionMaterials = array($pk,$sk);
-			}else{
+			} else{
 				throw new Ks3ClientException("encryptionMaterials should be string or an array of size 2");
 			}
 		}
@@ -58,10 +63,9 @@ 
 		$this->encryptionMaterials = $encryptionMaterials;
 		if(ENCRYPTPTION_MODE == "EO"){
 			$this->encryptionHandler = new EncryptionEO($ks3client,$encryptionMaterials);
-		}elseif (ENCRYPTPTION_MODE == "AE") {
+		} 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"){