[Pkg-owncloud-commits] [owncloud] 89/121: make share folder configurable

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 1519f018a4a4104b978896a893845c2166742a45
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Wed Aug 13 12:55:14 2014 +0200

    make share folder configurable
---
 apps/files_sharing/appinfo/update.php |  3 +++
 apps/files_sharing/lib/helper.php     | 20 ++++++++++++++++++++
 apps/files_sharing/lib/share/file.php | 15 ++++++++++++++-
 config/config.sample.php              |  5 +++++
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index 72acdba..e393b15 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -113,5 +113,8 @@ function removeSharedFolder($mkdirs = true, $chunkSize = 99) {
 			$query->execute(array());
 		}
 
+		// set config to keep the Shared folder as the default location for new shares
+		\OCA\Files_Sharing\Helper::setShareFolder('/Shared');
+
 	}
 }
diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php
index c15b1d4..f444404 100644
--- a/apps/files_sharing/lib/helper.php
+++ b/apps/files_sharing/lib/helper.php
@@ -237,4 +237,24 @@ class Helper {
 		return ($result === 'yes') ? true : false;
 	}
 
+	/**
+	 * get default share folder
+	 *
+	 * @return string
+	 */
+	public static function getShareFolder() {
+		$shareFolder = \OCP\Config::getSystemValue('share_folder', '/');
+
+		return \OC\Files\Filesystem::normalizePath($shareFolder);
+	}
+
+	/**
+	 * set default share folder
+	 *
+	 * @param string $shareFolder
+	 */
+	public static function setShareFolder($shareFolder) {
+		\OCP\Config::setSystemValue('share_folder', $shareFolder);
+	}
+
 }
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 9159546..2ae7fdc 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -61,7 +61,8 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 	 * @return string
 	 */
 	public function generateTarget($filePath, $shareWith, $exclude = null) {
-		$target = '/'.basename($filePath);
+		$shareFolder = \OCA\Files_Sharing\Helper::getShareFolder();
+		$target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath));
 
 		// for group shares we return the target right away
 		if ($shareWith === false) {
@@ -70,6 +71,18 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 
 		\OC\Files\Filesystem::initMountPoints($shareWith);
 		$view = new \OC\Files\View('/' . $shareWith . '/files');
+
+		if (!$view->is_dir($shareFolder)) {
+			$dir = '';
+			$subdirs = explode('/', $shareFolder);
+			foreach ($subdirs as $subdir) {
+				$dir = $dir . '/' . $subdir;
+				if (!$view->is_dir($dir)) {
+					$view->mkdir($dir);
+				}
+			}
+		}
+
 		$excludeList = \OCP\Share::getItemsSharedWithUser('file', $shareWith, self::FORMAT_TARGET_NAMES);
 		if (is_array($exclude)) {
 			$excludeList = array_merge($excludeList, $exclude);
diff --git a/config/config.sample.php b/config/config.sample.php
index a0f3e0a..2aa240a 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -341,4 +341,9 @@ $CONFIG = array(
 	),
 ),
 
+/**
+ * define default folder for shared files and folders
+ */
+'share_folder' => '/',
+
 );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git