diff --git a/core/module/config/config.php b/core/module/config/config.php index 825ce311..ae157936 100644 --- a/core/module/config/config.php +++ b/core/module/config/config.php @@ -443,45 +443,43 @@ class config extends common { 'cookieConsent' => $this->getInput('configCookieConsent', helper::FILTER_BOOLEAN), 'autoUpdate' => $this->getInput('configAutoUpdate', helper::FILTER_BOOLEAN), 'autoUpdateHtaccess' => $this->getInput('configAutoUpdateHtaccess', helper::FILTER_BOOLEAN), - 'autoBackup' => $this->getInput('configAutoBackup', helper::FILTER_BOOLEAN), 'maintenance' => $this->getInput('configMaintenance', helper::FILTER_BOOLEAN), - 'proxyType' => $this->getInput('configProxyType'), 'proxyUrl' => $this->getInput('configProxyUrl'), 'proxyPort' => $this->getInput('configProxyPort',helper::FILTER_INT), 'social' => [ - 'facebookId' => $this->getInput('configSocialFacebookId'), - 'linkedinId' => $this->getInput('configSocialLinkedinId'), - 'instagramId' => $this->getInput('configSocialInstagramId'), - 'pinterestId' => $this->getInput('configSocialPinterestId'), - 'twitterId' => $this->getInput('configSocialTwitterId'), - 'youtubeId' => $this->getInput('configSocialYoutubeId'), - 'youtubeUserId' => $this->getInput('configSocialYoutubeUserId'), - 'githubId' => $this->getInput('configSocialGithubId') + 'facebookId' => $this->getInput('socialFacebookId'), + 'linkedinId' => $this->getInput('socialLinkedinId'), + 'instagramId' => $this->getInput('socialInstagramId'), + 'pinterestId' => $this->getInput('socialPinterestId'), + 'twitterId' => $this->getInput('socialTwitterId'), + 'youtubeId' => $this->getInput('socialYoutubeId'), + 'youtubeUserId' => $this->getInput('socialYoutubeUserId'), + 'githubId' => $this->getInput('socialGithubId') ], 'smtp' => [ - 'enable' => $this->getInput('configSmtpEnable',helper::FILTER_BOOLEAN), - 'host' => $this->getInput('configSmtpHost',helper::FILTER_STRING_SHORT), - 'port' => $this->getInput('configSmtpPort',helper::FILTER_INT), - 'auth' => $this->getInput('configSmtpAuth',helper::FILTER_BOOLEAN), - 'secure' => $this->getInput('configSmtpSecure'), - 'username' => $this->getInput('configSmtpUsername',helper::FILTER_STRING_SHORT), - 'password' =>helper::encrypt($this->getData(['config','smtp','username']),$this->getInput('configSmtpPassword')), - 'sender' => $this->getInput('configSmtpSender',helper::FILTER_MAIL) + 'enable' => $this->getInput('smtpEnable',helper::FILTER_BOOLEAN), + 'host' => $this->getInput('smtpHost',helper::FILTER_STRING_SHORT), + 'port' => $this->getInput('smtpPort',helper::FILTER_INT), + 'auth' => $this->getInput('smtpAuth',helper::FILTER_BOOLEAN), + 'secure' => $this->getInput('smtpSecure'), + 'username' => $this->getInput('smtpUsername',helper::FILTER_STRING_SHORT), + 'password' =>helper::encrypt($this->getData(['config','smtp','username']),$this->getInput('smtpPassword')), + 'sender' => $this->getInput('smtpSender',helper::FILTER_MAIL) ], 'seo' => [ - 'robots' => $this->getInput('SeoRobots',helper::FILTER_BOOLEAN), - 'analyticsId' => $this->getInput('SeoAnalyticsId') + 'robots' => $this->getInput('seoRobots',helper::FILTER_BOOLEAN), + 'analyticsId' => $this->getInput('seoAnalyticsId') ], - 'safety' => [ - 'attempt' => $this->getInput('configConnectAttempt',helper::FILTER_INT), - 'timeout' => $this->getInput('configConnectTimeout',helper::FILTER_INT), - 'log' => $this->getInput('configConnectLog',helper::FILTER_BOOLEAN), - 'anonymousIp' => $this->getInput('configConnectAnonymousIp',helper::FILTER_INT), - 'captcha' => $this->getInput('configConnectCaptcha',helper::FILTER_BOOLEAN), - 'captchaStrong' => $this->getInput('configConnectCaptchaStrong',helper::FILTER_BOOLEAN), - 'autoDisconnect' => $this->getInput('configConnectAutoDisconnect',helper::FILTER_BOOLEAN), + 'connect' => [ + 'attempt' => $this->getInput('connectAttempt',helper::FILTER_INT), + 'timeout' => $this->getInput('connectTimeout',helper::FILTER_INT), + 'log' => $this->getInput('connectLog',helper::FILTER_BOOLEAN), + 'anonymousIp' => $this->getInput('connectAnonymousIp',helper::FILTER_INT), + 'captcha' => $this->getInput('connectCaptcha',helper::FILTER_BOOLEAN), + 'captchaStrong' => $this->getInput('connectCaptchaStrong',helper::FILTER_BOOLEAN), + 'autoDisconnect' => $this->getInput('connectAutoDisconnect',helper::FILTER_BOOLEAN), ], 'i18n' => [ 'enable' => $this->getData(['config', 'i18n', 'enable']) diff --git a/core/module/config/view/index/index.js.php b/core/module/config/view/index/index.js.php index 52cf0bf0..8b1792f9 100644 --- a/core/module/config/view/index/index.js.php +++ b/core/module/config/view/index/index.js.php @@ -68,21 +68,21 @@ $( document).ready(function() { * Options de blocage de connexions * Contrôle la cohérence des sélections et interdit une seule valeur Aucune */ - $("select[name=configConnectAttempt]").on("change", function() { - if ($("select[name=configConnectAttempt]").val() === "999") { - $("select[name=configConnectTimeout]").val(0); + $("select[name=connectAttempt]").on("change", function() { + if ($("select[name=connectAttempt]").val() === "999") { + $("select[name=connectTimeout]").val(0); } else { - if ($("select[name=configConnectTimeout]").val() === "0") { - $("select[name=configConnectTimeout]").val(300); + if ($("select[name=connectTimeout]").val() === "0") { + $("select[name=connectTimeout]").val(300); } } }); - $("select[name=configConnectTimeout]").on("change", function() { - if ($("select[name=configConnectTimeout]").val() === "0") { - $("select[name=configConnectAttempt]").val(999); + $("select[name=connectTimeout]").on("change", function() { + if ($("select[name=connectTimeout]").val() === "0") { + $("select[name=connectAttempt]").val(999); } else { - if ($("select[name=configConnectAttempt]").val() === "999") { - $("select[name=configConnectAttempt]").val(3); + if ($("select[name=connectAttempt]").val() === "999") { + $("select[name=connectAttempt]").val(3); } } }); @@ -90,15 +90,15 @@ $( document).ready(function() { /** * Captcha strong si captcha sélectionné */ - $("input[name=configConnectCaptcha]").on("change", function() { + $("input[name=connectCaptcha]").on("change", function() { - if ($("input[name=configConnectCaptcha]").is(':checked')) { - $("#configConnectCaptchaStrongWrapper").addClass("disabled"); - $("#configConnectCaptchaStrongWrapper").slideDown(); - $( "#configConnectCaptchaStrong" ).prop( "checked", false ); + if ($("input[name=connectCaptcha]").is(':checked')) { + $("#connectCaptchaStrongWrapper").addClass("disabled"); + $("#connectCaptchaStrongWrapper").slideDown(); + $( "#connectCaptchaStrong" ).prop( "checked", false ); } else { - $("#configConnectCaptchaStrongWrapper").removeClass("disabled"); - $("#configConnectCaptchaStrongWrapper").slideUp(); + $("#connectCaptchaStrongWrapper").removeClass("disabled"); + $("#connectCaptchaStrongWrapper").slideUp(); } }); diff --git a/core/module/config/view/network/network.php b/core/module/config/view/network/network.php index 2c9f4ece..bfabba9f 100644 --- a/core/module/config/view/network/network.php +++ b/core/module/config/view/network/network.php @@ -5,20 +5,20 @@

Réseau

- 'Type de proxy', 'selected' => $this->getData(['config', 'proxyType']) ]); ?>
- 'Adresse du proxy', 'placeholder' => 'cache.proxy.fr', 'value' => $this->getData(['config', 'proxyUrl']) ]); ?>
- 'Port du proxy', 'placeholder' => '6060', 'value' => $this->getData(['config', 'proxyPort']) @@ -34,52 +34,52 @@

SMTP

- $this->getData(['config', 'smtp','enable']), 'help' => 'Paramètres à utiliser lorsque votre hébergeur ne propose pas la fonctionnalité d\'envoi de mail.' ]); ?>
-
+
- 'Adresse SMTP', 'placeholder' => 'smtp.fr', 'value' => $this->getData(['config', 'smtp','host']) ]); ?>
- 'Port SMTP', 'placeholder' => '589', 'value' => $this->getData(['config', 'smtp','port']) ]); ?>
- 'Authentification', 'selected' => $this->getData(['config', 'smtp','auth']) ]); ?>
-
+
- 'Nom utilisateur', 'value' => $this->getData(['config', 'smtp','username' ]) ]); ?>
- 'Mot de passe', 'autocomplete' => 'off', 'value' => $this->getData(['config', 'smtp','username' ]) ? helper::decrypt ($this->getData(['config', 'smtp','username' ]),$this->getData(['config','smtp','password'])) : '' ]); ?>
- 'Sécurité', 'selected' => $this->getData(['config', 'smtp','secure']) ]); ?> diff --git a/core/module/config/view/social/social.php b/core/module/config/view/social/social.php index 84c6ae2a..9f46a5d1 100644 --- a/core/module/config/view/social/social.php +++ b/core/module/config/view/social/social.php @@ -7,7 +7,7 @@
- helper::baseUrl() . 'config/configMetaImage', 'value' => 'Générer une capture Open Graph' ]); ?> @@ -15,7 +15,7 @@
- helper::baseUrl() . 'config/generateFiles', 'value' => 'Générer sitemap.xml et robots.txt' ]); ?> @@ -23,7 +23,7 @@
- $this->getData(['config', 'seo','robots']) ]); ?>
@@ -48,28 +48,28 @@

