juliushaertl / deck

lib/Service/CardService.php

Doc Comments +3 added lines

@@ -45,6 +45,9 @@
         return $this->cardMapper->find($cardId);
     }
 
+    /**
+     * @param integer $order
+     */
     public function create($title, $stackId, $type, $order, $owner) {
         $this->permissionService->checkPermission($this->stackMapper, $stackId, Acl::PERMISSION_EDIT);
         $card = new Card();

Indentation +114 added lines, -114 removed lines

@@ -32,118 +32,118 @@
 
 class CardService {
 
-    private $cardMapper;
-
-    public function __construct(CardMapper $cardMapper, StackMapper $stackMapper, PermissionService $permissionService) {
-        $this->cardMapper = $cardMapper;
-        $this->stackMapper = $stackMapper;
-        $this->permissionService = $permissionService;
-    }
-
-    public function find($cardId) {
-        $this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
-        return $this->cardMapper->find($cardId);
-    }
-
-    public function create($title, $stackId, $type, $order, $owner) {
-        $this->permissionService->checkPermission($this->stackMapper, $stackId, Acl::PERMISSION_EDIT);
-        $card = new Card();
-        $card->setTitle($title);
-        $card->setStackId($stackId);
-        $card->setType($type);
-        $card->setOrder($order);
-        $card->setOwner($owner);
-        return $this->cardMapper->insert($card);
-
-    }
-
-    public function delete($id) {
-        $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
-        return $this->cardMapper->delete($this->cardMapper->find($id));
-    }
-
-    public function update($id, $title, $stackId, $type, $order, $description, $owner) {
-        $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
-        $card = $this->cardMapper->find($id);
-        if ($card->getArchived()) {
-            throw new CardArchivedException();
-        }
-        $card->setTitle($title);
-        $card->setStackId($stackId);
-        $card->setType($type);
-        $card->setOrder($order);
-        $card->setOwner($owner);
-        $card->setDescription($description);
-        return $this->cardMapper->update($card);
-    }
-
-    public function rename($id, $title) {
-        $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
-        $card = $this->cardMapper->find($id);
-        if ($card->getArchived()) {
-            throw new CardArchivedException();
-        }
-        $card->setTitle($title);
-        return $this->cardMapper->update($card);
-    }
-
-    public function reorder($id, $stackId, $order) {
-        $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
-        $cards = $this->cardMapper->findAll($stackId);
-        $result = [];
-        $i = 0;
-        foreach ($cards as $card) {
-            if ($card->getArchived()) {
-                throw new CardArchivedException();
-            }
-            if ($card->id === $id) {
-                $card->setOrder($order);
-                $card->setLastModified(time());
-            }
-
-            if ($i === $order) {
-                            $i++;
-            }
-
-            if ($card->id !== $id) {
-                $card->setOrder($i++);
-            }
-            $this->cardMapper->update($card);
-            $result[$card->getOrder()] = $card;
-        }
-
-        return $result;
-    }
-
-    public function archive($id) {
-        $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
-        $card = $this->cardMapper->find($id);
-        $card->setArchived(true);
-        return $this->cardMapper->update($card);
-    }
-
-    public function unarchive($id) {
-        $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
-        $card = $this->cardMapper->find($id);
-        $card->setArchived(false);
-        return $this->cardMapper->update($card);
-    }
-
-    public function assignLabel($cardId, $labelId) {
-        $this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
-        $card = $this->cardMapper->find($cardId);
-        if ($card->getArchived()) {
-            throw new CardArchivedException();
-        }
-        $this->cardMapper->assignLabel($cardId, $labelId);
-    }
-
-    public function removeLabel($cardId, $labelId) {
-        $this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
-        $card = $this->cardMapper->find($cardId);
-        if ($card->getArchived()) {
-            throw new CardArchivedException();
-        }
-        $this->cardMapper->removeLabel($cardId, $labelId);
-    }
+	private $cardMapper;
+
+	public function __construct(CardMapper $cardMapper, StackMapper $stackMapper, PermissionService $permissionService) {
+		$this->cardMapper = $cardMapper;
+		$this->stackMapper = $stackMapper;
+		$this->permissionService = $permissionService;
+	}
+
+	public function find($cardId) {
+		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
+		return $this->cardMapper->find($cardId);
+	}
+
+	public function create($title, $stackId, $type, $order, $owner) {
+		$this->permissionService->checkPermission($this->stackMapper, $stackId, Acl::PERMISSION_EDIT);
+		$card = new Card();
+		$card->setTitle($title);
+		$card->setStackId($stackId);
+		$card->setType($type);
+		$card->setOrder($order);
+		$card->setOwner($owner);
+		return $this->cardMapper->insert($card);
+
+	}
+
+	public function delete($id) {
+		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
+		return $this->cardMapper->delete($this->cardMapper->find($id));
+	}
+
+	public function update($id, $title, $stackId, $type, $order, $description, $owner) {
+		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
+		$card = $this->cardMapper->find($id);
+		if ($card->getArchived()) {
+			throw new CardArchivedException();
+		}
+		$card->setTitle($title);
+		$card->setStackId($stackId);
+		$card->setType($type);
+		$card->setOrder($order);
+		$card->setOwner($owner);
+		$card->setDescription($description);
+		return $this->cardMapper->update($card);
+	}
+
+	public function rename($id, $title) {
+		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
+		$card = $this->cardMapper->find($id);
+		if ($card->getArchived()) {
+			throw new CardArchivedException();
+		}
+		$card->setTitle($title);
+		return $this->cardMapper->update($card);
+	}
+
+	public function reorder($id, $stackId, $order) {
+		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
+		$cards = $this->cardMapper->findAll($stackId);
+		$result = [];
+		$i = 0;
+		foreach ($cards as $card) {
+			if ($card->getArchived()) {
+				throw new CardArchivedException();
+			}
+			if ($card->id === $id) {
+				$card->setOrder($order);
+				$card->setLastModified(time());
+			}
+
+			if ($i === $order) {
+							$i++;
+			}
+
+			if ($card->id !== $id) {
+				$card->setOrder($i++);
+			}
+			$this->cardMapper->update($card);
+			$result[$card->getOrder()] = $card;
+		}
+
+		return $result;
+	}
+
+	public function archive($id) {
+		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
+		$card = $this->cardMapper->find($id);
+		$card->setArchived(true);
+		return $this->cardMapper->update($card);
+	}
+
+	public function unarchive($id) {
+		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
+		$card = $this->cardMapper->find($id);
+		$card->setArchived(false);
+		return $this->cardMapper->update($card);
+	}
+
+	public function assignLabel($cardId, $labelId) {
+		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
+		$card = $this->cardMapper->find($cardId);
+		if ($card->getArchived()) {
+			throw new CardArchivedException();
+		}
+		$this->cardMapper->assignLabel($cardId, $labelId);
+	}
+
+	public function removeLabel($cardId, $labelId) {
+		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
+		$card = $this->cardMapper->find($cardId);
+		if ($card->getArchived()) {
+			throw new CardArchivedException();
+		}
+		$this->cardMapper->removeLabel($cardId, $labelId);
+	}
 }
\ No newline at end of file

lib/Service/BoardService.php

Indentation +10 added lines, -10 removed lines

@@ -39,7 +39,7 @@ 
 
 	private $boardMapper;
 	private $labelMapper;
-    private $aclMapper;
+	private $aclMapper;
 	private $l10n;
 	private $permissionService;
 
@@ -59,7 +59,7 @@ 
 	}
 
 	public function find($boardId) {
-	    $this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
+		$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_READ);
 		return $this->boardMapper->find($boardId, true, true);
 	}
 
