moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-03 16:13:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-36538_webdav_memory' of git://github.com/davosmith/moodle

Browse source
This commit is contained in:
Dan Poltawski 2012-12-10 13:06:37 +08:00
commit 8df07e5086
2 changed files with 63 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

102
lib/webdavlib.php
View file

@ -265,15 +265,17 @@ class webdav_client {
* Public method get * Public method get
* *
* Gets a file from a webdav collection. * Gets a file from a webdav collection.
* @param string path, string &buffer * @param string $path the path to the file on the webdav server
* @return status code and &$buffer (by reference) with response data from server on success. False on error. * @param string &$buffer the buffer to store the data in
* @param resource $fp optional if included, the data is written directly to this resource and not to the buffer
* @return string|bool status code and &$buffer (by reference) with response data from server on success. False on error.
*/ */
function get($path, &$buffer) { function get($path, &$buffer, $fp = null) {
$this->_path = $this->translate_uri($path); $this->_path = $this->translate_uri($path);
$this->header_unset(); $this->header_unset();
$this->create_basic_request('GET'); $this->create_basic_request('GET');
$this->send_request(); $this->send_request();
$this->get_respond(); $this->get_respond($fp);
$response = $this->process_respond(); $response = $this->process_respond();
$http_version = $response['status']['http-version']; $http_version = $response['status']['http-version'];
@ -283,8 +285,13 @@ class webdav_client {
// seems to be http ... proceed // seems to be http ... proceed
// We expect a 200 code // We expect a 200 code
if ($response['status']['status-code'] == 200 ) { if ($response['status']['status-code'] == 200 ) {
$this->_error_log('returning buffer with ' . strlen($response['body']) . ' bytes.'); if (!is_null($fp)) {
$buffer = $response['body']; $stat = fstat($fp);
$this->_error_log('file created with ' . $stat['size'] . ' bytes.');
} else {
$this->_error_log('returning buffer with ' . strlen($response['body']) . ' bytes.');
$buffer = $response['body'];
}
} }
return $response['status']['status-code']; return $response['status']['status-code'];
} }
@ -387,27 +394,24 @@ class webdav_client {
* Gets a file from a collection into local filesystem. * Gets a file from a collection into local filesystem.
* *
* fopen() is used. * fopen() is used.
* @param string srcpath, string localpath * @param string $srcpath
* @return true on success. false on error. * @param string $localpath
* @return bool true on success. false on error.
*/ */
function get_file($srcpath, $localpath) { function get_file($srcpath, $localpath) {
if ($this->get($srcpath, $buffer)) { $localpath = $this->utf_decode_path($localpath);
// convert utf-8 filename to iso-8859-1
$localpath = $this->utf_decode_path($localpath); $handle = fopen($localpath, 'wb');
if ($handle) {
$handle = fopen ($localpath, 'w'); $unused = '';
if ($handle) { $ret = $this->get($srcpath, $unused, $handle);
fwrite($handle, $buffer); fclose($handle);
fclose($handle); if ($ret) {
return true; return true;
} else {
return false;
} }
} else {
return false;
} }
return false;
} }
/** /**
@ -1447,8 +1451,9 @@ EOD;
* This routine is the weakest part of this class, because it very depends how php does handle a socket stream. * This routine is the weakest part of this class, because it very depends how php does handle a socket stream.
* If the stream is blocked for some reason php is blocked as well. * If the stream is blocked for some reason php is blocked as well.
* @access private * @access private
* @param resource $fp optional the file handle to write the body content to (stored internally in the '_body' if not set)
*/ */
private function get_respond() { private function get_respond($fp = null) {
$this->_error_log('get_respond()'); $this->_error_log('get_respond()');
// init vars (good coding style ;-) // init vars (good coding style ;-)
$buffer = ''; $buffer = '';
@ -1509,7 +1514,8 @@ EOD;
$read = 0; $read = 0;
// Reading the chunk in one bite is not secure, we read it byte by byte. // Reading the chunk in one bite is not secure, we read it byte by byte.
while ($read < $chunk_size) { while ($read < $chunk_size) {
$buffer .= fread($this->sock, 1); $chunk = fread($this->sock, 1);
self::update_file_or_buffer($chunk, $fp, $buffer);
$read++; $read++;
} }
} }
@ -1525,21 +1531,20 @@ EOD;
if ($matches[1] <= $max_chunk_size ) { if ($matches[1] <= $max_chunk_size ) {
// only read something if Content-Length is bigger than 0 // only read something if Content-Length is bigger than 0
if ($matches[1] > 0 ) { if ($matches[1] > 0 ) {
$buffer = fread($this->sock, $matches[1]); $chunk = fread($this->sock, $matches[1]);
$loadsize = strlen($buffer); $loadsize = strlen($chunk);
//did we realy get the full length? //did we realy get the full length?
if ($loadsize < $matches[1]) { if ($loadsize < $matches[1]) {
$max_chunk_size = $loadsize; $max_chunk_size = $loadsize;
do { do {
$mod = $max_chunk_size % ($matches[1] - strlen($buffer)); $mod = $max_chunk_size % ($matches[1] - strlen($chunk));
$chunk_size = ($mod == $max_chunk_size ? $max_chunk_size : $matches[1] - strlen($buffer)); $chunk_size = ($mod == $max_chunk_size ? $max_chunk_size : $matches[1] - strlen($chunk));
$buffer .= fread($this->sock, $chunk_size); $chunk .= fread($this->sock, $chunk_size);
$this->_error_log('mod: ' . $mod . ' chunk: ' . $chunk_size . ' total: ' . strlen($buffer)); $this->_error_log('mod: ' . $mod . ' chunk: ' . $chunk_size . ' total: ' . strlen($chunk));
} while ($mod == $max_chunk_size); } while ($mod == $max_chunk_size);
break;
} else {
break;
} }
self::update_file_or_buffer($chunk, $fp, $buffer);
break;
} else { } else {
$buffer = ''; $buffer = '';
break; break;
@ -1548,20 +1553,23 @@ EOD;
// data is to big to handle it as one. Get it chunk per chunk... // data is to big to handle it as one. Get it chunk per chunk...
//trying to get the full length of max_chunk_size //trying to get the full length of max_chunk_size
$buffer = fread($this->sock, $max_chunk_size); $chunk = fread($this->sock, $max_chunk_size);
$loadsize = strlen($buffer); $loadsize = strlen($chunk);
self::update_file_or_buffer($chunk, $fp, $buffer);
if ($loadsize < $max_chunk_size) { if ($loadsize < $max_chunk_size) {
$max_chunk_size = $loadsize; $max_chunk_size = $loadsize;
} }
do { do {
$mod = $max_chunk_size % ($matches[1] - strlen($buffer)); $mod = $max_chunk_size % ($matches[1] - $loadsize);
$chunk_size = ($mod == $max_chunk_size ? $max_chunk_size : $matches[1] - strlen($buffer)); $chunk_size = ($mod == $max_chunk_size ? $max_chunk_size : $matches[1] - $loadsize);
$buffer .= fread($this->sock, $chunk_size); $chunk = fread($this->sock, $chunk_size);
$this->_error_log('mod: ' . $mod . ' chunk: ' . $chunk_size . ' total: ' . strlen($buffer)); self::update_file_or_buffer($chunk, $fp, $buffer);
$loadsize += strlen($chunk);
$this->_error_log('mod: ' . $mod . ' chunk: ' . $chunk_size . ' total: ' . $loadsize);
} while ($mod == $max_chunk_size); } while ($mod == $max_chunk_size);
$loadsize = strlen($buffer);
if ($loadsize < $matches[1]) { if ($loadsize < $matches[1]) {
$buffer .= fread($this->sock, $matches[1] - $loadsize); $chunk = fread($this->sock, $matches[1] - $loadsize);
self::update_file_or_buffer($chunk, $fp, $buffer);
} }
break; break;
@ -1577,7 +1585,8 @@ EOD;
$this->_error_log('reading until feof...' . $header); $this->_error_log('reading until feof...' . $header);
socket_set_timeout($this->sock, 0, 0); socket_set_timeout($this->sock, 0, 0);
while (!feof($this->sock)) { while (!feof($this->sock)) {
$buffer .= fread($this->sock, 4096); $chunk = fread($this->sock, 4096);
self::update_file_or_buffer($chunk, $fp, $buffer);
} }
// renew the socket timeout...does it do something ???? Is it needed. More debugging needed... // renew the socket timeout...does it do something ???? Is it needed. More debugging needed...
socket_set_timeout($this->sock, $this->_socket_timeout, 0); socket_set_timeout($this->sock, $this->_socket_timeout, 0);
@ -1591,6 +1600,19 @@ EOD;
} }
/**
* Write the chunk to the file if $fp is set, otherwise append the data to the buffer
* @param string $chunk the data to add
* @param resource $fp the file handle to write to (or null)
* @param string &$buffer the buffer to append to (if $fp is null)
*/
static private function update_file_or_buffer($chunk, $fp, &$buffer) {
if ($fp) {
fwrite($fp, $chunk);
} else {
$buffer .= $chunk;
}
}
/** /**
* Private method process_respond * Private method process_respond

6
repository/webdav/lib.php
View file

@ -71,17 +71,13 @@ class repository_webdav extends repository {
return true; return true;
} }
public function get_file($url, $title = '') { public function get_file($url, $title = '') {
global $CFG;
$url = urldecode($url); $url = urldecode($url);
$path = $this->prepare_file($title); $path = $this->prepare_file($title);
$buffer = '';
if (!$this->dav->open()) { if (!$this->dav->open()) {
return false; return false;
} }
$webdavpath = rtrim('/'.ltrim($this->options['webdav_path'], '/ '), '/ '); // without slash in the end $webdavpath = rtrim('/'.ltrim($this->options['webdav_path'], '/ '), '/ '); // without slash in the end
$this->dav->get($webdavpath. $url, $buffer); $this->dav->get_file($webdavpath. $url, $path);
$fp = fopen($path, 'wb');
fwrite($fp, $buffer);
return array('path'=>$path); return array('path'=>$path);
} }
public function global_search() { public function global_search() {