From 198f8d6a8e39fe7bb21faafe53b12e351feca8b7 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Wed, 31 Dec 2014 12:56:29 -0500 Subject: Add debug option --- app/Auth/Base.php | 1 + app/Controller/Base.php | 8 +++++--- app/Controller/Project.php | 2 +- app/ServiceProvider/DatabaseProvider.php | 1 + app/ServiceProvider/LoggingProvider.php | 7 +++++-- app/constants.php | 3 +++ 6 files changed, 16 insertions(+), 6 deletions(-) (limited to 'app') diff --git a/app/Auth/Base.php b/app/Auth/Base.php index 2a3bdce0..e023e4fe 100644 --- a/app/Auth/Base.php +++ b/app/Auth/Base.php @@ -13,6 +13,7 @@ use Pimple\Container; * @property \Model\Acl $acl * @property \Model\LastLogin $lastLogin * @property \Model\User $user + * @property \Model\UserSession $userSession */ abstract class Base { diff --git a/app/Controller/Base.php b/app/Controller/Base.php index 4afcba37..cd807d56 100644 --- a/app/Controller/Base.php +++ b/app/Controller/Base.php @@ -100,9 +100,11 @@ abstract class Base */ public function __destruct() { - // foreach ($this->container['db']->getLogMessages() as $message) { - // $this->container['logger']->addDebug($message); - // } + if (DEBUG) { + foreach ($this->container['db']->getLogMessages() as $message) { + $this->container['logger']->addDebug($message); + } + } } /** diff --git a/app/Controller/Project.php b/app/Controller/Project.php index 6079971a..95779154 100644 --- a/app/Controller/Project.php +++ b/app/Controller/Project.php @@ -574,7 +574,7 @@ class Project extends Base */ public function create(array $values = array(), array $errors = array()) { - $is_private = $this->request->getIntegerParam('private', ! $this->userSession->isAdmin()); + $is_private = $this->request->getIntegerParam('private', $this->userSession->isAdmin() ? 0 : 1); $this->response->html($this->template->layout('project/new', array( 'board_selector' => $this->projectPermission->getAllowedProjects($this->userSession->getId()), diff --git a/app/ServiceProvider/DatabaseProvider.php b/app/ServiceProvider/DatabaseProvider.php index 2ed87ace..632b0238 100644 --- a/app/ServiceProvider/DatabaseProvider.php +++ b/app/ServiceProvider/DatabaseProvider.php @@ -11,6 +11,7 @@ class DatabaseProvider implements ServiceProviderInterface public function register(Container $container) { $container['db'] = $this->getInstance(); + $container['db']->stopwatch = DEBUG; } /** diff --git a/app/ServiceProvider/LoggingProvider.php b/app/ServiceProvider/LoggingProvider.php index 93f55a9c..f5e70381 100644 --- a/app/ServiceProvider/LoggingProvider.php +++ b/app/ServiceProvider/LoggingProvider.php @@ -13,8 +13,11 @@ class LoggingProvider implements ServiceProviderInterface public function register(Container $container) { $logger = new Logger('app'); - $logger->pushHandler(new StreamHandler(__DIR__.'/../../data/debug.log', Logger::DEBUG)); - $logger->pushHandler(new SyslogHandler('kanboard', LOG_USER, Logger::DEBUG)); + $logger->pushHandler(new SyslogHandler('kanboard', LOG_USER, Logger::INFO)); + + if (DEBUG) { + $logger->pushHandler(new StreamHandler(__DIR__.'/../../data/debug.log', Logger::DEBUG)); + } $container['logger'] = $logger; } diff --git a/app/constants.php b/app/constants.php index 08e10d68..a8d8f56e 100644 --- a/app/constants.php +++ b/app/constants.php @@ -1,5 +1,8 @@