diff --git a/includes/phpsvnclient/definitions.php b/includes/phpsvnclient/definitions.php deleted file mode 100644 index 2aec0ddc5a..0000000000 --- a/includes/phpsvnclient/definitions.php +++ /dev/null @@ -1,81 +0,0 @@ - - - -'); - -define("PHPSVN_NORMAL_REQUEST", -' - - - - - - -'); - -// -// - -define("PHPSVN_VERSION_REQUEST",''); -define("PHPSVN_LOGS_REQUEST",' %d%d'); - -define("SVN_LAST_MODIFIED","lp1:getlastmodified"); -define("SVN_URL","D:href"); -define("SVN_RELATIVE_URL","lp3:baseline-relative-path"); -define("SVN_FILE_ID","lp3:repository-uuid"); -define("SVN_STATUS","D:status"); -define("SVN_IN_FILE","D:propstat"); -define("SVN_FILE","D:response"); - -define("SVN_LOGS_BEGINGS","S:log-item"); -define("SVN_LOGS_VERSION","D:version-name"); -define("SVN_LOGS_AUTHOR","D:creator-displayname"); -define("SVN_LOGS_DATE","S:date"); - -// file changes. Note that we grouping ALL changed files together, -// so we will list deleted and renamed files here as well -define("SVN_LOGS_MODIFIED_FILES","S:modified-path"); -define("SVN_LOGS_ADDED_FILES","S:added-path"); -define("SVN_LOGS_DELETED_FILES","S:deleted-path"); -define("SVN_LOGS_RENAMED_FILES","S:replaced-path"); - -define("SVN_LOGS_COMMENT","D:comment"); - -define("NOT_FOUND", 2); -define("AUTH_REQUIRED", 3); -define("UNKNOWN_ERROR",4); -define("NO_ERROR",1) -?> diff --git a/includes/phpsvnclient/http.php b/includes/phpsvnclient/http.php deleted file mode 100644 index 59d80e4d23..0000000000 --- a/includes/phpsvnclient/http.php +++ /dev/null @@ -1,1985 +0,0 @@ -"01", - "Feb"=>"02", - "Mar"=>"03", - "Apr"=>"04", - "May"=>"05", - "Jun"=>"06", - "Jul"=>"07", - "Aug"=>"08", - "Sep"=>"09", - "Oct"=>"10", - "Nov"=>"11", - "Dec"=>"12"); - var $session=''; - var $connection_close=0; - - /* Private methods - DO NOT CALL */ - - Function Tokenize($string,$separator="") - { - if(!strcmp($separator,"")) - { - $separator=$string; - $string=$this->next_token; - } - for($character=0;$characternext_token=substr($string,$found+1); - return(substr($string,0,$found)); - } - else - { - $this->next_token=""; - return($string); - } - } - - Function CookieEncode($value, $name) - { - return($name ? str_replace("=", "%25", $value) : str_replace(";", "%3B", $value)); - } - - Function SetError($error) - { - return($this->error=$error); - } - - Function SetPHPError($error, &$php_error_message) - { - if(IsSet($php_error_message) - && strlen($php_error_message)) - $error.=": ".$php_error_message; - return($this->SetError($error)); - } - - Function SetDataAccessError($error,$check_connection=0) - { - $this->error=$error; - if(!$this->use_curl - && function_exists("socket_get_status")) - { - $status=socket_get_status($this->connection); - if($status["timed_out"]) - $this->error.=": data access time out"; - elseif($status["eof"]) - { - if($check_connection) - $this->error=""; - else - $this->error.=": the server disconnected"; - } - } - } - - Function OutputDebug($message) - { - $message.="\n"; - if($this->html_debug) - $message=str_replace("\n","
\n",HtmlEntities($message)); - echo $message; - flush(); - } - - Function GetLine() - { - for($line="";;) - { - if($this->use_curl) - { - $eol=strpos($this->response,"\n",$this->read_response); - $data=($eol ? substr($this->response,$this->read_response,$eol+1-$this->read_response) : ""); - $this->read_response+=strlen($data); - } - else - { - if(feof($this->connection)) - { - $this->SetDataAccessError("reached the end of data while reading from the HTTP server connection"); - return(0); - } - $data=fgets($this->connection,100); - } - if(GetType($data)!="string" - || strlen($data)==0) - { - $this->SetDataAccessError("it was not possible to read line from the HTTP server"); - return(0); - } - $line.=$data; - $length=strlen($line); - if($length - && !strcmp(substr($line,$length-1,1),"\n")) - { - $length-=(($length>=2 && !strcmp(substr($line,$length-2,1),"\r")) ? 2 : 1); - $line=substr($line,0,$length); - if($this->debug) - $this->OutputDebug("S $line"); - return($line); - } - } - } - - Function PutLine($line) - { - if($this->debug) - $this->OutputDebug("C $line"); - if(!fputs($this->connection,$line."\r\n")) - { - $this->SetDataAccessError("it was not possible to send a line to the HTTP server"); - return(0); - } - return(1); - } - - Function PutData($data) - { - if(strlen($data)) - { - if($this->debug) - $this->OutputDebug('C '.$data); - if(!fputs($this->connection,$data)) - { - $this->SetDataAccessError("it was not possible to send data to the HTTP server"); - return(0); - } - } - return(1); - } - - Function FlushData() - { - if(!fflush($this->connection)) - { - $this->SetDataAccessError("it was not possible to send data to the HTTP server"); - return(0); - } - return(1); - } - - Function ReadChunkSize() - { - if($this->remaining_chunk==0) - { - $debug=$this->debug; - if(!$this->debug_response_body) - $this->debug=0; - $line=$this->GetLine(); - $this->debug=$debug; - if(GetType($line)!="string") - return($this->SetError("4 could not read chunk start: ".$this->error)); - $this->remaining_chunk=hexdec($line); - } - return(""); - } - - Function ReadBytes($length) - { - if($this->use_curl) - { - $bytes=substr($this->response,$this->read_response,min($length,strlen($this->response)-$this->read_response)); - $this->read_response+=strlen($bytes); - if($this->debug - && $this->debug_response_body - && strlen($bytes)) - $this->OutputDebug("S ".$bytes); - } - else - { - if($this->chunked) - { - for($bytes="",$remaining=$length;$remaining;) - { - if(strlen($this->ReadChunkSize())) - return(""); - if($this->remaining_chunk==0) - { - $this->last_chunk_read=1; - break; - } - $ask=min($this->remaining_chunk,$remaining); - $chunk=@fread($this->connection,$ask); - $read=strlen($chunk); - if($read==0) - { - $this->SetDataAccessError("it was not possible to read data chunk from the HTTP server"); - return(""); - } - if($this->debug - && $this->debug_response_body) - $this->OutputDebug("S ".$chunk); - $bytes.=$chunk; - $this->remaining_chunk-=$read; - $remaining-=$read; - if($this->remaining_chunk==0) - { - if(feof($this->connection)) - return($this->SetError("reached the end of data while reading the end of data chunk mark from the HTTP server")); - $data=@fread($this->connection,2); - if(strcmp($data,"\r\n")) - { - $this->SetDataAccessError("it was not possible to read end of data chunk from the HTTP server"); - return(""); - } - } - } - } - else - { - $bytes=@fread($this->connection,$length); - if(strlen($bytes)) - { - if($this->debug - && $this->debug_response_body) - $this->OutputDebug("S ".$bytes); - } - else - $this->SetDataAccessError("it was not possible to read data from the HTTP server", $this->connection_close); - } - } - return($bytes); - } - - Function EndOfInput() - { - if($this->use_curl) - return($this->read_response>=strlen($this->response)); - if($this->chunked) - return($this->last_chunk_read); - return(feof($this->connection)); - } - - Function Resolve($domain, &$ip, $server_type) - { -// if(ereg('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$',$domain)) - if(preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/',$domain)) - $ip=$domain; - else - { - if($this->debug) - $this->OutputDebug('Resolving '.$server_type.' server domain "'.$domain.'"...'); - if(!strcmp($ip=@gethostbyname($domain),$domain)) - $ip=""; - } - if(strlen($ip)==0 - || (strlen($this->exclude_address) - && !strcmp(@gethostbyname($this->exclude_address),$ip))) - return($this->SetError("could not resolve the host domain \"".$domain."\"")); - return(''); - } - - Function Connect($host_name, $host_port, $ssl, $server_type = 'HTTP') - { - $domain=$host_name; - $port = $host_port; - if(strlen($error = $this->Resolve($domain, $ip, $server_type))) - return($error); - if(strlen($this->socks_host_name)) - { - switch($this->socks_version) - { - case '4': - $version = 4; - break; - case '5': - $version = 5; - break; - default: - return('it was not specified a supported SOCKS protocol version'); - break; - } - $host_ip = $ip; - $port = $this->socks_host_port; - $host_server_type = $server_type; - $server_type = 'SOCKS'; - if(strlen($error = $this->Resolve($this->socks_host_name, $ip, $server_type))) - return($error); - } - if($this->debug) - $this->OutputDebug('Connecting to '.$server_type.' server IP '.$ip.' port '.$port.'...'); - if($ssl) - $ip="ssl://".$ip; - if(($this->connection=($this->timeout ? @fsockopen($ip, $port, $errno, $error, $this->timeout) : @fsockopen($ip, $port, $errno)))==0) - { - switch($errno) - { - case -3: - return($this->SetError("-3 socket could not be created")); - case -4: - return($this->SetError("-4 dns lookup on hostname \"".$host_name."\" failed")); - case -5: - return($this->SetError("-5 connection refused or timed out")); - case -6: - return($this->SetError("-6 fdopen() call failed")); - case -7: - return($this->SetError("-7 setvbuf() call failed")); - default: - return($this->SetPHPError($errno." could not connect to the host \"".$host_name."\"",$php_errormsg)); - } - } - else - { - if($this->data_timeout - && function_exists("socket_set_timeout")) - socket_set_timeout($this->connection,$this->data_timeout,0); - if(strlen($this->socks_host_name)) - { - if($this->debug) - $this->OutputDebug('Connected to the SOCKS server '.$this->socks_host_name); - $send_error = 'it was not possible to send data to the SOCKS server'; - $receive_error = 'it was not possible to receive data from the SOCKS server'; - switch($version) - { - case 4: - $command = 1; - if(!fputs($this->connection, chr($version).chr($command).pack('nN', $host_port, ip2long($host_ip)).$this->user.Chr(0))) - $error = $this->SetDataAccessError($send_error); - else - { - $response = fgets($this->connection, 9); - if(strlen($response) != 8) - $error = $this->SetDataAccessError($receive_error); - else - { - $socks_errors = array( - "\x5a"=>'', - "\x5b"=>'request rejected', - "\x5c"=>'request failed because client is not running identd (or not reachable from the server)', - "\x5d"=>'request failed because client\'s identd could not confirm the user ID string in the request', - ); - $error_code = $response[1]; - $error = (IsSet($socks_errors[$error_code]) ? $socks_errors[$error_code] : 'unknown'); - if(strlen($error)) - $error = 'SOCKS error: '.$error; - } - } - break; - case 5: - if($this->debug) - $this->OutputDebug('Negotiating the authentication method ...'); - $methods = 1; - $method = 0; - if(!fputs($this->connection, chr($version).chr($methods).chr($method))) - $error = $this->SetDataAccessError($send_error); - else - { - $response = fgets($this->connection, 3); - if(strlen($response) != 2) - $error = $this->SetDataAccessError($receive_error); - elseif(Ord($response[1]) != $method) - $error = 'the SOCKS server requires an authentication method that is not yet supported'; - else - { - if($this->debug) - $this->OutputDebug('Connecting to '.$host_server_type.' server IP '.$host_ip.' port '.$host_port.'...'); - $command = 1; - $address_type = 1; - if(!fputs($this->connection, chr($version).chr($command)."\x00".chr($address_type).pack('Nn', ip2long($host_ip), $host_port))) - $error = $this->SetDataAccessError($send_error); - else - { - $response = fgets($this->connection, 11); - if(strlen($response) != 10) - $error = $this->SetDataAccessError($receive_error); - else - { - $socks_errors = array( - "\x00"=>'', - "\x01"=>'general SOCKS server failure', - "\x02"=>'connection not allowed by ruleset', - "\x03"=>'Network unreachable', - "\x04"=>'Host unreachable', - "\x05"=>'Connection refused', - "\x06"=>'TTL expired', - "\x07"=>'Command not supported', - "\x08"=>'Address type not supported' - ); - $error_code = $response[1]; - $error = (IsSet($socks_errors[$error_code]) ? $socks_errors[$error_code] : 'unknown'); - if(strlen($error)) - $error = 'SOCKS error: '.$error; - } - } - } - } - break; - default: - $error = 'support for SOCKS protocol version '.$this->socks_version.' is not yet implemented'; - break; - } - if(strlen($error)) - { - fclose($this->connection); - return($error); - } - } - if($this->debug) - $this->OutputDebug("Connected to $host_name"); - if(strlen($this->proxy_host_name) - && !strcmp(strtolower($this->protocol), 'https')) - { - if(function_exists('stream_socket_enable_crypto') - && in_array('ssl', stream_get_transports())) - $this->state = "ConnectedToProxy"; - else - { - $this->OutputDebug("It is not possible to start SSL after connecting to the proxy server. If the proxy refuses to forward the SSL request, you may need to upgrade to PHP 5.1 or later with OpenSSL support enabled."); - $this->state="Connected"; - } - } - else - $this->state="Connected"; - return(""); - } - } - - Function Disconnect() - { - if($this->debug) - $this->OutputDebug("Disconnected from ".$this->host_name); - if($this->use_curl) - { - curl_close($this->connection); - $this->response=""; - } - else - fclose($this->connection); - $this->state="Disconnected"; - return(""); - } - - /* Public methods */ - - Function GetRequestArguments($url, &$arguments) - { - if(strlen($this->error)) - return($this->error); - $arguments=array(); - $parameters=@parse_url($url); - - if(!$parameters) - return($this->SetError("it was not specified a valid URL")); - if(!IsSet($parameters["scheme"])) - return($this->SetError("it was not specified the protocol type argument")); - switch(strtolower($parameters["scheme"])) - { - case "http": - case "https": - $arguments["Protocol"]=$parameters["scheme"]; - break; - default: - return($parameters["scheme"]." connection scheme is not yet supported"); - } - if(!IsSet($parameters["host"])) - return($this->SetError("it was not specified the connection host argument")); - $arguments["HostName"]=$parameters["host"]; - $arguments["Headers"]=array("Host"=>$parameters["host"].(IsSet($parameters["port"]) ? ":".$parameters["port"] : "")); - if(IsSet($parameters["user"])) - { - $arguments["AuthUser"]=UrlDecode($parameters["user"]); - if(!IsSet($parameters["pass"])) - $arguments["AuthPassword"]=""; - } - if(IsSet($parameters["pass"])) - { - if(!IsSet($parameters["user"])) - $arguments["AuthUser"]=""; - $arguments["AuthPassword"]=UrlDecode($parameters["pass"]); - } - if(IsSet($parameters["port"])) - { - if(strcmp($parameters["port"],strval(intval($parameters["port"])))) - return($this->SetError("it was not specified a valid connection host argument")); - $arguments["HostPort"]=intval($parameters["port"]); - } - else - $arguments["HostPort"]=0; - $arguments["RequestURI"]=(IsSet($parameters["path"]) ? $parameters["path"] : "/").(IsSet($parameters["query"]) ? "?".$parameters["query"] : ""); - if(strlen($this->user_agent)) - $arguments["Headers"]["User-Agent"]=$this->user_agent; - return(""); - } - - Function Open($arguments) - { - if(strlen($this->error)) - return($this->error); - if($this->state!="Disconnected") - return("1 already connected"); - if(IsSet($arguments["HostName"])) - $this->host_name=$arguments["HostName"]; - if(IsSet($arguments["HostPort"])) - $this->host_port=$arguments["HostPort"]; - if(IsSet($arguments["ProxyHostName"])) - $this->proxy_host_name=$arguments["ProxyHostName"]; - if(IsSet($arguments["ProxyHostPort"])) - $this->proxy_host_port=$arguments["ProxyHostPort"]; - if(IsSet($arguments["SOCKSHostName"])) - $this->socks_host_name=$arguments["SOCKSHostName"]; - if(IsSet($arguments["SOCKSHostPort"])) - $this->socks_host_port=$arguments["SOCKSHostPort"]; - if(IsSet($arguments["SOCKSVersion"])) - $this->socks_version=$arguments["SOCKSVersion"]; - if(IsSet($arguments["Protocol"])) - $this->protocol=$arguments["Protocol"]; - switch(strtolower($this->protocol)) - { - case "http": - $default_port=80; - break; - case "https": - $default_port=443; - break; - default: - return($this->SetError("2 it was not specified a valid connection protocol")); - } - if(strlen($this->proxy_host_name)==0) - { - if(strlen($this->host_name)==0) - return($this->SetError("2 it was not specified a valid hostname")); - $host_name=$this->host_name; - $host_port=($this->host_port ? $this->host_port : $default_port); - $server_type = 'HTTP'; - } - else - { - $host_name=$this->proxy_host_name; - $host_port=$this->proxy_host_port; - $server_type = 'HTTP proxy'; - } - $ssl=(strtolower($this->protocol)=="https" && strlen($this->proxy_host_name)==0); - if($ssl - && strlen($this->socks_host_name)) - return($this->SetError('establishing SSL connections via a SOCKS server is not yet supported')); - $this->use_curl=($ssl && $this->prefer_curl && function_exists("curl_init")); - if($this->debug) - $this->OutputDebug("Connecting to ".$this->host_name); - if($this->use_curl) - { - $error=(($this->connection=curl_init($this->protocol."://".$this->host_name.($host_port==$default_port ? "" : ":".strval($host_port))."/")) ? "" : "Could not initialize a CURL session"); - if(strlen($error)==0) - { - if(IsSet($arguments["SSLCertificateFile"])) - curl_setopt($this->connection,CURLOPT_SSLCERT,$arguments["SSLCertificateFile"]); - if(IsSet($arguments["SSLCertificatePassword"])) - curl_setopt($this->connection,CURLOPT_SSLCERTPASSWD,$arguments["SSLCertificatePassword"]); - if(IsSet($arguments["SSLKeyFile"])) - curl_setopt($this->connection,CURLOPT_SSLKEY,$arguments["SSLKeyFile"]); - if(IsSet($arguments["SSLKeyPassword"])) - curl_setopt($this->connection,CURLOPT_SSLKEYPASSWD,$arguments["SSLKeyPassword"]); - } - $this->state="Connected"; - } - else - { - $error=""; - if(strlen($this->proxy_host_name) - && (IsSet($arguments["SSLCertificateFile"]) - || IsSet($arguments["SSLCertificateFile"]))) - $error="establishing SSL connections using certificates or private keys via non-SSL proxies is not supported"; - else - { - if($ssl) - { - if(IsSet($arguments["SSLCertificateFile"])) - $error="establishing SSL connections using certificates is only supported when the cURL extension is enabled"; - elseif(IsSet($arguments["SSLKeyFile"])) - $error="establishing SSL connections using a private key is only supported when the cURL extension is enabled"; - else - { - $version=explode(".",function_exists("phpversion") ? phpversion() : "3.0.7"); - $php_version=intval($version[0])*1000000+intval($version[1])*1000+intval($version[2]); - if($php_version<4003000) - $error="establishing SSL connections requires at least PHP version 4.3.0 or having the cURL extension enabled"; - elseif(!function_exists("extension_loaded") - || !extension_loaded("openssl")) - $error="establishing SSL connections requires the OpenSSL extension enabled"; - } - } - if(strlen($error)==0) - $error=$this->Connect($host_name, $host_port, $ssl, $server_type); - } - } - if(strlen($error)) - return($this->SetError($error)); - $this->session=md5(uniqid("")); - return(""); - } - - Function Close() - { - if($this->state=="Disconnected") - return("1 already disconnected"); - $error=$this->Disconnect(); - if(strlen($error)==0) - $this->state="Disconnected"; - return($error); - } - - Function PickCookies(&$cookies,$secure) - { - if(IsSet($this->cookies[$secure])) - { - $now=gmdate("Y-m-d H-i-s"); - for($domain=0,Reset($this->cookies[$secure]);$domaincookies[$secure]);Next($this->cookies[$secure]),$domain++) - { - $domain_pattern=Key($this->cookies[$secure]); - $match=strlen($this->request_host)-strlen($domain_pattern); - if($match>=0 - && !strcmp($domain_pattern,substr($this->request_host,$match)) - && ($match==0 - || $domain_pattern[0]=="." - || $this->request_host[$match-1]==".")) - { - for(Reset($this->cookies[$secure][$domain_pattern]),$path_part=0;$path_partcookies[$secure][$domain_pattern]);Next($this->cookies[$secure][$domain_pattern]),$path_part++) - { - $path=Key($this->cookies[$secure][$domain_pattern]); - if(strlen($this->request_uri)>=strlen($path) - && substr($this->request_uri,0,strlen($path))==$path) - { - for(Reset($this->cookies[$secure][$domain_pattern][$path]),$cookie=0;$cookiecookies[$secure][$domain_pattern][$path]);Next($this->cookies[$secure][$domain_pattern][$path]),$cookie++) - { - $cookie_name=Key($this->cookies[$secure][$domain_pattern][$path]); - $expires=$this->cookies[$secure][$domain_pattern][$path][$cookie_name]["expires"]; - if($expires=="" - || strcmp($now,$expires)<0) - $cookies[$cookie_name]=$this->cookies[$secure][$domain_pattern][$path][$cookie_name]; - } - } - } - } - } - } - } - - Function GetFileDefinition($file, &$definition) - { - $name=""; - if(IsSet($file["FileName"])) - $name=basename($file["FileName"]); - if(IsSet($file["Name"])) - $name=$file["Name"]; - if(strlen($name)==0) - return("it was not specified the file part name"); - if(IsSet($file["Content-Type"])) - { - $content_type=$file["Content-Type"]; - $type=$this->Tokenize(strtolower($content_type),"/"); - $sub_type=$this->Tokenize(""); - switch($type) - { - case "text": - case "image": - case "audio": - case "video": - case "application": - case "message": - break; - case "automatic": - switch($sub_type) - { - case "name": - switch(GetType($dot=strrpos($name,"."))=="integer" ? strtolower(substr($name,$dot)) : "") - { - case ".xls": - $content_type="application/excel"; - break; - case ".hqx": - $content_type="application/macbinhex40"; - break; - case ".doc": - case ".dot": - case ".wrd": - $content_type="application/msword"; - break; - case ".pdf": - $content_type="application/pdf"; - break; - case ".pgp": - $content_type="application/pgp"; - break; - case ".ps": - case ".eps": - case ".ai": - $content_type="application/postscript"; - break; - case ".ppt": - $content_type="application/powerpoint"; - break; - case ".rtf": - $content_type="application/rtf"; - break; - case ".tgz": - case ".gtar": - $content_type="application/x-gtar"; - break; - case ".gz": - $content_type="application/x-gzip"; - break; - case ".php": - case ".php3": - $content_type="application/x-httpd-php"; - break; - case ".js": - $content_type="application/x-javascript"; - break; - case ".ppd": - case ".psd": - $content_type="application/x-photoshop"; - break; - case ".swf": - case ".swc": - case ".rf": - $content_type="application/x-shockwave-flash"; - break; - case ".tar": - $content_type="application/x-tar"; - break; - case ".zip": - $content_type="application/zip"; - break; - case ".mid": - case ".midi": - case ".kar": - $content_type="audio/midi"; - break; - case ".mp2": - case ".mp3": - case ".mpga": - $content_type="audio/mpeg"; - break; - case ".ra": - $content_type="audio/x-realaudio"; - break; - case ".wav": - $content_type="audio/wav"; - break; - case ".bmp": - $content_type="image/bitmap"; - break; - case ".gif": - $content_type="image/gif"; - break; - case ".iff": - $content_type="image/iff"; - break; - case ".jb2": - $content_type="image/jb2"; - break; - case ".jpg": - case ".jpe": - case ".jpeg": - $content_type="image/jpeg"; - break; - case ".jpx": - $content_type="image/jpx"; - break; - case ".png": - $content_type="image/png"; - break; - case ".tif": - case ".tiff": - $content_type="image/tiff"; - break; - case ".wbmp": - $content_type="image/vnd.wap.wbmp"; - break; - case ".xbm": - $content_type="image/xbm"; - break; - case ".css": - $content_type="text/css"; - break; - case ".txt": - $content_type="text/plain"; - break; - case ".htm": - case ".html": - $content_type="text/html"; - break; - case ".xml": - $content_type="text/xml"; - break; - case ".mpg": - case ".mpe": - case ".mpeg": - $content_type="video/mpeg"; - break; - case ".qt": - case ".mov": - $content_type="video/quicktime"; - break; - case ".avi": - $content_type="video/x-ms-video"; - break; - case ".eml": - $content_type="message/rfc822"; - break; - default: - $content_type="application/octet-stream"; - break; - } - break; - default: - return($content_type." is not a supported automatic content type detection method"); - } - break; - default: - return($content_type." is not a supported file content type"); - } - } - else - $content_type="application/octet-stream"; - $definition=array( - "Content-Type"=>$content_type, - "NAME"=>$name - ); - if(IsSet($file["FileName"])) - { - if(GetType($length=@filesize($file["FileName"]))!="integer") - { - $error="it was not possible to determine the length of the file ".$file["FileName"]; - if(IsSet($php_errormsg) - && strlen($php_errormsg)) - $error.=": ".$php_errormsg; - if(!file_exists($file["FileName"])) - $error="it was not possible to access the file ".$file["FileName"]; - return($error); - } - $definition["FILENAME"]=$file["FileName"]; - $definition["Content-Length"]=$length; - } - elseif(IsSet($file["Data"])) - $definition["Content-Length"]=strlen($definition["DATA"]=$file["Data"]); - else - return("it was not specified a valid file name"); - return(""); - } - - Function ConnectFromProxy($arguments, &$headers) - { - if(!$this->PutLine('CONNECT '.$this->host_name.':'.($this->host_port ? $this->host_port : 443).' HTTP/1.0') - || (strlen($this->user_agent) - && !$this->PutLine('User-Agent: '.$this->user_agent)) - || (IsSet($arguments['Headers']['Proxy-Authorization']) - && !$this->PutLine('Proxy-Authorization: '.$arguments['Headers']['Proxy-Authorization'])) - || !$this->PutLine('')) - { - $this->Disconnect(); - return($this->error); - } - $this->state = "ConnectSent"; - if(strlen($error=$this->ReadReplyHeadersResponse($headers))) - return($error); - $proxy_authorization=""; - while(!strcmp($this->response_status, "100")) - { - $this->state="ConnectSent"; - if(strlen($error=$this->ReadReplyHeadersResponse($headers))) - return($error); - } - switch($this->response_status) - { - case "200": - if(!@stream_socket_enable_crypto($this->connection, 1, STREAM_CRYPTO_METHOD_SSLv23_CLIENT)) - { - $this->SetPHPError('it was not possible to start a SSL encrypted connection via this proxy', $php_errormsg); - $this->Disconnect(); - return($this->error); - } - $this->state = "Connected"; - break; - case "407": - if(strlen($error=$this->Authenticate($headers, -1, $proxy_authorization, $this->proxy_request_user, $this->proxy_request_password, $this->proxy_request_realm, $this->proxy_request_workstation))) - return($error); - break; - default: - return($this->SetError("unable to send request via proxy")); - } - return(""); - } - - Function SendRequest($arguments) - { - if(strlen($this->error)) - return($this->error); - if(IsSet($arguments["ProxyUser"])) - $this->proxy_request_user=$arguments["ProxyUser"]; - elseif(IsSet($this->proxy_user)) - $this->proxy_request_user=$this->proxy_user; - if(IsSet($arguments["ProxyPassword"])) - $this->proxy_request_password=$arguments["ProxyPassword"]; - elseif(IsSet($this->proxy_password)) - $this->proxy_request_password=$this->proxy_password; - if(IsSet($arguments["ProxyRealm"])) - $this->proxy_request_realm=$arguments["ProxyRealm"]; - elseif(IsSet($this->proxy_realm)) - $this->proxy_request_realm=$this->proxy_realm; - if(IsSet($arguments["ProxyWorkstation"])) - $this->proxy_request_workstation=$arguments["ProxyWorkstation"]; - elseif(IsSet($this->proxy_workstation)) - $this->proxy_request_workstation=$this->proxy_workstation; - switch($this->state) - { - case "Disconnected": - return($this->SetError("1 connection was not yet established")); - case "Connected": - $connect = 0; - break; - case "ConnectedToProxy": - if(strlen($error = $this->ConnectFromProxy($arguments, $headers))) - return($error); - $connect = 1; - break; - default: - return($this->SetError("2 can not send request in the current connection state")); - } - if(IsSet($arguments["RequestMethod"])) - $this->request_method=$arguments["RequestMethod"]; - if(IsSet($arguments["User-Agent"])) - $this->user_agent=$arguments["User-Agent"]; - if(!IsSet($arguments["Headers"]["User-Agent"]) - && strlen($this->user_agent)) - $arguments["Headers"]["User-Agent"]=$this->user_agent; - if(strlen($this->request_method)==0) - return($this->SetError("3 it was not specified a valid request method")); - if(IsSet($arguments["RequestURI"])) - $this->request_uri=$arguments["RequestURI"]; - if(strlen($this->request_uri)==0 - || substr($this->request_uri,0,1)!="/") - return($this->SetError("4 it was not specified a valid request URI")); - $this->request_arguments=$arguments; - $this->request_headers=(IsSet($arguments["Headers"]) ? $arguments["Headers"] : array()); - $body_length=0; - $this->request_body=""; - $get_body=1; - if($this->request_method=="POST" - || $this->request_method=="PUT") - { - if(IsSet($arguments['StreamRequest'])) - { - $get_body = 0; - $this->request_headers["Transfer-Encoding"]="chunked"; - } - elseif(IsSet($arguments["PostFiles"]) - || ($this->force_multipart_form_post - && IsSet($arguments["PostValues"]))) - { - $boundary="--".md5(uniqid(time())); - $this->request_headers["Content-Type"]="multipart/form-data; boundary=".$boundary.(IsSet($arguments["CharSet"]) ? "; charset=".$arguments["CharSet"] : ""); - $post_parts=array(); - if(IsSet($arguments["PostValues"])) - { - $values=$arguments["PostValues"]; - if(GetType($values)!="array") - return($this->SetError("5 it was not specified a valid POST method values array")); - for(Reset($values),$value=0;$value$headers,"DATA"=>$data); - $body_length+=strlen($headers)+strlen($data)+strlen("\r\n"); - } - } - $body_length+=strlen("--".$boundary."--\r\n"); - $files=(IsSet($arguments["PostFiles"]) ? $arguments["PostFiles"] : array()); - Reset($files); - $end=(GetType($input=Key($files))!="string"); - for(;!$end;) - { - if(strlen($error=$this->GetFileDefinition($files[$input],$definition))) - return("3 ".$error); - $headers="--".$boundary."\r\nContent-Disposition: form-data; name=\"".$input."\"; filename=\"".$definition["NAME"]."\"\r\nContent-Type: ".$definition["Content-Type"]."\r\n\r\n"; - $part=count($post_parts); - $post_parts[$part]=array("HEADERS"=>$headers); - if(IsSet($definition["FILENAME"])) - { - $post_parts[$part]["FILENAME"]=$definition["FILENAME"]; - $data=""; - } - else - $data=$definition["DATA"]; - $post_parts[$part]["DATA"]=$data; - $body_length+=strlen($headers)+$definition["Content-Length"]+strlen("\r\n"); - Next($files); - $end=(GetType($input=Key($files))!="string"); - } - $get_body=0; - } - elseif(IsSet($arguments["PostValues"])) - { - $values=$arguments["PostValues"]; - if(GetType($values)!="array") - return($this->SetError("5 it was not specified a valid POST method values array")); - for(Reset($values),$value=0;$value0) - $this->request_body.="&"; - $this->request_body.=UrlEncode($k)."=".UrlEncode($values[$k][$v]); - } - } - else - { - if($value>0) - $this->request_body.="&"; - $this->request_body.=UrlEncode($k)."=".UrlEncode($values[$k]); - } - } - $this->request_headers["Content-Type"]="application/x-www-form-urlencoded".(IsSet($arguments["CharSet"]) ? "; charset=".$arguments["CharSet"] : ""); - $get_body=0; - } - } - if($get_body - && (IsSet($arguments["Body"]) - || IsSet($arguments["BodyStream"]))) - { - if(IsSet($arguments["Body"])) - $this->request_body=$arguments["Body"]; - else - { - $stream=$arguments["BodyStream"]; - $this->request_body=""; - for($part=0; $partrequest_body.=$stream[$part]["Data"]; - elseif(IsSet($stream[$part]["File"])) - { - if(!($file=@fopen($stream[$part]["File"],"rb"))) - return($this->SetPHPError("could not open upload file ".$stream[$part]["File"], $php_errormsg)); - while(!feof($file)) - { - if(GetType($block=@fread($file,$this->file_buffer_length))!="string") - { - $error=$this->SetPHPError("could not read body stream file ".$stream[$part]["File"], $php_errormsg); - fclose($file); - return($error); - } - $this->request_body.=$block; - } - fclose($file); - } - else - return("5 it was not specified a valid file or data body stream element at position ".$part); - } - } - if(!IsSet($this->request_headers["Content-Type"])) - $this->request_headers["Content-Type"]="application/octet-stream".(IsSet($arguments["CharSet"]) ? "; charset=".$arguments["CharSet"] : ""); - } - if(IsSet($arguments["AuthUser"])) - $this->request_user=$arguments["AuthUser"]; - elseif(IsSet($this->user)) - $this->request_user=$this->user; - if(IsSet($arguments["AuthPassword"])) - $this->request_password=$arguments["AuthPassword"]; - elseif(IsSet($this->password)) - $this->request_password=$this->password; - if(IsSet($arguments["AuthRealm"])) - $this->request_realm=$arguments["AuthRealm"]; - elseif(IsSet($this->realm)) - $this->request_realm=$this->realm; - if(IsSet($arguments["AuthWorkstation"])) - $this->request_workstation=$arguments["AuthWorkstation"]; - elseif(IsSet($this->workstation)) - $this->request_workstation=$this->workstation; - if(strlen($this->proxy_host_name)==0 - || $connect) - $request_uri=$this->request_uri; - else - { - switch(strtolower($this->protocol)) - { - case "http": - $default_port=80; - break; - case "https": - $default_port=443; - break; - } - $request_uri=strtolower($this->protocol)."://".$this->host_name.(($this->host_port==0 || $this->host_port==$default_port) ? "" : ":".$this->host_port).$this->request_uri; - } - if($this->use_curl) - { - $version=(GetType($v=curl_version())=="array" ? (IsSet($v["version"]) ? $v["version"] : "0.0.0") : (ereg("^libcurl/([0-9]+\\.[0-9]+\\.[0-9]+)",$v,$m) ? $m[1] : "0.0.0")); - $curl_version=100000*intval($this->Tokenize($version,"."))+1000*intval($this->Tokenize("."))+intval($this->Tokenize("")); - $protocol_version=($curl_version<713002 ? "1.0" : $this->protocol_version); - } - else - $protocol_version=$this->protocol_version; - $this->request=$this->request_method." ".$request_uri." HTTP/".$protocol_version; - if($body_length - || ($body_length=strlen($this->request_body))) - $this->request_headers["Content-Length"]=$body_length; - for($headers=array(),$host_set=0,Reset($this->request_headers),$header=0;$headerrequest_headers);Next($this->request_headers),$header++) - { - $header_name=Key($this->request_headers); - $header_value=$this->request_headers[$header_name]; - if(GetType($header_value)=="array") - { - for(Reset($header_value),$value=0;$valuerequest_headers))=="host") - { - $this->request_host=strtolower($header_value); - $host_set=1; - } - } - if(!$host_set) - { - $headers[]="Host: ".$this->host_name; - $this->request_host=strtolower($this->host_name); - } - if(count($this->cookies)) - { - $cookies=array(); - $this->PickCookies($cookies,0); - if(strtolower($this->protocol)=="https") - $this->PickCookies($cookies,1); - if(count($cookies)) - { - $h=count($headers); - $headers[$h]="Cookie:"; - for(Reset($cookies),$cookie=0;$cookieuse_curl) - { - if(IsSet($arguments['StreamRequest'])) - return($this->SetError("Streaming request data is not supported when using Curl")); - if($body_length - && strlen($this->request_body)==0) - { - for($request_body="",$success=1,$part=0;$partSetPHPError("could not open upload file ".$post_parts[$part]["FILENAME"], $php_errormsg); - $success=0; - break; - } - while(!feof($file)) - { - if(GetType($block=@fread($file,$this->file_buffer_length))!="string") - { - $this->SetPHPError("could not read upload file", $php_errormsg); - $success=0; - break; - } - $request_body.=$block; - } - fclose($file); - if(!$success) - break; - } - $request_body.="\r\n"; - } - $request_body.="--".$boundary."--\r\n"; - } - else - $request_body=$this->request_body; - curl_setopt($this->connection,CURLOPT_HEADER,1); - curl_setopt($this->connection,CURLOPT_RETURNTRANSFER,1); - if($this->timeout) - curl_setopt($this->connection,CURLOPT_TIMEOUT,$this->timeout); - curl_setopt($this->connection,CURLOPT_SSL_VERIFYPEER,0); - curl_setopt($this->connection,CURLOPT_SSL_VERIFYHOST,0); - $request=$this->request."\r\n".implode("\r\n",$headers)."\r\n\r\n".$request_body; - curl_setopt($this->connection,CURLOPT_CUSTOMREQUEST,$request); - if($this->debug) - $this->OutputDebug("C ".$request); - if(!($success=(strlen($this->response=curl_exec($this->connection))!=0))) - { - $error=curl_error($this->connection); - $this->SetError("Could not execute the request".(strlen($error) ? ": ".$error : "")); - } - } - else - { - if(($success=$this->PutLine($this->request))) - { - for($header=0;$headerPutLine($headers[$header])) - break; - } - if($success - && ($success=$this->PutLine(""))) - { - if(IsSet($arguments['StreamRequest'])) - $next_state = "SendingRequestBody"; - elseif($body_length) - { - if(strlen($this->request_body)) - $success=$this->PutData($this->request_body); - else - { - for($part=0;$partPutData($post_parts[$part]["HEADERS"])) - || !($success=$this->PutData($post_parts[$part]["DATA"]))) - break; - if(IsSet($post_parts[$part]["FILENAME"])) - { - if(!($file=@fopen($post_parts[$part]["FILENAME"],"rb"))) - { - $this->SetPHPError("could not open upload file ".$post_parts[$part]["FILENAME"], $php_errormsg); - $success=0; - break; - } - while(!feof($file)) - { - if(GetType($block=@fread($file,$this->file_buffer_length))!="string") - { - $this->SetPHPError("could not read upload file", $php_errormsg); - $success=0; - break; - } - if(!($success=$this->PutData($block))) - break; - } - fclose($file); - if(!$success) - break; - } - if(!($success=$this->PutLine(""))) - break; - } - if($success) - $success=$this->PutLine("--".$boundary."--"); - } - if($success) - $sucess=$this->FlushData(); - } - } - } - } - if(!$success) - return($this->SetError("5 could not send the HTTP request: ".$this->error)); - $this->state=$next_state; - return(""); - } - - Function SetCookie($name, $value, $expires="" , $path="/" , $domain="" , $secure=0, $verbatim=0) - { - if(strlen($this->error)) - return($this->error); - if(strlen($name)==0) - return($this->SetError("it was not specified a valid cookie name")); - if(strlen($path)==0 - || strcmp($path[0],"/")) - return($this->SetError($path." is not a valid path for setting cookie ".$name)); - if($domain=="" - || !strpos($domain,".",$domain[0]=="." ? 1 : 0)) - return($this->SetError($domain." is not a valid domain for setting cookie ".$name)); - $domain=strtolower($domain); - if(!strcmp($domain[0],".")) - $domain=substr($domain,1); - if(!$verbatim) - { - $name=$this->CookieEncode($name,1); - $value=$this->CookieEncode($value,0); - } - $secure=intval($secure); - $this->cookies[$secure][$domain][$path][$name]=array( - "name"=>$name, - "value"=>$value, - "domain"=>$domain, - "path"=>$path, - "expires"=>$expires, - "secure"=>$secure - ); - return(""); - } - - Function SendRequestBody($data, $end_of_data) - { - if(strlen($this->error)) - return($this->error); - switch($this->state) - { - case "Disconnected": - return($this->SetError("1 connection was not yet established")); - case "Connected": - case "ConnectedToProxy": - return($this->SetError("2 request was not sent")); - case "SendingRequestBody": - break; - case "RequestSent": - return($this->SetError("3 request body was already sent")); - default: - return($this->SetError("4 can not send the request body in the current connection state")); - } - $length = strlen($data); - if($length) - { - $size = dechex($length)."\r\n"; - if(!$this->PutData($size) - || !$this->PutData($data)) - return($this->error); - } - if($end_of_data) - { - $size = "0\r\n"; - if(!$this->PutData($size)) - return($this->error); - $this->state = "RequestSent"; - } - return(""); - } - - Function ReadReplyHeadersResponse(&$headers) - { - $headers=array(); - if(strlen($this->error)) - return($this->error); - switch($this->state) - { - case "Disconnected": - return($this->SetError("1 connection was not yet established")); - case "Connected": - return($this->SetError("2 request was not sent")); - case "ConnectedToProxy": - return($this->SetError("2 connection from the remote server from the proxy was not yet established")); - case "SendingRequestBody": - return($this->SetError("4 request body data was not completely sent")); - case "ConnectSent": - $connect = 1; - break; - case "RequestSent": - $connect = 0; - break; - default: - return($this->SetError("3 can not get request headers in the current connection state")); - } - $this->content_length=$this->read_length=$this->read_response=$this->remaining_chunk=0; - $this->content_length_set=$this->chunked=$this->last_chunk_read=$chunked=0; - $this->connection_close=0; - for($this->response_status="";;) - { - $line=$this->GetLine(); - if(GetType($line)!="string") - return($this->SetError("4 could not read request reply: ".$this->error)); - if(strlen($this->response_status)==0) - { -// if(!eregi($match="^http/[0-9]+\\.[0-9]+[ \t]+([0-9]+)[ \t]*(.*)\$",$line,$matches)) - if(!preg_match("~^http/[0-9]+\\.[0-9]+[ \t]+([0-9]+)[ \t]*(.*)\$~i",$line,$matches)) - return($this->SetError("3 it was received an unexpected HTTP response status")); - $this->response_status=$matches[1]; - $this->response_message=$matches[2]; - } - if($line=="") - { - if(strlen($this->response_status)==0) - return($this->SetError("3 it was not received HTTP response status")); - $this->state=($connect ? "GotConnectHeaders" : "GotReplyHeaders"); - break; - } - $header_name=strtolower($this->Tokenize($line,":")); - $header_value=Trim(Chop($this->Tokenize("\r\n"))); - if(IsSet($headers[$header_name])) - { - if(GetType($headers[$header_name])=="string") - $headers[$header_name]=array($headers[$header_name]); - $headers[$header_name][]=$header_value; - } - else - $headers[$header_name]=$header_value; - if(!$connect) - { - switch($header_name) - { - case "content-length": - $this->content_length=intval($headers[$header_name]); - $this->content_length_set=1; - break; - case "transfer-encoding": - $encoding=$this->Tokenize($header_value,"; \t"); - if(!$this->use_curl - && !strcmp($encoding,"chunked")) - $chunked=1; - break; - case "set-cookie": - if($this->support_cookies) - { - if(GetType($headers[$header_name])=="array") - $cookie_headers=$headers[$header_name]; - else - $cookie_headers=array($headers[$header_name]); - for($cookie=0;$cookieTokenize($cookie_headers[$cookie],"=")); - $cookie_value=$this->Tokenize(";"); - $domain=$this->request_host; - $path="/"; - $expires=""; - $secure=0; - while(($name=trim(UrlDecode($this->Tokenize("="))))!="") - { - $value=UrlDecode($this->Tokenize(";")); - switch($name) - { - case "domain": - $domain=$value; - break; - case "path": - $path=$value; - break; - case "expires": - if(ereg("^((Mon|Monday|Tue|Tuesday|Wed|Wednesday|Thu|Thursday|Fri|Friday|Sat|Saturday|Sun|Sunday), )?([0-9]{2})\\-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\\-([0-9]{2,4}) ([0-9]{2})\\:([0-9]{2})\\:([0-9]{2}) GMT\$",$value,$matches)) - { - $year=intval($matches[5]); - if($year<1900) - $year+=($year<70 ? 2000 : 1900); - $expires="$year-".$this->months[$matches[4]]."-".$matches[3]." ".$matches[6].":".$matches[7].":".$matches[8]; - } - break; - case "secure": - $secure=1; - break; - } - } - if(strlen($this->SetCookie($cookie_name, $cookie_value, $expires, $path , $domain, $secure, 1))) - $this->error=""; - } - } - break; - case "connection": - $this->connection_close=!strcmp(strtolower($header_value),"close"); - break; - } - } - } - $this->chunked=$chunked; - if($this->content_length_set) - $this->connection_close=0; - return(""); - } - - Function Redirect(&$headers) - { - if($this->follow_redirect) - { - if(!IsSet($headers["location"]) - || (GetType($headers["location"])!="array" - && strlen($location=$headers["location"])==0) - || (GetType($headers["location"])=="array" - && strlen($location=$headers["location"][0])==0)) - return($this->SetError("3 it was received a redirect without location URL")); - if(strcmp($location[0],"/")) - { - $location_arguments=parse_url($location); - if(!IsSet($location_arguments["scheme"])) - $location=((GetType($end=strrpos($this->request_uri,"/"))=="integer" && $end>1) ? substr($this->request_uri,0,$end) : "")."/".$location; - } - if(!strcmp($location[0],"/")) - $location=$this->protocol."://".$this->host_name.($this->host_port ? ":".$this->host_port : "").$location; - $error=$this->GetRequestArguments($location,$arguments); - if(strlen($error)) - return($this->SetError("could not process redirect url: ".$error)); - $arguments["RequestMethod"]="GET"; - if(strlen($error=$this->Close())==0 - && strlen($error=$this->Open($arguments))==0 - && strlen($error=$this->SendRequest($arguments))==0) - { - $this->redirection_level++; - if($this->redirection_level>$this->redirection_limit) - $error="it was exceeded the limit of request redirections"; - else - $error=$this->ReadReplyHeaders($headers); - $this->redirection_level--; - } - if(strlen($error)) - return($this->SetError($error)); - } - return(""); - } - - Function Authenticate(&$headers, $proxy, &$proxy_authorization, &$user, &$password, &$realm, &$workstation) - { - if($proxy) - { - $authenticate_header="proxy-authenticate"; - $authorization_header="Proxy-Authorization"; - $authenticate_status="407"; - $authentication_mechanism=$this->proxy_authentication_mechanism; - } - else - { - $authenticate_header="www-authenticate"; - $authorization_header="Authorization"; - $authenticate_status="401"; - $authentication_mechanism=$this->authentication_mechanism; - } - if(IsSet($headers[$authenticate_header])) - { - if(function_exists("class_exists") - && !class_exists("sasl_client_class")) - return($this->SetError("the SASL client class needs to be loaded to be able to authenticate".($proxy ? " with the proxy server" : "")." and access this site")); - if(GetType($headers[$authenticate_header])=="array") - $authenticate=$headers[$authenticate_header]; - else - $authenticate=array($headers[$authenticate_header]); - for($response="", $mechanisms=array(),$m=0;$mTokenize($authenticate[$m]," "); - $response=$this->Tokenize(""); - if(strlen($authentication_mechanism)) - { - if(!strcmp($authentication_mechanism,$mechanism)) - { - $mechanisms[]=$mechanism; - break; - } - } - else - $mechanisms[]=$mechanism; - } - $sasl=new sasl_client_class; - if(IsSet($user)) - $sasl->SetCredential("user",$user); - if(IsSet($password)) - $sasl->SetCredential("password",$password); - if(IsSet($realm)) - $sasl->SetCredential("realm",$realm); - if(IsSet($workstation)) - $sasl->SetCredential("workstation",$workstation); - $sasl->SetCredential("uri",$this->request_uri); - $sasl->SetCredential("method",$this->request_method); - $sasl->SetCredential("session",$this->session); - do - { - $status=$sasl->Start($mechanisms,$message,$interactions); - } - while($status==SASL_INTERACT); - switch($status) - { - case SASL_CONTINUE: - break; - case SASL_NOMECH: - return($this->SetError(($proxy ? "proxy " : "")."authentication error: ".(strlen($authentication_mechanism) ? "authentication mechanism ".$authentication_mechanism." may not be used: " : "").$sasl->error)); - default: - return($this->SetError("Could not start the SASL ".($proxy ? "proxy " : "")."authentication client: ".$sasl->error)); - } - if($proxy >= 0) - { - for(;;) - { - if(strlen($error=$this->ReadReplyBody($body,$this->file_buffer_length))) - return($error); - if(strlen($body)==0) - break; - } - } - $authorization_value=$sasl->mechanism.(IsSet($message) ? " ".($sasl->encode_response ? base64_encode($message) : $message) : ""); - $request_arguments=$this->request_arguments; - $arguments=$request_arguments; - $arguments["Headers"][$authorization_header]=$authorization_value; - if(!$proxy - && strlen($proxy_authorization)) - $arguments["Headers"]["Proxy-Authorization"]=$proxy_authorization; - if(strlen($error=$this->Close()) - || strlen($error=$this->Open($arguments))) - return($this->SetError($error)); - $authenticated=0; - if(IsSet($message)) - { - if($proxy < 0) - { - if(strlen($error=$this->ConnectFromProxy($arguments, $headers))) - return($this->SetError($error)); - } - else - { - if(strlen($error=$this->SendRequest($arguments)) - || strlen($error=$this->ReadReplyHeadersResponse($headers))) - return($this->SetError($error)); - } - if(!IsSet($headers[$authenticate_header])) - $authenticate=array(); - elseif(GetType($headers[$authenticate_header])=="array") - $authenticate=$headers[$authenticate_header]; - else - $authenticate=array($headers[$authenticate_header]); - for($mechanism=0;$mechanismTokenize($authenticate[$mechanism]," "),$sasl->mechanism)) - { - $response=$this->Tokenize(""); - break; - } - } - switch($this->response_status) - { - case $authenticate_status: - break; - case "301": - case "302": - case "303": - case "307": - if($proxy >= 0) - return($this->Redirect($headers)); - default: - if(intval($this->response_status/100)==2) - { - if($proxy) - $proxy_authorization=$authorization_value; - $authenticated=1; - break; - } - if($proxy - && !strcmp($this->response_status,"401")) - { - $proxy_authorization=$authorization_value; - $authenticated=1; - break; - } - return($this->SetError(($proxy ? "proxy " : "")."authentication error: ".$this->response_status." ".$this->response_message)); - } - } - for(;!$authenticated;) - { - do - { - $status=$sasl->Step($response,$message,$interactions); - } - while($status==SASL_INTERACT); - switch($status) - { - case SASL_CONTINUE: - $authorization_value=$sasl->mechanism.(IsSet($message) ? " ".($sasl->encode_response ? base64_encode($message) : $message) : ""); - $arguments=$request_arguments; - $arguments["Headers"][$authorization_header]=$authorization_value; - if(!$proxy - && strlen($proxy_authorization)) - $arguments["Headers"]["Proxy-Authorization"]=$proxy_authorization; - if($proxy < 0) - { - if(strlen($error=$this->ConnectFromProxy($arguments, $headers))) - return($this->SetError($error)); - } - else - { - if(strlen($error=$this->SendRequest($arguments)) - || strlen($error=$this->ReadReplyHeadersResponse($headers))) - return($this->SetError($error)); - } - switch($this->response_status) - { - case $authenticate_status: - if(GetType($headers[$authenticate_header])=="array") - $authenticate=$headers[$authenticate_header]; - else - $authenticate=array($headers[$authenticate_header]); - for($response="",$mechanism=0;$mechanismTokenize($authenticate[$mechanism]," "),$sasl->mechanism)) - { - $response=$this->Tokenize(""); - break; - } - } - if($proxy >= 0) - { - for(;;) - { - if(strlen($error=$this->ReadReplyBody($body,$this->file_buffer_length))) - return($error); - if(strlen($body)==0) - break; - } - } - $this->state="Connected"; - break; - case "301": - case "302": - case "303": - case "307": - if($proxy >= 0) - return($this->Redirect($headers)); - default: - if(intval($this->response_status/100)==2) - { - if($proxy) - $proxy_authorization=$authorization_value; - $authenticated=1; - break; - } - if($proxy - && !strcmp($this->response_status,"401")) - { - $proxy_authorization=$authorization_value; - $authenticated=1; - break; - } - return($this->SetError(($proxy ? "proxy " : "")."authentication error: ".$this->response_status." ".$this->response_message)); - } - break; - default: - return($this->SetError("Could not process the SASL ".($proxy ? "proxy " : "")."authentication step: ".$sasl->error)); - } - } - } - return(""); - } - - Function ReadReplyHeaders(&$headers) - { - if(strlen($error=$this->ReadReplyHeadersResponse($headers))) - return($error); - $proxy_authorization=""; - while(!strcmp($this->response_status, "100")) - { - $this->state="RequestSent"; - if(strlen($error=$this->ReadReplyHeadersResponse($headers))) - return($error); - } - switch($this->response_status) - { - case "301": - case "302": - case "303": - case "307": - if(strlen($error=$this->Redirect($headers))) - return($error); - break; - case "407": - if(strlen($error=$this->Authenticate($headers, 1, $proxy_authorization, $this->proxy_request_user, $this->proxy_request_password, $this->proxy_request_realm, $this->proxy_request_workstation))) - return($error); - if(strcmp($this->response_status,"401")) - return(""); - case "401": - return($this->Authenticate($headers, 0, $proxy_authorization, $this->request_user, $this->request_password, $this->request_realm, $this->request_workstation)); - } - return(""); - } - - Function ReadReplyBody(&$body,$length) - { - $body=""; - if(strlen($this->error)) - return($this->error); - switch($this->state) - { - case "Disconnected": - return($this->SetError("1 connection was not yet established")); - case "Connected": - case "ConnectedToProxy": - return($this->SetError("2 request was not sent")); - case "RequestSent": - if(($error=$this->ReadReplyHeaders($headers))!="") - return($error); - break; - case "GotReplyHeaders": - break; - default: - return($this->SetError("3 can not get request headers in the current connection state")); - } - if($this->content_length_set) - $length=min($this->content_length-$this->read_length,$length); - if($length>0 - && !$this->EndOfInput() - && ($body=$this->ReadBytes($length))=="") - { - if(strlen($this->error)) - return($this->SetError("4 could not get the request reply body: ".$this->error)); - } - $this->read_length+=strlen($body); - return(""); - } - - Function SaveCookies(&$cookies, $domain='', $secure_only=0, $persistent_only=0) - { - $now=gmdate("Y-m-d H-i-s"); - $cookies=array(); - for($secure_cookies=0,Reset($this->cookies);$secure_cookiescookies);Next($this->cookies),$secure_cookies++) - { - $secure=Key($this->cookies); - if(!$secure_only - || $secure) - { - for($cookie_domain=0,Reset($this->cookies[$secure]);$cookie_domaincookies[$secure]);Next($this->cookies[$secure]),$cookie_domain++) - { - $domain_pattern=Key($this->cookies[$secure]); - $match=strlen($domain)-strlen($domain_pattern); - if(strlen($domain)==0 - || ($match>=0 - && !strcmp($domain_pattern,substr($domain,$match)) - && ($match==0 - || $domain_pattern[0]=="." - || $domain[$match-1]=="."))) - { - for(Reset($this->cookies[$secure][$domain_pattern]),$path_part=0;$path_partcookies[$secure][$domain_pattern]);Next($this->cookies[$secure][$domain_pattern]),$path_part++) - { - $path=Key($this->cookies[$secure][$domain_pattern]); - for(Reset($this->cookies[$secure][$domain_pattern][$path]),$cookie=0;$cookiecookies[$secure][$domain_pattern][$path]);Next($this->cookies[$secure][$domain_pattern][$path]),$cookie++) - { - $cookie_name=Key($this->cookies[$secure][$domain_pattern][$path]); - $expires=$this->cookies[$secure][$domain_pattern][$path][$cookie_name]["expires"]; - if((!$persistent_only - && strlen($expires)==0) - || (strlen($expires) - && strcmp($now,$expires)<0)) - $cookies[$secure][$domain_pattern][$path][$cookie_name]=$this->cookies[$secure][$domain_pattern][$path][$cookie_name]; - } - } - } - } - } - } - } - - Function SavePersistentCookies(&$cookies, $domain='', $secure_only=0) - { - $this->SaveCookies($cookies, $domain, $secure_only, 1); - } - - Function GetPersistentCookies(&$cookies, $domain='', $secure_only=0) - { - $this->SavePersistentCookies($cookies, $domain, $secure_only); - } - - Function RestoreCookies($cookies, $clear=1) - { - $new_cookies=($clear ? array() : $this->cookies); - for($secure_cookies=0, Reset($cookies); $secure_cookiesSetError("invalid cookie secure value type (".serialize($secure).")")); - for($cookie_domain=0,Reset($cookies[$secure]);$cookie_domainSetError("invalid cookie domain value type (".serialize($domain_pattern).")")); - for(Reset($cookies[$secure][$domain_pattern]),$path_part=0;$path_partSetError("invalid cookie path value type (".serialize($path).")")); - for(Reset($cookies[$secure][$domain_pattern][$path]),$cookie=0;$cookieSetError("invalid cookie expiry value type (".serialize($expires).")")); - $new_cookies[$secure][$domain_pattern][$path][$cookie_name]=array( - "name"=>$cookie_name, - "value"=>$value, - "domain"=>$domain_pattern, - "path"=>$path, - "expires"=>$expires, - "secure"=>$secure - ); - } - } - } - } - $this->cookies=$new_cookies; - return(""); - } -}; - -?> diff --git a/includes/phpsvnclient/phpsvnclient.php b/includes/phpsvnclient/phpsvnclient.php deleted file mode 100644 index 3322596ab7..0000000000 --- a/includes/phpsvnclient/phpsvnclient.php +++ /dev/null @@ -1,709 +0,0 @@ - - * @license BSD License - */ -class phpsvnclient { - /** - * SVN Repository URL - * - * @var string - * @access private - */ - private $_url; - /** - * Cache, for don't request the same thing in a - * short period of time. - * - * @var string - * @access private - */ - private $_cache; - /** - * HTTP Client object - * - * @var object - * @access private - */ - private $_http; - /** - * Respository Version. - * - * @access private - * @var interger - */ - private $_repVersion; - /** - * Password - * - * @access private - * @var string - */ - private $pass; - /** - * Password - * - * @access private - * @var string - */ - private $user; - /** - * Last error number - * - * Possible values are NOT_ERROR, NOT_FOUND, AUTH_REQUIRED, UNKOWN_ERROR - * - * @access public - * @var integer - */ - public $errNro; - - private $storeDirectoryFiles = array(); - private $lastDirectoryFiles; - - public function phpsvnclient($url = 'http://fusionpbx.googlecode.com/svn/', $user = false, $pass = false) { - $this->__construct($url, $user, $pass); - register_shutdown_function(array(&$this, '__destruct')); - } - - public function __construct($url = 'http://fusionpbx.googlecode.com/svn/trunk/fusionpbx/', $user = false, $pass = false) { - $http = & $this->_http; - $http = new http_class; - $http->user_agent = "FusionPBXphpsvnclient (http://fusionpbx.com/)"; - - $this->_url = $url; - $this->user = $user; - $this->pass = $pass; - } - -/** - * Public Functions - */ - - /** - * checkOut - */ - public function checkOut($folder = '/', $outPath = '.') { - while($outPath[strlen($outPath) - 1] == '/' && strlen($outPath) > 1) - $outPath = substr($outPath, 0, -1); - $tree = $this->getDirectoryTree($folder); - if(!file_exists($outPath)){ - mkdir($outPath, 0777, TRUE); - } - foreach($tree as $file) { - $path = $file['path']; - $tmp = strstr(trim($path, '/'), trim($folder, '/')); - $createPath = $outPath . '/' . ($tmp ? substr($tmp, strlen(trim($folder, '/'))) : ""); - if(trim($path, '/') == trim($folder, '/')) - continue; - if($file['type'] == 'directory' && !is_dir($createPath)){ - mkdir($createPath); - }elseif($file['type'] == 'file') { - $contents = $this->getFile($path); - $hOut = fopen($createPath, 'w'); - fwrite($hOut, $contents); - fclose($hOut); - } - } - } - - /** - * rawDirectoryDump - * - * This method dumps SVN data for $folder - * in the version $version of the repository. - * - * @param string $folder Folder to get data - * @param integer $version Repository version, -1 means actual - * @return array SVN data dump. - */ - public function rawDirectoryDump($folder='/',$version=-1) { - $actVersion = $this->getVersion(); - if ( $version == -1 || $version > $actVersion) { - $version = $actVersion; - } - $url = $this->cleanURL($this->_url . "/!svn/bc/" . $version . "/" . $folder . "/"); - $this->initQuery($args, "PROPFIND", $url); - $args['Body'] = PHPSVN_NORMAL_REQUEST; - $args['Headers']['Content-Length'] = strlen(PHPSVN_NORMAL_REQUEST); - - if ( ! $this->Request($args, $headers, $body) ) { - return false; - } - $xml2Array = new xml2Array(); - return $xml2Array->xmlParse($body); - } - -// -// use this to get node of tree by path with '/' terminator -// -function get_value_by_path($__xml_tree, $__tag_path) -{ - $tmp_arr =& $__xml_tree; - print_r($tmp_arr); - $tag_path = explode('/', $__tag_path); - foreach($tag_path as $tag_name) - { - $res = false; - foreach($tmp_arr as $key => $node) - { - if(is_int($key) && $node['name'] == $tag_name) - { - $tmp_arr = $node; - $res = true; - break; - } - } - if(!$res) - return false; - } - return $tmp_arr; -} - - -function my_xml2array($__url) -{ - $xml_values = array(); - $contents = $__url;//file_get_contents($__url); - $parser = xml_parser_create(''); - if(!$parser) - return false; - - xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8'); - xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); - xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1); - xml_parse_into_struct($parser, trim($contents), $xml_values); - xml_parser_free($parser); - if (!$xml_values) - return array(); - - $xml_array = array(); - $last_tag_ar =& $xml_array; - $parents = array(); - $last_counter_in_tag = array(1=>0); - foreach ($xml_values as $data) - { - switch($data['type']) - { - case 'open': - $last_counter_in_tag[$data['level']+1] = 0; - $new_tag = array('name' => $data['tag']); - if(isset($data['attributes'])) - $new_tag['attributes'] = $data['attributes']; - if(isset($data['value']) && trim($data['value'])) - $new_tag['value'] = trim($data['value']); - $last_tag_ar[$last_counter_in_tag[$data['level']]] = $new_tag; - $parents[$data['level']] =& $last_tag_ar; - $last_tag_ar =& $last_tag_ar[$last_counter_in_tag[$data['level']]++]; - break; - case 'complete': - $new_tag = array('name' => $data['tag']); - if(isset($data['attributes'])) - $new_tag['attributes'] = $data['attributes']; - if(isset($data['value']) && trim($data['value'])) - $new_tag['value'] = trim($data['value']); - - $last_count = count($last_tag_ar)-1; - $last_tag_ar[$last_counter_in_tag[$data['level']]++] = $new_tag; - break; - case 'close': - $last_tag_ar =& $parents[$data['level']]; - break; - default: - break; - }; - } - return $xml_array; -} - - /** - * getDirectoryFiles - * - * This method returns all the files in $folder - * in the version $version of the repository. - * - * @param string $folder Folder to get files - * @param integer $version Repository version, -1 means actual - * @return array List of files. */ - public function getDirectoryFiles($folder='/', $version=-1) { - if ($arrOutput = $this->rawDirectoryDump($folder, $version)) { -// echo '
';
-//			print_r($arrOutput);
-//			echo '
'; - $files = array(); - foreach($arrOutput['children'] as $key=>$value) { - //echo $key . ' => ' . $value . '
'; - array_walk_recursive($value, array($this, 'storeDirectoryFiles')); - array_push($files, $this->storeDirectoryFiles); - unset($this->storeDirectoryFiles); - } - return $files; - } - return false; - } - - /** - * getDirectoryTree - * - * This method returns the complete tree of files and directories - * in $folder from the version $version of the repository. Can also be used - * to get the info for a single file or directory - * - * @param string $folder Folder to get tree - * @param integer $version Repository version, -1 means actual - * @param boolean $recursive Whether to get the tree recursively, or just - * the specified directory/file. - * - * @return array List of files and directories. - */ - public function getDirectoryTree($folder='/',$version=-1, $recursive=true) { - $directoryTree = array(); - - if (!($arrOutput = $this->getDirectoryFiles($folder, $version))) - return false; - - if (!$recursive) - return $arrOutput[0]; - - while(count($arrOutput) && is_array($arrOutput)) { - $array = array_shift($arrOutput); - - array_push($directoryTree, $array); - - if(trim($array['path'], '/') == trim($folder, '/')) - continue; - - if ($array['type'] == 'directory') { - $walk = $this->getDirectoryFiles($array['path'], $version); - array_shift($walk); - //$walk = array_reverse($walk); - - foreach($walk as $step) { - array_unshift($arrOutput, $step); - } - } - } - return $directoryTree; - } - - /** - * Returns file contents - * - * @param string $file File pathname - * @param integer $version File Version - * @return string File content and information, false on error, or if a - * directory is requested - */ - public function getFile($file,$version=-1) { - $actVersion = $this->getVersion(); - if ( $version == -1 || $version > $actVersion) { - $version = $actVersion; - } - - // check if this is a directory... if so, return false, otherwise we - // get the HTML output of the directory listing from the SVN server. - // This is maybe a bit heavy since it makes another connection to the - // SVN server. Maybe add this as an option/parameter? ES 23/06/08 - $fileInfo = $this->getDirectoryTree($file, $version, false); - if ($fileInfo["type"] == "directory") - return false; - - $url = $this->cleanURL($this->_url."/!svn/bc/".$version."/".$file."/"); - $this->initQuery($args,"GET",$url); - if ( ! $this->Request($args, $headers, $body) ) - return false; - - return $body; - } - - /** - * Get changes logs of a file. - * - * Get repository change logs between version - * $vini and $vend. - * - * @param integer $vini Initial Version - * @param integer $vend End Version - * @return Array Respository Logs - */ - public function getRepositoryLogs($vini=0,$vend=-1) { - return $this->getFileLogs("/",$vini,$vend); - } - - /** - * Get changes logs of a file. - * - * Get repository change of a file between version - * $vini and $vend. - * - * @param - * @param integer $vini Initial Version - * @param integer $vend End Version - * @return Array Respository Logs - */ - public function getFileLogs($file, $vini=0,$vend=-1) { - $fileLogs = array(); - - $actVersion = $this->getVersion(); - if ( $vend == -1 || $vend > $actVersion) - $vend = $actVersion; - - if ( $vini < 0) $vini=0; - if ( $vini > $vend) $vini = $vend; - - $url = $this->cleanURL($this->_url."/!svn/bc/".$actVersion."/".$file."/"); - $this->initQuery($args,"REPORT",$url); - $args['Body'] = sprintf(PHPSVN_LOGS_REQUEST,$vini,$vend); - $args['Headers']['Content-Length'] = strlen($args['Body']); - $args['Headers']['Depth']=1; - - if ( ! $this->Request($args, $headers, $body) ) - return false; - - $xml2Array = new xml2Array(); - $arrOutput = $xml2Array->xmlParse($body); -// array_shift($arrOutput['children']); - - foreach($arrOutput['children'] as $value) { - $array=array(); - foreach($value['children'] as $entry) { - if ($entry['name'] == 'D:VERSION-NAME') $array['version'] = $entry['tagData']; - if ($array['version'] == $vini) continue 2; - if ($entry['name'] == 'D:CREATOR-DISPLAYNAME') $array['author'] = $entry['tagData']; - if ($entry['name'] == 'S:DATE') $array['date'] = $entry['tagData']; - if ($entry['name'] == 'D:COMMENT') $array['comment'] = $entry['tagData']; - - if (($entry['name'] == 'S:ADDED-PATH') || - ($entry['name'] == 'S:MODIFIED-PATH') || - ($entry['name'] == 'S:DELETED-PATH')) { - // For backward compatability - $array['files'][] = $entry['tagData']; - - if ($entry['name'] == 'S:ADDED-PATH') $array['add_files'][] = $entry['tagData']; - if ($entry['name'] == 'S:MODIFIED-PATH') $array['mod_files'][] = $entry['tagData']; - if ($entry['name'] == 'S:DELETED-PATH') $array['del_files'][] = $entry['tagData']; - } - } - array_push($fileLogs,$array); - } - - return $fileLogs; - } - - - /** - * Get the repository version - * - * @return integer Repository version - * @access public - */ - public function getVersion() { - if ( $this->_repVersion > 0) return $this->_repVersion; - - $this->_repVersion = -1; $this->initQuery($args,"PROPFIND",$this->cleanURL($this->_url."/!svn/vcc/default") ); - $args['Body'] = PHPSVN_VERSION_REQUEST; - $args['Headers']['Content-Length'] = strlen(PHPSVN_NORMAL_REQUEST); - $args['Headers']['Depth']=0; - - if ( !$this->Request($args, $tmp, $body) ) { - return $this->_repVersion; - } - - $parser=new xml_parser_class; - $parser->Parse( $body,true); - $enable=false; - foreach($parser->structure as $value) { - if ( $enable ) { - $t = explode("/",$value); - - // start from the end and move backwards until we find a non-blank entry - $index = count($t) - 1; - while ($t[$index] == ""){ - $index--; - } - - // check the last non-empty element to see if it's numeric. If so, it's the revision number - if (is_numeric($t[$index])) { - $this->_repVersion = $t[$index]; - break; - } - else { - // If there was no number, this was the wrong D:href, so disable 'til we find the next one. - $enable = false; - continue; - } - } - if ( is_array($value) && $value['Tag'] == 'D:href') $enable = true; - } - return $this->_repVersion; - } - -/** - * Deprecated functions for backward comatability - */ - - /** - * Set URL - * - * Set the project repository URL. - * - * @param string $url URL of the project. - * @access public - */ - public function setRepository($url) { - $this->_url = $url; - } - /** - * Old method; there's a typo in the name. This is now a wrapper for setRepository - */ - public function setRespository($url) { - return $this->setRepository($url); - } - /** - * Add Authentication settings - * - * @param string $user Username - * @param string $pass Password - */ - public function setAuth($user,$pass) { - $this->user = $user; - $this->pass = $pass; - } - -/** - * Private Functions - */ - /** - * Callback for array_walk_recursive in public function getDirectoryFiles - * - * @access private - */ - private function storeDirectoryFiles($item, $key) { - if ($key == 'name') { - switch ($item) { - case 'D:HREF': - case 'LP1:GETLASTMODIFIED': - case 'LP2:BASELINE-RELATIVE-PATH': - case 'LP3:BASELINE-RELATIVE-PATH': - case 'LP3:MD5-CHECKSUM': - case 'LP1:VERSION-NAME': - case 'LP1:GETCONTENTLENGTH': - case 'D:STATUS': - $this->lastDirectoryFiles = $item; - break; - default: - break; - } - } elseif (($key == 'tagData') && ($this->lastDirectoryFiles != '')) { - - // Unsure if the 1st of two D:HREF's always returns the result we want, but for now... - if (($this->lastDirectoryFiles == 'D:HREF') && (isset($this->storeDirectoryFiles['type']))) return; - - // Dump into the array - $ldf = $this->lastDirectoryFiles; - switch ($ldf) { - case 'D:HREF': - $var = 'type'; - break; - case 'LP1:GETLASTMODIFIED': - $var = 'last_mod'; -// $var = "$ldf"; - break; - case 'LP2:BASELINE-RELATIVE-PATH': - case 'LP3:BASELINE-RELATIVE-PATH': - $var = 'path'; -// $var = "$ldf"; - break; - case 'LP3:MD5-CHECKSUM': - $var = 'md5'; -// $var = "$ldf"; - break; -/* case 'LP1:VERSION-NAME': - $var = 'version'; - break; - case 'LP1:GETCONTENTLENGTH': - $var = 'size'; - break; -*/ case 'D:STATUS': -// return; - $var = 'status'; -// $var = "$ldf"; - break; - default: - //$var = "$ldf"; - break; - - } - $this->storeDirectoryFiles[$var] = $item; - $this->lastDirectoryFiles = ''; - // Detect 'type' as either a 'directory' or 'file' - if ( (isset($this->storeDirectoryFiles['type'])) && - //(isset($this->storeDirectoryFiles['last-mod'])) && - (isset($this->storeDirectoryFiles['path'])) - && (isset($this->storeDirectoryFiles['status'])) - ) { - $this->storeDirectoryFiles['path'] = str_replace(' ', '%20', $this->storeDirectoryFiles['path']); //Hack to make filenames with spaces work. - $len = strlen($this->storeDirectoryFiles['path']); - if ( substr($this->storeDirectoryFiles['type'],strlen($this->storeDirectoryFiles['type']) - $len) == $this->storeDirectoryFiles['path'] ) { - $this->storeDirectoryFiles['type'] = 'file'; - } else { - $this->storeDirectoryFiles['type'] = 'directory'; - } - } - - } else { - $this->lastDirectoryFiles = ''; - } - } - - /** - * Prepare HTTP CLIENT object - * - * @param array &$arguments Byreferences variable. - * @param string $method Method for the request (GET,POST,PROPFIND, REPORT,ETC). - * @param string $url URL for the action. - * @access private - */ - private function initQuery(&$arguments,$method, $url) { - $http = & $this->_http; - $http->GetRequestArguments($url,$arguments); - if ( isset($this->user) && isset($this->pass)) { - $arguments["Headers"]["Authorization"] = " Basic ".base64_encode($this->user.":".$this->pass); - } - $arguments["RequestMethod"]=$method; - $arguments["Headers"]["Content-Type"] = "text/xml"; - $arguments["Headers"]["Depth"] = 1; - } - - /** - * Open a connection, send request, read header - * and body. - * - * @param Array $args Connetion's argument - * @param Array &$headers Array with the header response. - * @param string &$body Body response. - * @return boolean True is query success - * @access private - */ - private function Request($args, &$headers, &$body) { - $args['RequestURI'] = str_replace(' ', '%20', $args['RequestURI']); //Hack to make filenames with spaces work. - $http = & $this->_http; - $http->Open($args); - $http->SendRequest($args); - $http->ReadReplyHeaders($headers); -// echo "
\n";
-//		print_r($http);
-//		echo "
\n";
-		if ($http->response_status[0] != 2) {
-			switch( $http->response_status ) {
-				case 404:
-					$this->errNro=NOT_FOUND;
-					break;
-				case 401:
-					$this->errNro=AUTH_REQUIRED;
-					break;
-				default:
-					$this->errNro=UNKNOWN_ERROR;
-			}
-			$http->close();
-			return false;
-		}
-		$this->errNro = NO_ERROR;
-		$body='';
-		$tbody='';
-		for(;;) {
-			$error=$http->ReadReplyBody($tbody,1000);
-			if($error!="" || strlen($tbody)==0) break;
-			$body.=($tbody);
-		}
-		$http->close();
-		return true;
-	}
-
-	/**
-	 *  Clean URL
-	 *
-	 *  Delete "//" on URL requests.
-	 *
-	 *  @param string $url URL
-	 *  @return string New cleaned URL.
-	 *  @access private
-	 */
-	private function cleanURL($url) {
-		return preg_replace("/((^:)\/\/)/", "//", $url);
-	}
-}
-?>
-
diff --git a/includes/phpsvnclient/xml2Array.php b/includes/phpsvnclient/xml2Array.php
deleted file mode 100644
index 1c21d957b2..0000000000
--- a/includes/phpsvnclient/xml2Array.php
+++ /dev/null
@@ -1,56 +0,0 @@
-
-Usage
- Grab some XML data, either from a file, URL, etc. however you want.
- Assume storage in $strYourXML;
-
- $arrOutput = new xml2Array($strYourXML);
- print_r($arrOutput); //print it out, or do whatever!
-*/
-class xml2Array {
-   
-	private $arrOutput = array();
-	private $resParser;
-	private $strXmlData;
-
-	public function xmlParse($strInputXML) {
-		$this->resParser = xml_parser_create ();
-		xml_set_object($this->resParser,$this);
-		xml_set_element_handler($this->resParser, "tag_open", "tagClosed");
-		xml_set_character_data_handler($this->resParser, "tagData");
-       
-		$this->strXmlData = xml_parse($this->resParser,$strInputXML );
-		if(!$this->strXmlData) {
-			die(sprintf("XML error: %s at line %d",
-				xml_error_string(xml_get_error_code($this->resParser)),
-				xml_get_current_line_number($this->resParser)));
-		}
-
-		xml_parser_free($this->resParser);
-		// Changed by Deadpan110
-		//return $this->arrOutput;
-		return $this->arrOutput[0];
-	}
-
-	private function tag_open($parser, $name, $attrs) {
-		$tag=array("name"=>$name,"attrs"=>$attrs);
-		array_push($this->arrOutput,$tag);
-	}
-
-	private function tagData($parser, $tagData) {
-		if(trim($tagData)) {
-			if(isset($this->arrOutput[count($this->arrOutput)-1]['tagData'])) {
-				$this->arrOutput[count($this->arrOutput)-1]['tagData'] .= $tagData;
-			} else {
-				$this->arrOutput[count($this->arrOutput)-1]['tagData'] = $tagData;
-			}
-		}
-	}
-
-	private function tagClosed($parser, $name) {
-		$this->arrOutput[count($this->arrOutput)-2]['children'][] = $this->arrOutput[count($this->arrOutput)-1];
-		array_pop($this->arrOutput);
-	}
-}
-?>
\ No newline at end of file
diff --git a/includes/phpsvnclient/xml_parser.php b/includes/phpsvnclient/xml_parser.php
deleted file mode 100644
index 15e02e0f6a..0000000000
--- a/includes/phpsvnclient/xml_parser.php
+++ /dev/null
@@ -1,427 +0,0 @@
-error,""))
-		$xml_parser_handlers[$parser]->StartElement($xml_parser_handlers[$parser],$name,$attrs);
-}
-
-Function xml_parser_end_element_handler($parser,$name)
-{
-  global $xml_parser_handlers;
-
-	if(!strcmp($xml_parser_handlers[$parser]->error,""))
-		$xml_parser_handlers[$parser]->EndElement($xml_parser_handlers[$parser],$name);
-}
-
-Function xml_parser_character_data_handler($parser,$data)
-{
-  global $xml_parser_handlers;
-
-	if(!strcmp($xml_parser_handlers[$parser]->error,""))
-		$xml_parser_handlers[$parser]->CharacterData($xml_parser_handlers[$parser],$data);
-}
-
-class xml_parser_handler_class
-{
-	var $xml_parser;
-	var $error_number=0;
-	var $error="";
-	var $error_code=0;
-	var $error_line,$error_column,$error_byte_index;
-	var $structure=array();
-	var $positions=array();
-	var $path="";
-	var $store_positions=0;
-	var $simplified_xml=0;
-	var $fail_on_non_simplified_xml=0;
-
-	Function SetError(&$object,$error_number,$error)
-	{
-		$object->error_number=$error_number;
-		$object->error=$error;
-		$object->error_line=xml_get_current_line_number($object->xml_parser);
-		$object->error_column=xml_get_current_column_number($object->xml_parser);
-		$object->error_byte_index=xml_get_current_byte_index($object->xml_parser);
-	}
-
-	Function SetElementData(&$object,$path,&$data)
-	{
-		$object->structure[$path]=$data;
-		if($object->store_positions)
-		{
-			$object->positions[$path]=array(
-				"Line"=>xml_get_current_line_number($object->xml_parser),
-				"Column"=>xml_get_current_column_number($object->xml_parser),
-				"Byte"=>xml_get_current_byte_index($object->xml_parser)
-			);
-		}
-	}
-
-	Function StartElement(&$object,$name,&$attrs)
-	{
-		if(strcmp($this->path,""))
-		{
-			$element=$object->structure[$this->path]["Elements"];
-			$object->structure[$this->path]["Elements"]++;
-			$this->path.=",$element";
-		}
-		else
-		{
-			$element=0;
-			$this->path="0";
-		}
-		$data=array(
-			"Tag"=>$name,
-			"Elements"=>0
-		);
-		if($object->simplified_xml)
-		{
-			if($object->fail_on_non_simplified_xml
-			&& count($attrs)>0)
-			{
-				$this->SetError($object,2,"Simplified XML can not have attributes in tags");
-				return;
-			}
-		}
-		else
-			$data["Attributes"]=$attrs;
-		$this->SetElementData($object,$this->path,$data);
-	}
-
-	Function EndElement(&$object,$name)
-	{
-		$this->path=(($position=strrpos($this->path,",")) ? substr($this->path,0,$position) : "");
-	}
-
-	Function CharacterData(&$object,$data)
-	{
-		$element=$object->structure[$this->path]["Elements"];
-		$previous=$this->path.",".strval($element-1);
-		if($element>0
-		&& GetType($object->structure[$previous])=="string")
-			$object->structure[$previous].=$data;
-		else
-		{
-			$this->SetElementData($object,$this->path.",$element",$data);
-			$object->structure[$this->path]["Elements"]++;
-		}
-	}
-};
-
-class xml_parser_class
-{
-	var $xml_parser=0;
-	var $parser_handler;
-	var $error="";
-	var $error_number=0;
-	var $error_line=0;
-	var $error_column=0;
-	var $error_byte_index=0;
-	var $error_code=0;
-	var $stream_buffer_size=4096;
-	var $structure=array();
-	var $positions=array();
-	var $store_positions=0;
-	var $case_folding=0;
-	var $target_encoding="ISO-8859-1";
-	var $simplified_xml=0;
-	var $fail_on_non_simplified_xml=0;
-
-	Function xml_parser_start_element_handler($parser,$name,$attrs)
-	{
-		if(!strcmp($this->error,""))
-			$this->parser_handler->StartElement($this,$name,$attrs);
-	}
-
-	Function xml_parser_end_element_handler($parser,$name)
-	{
-		if(!strcmp($this->error,""))
-			$this->parser_handler->EndElement($this,$name);
-	}
-
-	Function xml_parser_character_data_handler($parser,$data)
-	{
-		if(!strcmp($this->error,""))
-			$this->parser_handler->CharacterData($this,$data);
-	}
-
-	Function SetErrorPosition($error_number,$error,$line,$column,$byte_index)
-	{
-		$this->error_number=$error_number;
-		$this->error=$error;
-		$this->error_line=$line;
-		$this->error_column=$column;
-		$this->error_byte_index=$byte_index;
-	}
-
-	Function SetError($error_number,$error)
-	{
-		$this->error_number=$error_number;
-		$this->error=$error;
-		if($this->xml_parser)
-		{
-			$line=xml_get_current_line_number($this->xml_parser);
-			$column=xml_get_current_column_number($this->xml_parser);
-			$byte_index=xml_get_current_byte_index($this->xml_parser);
-		}
-		else
-		{
-			$line=$column=1;
-			$byte_index=0;
-		}
-		$this->SetErrorPosition($error_number,$error,$line,$column,$byte_index);
-	}
-
-	Function Parse($data,$end_of_data)
-	{
-		global $xml_parser_handlers;
-
-		if(strcmp($this->error,""))
-			return($this->error);
-		if(!$this->xml_parser)
-		{
-			if(!function_exists("xml_parser_create"))
-			{
-				$this->SetError(1,"XML support is not available in this PHP configuration");
-				return($this->error);
-			}
-			if(!($this->xml_parser=xml_parser_create()))
-			{
-				$this->SetError(1,"Could not create the XML parser");
-				return($this->error);
-			}
-			xml_parser_set_option($this->xml_parser,XML_OPTION_CASE_FOLDING,$this->case_folding);
-			xml_parser_set_option($this->xml_parser,XML_OPTION_TARGET_ENCODING,$this->target_encoding);
-			if(function_exists("xml_set_object"))
-			{
-				xml_set_object($this->xml_parser,$this);
-				$this->parser_handler=new xml_parser_handler_class;
-				$this->structure=array();
-				$this->positions=array();
-			}
-			else
-			{
-				$xml_parser_handlers[$this->xml_parser]=new xml_parser_handler_class;
-				$xml_parser_handlers[$this->xml_parser]->xml_parser=$this->xml_parser;
-				$xml_parser_handlers[$this->xml_parser]->store_positions=$this->store_positions;
-				$xml_parser_handlers[$this->xml_parser]->simplified_xml=$this->simplified_xml;
-				$xml_parser_handlers[$this->xml_parser]->fail_on_non_simplified_xml=$this->fail_on_non_simplified_xml;
-			}
-			xml_set_element_handler($this->xml_parser,"xml_parser_start_element_handler","xml_parser_end_element_handler");
-			xml_set_character_data_handler($this->xml_parser,"xml_parser_character_data_handler");
-		}
-		$parser_ok=xml_parse($this->xml_parser,$data,$end_of_data);
-		if(!function_exists("xml_set_object"))
-			$this->error=$xml_parser_handlers[$this->xml_parser]->error;
-		if(!strcmp($this->error,""))
-		{
-			if($parser_ok)
-			{
-				if($end_of_data)
-				{
-					if(function_exists("xml_set_object"))
-						Unset($this->parser_handler);
-					else
-					{
-						$this->structure=$xml_parser_handlers[$this->xml_parser]->structure;
-						$this->positions=$xml_parser_handlers[$this->xml_parser]->positions;
-						Unset($xml_parser_handlers[$this->xml_parser]);
-					}
-					xml_parser_free($this->xml_parser);
-					$this->xml_parser=0;
-				}
-			}
-			else
-				$this->SetError(2,"Could not parse data: ".xml_error_string($this->error_code=xml_get_error_code($this->xml_parser)));
-		}
-		else
-		{
-			if(!function_exists("xml_set_object"))
-			{
-				$this->error_number=$xml_parser_handlers[$this->xml_parser]->error_number;
-				$this->error_code=$xml_parser_handlers[$this->xml_parser]->error_code;
-				$this->error_line=$xml_parser_handlers[$this->xml_parser]->error_line;
-				$this->error_column=$xml_parser_handlers[$this->xml_parser]->error_column;
-				$this->error_byte_index=$xml_parser_handlers[$this->xml_parser]->error_byte_index;
-			}			
-		}
-		return($this->error);
-	}
-
-	Function VerifyWhiteSpace($path)
-	{
-		if($this->store_positions)
-		{
-			$line=$parser->positions[$path]["Line"];
-			$column=$parser->positions[$path]["Column"];
-			$byte_index=$parser->positions[$path]["Byte"];
-		}
-		else
-		{
-			$line=$column=1;
-			$byte_index=0;
-		}
-		if(!IsSet($this->structure[$path]))
-		{
-			$this->SetErrorPosition(2,"element path does not exist",$line,$column,$byte_index);
-			return($this->error);
-		}
-		if(GetType($this->structure[$path])!="string")
-		{
-			$this->SetErrorPosition(2,"element is not data",$line,$column,$byte_index);
-			return($this->error);
-		}
-		$data=$this->structure[$path];
-		for($previous_return=0,$position=0;$positionSetErrorPosition(2,"data is not white space",$line,$column,$byte_index);
-					return($this->error);
-			}
-		}
-		return("");
-	}
-
-	Function ParseStream($stream)
-	{
-		if(strcmp($this->error,""))
-			return($this->error);
-		do
-		{
-			if(!($data=@fread($stream,$this->stream_buffer_size)))
-			{
-				if(!feof($stream))
-				{
-					$this->SetError(3,"Could not read from input stream".(IsSet($php_errormsg) ? ': '.$php_errormsg : ''));
-					break;
-				}
-			}
-			if(strcmp($error=$this->Parse($data,feof($stream)),""))
-				break;
-		}
-		while(!feof($stream));
-		return($this->error);
-	}
-
-	Function ParseFile($file)
-	{
-		if(!file_exists($file))
-			return("the XML file to parse ($file) does not exist");
-		if(!($definition=@fopen($file,"r")))
-			return("could not open the XML file ($file)".(IsSet($php_errormsg) ? ': '.$php_errormsg : ''));
-		$error=$this->ParseStream($definition);
-		fclose($definition);
-		return($error);
-	}
-};
-
-Function XMLParseFile(&$parser,$file,$store_positions,$cache="",$case_folding=0,$target_encoding="ISO-8859-1",$simplified_xml=0,$fail_on_non_simplified_xml=0)
-{
-	if(!file_exists($file))
-		return("the XML file to parse ($file) does not exist");
-	if(strcmp($cache,""))
-	{
-		if(file_exists($cache)
-		&& filemtime($file)<=filemtime($cache))
-		{
-			if(($cache_file=@fopen($cache,"r")))
-			{
-				if(function_exists("set_file_buffer"))
-					set_file_buffer($cache_file,0);
-				if(!($cache_contents=@fread($cache_file,filesize($cache))))
-					$error="could not read from the XML cache file $cache".(IsSet($php_errormsg) ? ': '.$php_errormsg : '');
-				else
-					$error="";
-				fclose($cache_file);
-				if(!strcmp($error,""))
-				{
-					if(GetType($parser=unserialize($cache_contents))=="object"
-					&& IsSet($parser->structure))
-					{
-						if(!IsSet($parser->simplified_xml))
-							$parser->simplified_xml=0;
-						if(($simplified_xml
-						|| !$parser->simplified_xml)
-						&& (!$store_positions
-						|| $parser->store_positions))
-						{
-							return("");
-						}
-					}
-					else
-						$error="it was not specified a valid cache object in XML file ($cache)";
-				}
-			}
-			else
-				$error="could not open cache XML file ($cache)".(IsSet($php_errormsg) ? ': '.$php_errormsg : '');
-			if(strcmp($error,""))
-				return($error);
-		}
-	}
-	$parser=new xml_parser_class;
-	$parser->store_positions=$store_positions;
-	$parser->case_folding=$case_folding;
-	$parser->target_encoding=$target_encoding;
-	$parser->simplified_xml=$simplified_xml;
-	$parser->fail_on_non_simplified_xml=$fail_on_non_simplified_xml;
-	if(!strcmp($error=$parser->ParseFile($file),"")
-	&& strcmp($cache,""))
-	{
-		if(($cache_file=@fopen($cache,"w")))
-		{
-			if(function_exists("set_file_buffer"))
-				set_file_buffer($cache_file,0);
-			if(!@fwrite($cache_file,serialize($parser))
-			|| !@fclose($cache_file))
-				$error="could to write to the XML cache file ($cache)".(IsSet($php_errormsg) ? ': '.$php_errormsg : '');
-			if(strcmp($error,""))
-				unlink($cache);
-		}
-		else
-			$error="could not open for writing to the cache file ($cache)".(IsSet($php_errormsg) ? ': '.$php_errormsg : '');
-	}
-	return($error);
-}
-
-?>
\ No newline at end of file