5 files changed, 9 insertions, 8 deletions
diff --git a/app/Model/Action.php b/app/Model/Action.php
index ba74218f..dbf17e49 100644
--- a/app/Model/Action.php
+++ b/app/Model/Action.php
@@ -73,6 +73,7 @@ class Action extends Base
             'TaskAssignColorUser' => t('Assign a color to a specific user'),
             'TaskAssignColorCategory' => t('Assign automatically a color based on a category'),
             'TaskAssignCategoryColor' => t('Assign automatically a category based on a color'),
+            'TaskAssignCategoryLink' => t('Assign automatically a category based on a link'),
             'CommentCreation' => t('Create a comment from an external provider'),
             'TaskCreation' => t('Create a task from an external provider'),
             'TaskLogMoveAnotherColumn' => t('Add a comment log when moving the task between columns'),
diff --git a/app/Model/Authentication.php b/app/Model/Authentication.php
index 580c1e14..11e32313 100644
--- a/app/Model/Authentication.php
+++ b/app/Model/Authentication.php
@@ -2,7 +2,7 @@
 
 namespace Kanboard\Model;
 
-use Kanboard\Core\Request;
+use Kanboard\Core\Http\Request;
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
 use Gregwar\Captcha\CaptchaBuilder;
diff --git a/app/Model/Config.php b/app/Model/Config.php
index cf634f80..84a968e3 100644
--- a/app/Model/Config.php
+++ b/app/Model/Config.php
@@ -3,7 +3,7 @@
 namespace Kanboard\Model;
 
 use Kanboard\Core\Translator;
-use Kanboard\Core\Security;
+use Kanboard\Core\Security\Token;
 use Kanboard\Core\Session;
 
 /**
@@ -108,7 +108,7 @@ class Config extends Setting
     public function getJsLanguageCode()
     {
         $languages = array(
-            'cs_CZ' => 'cz',
+            'cs_CZ' => 'cs',
             'da_DK' => 'da',
             'de_DE' => 'de',
             'en_US' => 'en',
@@ -265,7 +265,7 @@ class Config extends Setting
      */
     public function regenerateToken($option)
     {
-        $this->save(array($option => Security::generateToken()));
+        $this->save(array($option => Token::getToken()));
     }
 
     /**
diff --git a/app/Model/Project.php b/app/Model/Project.php
index b767af26..9e30a9b8 100644
--- a/app/Model/Project.php
+++ b/app/Model/Project.php
@@ -4,7 +4,7 @@ namespace Kanboard\Model;
 
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
-use Kanboard\Core\Security;
+use Kanboard\Core\Security\Token;
 
 /**
  * Project model
@@ -491,7 +491,7 @@ class Project extends Base
                $this->db
                     ->table(self::TABLE)
                     ->eq('id', $project_id)
-                    ->save(array('is_public' => 1, 'token' => Security::generateToken()));
+                    ->save(array('is_public' => 1, 'token' => Token::getToken()));
     }
 
     /**
diff --git a/app/Model/User.php b/app/Model/User.php
index 6e7e94e0..dc00c0c5 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -6,7 +6,7 @@ use PicoDb\Database;
 use SimpleValidator\Validator;
 use SimpleValidator\Validators;
 use Kanboard\Core\Session;
-use Kanboard\Core\Security;
+use Kanboard\Core\Security\Token;
 
 /**
  * User model
@@ -383,7 +383,7 @@ class User extends Base
         return $this->db
                     ->table(self::TABLE)
                     ->eq('id', $user_id)
-                    ->save(array('token' => Security::generateToken()));
+                    ->save(array('token' => Token::getToken()));
     }
 
     /**