From bb229f729114bcd20b861e8b118fd6c805b96b73 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 26 Jul 2012 17:19:55 +0200
Subject: write private/public key from the client to the server

---
 apps/files_encryption/lib/keymanager.php | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

(limited to 'apps/files_encryption')

diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index f48047a692a..0bef3b74928 100644
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -73,8 +73,16 @@ class Keymanager {
 	 * @return bool true/false
 	 */
 	public static function setPrivateKey($user, $key) {
-		$view = new \OC_FilesystemView('/'.$user.'/files_encryption/');
-		return $view->file_put_contents($user.'.private.key', $key);
+
+		\OC_FileProxy::$enabled = false;
+		
+		$view = new \OC_FilesystemView('/'.$user.'/files_encryption');
+		if (!$view->file_exists('')) $view->mkdir('');
+		$result = $view->file_put_contents($user.'.private.key', $key);
+		
+		\OC_FileProxy::$enabled = true;
+		
+		return $result;
 	}
 	
 	
@@ -86,8 +94,16 @@ class Keymanager {
 	 * @return bool true/false
 	 */
 	public static function setPublicKey($user, $key) {
-		$view = new \OC_FilesystemView('/public-keys/');
-		return $view->file_put_contents($user.'.public.key', $key);
+		
+		\OC_FileProxy::$enabled = false;
+		
+		$view = new \OC_FilesystemView('/public-keys');
+		if (!$view->file_exists('')) $view->mkdir('');
+		$result = $view->file_put_contents($user.'.public.key', $key);
+		
+		\OC_FileProxy::$enabled = true;
+		
+		return $result;
 	}
 	
 	/**
@@ -103,10 +119,13 @@ class Keymanager {
 		\OC_FileProxy::$enabled = false;
 		
 		$view = new \OC_FilesystemView( '/' . $userId . '/' . 'files_encryption' );
-		
-		return $view->file_put_contents( '/' . $path . '.key', $key );
+		$path_parts = pathinfo($path);
+		if (!$view->file_exists($path_parts['dirname'])) $view->mkdir($path_parts['dirname']);
+		$result = $view->file_put_contents( '/' . $path . '.key', $key );
 		
 		\OC_FileProxy::$enabled = true;	
+		
+		return $result;
 	}
 	
 }
\ No newline at end of file
-- 
cgit v1.2.3