Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function __construct(array $urlParams = array()) {
$container = $this->getContainer();
$server = $container->getServer();

$container->registerService('SharingMiddleware', function ($container) use ($server) {
$container->registerService('SharingMiddleware', function($container) use ($server) {
return new SharingMiddleware(
$container,
$server->getRequest(),
Expand All @@ -55,7 +55,7 @@ public function __construct(array $urlParams = array()) {

public function registerNavigationEntry() {
$container = $this->getContainer();
$container->query('OCP\INavigationManager')->add(function () use ($container) {
$container->query('OCP\INavigationManager')->add(function() use ($container) {
$urlGenerator = $container->query('OCP\IURLGenerator');
$l10n = $container->query('OCP\IL10N');
return [
Expand Down
2 changes: 1 addition & 1 deletion lib/CardArchivedException.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class CardArchivedException extends \Exception {
* Constructor
* @param string $msg the error message
*/
public function __construct($msg=""){
public function __construct($msg = "") {
parent::__construct($msg);
}
}
4 changes: 2 additions & 2 deletions lib/Controller/CardController.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class CardController extends Controller {
private $userId;
private $cardService;

public function __construct($appName, IRequest $request, CardService $cardService, $userId){
public function __construct($appName, IRequest $request, CardService $cardService, $userId) {
parent::__construct($appName, $request);
$this->userId = $userId;
$this->cardService = $cardService;
Expand Down Expand Up @@ -76,7 +76,7 @@ public function rename($cardId, $title) {
* @param int $order
* @return \OCP\AppFramework\Db\Entity
*/
public function create($title, $stackId, $type, $order=999) {
public function create($title, $stackId, $type, $order = 999) {
return $this->cardService->create($title, $stackId, $type, $order, $this->userId);
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/LabelController.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class LabelController extends Controller {

private $labelService;

public function __construct($appName, IRequest $request, LabelService $labelService){
public function __construct($appName, IRequest $request, LabelService $labelService) {
parent::__construct($appName, $request);
$this->labelService = $labelService;
}
Expand Down
5 changes: 3 additions & 2 deletions lib/Controller/ShareController.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ public function searchUser($search) {
}
$limit = 10;
foreach ($this->userManager->searchDisplayName($search, $limit, $offset) as $idx => $user) {
if ($user->getUID() === $this->userId)
continue;
if ($user->getUID() === $this->userId) {
continue;
}
$acl = new Acl();
$acl->setType('user');
$acl->setParticipant($user->getUID());
Expand Down
4 changes: 2 additions & 2 deletions lib/Controller/StackController.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
class StackController extends Controller {
private $userId;
private $stackService;
public function __construct($appName, IRequest $request, StackService $cardService, $userId){
public function __construct($appName, IRequest $request, StackService $cardService, $userId) {
parent::__construct($appName, $request);
$this->userId = $userId;
$this->stackService = $cardService;
Expand Down Expand Up @@ -64,7 +64,7 @@ public function archived($boardId) {
* @param int $order
* @return \OCP\AppFramework\Db\Entity
*/
public function create($title, $boardId, $order=999) {
public function create($title, $boardId, $order = 999) {
return $this->stackService->create($title, $boardId, $order);
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Db/AclMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function __construct(IDBConnection $db) {
parent::__construct($db, 'deck_board_acl', '\OCA\Deck\Db\Acl');
}

public function findAll($boardId, $limit=null, $offset=null) {
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);
}
Expand Down
8 changes: 4 additions & 4 deletions lib/Db/Board.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ class Board extends Entity implements JsonSerializable {
protected $shared;

public function __construct() {
$this->addType('id','integer');
$this->addType('shared','integer');
$this->addType('archived','boolean');
$this->addType('id', 'integer');
$this->addType('shared', 'integer');
$this->addType('archived', 'boolean');
$this->addRelation('labels');
$this->addRelation('acl');
$this->addRelation('shared');
Expand All @@ -55,7 +55,7 @@ public function jsonSerialize() {
'labels' => $this->labels,
'acl' => $this->acl,
];
if($this->shared!==-1) {
if ($this->shared !== -1) {
$result['shared'] = $this->shared;
}
return $result;
Expand Down
8 changes: 4 additions & 4 deletions lib/Db/Card.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ class Card extends Entity implements JsonSerializable {
protected $archived = false;

public function __construct() {
$this->addType('id','integer');
$this->addType('stackId','integer');
$this->addType('order','integer');
$this->addType('id', 'integer');
$this->addType('stackId', 'integer');
$this->addType('order', 'integer');
$this->addType('lastModified', 'integer');
$this->addType('createdAt', 'integer');
$this->addType('archived','boolean');
$this->addType('archived', 'boolean');
$this->addRelation('labels');
}

Expand Down
4 changes: 2 additions & 2 deletions lib/Db/Entity.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ public function addRelation($property) {
* @param string $attribute the name of the attribute
* @since 7.0.0
*/
protected function markFieldUpdated($attribute){
if(!in_array($attribute, $this->_relations)) {
protected function markFieldUpdated($attribute) {
if (!in_array($attribute, $this->_relations)) {
parent::markFieldUpdated($attribute);
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Db/Label.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class Label extends Entity implements JsonSerializable {
protected $boardId;
protected $cardId;
public function __construct() {
$this->addType('id','integer');
$this->addType('id', 'integer');
}
public function jsonSerialize() {
return [
Expand Down
12 changes: 6 additions & 6 deletions lib/Db/LabelMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function __construct(IDBConnection $db) {
parent::__construct($db, 'deck_labels', '\OCA\Deck\Db\Label');
}

public function findAll($boardId, $limit=null, $offset=null) {
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);
}
Expand All @@ -44,11 +44,11 @@ public function delete(\OCP\AppFramework\Db\Entity $entity) {
return parent::delete($entity);
}

public function findAssignedLabelsForCard($cardId, $limit=null, $offset=null) {
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) {
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);
Expand All @@ -59,7 +59,7 @@ public function getAssignedLabelsForBoard($boardId) {
$labels = $this->findAssignedLabelsForBoard($boardId);
$result = array();
foreach ($labels as $label) {
if(!array_key_exists($label->getCardId(), $result)) {
if (!array_key_exists($label->getCardId(), $result)) {
$result[$label->getCardId()] = array();
}
$result[$label->getCardId()][] = $label;
Expand All @@ -70,14 +70,14 @@ public function getAssignedLabelsForBoard($boardId) {
public function deleteLabelAssignments($labelId) {
$sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE label_id = ?';
$stmt = $this->db->prepare($sql);
$stmt->bindParam(1, $labelId, \PDO::PARAM_INT);
$stmt->bindParam(1, $labelId, \PDO::PARAM_INT);
$stmt->execute();
}

public function deleteLabelAssignmentsForCard($cardId) {
$sql = 'DELETE FROM `*PREFIX*deck_assigned_labels` WHERE card_id = ?';
$stmt = $this->db->prepare($sql);
$stmt->bindParam(1, $cardId, \PDO::PARAM_INT);
$stmt->bindParam(1, $cardId, \PDO::PARAM_INT);
$stmt->execute();
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Db/StackMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function find($id) {
}


public function findAll($boardId, $limit=null, $offset=null) {
public function findAll($boardId, $limit = null, $offset = null) {
$sql = 'SELECT * FROM `*PREFIX*deck_stacks` WHERE `board_id` = ? ORDER BY `order`';
return $this->findEntities($sql, [$boardId], $limit, $offset);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/NoPermissionException.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@

class NoPermissionException extends StatusException {

public function __construct($message, $controller=null, $method=null) {
public function __construct($message, $controller = null, $method = null) {
parent::__construct($message);
if($controller && $method) {
if ($controller && $method) {
$this->message = get_class($controller) . "#" . $method . ": " . $message;
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/NotFoundException.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

class NotFoundException extends StatusException {

public function __construct($message="") {
public function __construct($message = "") {
parent::__construct($message);
}

Expand Down
5 changes: 3 additions & 2 deletions lib/Service/CardService.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@ public function reorder($id, $stackId, $order) {
$card->setLastModified(time());
}

if ($i === $order)
$i++;
if ($i === $order) {
$i++;
}

if ($card->id !== $id) {
$card->setOrder($i++);
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/LabelService.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
use OCA\Deck\Db\LabelMapper;


class LabelService {
class LabelService {

private $labelMapper;

Expand Down
2 changes: 0 additions & 2 deletions lib/Service/PermissionService.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@
use OCA\Deck\Db\Acl;
use OCA\Deck\Db\AclMapper;
use OCA\Deck\Db\BoardMapper;

use OCA\Deck\Db\IPermissionMapper;
use OCA\Deck\NoPermissionException;

use OCP\AppFramework\Db\DoesNotExistException;
use OCP\IGroupManager;
use OCP\ILogger;
Expand Down
6 changes: 3 additions & 3 deletions lib/Service/StackService.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
use OCA\Deck\Db\StackMapper;


class StackService {
class StackService {

private $stackMapper;
private $cardMapper;
Expand All @@ -54,7 +54,7 @@ public function findAll($boardId) {
foreach ($stacks as $stackIndex => $stack) {
$cards = $this->cardMapper->findAll($stack->id);
foreach ($cards as $cardIndex => $card) {
if(array_key_exists($card->id, $labels)) {
if (array_key_exists($card->id, $labels)) {
$cards[$cardIndex]->setLabels($labels[$card->id]);
}
}
Expand All @@ -70,7 +70,7 @@ public function findAllArchived($boardId) {
foreach ($stacks as $stackIndex => $stack) {
$cards = $this->cardMapper->findAllArchived($stack->id);
foreach ($cards as $cardIndex => $card) {
if(array_key_exists($card->id, $labels)) {
if (array_key_exists($card->id, $labels)) {
$cards[$cardIndex]->setLabels($labels[$card->id]);
}
}
Expand Down