GC0202 / ThinkLibrary

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

Indentation +223 added lines, -223 removed lines

@@ -2,234 +2,234 @@
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."exceptions".DIRECTORY_SEPARATOR."Exceptions.php";
 
 class Utils{
-	public static function encodeUrl($url,$path=TRUE){
-		$url = rawurlencode($url);
-		$url = str_replace("+", "%20", $url);
-		$url = str_replace("*", "%2A", $url);
-		$url = str_replace("%7A", "~", $url);
-		if($path){
-			$url = str_replace("%2F", "/", $url);
-		}
-		return $url;
-	}
-	public static function hex_to_base64($str){
-		$result = '';
+    public static function encodeUrl($url,$path=TRUE){
+        $url = rawurlencode($url);
+        $url = str_replace("+", "%20", $url);
+        $url = str_replace("*", "%2A", $url);
+        $url = str_replace("%7A", "~", $url);
+        if($path){
+            $url = str_replace("%2F", "/", $url);
+        }
+        return $url;
+    }
+    public static function hex_to_base64($str){
+        $result = '';
 
-		for ($i = 0; $i < strlen($str); $i += 2){
-			$result .= chr(hexdec(substr($str, $i, 2)));
-		}
+        for ($i = 0; $i < strlen($str); $i += 2){
+            $result .= chr(hexdec(substr($str, $i, 2)));
+        }
 
-		return base64_encode($result);
-	}
-	public static function replaceNS2($str){
-		$str = str_replace("<ns2:", "<", $str);
-		$str = str_replace("</ns2:", "</", $str);
-		return $str;
-	}
-	public static $mime_types = array (
-			'apk' => 'application/vnd.android.package-archive',
-			'3gp' => 'video/3gpp', 'ai' => 'application/postscript', 
-			'aif' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff', 
-			'aiff' => 'audio/x-aiff', 'asc' => 'text/plain', 
-			'atom' => 'application/atom+xml', 'au' => 'audio/basic', 
-			'avi' => 'video/x-msvideo', 'bcpio' => 'application/x-bcpio', 
-			'bin' => 'application/octet-stream', 'bmp' => 'image/bmp', 
-			'cdf' => 'application/x-netcdf', 'cgm' => 'image/cgm', 
-			'class' => 'application/octet-stream', 
-			'cpio' => 'application/x-cpio', 
-			'cpt' => 'application/mac-compactpro', 
-			'csh' => 'application/x-csh', 'css' => 'text/css', 
-			'dcr' => 'application/x-director', 'dif' => 'video/x-dv', 
-			'dir' => 'application/x-director', 'djv' => 'image/vnd.djvu', 
-			'djvu' => 'image/vnd.djvu', 
-			'dll' => 'application/octet-stream', 
-			'dmg' => 'application/octet-stream', 
-			'dms' => 'application/octet-stream', 
-			'doc' => 'application/msword', 'dtd' => 'application/xml-dtd', 
-			'dv' => 'video/x-dv', 'dvi' => 'application/x-dvi', 
-			'dxr' => 'application/x-director', 
-			'eps' => 'application/postscript', 'etx' => 'text/x-setext', 
-			'exe' => 'application/octet-stream', 
-			'ez' => 'application/andrew-inset', 'flv' => 'video/x-flv', 
-			'gif' => 'image/gif', 'gram' => 'application/srgs', 
-			'grxml' => 'application/srgs+xml', 
-			'gtar' => 'application/x-gtar', 'gz' => 'application/x-gzip', 
-			'hdf' => 'application/x-hdf', 
-			'hqx' => 'application/mac-binhex40', 'htm' => 'text/html', 
-			'html' => 'text/html', 'ice' => 'x-conference/x-cooltalk', 
-			'ico' => 'image/x-icon', 'ics' => 'text/calendar', 
-			'ief' => 'image/ief', 'ifb' => 'text/calendar', 
-			'iges' => 'model/iges', 'igs' => 'model/iges', 
-			'jnlp' => 'application/x-java-jnlp-file', 'jp2' => 'image/jp2', 
-			'jpe' => 'image/jpeg', 'jpeg' => 'image/jpeg', 
-			'jpg' => 'image/jpeg', 'js' => 'application/x-javascript', 
-			'kar' => 'audio/midi', 'latex' => 'application/x-latex', 
-			'lha' => 'application/octet-stream', 
-			'lzh' => 'application/octet-stream', 
-			'm3u' => 'audio/x-mpegurl', 'm4a' => 'audio/mp4a-latm', 
-			'm4p' => 'audio/mp4a-latm', 'm4u' => 'video/vnd.mpegurl', 
-			'm4v' => 'video/x-m4v', 'mac' => 'image/x-macpaint', 
-			'man' => 'application/x-troff-man', 
-			'mathml' => 'application/mathml+xml', 
-			'me' => 'application/x-troff-me', 'mesh' => 'model/mesh', 
-			'mid' => 'audio/midi', 'midi' => 'audio/midi', 
-			'mif' => 'application/vnd.mif', 'mov' => 'video/quicktime', 
-			'movie' => 'video/x-sgi-movie', 'mp2' => 'audio/mpeg', 
-			'mp3' => 'audio/mpeg', 'mp4' => 'video/mp4', 
-			'mpe' => 'video/mpeg', 'mpeg' => 'video/mpeg', 
-			'mpg' => 'video/mpeg', 'mpga' => 'audio/mpeg', 
-			'ms' => 'application/x-troff-ms', 'msh' => 'model/mesh', 
-			'mxu' => 'video/vnd.mpegurl', 'nc' => 'application/x-netcdf', 
-			'oda' => 'application/oda', 'ogg' => 'application/ogg', 
-			'ogv' => 'video/ogv', 'pbm' => 'image/x-portable-bitmap', 
-			'pct' => 'image/pict', 'pdb' => 'chemical/x-pdb', 
-			'pdf' => 'application/pdf', 
-			'pgm' => 'image/x-portable-graymap', 
-			'pgn' => 'application/x-chess-pgn', 'pic' => 'image/pict', 
-			'pict' => 'image/pict', 'png' => 'image/png', 
-			'pnm' => 'image/x-portable-anymap', 
-			'pnt' => 'image/x-macpaint', 'pntg' => 'image/x-macpaint', 
-			'ppm' => 'image/x-portable-pixmap', 
-			'ppt' => 'application/vnd.ms-powerpoint', 
-			'ps' => 'application/postscript', 'qt' => 'video/quicktime', 
-			'qti' => 'image/x-quicktime', 'qtif' => 'image/x-quicktime', 
-			'ra' => 'audio/x-pn-realaudio', 
-			'ram' => 'audio/x-pn-realaudio', 'ras' => 'image/x-cmu-raster', 
-			'rdf' => 'application/rdf+xml', 'rgb' => 'image/x-rgb', 
-			'rm' => 'application/vnd.rn-realmedia', 
-			'roff' => 'application/x-troff', 'rtf' => 'text/rtf', 
-			'rtx' => 'text/richtext', 'sgm' => 'text/sgml', 
-			'sgml' => 'text/sgml', 'sh' => 'application/x-sh', 
-			'shar' => 'application/x-shar', 'silo' => 'model/mesh', 
-			'sit' => 'application/x-stuffit', 
-			'skd' => 'application/x-koan', 'skm' => 'application/x-koan', 
-			'skp' => 'application/x-koan', 'skt' => 'application/x-koan', 
-			'smi' => 'application/smil', 'smil' => 'application/smil', 
-			'snd' => 'audio/basic', 'so' => 'application/octet-stream', 
-			'spl' => 'application/x-futuresplash', 
-			'src' => 'application/x-wais-source', 
-			'sv4cpio' => 'application/x-sv4cpio', 
-			'sv4crc' => 'application/x-sv4crc', 'svg' => 'image/svg+xml', 
-			'swf' => 'application/x-shockwave-flash', 
-			't' => 'application/x-troff', 'tar' => 'application/x-tar', 
-			'tcl' => 'application/x-tcl', 'tex' => 'application/x-tex', 
-			'texi' => 'application/x-texinfo', 
-			'texinfo' => 'application/x-texinfo', 'tif' => 'image/tiff', 
-			'tiff' => 'image/tiff', 'tr' => 'application/x-troff', 
-			'tsv' => 'text/tab-separated-values', 'txt' => 'text/plain', 
-			'ustar' => 'application/x-ustar', 
-			'vcd' => 'application/x-cdlink', 'vrml' => 'model/vrml', 
-			'vxml' => 'application/voicexml+xml', 'wav' => 'audio/x-wav', 
-			'wbmp' => 'image/vnd.wap.wbmp', 
-			'wbxml' => 'application/vnd.wap.wbxml', 'webm' => 'video/webm', 
-			'wml' => 'text/vnd.wap.wml', 
-			'wmlc' => 'application/vnd.wap.wmlc', 
-			'wmls' => 'text/vnd.wap.wmlscript', 
-			'wmlsc' => 'application/vnd.wap.wmlscriptc', 
-			'wmv' => 'video/x-ms-wmv', 'wrl' => 'model/vrml', 
-			'xbm' => 'image/x-xbitmap', 'xht' => 'application/xhtml+xml', 
-			'xhtml' => 'application/xhtml+xml', 
-			'xls' => 'application/vnd.ms-excel', 
-			'xml' => 'application/xml', 'xpm' => 'image/x-xpixmap', 
-			'xsl' => 'application/xml', 'xslt' => 'application/xslt+xml', 
-			'xul' => 'application/vnd.mozilla.xul+xml', 
-			'xwd' => 'image/x-xwindowdump', 'xyz' => 'chemical/x-xyz', 
-			'zip' => 'application/zip' );
+        return base64_encode($result);
+    }
+    public static function replaceNS2($str){
+        $str = str_replace("<ns2:", "<", $str);
+        $str = str_replace("</ns2:", "</", $str);
+        return $str;
+    }
+    public static $mime_types = array (
+            'apk' => 'application/vnd.android.package-archive',
+            '3gp' => 'video/3gpp', 'ai' => 'application/postscript', 
+            'aif' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff', 
+            'aiff' => 'audio/x-aiff', 'asc' => 'text/plain', 
+            'atom' => 'application/atom+xml', 'au' => 'audio/basic', 
+            'avi' => 'video/x-msvideo', 'bcpio' => 'application/x-bcpio', 
+            'bin' => 'application/octet-stream', 'bmp' => 'image/bmp', 
+            'cdf' => 'application/x-netcdf', 'cgm' => 'image/cgm', 
+            'class' => 'application/octet-stream', 
+            'cpio' => 'application/x-cpio', 
+            'cpt' => 'application/mac-compactpro', 
+            'csh' => 'application/x-csh', 'css' => 'text/css', 
+            'dcr' => 'application/x-director', 'dif' => 'video/x-dv', 
+            'dir' => 'application/x-director', 'djv' => 'image/vnd.djvu', 
+            'djvu' => 'image/vnd.djvu', 
+            'dll' => 'application/octet-stream', 
+            'dmg' => 'application/octet-stream', 
+            'dms' => 'application/octet-stream', 
+            'doc' => 'application/msword', 'dtd' => 'application/xml-dtd', 
+            'dv' => 'video/x-dv', 'dvi' => 'application/x-dvi', 
+            'dxr' => 'application/x-director', 
+            'eps' => 'application/postscript', 'etx' => 'text/x-setext', 
+            'exe' => 'application/octet-stream', 
+            'ez' => 'application/andrew-inset', 'flv' => 'video/x-flv', 
+            'gif' => 'image/gif', 'gram' => 'application/srgs', 
+            'grxml' => 'application/srgs+xml', 
+            'gtar' => 'application/x-gtar', 'gz' => 'application/x-gzip', 
+            'hdf' => 'application/x-hdf', 
+            'hqx' => 'application/mac-binhex40', 'htm' => 'text/html', 
+            'html' => 'text/html', 'ice' => 'x-conference/x-cooltalk', 
+            'ico' => 'image/x-icon', 'ics' => 'text/calendar', 
+            'ief' => 'image/ief', 'ifb' => 'text/calendar', 
+            'iges' => 'model/iges', 'igs' => 'model/iges', 
+            'jnlp' => 'application/x-java-jnlp-file', 'jp2' => 'image/jp2', 
+            'jpe' => 'image/jpeg', 'jpeg' => 'image/jpeg', 
+            'jpg' => 'image/jpeg', 'js' => 'application/x-javascript', 
+            'kar' => 'audio/midi', 'latex' => 'application/x-latex', 
+            'lha' => 'application/octet-stream', 
+            'lzh' => 'application/octet-stream', 
+            'm3u' => 'audio/x-mpegurl', 'm4a' => 'audio/mp4a-latm', 
+            'm4p' => 'audio/mp4a-latm', 'm4u' => 'video/vnd.mpegurl', 
+            'm4v' => 'video/x-m4v', 'mac' => 'image/x-macpaint', 
+            'man' => 'application/x-troff-man', 
+            'mathml' => 'application/mathml+xml', 
+            'me' => 'application/x-troff-me', 'mesh' => 'model/mesh', 
+            'mid' => 'audio/midi', 'midi' => 'audio/midi', 
+            'mif' => 'application/vnd.mif', 'mov' => 'video/quicktime', 
+            'movie' => 'video/x-sgi-movie', 'mp2' => 'audio/mpeg', 
+            'mp3' => 'audio/mpeg', 'mp4' => 'video/mp4', 
+            'mpe' => 'video/mpeg', 'mpeg' => 'video/mpeg', 
+            'mpg' => 'video/mpeg', 'mpga' => 'audio/mpeg', 
+            'ms' => 'application/x-troff-ms', 'msh' => 'model/mesh', 
+            'mxu' => 'video/vnd.mpegurl', 'nc' => 'application/x-netcdf', 
+            'oda' => 'application/oda', 'ogg' => 'application/ogg', 
+            'ogv' => 'video/ogv', 'pbm' => 'image/x-portable-bitmap', 
+            'pct' => 'image/pict', 'pdb' => 'chemical/x-pdb', 
+            'pdf' => 'application/pdf', 
+            'pgm' => 'image/x-portable-graymap', 
+            'pgn' => 'application/x-chess-pgn', 'pic' => 'image/pict', 
+            'pict' => 'image/pict', 'png' => 'image/png', 
+            'pnm' => 'image/x-portable-anymap', 
+            'pnt' => 'image/x-macpaint', 'pntg' => 'image/x-macpaint', 
+            'ppm' => 'image/x-portable-pixmap', 
+            'ppt' => 'application/vnd.ms-powerpoint', 
+            'ps' => 'application/postscript', 'qt' => 'video/quicktime', 
+            'qti' => 'image/x-quicktime', 'qtif' => 'image/x-quicktime', 
+            'ra' => 'audio/x-pn-realaudio', 
+            'ram' => 'audio/x-pn-realaudio', 'ras' => 'image/x-cmu-raster', 
+            'rdf' => 'application/rdf+xml', 'rgb' => 'image/x-rgb', 
+            'rm' => 'application/vnd.rn-realmedia', 
+            'roff' => 'application/x-troff', 'rtf' => 'text/rtf', 
+            'rtx' => 'text/richtext', 'sgm' => 'text/sgml', 
+            'sgml' => 'text/sgml', 'sh' => 'application/x-sh', 
+            'shar' => 'application/x-shar', 'silo' => 'model/mesh', 
+            'sit' => 'application/x-stuffit', 
+            'skd' => 'application/x-koan', 'skm' => 'application/x-koan', 
+            'skp' => 'application/x-koan', 'skt' => 'application/x-koan', 
+            'smi' => 'application/smil', 'smil' => 'application/smil', 
+            'snd' => 'audio/basic', 'so' => 'application/octet-stream', 
+            'spl' => 'application/x-futuresplash', 
+            'src' => 'application/x-wais-source', 
+            'sv4cpio' => 'application/x-sv4cpio', 
+            'sv4crc' => 'application/x-sv4crc', 'svg' => 'image/svg+xml', 
+            'swf' => 'application/x-shockwave-flash', 
+            't' => 'application/x-troff', 'tar' => 'application/x-tar', 
+            'tcl' => 'application/x-tcl', 'tex' => 'application/x-tex', 
+            'texi' => 'application/x-texinfo', 
+            'texinfo' => 'application/x-texinfo', 'tif' => 'image/tiff', 
+            'tiff' => 'image/tiff', 'tr' => 'application/x-troff', 
+            'tsv' => 'text/tab-separated-values', 'txt' => 'text/plain', 
+            'ustar' => 'application/x-ustar', 
+            'vcd' => 'application/x-cdlink', 'vrml' => 'model/vrml', 
+            'vxml' => 'application/voicexml+xml', 'wav' => 'audio/x-wav', 
+            'wbmp' => 'image/vnd.wap.wbmp', 
+            'wbxml' => 'application/vnd.wap.wbxml', 'webm' => 'video/webm', 
+            'wml' => 'text/vnd.wap.wml', 
+            'wmlc' => 'application/vnd.wap.wmlc', 
+            'wmls' => 'text/vnd.wap.wmlscript', 
+            'wmlsc' => 'application/vnd.wap.wmlscriptc', 
+            'wmv' => 'video/x-ms-wmv', 'wrl' => 'model/vrml', 
+            'xbm' => 'image/x-xbitmap', 'xht' => 'application/xhtml+xml', 
+            'xhtml' => 'application/xhtml+xml', 
+            'xls' => 'application/vnd.ms-excel', 
+            'xml' => 'application/xml', 'xpm' => 'image/x-xpixmap', 
+            'xsl' => 'application/xml', 'xslt' => 'application/xslt+xml', 
+            'xul' => 'application/vnd.mozilla.xul+xml', 
+            'xwd' => 'image/x-xwindowdump', 'xyz' => 'chemical/x-xyz', 
+            'zip' => 'application/zip' );
 	
-	public static function get_mimetype($ext) {
-		return (isset ( self::$mime_types [$ext] ) ? self::$mime_types [$ext] : 'application/octet-stream');
-	}
-	/**
-	 * 检测是否含有中文
-	 * @param string $subject
-	 * @return boolean
-	 */
-	public static function chk_chinese($str){
-		return preg_match('/[\x80-\xff]./', $str);
-	}
+    public static function get_mimetype($ext) {
+        return (isset ( self::$mime_types [$ext] ) ? self::$mime_types [$ext] : 'application/octet-stream');
+    }
+    /**
+     * 检测是否含有中文
+     * @param string $subject
+     * @return boolean
+     */
+    public static function chk_chinese($str){
+        return preg_match('/[\x80-\xff]./', $str);
+    }
 	
-	/**
-	 * 检测是否GB2312编码
-	 * @param string $str 
-	 * @return boolean false UTF-8编码  TRUE GB2312编码
-	 */
-	public static function  is_gb2312($str)  {  
-	    for($i=0; $i<strlen($str); $i++) {  
-	        $v = ord( $str[$i] );  
-	        if( $v > 127) {  
-	            if( ($v >= 228) && ($v <= 233) ){  
-	                if( ($i+2) >= (strlen($str) - 1)) return true;  // not enough characters  
-	                $v1 = ord( $str[$i+1] );  
-	                $v2 = ord( $str[$i+2] );  
-	                if( ($v1 >= 128) && ($v1 <=191) && ($v2 >=128) && ($v2 <= 191) )  
-	                    return false;   //UTF-8编码  
-	                else  
-	                    return true;    //GB编码  
-	            }  
-	        }  
-	    }  
-	} 
+    /**
+     * 检测是否GB2312编码
+     * @param string $str 
+     * @return boolean false UTF-8编码  TRUE GB2312编码
+     */
+    public static function  is_gb2312($str)  {  
+        for($i=0; $i<strlen($str); $i++) {  
+            $v = ord( $str[$i] );  
+            if( $v > 127) {  
+                if( ($v >= 228) && ($v <= 233) ){  
+                    if( ($i+2) >= (strlen($str) - 1)) return true;  // not enough characters  
+                    $v1 = ord( $str[$i+1] );  
+                    $v2 = ord( $str[$i+2] );  
+                    if( ($v1 >= 128) && ($v1 <=191) && ($v2 >=128) && ($v2 <= 191) )  
+                        return false;   //UTF-8编码  
+                    else  
+                        return true;    //GB编码  
+                }  
+            }  
+        }  
+    } 
 
 
-	/**
-	 * 检测是否GBK编码
-	 * @param string $str 
-	 * @param boolean $gbk
-	 * @return boolean 
-	 */	
-	public static function check_char($str, $gbk = true){ 
-	    for($i=0; $i<strlen($str); $i++) {
-	        $v = ord( $str[$i] );
-	        if( $v > 127){
-	            if( ($v >= 228) && ($v <= 233) ){
-	                 if(($i+2)>= (strlen($str)-1)) return $gbk?true:FALSE;  // not enough characters
-	                 $v1 = ord( $str[$i+1] ); $v2 = ord( $str[$i+2] );
-	                 if($gbk){
-	                      return (($v1 >= 128) && ($v1 <=191) && ($v2 >=128) && ($v2 <= 191))?FALSE:TRUE;//GBK
-	                 }else{
-	                      return (($v1 >= 128) && ($v1 <=191) && ($v2 >=128) && ($v2 <= 191))?TRUE:FALSE;
-	                 }
-	            }
-	        }
-	    }
-	   return $gbk?TRUE:FALSE;
-	}
-	public static function iso8601($time=false) {
-    	if ($time === false) $time = time();
-   		$date = date('Y-m-d\TH:i:s\.Z', $time);
-   		return (substr($date, 0, strlen($date)-2).'Z');
-	}
-	public static function getFileSize($path){
-		$success = FALSE;
-		$isresource = FALSE;
-		if(!is_resource($path)){
-			$isresource = FALSE;
-			$resource = fopen($path,"r");
-		}else{
-			$isresource = TRUE;
-			$resource = $path;
-		}
-		$stat = fstat($resource);
-		$size = $stat["size"];
-		if($size<0){
-			$success = FALSE;
-		}else{
-			$success = TRUE;
-		}
-		if($success)
-			return $size;
-		else if($isresource)
-			throw new Ks3ClientException("please use file path instead resource");
-		if(!((strtoupper(substr(PHP_OS,0,3))=="WIN"))){//如果不是windows系统，尝试使用stat命令
-			$size=trim(`stat -c%s $path`);
-		}else{//如果是windows系统，尝试cmd命令
-			if(!class_exists("COM")){
-				throw new Ks3ClientException("please add 'extension=php_com_dotnet.dll' and set 'com.allow_dcom = true' in php.ini and restart");
-			}
-			 $fs = new COM("Scripting.FileSystemObject");
-   			 $size=$fs->GetFile($path)->Size;
-		}
-		return $size;
-	}
+    /**
+     * 检测是否GBK编码
+     * @param string $str 
+     * @param boolean $gbk
+     * @return boolean 
+     */	
+    public static function check_char($str, $gbk = true){ 
+        for($i=0; $i<strlen($str); $i++) {
+            $v = ord( $str[$i] );
+            if( $v > 127){
+                if( ($v >= 228) && ($v <= 233) ){
+                        if(($i+2)>= (strlen($str)-1)) return $gbk?true:FALSE;  // not enough characters
+                        $v1 = ord( $str[$i+1] ); $v2 = ord( $str[$i+2] );
+                        if($gbk){
+                            return (($v1 >= 128) && ($v1 <=191) && ($v2 >=128) && ($v2 <= 191))?FALSE:TRUE;//GBK
+                        }else{
+                            return (($v1 >= 128) && ($v1 <=191) && ($v2 >=128) && ($v2 <= 191))?TRUE:FALSE;
+                        }
+                }
+            }
+        }
+        return $gbk?TRUE:FALSE;
+    }
+    public static function iso8601($time=false) {
+        if ($time === false) $time = time();
+            $date = date('Y-m-d\TH:i:s\.Z', $time);
+            return (substr($date, 0, strlen($date)-2).'Z');
+    }
+    public static function getFileSize($path){
+        $success = FALSE;
+        $isresource = FALSE;
+        if(!is_resource($path)){
+            $isresource = FALSE;
+            $resource = fopen($path,"r");
+        }else{
+            $isresource = TRUE;
+            $resource = $path;
+        }
+        $stat = fstat($resource);
+        $size = $stat["size"];
+        if($size<0){
+            $success = FALSE;
+        }else{
+            $success = TRUE;
+        }
+        if($success)
+            return $size;
+        else if($isresource)
+            throw new Ks3ClientException("please use file path instead resource");
+        if(!((strtoupper(substr(PHP_OS,0,3))=="WIN"))){//如果不是windows系统，尝试使用stat命令
+            $size=trim(`stat -c%s $path`);
+        }else{//如果是windows系统，尝试cmd命令
+            if(!class_exists("COM")){
+                throw new Ks3ClientException("please add 'extension=php_com_dotnet.dll' and set 'com.allow_dcom = true' in php.ini and restart");
+            }
+                $fs = new COM("Scripting.FileSystemObject");
+                $size=$fs->GetFile($path)->Size;
+        }
+        return $size;
+    }
 }
 ?>
