diff options
| -rw-r--r-- | app/Auth/Base.php | 34 | ||||
| -rw-r--r-- | app/Auth/Database.php | 1 | ||||
| -rw-r--r-- | app/Auth/Github.php | 3 | ||||
| -rw-r--r-- | app/Auth/Gitlab.php | 1 | ||||
| -rw-r--r-- | app/Auth/Google.php | 1 | ||||
| -rw-r--r-- | app/Auth/Ldap.php | 1 | ||||
| -rw-r--r-- | app/Auth/RememberMe.php | 1 | ||||
| -rw-r--r-- | app/Auth/ReverseProxy.php | 1 | ||||
| -rw-r--r-- | app/Template/auth/index.php | 4 | ||||
| -rw-r--r-- | doc/plugin-hooks.markdown | 2 |
10 files changed, 14 insertions, 35 deletions
diff --git a/app/Auth/Base.php b/app/Auth/Base.php deleted file mode 100644 index a354c200..00000000 --- a/app/Auth/Base.php +++ /dev/null @@ -1,34 +0,0 @@ -<?php - -namespace Kanboard\Auth; - -use Pimple\Container; - -/** - * Base auth class - * - * @package auth - * @author Frederic Guillot - */ -abstract class Base extends \Kanboard\Core\Base -{ - /** - * Database instance - * - * @access protected - * @var \PicoDb\Database - */ - protected $db; - - /** - * Constructor - * - * @access public - * @param \Pimple\Container $container - */ - public function __construct(Container $container) - { - $this->container = $container; - $this->db = $this->container['db']; - } -} diff --git a/app/Auth/Database.php b/app/Auth/Database.php index 36be669e..91b17a5f 100644 --- a/app/Auth/Database.php +++ b/app/Auth/Database.php @@ -2,6 +2,7 @@ namespace Kanboard\Auth; +use Kanboard\Core\Base; use Kanboard\Model\User; use Kanboard\Event\AuthEvent; diff --git a/app/Auth/Github.php b/app/Auth/Github.php index 28478b56..b89dc5b8 100644 --- a/app/Auth/Github.php +++ b/app/Auth/Github.php @@ -2,6 +2,7 @@ namespace Kanboard\Auth; +use Kanboard\Core\Base; use Kanboard\Event\AuthEvent; /** @@ -85,7 +86,7 @@ class Github extends Base * Get OAuth2 configured service * * @access public - * @return KanboardCore\OAuth2 + * @return Kanboard\Core\OAuth2 */ public function getService() { diff --git a/app/Auth/Gitlab.php b/app/Auth/Gitlab.php index 306a474d..8df3a5ec 100644 --- a/app/Auth/Gitlab.php +++ b/app/Auth/Gitlab.php @@ -2,6 +2,7 @@ namespace Kanboard\Auth; +use Kanboard\Core\Base; use Kanboard\Event\AuthEvent; /** diff --git a/app/Auth/Google.php b/app/Auth/Google.php index 76e65fb6..32bcb4b1 100644 --- a/app/Auth/Google.php +++ b/app/Auth/Google.php @@ -2,6 +2,7 @@ namespace Kanboard\Auth; +use Kanboard\Core\Base; use Kanboard\Event\AuthEvent; /** diff --git a/app/Auth/Ldap.php b/app/Auth/Ldap.php index 687762d3..c252be17 100644 --- a/app/Auth/Ldap.php +++ b/app/Auth/Ldap.php @@ -2,6 +2,7 @@ namespace Kanboard\Auth; +use Kanboard\Core\Base; use Kanboard\Event\AuthEvent; /** diff --git a/app/Auth/RememberMe.php b/app/Auth/RememberMe.php index bba2bda6..0290e36c 100644 --- a/app/Auth/RememberMe.php +++ b/app/Auth/RememberMe.php @@ -2,6 +2,7 @@ namespace Kanboard\Auth; +use Kanboard\Core\Base; use Kanboard\Core\Request; use Kanboard\Event\AuthEvent; use Kanboard\Core\Security; diff --git a/app/Auth/ReverseProxy.php b/app/Auth/ReverseProxy.php index 6f998a34..abcdd449 100644 --- a/app/Auth/ReverseProxy.php +++ b/app/Auth/ReverseProxy.php @@ -2,6 +2,7 @@ namespace Kanboard\Auth; +use Kanboard\Core\Base; use Kanboard\Event\AuthEvent; /** diff --git a/app/Template/auth/index.php b/app/Template/auth/index.php index 2ffc53cb..2f75b113 100644 --- a/app/Template/auth/index.php +++ b/app/Template/auth/index.php @@ -1,5 +1,7 @@ <div class="form-login"> + <?= $this->hook->render('template:auth:login-form:before') ?> + <?php if (isset($errors['login'])): ?> <p class="alert alert-error"><?= $this->e($errors['login']) ?></p> <?php endif ?> @@ -31,6 +33,8 @@ </form> <?php endif ?> + <?= $this->hook->render('template:auth:login-form:after') ?> + <?php if (GOOGLE_AUTH || GITHUB_AUTH || GITLAB_AUTH): ?> <ul class="no-bullet"> <?php if (GOOGLE_AUTH): ?> diff --git a/doc/plugin-hooks.markdown b/doc/plugin-hooks.markdown index 95d1a55f..eab2fa15 100644 --- a/doc/plugin-hooks.markdown +++ b/doc/plugin-hooks.markdown @@ -131,6 +131,8 @@ Template name without prefix are core templates. List of template hooks: +- `template:auth:login-form:before` +- `template:auth:login-form:after` - `template:dashboard:sidebar` - `template:config:sidebar` - `template:config:integrations` |