nextcloud / server

apps/files_sharing/lib/ShareBackend/Folder.php

Indentation +69 added lines, -69 removed lines

@@ -29,79 +29,79 @@
 
 class Folder extends File implements \OCP\Share_Backend_Collection {
 
-	/**
-	 * get shared parents
-	 *
-	 * @param int $itemSource item source ID
-	 * @param string $shareWith with whom should the item be shared
-	 * @param string $owner owner of the item
-	 * @return array with shares
-	 */
-	public function getParents($itemSource, $shareWith = null, $owner = null) {
-		$result = array();
-		$parent = $this->getParentId($itemSource);
-		while ($parent) {
-			$shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith, $owner);
-			if ($shares) {
-				foreach ($shares as $share) {
-					$name = basename($share['path']);
-					$share['collection']['path'] = $name;
-					$share['collection']['item_type'] = 'folder';
-					$share['file_path'] = $name;
-					$displayNameOwner = \OCP\User::getDisplayName($share['uid_owner']);
-					$displayNameShareWith = \OCP\User::getDisplayName($share['share_with']);
-					$share['displayname_owner'] = ($displayNameOwner) ? $displayNameOwner : $share['uid_owner'];
-					$share['share_with_displayname'] = ($displayNameShareWith) ? $displayNameShareWith : $share['uid_owner'];
+    /**
+     * get shared parents
+     *
+     * @param int $itemSource item source ID
+     * @param string $shareWith with whom should the item be shared
+     * @param string $owner owner of the item
+     * @return array with shares
+     */
+    public function getParents($itemSource, $shareWith = null, $owner = null) {
+        $result = array();
+        $parent = $this->getParentId($itemSource);
+        while ($parent) {
+            $shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith, $owner);
+            if ($shares) {
+                foreach ($shares as $share) {
+                    $name = basename($share['path']);
+                    $share['collection']['path'] = $name;
+                    $share['collection']['item_type'] = 'folder';
+                    $share['file_path'] = $name;
+                    $displayNameOwner = \OCP\User::getDisplayName($share['uid_owner']);
+                    $displayNameShareWith = \OCP\User::getDisplayName($share['share_with']);
+                    $share['displayname_owner'] = ($displayNameOwner) ? $displayNameOwner : $share['uid_owner'];
+                    $share['share_with_displayname'] = ($displayNameShareWith) ? $displayNameShareWith : $share['uid_owner'];
 
-					$result[] = $share;
-				}
-			}
-			$parent = $this->getParentId($parent);
-		}
+                    $result[] = $share;
+                }
+            }
+            $parent = $this->getParentId($parent);
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * get file cache ID of parent
-	 *
-	 * @param int $child file cache ID of child
-	 * @return mixed parent ID or null
-	 */
-	private function getParentId($child) {
-		$query = \OCP\DB::prepare('SELECT `parent` FROM `*PREFIX*filecache` WHERE `fileid` = ?');
-		$result = $query->execute(array($child));
-		$row = $result->fetchRow();
-		$parent = ($row) ? $row['parent'] : null;
+    /**
+     * get file cache ID of parent
+     *
+     * @param int $child file cache ID of child
+     * @return mixed parent ID or null
+     */
+    private function getParentId($child) {
+        $query = \OCP\DB::prepare('SELECT `parent` FROM `*PREFIX*filecache` WHERE `fileid` = ?');
+        $result = $query->execute(array($child));
+        $row = $result->fetchRow();
+        $parent = ($row) ? $row['parent'] : null;
 
-		return $parent;
-	}
+        return $parent;
+    }
 
-	public function getChildren($itemSource) {
-		$children = array();
-		$parents = array($itemSource);
-		$query = \OCP\DB::prepare('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?');
-		$result = $query->execute(array('httpd/unix-directory'));
-		if ($row = $result->fetchRow()) {
-			$mimetype = $row['id'];
-		} else {
-			$mimetype = -1;
-		}
-		while (!empty($parents)) {
-			$parents = "'".implode("','", $parents)."'";
-			$query = \OCP\DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`'
-				.' WHERE `parent` IN ('.$parents.')');
-			$result = $query->execute();
-			$parents = array();
-			while ($file = $result->fetchRow()) {
-				$children[] = array('source' => $file['fileid'], 'file_path' => $file['name']);
-				// If a child folder is found look inside it
-				if ($file['mimetype'] == $mimetype) {
-					$parents[] = $file['fileid'];
-				}
-			}
-		}
-		return $children;
-	}
+    public function getChildren($itemSource) {
+        $children = array();
+        $parents = array($itemSource);
+        $query = \OCP\DB::prepare('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?');
+        $result = $query->execute(array('httpd/unix-directory'));
+        if ($row = $result->fetchRow()) {
+            $mimetype = $row['id'];
+        } else {
+            $mimetype = -1;
+        }
+        while (!empty($parents)) {
+            $parents = "'".implode("','", $parents)."'";
+            $query = \OCP\DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`'
+                .' WHERE `parent` IN ('.$parents.')');
+            $result = $query->execute();
+            $parents = array();
+            while ($file = $result->fetchRow()) {
+                $children[] = array('source' => $file['fileid'], 'file_path' => $file['name']);
+                // If a child folder is found look inside it
+                if ($file['mimetype'] == $mimetype) {
+                    $parents[] = $file['fileid'];
+                }
+            }
+        }
+        return $children;
+    }
 
 }

