nextcloud / server

apps/files_sharing/lib/ShareBackend/File.php

Indentation +204 added lines, -204 removed lines

@@ -37,208 +37,208 @@
 
 class File implements \OCP\Share_Backend_File_Dependent {
 
-	const FORMAT_SHARED_STORAGE = 0;
-	const FORMAT_GET_FOLDER_CONTENTS = 1;
-	const FORMAT_FILE_APP_ROOT = 2;
-	const FORMAT_OPENDIR = 3;
-	const FORMAT_GET_ALL = 4;
-	const FORMAT_PERMISSIONS = 5;
-	const FORMAT_TARGET_NAMES = 6;
-
-	private $path;
-
-	/** @var FederatedShareProvider */
-	private $federatedShareProvider;
-
-	public function __construct(FederatedShareProvider $federatedShareProvider = null) {
-		if ($federatedShareProvider) {
-			$this->federatedShareProvider = $federatedShareProvider;
-		} else {
-			$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
-			$this->federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
-		}
-	}
-
-	public function isValidSource($itemSource, $uidOwner) {
-		try {
-			$path = \OC\Files\Filesystem::getPath($itemSource);
-			// FIXME: attributes should not be set here,
-			// keeping this pattern for now to avoid unexpected
-			// regressions
-			$this->path = \OC\Files\Filesystem::normalizePath(basename($path));
-			return true;
-		} catch (\OCP\Files\NotFoundException $e) {
-			return false;
-		}
-	}
-
-	public function getFilePath($itemSource, $uidOwner) {
-		if (isset($this->path)) {
-			$path = $this->path;
-			$this->path = null;
-			return $path;
-		} else {
-			try {
-				$path = \OC\Files\Filesystem::getPath($itemSource);
-				return $path;
-			} catch (\OCP\Files\NotFoundException $e) {
-				return false;
-			}
-		}
-	}
-
-	/**
-	 * create unique target
-	 * @param string $filePath
-	 * @param string $shareWith
-	 * @param array $exclude (optional)
-	 * @return string
-	 */
-	public function generateTarget($filePath, $shareWith, $exclude = null) {
-		$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) {
-			return $target;
-		}
-
-		\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 = (is_array($exclude)) ? $exclude : array();
-
-		return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $excludeList, $view);
-	}
-
-	public function formatItems($items, $format, $parameters = null) {
-		if ($format == self::FORMAT_SHARED_STORAGE) {
-			// Only 1 item should come through for this format call
-			$item = array_shift($items);
-			return array(
-				'parent' => $item['parent'],
-				'path' => $item['path'],
-				'storage' => $item['storage'],
-				'permissions' => $item['permissions'],
-				'uid_owner' => $item['uid_owner'],
-			);
-		} else if ($format == self::FORMAT_GET_FOLDER_CONTENTS) {
-			$files = array();
-			foreach ($items as $item) {
-				$file = array();
-				$file['fileid'] = $item['file_source'];
-				$file['storage'] = $item['storage'];
-				$file['path'] = $item['file_target'];
-				$file['parent'] = $item['file_parent'];
-				$file['name'] = basename($item['file_target']);
-				$file['mimetype'] = $item['mimetype'];
-				$file['mimepart'] = $item['mimepart'];
-				$file['mtime'] = $item['mtime'];
-				$file['encrypted'] = $item['encrypted'];
-				$file['etag'] = $item['etag'];
-				$file['uid_owner'] = $item['uid_owner'];
-				$file['displayname_owner'] = $item['displayname_owner'];
-
-				$storage = \OC\Files\Filesystem::getStorage('/');
-				$cache = $storage->getCache();
-				$file['size'] = $item['size'];
-				$files[] = $file;
-			}
-			return $files;
-		} else if ($format == self::FORMAT_OPENDIR) {
-			$files = array();
-			foreach ($items as $item) {
-				$files[] = basename($item['file_target']);
-			}
-			return $files;
-		} else if ($format == self::FORMAT_GET_ALL) {
-			$ids = array();
-			foreach ($items as $item) {
-				$ids[] = $item['file_source'];
-			}
-			return $ids;
-		} else if ($format === self::FORMAT_PERMISSIONS) {
-			$filePermissions = array();
-			foreach ($items as $item) {
-				$filePermissions[$item['file_source']] = $item['permissions'];
-			}
-			return $filePermissions;
-		} else if ($format === self::FORMAT_TARGET_NAMES) {
-			$targets = array();
-			foreach ($items as $item) {
-				$targets[] = $item['file_target'];
-			}
-			return $targets;
-		}
-		return array();
-	}
-
-	/**
-	 * check if server2server share is enabled
-	 *
-	 * @param int $shareType
-	 * @return boolean
-	 */
-	public function isShareTypeAllowed($shareType) {
-		if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
-			return $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
-		}
-
-		return true;
-	}
-
-	/**
-	 * resolve reshares to return the correct source item
-	 * @param array $source
-	 * @return array source item
-	 */
-	protected static function resolveReshares($source) {
-		if (isset($source['parent'])) {
-			$parent = $source['parent'];
-			while (isset($parent)) {
-				$query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
-				$item = $query->execute(array($parent))->fetchRow();
-				if (isset($item['parent'])) {
-					$parent = $item['parent'];
-				} else {
-					$fileOwner = $item['uid_owner'];
-					break;
-				}
-			}
-		} else {
-			$fileOwner = $source['uid_owner'];
-		}
-		if (isset($fileOwner)) {
-			$source['fileOwner'] = $fileOwner;
-		} else {
-			\OCP\Util::writeLog('files_sharing', "No owner found for reshare", \OCP\Util::ERROR);
-		}
-
-		return $source;
-	}
-
-	/**
-	 * @param string $target
-	 * @param array $share
-	 * @return array|false source item
-	 */
-	public static function getSource($target, $share) {
-		if ($share['item_type'] === 'folder' && $target !== '') {
-			// note: in case of ext storage mount points the path might be empty
-			// which would cause a leading slash to appear
-			$share['path'] = ltrim($share['path'] . '/' . $target, '/');
-		}
-		return self::resolveReshares($share);
-	}
+    const FORMAT_SHARED_STORAGE = 0;
+    const FORMAT_GET_FOLDER_CONTENTS = 1;
+    const FORMAT_FILE_APP_ROOT = 2;
+    const FORMAT_OPENDIR = 3;
+    const FORMAT_GET_ALL = 4;
+    const FORMAT_PERMISSIONS = 5;
+    const FORMAT_TARGET_NAMES = 6;
+
+    private $path;
+
+    /** @var FederatedShareProvider */
+    private $federatedShareProvider;
+
+    public function __construct(FederatedShareProvider $federatedShareProvider = null) {
+        if ($federatedShareProvider) {
+            $this->federatedShareProvider = $federatedShareProvider;
+        } else {
+            $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
+            $this->federatedShareProvider = $federatedSharingApp->getFederatedShareProvider();
+        }
+    }
+
+    public function isValidSource($itemSource, $uidOwner) {
+        try {
+            $path = \OC\Files\Filesystem::getPath($itemSource);
+            // FIXME: attributes should not be set here,
+            // keeping this pattern for now to avoid unexpected
+            // regressions
+            $this->path = \OC\Files\Filesystem::normalizePath(basename($path));
+            return true;
+        } catch (\OCP\Files\NotFoundException $e) {
+            return false;
+        }
+    }
+
+    public function getFilePath($itemSource, $uidOwner) {
+        if (isset($this->path)) {
+            $path = $this->path;
+            $this->path = null;
+            return $path;
+        } else {
+            try {
+                $path = \OC\Files\Filesystem::getPath($itemSource);
+                return $path;
+            } catch (\OCP\Files\NotFoundException $e) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * create unique target
+     * @param string $filePath
+     * @param string $shareWith
+     * @param array $exclude (optional)
+     * @return string
+     */
+    public function generateTarget($filePath, $shareWith, $exclude = null) {
+        $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) {
+            return $target;
+        }
+
+        \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 = (is_array($exclude)) ? $exclude : array();
+
+        return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $excludeList, $view);
+    }
+
+    public function formatItems($items, $format, $parameters = null) {
+        if ($format == self::FORMAT_SHARED_STORAGE) {
+            // Only 1 item should come through for this format call
+            $item = array_shift($items);
+            return array(
+                'parent' => $item['parent'],
+                'path' => $item['path'],
+                'storage' => $item['storage'],
+                'permissions' => $item['permissions'],
+                'uid_owner' => $item['uid_owner'],
+            );
+        } else if ($format == self::FORMAT_GET_FOLDER_CONTENTS) {
+            $files = array();
+            foreach ($items as $item) {
+                $file = array();
+                $file['fileid'] = $item['file_source'];
+                $file['storage'] = $item['storage'];
+                $file['path'] = $item['file_target'];
+                $file['parent'] = $item['file_parent'];
+                $file['name'] = basename($item['file_target']);
+                $file['mimetype'] = $item['mimetype'];
+                $file['mimepart'] = $item['mimepart'];
+                $file['mtime'] = $item['mtime'];
+                $file['encrypted'] = $item['encrypted'];
+                $file['etag'] = $item['etag'];
+                $file['uid_owner'] = $item['uid_owner'];
+                $file['displayname_owner'] = $item['displayname_owner'];
+
+                $storage = \OC\Files\Filesystem::getStorage('/');
+                $cache = $storage->getCache();
+                $file['size'] = $item['size'];
+                $files[] = $file;
+            }
+            return $files;
+        } else if ($format == self::FORMAT_OPENDIR) {
+            $files = array();
+            foreach ($items as $item) {
+                $files[] = basename($item['file_target']);
+            }
+            return $files;
+        } else if ($format == self::FORMAT_GET_ALL) {
+            $ids = array();
+            foreach ($items as $item) {
+                $ids[] = $item['file_source'];
+            }
+            return $ids;
+        } else if ($format === self::FORMAT_PERMISSIONS) {
+            $filePermissions = array();
+            foreach ($items as $item) {
+                $filePermissions[$item['file_source']] = $item['permissions'];
+            }
+            return $filePermissions;
+        } else if ($format === self::FORMAT_TARGET_NAMES) {
+            $targets = array();
+            foreach ($items as $item) {
+                $targets[] = $item['file_target'];
+            }
+            return $targets;
+        }
+        return array();
+    }
+
+    /**
+     * check if server2server share is enabled
+     *
+     * @param int $shareType
+     * @return boolean
+     */
+    public function isShareTypeAllowed($shareType) {
+        if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
+            return $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
+        }
+
+        return true;
+    }
+
+    /**
+     * resolve reshares to return the correct source item
+     * @param array $source
+     * @return array source item
+     */
+    protected static function resolveReshares($source) {
+        if (isset($source['parent'])) {
+            $parent = $source['parent'];
+            while (isset($parent)) {
+                $query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+                $item = $query->execute(array($parent))->fetchRow();
+                if (isset($item['parent'])) {
+                    $parent = $item['parent'];
+                } else {
+                    $fileOwner = $item['uid_owner'];
+                    break;
+                }
+            }
+        } else {
+            $fileOwner = $source['uid_owner'];
+        }
+        if (isset($fileOwner)) {
+            $source['fileOwner'] = $fileOwner;
+        } else {
+            \OCP\Util::writeLog('files_sharing', "No owner found for reshare", \OCP\Util::ERROR);
+        }
+
+        return $source;
+    }
+
+    /**
+     * @param string $target
+     * @param array $share
+     * @return array|false source item
+     */
+    public static function getSource($target, $share) {
+        if ($share['item_type'] === 'folder' && $target !== '') {
+            // note: in case of ext storage mount points the path might be empty
+            // which would cause a leading slash to appear
+            $share['path'] = ltrim($share['path'] . '/' . $target, '/');
+        }
+        return self::resolveReshares($share);
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -96,7 +96,7 @@ 
 	 */
 	public function generateTarget($filePath, $shareWith, $exclude = null) {
 		$shareFolder = \OCA\Files_Sharing\Helper::getShareFolder();
-		$target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath));
+		$target = \OC\Files\Filesystem::normalizePath($shareFolder.'/'.basename($filePath));
 
 		// for group shares we return the target right away
 		if ($shareWith === false) {
@@ -104,13 +104,13 @@ 
 		}
 
 		\OC\Files\Filesystem::initMountPoints($shareWith);
