diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-07-26 11:26:22 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-07-26 11:26:22 +0000 |
| commit | edb04b25dea733e0ac3a1f87c55cfd368dcdf731 (patch) | |
| tree | e8b951b8162955d7f2282c83d06cf803e61396f3 /apps/files_encryption | |
| parent | 7de97ed20003d1f5ab9e2bfde9386bba07d0eff8 (diff) | |
| parent | b3848581bf5f77008a71cf79ba6e3d61b33baed6 (diff) | |
| download | nextcloud-server-edb04b25dea733e0ac3a1f87c55cfd368dcdf731.tar.gz nextcloud-server-edb04b25dea733e0ac3a1f87c55cfd368dcdf731.zip | |
Fix merge conflicts
Diffstat (limited to 'apps/files_encryption')
| -rw-r--r-- | apps/files_encryption/js/settings.js | 4 | ||||
| -rw-r--r-- | apps/files_encryption/lib/cryptstream.php | 3 | ||||
| -rw-r--r-- | apps/files_encryption/templates/settings.php | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js index 37d62265c94..8cc433246cb 100644 --- a/apps/files_encryption/js/settings.js +++ b/apps/files_encryption/js/settings.js @@ -17,8 +17,8 @@ $(document).ready(function(){ OC.AppConfig.setValue('files_encryption','type_blacklist',blackList); } - $('#enbale_encryption').change(function(){ - var checked=$('#enbale_encryption').is(':checked'); + $('#enable_encryption').change(function(){ + var checked=$('#enable_encryption').is(':checked'); OC.AppConfig.setValue('files_encryption','enable_encryption',(checked)?'true':'false'); }) })
\ No newline at end of file diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php index e0020537563..46471911d94 100644 --- a/apps/files_encryption/lib/cryptstream.php +++ b/apps/files_encryption/lib/cryptstream.php @@ -31,9 +31,7 @@ class OC_CryptStream{ public static $sourceStreams=array(); private $source; private $path; - private $readBuffer;//for streams that dont support seeking private $meta=array();//header/meta for source stream - private $count; private $writeCache; private $size; private static $rootView; @@ -100,7 +98,6 @@ class OC_CryptStream{ public function stream_write($data){ $length=strlen($data); - $written=0; $currentPos=ftell($this->source); if($this->writeCache){ $data=$this->writeCache.$data; diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php index 25b5a06f56c..79780d694cf 100644 --- a/apps/files_encryption/templates/settings.php +++ b/apps/files_encryption/templates/settings.php @@ -7,6 +7,6 @@ <option selected="selected" value="<?php echo $type;?>"><?php echo $type;?></option> <?php endforeach;?> </select> - <input type='checkbox' id='enbale_encryption' <?php if($_['encryption_enabled']){echo 'checked="checked"';} ?>></input><label for='enbale_encryption'><?php echo $l->t('Enable Encryption')?></label> + <input type='checkbox' id='enable_encryption' <?php if($_['encryption_enabled']){echo 'checked="checked"';} ?>></input><label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label> </fieldset> </form> |