diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-02-05 16:11:50 +0000 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-02-05 16:11:50 +0000 |
| commit | 680c5b3dad9f83b912da3a0629060525d08c2165 (patch) | |
| tree | cf1c5c4ffc87ff3ba85a66a2b267e5b7d6186170 /apps | |
| parent | 221b69dd0ed1c493e2bd6d19e88b5e3dec97bd6e (diff) | |
| download | nextcloud-server-680c5b3dad9f83b912da3a0629060525d08c2165.tar.gz nextcloud-server-680c5b3dad9f83b912da3a0629060525d08c2165.zip | |
Removed debugging output
Diffstat (limited to 'apps')
| -rwxr-xr-x | apps/files_encryption/lib/crypt.php | 6 | ||||
| -rw-r--r-- | apps/files_encryption/lib/util.php | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index ff7d6dfb1fd..e3ffacabc9a 100755 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -187,16 +187,10 @@ class Crypt { * @return true / false
*/
public static function isLegacyEncryptedContent( $data, $relPath ) {
-
-// trigger_error("REL PATH = ".var_export($relPath, 1));
-
-// trigger_error( "DATA = ".var_export($data, 1). " CATFILE?: ".var_export( self::isCatfile( $data ), 1));
// Fetch all file metadata from DB
$metadata = \OC\Files\Filesystem::getFileInfo( $relPath, '' );
- trigger_error("PATH = ". var_export($relPath, 1)." METADATA = ".var_export($metadata['encrypted'], 1));
-
// If a file is flagged with encryption in DB, but isn't a
// valid content + IV combination, it's probably using the
// legacy encryption system
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index a16bf941600..355ffb90ef0 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -269,8 +269,6 @@ class Util { $data = $this->view->file_get_contents( $filePath ); -// trigger_error("HAKE \n".var_export($this->view->file_get_contents( $filePath ), 1)." \nfilepath = ".var_export($filePath, 1 )); - // If the file is encrypted // NOTE: If the userId is // empty or not set, file will @@ -366,8 +364,6 @@ class Util { if ( $found = $this->findFiles( $dirPath ) ) { -// trigger_error("FOUND = ".print_r($found, 1)); - // Disable proxy to prevent file being encrypted twice \OC_FileProxy::$enabled = false; @@ -407,8 +403,6 @@ class Util { // Fetch data from file $legacyData = $this->view->file_get_contents( $legacyFile['path'] ); - trigger_error("\n\nlegdata = ".var_export($legacyData, 1).' \n\npassphrase = '.var_export($legacyPassphrase, 1).' \n\npublickey = '.var_export($publicKey, 1).' \n\nnewpass = '.var_export($newPassphrase, 1)); - // Recrypt data, generate catfile $recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKey, $newPassphrase ); |