Merge branch 'master' into large-sidebar-preview-resize

apps/files_external/controller/globalstoragescontroller.php

@@ -98,7 +98,7 @@ class GlobalStoragesController extends StoragesController {
 			return $newStorage;
 		}
 
-		$response = $this->validate($newStorage, BackendService::PERMISSION_CREATE);
+		$response = $this->validate($newStorage);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -154,7 +154,7 @@ class GlobalStoragesController extends StoragesController {
 		}
 		$storage->setId($id);
 
-		$response = $this->validate($storage, BackendService::PERMISSION_MODIFY);
+		$response = $this->validate($storage);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -180,12 +180,12 @@ class GlobalStoragesController extends StoragesController {
 	}
 
 	/**
-	 * Get the user type for this controller, used in validation
+	 * Get the visibility type for this controller, used in validation
 	 *
-	 * @return string BackendService::USER_* constants
+	 * @return string BackendService::VISIBILITY_* constants
 	 */
-	protected function getUserType() {
+	protected function getVisibilityType() {
-		return BackendService::USER_ADMIN;
+		return BackendService::VISIBILITY_ADMIN;
 	}
 
 

apps/files_external/controller/storagescontroller.php

@@ -125,11 +125,10 @@ abstract class StoragesController extends Controller {
 	 * Validate storage config
 	 *
 	 * @param StorageConfig $storage storage config
-	 * @param int $permissionCheck permission to check
 	 *
 	 * @return DataResponse|null returns response in case of validation error
 	 */
-	protected function validate(StorageConfig $storage, $permissionCheck = BackendService::PERMISSION_CREATE) {
+	protected function validate(StorageConfig $storage) {
 		$mountPoint = $storage->getMountPoint();
 		if ($mountPoint === '' || $mountPoint === '/') {
 			return new DataResponse(
@@ -166,7 +165,7 @@ abstract class StoragesController extends Controller {
 			);
 		}
 
-		if (!$backend->isPermitted($this->getUserType(), $permissionCheck)) {
+		if (!$backend->isVisibleFor($this->getVisibilityType())) {
 			// not permitted to use backend
 			return new DataResponse(
 				array(
@@ -177,7 +176,7 @@ abstract class StoragesController extends Controller {
 				Http::STATUS_UNPROCESSABLE_ENTITY
 			);
 		}
-		if (!$authMechanism->isPermitted($this->getUserType(), $permissionCheck)) {
+		if (!$authMechanism->isVisibleFor($this->getVisibilityType())) {
 			// not permitted to use auth mechanism
 			return new DataResponse(
 				array(
@@ -212,11 +211,11 @@ abstract class StoragesController extends Controller {
 	}
 
 	/**
-	 * Get the user type for this controller, used in validation
+	 * Get the visibility type for this controller, used in validation
 	 *
-	 * @return string BackendService::USER_* constants
+	 * @return string BackendService::VISIBILITY_* constants
 	 */
-	abstract protected function getUserType();
+	abstract protected function getVisibilityType();
 
 	/**
 	 * Check whether the given storage is available / valid.

apps/files_external/controller/userstoragescontroller.php

@@ -103,7 +103,7 @@ class UserStoragesController extends StoragesController {
 			return $newStorage;
 		}
 
-		$response = $this->validate($newStorage, BackendService::PERMISSION_CREATE);
+		$response = $this->validate($newStorage);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -151,7 +151,7 @@ class UserStoragesController extends StoragesController {
 		}
 		$storage->setId($id);
 
-		$response = $this->validate($storage, BackendService::PERMISSION_MODIFY);
+		$response = $this->validate($storage);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -188,12 +188,12 @@ class UserStoragesController extends StoragesController {
 	}
 
 	/**
-	 * Get the user type for this controller, used in validation
+	 * Get the visibility type for this controller, used in validation
 	 *
-	 * @return string BackendService::USER_* constants
+	 * @return string BackendService::VISIBILITY_* constants
 	 */
-	protected function getUserType() {
+	protected function getVisibilityType() {
-		return BackendService::USER_PERSONAL;
+		return BackendService::VISIBILITY_PERSONAL;
 	}
 
 }

apps/files_external/js/settings.js

@@ -1113,7 +1113,18 @@ $(document).ready(function() {
 
 	$('input[name="allowUserMountingBackends\\[\\]"]').bind('change', function() {
 		OC.msg.startSaving('#userMountingMsg');
-		var userMountingBackends = $('input[name="allowUserMountingBackends\\[\\]"]:checked').map(function(){return $(this).val();}).get();
+
+		var userMountingBackends = $('input[name="allowUserMountingBackends\\[\\]"]:checked').map(function(){
+			return $(this).val();
+		}).get();
+		var deprecatedBackends = $('input[name="allowUserMountingBackends\\[\\]"][data-deprecate-to]').map(function(){
+			if ($.inArray($(this).data('deprecate-to'), userMountingBackends) !== -1) {
+				return $(this).val();
+			}
+			return null;
+		}).get();
+		userMountingBackends = userMountingBackends.concat(deprecatedBackends);
+
 		OC.AppConfig.setValue('files_external', 'user_mounting_backends', userMountingBackends.join());
 		OC.msg.finishedSaving('#userMountingMsg', {status: 'success', data: {message: t('files_external', 'Saved')}});
 

apps/files_external/lib/auth/authmechanism.php

@@ -22,7 +22,7 @@
 namespace OCA\Files_External\Lib\Auth;
 
 use \OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_External\Lib\PermissionsTrait;
+use \OCA\Files_External\Lib\VisibilityTrait;
 use \OCA\Files_External\Lib\IdentifierTrait;
 use \OCA\Files_External\Lib\FrontendDefinitionTrait;
 use \OCA\Files_External\Lib\StorageModifierTrait;
@@ -40,7 +40,7 @@ use \OCA\Files_External\Lib\StorageModifierTrait;
  * scheme, which are provided from the authentication mechanism.
  *
  * This class uses the following traits:
- *  - PermissionsTrait
+ *  - VisibilityTrait
  *      Restrict usage to admin-only/none
  *  - FrontendDefinitionTrait
  *      Specify configuration parameters and other definitions
@@ -58,7 +58,7 @@ class AuthMechanism implements \JsonSerializable {
 	const SCHEME_PUBLICKEY = 'publickey';
 	const SCHEME_OPENSTACK = 'openstack';
 
-	use PermissionsTrait;
+	use VisibilityTrait;
 	use FrontendDefinitionTrait;
 	use StorageModifierTrait;
 	use IdentifierTrait;
@@ -92,6 +92,8 @@ class AuthMechanism implements \JsonSerializable {
 	 */
 	public function jsonSerialize() {
 		$data = $this->jsonSerializeDefinition();
+		$data += $this->jsonSerializeIdentifier();
+
 		$data['scheme'] = $this->getScheme();
 
 		return $data;

apps/files_external/lib/backend/backend.php

@@ -22,7 +22,7 @@
 namespace OCA\Files_External\Lib\Backend;
 
 use \OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_External\Lib\PermissionsTrait;
+use \OCA\Files_External\Lib\VisibilityTrait;
 use \OCA\Files_External\Lib\FrontendDefinitionTrait;
 use \OCA\Files_External\Lib\PriorityTrait;
 use \OCA\Files_External\Lib\DependencyTrait;
@@ -43,7 +43,7 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
  * scheme, which are provided from the authentication mechanism.
  *
  * This class uses the following traits:
- *  - PermissionsTrait
+ *  - VisibilityTrait
  *      Restrict usage to admin-only/none
  *  - FrontendDefinitionTrait
  *      Specify configuration parameters and other definitions
@@ -56,7 +56,7 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
  */
 class Backend implements \JsonSerializable {
 
-	use PermissionsTrait;
+	use VisibilityTrait;
 	use FrontendDefinitionTrait;
 	use PriorityTrait;
 	use DependencyTrait;
@@ -142,6 +142,7 @@ class Backend implements \JsonSerializable {
 	 */
 	public function jsonSerialize() {
 		$data = $this->jsonSerializeDefinition();
+		$data += $this->jsonSerializeIdentifier();
 
 		$data['backend'] = $data['name']; // legacy compat
 		$data['priority'] = $this->getPriority();

apps/files_external/lib/backend/local.php

@@ -39,7 +39,7 @@ class Local extends Backend {
 			->addParameters([
 				(new DefinitionParameter('datadir', $l->t('Location'))),
 			])
-			->setAllowedPermissions(BackendService::USER_PERSONAL, BackendService::PERMISSION_NONE)
+			->setAllowedVisibility(BackendService::VISIBILITY_ADMIN)
 			->setPriority(BackendService::PRIORITY_DEFAULT + 50)
 			->addAuthScheme(AuthMechanism::SCHEME_NULL)
 			->setLegacyAuthMechanism($legacyAuth)

apps/files_external/lib/backend/sftp_key.php

@@ -27,23 +27,23 @@ use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Lib\Auth\PublicKey\RSA;
+use \OCA\Files_External\Lib\Backend\SFTP;
 
 class SFTP_Key extends Backend {
 
-	public function __construct(IL10N $l, RSA $legacyAuth) {
+	public function __construct(IL10N $l, RSA $legacyAuth, SFTP $sftpBackend) {
 		$this
 			->setIdentifier('\OC\Files\Storage\SFTP_Key')
 			->setStorageClass('\OC\Files\Storage\SFTP')
-			->setText($l->t('SFTP with secret key login [DEPRECATED]'))
+			->setText($l->t('SFTP with secret key login'))
 			->addParameters([
 				(new DefinitionParameter('host', $l->t('Host'))),
 				(new DefinitionParameter('root', $l->t('Remote subfolder')))
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
-			->removeAllowedPermission(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
-			->removeAllowedPermission(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE)
 			->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
 			->setLegacyAuthMechanism($legacyAuth)
+			->deprecateTo($sftpBackend)
 		;
 	}
 

apps/files_external/lib/backend/smb_oc.php

@@ -29,6 +29,7 @@ use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Lib\Auth\Password\SessionCredentials;
 use \OCA\Files_External\Lib\StorageConfig;
 use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
+use \OCA\Files_External\Lib\Backend\SMB;
 
 /**
  * Deprecated SMB_OC class - use SMB with the password::sessioncredentials auth mechanism
@@ -37,11 +38,11 @@ class SMB_OC extends Backend {
 
 	use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, SessionCredentials $legacyAuth) {
+	public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBackend) {
 		$this
 			->setIdentifier('\OC\Files\Storage\SMB_OC')
 			->setStorageClass('\OC\Files\Storage\SMB')
-			->setText($l->t('SMB / CIFS using OC login [DEPRECATED]'))
+			->setText($l->t('SMB / CIFS using OC login'))
 			->addParameters([
 				(new DefinitionParameter('host', $l->t('Host'))),
 				(new DefinitionParameter('username_as_share', $l->t('Username as share')))
@@ -51,11 +52,10 @@ class SMB_OC extends Backend {
 				(new DefinitionParameter('root', $l->t('Remote subfolder')))
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
-			->removeAllowedPermission(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
-			->removeAllowedPermission(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE)
 			->setPriority(BackendService::PRIORITY_DEFAULT - 10)
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
 			->setLegacyAuthMechanism($legacyAuth)
+			->deprecateTo($smbBackend)
 		;
 	}
 

apps/files_external/lib/identifiertrait.php

@@ -23,6 +23,7 @@ namespace OCA\Files_External\Lib;
 
 /**
  * Trait for objects requiring an identifier (and/or identifier aliases)
+ * Also supports deprecation to a different object, linking the objects
  */
 trait IdentifierTrait {
 
@@ -32,6 +33,9 @@ trait IdentifierTrait {
 	/** @var string[] */
 	protected $identifierAliases = [];
 
+	/** @var IdentifierTrait */
+	protected $deprecateTo = null;
+
 	/**
 	 * @return string
 	 */
@@ -65,4 +69,34 @@ trait IdentifierTrait {
 		return $this;
 	}
 
+	/**
+	 * @return object|null
+	 */
+	public function getDeprecateTo() {
+		return $this->deprecateTo;
+	}
+
+	/**
+	 * @param object $destinationObject
+	 * @return self
+	 */
+	public function deprecateTo($destinationObject) {
+		$this->deprecateTo = $destinationObject;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function jsonSerializeIdentifier() {
+		$data = [
+			'identifier' => $this->identifier,
+			'identifierAliases' => $this->identifierAliases,
+		];
+		if ($this->deprecateTo) {
+			$data['deprecateTo'] = $this->deprecateTo->getIdentifier();
+		}
+		return $data;
+	}
+
 }

apps/files_external/lib/permissionstrait.php

@@ -1,164 +0,0 @@
-<?php
-/**
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\Files_External\Lib;
-
-use \OCA\Files_External\Service\BackendService;
-
-/**
- * Trait to implement backend and auth mechanism permissions
- *
- * For user type constants, see BackendService::USER_*
- * For permission constants, see BackendService::PERMISSION_*
- */
-trait PermissionsTrait {
-
-	/** @var array [user type => permissions] */
-	protected $permissions = [
-		BackendService::USER_PERSONAL => BackendService::PERMISSION_DEFAULT,
-		BackendService::USER_ADMIN => BackendService::PERMISSION_DEFAULT,
-	];
-
-	/** @var array [user type => allowed permissions] */
-	protected $allowedPermissions = [
-		BackendService::USER_PERSONAL => BackendService::PERMISSION_DEFAULT,
-		BackendService::USER_ADMIN => BackendService::PERMISSION_DEFAULT,
-	];
-
-	/**
-	 * @param string $userType
-	 * @return int
-	 */
-	public function getPermissions($userType) {
-		if (isset($this->permissions[$userType])) {
-			return $this->permissions[$userType];
-		}
-		return BackendService::PERMISSION_NONE;
-	}
-
-	/**
-	 * Check if the user type has permission
-	 *
-	 * @param string $userType
-	 * @param int $permission
-	 * @return bool
-	 */
-	public function isPermitted($userType, $permission) {
-		if ($this->getPermissions($userType) & $permission) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $userType
-	 * @param int $permissions
-	 * @return self
-	 */
-	public function setPermissions($userType, $permissions) {
-		$this->permissions[$userType] = $permissions;
-		$this->allowedPermissions[$userType] =
-			$this->getAllowedPermissions($userType) | $permissions;
-		return $this;
-	}
-
-	/**
-	 * @param string $userType
-	 * @param int $permission
-	 * @return self
-	 */
-	public function addPermission($userType, $permission) {
-		return $this->setPermissions($userType,
-			$this->getPermissions($userType) | $permission
-		);
-	}
-
-	/**
-	 * @param string $userType
-	 * @param int $permission
-	 * @return self
-	 */
-	public function removePermission($userType, $permission) {
-		return $this->setPermissions($userType,
-			$this->getPermissions($userType) & ~$permission
-		);
-	}
-
-	/**
-	 * @param string $userType
-	 * @return int
-	 */
-	public function getAllowedPermissions($userType) {
-		if (isset($this->allowedPermissions[$userType])) {
-			return $this->allowedPermissions[$userType];
-		}
-		return BackendService::PERMISSION_NONE;
-	}
-
-	/**
-	 * Check if the user type has an allowed permission
-	 *
-	 * @param string $userType
-	 * @param int $permission
-	 * @return bool
-	 */
-	public function isAllowedPermitted($userType, $permission) {
-		if ($this->getAllowedPermissions($userType) & $permission) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $userType
-	 * @param int $permissions
-	 * @return self
-	 */
-	public function setAllowedPermissions($userType, $permissions) {
-		$this->allowedPermissions[$userType] = $permissions;
-		$this->permissions[$userType] =
-			$this->getPermissions($userType) & $permissions;
-		return $this;
-	}
-
-	/**
-	 * @param string $userType
-	 * @param int $permission
-	 * @return self
-	 */
-	public function addAllowedPermission($userType, $permission) {
-		return $this->setAllowedPermissions($userType,
-			$this->getAllowedPermissions($userType) | $permission
-		);
-	}
-
-	/**
-	 * @param string $userType
-	 * @param int $permission
-	 * @return self
-	 */
-	public function removeAllowedPermission($userType, $permission) {
-		return $this->setAllowedPermissions($userType,
-			$this->getAllowedPermissions($userType) & ~$permission
-		);
-	}
-
-}

apps/files_external/lib/visibilitytrait.php

@@ -0,0 +1,136 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib;
+
+use \OCA\Files_External\Service\BackendService;
+
+/**
+ * Trait to implement visibility mechanics for a configuration class
+ *
+ * The standard visibility defines which users/groups can use or see the
+ * object. The allowed visibility defines the maximum visibility allowed to be
+ * set on the object. The standard visibility is often set dynamically by
+ * stored configuration parameters that can be modified by the administrator,
+ * while the allowed visibility is set directly by the object and cannot be
+ * modified by the administrator.
+ */
+trait VisibilityTrait {
+
+	/** @var int visibility */
+	protected $visibility = BackendService::VISIBILITY_DEFAULT;
+
+	/** @var int allowed visibilities */
+	protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT;
+
+	/**
+	 * @return int
+	 */
+	public function getVisibility() {
+		return $this->visibility;
+	}
+
+	/**
+	 * Check if the backend is visible for a user type
+	 *
+	 * @param int $visibility
+	 * @return bool
+	 */
+	public function isVisibleFor($visibility) {
+		if ($this->visibility & $visibility) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @param int $visibility
+	 * @return self
+	 */
+	public function setVisibility($visibility) {
+		$this->visibility = $visibility;
+		$this->allowedVisibility |= $visibility;
+		return $this;
+	}
+
+	/**
+	 * @param int $visibility
+	 * @return self
+	 */
+	public function addVisibility($visibility) {
+		return $this->setVisibility($this->visibility | $visibility);
+	}
+
+	/**
+	 * @param int $visibility
+	 * @return self
+	 */
+	public function removeVisibility($visibility) {
+		return $this->setVisibility($this->visibility & ~$visibility);
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getAllowedVisibility() {
+		return $this->allowedVisibility;
+	}
+
+	/**
+	 * Check if the backend is allowed to be visible for a user type
+	 *
+	 * @param int $allowedVisibility
+	 * @return bool
+	 */
+	public function isAllowedVisibleFor($allowedVisibility) {
+		if ($this->allowedVisibility & $allowedVisibility) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @param int $allowedVisibility
+	 * @return self
+	 */
+	public function setAllowedVisibility($allowedVisibility) {
+		$this->allowedVisibility = $allowedVisibility;
+		$this->visibility &= $allowedVisibility;
+		return $this;
+	}
+
+	/**
+	 * @param int $allowedVisibility
+	 * @return self
+	 */
+	public function addAllowedVisibility($allowedVisibility) {
+		return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility);
+	}
+
+	/**
+	 * @param int $allowedVisibility
+	 * @return self
+	 */
+	public function removeAllowedVisibility($allowedVisibility) {
+		return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility);
+	}
+
+}

apps/files_external/personal.php

@@ -35,10 +35,10 @@ OCP\Util::addScript('files_external', 'settings');
 OCP\Util::addStyle('files_external', 'settings');
 
 $backends = array_filter($backendService->getAvailableBackends(), function($backend) {
-	return $backend->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE);
+	return $backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL);
 });
 $authMechanisms = array_filter($backendService->getAuthMechanisms(), function($authMechanism) {
-	return $authMechanism->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE);
+	return $authMechanism->isVisibleFor(BackendService::VISIBILITY_PERSONAL);
 });
 foreach ($backends as $backend) {
 	if ($backend->getCustomJs()) {

apps/files_external/service/backendservice.php

@@ -31,17 +31,13 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
  */
 class BackendService {
 
-	/** Permission constants for PermissionsTrait */
+	/** Visibility constants for VisibilityTrait */
-	const PERMISSION_NONE = 0;
+	const VISIBILITY_NONE = 0;
-	const PERMISSION_MOUNT = 1;
+	const VISIBILITY_PERSONAL = 1;
-	const PERMISSION_CREATE = 2;
+	const VISIBILITY_ADMIN = 2;
-	const PERMISSION_MODIFY = 4;
+	//const VISIBILITY_ALIENS = 4;
 
-	const PERMISSION_DEFAULT = 7; // MOUNT | CREATE | MODIFY
+	const VISIBILITY_DEFAULT = 3; // PERSONAL | ADMIN
-
-	/** User contants */
-	const USER_ADMIN = 'admin';
-	const USER_PERSONAL = 'personal';
 
 	/** Priority constants for PriorityTrait */
 	const PRIORITY_DEFAULT = 100;
@@ -85,7 +81,7 @@ class BackendService {
 	 */
 	public function registerBackend(Backend $backend) {
 		if (!$this->isAllowedUserBackend($backend)) {
-			$backend->removePermission(self::USER_PERSONAL, self::PERMISSION_CREATE | self::PERMISSION_MOUNT);
+			$backend->removeVisibility(BackendService::VISIBILITY_PERSONAL);
 		}
 		foreach ($backend->getIdentifierAliases() as $alias) {
 			$this->backends[$alias] = $backend;
@@ -107,7 +103,7 @@ class BackendService {
 	 */
 	public function registerAuthMechanism(AuthMechanism $authMech) {
 		if (!$this->isAllowedAuthMechanism($authMech)) {
-			$authMech->removePermission(self::USER_PERSONAL, self::PERMISSION_CREATE | self::PERMISSION_MOUNT);
+			$authMech->removeVisibility(BackendService::VISIBILITY_PERSONAL);
 		}
 		foreach ($authMech->getIdentifierAliases() as $alias) {
 			$this->authMechanisms[$alias] = $authMech;

apps/files_external/settings.php

@@ -42,10 +42,10 @@ OCP\Util::addStyle('files_external', 'settings');
 \OC_Util::addVendorStyle('select2/select2');
 
 $backends = array_filter($backendService->getAvailableBackends(), function($backend) {
-	return $backend->isPermitted(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE);
+	return $backend->isVisibleFor(BackendService::VISIBILITY_ADMIN);
 });
 $authMechanisms = array_filter($backendService->getAuthMechanisms(), function($authMechanism) {
-	return $authMechanism->isPermitted(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE);
+	return $authMechanism->isVisibleFor(BackendService::VISIBILITY_ADMIN);
 });
 foreach ($backends as $backend) {
 	if ($backend->getCustomJs()) {
@@ -59,9 +59,7 @@ foreach ($authMechanisms as $authMechanism) {
 }
 
 $userBackends = array_filter($backendService->getAvailableBackends(), function($backend) {
-	return $backend->isAllowedPermitted(
+	return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL);
-		BackendService::USER_PERSONAL, BackendService::PERMISSION_MOUNT
-	);
 });
 
 $tmpl = new OCP\Template('files_external', 'settings');

apps/files_external/templates/settings.php

@@ -157,6 +157,7 @@
 							});
 						?>
 						<?php foreach ($sortedBackends as $backend): ?>
+							<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
 							<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
 						<?php endforeach; ?>
 					</select>
@@ -197,8 +198,12 @@
 		<p id="userMountingBackends"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>>
 			<?php p($l->t('Allow users to mount the following external storage')); ?><br />
 			<?php $i = 0; foreach ($_['userBackends'] as $backend): ?>
-				<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_MOUNT)) print_unescaped(' checked="checked"'); ?> />
+				<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
+					<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />
+				<?php else: ?>
+					<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
 					<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
+				<?php endif; ?>
 				<?php $i++; ?>
 			<?php endforeach; ?>
 		</p>

apps/files_external/tests/controller/storagescontrollertest.php

@@ -75,12 +75,12 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
-		$authMech->method('isPermitted')
+		$authMech->method('isVisibleFor')
 			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isPermitted')
+		$backend->method('isVisibleFor')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(1);
@@ -116,12 +116,12 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
-		$authMech->method('isPermitted')
+		$authMech->method('isVisibleFor')
 			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isPermitted')
+		$backend->method('isVisibleFor')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(1);
@@ -249,12 +249,12 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
-		$authMech->method('isPermitted')
+		$authMech->method('isVisibleFor')
 			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isPermitted')
+		$backend->method('isVisibleFor')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(255);
@@ -338,13 +338,13 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn($backendValidate);
-		$backend->method('isPermitted')
+		$backend->method('isVisibleFor')
 			->willReturn(true);
 
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->will($this->returnValue($authMechValidate));
-		$authMech->method('isPermitted')
+		$authMech->method('isVisibleFor')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig();

apps/files_external/tests/controller/userstoragescontrollertest.php

@@ -49,21 +49,15 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 	}
 
 	public function testAddOrUpdateStorageDisallowedBackend() {
-		$backend1 = $this->getBackendMock();
+		$backend = $this->getBackendMock();
-		$backend1->expects($this->once())
+		$backend->method('isVisibleFor')
-			->method('isPermitted')
+			->with(BackendService::VISIBILITY_PERSONAL)
-			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
-			->willReturn(false);
-		$backend2 = $this->getBackendMock();
-		$backend2->expects($this->once())
-			->method('isPermitted')
-			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_MODIFY)
 			->willReturn(false);
 		$authMech = $this->getAuthMechMock();
 
 		$storageConfig = new StorageConfig(1);
 		$storageConfig->setMountPoint('mount');
-		$storageConfig->setBackend($backend1);
+		$storageConfig->setBackend($backend);
 		$storageConfig->setAuthMechanism($authMech);
 		$storageConfig->setBackendOptions([]);
 
@@ -88,8 +82,6 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 
 		$this->assertEquals(Http::STATUS_UNPROCESSABLE_ENTITY, $response->getStatus());
 
-		$storageConfig->setBackend($backend2);
-
 		$response = $this->controller->update(
 			1,
 			'mount',

apps/files_external/tests/service/backendservicetest.php

@@ -83,11 +83,11 @@ class BackendServiceTest extends \Test\TestCase {
 
 		$backendAllowed = $this->getBackendMock('\User\Mount\Allowed');
 		$backendAllowed->expects($this->never())
-			->method('removePermission');
+			->method('removeVisibility');
 		$backendNotAllowed = $this->getBackendMock('\User\Mount\NotAllowed');
 		$backendNotAllowed->expects($this->once())
-			->method('removePermission')
+			->method('removeVisibility')
-			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE | BackendService::PERMISSION_MOUNT);
+			->with(BackendService::VISIBILITY_PERSONAL);
 
 		$backendAlias = $this->getMockBuilder('\OCA\Files_External\Lib\Backend\Backend')
 			->disableOriginalConstructor()

core/css/fixes.css

@@ -115,3 +115,8 @@ select {
 	line-height: 38px;
 }
 
+.lte8 input[type="checkbox"] + label:before { background-image: url('../img/actions/checkbox.png'); }
+.lte8 input[type="checkbox"].white + label:before { background-image: url('../img/actions/checkbox-white.png'); }
+.lte8 input[type="checkbox"]:checked + label:before { background-image: url('../img/actions/checkbox-checked.png'); }
+.lte8 input[type="checkbox"].white:checked + label:before { background-image: url('../img/actions/checkbox-checked-white.png'); }
+

core/js/shareitemmodel.js

@@ -50,7 +50,7 @@
 	 * @property {string} token
 	 * @property {string} share_with
 	 * @property {string} share_with_displayname
-	 * @property {string} share_mail_send
+	 * @property {string} mail_send
 	 * @property {OC.Share.Types.Collection|undefined} collection
 	 * @property {Date} expiration optional?
 	 * @property {number} stime optional?
@@ -63,6 +63,15 @@
 	 * @property {OC.Share.Types.LinkShareInfo|undefined} linkShare
 	 */
 
+	/**
+	 * These properties are sometimes returned by the server as strings instead
+	 * of integers, so we need to convert them accordingly...
+	 */
+	var SHARE_RESPONSE_INT_PROPS = [
+		'id', 'file_parent', 'mail_send', 'file_source', 'item_source', 'permissions',
+		'storage', 'share_type', 'parent', 'stime', 'expiration'
+	];
+
 	/**
 	 * @class OCA.Share.ShareItemModel
 	 * @classdesc
@@ -462,7 +471,7 @@
 			if(!_.isObject(share)) {
 				throw "Unknown Share";
 			}
-			return share.share_mail_send === '1';
+			return share.mail_send === 1;
 		},
 
 		/**
@@ -673,7 +682,19 @@
 			}
 
 			/** @type {OC.Share.Types.ShareInfo[]} **/
-			var shares = _.toArray(data.shares);
+			var shares = _.map(data.shares, function(share) {
+				// properly parse some values because sometimes the server
+				// returns integers as string...
+				var i;
+				for (i = 0; i < SHARE_RESPONSE_INT_PROPS.length; i++) {
+					var prop = SHARE_RESPONSE_INT_PROPS[i];
+					if (!_.isUndefined(share[prop])) {
+						share[prop] = parseInt(share[prop], 10);
+					}
+				}
+				return share;
+			});
+
 			this._legacyFillCurrentShares(shares);
 
 			var linkShare = { isLinkShare: false };

core/js/tests/specs/shareitemmodelSpec.js

@@ -249,10 +249,7 @@ describe('OC.Share.ShareItemModel', function() {
 		it('allows owner to share their own share when they are also the recipient', function() {
 			OC.currentUser = 'user1';
 			loadItemStub.yields({
-				reshare: {
+				reshare: {},
-					permissions: OC.PERMISSION_READ,
-					uid_owner: 'user1'
-				},
 				shares: []
 			});
 
@@ -261,6 +258,51 @@ describe('OC.Share.ShareItemModel', function() {
 			// sharing still allowed
 			expect(model.get('permissions') & OC.PERMISSION_SHARE).toEqual(OC.PERMISSION_SHARE);
 		});
+		it('properly parses integer values when the server is in the mood of returning ints as string', function() {
+			loadItemStub.yields({
+				reshare: {},
+				shares: [{
+					displayname_owner: 'root',
+					expiration: '1403900000',
+					file_source: '123',
+					file_target: '/folder',
+					id: '20',
+					item_source: '123',
+					item_type: 'file',
+					mail_send: '0',
+					parent: '999',
+					path: '/folder',
+					permissions: '' + OC.PERMISSION_READ,
+					share_type: '' + OC.Share.SHARE_TYPE_USER,
+					share_with: 'user1',
+					stime: '1403884258',
+					storage: '1',
+					token: 'tehtoken',
+					uid_owner: 'root'
+				}]
+			});
+
+			model.fetch();
+
+			var shares = model.get('shares');
+			expect(shares.length).toEqual(1);
+
+			var share = shares[0];
+			expect(share.id).toEqual(20);
+			expect(share.file_source).toEqual(123);
+			expect(share.file_target).toEqual('/folder');
+			expect(share.item_source).toEqual(123);
+			expect(share.item_type).toEqual('file');
+			expect(share.displayname_owner).toEqual('root');
+			expect(share.mail_send).toEqual(0);
+			expect(share.parent).toEqual(999);
+			expect(share.path).toEqual('/folder');
+			expect(share.permissions).toEqual(OC.PERMISSION_READ);
+			expect(share.share_type).toEqual(OC.Share.SHARE_TYPE_USER);
+			expect(share.share_with).toEqual('user1');
+			expect(share.stime).toEqual(1403884258);
+			expect(share.expiration).toEqual(1403900000);
+		});
 	});
 
 	describe('Util', function() {

core/search/js/search.js

@@ -217,10 +217,10 @@
 					$status.addClass('emptycontent').removeClass('status');
 					$status.html('');
 					$status.append('<div class="icon-search"></div>');
-					$status.append('<h2>' + t('core', 'No search results in other places') + '</h2>');
+					$status.append('<h2>' + t('core', 'No search results in other folders') + '</h2>');
 				} else {
 					$status.removeClass('emptycontent').addClass('status');
-					$status.text(n('core', '{count} search result in other places', '{count} search results in other places', count, {count:count}));
+					$status.text(n('core', '{count} search result in another folder', '{count} search results in other folders', count, {count:count}));
 				}
 			}
 			function renderCurrent() {

lib/private/app.php

@@ -411,7 +411,7 @@ class OC_App {
 	/**
 	 * Returns the Settings Navigation
 	 *
-	 * @return string
+	 * @return string[]
 	 *
 	 * This function returns an array containing all settings pages added. The
 	 * entries are sorted by the key 'order' ascending.

lib/private/templatelayout.php

@@ -116,9 +116,14 @@ class OC_TemplateLayout extends OC_Template {
 				}
 			}
 			$userDisplayName = OC_User::getDisplayName();
+			$appsMgmtActive = strpos(\OC::$server->getRequest()->getRequestUri(), \OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')) === 0;
+			if ($appsMgmtActive) {
+				$l = \OC::$server->getL10N('lib');
+				$this->assign('application', $l->t('Apps'));
+			}
 			$this->assign('user_displayname', $userDisplayName);
 			$this->assign('user_uid', OC_User::getUser());
-			$this->assign('appsmanagement_active', strpos(\OC::$server->getRequest()->getRequestUri(), \OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')) === 0 );
+			$this->assign('appsmanagement_active', $appsMgmtActive);
 			$this->assign('enableAvatars', $this->config->getSystemValue('enable_avatars', true));
 			$this->assign('userAvatarSet', \OC_Helper::userAvatarSet(OC_User::getUser()));
 		} else if ($renderAs == 'error') {
@@ -148,7 +153,7 @@ class OC_TemplateLayout extends OC_Template {
 		} else {
 			// Add the js files
 			$jsFiles = self::findJavascriptFiles(OC_Util::$scripts);
-			$this->assign('jsfiles', array(), false);
+			$this->assign('jsfiles', array());
 			if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
 				$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash)));
 			}