-		$view = new \OC\Files\View('/' . $shareWith . '/files');
+		$view = new \OC\Files\View('/'.$shareWith.'/files');
 
 		if (!$view->is_dir($shareFolder)) {
 			$dir = '';
 			$subdirs = explode('/', $shareFolder);
 			foreach ($subdirs as $subdir) {
-				$dir = $dir . '/' . $subdir;
+				$dir = $dir.'/'.$subdir;
 				if (!$view->is_dir($dir)) {
 					$view->mkdir($dir);
 				}
@@ -237,7 +237,7 @@ 
 		if ($share['item_type'] === 'folder' && $target !== '') {
 			// note: in case of ext storage mount points the path might be empty
 			// which would cause a leading slash to appear
-			$share['path'] = ltrim($share['path'] . '/' . $target, '/');
+			$share['path'] = ltrim($share['path'].'/'.$target, '/');
 		}
 		return self::resolveReshares($share);
 	}

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());
 }

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 $token = isset($_GET['t']) ? $_GET['t'] : '';
 $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare';
 
-if($token !== '') {
+if ($token !== '') {
 	OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token)));
 } else {
 	header('HTTP/1.0 404 Not Found');

apps/provisioning_api/lib/Controller/AppsController.php

Spacing +4 added lines, -4 removed lines

@@ -59,11 +59,11 @@ 
 	public function getApps($filter = null) {
 		$apps = (new OC_App())->listAllApps();
 		$list = [];
-		foreach($apps as $app) {
+		foreach ($apps as $app) {
 			$list[] = $app['id'];
 		}
-		if($filter){
-			switch($filter){
+		if ($filter) {
+			switch ($filter) {
 				case 'enabled':
 					return new DataResponse(['apps' => \OC_App::getEnabledApps()]);
 					break;
@@ -88,7 +88,7 @@ 
 	 */
 	public function getAppInfo($app) {
 		$info = \OCP\App::getAppInfo($app);
-		if(!is_null($info)) {
+		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);

Indentation +79 added lines, -79 removed lines

@@ -35,91 +35,91 @@
 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
-	 * @throws OCSException
-	 */
-	public function enable($app) {
-		try {
-			$this->appManager->enableApp($app);
-		} catch (AppPathNotFoundException $e) {
-			throw new OCSException('The request app was not found', \OCP\API::RESPOND_NOT_FOUND);
-		}
-		return new DataResponse();
-	}
+    /**
+     * @PasswordConfirmationRequired
+     * @param string $app
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function enable($app) {
+        try {
+            $this->appManager->enableApp($app);
+        } catch (AppPathNotFoundException $e) {
+            throw new OCSException('The request app was not found', \OCP\API::RESPOND_NOT_FOUND);
+        }
+        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

Spacing +11 added lines, -11 removed lines

@@ -72,10 +72,10 @@ 
 	 */
 	public function getGroups($search = '', $limit = null, $offset = null) {
 		if ($limit !== null) {
-			$limit = (int)$limit;
+			$limit = (int) $limit;
 		}
 		if ($offset !== null) {
-			$offset = (int)$offset;
+			$offset = (int) $offset;
 		}
 
 		$groups = $this->groupManager->search($search, $limit, $offset);
@@ -100,21 +100,21 @@ 
 		$user = $this->userSession->getUser();
 
 		// Check the group exists
-		if(!$this->groupManager->groupExists($groupId)) {
+		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);
+			$isSubadminOfGroup = $this->groupManager->getSubAdmin()->isSubAdminofGroup($user, $group);
 		}
 
 		// Check subadmin has access to this group
-		if($this->groupManager->isAdmin($user->getUID())
+		if ($this->groupManager->isAdmin($user->getUID())
 		   || $isSubadminOfGroup) {
 			$users = $this->groupManager->get($groupId)->getUsers();
-			$users =  array_map(function($user) {
+			$users = array_map(function($user) {
 				/** @var IUser $user */
 				return $user->getUID();
 			}, $users);
@@ -136,12 +136,12 @@ 
 	 */
 	public function addGroup($groupid) {
 		// Validate name
-		if(empty($groupid)){
+		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)){
+		if ($this->groupManager->groupExists($groupid)) {
 			throw new OCSException('', 102);
 		}
 		$this->groupManager->createGroup($groupid);
@@ -157,9 +157,9 @@ 
 	 */
 	public function deleteGroup($groupId) {
 		// Check it exists
-		if(!$this->groupManager->groupExists($groupId)){
+		if (!$this->groupManager->groupExists($groupId)) {
 			throw new OCSException('', 101);
-		} else if($groupId === 'admin' || !$this->groupManager->get($groupId)->delete()){
+		} else if ($groupId === 'admin' || !$this->groupManager->get($groupId)->delete()) {
 			// Cannot delete admin group
 			throw new OCSException('', 102);
 		}
@@ -175,7 +175,7 @@ 
 	public function getSubAdminsOfGroup($groupId) {
 		// Check group exists
 		$targetGroup = $this->groupManager->get($groupId);
-		if($targetGroup === null) {
+		if ($targetGroup === null) {
 			throw new OCSException('Group does not exist', 101);
 		}
 

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();
-	}
-
-	/**
-	 * @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();
+    }
+
+    /**
+     * @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/Middleware/Exceptions/NotSubAdminException.php

Indentation +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@
 use OCP\AppFramework\Http;
 
 class NotSubAdminException extends \Exception {
-	public function __construct() {
-		parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
-	}
+    public function __construct() {
+        parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN);
+    }
 }
\ No newline at end of file

apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php

Indentation +45 added lines, -45 removed lines

@@ -10,55 +10,55 @@
 
 class ProvisioningApiMiddleware extends Middleware {
 
-	/** @var IControllerMethodReflector */
-	private $reflector;
+    /** @var IControllerMethodReflector */
+    private $reflector;
 
-	/** @var bool */
-	private $isAdmin;
+    /** @var bool */
+    private $isAdmin;
 
-	/** @var bool */
-	private $isSubAdmin;
+    /** @var bool */
+    private $isSubAdmin;
 
-	/**
-	 * ProvisioningApiMiddleware constructor.
-	 *
-	 * @param IControllerMethodReflector $reflector
-	 * @param bool $isAdmin
-	 * @param bool $isSubAdmin
-	 */
-	public function __construct(
-		IControllerMethodReflector $reflector,
-		$isAdmin,
-		$isSubAdmin) {
-		$this->reflector = $reflector;
-		$this->isAdmin = $isAdmin;
-		$this->isSubAdmin = $isSubAdmin;
-	}
+    /**
+     * ProvisioningApiMiddleware constructor.
+     *
+     * @param IControllerMethodReflector $reflector
+     * @param bool $isAdmin
+     * @param bool $isSubAdmin
+     */
+    public function __construct(
+        IControllerMethodReflector $reflector,
+        $isAdmin,
+        $isSubAdmin) {
+        $this->reflector = $reflector;
+        $this->isAdmin = $isAdmin;
+        $this->isSubAdmin = $isSubAdmin;
+    }
 
-	/**
-	 * @param \OCP\AppFramework\Controller $controller
-	 * @param string $methodName
-	 *
-	 * @throws NotSubAdminException
-	 */
-	public function beforeController($controller, $methodName) {
-		if (!$this->isAdmin && !$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->isSubAdmin) {
-			throw new NotSubAdminException();
-		}
-	}
+    /**
+     * @param \OCP\AppFramework\Controller $controller
+     * @param string $methodName
+     *
+     * @throws NotSubAdminException
+     */
+    public function beforeController($controller, $methodName) {
+        if (!$this->isAdmin && !$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->isSubAdmin) {
+            throw new NotSubAdminException();
+        }
+    }
 
-	/**
-	 * @param \OCP\AppFramework\Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @throws \Exception
-	 * @return Response
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if ($exception instanceof NotSubAdminException) {
-			throw new OCSException($exception->getMessage(), \OCP\API::RESPOND_UNAUTHORISED);
-		}
+    /**
+     * @param \OCP\AppFramework\Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @throws \Exception
+     * @return Response
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if ($exception instanceof NotSubAdminException) {
+            throw new OCSException($exception->getMessage(), \OCP\API::RESPOND_UNAUTHORISED);
+        }
 
-		throw $exception;
-	}
+        throw $exception;
+    }
 }
\ No newline at end of file

apps/updatenotification/templates/admin.php

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php
-	script('updatenotification', 'admin');
+    script('updatenotification', 'admin');
 
-	/** @var array $_ */
-	/** @var bool $isNewVersionAvailable */
-	$isNewVersionAvailable = $_['isNewVersionAvailable'];
-	/** @var string $newVersionString */
-	$newVersionString = $_['newVersionString'];
-	/** @var string $lastCheckedDate */
-	$lastCheckedDate = $_['lastChecked'];
-	/** @var array $channels */
-	$channels = $_['channels'];
-	/** @var string $currentChannel */
-	$currentChannel = $_['currentChannel'];
+    /** @var array $_ */
+    /** @var bool $isNewVersionAvailable */
+    $isNewVersionAvailable = $_['isNewVersionAvailable'];
+    /** @var string $newVersionString */
+    $newVersionString = $_['newVersionString'];
+    /** @var string $lastCheckedDate */
+    $lastCheckedDate = $_['lastChecked'];
+    /** @var array $channels */
+    $channels = $_['channels'];
+    /** @var string $currentChannel */
+    $currentChannel = $_['currentChannel'];
 ?>
 <form id="oca_updatenotification_section" class="followupsection">
 	<?php if($isNewVersionAvailable === true) { ?>

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 	$currentChannel = $_['currentChannel'];
 ?>
 <form id="oca_updatenotification_section" class="followupsection">
-	<?php if($isNewVersionAvailable === true) { ?>
+	<?php if ($isNewVersionAvailable === true) { ?>
 		<strong><?php p($l->t('A new version is available: %s', [$newVersionString])); ?></strong>
 		<?php if ($_['updaterEnabled']) { ?>
 			<input type="button" id="oca_updatenotification_button" value="<?php p($l->t('Open updater')) ?>">
@@ -31,7 +31,7 @@ 
 		<label for="release-channel"><?php p($l->t('Update channel:')) ?></label>
 		<select id="release-channel">
 			<option value="<?php p($currentChannel); ?>"><?php p($currentChannel); ?></option>
-			<?php foreach ($channels as $channel => $channelTitle){ ?>
+			<?php foreach ($channels as $channel => $channelTitle) { ?>
 				<option value="<?php p($channelTitle) ?>">
 					<?php p($channelTitle) ?>
 				</option>

Braces +12 added lines, -3 removed lines

@@ -48,11 +48,20 @@
 		<br />
 		<?php p($l->t('Notify members of the following groups about available updates:')); ?>
 		<input name="oca_updatenotification_groups_list" type="hidden" id="oca_updatenotification_groups_list" value="<?php p($_['notify_groups']) ?>" style="width: 400px">
-		<em class="<?php if (!in_array($currentChannel, ['daily', 'git'])) p('hidden'); ?>">
+		<em class="<?php if (!in_array($currentChannel, ['daily', 'git'])) {
+    p('hidden');
+}
+?>">
 			<br />
 			<?php p($l->t('Only notification for app updates are available.')); ?>
-			<?php if ($currentChannel === 'daily') p($l->t('The selected update channel makes dedicated notifications for the server obsolete.')); ?>
-			<?php if ($currentChannel === 'git') p($l->t('The selected update channel does not support updates of the server.')); ?>
+			<?php if ($currentChannel === 'daily') {
+    p($l->t('The selected update channel makes dedicated notifications for the server obsolete.'));
+}
+?>
+			<?php if ($currentChannel === 'git') {
+    p($l->t('The selected update channel does not support updates of the server.'));
+}
+?>
 		</em>
 	</p>
 </form>