From 40efeb91878e72eb5c2eb1ab50574cda9435e0fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Fri, 22 Feb 2013 16:02:27 +0100
Subject: [PATCH] isSharedFile() doesn't detect all shares, just use
 getUsersSharingFile() directly either you get a list of users or not

---
 apps/files_encryption/lib/proxy.php |  6 +----
 lib/public/share.php                | 34 -----------------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 9e6a11d9d48..ebe09dc075a 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -113,14 +113,10 @@ class Proxy extends \OC_FileProxy {
 				$encData = Crypt::symmetricEncryptFileContentKeyfile( $data );
 				
 				// Check if the keyfile needs to be shared
-				if ( \OCP\Share::isSharedFile( $filePath ) ) {
+				if ( ($userIds = \OCP\Share::getUsersSharingFile( $filePath, true )) ) {
 					
 // 					$fileOwner = \OC\Files\Filesystem::getOwner( $path );
 					
-					// List everyone sharing the file
-					//TODO check, is this path always the path to the source file?
-					$userIds = \OCP\Share::getUsersSharingFile( $filePath, true );
-					
 					$publicKeys = Keymanager::getPublicKeys( $rootView, $userIds );
 					
 					\OC_FileProxy::$enabled = false;
diff --git a/lib/public/share.php b/lib/public/share.php
index 720337c3c38..7630c8ae6cb 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -108,41 +108,7 @@ class Share {
 		return $path;
 	
 	}
-	
-	public static function isSharedFile( $path ) {
-	
-		$fPath = self::prepFileTarget( $path );
-	
-		// Fetch all shares of this file path from DB
-		$query = \OC_DB::prepare( 
-			'SELECT 
-				id
-			FROM 
-				`*PREFIX*share` 
-			WHERE 
-				file_target = ?'
-			);
-			
-		$result = $query->execute( array( $fPath ) );
 		
-		if ( \OC_DB::isError( $result ) ) {
-		
-			\OC_Log::write( 'OCP\Share', \OC_DB::getErrorMessage( $result ) . ', path=' . $fPath, \OC_Log::ERROR );
-		
-		}
-		
-		if ( $result->fetchRow() !== false ) {
-		
-			return true;
-		
-		} else {
-		
-			return false;
-			
-		}
-	
-	}
-	
 	/**
 	* @brief Find which users can access a shared item
 	* @param $path to the file