diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Action/Base.php | 2 | ||||
| -rw-r--r-- | app/Auth/Base.php | 2 | ||||
| -rw-r--r-- | app/Auth/Ldap.php | 2 | ||||
| -rw-r--r-- | app/Controller/App.php | 4 | ||||
| -rw-r--r-- | app/Controller/Base.php | 10 | ||||
| -rw-r--r-- | app/Core/Router.php | 8 | ||||
| -rw-r--r-- | app/Event/Base.php | 2 | ||||
| -rw-r--r-- | app/Model/Base.php | 2 |
8 files changed, 16 insertions, 16 deletions
diff --git a/app/Action/Base.php b/app/Action/Base.php index acb82fc9..a2b07e3f 100644 --- a/app/Action/Base.php +++ b/app/Action/Base.php @@ -51,7 +51,7 @@ abstract class Base implements Listener * Container instance * * @access protected - * @var Pimple\Container + * @var \Pimple\Container */ protected $container; diff --git a/app/Auth/Base.php b/app/Auth/Base.php index 3abd47f2..9633af4f 100644 --- a/app/Auth/Base.php +++ b/app/Auth/Base.php @@ -29,7 +29,7 @@ abstract class Base * Container instance * * @access protected - * @var Pimple\Container + * @var \Pimple\Container */ protected $container; diff --git a/app/Auth/Ldap.php b/app/Auth/Ldap.php index 4f20998f..5bb60275 100644 --- a/app/Auth/Ldap.php +++ b/app/Auth/Ldap.php @@ -104,7 +104,7 @@ class Ldap extends Base { $ldap = $this->connect(); - if ($this->bind($ldap, $username, $password)) { + if (is_resource($ldap) && $this->bind($ldap, $username, $password)) { return $this->search($ldap, $username, $password); } diff --git a/app/Controller/App.php b/app/Controller/App.php index 56124da2..9ac9d012 100644 --- a/app/Controller/App.php +++ b/app/Controller/App.php @@ -3,7 +3,7 @@ namespace Controller; use Model\Project as ProjectModel; -use Model\SubTask; +use Model\SubTask as SubTaskModel; use Helper; /** @@ -87,7 +87,7 @@ class App extends Base */ private function getSubtaskPagination($user_id, $paginate, $offset, $order, $direction) { - $status = array(SubTask::STATUS_TODO, SubTask::STATUS_INPROGRESS); + $status = array(SubTaskModel::STATUS_TODO, SubTaskModel::STATUS_INPROGRESS); $limit = 10; if (! in_array($order, array('tasks.id', 'project_name', 'status', 'title'))) { diff --git a/app/Controller/Base.php b/app/Controller/Base.php index 4609670f..d3d8eec8 100644 --- a/app/Controller/Base.php +++ b/app/Controller/Base.php @@ -55,7 +55,7 @@ abstract class Base * Request instance * * @accesss protected - * @var Core\Request + * @var \Core\Request */ protected $request; @@ -63,7 +63,7 @@ abstract class Base * Response instance * * @accesss protected - * @var Core\Response + * @var \Core\Response */ protected $response; @@ -71,7 +71,7 @@ abstract class Base * Template instance * * @accesss protected - * @var Core\Template + * @var \Core\Template */ protected $template; @@ -79,7 +79,7 @@ abstract class Base * Session instance * * @accesss public - * @var Core\Session + * @var \Core\Session */ protected $session; @@ -87,7 +87,7 @@ abstract class Base * Container instance * * @access private - * @var Pimple\Container + * @var \Pimple\Container */ private $container; diff --git a/app/Core/Router.php b/app/Core/Router.php index e01c16f6..36c11a0a 100644 --- a/app/Core/Router.php +++ b/app/Core/Router.php @@ -32,7 +32,7 @@ class Router * Container instance * * @access private - * @var Pimple\Container + * @var \Pimple\Container */ private $container; @@ -40,9 +40,9 @@ class Router * Constructor * * @access public - * @param Pimple\Container $container Container instance - * @param string $controller Controller name - * @param string $action Action name + * @param \Pimple\Container $container Container instance + * @param string $controller Controller name + * @param string $action Action name */ public function __construct(Container $container, $controller = '', $action = '') { diff --git a/app/Event/Base.php b/app/Event/Base.php index 2ca1ada0..0217fa08 100644 --- a/app/Event/Base.php +++ b/app/Event/Base.php @@ -25,7 +25,7 @@ abstract class Base implements Listener * Container instance * * @access protected - * @var Pimple\Container + * @var \Pimple\Container */ protected $container; diff --git a/app/Model/Base.php b/app/Model/Base.php index 21353b73..56a4d8e8 100644 --- a/app/Model/Base.php +++ b/app/Model/Base.php @@ -63,7 +63,7 @@ abstract class Base * Container instance * * @access protected - * @var Pimple\Container + * @var \Pimple\Container */ protected $container; |