Merge branch 'dev-1.5' of http://github.com/nextcloud/polls into dev-1.5

4 files changed, 17 insertions, 17 deletions

diff --git a/lib/Controller/CommentApiController.php b/lib/Controller/CommentApiController.php
index 16d3b66a..e9b8c310 100644
--- a/lib/Controller/CommentApiController.php
+++ b/lib/Controller/CommentApiController.php
@@ -57,8 +57,8 @@ class CommentApiController extends ApiController {
 		parent::__construct($appName,
 			$request,
 			'POST, GET, DELETE',
-            'Authorization, Content-Type, Accept',
-            1728000);
+			'Authorization, Content-Type, Accept',
+			1728000);
 		$this->commentService = $commentService;
 	}
 
diff --git a/lib/Controller/OptionApiController.php b/lib/Controller/OptionApiController.php
index 5c3e6f3c..5183f9fe 100644
--- a/lib/Controller/OptionApiController.php
+++ b/lib/Controller/OptionApiController.php
@@ -55,8 +55,8 @@ class OptionApiController extends ApiController {
 		parent::__construct($appName,
 			$request,
 			'POST, PUT, GET, DELETE',
-            'Authorization, Content-Type, Accept',
-            1728000);
+			'Authorization, Content-Type, Accept',
+			1728000);
 		$this->optionService = $optionService;
 	}
 
diff --git a/lib/Controller/ShareController.php b/lib/Controller/ShareController.php
index a009150e..39cb7a4d 100644
--- a/lib/Controller/ShareController.php
+++ b/lib/Controller/ShareController.php
@@ -201,7 +201,7 @@ class ShareController extends Controller {
 		try {
 			$share = $this->shareService->get($token);
 			foreach ($this->systemService->getContactsGroupMembers($share->getUserId()) as $member) {
-				$shares[] = $this->shareService->add($share->getpollId(), 'contact', $member['user'], $member['emailAddress']) ;
+				$shares[] = $this->shareService->add($share->getpollId(), 'contact', $member['user'], $member['emailAddress']);
 			}
 
 			return new DataResponse(['shares' => $shares], Http::STATUS_OK);
diff --git a/lib/Controller/SystemController.php b/lib/Controller/SystemController.php
index 45e5afba..53f5c8f1 100644
--- a/lib/Controller/SystemController.php
+++ b/lib/Controller/SystemController.php
@@ -53,23 +53,23 @@ class SystemController extends Controller {
 	}
 
 	 /**
- 	 * Get a list of users
- 	 * @NoAdminRequired
- 	 * @param string $query
- 	 * @param array $skipUsers - usernames to skip in return array
-	 * @return DataResponse
- 	 */
+	  * Get a list of users
+	  * @NoAdminRequired
+	  * @param string $query
+	  * @param array $skipUsers - usernames to skip in return array
+	  * @return DataResponse
+	  */
 	 public function getSiteUsers($query = '', $skipUsers = array()) {
 		 return new DataResponse(['users' => $this->systemService->getSiteUsers($query, $skipUsers)], Http::STATUS_OK);
 	 }
 
 	 /**
- 	 * Get a list of user groups
- 	 * @NoAdminRequired
- 	 * @param string $query
- 	 * @param array $skipGroups - group names to skip in return array
-	 * @return DataResponse
- 	 */
+	  * Get a list of user groups
+	  * @NoAdminRequired
+	  * @param string $query
+	  * @param array $skipGroups - group names to skip in return array
+	  * @return DataResponse
+	  */
 	 public function getSiteGroups($query = '', $skipGroups = array()) {
 		 return new DataResponse(['groups' => $this->systemService->getSiteGroups($query, $skipGroups)], Http::STATUS_OK);
 	 }