aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/lib/cryptstream.php
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2012-11-04 19:58:48 +0100
committerArthur Schiwon <blizzz@owncloud.com>2012-11-04 19:58:48 +0100
commit00bb246a0d90ddbcc1016fdedb5cf629bfbca70a (patch)
treef5d69cf10ef3fd157a21990a38515c03b74035a1 /apps/files_encryption/lib/cryptstream.php
parentdf8c67721df1358eab7aa5794ef223a5bc8f0b59 (diff)
parent8ac3849a95bd6a733cce9134bab4bf38c5c0fadd (diff)
downloadnextcloud-server-00bb246a0d90ddbcc1016fdedb5cf629bfbca70a.tar.gz
nextcloud-server-00bb246a0d90ddbcc1016fdedb5cf629bfbca70a.zip
merge from master
Diffstat (limited to 'apps/files_encryption/lib/cryptstream.php')
-rw-r--r--apps/files_encryption/lib/cryptstream.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index 0dd2d4b7b1e..8b05560050d 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -23,7 +23,7 @@
/**
* transparently encrypted filestream
*
- * you can use it as wrapper around an existing stream by setting OC_CryptStream::$sourceStreams['foo']=array('path'=>$path,'stream'=>$stream)
+ * you can use it as wrapper around an existing stream by setting OC_CryptStream::$sourceStreams['foo']=array('path'=>$path, 'stream'=>$stream)
* and then fopen('crypt://streams/foo');
*/
@@ -106,7 +106,7 @@ class OC_CryptStream{
if($currentPos%8192!=0) {
//make sure we always start on a block start
fseek($this->source, -($currentPos%8192), SEEK_CUR);
- $encryptedBlock=fread($this->source,8192);
+ $encryptedBlock=fread($this->source, 8192);
fseek($this->source, -($currentPos%8192), SEEK_CUR);
$block=OC_Crypt::decrypt($encryptedBlock);
$data=substr($block, 0, $currentPos%8192).$data;
@@ -123,11 +123,11 @@ class OC_CryptStream{
$data=substr($data, 8192);
}
}
- $this->size=max($this->size,$currentPos+$length);
+ $this->size=max($this->size, $currentPos+$length);
return $length;
}
- public function stream_set_option($option,$arg1,$arg2) {
+ public function stream_set_option($option, $arg1, $arg2) {
switch($option) {
case STREAM_OPTION_BLOCKING:
stream_set_blocking($this->source, $arg1);