From dee593663bbf5096fb014ae6c2a8e5cc1cf90a45 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 14 Jul 2022 16:19:14 +0800
Subject: [PATCH] * Fix bug #25309.

---
 module/common/lang/de.php    | 1 +
 module/common/lang/en.php    | 1 +
 module/common/lang/fr.php    | 1 +
 module/common/lang/zh-cn.php | 1 +
 module/kanban/lang/de.php    | 2 +-
 module/kanban/lang/en.php    | 2 +-
 module/kanban/lang/fr.php    | 2 +-
 module/kanban/lang/zh-cn.php | 2 +-
 module/kanban/model.php      | 2 +-
 9 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index c040e25ada..e9529dc6f5 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -463,6 +463,7 @@ if(!defined('DT_TIME2'))          define('DT_TIME2',     'H:i');
 if(!defined('LONG_TIME'))         define('LONG_TIME',    '2059-12-31');
 if(!defined('BRANCH_MAIN'))       define('BRANCH_MAIN', '0');
 if(!defined('DEFAULT_CARDCOUNT')) define('DEFAULT_CARDCOUNT', '2');
+if(!defined('MAX_CARDCOUNT'))     define('MAX_CARDCOUNT', '32767');
 
 /* Datepicker. */
 $lang->datepicker = new stdclass();
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 840816c09b..16edf7074d 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -463,6 +463,7 @@ if(!defined('DT_TIME2'))          define('DT_TIME2',     'H:i');
 if(!defined('LONG_TIME'))         define('LONG_TIME',    '2059-12-31');
 if(!defined('BRANCH_MAIN'))       define('BRANCH_MAIN', '0');
 if(!defined('DEFAULT_CARDCOUNT')) define('DEFAULT_CARDCOUNT', '2');
+if(!defined('MAX_CARDCOUNT'))     define('MAX_CARDCOUNT', '32767');
 
 /* Datepicker. */
 $lang->datepicker = new stdclass();
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index e237242a94..d6aad09697 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -463,6 +463,7 @@ if(!defined('DT_TIME2'))          define('DT_TIME2',     'H:i');
 if(!defined('LONG_TIME'))         define('LONG_TIME',    '2059-12-31');
 if(!defined('BRANCH_MAIN'))       define('BRANCH_MAIN', '0');
 if(!defined('DEFAULT_CARDCOUNT')) define('DEFAULT_CARDCOUNT', '2');
+if(!defined('MAX_CARDCOUNT'))     define('MAX_CARDCOUNT', '32767');
 
 /* Datepicker. */
 $lang->datepicker = new stdclass();
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 336f1c7a4d..c63345b39f 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -463,6 +463,7 @@ if(!defined('DT_TIME2'))          define('DT_TIME2', 'H:i');
 if(!defined('LONG_TIME'))         define('LONG_TIME', '2059-12-31');
 if(!defined('BRANCH_MAIN'))       define('BRANCH_MAIN', '0');
 if(!defined('DEFAULT_CARDCOUNT')) define('DEFAULT_CARDCOUNT', '2');
+if(!defined('MAX_CARDCOUNT'))     define('MAX_CARDCOUNT', '32767');
 
 /* datepicker 时间*/
 $lang->datepicker = new stdclass();
diff --git a/module/kanban/lang/de.php b/module/kanban/lang/de.php
index 92e5fd43a2..dc67489d85 100644
--- a/module/kanban/lang/de.php
+++ b/module/kanban/lang/de.php
@@ -349,7 +349,7 @@ $lang->kanbancolumn->fluidBoardList['0'] = 'Fixed';
 $lang->kanbancolumn->fluidBoardList['1'] = 'Auto Width';
 
 $lang->kanbanlane->error = new stdclass();
-$lang->kanbanlane->error->mustBeInt = 'The number of cards must be a positive integer greater than 2.';
+$lang->kanbanlane->error->mustBeInt = 'No. of cards must be a positive integer from 2 to 32767.';
 
 $lang->kanbanregion = new stdclass();
 $lang->kanbanregion->name    = 'Region Name';
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index d15765ab9a..9b0ad966be 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -349,7 +349,7 @@ $lang->kanbancolumn->fluidBoardList['0'] = 'Fixed';
 $lang->kanbancolumn->fluidBoardList['1'] = 'Auto Width';
 
 $lang->kanbanlane->error = new stdclass();
-$lang->kanbanlane->error->mustBeInt = 'The number of cards must be a positive integer greater than 2.';
+$lang->kanbanlane->error->mustBeInt = 'No. of cards must be a positive integer from 2 to 32767.';
 
 $lang->kanbanregion = new stdclass();
 $lang->kanbanregion->name    = 'Region Name';
diff --git a/module/kanban/lang/fr.php b/module/kanban/lang/fr.php
index 2dcbd7bf73..a83c57cb42 100644
--- a/module/kanban/lang/fr.php
+++ b/module/kanban/lang/fr.php
@@ -349,7 +349,7 @@ $lang->kanbancolumn->fluidBoardList['0'] = 'Fixed';
 $lang->kanbancolumn->fluidBoardList['1'] = 'Auto Width';
 
 $lang->kanbanlane->error = new stdclass();
-$lang->kanbanlane->error->mustBeInt = 'The number of cards must be a positive integer greater than 2.';
+$lang->kanbanlane->error->mustBeInt = 'Nb de cartes doit être un entier positif compris entre 2 et 32767.';
 
 $lang->kanbanregion = new stdclass();
 $lang->kanbanregion->name    = 'Region Name';
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index 5abd09484a..b08ed63849 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -349,7 +349,7 @@ $lang->kanbancolumn->fluidBoardList['0'] = '固定列宽';
 $lang->kanbancolumn->fluidBoardList['1'] = '自适应列宽';
 
 $lang->kanbanlane->error = new stdclass();
-$lang->kanbanlane->error->mustBeInt = '卡片数量必须是大于2的正整数。';
+$lang->kanbanlane->error->mustBeInt = '卡片数量必须是 2~32767 的正整数。';
 
 $lang->kanbanregion = new stdclass();
 $lang->kanbanregion->name    = '区域名称';
diff --git a/module/kanban/model.php b/module/kanban/model.php
index ac59a711bc..08ed5d539f 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -3960,7 +3960,7 @@ class kanbanModel extends model
      */
     public function checkDisplayCards($count)
     {
-        if(!preg_match("/^-?\d+$/", $count) or $count <= DEFAULT_CARDCOUNT) dao::$errors['displayCards'] = $this->lang->kanbanlane->error->mustBeInt;
+        if(!preg_match("/^-?\d+$/", $count) or $count <= DEFAULT_CARDCOUNT or $count > MAX_CARDCOUNT) dao::$errors['displayCards'] = $this->lang->kanbanlane->error->mustBeInt;
         return !dao::isError();
     }
 }