code fixes and bugs

8 files changed, 17 insertions, 18 deletions

diff --git a/lib/Controller/OptionApiController.php b/lib/Controller/OptionApiController.php
index f0884435..5c3e6f3c 100644
--- a/lib/Controller/OptionApiController.php
+++ b/lib/Controller/OptionApiController.php
@@ -108,9 +108,9 @@ class OptionApiController extends ApiController {
 	 * @param array $option
 	 * @return DataResponse
 	 */
-	public function update($optionId, $timestamp = 0 , $pollOptionText = '') {
+	public function update($optionId, $timestamp = 0, $pollOptionText = '') {
 		try {
-			return new DataResponse(['option' => $this->optionService->update($optionId, $timestamp, $pollOptionText, $order)], Http::STATUS_OK);
+			return new DataResponse(['option' => $this->optionService->update($optionId, $timestamp, $pollOptionText)], Http::STATUS_OK);
 		} catch (NotAuthorizedException $e) {
 			return new DataResponse(['error' => $e->getMessage()], $e->getStatus());
 		}
diff --git a/lib/Controller/OptionController.php b/lib/Controller/OptionController.php
index 1fa382f6..ea58c79c 100644
--- a/lib/Controller/OptionController.php
+++ b/lib/Controller/OptionController.php
@@ -77,11 +77,11 @@ class OptionController extends Controller {
 	// }
 
 	/**
-	* Add a new option
-	* @NoAdminRequired
-	* @param array $option
-	* @return DataResponse
-	*/
+	 * Add a new option
+	 * @NoAdminRequired
+	 * @param array $option
+	 * @return DataResponse
+	 */
 	public function add($pollId, $timestamp = 0, $pollOptionText = '') {
 		return new DataResponse($this->optionService->add($pollId, $timestamp, $pollOptionText), Http::STATUS_OK);
 	}
diff --git a/lib/Controller/PollController.php b/lib/Controller/PollController.php
index 834fb391..73c07347 100644
--- a/lib/Controller/PollController.php
+++ b/lib/Controller/PollController.php
@@ -67,12 +67,12 @@ class PollController extends Controller {
  	 * PollController constructor.
  	 * @param string $appName
  	 * @param IRequest $request
- 	 * @param PollService $pollService
+	 * @param PollService $pollService
 	 * @param CommentService $commentService
-  	 * @param OptionService $optionService
-  	 * @param ShareService $shareService
-  	 * @param VoteService $voteService
-  	 * @param Acl $acl
+	 * @param OptionService $optionService
+	 * @param ShareService $shareService
+	 * @param VoteService $voteService
+	 * @param Acl $acl
 	 */
 
  	public function __construct(
diff --git a/lib/Controller/ShareApiController.php b/lib/Controller/ShareApiController.php
index 261262b8..e2d8b465 100644
--- a/lib/Controller/ShareApiController.php
+++ b/lib/Controller/ShareApiController.php
@@ -155,7 +155,7 @@ class ShareApiController extends ApiController {
 		try {
 			return new DataResponse($this->mailService->sendInvitationMail($token), Http::STATUS_OK);
 		} catch (Exception $e) {
-			return new DataResponse(['error' => $e->getMessage()], $e->getStatus());
+			return new DataResponse(['error' => $e], Http::STATUS_CONFLICT);
 		}
 	}
 }
diff --git a/lib/Controller/ShareController.php b/lib/Controller/ShareController.php
index bb55c5b8..4810ed23 100644
--- a/lib/Controller/ShareController.php
+++ b/lib/Controller/ShareController.php
@@ -136,7 +136,7 @@ class ShareController extends Controller {
 			$share = $this->shareService->get($token);
 			return new DataResponse(['share' => $share, 'sentResult' => $sentResult], Http::STATUS_OK);
 		} catch (Exception $e) {
-			return new DataResponse(['error' => $e->getMessage()], $e->getStatus());
+			return new DataResponse(['error' => $e], Http::STATUS_CONFLICT);
 		}
 	}
 }
diff --git a/lib/Controller/SubscriptionApiController.php b/lib/Controller/SubscriptionApiController.php
index 13ffe3eb..b8a87d16 100644
--- a/lib/Controller/SubscriptionApiController.php
+++ b/lib/Controller/SubscriptionApiController.php
@@ -56,8 +56,8 @@ class SubscriptionApiController extends ApiController {
 		parent::__construct($appName,
 			$request,
 			'PUT, GET, DELETE',
-            'Authorization, Content-Type, Accept',
-            1728000);
+			'Authorization, Content-Type, Accept',
+			1728000);
 		$this->subscriptionService = $subscriptionService;
 	}
 
diff --git a/lib/Controller/SystemController.php b/lib/Controller/SystemController.php
index b1e2c606..ef695932 100644
--- a/lib/Controller/SystemController.php
+++ b/lib/Controller/SystemController.php
@@ -91,7 +91,7 @@ class SystemController extends Controller {
 	 * Validate string as email address
 	 * @NoAdminRequired
 	 * @param string $query
-	 * @return boolval
+	 * @return bool
 	 */
 	 private function isValidEmail($email) {
 		 return (!preg_match('/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/', $email)) ? false : true;
diff --git a/lib/Controller/VoteController.php b/lib/Controller/VoteController.php
index 02ccc9a0..32fc89a2 100644
--- a/lib/Controller/VoteController.php
+++ b/lib/Controller/VoteController.php
@@ -45,7 +45,6 @@ class VoteController extends Controller {
 	 * @param string $appName
 	 * @param IRequest $request
 	 * @param VoteService $voteService
-
 	 */
 	public function __construct(
 		string $appName,