@@ -72,11 +72,11 @@ 
 
 		// create new labels
 		$default_labels = [
-		    '31CC7C' => $this->l10n->t('Finished'),
-            '317CCC' => $this->l10n->t('To review'),
+			'31CC7C' => $this->l10n->t('Finished'),
+			'317CCC' => $this->l10n->t('To review'),
 			'FF7A66' => $this->l10n->t('Action needed'),
 			'F1DB50' => $this->l10n->t('Later')
-        ];
+		];
 		$labels = [];
 		foreach ($default_labels as $color => $title) {
 			$label = new Label();
@@ -91,12 +91,12 @@ 
 	}
 
 	public function delete($id) {
-        $this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_READ);
+		$this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_READ);
 		return $this->boardMapper->delete($this->find($id));
 	}
 
 	public function update($id, $title, $color) {
-        $this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_MANAGE);
+		$this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_MANAGE);
 		$board = $this->find($id);
 		$board->setTitle($title);
 		$board->setColor($color);
@@ -105,7 +105,7 @@ 
 
 
 	public function addAcl($boardId, $type, $participant, $edit, $share, $manage) {
-        $this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_SHARE);
+		$this->permissionService->checkPermission($this->boardMapper, $boardId, Acl::PERMISSION_SHARE);
 		$acl = new Acl();
 		$acl->setBoardId($boardId);
 		$acl->setType($type);
