more fixes

4 files changed, 1 insertions, 30 deletions

diff --git a/lib/Controller/OptionController.php b/lib/Controller/OptionController.php
index 23eef822..b523326b 100644
--- a/lib/Controller/OptionController.php
+++ b/lib/Controller/OptionController.php
@@ -156,29 +156,5 @@ class OptionController extends Controller {
 		$searchTo = $searchTo->add(new DateInterval('PT3H'));
 
 		return new DataResponse(['events' => array_values($this->calendarService->getEvents($searchFrom, $searchTo))], Http::STATUS_OK);
-
-
-		if (is_int($from)) {
-			$searchFrom = new DateTime();
-			$searchFrom = $searchFrom->setTimestamp($from);
-		} else {
-			$searchFrom = new DateTime($from);
-		}
-
-
-		if (!$to) {
-			$searchTo = clone $searchFrom;
-			$searchTo = $searchTo->add(new DateInterval('PT1H'));
-
-		} else if (is_int($to)) {
-				$searchTo = new DateTime();
-				$searchTo = $searchTo->setTimestamp($to);
-		} else {
-			$searchTo = new DateTime($to);
-		}
-
-		$events = array_values($this->calendarService->getEvents($searchFrom, $searchTo));
-		return $events;
-
 	}
 }
diff --git a/lib/Controller/PreferencesController.php b/lib/Controller/PreferencesController.php
index 904e1a19..e9afb366 100644
--- a/lib/Controller/PreferencesController.php
+++ b/lib/Controller/PreferencesController.php
@@ -28,7 +28,6 @@ use OCP\AppFramework\Db\DoesNotExistException;
 
 
 use OCP\IRequest;
-use OCP\ILogger;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
@@ -42,7 +41,6 @@ class PreferencesController extends Controller {
 
 	private $userId;
 	private $preferencesMapper;
-	private $logger;
 
 	private $groupManager;
 	private $pollMapper;
@@ -60,7 +58,6 @@ class PreferencesController extends Controller {
 		string $appName,
 		$userId,
 		IRequest $request,
-		ILogger $logger,
 		PreferencesMapper $preferencesMapper
 	) {
 		parent::__construct($appName, $request);
diff --git a/lib/Controller/SystemController.php b/lib/Controller/SystemController.php
index 53f5c8f1..3e0a9b68 100644
--- a/lib/Controller/SystemController.php
+++ b/lib/Controller/SystemController.php
@@ -130,8 +130,7 @@ class SystemController extends Controller {
 	 * @return DataResponse
 	 */
 	public function validatePublicUsername($pollId, $userName, $token) {
-		return new DataResponse(['result' => true, 'name' => $userName], Http::STATUS_OK);
-
+		return new DataResponse(['result' => $this->systemService->validatePublicUsername($pollId, $userName, $token), 'name' => $userName], Http::STATUS_OK);
 	}
 
 }
diff --git a/lib/Service/MailService.php b/lib/Service/MailService.php
index a4451355..3c0b835d 100644
--- a/lib/Service/MailService.php
+++ b/lib/Service/MailService.php
@@ -163,7 +163,6 @@ class MailService {
 	 * @return string
 	 */
 	public function resolveEmailAddress($pollId, $userId) {
-		$contactsManager = \OC::$server->getContactsManager();
 
 		if ($this->userManager->get($userId) instanceof IUser) {
 			return \OC::$server->getConfig()->getUserValue($userId, 'settings', 'email');