Fixes to code formatting and indentation

diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 51d4f8ffc04a86ab50ab66b539af593cbbbce4f1..6c2df6f840641392962236dba51b0906251ee96b 100755 (executable)
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -113,8 +113,8 @@ class Keymanager {
                \OC_FileProxy::$enabled = false;
 
                //here we need the currently logged in user, while userId can be a different user
-               $util = new Util($view, \OCP\User::getUser());
-               list($owner, $filename) = $util->getUidAndFilename($path);
+               $util = new Util( $view, \OCP\User::getUser() );
+               list( $owner, $filename ) = $util->getUidAndFilename( $path );
 
                $basePath = '/' . $owner . '/files_encryption/keyfiles';
                
@@ -123,19 +123,26 @@ class Keymanager {
                if ( !$view->is_dir( $basePath . '/' . $targetPath ) ) {
 
                        // create all parent folders
-                       $info=pathinfo($basePath . '/' . $targetPath);
-                       $keyfileFolderName=$view->getLocalFolder($info['dirname']);
-                       if(!file_exists($keyfileFolderName)) {
-                               mkdir($keyfileFolderName, 0750, true);
+                       $info = pathinfo( $basePath . '/' . $targetPath );
+                       $keyfileFolderName = $view->getLocalFolder( $info['dirname'] );
+                       
+                       if ( ! file_exists( $keyfileFolderName ) ) {
+                               
+                               mkdir( $keyfileFolderName, 0750, true );
+                       
                        }
                }
 
-        // try reusing key file if part file
-        if(self::isPartialFilePath($targetPath)) {
-            $result = $view->file_put_contents( $basePath . '/' . self::fixPartialFilePath($targetPath) . '.key', $catfile );
-        } else {
-            $result = $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
-        }
+               // try reusing key file if part file
+               if ( self::isPartialFilePath( $targetPath ) ) {
+               
+                       $result = $view->file_put_contents( $basePath . '/' . self::fixPartialFilePath( $targetPath ) . '.key', $catfile );
+                       
+               } else {
+               
+                       $result = $view->file_put_contents( $basePath . '/' . $targetPath . '.key', $catfile );
+                       
+               }
                
                \OC_FileProxy::$enabled = $proxyStatus;
                
@@ -143,37 +150,47 @@ class Keymanager {
                
        }
 
-    /**
-     * @brief Remove .path extension from a file path
-     * @param string $path Path that may identify a .part file
-     * @return string File path without .part extension
-     * @note this is needed for reusing keys
-     */
-    public static function fixPartialFilePath($path)
-    {
-        if (preg_match('/\.part$/', $path)) {
+       /**
+        * @brief Remove .path extension from a file path
+        * @param string $path Path that may identify a .part file
+        * @return string File path without .part extension
+        * @note this is needed for reusing keys
+        */
+       public static function fixPartialFilePath( $path ) {
+       
+               if (preg_match('/\.part$/', $path)) {
 
-            $newLength = strlen($path) - 5;
-            $fPath = substr($path, 0, $newLength);
+                       $newLength = strlen($path) - 5;
+                       $fPath = substr($path, 0, $newLength);
 
-            return $fPath;
-        } else {
+                       return $fPath;
+                       
+               } else {
 
-            return $path;
+                       return $path;
 
-        }
+               }
 
-    }
+       }
 
-    public static function isPartialFilePath($path)
-    {
-        if (preg_match('/\.part$/', $path)) {
-             return true;
-        } else {
-            return false;
-        }
+       /**
+        * @brief Check if a path is a .part file
+        * @param string $path Path that may identify a .part file
+        * @return bool
+        */
+       public static function isPartialFilePath( $path ) {
+               
+               if ( preg_match('/\.part$/', $path ) ) {
+               
+                       return true;
+               
+               } else {
+                       
+                       return false;
+               
+               }
 
-    }
+       }
        /**
         * @brief retrieve keyfile for an encrypted file
         * @param \OC_FilesystemView $view
@@ -186,21 +203,26 @@ class Keymanager {
         */
        public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
 
-        // try reusing key file if part file
-        if(self::isPartialFilePath($filePath)) {
-            $result = self::getFileKey($view, $userId, self::fixPartialFilePath($filePath));
-            if($result) {
-                return $result;
-            }
-        }
+               // try reusing key file if part file
+               if ( self::isPartialFilePath( $filePath ) ) {
+               
+                       $result = self::getFileKey( $view, $userId, self::fixPartialFilePath( $filePath ) );
+               
+                       if ( $result ) {
+                       
+                               return $result;
+                               
+                       }
+       
+               }
 
                $util = new Util($view, \OCP\User::getUser());
                list($owner, $filename) = $util->getUidAndFilename($filePath);
                $filePath_f = ltrim( $filename, '/' );
 
-        $keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+               $keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
 
-        $proxyStatus = \OC_FileProxy::$enabled;
+               $proxyStatus = \OC_FileProxy::$enabled;
                \OC_FileProxy::$enabled = false;
                
                if ( $view->file_exists( $keyfilePath ) ) {
@@ -269,7 +291,7 @@ class Keymanager {
                
                $view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
 
-        $proxyStatus = \OC_FileProxy::$enabled;
+               $proxyStatus = \OC_FileProxy::$enabled;
                \OC_FileProxy::$enabled = false;
                
                if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
@@ -278,7 +300,8 @@ class Keymanager {
                
                \OC_FileProxy::$enabled = $proxyStatus;
 
-        return $result;
+               return $result;
+               
        }
        
        /**
@@ -304,7 +327,7 @@ class Keymanager {
                
                $view = new \OC_FilesystemView( '/public-keys' );
 
-        $proxyStatus = \OC_FileProxy::$enabled;
+               $proxyStatus = \OC_FileProxy::$enabled;
                \OC_FileProxy::$enabled = false;
                
                if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
@@ -313,7 +336,7 @@ class Keymanager {
                
                \OC_FileProxy::$enabled = $proxyStatus;
 
-        return $result;
+               return $result;
                
        }
        
@@ -330,28 +353,32 @@ class Keymanager {
         */
        public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
 
-        //here we need the currently logged in user, while userId can be a different user
+               // Here we need the currently logged in user, while userId can be a different user
                $util = new Util( $view, \OCP\User::getUser() );
 
-               list($owner, $filename) = $util->getUidAndFilename($path);
+               list( $owner, $filename ) = $util->getUidAndFilename( $path );
 
                $basePath = '/' . $owner . '/files_encryption/share-keys';
                
                $shareKeyPath = self::keySetPreparation( $view, $filename, $basePath, $owner );
 
-        // try reusing key file if part file
-        if(self::isPartialFilePath($shareKeyPath)) {
-            $writePath = $basePath . '/' . self::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
-        } else {
-            $writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
-        }
+               // try reusing key file if part file
+               if(self::isPartialFilePath($shareKeyPath)) {
+               
+                       $writePath = $basePath . '/' . self::fixPartialFilePath($shareKeyPath) . '.' . $userId . '.shareKey';
+                       
+               } else {
+               
+                       $writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
+                       
+               }
 
-        $proxyStatus = \OC_FileProxy::$enabled;
+               $proxyStatus = \OC_FileProxy::$enabled;
                \OC_FileProxy::$enabled = false;
 
                $result = $view->file_put_contents( $writePath, $shareKey );
 
-        \OC_FileProxy::$enabled = $proxyStatus;
+               \OC_FileProxy::$enabled = $proxyStatus;
 
                if ( 
                        is_int( $result ) 
@@ -407,15 +434,20 @@ class Keymanager {
         */
        public static function getShareKey( \OC_FilesystemView $view, $userId, $filePath ) {
 
-        // try reusing key file if part file
-        if(self::isPartialFilePath($filePath)) {
-            $result = self::getShareKey($view, $userId, self::fixPartialFilePath($filePath));
-            if($result) {
-                return $result;
-            }
-        }
+               // try reusing key file if part file
+               if(self::isPartialFilePath($filePath)) {
+               
+                       $result = self::getShareKey($view, $userId, self::fixPartialFilePath($filePath));
+                       
+                       if($result) {
+                       
+                               return $result;
+                               
+                       }
+                       
+               }
 
-        $proxyStatus = \OC_FileProxy::$enabled;
+               $proxyStatus = \OC_FileProxy::$enabled;
                \OC_FileProxy::$enabled = false;
 
                //here we need the currently logged in user, while userId can be a different user