[Pkg-owncloud-commits] [owncloud] 17/34: Updated sharing capabilities

[David Prévot]

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

taffit pushed a commit to annotated tag v8.0.0
in repository owncloud.

commit d4e361db44e50787d5f660d5947aeeef82c38bf4
Author: Roeland Jago Douma <roeland at famdouma.nl>
Date:   Fri Feb 6 10:33:08 2015 +0100

    Updated sharing capabilities
    
    Moved to files_sharing
    Added more capabilities.
    Tried to order to capabilities more OO style
---
 apps/files_sharing/lib/capabilities.php | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/apps/files_sharing/lib/capabilities.php b/apps/files_sharing/lib/capabilities.php
index 6e14a60..50db775 100644
--- a/apps/files_sharing/lib/capabilities.php
+++ b/apps/files_sharing/lib/capabilities.php
@@ -40,23 +40,29 @@ class Capabilities {
 	 */
 	public function getCaps() {
 		$res = array();
-		if ($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
-			$res['allow_links'] = true;
 
-			if ($this->config->getAppValue('core', 'shareapi_enforce_links_password', 'yes') === 'yes') {
-				$res['enforce_links_password'] = true;
-			} 
+		$public = array();
+		if ($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
+			$public['password_enforced'] = ($this->config->getAppValue('core', 'shareapi_enforce_links_password', 'yes') === 'yes');
 
-			if ($this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes') {
-				$res['allow_public_upload'] = true;
+			$public['expire_date'] = array();
+			if ($this->config->getAppValue('core', 'shareapi_default_expire_date', 'yes') === 'yes') {
+				$public['expire_date']['days'] = $this->config->getAppValue('core', 'shareapi_expire_after_n_days', false);
+				$public['expire_date']['enforce'] = $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'yes') === 'yes';
 			}
 
-			$res = array('sharing' => $res);
+			$public['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'yes') === 'yes';
 		}
+		$res["public"] = $public;
+
+		$res['user']['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_mail_notification', 'yes') === 'yes';
+
+		$res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes';
+
 
 		return new \OC_OCS_Result(array(
 			'capabilities' => array(
-				'files' => $res
+				'files_sharing' => $res
 				),
 			));
 	}

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