apps/files_sharing/public.php

Indentation +4 added lines, -4 removed lines

@@ -28,9 +28,9 @@
 $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare';
 
 if($token !== '') {
-	OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token)));
+    OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token)));
 } else {
-	header('HTTP/1.0 404 Not Found');
-	$tmpl = new OCP\Template('', '404', 'guest');
-	print_unescaped($tmpl->fetchPage());
+    header('HTTP/1.0 404 Not Found');
+    $tmpl = new OCP\Template('', '404', 'guest');
+    print_unescaped($tmpl->fetchPage());
 }

apps/files_sharing/appinfo/update.php

Indentation +4 added lines, -4 removed lines

@@ -26,11 +26,11 @@
 
 // Migration OC8.2 -> OC9
 if (version_compare($installedVersion, '0.9.1', '<')) {
-	$m = new Migration(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig());
-	$m->removeReShares();
-	$m->updateInitiatorInfo();
+    $m = new Migration(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig());
+    $m->removeReShares();
+    $m->updateInitiatorInfo();
 }
 
 if (version_compare($installedVersion, '1.1.1', '<')) {
-	$m = new Migration(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig());
+    $m = new Migration(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig());
 }

apps/files_sharing/appinfo/routes.php

Indentation +87 added lines, -87 removed lines