@@ -117,7 +117,7 @@ 
 	}
 
 	public function updateAcl($id, $edit, $share, $manage) {
-        $this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_SHARE);
+		$this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_SHARE);
 		$acl = $this->aclMapper->find($id);
 		$acl->setPermissionEdit($edit);
 		$acl->setPermissionShare($share);
@@ -126,7 +126,7 @@ 
 	}
 
 	public function deleteAcl($id) {
-        $this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_SHARE);
+		$this->permissionService->checkPermission($this->boardMapper, $id, Acl::PERMISSION_SHARE);
 		$acl = $this->aclMapper->find($id);
 		return $this->aclMapper->delete($acl);
 	}

lib/Controller/BoardController.php

Indentation +4 added lines, -4 removed lines

@@ -49,10 +49,10 @@
 		$this->userInfo = $this->getBoardPrerequisites();
 	}
 
-    /**
-     * TODO: move to boardservice
-     * @return array
-     */
+	/**
+	 * TODO: move to boardservice
+	 * @return array
+	 */
 	private function getBoardPrerequisites() {
 		$groups = $this->groupManager->getUserGroupIds(
 			$this->userManager->get($this->userId)

appinfo/routes.php

Indentation +35 added lines, -35 removed lines

@@ -22,46 +22,46 @@
  */
 
 return [
-    'routes' => [
-        ['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
+	'routes' => [
+		['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
 
-        // share
-        ['name' => 'share#searchUser', 'url' => '/share/search/{search}', 'verb' => 'GET'],
+		// share
+		['name' => 'share#searchUser', 'url' => '/share/search/{search}', 'verb' => 'GET'],
 
-        // boards
-        ['name' => 'board#index', 'url' => '/boards', 'verb' => 'GET'],
-        ['name' => 'board#create', 'url' => '/boards', 'verb' => 'POST'],
-        ['name' => 'board#read', 'url' => '/boards/{boardId}', 'verb' => 'GET'],
-        ['name' => 'board#update', 'url' => '/boards/{boardId}', 'verb' => 'PUT'],
-        ['name' => 'board#delete', 'url' => '/boards/{boardId}', 'verb' => 'DELETE'],
+		// boards
+		['name' => 'board#index', 'url' => '/boards', 'verb' => 'GET'],
+		['name' => 'board#create', 'url' => '/boards', 'verb' => 'POST'],
+		['name' => 'board#read', 'url' => '/boards/{boardId}', 'verb' => 'GET'],
+		['name' => 'board#update', 'url' => '/boards/{boardId}', 'verb' => 'PUT'],
+		['name' => 'board#delete', 'url' => '/boards/{boardId}', 'verb' => 'DELETE'],
 		['name' => 'board#getUserPermissions', 'url' => '/boards/{boardId}/permissions', 'verb' => 'GET'],
-        ['name' => 'board#addAcl', 'url' => '/boards/{boardId}/acl', 'verb' => 'POST'],
-        ['name' => 'board#updateAcl', 'url' => '/boards/{boardId}/acl', 'verb' => 'PUT'],
-        ['name' => 'board#deleteAcl', 'url' => '/boards/{boardId}/acl/{aclId}', 'verb' => 'DELETE'],
+		['name' => 'board#addAcl', 'url' => '/boards/{boardId}/acl', 'verb' => 'POST'],
+		['name' => 'board#updateAcl', 'url' => '/boards/{boardId}/acl', 'verb' => 'PUT'],
+		['name' => 'board#deleteAcl', 'url' => '/boards/{boardId}/acl/{aclId}', 'verb' => 'DELETE'],
 
-        // stacks
-        ['name' => 'stack#index', 'url' => '/stacks/{boardId}', 'verb' => 'GET'],
-        ['name' => 'stack#create', 'url' => '/stacks', 'verb' => 'POST'],
-        ['name' => 'stack#update', 'url' => '/stacks/{stackId}', 'verb' => 'PUT'],
-        ['name' => 'stack#delete', 'url' => '/stacks/{stackId}', 'verb' => 'DELETE'],
-        ['name' => 'stack#archived', 'url' => '/stacks/{boardId}/archived', 'verb' => 'GET'],
+		// stacks
+		['name' => 'stack#index', 'url' => '/stacks/{boardId}', 'verb' => 'GET'],
+		['name' => 'stack#create', 'url' => '/stacks', 'verb' => 'POST'],
+		['name' => 'stack#update', 'url' => '/stacks/{stackId}', 'verb' => 'PUT'],
+		['name' => 'stack#delete', 'url' => '/stacks/{stackId}', 'verb' => 'DELETE'],
+		['name' => 'stack#archived', 'url' => '/stacks/{boardId}/archived', 'verb' => 'GET'],
 
-        // cards
-        ['name' => 'card#read', 'url' => '/cards/{cardId}', 'verb' => 'GET'],
-        ['name' => 'card#create', 'url' => '/cards', 'verb' => 'POST'],
-        ['name' => 'card#update', 'url' => '/cards/{cardId}', 'verb' => 'PUT'],
-        ['name' => 'card#delete', 'url' => '/cards/{cardId}', 'verb' => 'DELETE'],
-        ['name' => 'card#rename', 'url' => '/cards/{cardId}/rename', 'verb' => 'PUT'],
-        ['name' => 'card#reorder', 'url' => '/cards/{cardId}/reorder', 'verb' => 'PUT'],
-        ['name' => 'card#archive', 'url' => '/cards/{cardId}/archive', 'verb' => 'PUT'],
-        ['name' => 'card#unarchive', 'url' => '/cards/{cardId}/unarchive', 'verb' => 'PUT'],
-        ['name' => 'card#assignLabel', 'url' => '/cards/{cardId}/label/{labelId}', 'verb' => 'POST'],
-        ['name' => 'card#removeLabel', 'url' => '/cards/{cardId}/label/{labelId}', 'verb' => 'DELETE'],
+		// cards
+		['name' => 'card#read', 'url' => '/cards/{cardId}', 'verb' => 'GET'],
+		['name' => 'card#create', 'url' => '/cards', 'verb' => 'POST'],
+		['name' => 'card#update', 'url' => '/cards/{cardId}', 'verb' => 'PUT'],
+		['name' => 'card#delete', 'url' => '/cards/{cardId}', 'verb' => 'DELETE'],
+		['name' => 'card#rename', 'url' => '/cards/{cardId}/rename', 'verb' => 'PUT'],
+		['name' => 'card#reorder', 'url' => '/cards/{cardId}/reorder', 'verb' => 'PUT'],
+		['name' => 'card#archive', 'url' => '/cards/{cardId}/archive', 'verb' => 'PUT'],
+		['name' => 'card#unarchive', 'url' => '/cards/{cardId}/unarchive', 'verb' => 'PUT'],
+		['name' => 'card#assignLabel', 'url' => '/cards/{cardId}/label/{labelId}', 'verb' => 'POST'],
+		['name' => 'card#removeLabel', 'url' => '/cards/{cardId}/label/{labelId}', 'verb' => 'DELETE'],
 
-        // labels
-        ['name' => 'label#create', 'url' => '/labels', 'verb' => 'POST'],
-        ['name' => 'label#update', 'url' => '/labels/{labelId}', 'verb' => 'PUT'],
-        ['name' => 'label#delete', 'url' => '/labels/{labelId}', 'verb' => 'DELETE'],
+		// labels
+		['name' => 'label#create', 'url' => '/labels', 'verb' => 'POST'],
+		['name' => 'label#update', 'url' => '/labels/{labelId}', 'verb' => 'PUT'],
+		['name' => 'label#delete', 'url' => '/labels/{labelId}', 'verb' => 'DELETE'],
 
-    ]
+	]
 ];

lib/Service/PermissionService.php

Indentation +26 added lines, -26 removed lines

@@ -75,35 +75,35 @@ 
 	 * @return bool
 	 * @throws NoPermissionException
 	 */
-    public function checkPermission($mapper, $id, $permission) {
-        try {
-            if ($mapper instanceof IPermissionMapper) {
-                $boardId = $mapper->findBoardId($id);
-            } else {
-                $boardId = $id;
-            }
-            if ($boardId === null) {
-                // Throw NoPermission to not leak information about existing entries
-                throw new NoPermissionException('Permission denied');
-            }
+	public function checkPermission($mapper, $id, $permission) {
+		try {
+			if ($mapper instanceof IPermissionMapper) {
+				$boardId = $mapper->findBoardId($id);
+			} else {
+				$boardId = $id;
+			}
+			if ($boardId === null) {
+				// Throw NoPermission to not leak information about existing entries
+				throw new NoPermissionException('Permission denied');
+			}
 
-            if ($this->userIsBoardOwner($boardId)) {
-                return true;
-            }
-            $acls = $this->aclMapper->findAll($boardId);
-            $result = $this->userCan($acls, $permission);
-            if ($result) {
-                return true;
-            }
+			if ($this->userIsBoardOwner($boardId)) {
+				return true;
+			}
+			$acls = $this->aclMapper->findAll($boardId);
+			$result = $this->userCan($acls, $permission);
+			if ($result) {
+				return true;
+			}
 
-        } catch (DoesNotExistException $exception) {
-            // Throw NoPermission to not leak information about existing entries
-            throw new NoPermissionException('Permission denied');
-        }
+		} catch (DoesNotExistException $exception) {
+			// Throw NoPermission to not leak information about existing entries
+			throw new NoPermissionException('Permission denied');
+		}
 
-        throw new NoPermissionException('Permission denied.');
+		throw new NoPermissionException('Permission denied.');
 
-    }
+	}
 
 	/**
 	 * @param $boardId
@@ -114,7 +114,7 @@ 
 		if ($board && $this->userId === $board->getOwner()) {
 			return true;
 		}
-        return false;
+		return false;
 	}
 
 	/**

lib/Service/LabelService.php

Indentation +28 added lines, -28 removed lines

@@ -30,38 +30,38 @@
 
 class LabelService {
 
-    private $labelMapper;
+	private $labelMapper;
 
-    public function __construct(LabelMapper $labelMapper, PermissionService $permissionService) {
-        $this->labelMapper = $labelMapper;
-        $this->permissionService = $permissionService;
-    }
+	public function __construct(LabelMapper $labelMapper, PermissionService $permissionService) {
+		$this->labelMapper = $labelMapper;
+		$this->permissionService = $permissionService;
+	}
 
-    public function find($labelId) {
-        $this->permissionService->checkPermission($this->labelMapper, $labelId, Acl::PERMISSION_READ);
-        return $this->labelMapper->find($labelId);
-    }
+	public function find($labelId) {
+		$this->permissionService->checkPermission($this->labelMapper, $labelId, Acl::PERMISSION_READ);
+		return $this->labelMapper->find($labelId);
+	}
 
-    public function create($title, $color, $boardId) {
-        $this->permissionService->checkPermission(null, $boardId, Acl::PERMISSION_MANAGE);
-        $label = new Label();
-        $label->setTitle($title);
-        $label->setColor($color);
-        $label->setBoardId($boardId);
-        return $this->labelMapper->insert($label);
-    }
+	public function create($title, $color, $boardId) {
+		$this->permissionService->checkPermission(null, $boardId, Acl::PERMISSION_MANAGE);
+		$label = new Label();
+		$label->setTitle($title);
+		$label->setColor($color);
+		$label->setBoardId($boardId);
+		return $this->labelMapper->insert($label);
+	}
 
-    public function delete($id) {
-        $this->permissionService->checkPermission($this->labelMapper, $id, Acl::PERMISSION_MANAGE);
-        return $this->labelMapper->delete($this->find($id));
-    }
+	public function delete($id) {
+		$this->permissionService->checkPermission($this->labelMapper, $id, Acl::PERMISSION_MANAGE);
+		return $this->labelMapper->delete($this->find($id));
+	}
 
-    public function update($id, $title, $color) {
-        $this->permissionService->checkPermission($this->labelMapper, $id, Acl::PERMISSION_MANAGE);
-        $label = $this->find($id);
-        $label->setTitle($title);
-        $label->setColor($color);
-        return $this->labelMapper->update($label);
-    }
+	public function update($id, $title, $color) {
+		$this->permissionService->checkPermission($this->labelMapper, $id, Acl::PERMISSION_MANAGE);
+		$label = $this->find($id);
+		$label->setTitle($title);
+		$label->setColor($color);
+		return $this->labelMapper->update($label);
+	}
 
 }
\ No newline at end of file

lib/Service/StackService.php

Indentation +57 added lines, -57 removed lines

@@ -35,71 +35,71 @@
 
 class StackService {
 
-    private $stackMapper;
-    private $cardMapper;
-    private $labelMapper;
-    private $permissionService;
+	private $stackMapper;
+	private $cardMapper;
+	private $labelMapper;
+	private $permissionService;
 
-    public function __construct(StackMapper $stackMapper, CardMapper $cardMapper, LabelMapper $labelMapper, PermissionService $permissionService) {
-        $this->stackMapper = $stackMapper;
-        $this->cardMapper = $cardMapper;
-        $this->labelMapper = $labelMapper;
-        $this->permissionService = $permissionService;
-    }
+	public function __construct(StackMapper $stackMapper, CardMapper $cardMapper, LabelMapper $labelMapper, PermissionService $permissionService) {
+		$this->stackMapper = $stackMapper;
+		$this->cardMapper = $cardMapper;
+		$this->labelMapper = $labelMapper;
+		$this->permissionService = $permissionService;
+	}
 
-    public function findAll($boardId) {
-        $this->permissionService->checkPermission(null, $boardId, Acl::PERMISSION_READ);
-        $stacks = $this->stackMapper->findAll($boardId);
-        $labels = $this->labelMapper->getAssignedLabelsForBoard($boardId);
-        foreach ($stacks as $stackIndex => $stack) {
-            $cards = $this->cardMapper->findAll($stack->id);
-            foreach ($cards as $cardIndex => $card) {
-            	if (array_key_exists($card->id, $labels)) {
-                	$cards[$cardIndex]->setLabels($labels[$card->id]);
+	public function findAll($boardId) {
+		$this->permissionService->checkPermission(null, $boardId, Acl::PERMISSION_READ);
+		$stacks = $this->stackMapper->findAll($boardId);
+		$labels = $this->labelMapper->getAssignedLabelsForBoard($boardId);
+		foreach ($stacks as $stackIndex => $stack) {
+			$cards = $this->cardMapper->findAll($stack->id);
+			foreach ($cards as $cardIndex => $card) {
+				if (array_key_exists($card->id, $labels)) {
+					$cards[$cardIndex]->setLabels($labels[$card->id]);
 				}
-            }
-            $stacks[$stackIndex]->setCards($cards);
-        }
-        return $stacks;
-    }
+			}
+			$stacks[$stackIndex]->setCards($cards);
+		}
+		return $stacks;
+	}
 
-    public function findAllArchived($boardId) {
-        $this->permissionService->checkPermission(null, $boardId, Acl::PERMISSION_READ);
-        $stacks = $this->stackMapper->findAll($boardId);
-        $labels = $this->labelMapper->getAssignedLabelsForBoard($boardId);
-        foreach ($stacks as $stackIndex => $stack) {
-            $cards = $this->cardMapper->findAllArchived($stack->id);
-            foreach ($cards as $cardIndex => $card) {
-            	if (array_key_exists($card->id, $labels)) {
+	public function findAllArchived($boardId) {
+		$this->permissionService->checkPermission(null, $boardId, Acl::PERMISSION_READ);
+		$stacks = $this->stackMapper->findAll($boardId);
+		$labels = $this->labelMapper->getAssignedLabelsForBoard($boardId);
+		foreach ($stacks as $stackIndex => $stack) {
+			$cards = $this->cardMapper->findAllArchived($stack->id);
+			foreach ($cards as $cardIndex => $card) {
+				if (array_key_exists($card->id, $labels)) {
 					$cards[$cardIndex]->setLabels($labels[$card->id]);
 				}
-            }
-            $stacks[$stackIndex]->setCards($cards);
-        }
-        return $stacks;
-    }
+			}
+			$stacks[$stackIndex]->setCards($cards);
+		}
+		return $stacks;
+	}
 
-    public function create($title, $boardId, $order) {
-        $this->permissionService->checkPermission(null, $boardId, Acl::PERMISSION_MANAGE);
-        $stack = new Stack();
-        $stack->setTitle($title);
-        $stack->setBoardId($boardId);
-        $stack->setOrder($order);
-        return $this->stackMapper->insert($stack);
+	public function create($title, $boardId, $order) {
+		$this->permissionService->checkPermission(null, $boardId, Acl::PERMISSION_MANAGE);
+		$stack = new Stack();
+		$stack->setTitle($title);
+		$stack->setBoardId($boardId);
+		$stack->setOrder($order);
+		return $this->stackMapper->insert($stack);
 
-    }
+	}
 
-    public function delete($id) {
-        $this->permissionService->checkPermission($this->stackMapper, $id, Acl::PERMISSION_MANAGE);
-        return $this->stackMapper->delete($this->stackMapper->find($id));
-    }
+	public function delete($id) {
+		$this->permissionService->checkPermission($this->stackMapper, $id, Acl::PERMISSION_MANAGE);
+		return $this->stackMapper->delete($this->stackMapper->find($id));
+	}
 
-    public function update($id, $title, $boardId, $order) {
-        $this->permissionService->checkPermission($this->stackMapper, $id, Acl::PERMISSION_MANAGE);
-        $stack = $this->stackMapper->find($id);
-        $stack->setTitle($title);
-        $stack->setBoardId($boardId);
-        $stack->setOrder($order);
-        return $this->stackMapper->update($stack);
-    }
+	public function update($id, $title, $boardId, $order) {
+		$this->permissionService->checkPermission($this->stackMapper, $id, Acl::PERMISSION_MANAGE);
+		$stack = $this->stackMapper->find($id);
+		$stack->setTitle($title);
+		$stack->setBoardId($boardId);
+		$stack->setOrder($order);
+		return $this->stackMapper->update($stack);
+	}
 }
\ No newline at end of file

lib/Db/LabelMapper.php

Indentation +41 added lines, -41 removed lines

@@ -28,44 +28,44 @@ 
 
 class LabelMapper extends DeckMapper implements IPermissionMapper {
 
-    public function __construct(IDBConnection $db) {
-        parent::__construct($db, 'deck_labels', '\OCA\Deck\Db\Label');
-    }
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'deck_labels', '\OCA\Deck\Db\Label');
+	}
 
-    public function findAll($boardId, $limit = null, $offset = null) {
-        $sql = 'SELECT * FROM `*PREFIX*deck_labels` WHERE `board_id` = ? ORDER BY `id`';
-        return $this->findEntities($sql, [$boardId], $limit, $offset);
-    }
+	public function findAll($boardId, $limit = null, $offset = null) {
+		$sql = 'SELECT * FROM `*PREFIX*deck_labels` WHERE `board_id` = ? ORDER BY `id`';
+		return $this->findEntities($sql, [$boardId], $limit, $offset);
+	}
 
-    public function delete(\OCP\AppFramework\Db\Entity $entity) {
+	public function delete(\OCP\AppFramework\Db\Entity $entity) {
 		// delete assigned labels
 		$this->deleteLabelAssignments($entity->getId());
 		// delete label
-        return parent::delete($entity);
-    }
+		return parent::delete($entity);
+	}
 
-    public function findAssignedLabelsForCard($cardId, $limit = null, $offset = null) {
-        $sql = 'SELECT l.* FROM `*PREFIX*deck_assigned_labels` as al INNER JOIN *PREFIX*deck_labels as l ON l.id = al.label_id WHERE `card_id` = ? ORDER BY l.id';
-        return $this->findEntities($sql, [$cardId], $limit, $offset);
-    }
-    public function findAssignedLabelsForBoard($boardId, $limit = null, $offset = null) {
-        $sql = "SELECT c.id as card_id, l.id as id, l.title as title, l.color as color FROM oc_deck_cards as c " .
-            " INNER JOIN oc_deck_assigned_labels as al ON al.card_id = c.id INNER JOIN oc_deck_labels as l ON  al.label_id = l.id WHERE board_id=? ORDER BY l.id";
-        $entities = $this->findEntities($sql, [$boardId], $limit, $offset);
-        return $entities;
-    }
+	public function findAssignedLabelsForCard($cardId, $limit = null, $offset = null) {
+		$sql = 'SELECT l.* FROM `*PREFIX*deck_assigned_labels` as al INNER JOIN *PREFIX*deck_labels as l ON l.id = al.label_id WHERE `card_id` = ? ORDER BY l.id';
+		return $this->findEntities($sql, [$cardId], $limit, $offset);
+	}
+	public function findAssignedLabelsForBoard($boardId, $limit = null, $offset = null) {
+		$sql = "SELECT c.id as card_id, l.id as id, l.title as title, l.color as color FROM oc_deck_cards as c " .
+			" INNER JOIN oc_deck_assigned_labels as al ON al.card_id = c.id INNER JOIN oc_deck_labels as l ON  al.label_id = l.id WHERE board_id=? ORDER BY l.id";
+		$entities = $this->findEntities($sql, [$boardId], $limit, $offset);
+		return $entities;
+	}
 
-    public function getAssignedLabelsForBoard($boardId) {
-        $labels = $this->findAssignedLabelsForBoard($boardId);
-        $result = array();
-        foreach ($labels as $label) {
-            if (!array_key_exists($label->getCardId(), $result)) {
-                $result[$label->getCardId()] = array();
-            }
-            $result[$label->getCardId()][] = $label;
-        }
-        return $result;
-    }
+	public function getAssignedLabelsForBoard($boardId) {
+		$labels = $this->findAssignedLabelsForBoard($boardId);
+		$result = array();
+		foreach ($labels as $label) {
+			if (!array_key_exists($label->getCardId(), $result)) {
+				$result[$label->getCardId()] = array();
+			}
+			$result[$label->getCardId()][] = $label;
+		}
+		return $result;
+	}
 
 	public function deleteLabelAssignments($labelId) {
 		$sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE label_id = ?';
@@ -81,15 +81,15 @@ 
 		$stmt->execute();
 	}
 
-    public function isOwner($userId, $labelId) {
-        $sql = 'SELECT owner FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_labels` WHERE id = ?)';
-        $stmt = $this->execute($sql, [$labelId]);
-        $row = $stmt->fetch();
-        return ($row['owner'] === $userId);
-    }
+	public function isOwner($userId, $labelId) {
+		$sql = 'SELECT owner FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_labels` WHERE id = ?)';
+		$stmt = $this->execute($sql, [$labelId]);
+		$row = $stmt->fetch();
+		return ($row['owner'] === $userId);
+	}
 
-    public function findBoardId($labelId) {
-        $entity = $this->find($labelId);
-        return $entity->getBoardId();
-    }
+	public function findBoardId($labelId) {
+		$entity = $this->find($labelId);
+		return $entity->getBoardId();
+	}
 }

lib/Db/AclMapper.php

Indentation +20 added lines, -20 removed lines

@@ -28,25 +28,25 @@
 
 class AclMapper extends DeckMapper implements IPermissionMapper {
 
-    public function __construct(IDBConnection $db) {
-        parent::__construct($db, 'deck_board_acl', '\OCA\Deck\Db\Acl');
-    }
-
-    public function findAll($boardId, $limit = null, $offset = null) {
-        $sql = 'SELECT id, board_id, type, participant, permission_edit, permission_share, permission_manage FROM `*PREFIX*deck_board_acl` WHERE `board_id` = ? ';
-        return $this->findEntities($sql, [$boardId], $limit, $offset);
-    }
-
-    public function isOwner($userId, $aclId) {
-        $sql = 'SELECT owner FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_board_acl` WHERE id = ?)';
-        $stmt = $this->execute($sql, [$aclId]);
-        $row = $stmt->fetch();
-        return ($row['owner'] === $userId);
-    }
-
-    public function findBoardId($aclId) {
-        $entity = $this->find($aclId);
-        return $entity->getBoardId();
-    }
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'deck_board_acl', '\OCA\Deck\Db\Acl');
+	}
+
+	public function findAll($boardId, $limit = null, $offset = null) {
+		$sql = 'SELECT id, board_id, type, participant, permission_edit, permission_share, permission_manage FROM `*PREFIX*deck_board_acl` WHERE `board_id` = ? ';
+		return $this->findEntities($sql, [$boardId], $limit, $offset);
+	}
+
+	public function isOwner($userId, $aclId) {
+		$sql = 'SELECT owner FROM `*PREFIX*deck_boards` WHERE `id` IN (SELECT board_id FROM `*PREFIX*deck_board_acl` WHERE id = ?)';
+		$stmt = $this->execute($sql, [$aclId]);
+		$row = $stmt->fetch();
+		return ($row['owner'] === $userId);
+	}
+
+	public function findBoardId($aclId) {
+		$entity = $this->find($aclId);
+		return $entity->getBoardId();
+	}
 
 }