polish PHP controllers

Signed-off-by: Georg Ehrke <[email protected]>
Timon-CHP · Oct 19, 2019 · 1ec99c0 · 1ec99c0
1 parent 352b36b
commit 1ec99c0
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 232 deletions.
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -38,7 +38,6 @@
 		['name' => 'contact#searchAttendee', 'url' => '/v1/autocompletion/attendee', 'verb' => 'POST'],
 		['name' => 'contact#searchLocation', 'url' => '/v1/autocompletion/location', 'verb' => 'POST'],
 		//Settings
-		['name' => 'settings#getConfig', 'url' => '/v1/config', 'verb' => 'GET'],
 		['name' => 'settings#setConfig', 'url' => '/v1/config', 'verb' => 'POST'],
 		// Tools
 		['name' => 'email#sendEmailPublicLink', 'url' => '/v1/public/sendmail', 'verb' => 'POST'],

diff --git a/lib/Controller/ContactController.php b/lib/Controller/ContactController.php
@@ -3,7 +3,7 @@
  * Calendar App
  *
  * @author Georg Ehrke
- * @copyright 2016 Georg Ehrke <[email protected]>
+ * @copyright 2018 Georg Ehrke <[email protected]>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -40,7 +40,7 @@ class ContactController extends Controller {
 	 * @param IRequest $request an instance of the request
 	 * @param IManager $contacts
 	 */
-	public function __construct($appName, IRequest $request, IManager $contacts) {
+	public function __construct(string $appName, IRequest $request, IManager $contacts) {
 		parent::__construct($appName, $request);
 		$this->contacts = $contacts;
 	}
@@ -52,7 +52,7 @@ public function __construct($appName, IRequest $request, IManager $contacts) {
 	 *
 	 * @NoAdminRequired
 	 */
-	public function searchLocation($location) {
+	public function searchLocation(string $location):JSONResponse {
 		$result = $this->contacts->search($location, ['FN', 'ADR']);
 
 		$contacts = [];
@@ -62,7 +62,7 @@ public function searchLocation($location) {
 			}
 
 			$name = $this->getNameFromContact($r);
-			if (is_string($r['ADR'])) {
+			if (\is_string($r['ADR'])) {
 				$r['ADR'] = [$r['ADR']];
 			}
 
@@ -85,7 +85,7 @@ public function searchLocation($location) {
 	 *
 	 * @NoAdminRequired
 	 */
-	public function searchAttendee($search) {
+	public function searchAttendee(string $search):JSONResponse {
 		$result = $this->contacts->search($search, ['FN', 'EMAIL']);
 
 		$contacts = [];
@@ -95,7 +95,7 @@ public function searchAttendee($search) {
 			}
 
 			$name = $this->getNameFromContact($r);
-			if (is_string($r['EMAIL'])) {
+			if (\is_string($r['EMAIL'])) {
 				$r['EMAIL'] = [$r['EMAIL']];
 			}
 
@@ -115,7 +115,7 @@ public function searchAttendee($search) {
 	 * @param array $r
 	 * @return string
 	 */
-	private function getNameFromContact(array $r) {
+	private function getNameFromContact(array $r):string {
 		$name = '';
 		if (isset($r['FN'])) {
 			$name = $r['FN'];

diff --git a/lib/Controller/EmailController.php b/lib/Controller/EmailController.php
@@ -84,7 +84,7 @@ public function __construct($appName, IRequest $request, IUserSession $userSessi
 	 * @return JSONResponse
 	 * @NoAdminRequired
 	 */
-	public function sendEmailPublicLink($recipient, $url, $calendarName) {
+	public function sendEmailPublicLink(string $recipient, string $url, string $calendarName):JSONResponse {
 		$user = $this->userSession->getUser();
 		$displayName = $user->getDisplayName();
 
@@ -145,7 +145,7 @@ public function sendEmailPublicLink($recipient, $url, $calendarName) {
 	 * @param string $textBody
 	 * @return int
 	 */
-	private function sendEmail($recipient, $subject, $body, $textBody) {
+	private function sendEmail(string $recipient, string $subject, string $body, string $textBody):int {
 		if (!$this->mailer->validateMailAddress($recipient)) {
 			return Http::STATUS_BAD_REQUEST;
 		}
@@ -160,7 +160,12 @@ private function sendEmail($recipient, $subject, $body, $textBody) {
 		$message->setTo([$recipient => $this->l10n->t('Recipient')]);
 		$message->setPlainBody($textBody);
 		$message->setHtmlBody($body);
-		$this->mailer->send($message);
+
+		try {
+			$this->mailer->send($message);
+		} catch(\Exception $ex) {
+			return Http::STATUS_INTERNAL_SERVER_ERROR;
+		}
 
 		return Http::STATUS_OK;
 	}