@@ -30,105 +30,105 @@
 
 $application = new \OCA\Files_Sharing\AppInfo\Application();
 $application->registerRoutes($this, [
-	'resources' => [
-		'ExternalShares' => ['url' => '/api/externalShares'],
-	],
-	'routes' => [
-		[
-			'name' => 'externalShares#testRemote',
-			'url' => '/testremote',
-			'verb' => 'GET'
-		],
-		[
-			'name' => 'PublicPreview#getPreview',
-			'url' => '/publicpreview',
-			'verb' => 'GET',
-		],
+    'resources' => [
+        'ExternalShares' => ['url' => '/api/externalShares'],
+    ],
+    'routes' => [
+        [
+            'name' => 'externalShares#testRemote',
+            'url' => '/testremote',
+            'verb' => 'GET'
+        ],
+        [
+            'name' => 'PublicPreview#getPreview',
+            'url' => '/publicpreview',
+            'verb' => 'GET',
+        ],
 
-		[
-			'name' => 'PublicPreview#getPreview',
-			'url' => '/ajax/publicpreview.php',
-			'verb' => 'GET',
-		],
-	],
-	'ocs' => [
-		/*
+        [
+            'name' => 'PublicPreview#getPreview',
+            'url' => '/ajax/publicpreview.php',
+            'verb' => 'GET',
+        ],
+    ],
+    'ocs' => [
+        /*
 		 * OCS Share API
 		 */
-		[
-			'name' => 'ShareAPI#getShares',
-			'url'  => '/api/v1/shares',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'ShareAPI#createShare',
-			'url'  => '/api/v1/shares',
-			'verb' => 'POST',
-		],
-		[
-			'name' => 'ShareAPI#getShare',
-			'url'  => '/api/v1/shares/{id}',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'ShareAPI#updateShare',
-			'url'  => '/api/v1/shares/{id}',
-			'verb' => 'PUT',
-		],
-		[
-			'name' => 'ShareAPI#deleteShare',
-			'url'  => '/api/v1/shares/{id}',
-			'verb' => 'DELETE',
-		],
-		/*
+        [
+            'name' => 'ShareAPI#getShares',
+            'url'  => '/api/v1/shares',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'ShareAPI#createShare',
+            'url'  => '/api/v1/shares',
+            'verb' => 'POST',
+        ],
+        [
+            'name' => 'ShareAPI#getShare',
+            'url'  => '/api/v1/shares/{id}',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'ShareAPI#updateShare',
+            'url'  => '/api/v1/shares/{id}',
+            'verb' => 'PUT',
+        ],
+        [
+            'name' => 'ShareAPI#deleteShare',
+            'url'  => '/api/v1/shares/{id}',
+            'verb' => 'DELETE',
+        ],
+        /*
 		 * OCS Sharee API
 		 */
-		[
-			'name' => 'ShareesAPI#search',
-			'url' => '/api/v1/sharees',
-			'verb' => 'GET',
-		],
-		/*
+        [
+            'name' => 'ShareesAPI#search',
+            'url' => '/api/v1/sharees',
+            'verb' => 'GET',
+        ],
+        /*
 		 * Remote Shares
 		 */
-		[
-			'name' => 'Remote#getShares',
-			'url' => '/api/v1/remote_shares',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'Remote#getOpenShares',
-			'url' => '/api/v1/remote_shares/pending',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'Remote#acceptShare',
-			'url' => '/api/v1/remote_shares/pending/{id}',
-			'verb' => 'POST',
-		],
-		[
-			'name' => 'Remote#declineShare',
-			'url' => '/api/v1/remote_shares/pending/{id}',
-			'verb' => 'DELETE',
-		],
-		[
-			'name' => 'Remote#getShare',
-			'url' => '/api/v1/remote_shares/{id}',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'Remote#unshare',
-			'url' => '/api/v1/remote_shares/{id}',
-			'verb' => 'DELETE',
-		],
-	],
+        [
+            'name' => 'Remote#getShares',
+            'url' => '/api/v1/remote_shares',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'Remote#getOpenShares',
+            'url' => '/api/v1/remote_shares/pending',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'Remote#acceptShare',
+            'url' => '/api/v1/remote_shares/pending/{id}',
+            'verb' => 'POST',
+        ],
+        [
+            'name' => 'Remote#declineShare',
+            'url' => '/api/v1/remote_shares/pending/{id}',
+            'verb' => 'DELETE',
+        ],
+        [
+            'name' => 'Remote#getShare',
+            'url' => '/api/v1/remote_shares/{id}',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'Remote#unshare',
+            'url' => '/api/v1/remote_shares/{id}',
+            'verb' => 'DELETE',
+        ],
+    ],
 ]);
 
 /** @var $this \OCP\Route\IRouter */
 $this->create('files_sharing_ajax_list', 'ajax/list.php')
-	->actionInclude('files_sharing/ajax/list.php');
+    ->actionInclude('files_sharing/ajax/list.php');
 $this->create('sharing_external_shareinfo', '/shareinfo')
-	->actionInclude('files_sharing/ajax/shareinfo.php');
+    ->actionInclude('files_sharing/ajax/shareinfo.php');
 
 // OCS API
 

apps/files_sharing/appinfo/app.php

Indentation +40 added lines, -40 removed lines

