diff --git a/CHANGES.md b/CHANGES.md
index 786ccdfd..00b6e6ed 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,10 +15,10 @@
## version 10.3.03
- Correction :
- - Doublons de lignes.
+ - Localisation, affichage des accents, LC_TIME devient LC_ALL
- Modifications :
- Configuration des captcha. Addition simple chiffres de 0 à 9.
- - Une icône remplace le terme Connexion dans le menu et dans le pied de page.
+ - Une icône remplace Connexion dans le menu et dans le pied de page.
## version 10.3.02
- Corrections :
diff --git a/core/class/template.class.php b/core/class/template.class.php
index d8f8f6d8..e7b9551f 100644
--- a/core/class/template.class.php
+++ b/core/class/template.class.php
@@ -52,7 +52,7 @@ class template {
// Génère deux nombres pour le captcha
$numbers = array(0,1,2,3,4,5,6,7,8,9,10,12,13,14,15,16,17,18,19,20);
$letters = array('u','t','s','r','q','p','o','n','m','l','k','j','i','h','g','f','e','d','c','b','a');
- $limit = $attributes['limit'] ? 9 : count($letters)-1 ;
+ $limit = $attributes['limit'] ? count($letters)-1 : 10 ;
$firstNumber = rand ( 0 , $limit );
$secondNumber = rand ( 0 , $limit );
$result = $firstNumber + $secondNumber;
diff --git a/core/core.php b/core/core.php
index b4416740..c1b5b6a4 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1441,7 +1441,7 @@ class common {
// Version 10.3.03
if ($this->getData(['core', 'dataVersion']) < 10303) {
// Activation par défaut du captcha à la connexion
- $this->setData(['config', 'connect','captcha10', false]);
+ $this->setData(['config', 'captchaStrong', false]);
$this->setData(['core', 'dataVersion', 10303]);
}
}
diff --git a/core/module/config/config.php b/core/module/config/config.php
index b97d1481..13e474b5 100644
--- a/core/module/config/config.php
+++ b/core/module/config/config.php
@@ -470,6 +470,7 @@ class config extends common {
'proxyType' => $this->getInput('configProxyType'),
'proxyUrl' => $this->getInput('configProxyUrl'),
'proxyPort' => $this->getInput('configProxyPort',helper::FILTER_INT),
+ 'captchaStrong' => $this->getInput('configCaptchaStrong',helper::FILTER_BOOLEAN),
'smtp' => [
'enable' => $this->getInput('configSmtpEnable',helper::FILTER_BOOLEAN),
'host' => $this->getInput('configSmtpHost',helper::FILTER_STRING_SHORT),
@@ -485,7 +486,6 @@ class config extends common {
'timeout' => $this->getInput('configConnectTimeout',helper::FILTER_INT),
'log' => $this->getInput('configConnectLog',helper::FILTER_BOOLEAN),
'captcha' => $this->getInput('configConnectCaptcha',helper::FILTER_BOOLEAN),
- 'captcha10' => $this->getInput('configConnectCaptcha10',helper::FILTER_BOOLEAN)
]
]
]);
diff --git a/core/module/config/view/index/index.php b/core/module/config/view/index/index.php
index 007b3d85..5d16c250 100644
--- a/core/module/config/view/index/index.php
+++ b/core/module/config/view/index/index.php
@@ -100,9 +100,9 @@
]); ?>
- $this->getData(['config', 'connect','captcha10']),
- 'help' => 'Addition limitée aux chiffres de 0 à 9. S\'applique à tous les captchas du site.'
+ $this->getData(['config', 'captchaStrong']),
+ 'help' => 'Addition de nombres de 0 à 20.'
]); ?>
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index 03ff078d..f4e07063 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -16,6 +16,7 @@ class init extends common {
'legalPageId' => 'mentions-legales',
'searchPageId' => 'recherche',
'maintenance' => false,
+ 'captchaStrong' => false,
'social' => [
'facebookId' => 'facebook',
'instagramId' => '',
diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php
index d8fac7af..dc40e90c 100644
--- a/core/module/theme/view/menu/menu.php
+++ b/core/module/theme/view/menu/menu.php
@@ -170,8 +170,7 @@
$this->getData(['theme', 'menu', 'loginLink']),
- 'help' => 'L\'activation de cette option n\'est pas recommandée'
+ 'checked' => $this->getData(['theme', 'menu', 'loginLink'])
]); ?>
diff --git a/core/module/user/user.php b/core/module/user/user.php
index 0f9eeb3d..c4025d4f 100644
--- a/core/module/user/user.php
+++ b/core/module/user/user.php
@@ -594,7 +594,17 @@ class user extends common {
AND array_key_exists('prenom',$item)
AND array_key_exists('nom',$item)
AND array_key_exists('groupe',$item)
- AND array_key_exists('email',$item) ) {
+ AND array_key_exists('email',$item)
+ AND $item['nom']
+ AND $item['prenom']
+ AND $item['id']
+ AND $item['email']
+ AND $item['groupe']
+ ) {
+ // Validation du groupe
+ $item['groupe'] = (int) $item['groupe'];
+ $item['groupe'] = ( $item['groupe'] >= self::GROUP_BANNED AND $item['groupe'] <= self::GROUP_ADMIN )
+ ? $item['groupe'] : 1;
// L'utilisateur existe
if ( $this->getData(['user',helper::filter($item['id'] , helper::FILTER_ID)]))
{
@@ -620,7 +630,7 @@ class user extends common {
$userId, [
'firstname' => $item['prenom'],
'forgot' => 0,
- 'group' => (int) $item['groupe'],
+ 'group' => $item['groupe'] ,
'lastname' => $item['nom'],
'mail' => $item['email'],
'pseudo' => $item['prenom'],
diff --git a/core/module/user/view/import/import.php b/core/module/user/view/import/import.php
index 7364775b..051aabba 100644
--- a/core/module/user/view/import/import.php
+++ b/core/module/user/view/import/import.php
@@ -56,7 +56,7 @@
- Compte créé | Compte créé et notifié | Erreur
+ Compte créé | Compte créé et notifié | ou manquant : erreur, compte non importé
\ No newline at end of file
diff --git a/core/module/user/view/login/login.php b/core/module/user/view/login/login.php
index a7219ce6..43b59702 100644
--- a/core/module/user/view/login/login.php
+++ b/core/module/user/view/login/login.php
@@ -16,7 +16,7 @@
$this->getData(['config','connect','captcha10'])
+ 'limit' => $this->getData(['config','captchaStrong'])
]); ?>
diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php
index 51c6ec80..9f60ac47 100644
--- a/module/blog/view/article/article.php
+++ b/module/blog/view/article/article.php
@@ -98,7 +98,7 @@
$this->getData(['config','connect','captcha10'])
+ 'limit' => $this->getData(['config','captchaStrong'])
]); ?>
diff --git a/module/form/view/index/index.php b/module/form/view/index/index.php
index 02b082e2..1a10764c 100644
--- a/module/form/view/index/index.php
+++ b/module/form/view/index/index.php
@@ -47,7 +47,7 @@
$this->getData(['config','connect','captcha10'])
+ 'limit' => $this->getData(['config','captchaStrong'])
]); ?>