Réseaux sociaux

- 'Saisissez votre ID : https://www.facebook.com/[ID].', 'label' => 'Facebook', 'value' => $this->getData(['config', 'social', 'facebookId']) ]); ?>
- 'Saisissez votre ID : https://www.instagram.com/[ID].', 'label' => 'Instagram', 'value' => $this->getData(['config', 'social', 'instagramId']) ]); ?>
- 'ID de la chaîne : https://www.youtube.com/channel/[ID].', 'label' => 'Chaîne Youtube', 'value' => $this->getData(['config', 'social', 'youtubeId']) ]); ?>
- 'Saisissez votre ID Utilisateur : https://www.youtube.com/user/[ID].', 'label' => 'Youtube', 'value' => $this->getData(['config', 'social', 'youtubeUserId']) @@ -78,28 +78,28 @@
- 'Saisissez votre ID : https://twitter.com/[ID].', 'label' => 'Twitter', 'value' => $this->getData(['config', 'social', 'twitterId']) ]); ?>
- 'Saisissez votre ID : https://pinterest.com/[ID].', 'label' => 'Pinterest', 'value' => $this->getData(['config', 'social', 'pinterestId']) ]); ?>
- 'Saisissez votre ID Linkedin : https://fr.linkedin.com/in/[ID].', 'label' => 'Linkedin', 'value' => $this->getData(['config', 'social', 'linkedinId']) ]); ?>
- 'Saisissez votre ID Github : https://github.com/[ID].', 'label' => 'Github', 'value' => $this->getData(['config', 'social', 'githubId']) @@ -115,7 +115,7 @@

Scripts externes

- 'Saisissez l\'ID de suivi.', 'label' => 'Google Analytics', 'placeholder' => 'UA-XXXXXXXX-X', @@ -123,14 +123,14 @@ ]); ?>
- helper::baseUrl() . 'config/script/head', 'value' => 'Script dans head', 'ico' => 'pencil' ]); ?>
- helper::baseUrl() . 'config/script/body', 'value' => 'Script dans body', 'ico' => 'pencil'