@@ -38,14 +38,14 @@ 
 
 $eventDispatcher = \OC::$server->getEventDispatcher();
 $eventDispatcher->addListener(
-	'OCA\Files::loadAdditionalScripts',
-	function() {
-		\OCP\Util::addScript('files_sharing', 'share');
-		\OCP\Util::addScript('files_sharing', 'sharetabview');
-		\OCP\Util::addScript('files_sharing', 'sharebreadcrumbview');
-		\OCP\Util::addStyle('files_sharing', 'sharetabview');
-		\OCP\Util::addStyle('files_sharing', 'sharebreadcrumb');
-	}
+    'OCA\Files::loadAdditionalScripts',
+    function() {
+        \OCP\Util::addScript('files_sharing', 'share');
+        \OCP\Util::addScript('files_sharing', 'sharetabview');
+        \OCP\Util::addScript('files_sharing', 'sharebreadcrumbview');
+        \OCP\Util::addStyle('files_sharing', 'sharetabview');
+        \OCP\Util::addStyle('files_sharing', 'sharebreadcrumb');
+    }
 );
 
 // \OCP\Util::addStyle('files_sharing', 'sharetabview');
@@ -53,38 +53,38 @@ 
 $config = \OC::$server->getConfig();
 if ($config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes') {
 
-	\OCA\Files\App::getNavigationManager()->add(
-		array(
-			"id" => 'sharingin',
-			"appname" => 'files_sharing',
-			"script" => 'list.php',
-			"order" => 10,
-			"name" => $l->t('Shared with you')
-		)
-	);
+    \OCA\Files\App::getNavigationManager()->add(
+        array(
+            "id" => 'sharingin',
+            "appname" => 'files_sharing',
+            "script" => 'list.php',
+            "order" => 10,
+            "name" => $l->t('Shared with you')
+        )
+    );
 
-	if (\OCP\Util::isSharingDisabledForUser() === false) {
+    if (\OCP\Util::isSharingDisabledForUser() === false) {
 
-		\OCA\Files\App::getNavigationManager()->add(
-			array(
-				"id" => 'sharingout',
-				"appname" => 'files_sharing',
-				"script" => 'list.php',
-				"order" => 15,
-				"name" => $l->t('Shared with others')
-			)
-		);
-		// Check if sharing by link is enabled
-		if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
-			\OCA\Files\App::getNavigationManager()->add(
-				array(
-					"id" => 'sharinglinks',
-					"appname" => 'files_sharing',
-					"script" => 'list.php',
-					"order" => 20,
-					"name" => $l->t('Shared by link')
-				)
-			);
-		}
-	}
+        \OCA\Files\App::getNavigationManager()->add(
+            array(
+                "id" => 'sharingout',
+                "appname" => 'files_sharing',
+                "script" => 'list.php',
+                "order" => 15,
+                "name" => $l->t('Shared with others')
+            )
+        );
+        // Check if sharing by link is enabled
+        if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
+            \OCA\Files\App::getNavigationManager()->add(
+                array(
+                    "id" => 'sharinglinks',
+                    "appname" => 'files_sharing',
+                    "script" => 'list.php',
+                    "order" => 20,
+                    "name" => $l->t('Shared by link')
+                )
+            );
+        }
+    }
 }

apps/provisioning_api/lib/Controller/AppsController.php

Indentation +74 added lines, -74 removed lines