\ No newline at end of file

Spacing +46 added lines, -46 removed lines

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

Braces +28 added lines, -15 removed lines

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

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

Indentation +259 added lines, -259 removed lines

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

Spacing +7 added lines, -7 removed lines

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

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

Indentation +289 added lines, -289 removed lines

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

Spacing +106 added lines, -106 removed lines

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

Braces +17 added lines, -16 removed lines

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

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

Indentation +999 added lines, -999 removed lines

@@ -13,958 +13,958 @@ 
  */
 class RequestCore
 {
-	/**
-	 * The URL being requested.
-	 */
-	public $request_url;
-
-	/**
-	 * The headers being sent in the request.
-	 */
-	public $request_headers;
-
-	/**
-	 * The body being sent in the request.
-	 */
-	public $request_body;
-
-	/**
-	 * The response returned by the request.
-	 */
-	public $response;
-
-	/**
-	 * The headers returned by the request.
-	 */
-	public $response_headers;
-
-	/**
-	 * The body returned by the request.
-	 */
-	public $response_body;
-
-	/**
-	 * The HTTP status code returned by the request.
-	 */
-	public $response_code;
-
-	/**
-	 * Additional response data.
-	 */
-	public $response_info;
-
-	/**
-	 * The handle for the cURL object.
-	 */
-	public $curl_handle;
-
-	/**
-	 * The method by which the request is being made.
-	 */
-	public $method;
-
-	/**
-	 * Stores the proxy settings to use for the request.
-	 */
-	public $proxy = null;
-
-	/**
-	 * The username to use for the request.
-	 */
-	public $username = null;
-
-	/**
-	 * The password to use for the request.
-	 */
-	public $password = null;
-
-	/**
-	 * Custom CURLOPT settings.
-	 */
-	public $curlopts = null;
-
-	/**
-	 * The state of debug mode.
-	 */
-	public $debug_mode = false;
-
-	/**
-	 * The default class to use for HTTP Requests (defaults to <RequestCore>).
-	 */
-	public $request_class = 'RequestCore';
-
-	/**
-	 * The default class to use for HTTP Responses (defaults to <ResponseCore>).
-	 */
-	public $response_class = 'ResponseCore';
-
-	/**
-	 * Default useragent string to use.
-	 */
-	public $useragent = 'RequestCore/1.4.3';
-
-	/**
-	 * File to read from while streaming up.
-	 */
-	public $read_file = null;
-
-	/**
-	 * The resource to read from while streaming up.
-	 */
-	public $read_stream = null;
-
-	/**
-	 * The size of the stream to read from.
-	 */
-	public $read_stream_size = null;
-
-	/**
-	 * The length already read from the stream.
-	 */
-	public $read_stream_read = 0;
-
-	/**
-	 * File to write to while streaming down.
-	 */
-	public $write_file = null;
-
-	/**
-	 * The resource to write to while streaming down.
-	 */
-	public $write_stream = null;
-
-	/**
-	 * Stores the intended starting seek position.
-	 */
-	public $seek_position = null;
-
-	/**
-	 * The location of the cacert.pem file to use.
-	 */
-	public $cacert_location = false;
-
-	/**
-	 * The state of SSL certificate verification.
-	 */
-	public $ssl_verification = true;
-
-	/**
-	 * The user-defined callback function to call when a stream is read from.
-	 */
-	public $registered_streaming_read_callback = null;
-
-	/**
-	 * The user-defined callback function to call when a stream is written to.
-	 */
-	public $registered_streaming_write_callback = null;
-
-	/*%******************************************************************************************%*/
-	// CONSTANTS
-
-	/**
-	 * GET HTTP Method
-	 */
-	const HTTP_GET = 'GET';
-
-	/**
-	 * POST HTTP Method
-	 */
-	const HTTP_POST = 'POST';
-
-	/**
-	 * PUT HTTP Method
-	 */
-	const HTTP_PUT = 'PUT';
-
-	/**
-	 * DELETE HTTP Method
-	 */
-	const HTTP_DELETE = 'DELETE';
-
-	/**
-	 * HEAD HTTP Method
-	 */
-	const HTTP_HEAD = 'HEAD';
-
-
-	/*%******************************************************************************************%*/
-	// CONSTRUCTOR/DESTRUCTOR
-
-	/**
-	 * Constructs a new instance of this class.
-	 *
-	 * @param string $url (Optional) The URL to request or service endpoint to query.
-	 * @param string $proxy (Optional) The faux-url to use for proxy settings. Takes the following format: `proxy://user:pass@hostname:port`
-	 * @param array $helpers (Optional) An associative array of classnames to use for request, and response functionality. Gets passed in automatically by the calling class.
-	 * @return $this A reference to the current instance.
-	 */
-	public function __construct($url = null, $proxy = null, $helpers = null)
-	{
-		// Set some default values.
-		$this->request_url = $url;
-		$this->method = self::HTTP_GET;
-		$this->request_headers = array();
-		$this->request_body = '';
-
-		// Set a new Request class if one was set.
-		if (isset($helpers['request']) && !empty($helpers['request']))
-		{
-			$this->request_class = $helpers['request'];
-		}
-
-		// Set a new Request class if one was set.
-		if (isset($helpers['response']) && !empty($helpers['response']))
-		{
-			$this->response_class = $helpers['response'];
-		}
-
-		if ($proxy)
-		{
-			$this->set_proxy($proxy);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Destructs the instance. Closes opened file handles.
-	 *
-	 * @return $this A reference to the current instance.
-	 */
-	public function __destruct()
-	{
-		if (isset($this->read_file) && isset($this->read_stream))
-		{
-			fclose($this->read_stream);
-		}
-
-		if (isset($this->write_file) && isset($this->write_stream))
-		{
-			fclose($this->write_stream);
-		}
-
-		return $this;
-	}
-
-
-	/*%******************************************************************************************%*/
-	// REQUEST METHODS
-
-	/**
-	 * Sets the credentials to use for authentication.
-	 *
-	 * @param string $user (Required) The username to authenticate with.
-	 * @param string $pass (Required) The password to authenticate with.
-	 * @return $this A reference to the current instance.
-	 */
-	public function set_credentials($user, $pass)
-	{
-		$this->username = $user;
-		$this->password = $pass;
-		return $this;
-	}
-
-	/**
-	 * Adds a custom HTTP header to the cURL request.
-	 *
-	 * @param string $key (Required) The custom HTTP header to set.
-	 * @param mixed $value (Required) The value to assign to the custom HTTP header.
-	 * @return $this A reference to the current instance.
-	 */
-	public function add_header($key, $value)
-	{
-		$this->request_headers[$key] = $value;
-		return $this;
-	}
-
-	/**
-	 * Removes an HTTP header from the cURL request.
-	 *
-	 * @param string $key (Required) The custom HTTP header to set.
-	 * @return $this A reference to the current instance.
-	 */
-	public function remove_header($key)
-	{
-		if (isset($this->request_headers[$key]))
-		{
-			unset($this->request_headers[$key]);
-		}
-		return $this;
-	}
-
-	/**
-	 * Set the method type for the request.
-	 *
-	 * @param string $method (Required) One of the following constants: <HTTP_GET>, <HTTP_POST>, <HTTP_PUT>, <HTTP_HEAD>, <HTTP_DELETE>.
-	 * @return $this A reference to the current instance.
-	 */
-	public function set_method($method)
-	{
-		$this->method = strtoupper($method);
-		return $this;
-	}
-
-	/**
-	 * Sets a custom useragent string for the class.
-	 *
-	 * @param string $ua (Required) The useragent string to use.
-	 * @return $this A reference to the current instance.
-	 */
-	public function set_useragent($ua)
-	{
-		$this->useragent = $ua;
-		return $this;
-	}
-
-	/**
-	 * Set the body to send in the request.
-	 *
-	 * @param string $body (Required) The textual content to send along in the body of the request.
-	 * @return $this A reference to the current instance.
-	 */
-	public function set_body($body)
-	{
-		$this->request_body = $body;
-		return $this;
-	}
-
-	/**
-	 * Set the URL to make the request to.
-	 *
-	 * @param string $url (Required) The URL to make the request to.
-	 * @return $this A reference to the current instance.
-	 */
-	public function set_request_url($url)
-	{
-		$this->request_url = $url;
-		return $this;
-	}
-
-	/**
-	 * Set additional CURLOPT settings. These will merge with the default settings, and override if
-	 * there is a duplicate.
-	 *
-	 * @param array $curlopts (Optional) A set of key-value pairs that set `CURLOPT` options. These will merge with the existing CURLOPTs, and ones passed here will override the defaults. Keys should be the `CURLOPT_*` constants, not strings.
-	 * @return $this A reference to the current instance.
-	 */
-	public function set_curlopts($curlopts)
-	{
-		$this->curlopts = $curlopts;
-		return $this;
-	}
-
-	/**
-	 * Sets the length in bytes to read from the stream while streaming up.
-	 *
-	 * @param integer $size (Required) The length in bytes to read from the stream.
-	 * @return $this A reference to the current instance.
-	 */
-	public function set_read_stream_size($size)
-	{
-		$this->read_stream_size = $size;
-
-		return $this;
-	}
-
-	/**
-	 * Sets the resource to read from while streaming up. Reads the stream from its current position until
-	 * EOF or `$size` bytes have been read. If `$size` is not given it will be determined by <php:fstat()> and
-	 * <php:ftell()>.
-	 *
-	 * @param resource $resource (Required) The readable resource to read from.
-	 * @param integer $size (Optional) The size of the stream to read.
-	 * @return $this A reference to the current instance.
-	 */
-	public function set_read_stream($resource, $size = null)
-	{
-		if (!isset($size) || $size < 0)
-		{
-			$stats = fstat($resource);
-
-			if ($stats && $stats['size'] >= 0)
-			{
-				$position = ftell($resource);
-
-				if ($position !== false && $position >= 0)
-				{
-					$size = $stats['size'] - $position;
-				}
-			}
-		}
-
-		$this->read_stream = $resource;
-
-		return $this->set_read_stream_size($size);
-	}
-
-	/**
-	 * Sets the file to read from while streaming up.
-	 *
-	 * @param string $location (Required) The readable location to read from.
-	 * @return $this A reference to the current instance.
-	 */
-	public function set_read_file($location)
-	{
-		$this->read_file = $location;
-		$read_file_handle = fopen($location, 'r');
-
-		return $this->set_read_stream($read_file_handle);
-	}
-
-	/**
-	 * Sets the resource to write to while streaming down.
-	 *
-	 * @param resource $resource (Required) The writeable resource to write to.
-	 * @return $this A reference to the current instance.
-	 */
-	public function set_write_stream($resource)
-	{
-		$this->write_stream = $resource;
-
-		return $this;
-	}
-
-	/**
-	 * Sets the file to write to while streaming down.
-	 *
-	 * @param string $location (Required) The writeable location to write to.
-	 * @return $this A reference to the current instance.
-	 */
-	public function set_write_file($location)
-	{
-		$this->write_file = $location;
-		$write_file_handle = fopen($location, 'w');
-
-		return $this->set_write_stream($write_file_handle);
-	}
-
-	/**
-	 * Set the proxy to use for making requests.
-	 *
-	 * @param string $proxy (Required) The faux-url to use for proxy settings. Takes the following format: `proxy://user:pass@hostname:port`
-	 * @return $this A reference to the current instance.
-	 */
-	public function set_proxy($proxy)
-	{
-		$proxy = parse_url($proxy);
-		$proxy['user'] = isset($proxy['user']) ? $proxy['user'] : null;
-		$proxy['pass'] = isset($proxy['pass']) ? $proxy['pass'] : null;
-		$proxy['port'] = isset($proxy['port']) ? $proxy['port'] : null;
-		$this->proxy = $proxy;
-		return $this;
-	}
-
-	/**
-	 * Set the intended starting seek position.
-	 *
-	 * @param integer $position (Required) The byte-position of the stream to begin reading from.
-	 * @return $this A reference to the current instance.
-	 */
-	public function set_seek_position($position)
-	{
-		$this->seek_position = isset($position) ? (integer) $position : null;
-
-		return $this;
-	}
-
-	/**
-	 * Register a callback function to execute whenever a data stream is read from using
-	 * <CFRequest::streaming_read_callback()>.
-	 *
-	 * The user-defined callback function should accept three arguments:
-	 *
-	 * <ul>
-	 * 	<li><code>$curl_handle</code> - <code>resource</code> - Required - The cURL handle resource that represents the in-progress transfer.</li>
-	 * 	<li><code>$file_handle</code> - <code>resource</code> - Required - The file handle resource that represents the file on the local file system.</li>
-	 * 	<li><code>$length</code> - <code>integer</code> - Required - The length in kilobytes of the data chunk that was transferred.</li>
-	 * </ul>
-	 *
-	 * @param string|array|function $callback (Required) The callback function is called by <php:call_user_func()>, so you can pass the following values: <ul>
-	 * 	<li>The name of a global function to execute, passed as a string.</li>
-	 * 	<li>A method to execute, passed as <code>array('ClassName', 'MethodName')</code>.</li>
-	 * 	<li>An anonymous function (PHP 5.3+).</li></ul>
-	 * @return $this A reference to the current instance.
-	 */
-	public function register_streaming_read_callback($callback)
-	{
-		$this->registered_streaming_read_callback = $callback;
-
-		return $this;
-	}
-
-	/**
-	 * Register a callback function to execute whenever a data stream is written to using
-	 * <CFRequest::streaming_write_callback()>.
-	 *
-	 * The user-defined callback function should accept two arguments:
-	 *
-	 * <ul>
-	 * 	<li><code>$curl_handle</code> - <code>resource</code> - Required - The cURL handle resource that represents the in-progress transfer.</li>
-	 * 	<li><code>$length</code> - <code>integer</code> - Required - The length in kilobytes of the data chunk that was transferred.</li>
-	 * </ul>
-	 *
-	 * @param string|array|function $callback (Required) The callback function is called by <php:call_user_func()>, so you can pass the following values: <ul>
-	 * 	<li>The name of a global function to execute, passed as a string.</li>
-	 * 	<li>A method to execute, passed as <code>array('ClassName', 'MethodName')</code>.</li>
-	 * 	<li>An anonymous function (PHP 5.3+).</li></ul>
-	 * @return $this A reference to the current instance.
-	 */
-	public function register_streaming_write_callback($callback)
-	{
-		$this->registered_streaming_write_callback = $callback;
-
-		return $this;
-	}
-
-
-	/*%******************************************************************************************%*/
-	// PREPARE, SEND, AND PROCESS REQUEST
-
-	/**
-	 * A callback function that is invoked by cURL for streaming up.
-	 *
-	 * @param resource $curl_handle (Required) The cURL handle for the request.
-	 * @param resource $file_handle (Required) The open file handle resource.
-	 * @param integer $length (Required) The maximum number of bytes to read.
-	 * @return binary Binary data from a stream.
-	 */
-	public function streaming_read_callback($curl_handle, $file_handle, $length)
-	{
-		// 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);
-		}
-		// Once we've sent as much as we're supposed to send...
-		if ($this->read_stream_read >= $this->read_stream_size)
-		{
-			// Send EOF
-			return '';
-		}
-
-		// If we're at the beginning of an upload and need to seek...
-		if ($this->read_stream_read == 0 && isset($this->seek_position) && $this->seek_position !== ftell($this->read_stream))
-		{
-			if (fseek($this->read_stream, $this->seek_position) !== 0)
-			{
-				throw new RequestCore_Exception('The stream does not support seeking and is either not at the requested position or the position is unknown.');
-			}
-		}
-
-		$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;
-
-		return $out;
-	}
-
-	/**
-	 * A callback function that is invoked by cURL for streaming down.
-	 *
-	 * @param resource $curl_handle (Required) The cURL handle for the request.
-	 * @param binary $data (Required) The data to write.
-	 * @return integer The number of bytes written.
-	 */
-	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);
-		}
-		$length = strlen($data);
-		$written_total = 0;
-		$written_last = 0;
-
-		while ($written_total < $length)
-		{
-			$written_last = fwrite($this->write_stream, substr($data, $written_total));
-
-			if ($written_last === false)
-			{
-				return $written_total;
-			}
-
-			$written_total += $written_last;
-		}
-
-		return $written_total;
-	}
-
-	/**
-	 * Prepares and adds the details of the cURL request. This can be passed along to a <php:curl_multi_exec()>
-	 * function.
-	 *
-	 * @return resource The handle for the cURL object.
-	 */
-	public function prep_request()
-	{
-		$curl_handle = curl_init();
-
-		// Set default options.
-		curl_setopt($curl_handle, CURLOPT_URL, $this->request_url);
-		curl_setopt($curl_handle, CURLOPT_FILETIME, true);
-		curl_setopt($curl_handle, CURLOPT_FRESH_CONNECT, false);
-		//为了兼容PHP 5.6,PHP 5.6把 CURLOPT_CLOSEPOLICY 这个变量删除了
-		//curl_setopt($curl_handle, CURLOPT_CLOSEPOLICY, CURLCLOSEPOLICY_LEAST_RECENTLY_USED);
-		curl_setopt($curl_handle, CURLOPT_MAXREDIRS, 5);
-		curl_setopt($curl_handle, CURLOPT_HEADER, true);
-		curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($curl_handle, CURLOPT_TIMEOUT, 5184000);
-		curl_setopt($curl_handle, CURLOPT_CONNECTTIMEOUT, 120);
-		curl_setopt($curl_handle, CURLOPT_NOSIGNAL, true);
-		curl_setopt($curl_handle, CURLOPT_REFERER, $this->request_url);
-		curl_setopt($curl_handle, CURLOPT_USERAGENT, $this->useragent);
-		curl_setopt($curl_handle, CURLOPT_READFUNCTION, array($this, 'streaming_read_callback'));
-
-		// Verification of the SSL cert
-		if ($this->ssl_verification)
-		{
-			curl_setopt($curl_handle, CURLOPT_SSL_VERIFYPEER, true);
-			curl_setopt($curl_handle, CURLOPT_SSL_VERIFYHOST, 2);
-		}
-		else
-		{
-			curl_setopt($curl_handle, CURLOPT_SSL_VERIFYPEER, false);
-			curl_setopt($curl_handle, CURLOPT_SSL_VERIFYHOST, false);
-		}
-
-		// chmod the file as 0755
-		if ($this->cacert_location === true)
-		{
-			curl_setopt($curl_handle, CURLOPT_CAINFO, dirname(__FILE__) . '/cacert.pem');
-		}
-		elseif (is_string($this->cacert_location))
-		{
-			curl_setopt($curl_handle, CURLOPT_CAINFO, $this->cacert_location);
-		}
-
-		// Debug mode
-		if ($this->debug_mode)
-		{
-			curl_setopt($curl_handle, CURLOPT_VERBOSE, true);
-		}
-
-		// Handle open_basedir & safe mode
-		if (!ini_get('safe_mode') && !ini_get('open_basedir'))
-		{
-			curl_setopt($curl_handle, CURLOPT_FOLLOWLOCATION, FALSE);
-		}
-
-		// Enable a proxy connection if requested.
-		if ($this->proxy)
-		{
-			curl_setopt($curl_handle, CURLOPT_HTTPPROXYTUNNEL, true);
-
-			$host = $this->proxy['host'];
-			$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']);
-			}
-		}
-
-		// Set credentials for HTTP Basic/Digest Authentication.
-		if ($this->username && $this->password)
-		{
-			curl_setopt($curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-			curl_setopt($curl_handle, CURLOPT_USERPWD, $this->username . ':' . $this->password);
-		}
-
-		// Handle the encoding if we can.
-		if (extension_loaded('zlib'))
-		{
-			curl_setopt($curl_handle, CURLOPT_ENCODING, '');
-		}
-
-		// Process custom headers
-		if (isset($this->request_headers) && count($this->request_headers))
-		{
-			$temp_headers = array();
-
-			foreach ($this->request_headers as $k => $v)
-			{
-				$temp_headers[] = $k . ': ' . $v;
-			}
-
-			curl_setopt($curl_handle, CURLOPT_HTTPHEADER, $temp_headers);
-		}
-
-		switch ($this->method)
-		{
-			case self::HTTP_PUT:
-				//unset($this->read_stream);
-				curl_setopt($curl_handle, CURLOPT_CUSTOMREQUEST, 'PUT');
-				if (isset($this->read_stream))
-				{
-					if (!isset($this->read_stream_size) || $this->read_stream_size < 0)
-					{
-						throw new RequestCore_Exception('The stream size for the streaming upload cannot be determined.');
-					}
-
-					curl_setopt($curl_handle, CURLOPT_INFILESIZE, $this->read_stream_size);
-					curl_setopt($curl_handle, CURLOPT_UPLOAD, true);
-				}
-				else
-				{
-					curl_setopt($curl_handle, CURLOPT_POSTFIELDS, $this->request_body);
-				}
-				break;
-
-			case self::HTTP_POST:
-				curl_setopt($curl_handle, CURLOPT_POST, true);
-				curl_setopt($curl_handle, CURLOPT_POSTFIELDS, $this->request_body);
-				break;
-
-			case self::HTTP_HEAD:
-				curl_setopt($curl_handle, CURLOPT_CUSTOMREQUEST, self::HTTP_HEAD);
-				curl_setopt($curl_handle, CURLOPT_NOBODY, 1);
-				break;
-
-			default: // Assumed GET
-				curl_setopt($curl_handle, CURLOPT_CUSTOMREQUEST, $this->method);
-				if (isset($this->write_stream))
-				{
-					curl_setopt($curl_handle, CURLOPT_WRITEFUNCTION, array($this, 'streaming_write_callback'));
-					curl_setopt($curl_handle, CURLOPT_HEADER, false);
-				}
-				else
-				{
-					curl_setopt($curl_handle, CURLOPT_POSTFIELDS, $this->request_body);
-				}
-				break;
-		}
-
-		// Merge in the CURLOPTs
-		if (isset($this->curlopts) && sizeof($this->curlopts) > 0)
-		{
-			foreach ($this->curlopts as $k => $v)
-			{
-				curl_setopt($curl_handle, $k, $v);
-			}
-		}
-
-		return $curl_handle;
-	}
-
-	/**
-	 * Take the post-processed cURL data and break it down into useful header/body/info chunks. Uses the
-	 * data stored in the `curl_handle` and `response` properties unless replacement data is passed in via
-	 * parameters.
-	 *
-	 * @param resource $curl_handle (Optional) The reference to the already executed cURL request.
-	 * @param string $response (Optional) The actual response content itself that needs to be parsed.
-	 * @return ResponseCore A <ResponseCore> object containing a parsed HTTP response.
-	 */
-	public function process_response($curl_handle = null, $response = null)
-	{
-		// Accept a custom one if it's passed.
-		if ($curl_handle && $response)
-		{
-			$this->curl_handle = $curl_handle;
-			$this->response = $response;
-		}
-
-		// As long as this came back as a valid resource...
-		if (is_resource($this->curl_handle))
-		{
-			// Determine what's what.
-			$header_size = curl_getinfo($this->curl_handle, CURLINFO_HEADER_SIZE);
-			$this->response_headers = substr($this->response, 0, $header_size);
-			$this->response_body = substr($this->response, $header_size);
-			$this->response_code = curl_getinfo($this->curl_handle, CURLINFO_HTTP_CODE);
-			$this->response_info = curl_getinfo($this->curl_handle);
-
-			// Parse out the headers
-			$this->response_headers = explode("\r\n\r\n", trim($this->response_headers));
-			$this->response_headers = array_pop($this->response_headers);
-			$this->response_headers = explode("\r\n", $this->response_headers);
-			array_shift($this->response_headers);
-
-			// Loop through and split up the headers.
-			$header_assoc = array();
-			foreach ($this->response_headers as $header)
-			{
-				$kv = explode(': ', $header);
-				$header_assoc[strtolower($kv[0])] = isset($kv[1])?$kv[1]:'';
-			}
-
-			// Reset the headers to the appropriate property.
-			$this->response_headers = $header_assoc;
-			$this->response_headers['_info'] = $this->response_info;
-			$this->response_headers['_info']['method'] = $this->method;
-
-			if ($curl_handle && $response)
-			{
-				return new $this->response_class($this->response_headers, $this->response_body, $this->response_code, $this->curl_handle);
-			}
-		}
-
-		// Return false
-		return false;
-	}
-
-	/**
-	 * Sends the request, calling necessary utility functions to update built-in properties.
-	 *
-	 * @param boolean $parse (Optional) Whether to parse the response with ResponseCore or not.
-	 * @return string The resulting unparsed data from the request.
-	 */
-	public function send_request($parse = false)
-	{
-		set_time_limit(0);
-
-		$curl_handle = $this->prep_request();
-		$this->response = curl_exec($curl_handle);
-
-		if ($this->response === false)
-		{
-			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);
-
-		curl_close($curl_handle);
-
-		if ($parse)
-		{
-			return $parsed_response;
-		}
-
-		return $this->response;
-	}
-
-	/**
-	 * Sends the request using <php:curl_multi_exec()>, enabling parallel requests. Uses the "rolling" method.
-	 *
-	 * @param array $handles (Required) An indexed array of cURL handles to process simultaneously.
-	 * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
-	 * 	<li><code>callback</code> - <code>string|array</code> - Optional - The string name of a function to pass the response data to. If this is a method, pass an array where the <code>[0]</code> index is the class and the <code>[1]</code> index is the method name.</li>
-	 * 	<li><code>limit</code> - <code>integer</code> - Optional - The number of simultaneous requests to make. This can be useful for scaling around slow server responses. Defaults to trusting cURLs judgement as to how many to use.</li></ul>
-	 * @return array Post-processed cURL responses.
-	 */
-	public function send_multi_request($handles, $opt = null)
-	{
-		set_time_limit(0);
-
-		// Skip everything if there are no handles to process.
-		if (count($handles) === 0) return array();
-
-		if (!$opt) $opt = array();
-
-		// Initialize any missing options
-		$limit = isset($opt['limit']) ? $opt['limit'] : -1;
-
-		// Initialize
-		$handle_list = $handles;
-		$http = new $this->request_class();
-		$multi_handle = curl_multi_init();
-		$handles_post = array();
-		$added = count($handles);
-		$last_handle = null;
-		$count = 0;
-		$i = 0;
-
-		// 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;
-			curl_multi_add_handle($multi_handle, array_shift($handles));
-			$i++;
-		}
-
-		do
-		{
-			$active = false;
-
-			// Start executing and wait for a response.
-			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;
-			}
-
-			// Figure out which requests finished.
-			$to_process = array();
-
-			while ($done = curl_multi_info_read($multi_handle))
-			{
-				// 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'] . ')');
-				}
-
-				// 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']]))
-				{
-					$to_process[(int) $done['handle']] = $done;
-				}
-			}
-
-			// Actually deal with the request
-			foreach ($to_process as $pkey => $done)
-			{
-				$response = $http->process_response($done['handle'], curl_multi_getcontent($done['handle']));
-				$key = array_search($done['handle'], $handle_list, true);
-				$handles_post[$key] = $response;
-
-				if (count($handles) > 0)
-				{
-					curl_multi_add_handle($multi_handle, array_shift($handles));
-				}
-
-				curl_multi_remove_handle($multi_handle, $done['handle']);
-				curl_close($done['handle']);
-			}
-		}
-		while ($active || count($handles_post) < $added);
-
-		curl_multi_close($multi_handle);
-
-		ksort($handles_post, SORT_NUMERIC);
-		return $handles_post;
-	}
-
-
-	/*%******************************************************************************************%*/
-	// RESPONSE METHODS
-
-	/**
-	 * Get the HTTP response headers from the request.
-	 *
-	 * @param string $header (Optional) A specific header value to return. Defaults to all headers.
-	 * @return string|array All or selected header values.
-	 */
-	public function get_response_header($header = null)
-	{
-		if ($header)
-		{
-			return $this->response_headers[strtolower($header)];
-		}
-		return $this->response_headers;
-	}
-
-	/**
-	 * Get the HTTP response body from the request.
-	 *
-	 * @return string The response body.
-	 */
-	public function get_response_body()
-	{
-		return $this->response_body;
-	}
-
-	/**
-	 * Get the HTTP response code from the request.
-	 *
-	 * @return string The HTTP response code.
-	 */
-	public function get_response_code()
-	{
-		return $this->response_code;
-	}
+    /**
+     * The URL being requested.
+     */
+    public $request_url;
+
+    /**
+     * The headers being sent in the request.
+     */
+    public $request_headers;
+
+    /**
+     * The body being sent in the request.
+     */
+    public $request_body;
+
+    /**
+     * The response returned by the request.
+     */
+    public $response;
+
+    /**
+     * The headers returned by the request.
+     */
+    public $response_headers;
+
+    /**
+     * The body returned by the request.
+     */
+    public $response_body;
+
+    /**
+     * The HTTP status code returned by the request.
+     */
+    public $response_code;
+
+    /**
+     * Additional response data.
+     */
+    public $response_info;
+
+    /**
+     * The handle for the cURL object.
+     */
+    public $curl_handle;
+
+    /**
+     * The method by which the request is being made.
+     */
+    public $method;
+
+    /**
+     * Stores the proxy settings to use for the request.
+     */
+    public $proxy = null;
+
+    /**
+     * The username to use for the request.
+     */
+    public $username = null;
+
+    /**
+     * The password to use for the request.
+     */
+    public $password = null;
+
+    /**
+     * Custom CURLOPT settings.
+     */
+    public $curlopts = null;
+
+    /**
+     * The state of debug mode.
+     */
+    public $debug_mode = false;
+
+    /**
+     * The default class to use for HTTP Requests (defaults to <RequestCore>).
+     */
+    public $request_class = 'RequestCore';
+
+    /**
+     * The default class to use for HTTP Responses (defaults to <ResponseCore>).
+     */
+    public $response_class = 'ResponseCore';
+
+    /**
+     * Default useragent string to use.
+     */
+    public $useragent = 'RequestCore/1.4.3';
+
+    /**
+     * File to read from while streaming up.
+     */
+    public $read_file = null;
+
+    /**
+     * The resource to read from while streaming up.
+     */
+    public $read_stream = null;
+
+    /**
+     * The size of the stream to read from.
+     */
+    public $read_stream_size = null;
+
+    /**
+     * The length already read from the stream.
+     */
+    public $read_stream_read = 0;
+
+    /**
+     * File to write to while streaming down.
+     */
+    public $write_file = null;
+
+    /**
+     * The resource to write to while streaming down.
+     */
+    public $write_stream = null;
+
+    /**
+     * Stores the intended starting seek position.
+     */
+    public $seek_position = null;
+
+    /**
+     * The location of the cacert.pem file to use.
+     */
+    public $cacert_location = false;
+
+    /**
+     * The state of SSL certificate verification.
+     */
+    public $ssl_verification = true;
+
+    /**
+     * The user-defined callback function to call when a stream is read from.
+     */
+    public $registered_streaming_read_callback = null;
+
+    /**
+     * The user-defined callback function to call when a stream is written to.
+     */
+    public $registered_streaming_write_callback = null;
+
+    /*%******************************************************************************************%*/
+    // CONSTANTS
+
+    /**
+     * GET HTTP Method
+     */
+    const HTTP_GET = 'GET';
+
+    /**
+     * POST HTTP Method
+     */
+    const HTTP_POST = 'POST';
+
+    /**
+     * PUT HTTP Method
+     */
+    const HTTP_PUT = 'PUT';
+
+    /**
+     * DELETE HTTP Method
+     */
+    const HTTP_DELETE = 'DELETE';
+
+    /**
+     * HEAD HTTP Method
+     */
+    const HTTP_HEAD = 'HEAD';
+
+
+    /*%******************************************************************************************%*/
+    // CONSTRUCTOR/DESTRUCTOR
+
+    /**
+     * Constructs a new instance of this class.
+     *
+     * @param string $url (Optional) The URL to request or service endpoint to query.
+     * @param string $proxy (Optional) The faux-url to use for proxy settings. Takes the following format: `proxy://user:pass@hostname:port`
+     * @param array $helpers (Optional) An associative array of classnames to use for request, and response functionality. Gets passed in automatically by the calling class.
+     * @return $this A reference to the current instance.
+     */
+    public function __construct($url = null, $proxy = null, $helpers = null)
+    {
+        // Set some default values.
+        $this->request_url = $url;
+        $this->method = self::HTTP_GET;
+        $this->request_headers = array();
+        $this->request_body = '';
+
+        // Set a new Request class if one was set.
+        if (isset($helpers['request']) && !empty($helpers['request']))
+        {
+            $this->request_class = $helpers['request'];
+        }
+
+        // Set a new Request class if one was set.
+        if (isset($helpers['response']) && !empty($helpers['response']))
+        {
+            $this->response_class = $helpers['response'];
+        }
+
+        if ($proxy)
+        {
+            $this->set_proxy($proxy);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Destructs the instance. Closes opened file handles.
+     *
+     * @return $this A reference to the current instance.
+     */
+    public function __destruct()
+    {
+        if (isset($this->read_file) && isset($this->read_stream))
+        {
+            fclose($this->read_stream);
+        }
+
+        if (isset($this->write_file) && isset($this->write_stream))
+        {
+            fclose($this->write_stream);
+        }
+
+        return $this;
+    }
+
+
+    /*%******************************************************************************************%*/
+    // REQUEST METHODS
+
+    /**
+     * Sets the credentials to use for authentication.
+     *
+     * @param string $user (Required) The username to authenticate with.
+     * @param string $pass (Required) The password to authenticate with.
+     * @return $this A reference to the current instance.
+     */
+    public function set_credentials($user, $pass)
+    {
+        $this->username = $user;
+        $this->password = $pass;
+        return $this;
+    }
+
+    /**
+     * Adds a custom HTTP header to the cURL request.
+     *
+     * @param string $key (Required) The custom HTTP header to set.
+     * @param mixed $value (Required) The value to assign to the custom HTTP header.
+     * @return $this A reference to the current instance.
+     */
+    public function add_header($key, $value)
+    {
+        $this->request_headers[$key] = $value;
+        return $this;
+    }
+
+    /**
+     * Removes an HTTP header from the cURL request.
+     *
+     * @param string $key (Required) The custom HTTP header to set.
+     * @return $this A reference to the current instance.
+     */
+    public function remove_header($key)
+    {
+        if (isset($this->request_headers[$key]))
+        {
+            unset($this->request_headers[$key]);
+        }
+        return $this;
+    }
+
+    /**
+     * Set the method type for the request.
+     *
+     * @param string $method (Required) One of the following constants: <HTTP_GET>, <HTTP_POST>, <HTTP_PUT>, <HTTP_HEAD>, <HTTP_DELETE>.
+     * @return $this A reference to the current instance.
+     */
+    public function set_method($method)
+    {
+        $this->method = strtoupper($method);
+        return $this;
+    }
+
+    /**
+     * Sets a custom useragent string for the class.
+     *
+     * @param string $ua (Required) The useragent string to use.
+     * @return $this A reference to the current instance.
+     */
+    public function set_useragent($ua)
+    {
+        $this->useragent = $ua;
+        return $this;
+    }
+
+    /**
+     * Set the body to send in the request.
+     *
+     * @param string $body (Required) The textual content to send along in the body of the request.
+     * @return $this A reference to the current instance.
+     */
+    public function set_body($body)
+    {
+        $this->request_body = $body;
+        return $this;
+    }
+
+    /**
+     * Set the URL to make the request to.
+     *
+     * @param string $url (Required) The URL to make the request to.
+     * @return $this A reference to the current instance.
+     */
+    public function set_request_url($url)
+    {
+        $this->request_url = $url;
+        return $this;
+    }
+
+    /**
+     * Set additional CURLOPT settings. These will merge with the default settings, and override if
+     * there is a duplicate.
+     *
+     * @param array $curlopts (Optional) A set of key-value pairs that set `CURLOPT` options. These will merge with the existing CURLOPTs, and ones passed here will override the defaults. Keys should be the `CURLOPT_*` constants, not strings.
+     * @return $this A reference to the current instance.
+     */
+    public function set_curlopts($curlopts)
+    {
+        $this->curlopts = $curlopts;
+        return $this;
+    }
+
+    /**
+     * Sets the length in bytes to read from the stream while streaming up.
+     *
+     * @param integer $size (Required) The length in bytes to read from the stream.
+     * @return $this A reference to the current instance.
+     */
+    public function set_read_stream_size($size)
+    {
+        $this->read_stream_size = $size;
+
+        return $this;
+    }
+
+    /**
+     * Sets the resource to read from while streaming up. Reads the stream from its current position until
+     * EOF or `$size` bytes have been read. If `$size` is not given it will be determined by <php:fstat()> and
+     * <php:ftell()>.
+     *
+     * @param resource $resource (Required) The readable resource to read from.
+     * @param integer $size (Optional) The size of the stream to read.
+     * @return $this A reference to the current instance.
+     */
+    public function set_read_stream($resource, $size = null)
+    {
+        if (!isset($size) || $size < 0)
+        {
+            $stats = fstat($resource);
+
+            if ($stats && $stats['size'] >= 0)
+            {
+                $position = ftell($resource);
+
+                if ($position !== false && $position >= 0)
+                {
+                    $size = $stats['size'] - $position;
+                }
+            }
+        }
+
+        $this->read_stream = $resource;
+
+        return $this->set_read_stream_size($size);
+    }
+
+    /**
+     * Sets the file to read from while streaming up.
+     *
+     * @param string $location (Required) The readable location to read from.
+     * @return $this A reference to the current instance.
+     */
+    public function set_read_file($location)
+    {
+        $this->read_file = $location;
+        $read_file_handle = fopen($location, 'r');
+
+        return $this->set_read_stream($read_file_handle);
+    }
+
+    /**
+     * Sets the resource to write to while streaming down.
+     *
+     * @param resource $resource (Required) The writeable resource to write to.
+     * @return $this A reference to the current instance.
+     */
+    public function set_write_stream($resource)
+    {
+        $this->write_stream = $resource;
+
+        return $this;
+    }
+
+    /**
+     * Sets the file to write to while streaming down.
+     *
+     * @param string $location (Required) The writeable location to write to.
+     * @return $this A reference to the current instance.
+     */
+    public function set_write_file($location)
+    {
+        $this->write_file = $location;
+        $write_file_handle = fopen($location, 'w');
+
+        return $this->set_write_stream($write_file_handle);
+    }
+
+    /**
+     * Set the proxy to use for making requests.
+     *
+     * @param string $proxy (Required) The faux-url to use for proxy settings. Takes the following format: `proxy://user:pass@hostname:port`
+     * @return $this A reference to the current instance.
+     */
+    public function set_proxy($proxy)
+    {
+        $proxy = parse_url($proxy);
+        $proxy['user'] = isset($proxy['user']) ? $proxy['user'] : null;
+        $proxy['pass'] = isset($proxy['pass']) ? $proxy['pass'] : null;
+        $proxy['port'] = isset($proxy['port']) ? $proxy['port'] : null;
+        $this->proxy = $proxy;
+        return $this;
+    }
+
+    /**
+     * Set the intended starting seek position.
+     *
+     * @param integer $position (Required) The byte-position of the stream to begin reading from.
+     * @return $this A reference to the current instance.
+     */
+    public function set_seek_position($position)
+    {
+        $this->seek_position = isset($position) ? (integer) $position : null;
+
+        return $this;
+    }
+
+    /**
+     * Register a callback function to execute whenever a data stream is read from using
+     * <CFRequest::streaming_read_callback()>.
+     *
+     * The user-defined callback function should accept three arguments:
+     *
+     * <ul>
+     * 	<li><code>$curl_handle</code> - <code>resource</code> - Required - The cURL handle resource that represents the in-progress transfer.</li>
+     * 	<li><code>$file_handle</code> - <code>resource</code> - Required - The file handle resource that represents the file on the local file system.</li>
+     * 	<li><code>$length</code> - <code>integer</code> - Required - The length in kilobytes of the data chunk that was transferred.</li>
+     * </ul>
+     *
+     * @param string|array|function $callback (Required) The callback function is called by <php:call_user_func()>, so you can pass the following values: <ul>
+     * 	<li>The name of a global function to execute, passed as a string.</li>
+     * 	<li>A method to execute, passed as <code>array('ClassName', 'MethodName')</code>.</li>
+     * 	<li>An anonymous function (PHP 5.3+).</li></ul>
+     * @return $this A reference to the current instance.
+     */
+    public function register_streaming_read_callback($callback)
+    {
+        $this->registered_streaming_read_callback = $callback;
+
+        return $this;
+    }
+
+    /**
+     * Register a callback function to execute whenever a data stream is written to using
+     * <CFRequest::streaming_write_callback()>.
+     *
+     * The user-defined callback function should accept two arguments:
+     *
+     * <ul>
+     * 	<li><code>$curl_handle</code> - <code>resource</code> - Required - The cURL handle resource that represents the in-progress transfer.</li>
+     * 	<li><code>$length</code> - <code>integer</code> - Required - The length in kilobytes of the data chunk that was transferred.</li>
+     * </ul>
+     *
+     * @param string|array|function $callback (Required) The callback function is called by <php:call_user_func()>, so you can pass the following values: <ul>
+     * 	<li>The name of a global function to execute, passed as a string.</li>
+     * 	<li>A method to execute, passed as <code>array('ClassName', 'MethodName')</code>.</li>
+     * 	<li>An anonymous function (PHP 5.3+).</li></ul>
+     * @return $this A reference to the current instance.
+     */
+    public function register_streaming_write_callback($callback)
+    {
+        $this->registered_streaming_write_callback = $callback;
+
+        return $this;
+    }
+
+
+    /*%******************************************************************************************%*/
+    // PREPARE, SEND, AND PROCESS REQUEST
+
+    /**
+     * A callback function that is invoked by cURL for streaming up.
+     *
+     * @param resource $curl_handle (Required) The cURL handle for the request.
+     * @param resource $file_handle (Required) The open file handle resource.
+     * @param integer $length (Required) The maximum number of bytes to read.
+     * @return binary Binary data from a stream.
+     */
+    public function streaming_read_callback($curl_handle, $file_handle, $length)
+    {
+        // 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);
+        }
+        // Once we've sent as much as we're supposed to send...
+        if ($this->read_stream_read >= $this->read_stream_size)
+        {
+            // Send EOF
+            return '';
+        }
+
+        // If we're at the beginning of an upload and need to seek...
+        if ($this->read_stream_read == 0 && isset($this->seek_position) && $this->seek_position !== ftell($this->read_stream))
+        {
+            if (fseek($this->read_stream, $this->seek_position) !== 0)
+            {
+                throw new RequestCore_Exception('The stream does not support seeking and is either not at the requested position or the position is unknown.');
+            }
+        }
+
+        $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;
+
+        return $out;
+    }
+
+    /**
+     * A callback function that is invoked by cURL for streaming down.
+     *
+     * @param resource $curl_handle (Required) The cURL handle for the request.
+     * @param binary $data (Required) The data to write.
+     * @return integer The number of bytes written.
+     */
+    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);
+        }
+        $length = strlen($data);
+        $written_total = 0;
+        $written_last = 0;
+
+        while ($written_total < $length)
+        {
+            $written_last = fwrite($this->write_stream, substr($data, $written_total));
+
+            if ($written_last === false)
+            {
+                return $written_total;
+            }
+
+            $written_total += $written_last;
+        }
+
+        return $written_total;
+    }
+
+    /**
+     * Prepares and adds the details of the cURL request. This can be passed along to a <php:curl_multi_exec()>
+     * function.
+     *
+     * @return resource The handle for the cURL object.
+     */
+    public function prep_request()
+    {
+        $curl_handle = curl_init();
+
+        // Set default options.
+        curl_setopt($curl_handle, CURLOPT_URL, $this->request_url);
+        curl_setopt($curl_handle, CURLOPT_FILETIME, true);
+        curl_setopt($curl_handle, CURLOPT_FRESH_CONNECT, false);
+        //为了兼容PHP 5.6,PHP 5.6把 CURLOPT_CLOSEPOLICY 这个变量删除了
+        //curl_setopt($curl_handle, CURLOPT_CLOSEPOLICY, CURLCLOSEPOLICY_LEAST_RECENTLY_USED);
+        curl_setopt($curl_handle, CURLOPT_MAXREDIRS, 5);
+        curl_setopt($curl_handle, CURLOPT_HEADER, true);
+        curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($curl_handle, CURLOPT_TIMEOUT, 5184000);
+        curl_setopt($curl_handle, CURLOPT_CONNECTTIMEOUT, 120);
+        curl_setopt($curl_handle, CURLOPT_NOSIGNAL, true);
+        curl_setopt($curl_handle, CURLOPT_REFERER, $this->request_url);
+        curl_setopt($curl_handle, CURLOPT_USERAGENT, $this->useragent);
+        curl_setopt($curl_handle, CURLOPT_READFUNCTION, array($this, 'streaming_read_callback'));
+
+        // Verification of the SSL cert
+        if ($this->ssl_verification)
+        {
+            curl_setopt($curl_handle, CURLOPT_SSL_VERIFYPEER, true);
+            curl_setopt($curl_handle, CURLOPT_SSL_VERIFYHOST, 2);
+        }
+        else
+        {
+            curl_setopt($curl_handle, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($curl_handle, CURLOPT_SSL_VERIFYHOST, false);
+        }
+
+        // chmod the file as 0755
+        if ($this->cacert_location === true)
+        {
+            curl_setopt($curl_handle, CURLOPT_CAINFO, dirname(__FILE__) . '/cacert.pem');
+        }
+        elseif (is_string($this->cacert_location))
+        {
+            curl_setopt($curl_handle, CURLOPT_CAINFO, $this->cacert_location);
+        }
+
+        // Debug mode
+        if ($this->debug_mode)
+        {
+            curl_setopt($curl_handle, CURLOPT_VERBOSE, true);
+        }
+
+        // Handle open_basedir & safe mode
+        if (!ini_get('safe_mode') && !ini_get('open_basedir'))
+        {
+            curl_setopt($curl_handle, CURLOPT_FOLLOWLOCATION, FALSE);
+        }
+
+        // Enable a proxy connection if requested.
+        if ($this->proxy)
+        {
+            curl_setopt($curl_handle, CURLOPT_HTTPPROXYTUNNEL, true);
+
+            $host = $this->proxy['host'];
+            $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']);
+            }
+        }
+
+        // Set credentials for HTTP Basic/Digest Authentication.
+        if ($this->username && $this->password)
+        {
+            curl_setopt($curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+            curl_setopt($curl_handle, CURLOPT_USERPWD, $this->username . ':' . $this->password);
+        }
+
+        // Handle the encoding if we can.
+        if (extension_loaded('zlib'))
+        {
+            curl_setopt($curl_handle, CURLOPT_ENCODING, '');
+        }
+
+        // Process custom headers
+        if (isset($this->request_headers) && count($this->request_headers))
+        {
+            $temp_headers = array();
+
+            foreach ($this->request_headers as $k => $v)
+            {
+                $temp_headers[] = $k . ': ' . $v;
+            }
+
+            curl_setopt($curl_handle, CURLOPT_HTTPHEADER, $temp_headers);
+        }
+
+        switch ($this->method)
+        {
+            case self::HTTP_PUT:
+                //unset($this->read_stream);
+                curl_setopt($curl_handle, CURLOPT_CUSTOMREQUEST, 'PUT');
+                if (isset($this->read_stream))
+                {
+                    if (!isset($this->read_stream_size) || $this->read_stream_size < 0)
+                    {
+                        throw new RequestCore_Exception('The stream size for the streaming upload cannot be determined.');
+                    }
+
+                    curl_setopt($curl_handle, CURLOPT_INFILESIZE, $this->read_stream_size);
+                    curl_setopt($curl_handle, CURLOPT_UPLOAD, true);
+                }
+                else
+                {
+                    curl_setopt($curl_handle, CURLOPT_POSTFIELDS, $this->request_body);
+                }
+                break;
+
+            case self::HTTP_POST:
+                curl_setopt($curl_handle, CURLOPT_POST, true);
+                curl_setopt($curl_handle, CURLOPT_POSTFIELDS, $this->request_body);
+                break;
+
+            case self::HTTP_HEAD:
+                curl_setopt($curl_handle, CURLOPT_CUSTOMREQUEST, self::HTTP_HEAD);
+                curl_setopt($curl_handle, CURLOPT_NOBODY, 1);
+                break;
+
+            default: // Assumed GET
+                curl_setopt($curl_handle, CURLOPT_CUSTOMREQUEST, $this->method);
+                if (isset($this->write_stream))
+                {
+                    curl_setopt($curl_handle, CURLOPT_WRITEFUNCTION, array($this, 'streaming_write_callback'));
+                    curl_setopt($curl_handle, CURLOPT_HEADER, false);
+                }
+                else
+                {
+                    curl_setopt($curl_handle, CURLOPT_POSTFIELDS, $this->request_body);
+                }
+                break;
+        }
+
+        // Merge in the CURLOPTs
+        if (isset($this->curlopts) && sizeof($this->curlopts) > 0)
+        {
+            foreach ($this->curlopts as $k => $v)
+            {
+                curl_setopt($curl_handle, $k, $v);
+            }
+        }
+
+        return $curl_handle;
+    }
+
+    /**
+     * Take the post-processed cURL data and break it down into useful header/body/info chunks. Uses the
+     * data stored in the `curl_handle` and `response` properties unless replacement data is passed in via
+     * parameters.
+     *
+     * @param resource $curl_handle (Optional) The reference to the already executed cURL request.
+     * @param string $response (Optional) The actual response content itself that needs to be parsed.
+     * @return ResponseCore A <ResponseCore> object containing a parsed HTTP response.
+     */
+    public function process_response($curl_handle = null, $response = null)
+    {
+        // Accept a custom one if it's passed.
+        if ($curl_handle && $response)
+        {
+            $this->curl_handle = $curl_handle;
+            $this->response = $response;
+        }
+
+        // As long as this came back as a valid resource...
+        if (is_resource($this->curl_handle))
+        {
+            // Determine what's what.
+            $header_size = curl_getinfo($this->curl_handle, CURLINFO_HEADER_SIZE);
+            $this->response_headers = substr($this->response, 0, $header_size);
+            $this->response_body = substr($this->response, $header_size);
+            $this->response_code = curl_getinfo($this->curl_handle, CURLINFO_HTTP_CODE);
+            $this->response_info = curl_getinfo($this->curl_handle);
+
+            // Parse out the headers
+            $this->response_headers = explode("\r\n\r\n", trim($this->response_headers));
+            $this->response_headers = array_pop($this->response_headers);
+            $this->response_headers = explode("\r\n", $this->response_headers);
+            array_shift($this->response_headers);
+
+            // Loop through and split up the headers.
+            $header_assoc = array();
+            foreach ($this->response_headers as $header)
+            {
+                $kv = explode(': ', $header);
+                $header_assoc[strtolower($kv[0])] = isset($kv[1])?$kv[1]:'';
+            }
+
+            // Reset the headers to the appropriate property.
+            $this->response_headers = $header_assoc;
+            $this->response_headers['_info'] = $this->response_info;
+            $this->response_headers['_info']['method'] = $this->method;
+
+            if ($curl_handle && $response)
+            {
+                return new $this->response_class($this->response_headers, $this->response_body, $this->response_code, $this->curl_handle);
+            }
+        }
+
+        // Return false
+        return false;
+    }
+
+    /**
+     * Sends the request, calling necessary utility functions to update built-in properties.
+     *
+     * @param boolean $parse (Optional) Whether to parse the response with ResponseCore or not.
+     * @return string The resulting unparsed data from the request.
+     */
+    public function send_request($parse = false)
+    {
+        set_time_limit(0);
+
+        $curl_handle = $this->prep_request();
+        $this->response = curl_exec($curl_handle);
+
+        if ($this->response === false)
+        {
+            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);
+
+        curl_close($curl_handle);
+
+        if ($parse)
+        {
+            return $parsed_response;
+        }
+
+        return $this->response;
+    }
+
+    /**
+     * Sends the request using <php:curl_multi_exec()>, enabling parallel requests. Uses the "rolling" method.
+     *
+     * @param array $handles (Required) An indexed array of cURL handles to process simultaneously.
+     * @param array $opt (Optional) An associative array of parameters that can have the following keys: <ul>
+     * 	<li><code>callback</code> - <code>string|array</code> - Optional - The string name of a function to pass the response data to. If this is a method, pass an array where the <code>[0]</code> index is the class and the <code>[1]</code> index is the method name.</li>
+     * 	<li><code>limit</code> - <code>integer</code> - Optional - The number of simultaneous requests to make. This can be useful for scaling around slow server responses. Defaults to trusting cURLs judgement as to how many to use.</li></ul>
+     * @return array Post-processed cURL responses.
+     */
+    public function send_multi_request($handles, $opt = null)
+    {
+        set_time_limit(0);
+
+        // Skip everything if there are no handles to process.
+        if (count($handles) === 0) return array();
+
+        if (!$opt) $opt = array();
+
+        // Initialize any missing options
+        $limit = isset($opt['limit']) ? $opt['limit'] : -1;
+
+        // Initialize
+        $handle_list = $handles;
+        $http = new $this->request_class();
+        $multi_handle = curl_multi_init();
+        $handles_post = array();
+        $added = count($handles);
+        $last_handle = null;
+        $count = 0;
+        $i = 0;
+
+        // 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;
+            curl_multi_add_handle($multi_handle, array_shift($handles));
+            $i++;
+        }
+
+        do
+        {
+            $active = false;
+
+            // Start executing and wait for a response.
+            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;
+            }
+
+            // Figure out which requests finished.
+            $to_process = array();
+
+            while ($done = curl_multi_info_read($multi_handle))
+            {
+                // 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'] . ')');
+                }
+
+                // 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']]))
+                {
+                    $to_process[(int) $done['handle']] = $done;
+                }
+            }
+
+            // Actually deal with the request
+            foreach ($to_process as $pkey => $done)
+            {
+                $response = $http->process_response($done['handle'], curl_multi_getcontent($done['handle']));
+                $key = array_search($done['handle'], $handle_list, true);
+                $handles_post[$key] = $response;
+
+                if (count($handles) > 0)
+                {
+                    curl_multi_add_handle($multi_handle, array_shift($handles));
+                }
+
+                curl_multi_remove_handle($multi_handle, $done['handle']);
+                curl_close($done['handle']);
+            }
+        }
+        while ($active || count($handles_post) < $added);
+
+        curl_multi_close($multi_handle);
+
+        ksort($handles_post, SORT_NUMERIC);
+        return $handles_post;
+    }
+
+
+    /*%******************************************************************************************%*/
+    // RESPONSE METHODS
+
+    /**
+     * Get the HTTP response headers from the request.
+     *
+     * @param string $header (Optional) A specific header value to return. Defaults to all headers.
+     * @return string|array All or selected header values.
+     */
+    public function get_response_header($header = null)
+    {
+        if ($header)
+        {
+            return $this->response_headers[strtolower($header)];
+        }
+        return $this->response_headers;
+    }
+
+    /**
+     * Get the HTTP response body from the request.
+     *
+     * @return string The response body.
+     */
+    public function get_response_body()
+    {
+        return $this->response_body;
+    }
+
+    /**
+     * Get the HTTP response code from the request.
+     *
+     * @return string The HTTP response code.
+     */
+    public function get_response_code()
+    {
+        return $this->response_code;
+    }
 }
 
 