@@ -33,86 +33,86 @@
 use OCP\IRequest;
 
 class AppsController extends OCSController {
-	/** @var \OCP\App\IAppManager */
-	private $appManager;
+    /** @var \OCP\App\IAppManager */
+    private $appManager;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		IAppManager $appManager
-	) {
-		parent::__construct($appName, $request);
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IAppManager $appManager
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        IAppManager $appManager
+    ) {
+        parent::__construct($appName, $request);
 
-		$this->appManager = $appManager;
-	}
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * @param string $filter
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getApps($filter = null) {
-		$apps = (new OC_App())->listAllApps();
-		$list = [];
-		foreach($apps as $app) {
-			$list[] = $app['id'];
-		}
-		if($filter){
-			switch($filter){
-				case 'enabled':
-					return new DataResponse(['apps' => \OC_App::getEnabledApps()]);
-					break;
-				case 'disabled':
-					$enabled = OC_App::getEnabledApps();
-					return new DataResponse(['apps' => array_diff($list, $enabled)]);
-					break;
-				default:
-					// Invalid filter variable
-					throw new OCSException('', 101);
-			}
+    /**
+     * @param string $filter
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getApps($filter = null) {
+        $apps = (new OC_App())->listAllApps();
+        $list = [];
+        foreach($apps as $app) {
+            $list[] = $app['id'];
+        }
+        if($filter){
+            switch($filter){
+                case 'enabled':
+                    return new DataResponse(['apps' => \OC_App::getEnabledApps()]);
+                    break;
+                case 'disabled':
+                    $enabled = OC_App::getEnabledApps();
+                    return new DataResponse(['apps' => array_diff($list, $enabled)]);
+                    break;
+                default:
+                    // Invalid filter variable
+                    throw new OCSException('', 101);
+            }
 
-		} else {
-			return new DataResponse(['apps' => $list]);
-		}
-	}
+        } else {
+            return new DataResponse(['apps' => $list]);
+        }
+    }
 
-	/**
-	 * @param string $app
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getAppInfo($app) {
-		$info = \OCP\App::getAppInfo($app);
-		if(!is_null($info)) {
-			return new DataResponse(OC_App::getAppInfo($app));
-		} else {
-			throw new OCSException('The request app was not found', \OCP\API::RESPOND_NOT_FOUND);
-		}
-	}
+    /**
+     * @param string $app
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getAppInfo($app) {
+        $info = \OCP\App::getAppInfo($app);
+        if(!is_null($info)) {
+            return new DataResponse(OC_App::getAppInfo($app));
+        } else {
+            throw new OCSException('The request app was not found', \OCP\API::RESPOND_NOT_FOUND);
+        }
+    }
 
-	/**
-	 * @PasswordConfirmationRequired
-	 * @param string $app
-	 * @return DataResponse
-	 */
-	public function enable($app) {
-		$this->appManager->enableApp($app);
-		return new DataResponse();
-	}
+    /**
+     * @PasswordConfirmationRequired
+     * @param string $app
+     * @return DataResponse
+     */
+    public function enable($app) {
+        $this->appManager->enableApp($app);
+        return new DataResponse();
+    }
 
-	/**
-	 * @PasswordConfirmationRequired
-	 * @param string $app
-	 * @return DataResponse
-	 */
-	public function disable($app) {
-		$this->appManager->disableApp($app);
-		return new DataResponse();
-	}
+    /**
+     * @PasswordConfirmationRequired
+     * @param string $app
+     * @return DataResponse
+     */
+    public function disable($app) {
+        $this->appManager->disableApp($app);
+        return new DataResponse();
+    }
 
 }

apps/provisioning_api/lib/Controller/GroupsController.php

Indentation +151 added lines, -151 removed lines

@@ -37,156 +37,156 @@
 
 class GroupsController extends OCSController {
 
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IGroupManager $groupManager
-	 * @param IUserSession $userSession
-	 */
-	public function __construct(
-			$appName,
-			IRequest $request,
-			IGroupManager $groupManager,
-			IUserSession $userSession) {
-		parent::__construct($appName, $request);
-
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-	}
-
-	/**
-	 * returns a list of groups
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return DataResponse
-	 */
-	public function getGroups($search = '', $limit = null, $offset = null) {
-		if ($limit !== null) {
-			$limit = (int)$limit;
-		}
-		if ($offset !== null) {
-			$offset = (int)$offset;
-		}
-
-		$groups = $this->groupManager->search($search, $limit, $offset);
-		$groups = array_map(function($group) {
-			/** @var IGroup $group */
-			return $group->getGID();
-		}, $groups);
-
-		return new DataResponse(['groups' => $groups]);
-	}
-
-	/**
-	 * returns an array of users in the group specified
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $groupId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getGroup($groupId) {
-		$user = $this->userSession->getUser();
-
-		// Check the group exists
-		if(!$this->groupManager->groupExists($groupId)) {
-			throw new OCSException('The requested group could not be found', \OCP\API::RESPOND_NOT_FOUND);
-		}
-
-		$isSubadminOfGroup = false;
-		$group = $this->groupManager->get($groupId);
-		if ($group !== null) {
-			$isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminofGroup($user, $group);
-		}
-
-		// Check subadmin has access to this group
-		if($this->groupManager->isAdmin($user->getUID())
-		   || $isSubadminOfGroup) {
-			$users = $this->groupManager->get($groupId)->getUsers();
-			$users =  array_map(function($user) {
-				/** @var IUser $user */
-				return $user->getUID();
-			}, $users);
-			$users = array_values($users);
-			return new DataResponse(['users' => $users]);
-		} else {
-			throw new OCSException('User does not have access to specified group', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-	}
-
-	/**
-	 * creates a new group
-	 *
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function addGroup($groupid) {
-		// Validate name
-		if(empty($groupid)){
-			\OCP\Util::writeLog('provisioning_api', 'Group name not supplied', \OCP\Util::ERROR);
-			throw new OCSException('Invalid group name', 101);
-		}
-		// Check if it exists
-		if($this->groupManager->groupExists($groupid)){
-			throw new OCSException('', 102);
-		}
-		$this->groupManager->createGroup($groupid);
-		return new DataResponse();
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $groupId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function deleteGroup($groupId) {
-		// Check it exists
-		if(!$this->groupManager->groupExists($groupId)){
-			throw new OCSException('', 101);
-		} else if($groupId === 'admin' || !$this->groupManager->get($groupId)->delete()){
-			// Cannot delete admin group
-			throw new OCSException('', 102);
-		}
-
-		return new DataResponse(null, 100);
-	}
-
-	/**
-	 * @param string $groupId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getSubAdminsOfGroup($groupId) {
-		// Check group exists
-		$targetGroup = $this->groupManager->get($groupId);
-		if($targetGroup === null) {
-			throw new OCSException('Group does not exist', 101);
-		}
-
-		$subadmins = $this->groupManager->getSubAdmin()->getGroupsSubAdmins($targetGroup);
-		// New class returns IUser[] so convert back
-		$uids = [];
-		foreach ($subadmins as $user) {
-			$uids[] = $user->getUID();
-		}
-
-		return new DataResponse($uids);
-	}
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IGroupManager $groupManager
+     * @param IUserSession $userSession
+     */
+    public function __construct(
+            $appName,
+            IRequest $request,
+            IGroupManager $groupManager,
+            IUserSession $userSession) {
+        parent::__construct($appName, $request);
+
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+    }
+
+    /**
+     * returns a list of groups
+     *
+     * @NoAdminRequired
+     *
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return DataResponse
+     */
+    public function getGroups($search = '', $limit = null, $offset = null) {
+        if ($limit !== null) {
+            $limit = (int)$limit;
+        }
+        if ($offset !== null) {
+            $offset = (int)$offset;
+        }
+
+        $groups = $this->groupManager->search($search, $limit, $offset);
+        $groups = array_map(function($group) {
+            /** @var IGroup $group */
+            return $group->getGID();
+        }, $groups);
+
+        return new DataResponse(['groups' => $groups]);
+    }
+
+    /**
+     * returns an array of users in the group specified
+     *
+     * @NoAdminRequired
+     *
+     * @param string $groupId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getGroup($groupId) {
+        $user = $this->userSession->getUser();
+
+        // Check the group exists
+        if(!$this->groupManager->groupExists($groupId)) {
+            throw new OCSException('The requested group could not be found', \OCP\API::RESPOND_NOT_FOUND);
+        }
+
+        $isSubadminOfGroup = false;
+        $group = $this->groupManager->get($groupId);
+        if ($group !== null) {
+            $isSubadminOfGroup =$this->groupManager->getSubAdmin()->isSubAdminofGroup($user, $group);
+        }
+
+        // Check subadmin has access to this group
+        if($this->groupManager->isAdmin($user->getUID())
+           || $isSubadminOfGroup) {
+            $users = $this->groupManager->get($groupId)->getUsers();
+            $users =  array_map(function($user) {
+                /** @var IUser $user */
+                return $user->getUID();
+            }, $users);
+            $users = array_values($users);
+            return new DataResponse(['users' => $users]);
+        } else {
+            throw new OCSException('User does not have access to specified group', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+    }
+
+    /**
+     * creates a new group
+     *
+     * @PasswordConfirmationRequired
+     *
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function addGroup($groupid) {
+        // Validate name
+        if(empty($groupid)){
+            \OCP\Util::writeLog('provisioning_api', 'Group name not supplied', \OCP\Util::ERROR);
+            throw new OCSException('Invalid group name', 101);
+        }
+        // Check if it exists
+        if($this->groupManager->groupExists($groupid)){
+            throw new OCSException('', 102);
+        }
+        $this->groupManager->createGroup($groupid);
+        return new DataResponse();
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     *
+     * @param string $groupId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function deleteGroup($groupId) {
+        // Check it exists
+        if(!$this->groupManager->groupExists($groupId)){
+            throw new OCSException('', 101);
+        } else if($groupId === 'admin' || !$this->groupManager->get($groupId)->delete()){
+            // Cannot delete admin group
+            throw new OCSException('', 102);
+        }
+
+        return new DataResponse(null, 100);
+    }
+
+    /**
+     * @param string $groupId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getSubAdminsOfGroup($groupId) {
+        // Check group exists
+        $targetGroup = $this->groupManager->get($groupId);
+        if($targetGroup === null) {
+            throw new OCSException('Group does not exist', 101);
+        }
+
+        $subadmins = $this->groupManager->getSubAdmin()->getGroupsSubAdmins($targetGroup);
+        // New class returns IUser[] so convert back
+        $uids = [];
+        foreach ($subadmins as $user) {
+            $uids[] = $user->getUID();
+        }
+
+        return new DataResponse($uids);
+    }
 
 }

apps/provisioning_api/lib/Controller/AppConfigController.php

Indentation +123 added lines, -123 removed lines

@@ -31,127 +31,127 @@
 
 class AppConfigController extends OCSController {
 
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IAppConfig */
-	protected $appConfig;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IAppConfig $appConfig
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IConfig $config,
-								IAppConfig $appConfig) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-		$this->appConfig = $appConfig;
-	}
-
-	/**
-	 * @return DataResponse
-	 */
-	public function getApps() {
-		return new DataResponse([
-			'data' => $this->appConfig->getApps(),
-		]);
-	}
-
-	/**
-	 * @param string $app
-	 * @return DataResponse
-	 */
-	public function getKeys($app) {
-		try {
-			$this->verifyAppId($app);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-		return new DataResponse([
-			'data' => $this->config->getAppKeys($app),
-		]);
-	}
-
-	/**
-	 * @param string $app
-	 * @param string $key
-	 * @param string $defaultValue
-	 * @return DataResponse
-	 */
-	public function getValue($app, $key, $defaultValue = '') {
-		try {
-			$this->verifyAppId($app);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-		return new DataResponse([
-			'data' => $this->config->getAppValue($app, $key, $defaultValue),
-		]);
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @param string $app
-	 * @param string $key
-	 * @param string $value
-	 * @return DataResponse
-	 */
-	public function setValue($app, $key, $value) {
-		try {
-			$this->verifyAppId($app);
-			$this->verifyConfigKey($app, $key);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-
-		$this->config->setAppValue($app, $key, $value);
-		return new DataResponse();
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @param string $app
-	 * @param string $key
-	 * @return DataResponse
-	 */
-	public function deleteKey($app, $key) {
-		try {
-			$this->verifyAppId($app);
-			$this->verifyConfigKey($app, $key);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
-		}
-
-		$this->config->deleteAppValue($app, $key);
-		return new DataResponse();
-	}
-
-	/**
-	 * @param string $app
-	 * @throws \InvalidArgumentException
-	 */
-	protected function verifyAppId($app) {
-		if (\OC_App::cleanAppId($app) !== $app) {
-			throw new \InvalidArgumentException('Invalid app id given');
-		}
-	}
-
-	/**
-	 * @param string $app
-	 * @param string $key
-	 * @throws \InvalidArgumentException
-	 */
-	protected function verifyConfigKey($app, $key) {
-		if (in_array($key, ['installed_version', 'enabled', 'types'])) {
-			throw new \InvalidArgumentException('The given key can not be set');
-		}
-
-		if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) {
-			throw new \InvalidArgumentException('The given key can not be set');
-		}
-	}
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IAppConfig */
+    protected $appConfig;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IAppConfig $appConfig
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IAppConfig $appConfig) {
+        parent::__construct($appName, $request);
+        $this->config = $config;
+        $this->appConfig = $appConfig;
+    }
+
+    /**
+     * @return DataResponse
+     */
+    public function getApps() {
+        return new DataResponse([
+            'data' => $this->appConfig->getApps(),
+        ]);
+    }
+
+    /**
+     * @param string $app
+     * @return DataResponse
+     */
+    public function getKeys($app) {
+        try {
+            $this->verifyAppId($app);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+        return new DataResponse([
+            'data' => $this->config->getAppKeys($app),
+        ]);
+    }
+
+    /**
+     * @param string $app
+     * @param string $key
+     * @param string $defaultValue
+     * @return DataResponse
+     */
+    public function getValue($app, $key, $defaultValue = '') {
+        try {
+            $this->verifyAppId($app);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+        return new DataResponse([
+            'data' => $this->config->getAppValue($app, $key, $defaultValue),
+        ]);
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @param string $app
+     * @param string $key
+     * @param string $value
+     * @return DataResponse
+     */
+    public function setValue($app, $key, $value) {
+        try {
+            $this->verifyAppId($app);
+            $this->verifyConfigKey($app, $key);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+
+        $this->config->setAppValue($app, $key, $value);
+        return new DataResponse();
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @param string $app
+     * @param string $key
+     * @return DataResponse
+     */
+    public function deleteKey($app, $key) {
+        try {
+            $this->verifyAppId($app);
+            $this->verifyConfigKey($app, $key);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_FORBIDDEN);
+        }
+
+        $this->config->deleteAppValue($app, $key);
+        return new DataResponse();
+    }
+
+    /**
+     * @param string $app
+     * @throws \InvalidArgumentException
+     */
+    protected function verifyAppId($app) {
+        if (\OC_App::cleanAppId($app) !== $app) {
+            throw new \InvalidArgumentException('Invalid app id given');
+        }
+    }
+
+    /**
+     * @param string $app
+     * @param string $key
+     * @throws \InvalidArgumentException
+     */
+    protected function verifyConfigKey($app, $key) {
+        if (in_array($key, ['installed_version', 'enabled', 'types'])) {
+            throw new \InvalidArgumentException('The given key can not be set');
+        }
+
+        if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) {
+            throw new \InvalidArgumentException('The given key can not be set');
+        }
+    }
 }

apps/provisioning_api/lib/AppInfo/Application.php

Indentation +16 added lines, -16 removed lines

@@ -7,22 +7,22 @@
 use OCP\AppFramework\App;
 
 class Application extends App {
-	public function __construct(array $urlParams = array()) {
-		parent::__construct('provisioning_api', $urlParams);
+    public function __construct(array $urlParams = array()) {
+        parent::__construct('provisioning_api', $urlParams);
 
-		$container = $this->getContainer();
-		$server = $container->getServer();
+        $container = $this->getContainer();
+        $server = $container->getServer();
 
-		$container->registerService('ProvisioningApiMiddleware', function(SimpleContainer $c) use ($server) {
-			$user = $server->getUserManager()->get($c['UserId']);
-			$isAdmin = $user !== null ? $server->getGroupManager()->isAdmin($user->getUID()) : false;
-			$isSubAdmin = $user !== null ? $server->getGroupManager()->getSubAdmin()->isSubAdmin($user) : false;
-			return new ProvisioningApiMiddleware(
-				$c['ControllerMethodReflector'],
-				$isAdmin,
-				$isSubAdmin
-			);
-		});
-		$container->registerMiddleWare('ProvisioningApiMiddleware');
-	}
+        $container->registerService('ProvisioningApiMiddleware', function(SimpleContainer $c) use ($server) {
+            $user = $server->getUserManager()->get($c['UserId']);
+            $isAdmin = $user !== null ? $server->getGroupManager()->isAdmin($user->getUID()) : false;
+            $isSubAdmin = $user !== null ? $server->getGroupManager()->getSubAdmin()->isSubAdmin($user) : false;
+            return new ProvisioningApiMiddleware(
+                $c['ControllerMethodReflector'],
+                $isAdmin,
+                $isSubAdmin
+            );
+        });
+        $container->registerMiddleWare('ProvisioningApiMiddleware');
+    }
 }