@@ -973,53 +973,53 @@ 
  */
 class ResponseCore
 {
-	/**
-	 * Stores the HTTP header information.
-	 */
-	public $header;
-
-	/**
-	 * Stores the SimpleXML response.
-	 */
-	public $body;
-
-	/**
-	 * Stores the HTTP response code.
-	 */
-	public $status;
-
-	/**
-	 * Constructs a new instance of this class.
-	 *
-	 * @param array $header (Required) Associative array of HTTP headers (typically returned by <RequestCore::get_response_header()>).
-	 * @param string $body (Required) XML-formatted response from AWS.
-	 * @param integer $status (Optional) HTTP response status code from the request.
-	 * @return object Contains an <php:array> `header` property (HTTP headers as an associative array), a <php:SimpleXMLElement> or <php:string> `body` property, and an <php:integer> `status` code.
-	 */
-	public function __construct($header, $body, $status = null)
-	{
-		$this->header = $header;
-		$this->body = $body;
-		$this->status = $status;
-
-		return $this;
-	}
-
-	/**
-	 * Did we receive the status code we expected?
-	 *
-	 * @param integer|array $codes (Optional) The status code(s) to expect. Pass an <php:integer> for a single acceptable value, or an <php:array> of integers for multiple acceptable values.
-	 * @return boolean Whether we received the expected status code or not.
-	 */
-	public function isOK($codes = array(200, 201, 204, 206))
-	{
-		if (is_array($codes))
-		{
-			return in_array($this->status, $codes);
-		}
-
-		return $this->status === $codes;
-	}
+    /**
+     * Stores the HTTP header information.
+     */
+    public $header;
+
+    /**
+     * Stores the SimpleXML response.
+     */
+    public $body;
+
+    /**
+     * Stores the HTTP response code.
+     */
+    public $status;
+
+    /**
+     * Constructs a new instance of this class.
+     *
+     * @param array $header (Required) Associative array of HTTP headers (typically returned by <RequestCore::get_response_header()>).
+     * @param string $body (Required) XML-formatted response from AWS.
+     * @param integer $status (Optional) HTTP response status code from the request.
+     * @return object Contains an <php:array> `header` property (HTTP headers as an associative array), a <php:SimpleXMLElement> or <php:string> `body` property, and an <php:integer> `status` code.
+     */
+    public function __construct($header, $body, $status = null)
+    {
+        $this->header = $header;
+        $this->body = $body;
+        $this->status = $status;
+
+        return $this;
+    }
+
+    /**
+     * Did we receive the status code we expected?
+     *
+     * @param integer|array $codes (Optional) The status code(s) to expect. Pass an <php:integer> for a single acceptable value, or an <php:array> of integers for multiple acceptable values.
+     * @return boolean Whether we received the expected status code or not.
+     */
+    public function isOK($codes = array(200, 201, 204, 206))
+    {
+        if (is_array($codes))
+        {
+            return in_array($this->status, $codes);
+        }
+
+        return $this->status === $codes;
+    }
 }
 
 /**

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

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

Indentation +100 added lines, -100 removed lines

@@ -19,111 +19,111 @@
 
 
 if(function_exists('get_loaded_extensions')){
-	//检测mcrypt,openssl扩展
-	$extensions = get_loaded_extensions();
-	if($extensions){
-		if(!in_array('mcrypt', $extensions)){
-			throw new Ks3ClientException("please install mcrypt extension");
-		}
-		if(!in_array('openssl', $extensions)){
-			throw new Ks3ClientException("please install openssl extension");
-		}
-	}else{
-		throw new Ks3ClientException("please install extensions");
-	}
+    //检测mcrypt,openssl扩展
+    $extensions = get_loaded_extensions();
+    if($extensions){
+        if(!in_array('mcrypt', $extensions)){
+            throw new Ks3ClientException("please install mcrypt extension");
+        }
+        if(!in_array('openssl', $extensions)){
+            throw new Ks3ClientException("please install openssl extension");
+        }
+    }else{
+        throw new Ks3ClientException("please install extensions");
+    }
 }else{
-	throw new Ks3ClientException();
+    throw new Ks3ClientException();
 } 
 class Ks3EncryptionClient extends Ks3Client{
-	private $encryptionHandler = NULL;
-	//用户提供的主密钥,可以是对称秘钥或非对称秘钥(array,分别是公钥和私钥)
-	private $encryptionMaterials = NULL;
+    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){
-				$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");
-				$encryptionMaterials = array($pk,$sk);
-			}else{
-				throw new Ks3ClientException("encryptionMaterials should be string or an array of size 2");
-			}
-		}
-		$ks3client = new Ks3Client($accessKey,$secretKey,$endpoint);
-		$this->encryptionMaterials = $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{
-			throw new Ks3ClientException("unsupported encryption mode :".ENCRYPTPTION_MODE);
-		}
-		if(ENCRYPTPTION_STORAGE_MODE != "ObjectMetadata"&&ENCRYPTPTION_STORAGE_MODE!="InstructionFile"){
-			throw new Ks3ClientException("unsupported encryption storage mode :".ENCRYPTPTION_STORAGE_MODE);
-		}
-	}
+    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)
+                    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{
+                throw new Ks3ClientException("encryptionMaterials should be string or an array of size 2");
+            }
+        }
+        $ks3client = new Ks3Client($accessKey,$secretKey,$endpoint);
+        $this->encryptionMaterials = $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{
+            throw new Ks3ClientException("unsupported encryption mode :".ENCRYPTPTION_MODE);
+        }
+        if(ENCRYPTPTION_STORAGE_MODE != "ObjectMetadata"&&ENCRYPTPTION_STORAGE_MODE!="InstructionFile"){
+            throw new Ks3ClientException("unsupported encryption storage mode :".ENCRYPTPTION_STORAGE_MODE);
+        }
+    }
 
-	public function putObjectByContent($args=array()){
-		return $this->encryptionHandler->putObjectByContentSecurely($args);
-	}
-	public function putObjectByFile($args=array()){
-		return $this->encryptionHandler->putObjectByFileSecurely($args);
-	}
-	public function getObject($args=array()){
-		return $this->encryptionHandler->getObjectSecurely($args);
-	}
-	public function initMultipartUpload($args=array()){
-		return $this->encryptionHandler->initMultipartUploadSecurely($args);
-	}
-	public function uploadPart($args=array()){
-		return $this->encryptionHandler->uploadPartSecurely($args);
-	}
-	public function abortMultipartUpload($args=array()){
-		return $this->encryptionHandler->abortMultipartUploadSecurely($args);
-	}
-	public function completeMultipartUpload($args=array()){
-		return $this->encryptionHandler->completeMultipartUploadSecurely($args);
-	}
-	public function deleteObject($args=array()){
-		$result = parent::deleteObject($args);
-		$args["Key"] = $args["Key"].EncryptionUtil::$INSTRUCTION_SUFFIX;
-		try {
-			parent::deleteObject($args);
-		} catch (Exception $e) {
-			//do nothing
-		}
-		return $result;
-	}
-	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(
-			"Bucket"=>$args["CopySource"]["Bucket"],
-			"Key"=>$args["CopySource"]["Key"].EncryptionUtil::$INSTRUCTION_SUFFIX
-			))){
-			parent::copyObject(
-				array(
-					"Bucket"=>$args["Bucket"],
-					"Key"=>$args["Key"].EncryptionUtil::$INSTRUCTION_SUFFIX,
-					"CopySource"=>array(
-						"Bucket"=>$args["CopySource"]["Bucket"],
-						"Key"=>$args["CopySource"]["Key"].EncryptionUtil::$INSTRUCTION_SUFFIX
-						)
-					)
-				);
-		}
-		return parent::copyObject($args);
-	}
+    public function putObjectByContent($args=array()){
+        return $this->encryptionHandler->putObjectByContentSecurely($args);
+    }
+    public function putObjectByFile($args=array()){
+        return $this->encryptionHandler->putObjectByFileSecurely($args);
+    }
+    public function getObject($args=array()){
+        return $this->encryptionHandler->getObjectSecurely($args);
+    }
+    public function initMultipartUpload($args=array()){
+        return $this->encryptionHandler->initMultipartUploadSecurely($args);
+    }
+    public function uploadPart($args=array()){
+        return $this->encryptionHandler->uploadPartSecurely($args);
+    }
+    public function abortMultipartUpload($args=array()){
+        return $this->encryptionHandler->abortMultipartUploadSecurely($args);
+    }
+    public function completeMultipartUpload($args=array()){
+        return $this->encryptionHandler->completeMultipartUploadSecurely($args);
+    }
+    public function deleteObject($args=array()){
+        $result = parent::deleteObject($args);
+        $args["Key"] = $args["Key"].EncryptionUtil::$INSTRUCTION_SUFFIX;
+        try {
+            parent::deleteObject($args);
+        } catch (Exception $e) {
+            //do nothing
+        }
+        return $result;
+    }
+    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(
+            "Bucket"=>$args["CopySource"]["Bucket"],
+            "Key"=>$args["CopySource"]["Key"].EncryptionUtil::$INSTRUCTION_SUFFIX
+            ))){
+            parent::copyObject(
+                array(
+                    "Bucket"=>$args["Bucket"],
+                    "Key"=>$args["Key"].EncryptionUtil::$INSTRUCTION_SUFFIX,
+                    "CopySource"=>array(
+                        "Bucket"=>$args["CopySource"]["Bucket"],
+                        "Key"=>$args["CopySource"]["Key"].EncryptionUtil::$INSTRUCTION_SUFFIX
+                        )
+                    )
+                );
+        }
+        return parent::copyObject($args);
+    }
 }
 
 ?>
\ No newline at end of file

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"],

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

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

Indentation +6 added lines, -6 removed lines

@@ -16,14 +16,14 @@
 
 //将所有能确定值的表单项都放在该数组中
 $postData = array(
-	"key"=>$key,
-	"success_action_redirect"=>$redirect,
-	"Content-Type"=>"text/html",
-	);
+    "key"=>$key,
+    "success_action_redirect"=>$redirect,
+    "Content-Type"=>"text/html",
+    );
 //将不能确定值的表单项都放在该数组中
 $unknowData = array(
-	"random"
-	);
+    "random"
+    );
 $result = $client->postObject($bucket_name,$postData,$unknowData);
 print_r($result);
 

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

Indentation +59 added lines, -59 removed lines

@@ -16,37 +16,37 @@ 
 multipartUpload($client,$bucket,$keyprefix);
 
 function putObjectByContentAndGetObjectUsingMeta($client,$bucket,$keyprefix){
-	for($i = 45 ;$i < 60;$i++){
+    for($i = 45 ;$i < 60;$i++){
 
-		$content = EncryptionUtil::genereateOnceUsedKey($i);
+        $content = EncryptionUtil::genereateOnceUsedKey($i);
 
-		$args = array(
-			"Bucket"=>$bucket,
-			"Key"=>$keyprefix."EOMeta",
-			"ACL"=>"public-read",
-			"Content"=>$content
-		);
-		$client->putObjectByContent($args);
-		rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOMeta",
-			"D://testdown/down",base64_encode(md5($args["Content"])));
-	}
+        $args = array(
+            "Bucket"=>$bucket,
+            "Key"=>$keyprefix."EOMeta",
+            "ACL"=>"public-read",
+            "Content"=>$content
+        );
+        $client->putObjectByContent($args);
+        rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOMeta",
+            "D://testdown/down",base64_encode(md5($args["Content"])));
+    }
 }
 function putObjectByFileAndGetObjectUsingMeta($client,$bucket,$keyprefix){
 
-	$args = array(
-		"Bucket"=>$bucket,
-		"Key"=>$keyprefix."EOMeta",
-		"ACL"=>"public-read",
-		"Content"=>array(
-			"content"=>"D://IMG.jpg"
-			)
-	);
-	$client->putObjectByFile($args);
-	rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOMeta",
-			"D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
+    $args = array(
+        "Bucket"=>$bucket,
+        "Key"=>$keyprefix."EOMeta",
+        "ACL"=>"public-read",
+        "Content"=>array(
+            "content"=>"D://IMG.jpg"
+            )
+    );
+    $client->putObjectByFile($args);
+    rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOMeta",
+            "D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
 }
 function multipartUpload($client,$bucket,$keyprefix){
-	//初始化分开上传，获取uploadid
+    //初始化分开上传，获取uploadid
     $args = array(
         "Bucket"=>$bucket,
         "Key"=>$keyprefix."EOMeta",
@@ -67,8 +67,8 @@ 
         echo "upload".$i."\r\n";
         $args=array(
             "Bucket"=>$bucket,
-        	"Key"=>$keyprefix."EOMeta",
-        	"LastPart"=>($i===$count-1),
+            "Key"=>$keyprefix."EOMeta",
+            "LastPart"=>($i===$count-1),
             "Options"=>array(
                 "partNumber"=>$i+1,
                 "uploadId"=>$uploadid
@@ -95,42 +95,42 @@ 
     $result = $client->completeMultipartUpload($args);
 
     rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOMeta",
-    	"D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
+        "D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
 }
 function rangeGetAndCheckMd5($client,$bucket,$key,$file,$expectedMd5){
-	$args = array("Bucket"=>$bucket,"Key"=>$key);
-	$meta = $client->getObjectMeta($args);
-	$contentlength = $meta["ObjectMeta"]["Content-Length"];
+    $args = array("Bucket"=>$bucket,"Key"=>$key);
+    $meta = $client->getObjectMeta($args);
+    $contentlength = $meta["ObjectMeta"]["Content-Length"];
 
-	$filelist = array();
+    $filelist = array();
 
-	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);
-		$begin += ($index+1);
-		$args = array(
-			"Bucket"=>$bucket,
-			"Key"=>$key,
-			"Range"=>$range,
-			"WriteTo"=>$destFile
-		);
-		$client->getObject($args);
-	}
+    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);
+        $begin += ($index+1);
+        $args = array(
+            "Bucket"=>$bucket,
+            "Key"=>$key,
+            "Range"=>$range,
+            "WriteTo"=>$destFile
+        );
+        $client->getObject($args);
+    }
 
-	foreach ($filelist as $key => $value) {
-		$handle = fopen($value,"r");
-		$size = filesize($value);
-		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)
-		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
-	@unlink($file);	
+    foreach ($filelist as $key => $value) {
+        $handle = fopen($value,"r");
+        $size = filesize($value);
+        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)
+        throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
+    @unlink($file);	
 }

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

Braces +3 added lines, -2 removed lines

@@ -130,7 +130,8 @@
 		@unlink($value);
 	}
 	$md5 = base64_encode(md5_file($file));
-	if($md5 != $expectedMd5)
-		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
+	if($md5 != $expectedMd5) {
+			throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
+	}
 	@unlink($file);	
 }

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

Indentation +87 added lines, -87 removed lines

@@ -17,33 +17,33 @@ 
 copyAnddeleteObject($client,$bucket,$keyprefix);
 
 function putObjectByContentAndGetObjectUsingInstruction($client,$bucket,$keyprefix){
-	$content = EncryptionUtil::genereateOnceUsedKey(rand(100,1000));
-	$args = array(
-		"Bucket"=>$bucket,
-		"Key"=>$keyprefix."EOFile",
-		"ACL"=>"public-read",
-		"Content"=>$content
-	);
-	$client->putObjectByContent($args);
-	rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOFile",
-			"D://testdown/down",base64_encode(md5($args["Content"])));
+    $content = EncryptionUtil::genereateOnceUsedKey(rand(100,1000));
+    $args = array(
+        "Bucket"=>$bucket,
+        "Key"=>$keyprefix."EOFile",
+        "ACL"=>"public-read",
+        "Content"=>$content
+    );
+    $client->putObjectByContent($args);
+    rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOFile",
+            "D://testdown/down",base64_encode(md5($args["Content"])));
 }
 function putObjectByFileAndGetObjectUsingFile($client,$bucket,$keyprefix){
 
-	$args = array(
-		"Bucket"=>$bucket,
-		"Key"=>$keyprefix."EOFile",
-		"ACL"=>"public-read",
-		"Content"=>array(
-			"content"=>"D://IMG.jpg"
-			)
-	);
-	$client->putObjectByFile($args);
-	rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOFile",
-			"D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
+    $args = array(
+        "Bucket"=>$bucket,
+        "Key"=>$keyprefix."EOFile",
+        "ACL"=>"public-read",
+        "Content"=>array(
+            "content"=>"D://IMG.jpg"
+            )
+    );
+    $client->putObjectByFile($args);
+    rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOFile",
+            "D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
 }
 function multipartUpload($client,$bucket,$keyprefix){
-	//初始化分开上传，获取uploadid
+    //初始化分开上传，获取uploadid
     $args = array(
         "Bucket"=>$bucket,
         "Key"=>$keyprefix."EOFile",
@@ -64,8 +64,8 @@ 
         echo "upload".$i."\r\n";
         $args=array(
             "Bucket"=>$bucket,
-        	"Key"=>$keyprefix."EOFile",
-        	"LastPart"=>($i===$count-1),
+            "Key"=>$keyprefix."EOFile",
+            "LastPart"=>($i===$count-1),
             "Options"=>array(
                 "partNumber"=>$i+1,
                 "uploadId"=>$uploadid
@@ -92,79 +92,79 @@ 
     $result = $client->completeMultipartUpload($args);
 
     rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOFile",
-    	"D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
+        "D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
 }
 function copyAnddeleteObject($client,$bucket,$keyprefix){
-	$content = EncryptionUtil::genereateOnceUsedKey(rand(100,1000));
-	$args = array(
-		"Bucket"=>$bucket,
-		"Key"=>$keyprefix."EOFile",
-		"ACL"=>"public-read",
-		"Content"=>$content
-	);
-	$client->putObjectByContent($args);
+    $content = EncryptionUtil::genereateOnceUsedKey(rand(100,1000));
+    $args = array(
+        "Bucket"=>$bucket,
+        "Key"=>$keyprefix."EOFile",
+        "ACL"=>"public-read",
+        "Content"=>$content
+    );
+    $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,
-		"Key"=>$keyprefix."EOFileCopy",
-		"CopySource"=>array(
-			"Bucket"=>$bucket,
-			"Key"=>$keyprefix."EOFile"
-			)
-		);
-	$client->copyObject($copyReq);
+    $copyReq = array(
+        "Bucket"=>$bucket,
+        "Key"=>$keyprefix."EOFileCopy",
+        "CopySource"=>array(
+            "Bucket"=>$bucket,
+            "Key"=>$keyprefix."EOFile"
+            )
+        );
+    $client->copyObject($copyReq);
 
-	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")))
-		throw new Exception("not found ".$keyprefix."EOFileCopy.instruction");
+    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")))
+        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")))
-		throw new Exception("found ".$keyprefix."EOFileCopy");
-	if($client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy.instruction")))
-		throw new Exception("found ".$keyprefix."EOFileCopy.instruction");
+    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")))
+        throw new Exception("found ".$keyprefix."EOFileCopy.instruction");
 }
 function rangeGetAndCheckMd5($client,$bucket,$key,$file,$expectedMd5){
-	$args = array("Bucket"=>$bucket,"Key"=>$key);
-	$meta = $client->getObjectMeta($args);
-	$contentlength = $meta["ObjectMeta"]["Content-Length"];
+    $args = array("Bucket"=>$bucket,"Key"=>$key);
+    $meta = $client->getObjectMeta($args);
+    $contentlength = $meta["ObjectMeta"]["Content-Length"];
 
-	$filelist = array();
+    $filelist = array();
 
-	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);
-		$begin += ($index+1);
-		$args = array(
-			"Bucket"=>$bucket,
-			"Key"=>$key,
-			"Range"=>$range,
-			"WriteTo"=>$destFile
-		);
-		$client->getObject($args);
-	}
+    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);
+        $begin += ($index+1);
+        $args = array(
+            "Bucket"=>$bucket,
+            "Key"=>$key,
+            "Range"=>$range,
+            "WriteTo"=>$destFile
+        );
+        $client->getObject($args);
+    }
 
-	foreach ($filelist as $key => $value) {
-		$handle = fopen($value,"r");
-		$size = filesize($value);
-		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)
-		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
-	@unlink($file);	
+    foreach ($filelist as $key => $value) {
+        $handle = fopen($value,"r");
+        $size = filesize($value);
+        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)
+        throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
+    @unlink($file);	
 }

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

Braces +22 added lines, -15 removed lines

@@ -104,10 +104,12 @@ 
 	);
 	$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,18 +121,22 @@ 
 		);
 	$client->copyObject($copyReq);
 
-	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")))
-		throw new Exception("not found ".$keyprefix."EOFileCopy.instruction");
+	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"))) {
+			throw new Exception("not found ".$keyprefix."EOFileCopy.instruction");
+	}
 
 	$client->deleteObject(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")))
-		throw new Exception("found ".$keyprefix."EOFileCopy.instruction");
-}
+	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"))) {
+			throw new Exception("found ".$keyprefix."EOFileCopy.instruction");
+	}
+	}
 function rangeGetAndCheckMd5($client,$bucket,$key,$file,$expectedMd5){
 	$args = array("Bucket"=>$bucket,"Key"=>$key);
 	$meta = $client->getObjectMeta($args);
@@ -164,7 +170,8 @@ 
 		@unlink($value);
 	}
 	$md5 = base64_encode(md5_file($file));
-	if($md5 != $expectedMd5)
-		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
+	if($md5 != $expectedMd5) {
+			throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
+	}
 	@unlink($file);	
 }

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

Indentation +316 added lines, -316 removed lines

@@ -33,381 +33,381 @@
 //print_r(putAdp($client));
 //print_r(postObject($client));
 function listBuckets($client){
-	return $client->listBuckets();
+    return $client->listBuckets();
 }
 function deleteBucket($client){
-	return $client->deleteBucket(array("Bucket"=>"ksc-scm"));
+    return $client->deleteBucket(array("Bucket"=>"ksc-scm"));
 }
 function deleteBucketCORS($client){
-	return $client->deleteBucketCORS(array("Bucket"=>"ksc-scm"));
+    return $client->deleteBucketCORS(array("Bucket"=>"ksc-scm"));
 }
 function listObjects($client){
-	$args = array(
-		"Bucket"=>"lijunwei.test",
-		"Options"=>array(
-			//"prefix"=>"dir/",
-			"max-keys"=>4,
-			//"marker"=>"123.pdf",
-			"delimiter"=>"/"
-			)
-		);
-	return $client->listObjects($args);
+    $args = array(
+        "Bucket"=>"lijunwei.test",
+        "Options"=>array(
+            //"prefix"=>"dir/",
+            "max-keys"=>4,
+            //"marker"=>"123.pdf",
+            "delimiter"=>"/"
+            )
+        );
+    return $client->listObjects($args);
 }
 function getBucketAcl($client){
-	return $client->getBucketAcl(array("Bucket"=>"aaphp"));
+    return $client->getBucketAcl(array("Bucket"=>"aaphp"));
 }
 function getBucketCORS($client){
-	return $client->getBucketCORS(array("Bucket"=>"ksc-scm"));
+    return $client->getBucketCORS(array("Bucket"=>"ksc-scm"));
 }
 function getBucketLocation($client){
-	return $client->getBucketLocation(array("Bucket"=>"ksc-scm"));
+    return $client->getBucketLocation(array("Bucket"=>"ksc-scm"));
 }
 function getBucketLogging($client){
-	return $client->getBucketLogging(array("Bucket"=>"ksc-scm"));
+    return $client->getBucketLogging(array("Bucket"=>"ksc-scm"));
 }
 function bucketExists($client){
-	$args = array("Bucket"=>"ksc-scm");
-	return $client->bucketExists($args);
+    $args = array("Bucket"=>"ksc-scm");
+    return $client->bucketExists($args);
 }
 function createBucket($client){
-	$args = array(
-		"Bucket"=>"ksc-scm",
-		"ACL"=>"private"
-		);
-	return $client->createBucket($args);
+    $args = array(
+        "Bucket"=>"ksc-scm",
+        "ACL"=>"private"
+        );
+    return $client->createBucket($args);
 }
 function setBucketAcl($client){
-	$args = array(
-		"Bucket"=>"ksc-scm",
-		"ACL"=>"private"
-		);
-	return $client->setBucketAcl($args);
+    $args = array(
+        "Bucket"=>"ksc-scm",
+        "ACL"=>"private"
+        );
+    return $client->setBucketAcl($args);
 }
 function setBucketCORS($client){
-	$args = array(
-		"Bucket"=>"ksc-scm",
-		"CORS"=>array(
-			array(
-				"AllowedMethod"=>array("GET","PUT"),
-				"AllowedOrigin"=>array("http://www.kingsoft.com"),
-				"AllowedHeader"=>array("*"),
-				"ExposeHeader"=>array("*"),
-				"MaxAgeSeconds"=>10
-			),
-			array(
-				"AllowedMethod"=>array("GET","PUT"),
-				"AllowedOrigin"=>array("*"),
-				"AllowedHeader"=>array("*"),
-				"ExposeHeader"=>array("*"),
-				"MaxAgeSeconds"=>10
-			)
-		)
-	);
-	return $client->setBucketCORS($args);
+    $args = array(
+        "Bucket"=>"ksc-scm",
+        "CORS"=>array(
+            array(
+                "AllowedMethod"=>array("GET","PUT"),
+                "AllowedOrigin"=>array("http://www.kingsoft.com"),
+                "AllowedHeader"=>array("*"),
+                "ExposeHeader"=>array("*"),
+                "MaxAgeSeconds"=>10
+            ),
+            array(
+                "AllowedMethod"=>array("GET","PUT"),
+                "AllowedOrigin"=>array("*"),
+                "AllowedHeader"=>array("*"),
+                "ExposeHeader"=>array("*"),
+                "MaxAgeSeconds"=>10
+            )
+        )
+    );
+    return $client->setBucketCORS($args);
 }
 function setBucketLogging($client){
-	$args = array(
-		"Bucket"=>"ksc-scm",
-		"BucketLogging"=>array(
-			"Enable"=>TRUE,
-			"TargetBucket"=>"ksc-scm",
-			"TargetPrefix"=>"X-KSS"
-			)
-		);
-	return $client->setBucketLogging($args);
+    $args = array(
+        "Bucket"=>"ksc-scm",
+        "BucketLogging"=>array(
+            "Enable"=>TRUE,
+            "TargetBucket"=>"ksc-scm",
+            "TargetPrefix"=>"X-KSS"
+            )
+        );
+    return $client->setBucketLogging($args);
 }
 function deleteObject($client){
-	$args = array(
-		"Bucket"=>"ksc-scm",
-		"Key"=>"123.pdf"
-		);
-	return $client->deleteObject($args);
+    $args = array(
+        "Bucket"=>"ksc-scm",
+        "Key"=>"123.pdf"
+        );
+    return $client->deleteObject($args);
 }
 function deleteObjects($client){
-	$args = array(
-		"Bucket"=>"ksc-scm",
-		"DeleteKeys"=>array("copy/test.zip","copy/123.doc")
-		);
-	return $client->deleteObjects($args);
+    $args = array(
+        "Bucket"=>"ksc-scm",
+        "DeleteKeys"=>array("copy/test.zip","copy/123.doc")
+        );
+    return $client->deleteObjects($args);
 }
 function getObject($client){
-	$args = array(
-		"Bucket"=>"aaphp",
-		"Key"=>"multi.exe",
-		"Range"=>array(
-			"start"=>NULL,
-			"end"=>4,
-			),
-		"WriteTo"=>"D://test.zip"
-		);
-	return $client->getObject($args);
+    $args = array(
+        "Bucket"=>"aaphp",
+        "Key"=>"multi.exe",
+        "Range"=>array(
+            "start"=>NULL,
+            "end"=>4,
+            ),
+        "WriteTo"=>"D://test.zip"
+        );
+    return $client->getObject($args);
 }
 function getObjectAcl($client){
-	$args = array(
-		"Bucket"=>"aaphp",
-		"Key"=>"multi.exe"
-		);
-	return $client->getObjectAcl($args);
+    $args = array(
+        "Bucket"=>"aaphp",
+        "Key"=>"multi.exe"
+        );
+    return $client->getObjectAcl($args);
 }
 function objectExists($client){
-	$args = array(
-		"Bucket"=>"ksc-scm",
-		"Key"=>"123.pdf"
-		);
-	return $client->objectExists($args);
+    $args = array(
+        "Bucket"=>"ksc-scm",
+        "Key"=>"123.pdf"
+        );
+    return $client->objectExists($args);
 }
 function getObjectMeta($client){
-	$args = array(
-		"Bucket"=>"aaphp",
-		"Key"=>"test.zip"
-		);
-	return $client->getObjectMeta($args);
+    $args = array(
+        "Bucket"=>"aaphp",
+        "Key"=>"test.zip"
+        );
+    return $client->getObjectMeta($args);
 }
 function setObjectAcl($client){
-	$args = array(
-		"Bucket"=>"aaphp",
-		"Key"=>"test.zip",
-		"ACL"=>"private"
-		);
-	return $client->setObjectAcl($args);
+    $args = array(
+        "Bucket"=>"aaphp",
+        "Key"=>"test.zip",
+        "ACL"=>"private"
+        );
+    return $client->setObjectAcl($args);
 }
 function copyObject($client){
-	$args = array(
-		"Bucket"=>"aaphp",
-		"Key"=>"copy/test.zip",
-		"CopySource"=>array(
-			"Bucket"=>"aaphp",
-			"Key"=>"test.zip"
-			)
-		);
-	return $client->copyObject($args);
+    $args = array(
+        "Bucket"=>"aaphp",
+        "Key"=>"copy/test.zip",
+        "CopySource"=>array(
+            "Bucket"=>"aaphp",
+            "Key"=>"test.zip"
+            )
+        );
+    return $client->copyObject($args);
 }
 function putObjectByFile($client){
-	$file = "D://phpput";
-	if(Utils::chk_chinese($file)){
-		$file = iconv('utf-8','gbk',$file);
-	}
-	$content = $file;
-	$args = array(
-		"Bucket"=>"aaphp",
-		"Key"=>"stream_upload1.txt",
-		"ACL"=>"public-read",
-		"ObjectMeta"=>array(
-			"Content-Type"=>"image/jpg",//只传0-10字节,
-			),
-		"Content"=>array(
-			"content"=>$file,
-			"seek_position"=>0
-			),
-	);
-	return $client->putObjectByFile($args);
+    $file = "D://phpput";
+    if(Utils::chk_chinese($file)){
+        $file = iconv('utf-8','gbk',$file);
+    }
+    $content = $file;
+    $args = array(
+        "Bucket"=>"aaphp",
+        "Key"=>"stream_upload1.txt",
+        "ACL"=>"public-read",
+        "ObjectMeta"=>array(
+            "Content-Type"=>"image/jpg",//只传0-10字节,
+            ),
+        "Content"=>array(
+            "content"=>$file,
+            "seek_position"=>0
+            ),
+    );
+    return $client->putObjectByFile($args);
 }
 function multipartUpload($client){
-	$args = array(
-		"Bucket"=>"aaphp",
-		"Key"=>"multi.zip",
-		"UserMeta"=>array(
-			"x-kss-meta-test"=>"example"
-			),
-		"ObjectMeta"=>array(
-			"Content-Type"=>"text/plain"
-			)
-		);
-	$uploadid = $client->initMultipartUpload($args);
-	print_r($uploadid);
-	$uploadid = $uploadid["UploadId"];
-	echo $uploadid."\r\n";
-	//开始上传
+    $args = array(
+        "Bucket"=>"aaphp",
+        "Key"=>"multi.zip",
+        "UserMeta"=>array(
+            "x-kss-meta-test"=>"example"
+            ),
+        "ObjectMeta"=>array(
+            "Content-Type"=>"text/plain"
+            )
+        );
+    $uploadid = $client->initMultipartUpload($args);
+    print_r($uploadid);
+    $uploadid = $uploadid["UploadId"];
+    echo $uploadid."\r\n";
+    //开始上传
 
-	$file = "D://新建文件夹.rar";
-	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++){
-		echo "upload".$i."\r\n";
-		$args=array(
-			"Bucket"=>"aaphp",
-			"Key"=>"multi.zip",
-			"Options"=>array(
-				"partNumber"=>$i+1,
-				"uploadId"=>$uploadid
-				),
-			"ObjectMeta"=>array(
-				"Content-Length"=>$partsize
-				),
-			"Content"=>array(
-				"content"=>$file,
-				"seek_position"=>$partsize*$i
-				)
-			);
-		$etag = $client->uploadPart($args);
-		print_r($etag);
-		$etag = $etag["ETag"];
-	}
-	$parts = $client->listParts(array("Bucket"=>"aaphp","Key"=>"multi.zip","Options"=>array("uploadId"=>$uploadid)));
-	print_r($parts);
-	//结束上传
-	$args=array(
-		"Bucket"=>"aaphp",
-		"Key"=>"multi.zip",
-		"Options"=>array("uploadId"=>$uploadid),
-		"Parts"=>$parts["Parts"]
-		);
-	$result = $client->completeMultipartUpload($args);
-	print_r($result);
+    $file = "D://新建文件夹.rar";
+    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++){
+        echo "upload".$i."\r\n";
+        $args=array(
+            "Bucket"=>"aaphp",
+            "Key"=>"multi.zip",
+            "Options"=>array(
+                "partNumber"=>$i+1,
+                "uploadId"=>$uploadid
+                ),
+            "ObjectMeta"=>array(
+                "Content-Length"=>$partsize
+                ),
+            "Content"=>array(
+                "content"=>$file,
+                "seek_position"=>$partsize*$i
+                )
+            );
+        $etag = $client->uploadPart($args);
+        print_r($etag);
+        $etag = $etag["ETag"];
+    }
+    $parts = $client->listParts(array("Bucket"=>"aaphp","Key"=>"multi.zip","Options"=>array("uploadId"=>$uploadid)));
+    print_r($parts);
+    //结束上传
+    $args=array(
+        "Bucket"=>"aaphp",
+        "Key"=>"multi.zip",
+        "Options"=>array("uploadId"=>$uploadid),
+        "Parts"=>$parts["Parts"]
+        );
+    $result = $client->completeMultipartUpload($args);
+    print_r($result);
 }
 function abortMultipartUpload($client){
-	$args=array(
-		"Bucket"=>"aaphp",
-		"Key"=>"multi.zip",
-		"Options"=>array("uploadId"=>"1234")
-		);
-	return $client->abortMultipartUpload($args);
+    $args=array(
+        "Bucket"=>"aaphp",
+        "Key"=>"multi.zip",
+        "Options"=>array("uploadId"=>"1234")
+        );
+    return $client->abortMultipartUpload($args);
 }
 function generatePresignedUrl($client){
-	$args=array(
-		"Bucket"=>"aaphp",
-		"Key"=>"multi.zip",
-		"Options"=>array(
-			"Expires"=>60*60*24*10,
-			"response-content-type"=>"application/xml"
-			)
-		);
-	return $client->generatePresignedUrl($args);
+    $args=array(
+        "Bucket"=>"aaphp",
+        "Key"=>"multi.zip",
+        "Options"=>array(
+            "Expires"=>60*60*24*10,
+            "response-content-type"=>"application/xml"
+            )
+        );
+    return $client->generatePresignedUrl($args);
 }
 function putObjectWithAdpAndCallBack($client){
-	$content = "D://野生动物.3gp";
-	$args = array(
-		"Bucket"=>"aaphp",
-		"Key"=>"野生动物.3gp",
-		"ACL"=>"public-read",
-		"Content"=>array(
-			"content"=>$content
-			),
-		"Adp"=>array(
-			"NotifyURL"=>"http://10.4.2.38:19090/",
-			"Adps"=>array(
-				array(
-					"Command"=>"tag=avop&f=mp4&res=1280x720&vbr=1000k&abr=128k",
-					"Key"=>"野生动物-转码.3gp"
-				)
-			)
-		),
-		"CallBack"=>array(
-			"Url"=>"http://10.4.2.38:19090/",
-			"BodyMagicVariables"=>array("bucket"=>"bucket","key"=>"key"),
-			"BodyVariables"=>array("name"=>"lijunwei")
-		)
-	);
-	return $client->putObjectByFile($args);
+    $content = "D://野生动物.3gp";
+    $args = array(
+        "Bucket"=>"aaphp",
+        "Key"=>"野生动物.3gp",
+        "ACL"=>"public-read",
+        "Content"=>array(
+            "content"=>$content
+            ),
+        "Adp"=>array(
+            "NotifyURL"=>"http://10.4.2.38:19090/",
+            "Adps"=>array(
+                array(
+                    "Command"=>"tag=avop&f=mp4&res=1280x720&vbr=1000k&abr=128k",
+                    "Key"=>"野生动物-转码.3gp"
+                )
+            )
+        ),
+        "CallBack"=>array(
+            "Url"=>"http://10.4.2.38:19090/",
+            "BodyMagicVariables"=>array("bucket"=>"bucket","key"=>"key"),
+            "BodyVariables"=>array("name"=>"lijunwei")
+        )
+    );
+    return $client->putObjectByFile($args);
 }
 function  multipartUploadWithAdpAndCallBack($client){
-	$args = array(
-		"Bucket"=>"aaphp",
-		"Key"=>"multi.zip",
-		"UserMeta"=>array(
-			"x-kss-meta-test"=>"example"
-			),
-		"ObjectMeta"=>array(
-			"Content-Type"=>"text/plain"
-			)
-		);
-	$uploadid = $client->initMultipartUpload($args);
-	print_r($uploadid);
-	$uploadid = $uploadid["UploadId"];
-	echo $uploadid."\r\n";
-	//开始上传
+    $args = array(
+        "Bucket"=>"aaphp",
+        "Key"=>"multi.zip",
+        "UserMeta"=>array(
+            "x-kss-meta-test"=>"example"
+            ),
+        "ObjectMeta"=>array(
+            "Content-Type"=>"text/plain"
+            )
+        );
+    $uploadid = $client->initMultipartUpload($args);
+    print_r($uploadid);
+    $uploadid = $uploadid["UploadId"];
+    echo $uploadid."\r\n";
+    //开始上传
 
-	$file = "D://野生动物.3gp";
-	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++){
-		echo "upload".$i."\r\n";
-		$args=array(
-			"Bucket"=>"aaphp",
-			"Key"=>"multi.zip",
-			"Options"=>array(
-				"partNumber"=>$i+1,
-				"uploadId"=>$uploadid
-				),
-			"ObjectMeta"=>array(
-				"Content-Length"=>$partsize
-				),
-			"Content"=>array(
-				"content"=>$file,
-				"seek_position"=>$partsize*$i
-				)
-			);
-		$etag = $client->uploadPart($args);
-		print_r($etag);
-		$etag = $etag["ETag"];
-	}
-	$parts = $client->listParts(array("Bucket"=>"aaphp","Key"=>"multi.zip","Options"=>array("uploadId"=>$uploadid)));
-	print_r($parts);
-	//结束上传
-	$args=array(
-		"Bucket"=>"aaphp",
-		"Key"=>"multi.zip",
-		"Options"=>array("uploadId"=>$uploadid),
-		"Parts"=>$parts["Parts"],
-		"Adp"=>array(
-			"NotifyURL"=>"http://10.4.2.38:19090/",
-			"Adps"=>array(
-				array(
-					"Command"=>"tag=avop&f=mp4&res=1280x720&vbr=1000k&abr=128k",
-					"Key"=>"野生动物-转码.3gp"
-				)
-			)
-		),
-		"CallBack"=>array(
-			"Url"=>"http://10.4.2.38:19090/",
-			"BodyMagicVariables"=>array("bucket"=>"bucket","key"=>"key"),
-			"BodyVariables"=>array("name"=>"lijunwei")
-		)
-	);
-	$result = $client->completeMultipartUpload($args);
-	print_r($result);
-	$taskid = $result["TaskID"];
-	$task = $client->getAdp(array("TaskID"=>$taskid));
-	print_r($task);
+    $file = "D://野生动物.3gp";
+    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++){
+        echo "upload".$i."\r\n";
+        $args=array(
+            "Bucket"=>"aaphp",
+            "Key"=>"multi.zip",
+            "Options"=>array(
+                "partNumber"=>$i+1,
+                "uploadId"=>$uploadid
+                ),
+            "ObjectMeta"=>array(
+                "Content-Length"=>$partsize
+                ),
+            "Content"=>array(
+                "content"=>$file,
+                "seek_position"=>$partsize*$i
+                )
+            );
+        $etag = $client->uploadPart($args);
+        print_r($etag);
+        $etag = $etag["ETag"];
+    }
+    $parts = $client->listParts(array("Bucket"=>"aaphp","Key"=>"multi.zip","Options"=>array("uploadId"=>$uploadid)));
+    print_r($parts);
+    //结束上传
+    $args=array(
+        "Bucket"=>"aaphp",
+        "Key"=>"multi.zip",
+        "Options"=>array("uploadId"=>$uploadid),
+        "Parts"=>$parts["Parts"],
+        "Adp"=>array(
+            "NotifyURL"=>"http://10.4.2.38:19090/",
+            "Adps"=>array(
+                array(
+                    "Command"=>"tag=avop&f=mp4&res=1280x720&vbr=1000k&abr=128k",
+                    "Key"=>"野生动物-转码.3gp"
+                )
+            )
+        ),
+        "CallBack"=>array(
+            "Url"=>"http://10.4.2.38:19090/",
+            "BodyMagicVariables"=>array("bucket"=>"bucket","key"=>"key"),
+            "BodyVariables"=>array("name"=>"lijunwei")
+        )
+    );
+    $result = $client->completeMultipartUpload($args);
+    print_r($result);
+    $taskid = $result["TaskID"];
+    $task = $client->getAdp(array("TaskID"=>$taskid));
+    print_r($task);
 }
 function putAdp($client){
-	$args=array(
-		"Bucket"=>"aaphp",
-		"Key"=>"multi.zip",
-		"Adp"=>array(
-			"NotifyURL"=>"http://10.4.2.38:19090/",
-			"Adps"=>array(
-				array(
-					"Command"=>"tag=avop&f=mp4&res=1280x720&vbr=1000k&abr=128k",
-					"Key"=>"野生动物-转码.3gp"
-				)
-			)
-		)
-	);
-	$result = $client->putAdp($args);
-	print_r($result);
-	$taskid = $result["TaskID"];
-	$task = $client->getAdp(array("TaskID"=>$taskid));
-	print_r($task);
+    $args=array(
+        "Bucket"=>"aaphp",
+        "Key"=>"multi.zip",
+        "Adp"=>array(
+            "NotifyURL"=>"http://10.4.2.38:19090/",
+            "Adps"=>array(
+                array(
+                    "Command"=>"tag=avop&f=mp4&res=1280x720&vbr=1000k&abr=128k",
+                    "Key"=>"野生动物-转码.3gp"
+                )
+            )
+        )
+    );
+    $result = $client->putAdp($args);
+    print_r($result);
+    $taskid = $result["TaskID"];
+    $task = $client->getAdp(array("TaskID"=>$taskid));
+    print_r($task);
 }
 function postObject($client){
 
-	$postData = array(
-		"key"=>"~!@\\#$\%^&*()_+-=qw",
-		"acl"=>"public-read"
-		);
-	$unKnowData=array("122","334");
+    $postData = array(
+        "key"=>"~!@\\#$\%^&*()_+-=qw",
+        "acl"=>"public-read"
+        );
+    $unKnowData=array("122","334");
 
-	print_r($client->postObject("ksc-scm",$postData,$unKnowData));
+    print_r($client->postObject("ksc-scm",$postData,$unKnowData));
 }
 ?>

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