ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

Virer advanced et unifier la fonction index

This commit is contained in:
Fred Tempez 2021-10-30 12:48:29 +02:00
parent 716495c9e2
commit 650d57b7cb
8 changed files with 170 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

269
core/module/config/config.php
View File

@ -22,10 +22,6 @@ class config extends common {
'configMetaImage' => self::GROUP_ADMIN, 'configMetaImage' => self::GROUP_ADMIN,
'generateFiles' => self::GROUP_ADMIN, 'generateFiles' => self::GROUP_ADMIN,
'index' => self::GROUP_ADMIN, 'index' => self::GROUP_ADMIN,
'locale' => self::GROUP_ADMIN,
'social' => self::GROUP_ADMIN,
'safety' => self::GROUP_ADMIN,
'network' => self::GROUP_ADMIN,
'restore' => self::GROUP_ADMIN, 'restore' => self::GROUP_ADMIN,
'updateBaseUrl' => self::GROUP_ADMIN, 'updateBaseUrl' => self::GROUP_ADMIN,
'script' => self::GROUP_ADMIN, 'script' => self::GROUP_ADMIN,
@ -388,35 +384,110 @@ class config extends common {
]); ]);
} }
/** *
* Configuration de base /**
* Configuration
*/ */
public function index() { public function index() {
// Soumission du formulaire // Soumission du formulaire
if($this->isPost()) { if($this->isPost()) {
// Basculement en mise à jour auto
// Remise à 0 du compteur // Basculement en mise à jour auto, remise à 0 du compteur
if ($this->getData(['config','autoUpdate']) === false && if ($this->getData(['config','autoUpdate']) === false &&
$this->getInput('configAdvancedAutoUpdate', helper::FILTER_BOOLEAN) === true) { $this->getInput('configAutoUpdate', helper::FILTER_BOOLEAN) === true) {
$this->setData(['core','lastAutoUpdate',0]); $this->setData(['core','lastAutoUpdate',0]);
} }
// Eviter déconnexion automatique après son activation // Eviter déconnexion automatique après son activation
if ( $this->getData(['config','autoDisconnect']) === false if ( $this->getData(['config','autoDisconnect']) === false
AND $this->getInput('configAdvancedAutoDisconnect',helper::FILTER_BOOLEAN) === true ) { AND $this->getInput('configAutoDisconnect',helper::FILTER_BOOLEAN) === true ) {
$this->setData(['user',$this->getuser('id'),'accessCsrf',$_SESSION['csrf']]); $this->setData(['user',$this->getuser('id'),'accessCsrf',$_SESSION['csrf']]);
} }
// Sauvegarder // Répercuter la suppression de la page dans la configuration du footer
$this->setData(['config', 'autoBackup', $this->getInput('configAdvancedAutoBackup', helper::FILTER_BOOLEAN)]); if ( $this->getData(['theme','footer','displaySearch']) === true
$this->setData(['config', 'maintenance', $this->getInput('configAdvancedMaintenance', helper::FILTER_BOOLEAN)]); AND $this->getInput('configSearchPageId') === 'none'
$this->setData(['config', 'cookieConsent', $this->getInput('configAdvancedCookieConsent', helper::FILTER_BOOLEAN)]); ){
$this->setData(['config', 'favicon', $this->getInput('configAdvancedFavicon')]); $this->setData(['theme', 'footer', 'displaySearch', false]);
$this->setData(['config', 'faviconDark', $this->getInput('configAdvancedFaviconDark')]); }
$this->setData(['config', 'timezone', $this->getInput('configAdvancedTimezone', helper::FILTER_STRING_SHORT, true)]); if ( $this->getData(['theme','footer','displayLegal']) === true
$this->setData(['config', 'autoUpdate', $this->getInput('configAdvancedAutoUpdate', helper::FILTER_BOOLEAN)]); AND $this->getInput('configLegalPageId') === 'none'
$this->setData(['config', 'autoUpdateHtaccess', $this->getInput('configAdvancedAutoUpdateHtaccess', helper::FILTER_BOOLEAN)]); ){
$this->setData(['theme', 'footer', 'displayLegal', false]);
}
// Sauvegarder les locales
$this->setData([
'locale',
[
'homePageId' => $this->getInput('configHomePageId', helper::FILTER_ID, true),
'page404' => $this->getInput('configPage404'),
'page403' => $this->getInput('configPage403'),
'page302' => $this->getInput('configPage302'),
'legalPageId' => $this->getInput('configLegalPageId'),
'searchPageId' => $this->getInput('configSearchPageId'),
'searchPageLabel' => empty($this->getInput('configSearchPageLabel', helper::FILTER_STRING_SHORT)) ? 'Rechercher' : $this->getInput('configSearchPageLabel', helper::FILTER_STRING_SHORT),
'legalPageLabel' => empty($this->getInput('configLegalPageLabel', helper::FILTER_STRING_SHORT)) ? 'Mentions légales' : $this->getInput('configLegalPageLabel', helper::FILTER_STRING_SHORT),
'sitemapPageLabel' => empty($this->getInput('configSitemapPageLabel', helper::FILTER_STRING_SHORT)) ? 'Plan du site' : $this->getInput('configSitemapPageLabel', helper::FILTER_STRING_SHORT),
'metaDescription' => $this->getInput('configMetaDescription', helper::FILTER_STRING_LONG, true),
'title' => $this->getInput('configTitle', helper::FILTER_STRING_SHORT, true)
]
]);
// Sauvegarder la configuration
$this->setData([
'config',
[
'analyticsId' => $this->getInput('configAnalyticsId'),
'autoBackup' => $this->getInput('configAutoBackup', helper::FILTER_BOOLEAN),
'maintenance' => $this->getInput('configMaintenance', helper::FILTER_BOOLEAN),
'cookieConsent' => $this->getInput('configCookieConsent', helper::FILTER_BOOLEAN),
'favicon' => $this->getInput('configFavicon'),
'faviconDark' => $this->getInput('configFaviconDark'),
'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')
],
'timezone' => $this->getInput('configTimezone', helper::FILTER_STRING_SHORT, true),
'autoUpdate' => $this->getInput('configAutoUpdate', helper::FILTER_BOOLEAN),
'autoUpdateHtaccess' => $this->getInput('configAutoUpdateHtaccess', helper::FILTER_BOOLEAN),
'proxyType' => $this->getInput('configProxyType'),
'proxyUrl' => $this->getInput('configProxyUrl'),
'proxyPort' => $this->getInput('configProxyPort',helper::FILTER_INT),
'captchaStrong' => $this->getInput('configCaptchaStrong',helper::FILTER_BOOLEAN),
'autoDisconnect' => $this->getInput('configAutoDisconnect',helper::FILTER_BOOLEAN),
'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)
],
'seo' => [
'robots' => $this->getInput('configSeoRobots',helper::FILTER_BOOLEAN)
],
'connect' => [
'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),
],
'i18n' => [
'enable' => $this->getData(['config', 'i18n', 'enable'])
]
]
]);
// Efface les fichiers de backup lorsque l'option est désactivée // Efface les fichiers de backup lorsque l'option est désactivée
if ($this->getInput('configAdvancedFileBackup', helper::FILTER_BOOLEAN) === false) { if ($this->getInput('configFileBackup', helper::FILTER_BOOLEAN) === false) {
$path = realpath('site/data'); $path = realpath('site/data');
foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path)) as $filename) foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path)) as $filename)
{ {
@ -477,61 +548,7 @@ class config extends common {
'state' => true 'state' => true
]); ]);
} }
// Valeurs en sortie // Générer la list des pages disponibles
$this->addOutput([
'title' => 'Configuration de base',
'view' => 'index'
]);
}
/**
* Configuration
*/
public function locale() {
// Soumission du formulaire
if($this->isPost()) {
// Répercuter la suppression de la page dans la configuration du footer
if ( $this->getData(['theme','footer','displaySearch']) === true
AND $this->getInput('configSearchPageId') === 'none'
){
$this->setData(['theme', 'footer', 'displaySearch', false]);
}
if ( $this->getData(['theme','footer','displayLegal']) === true
AND $this->getInput('configLegalPageId') === 'none'
){
$this->setData(['theme', 'footer', 'displayLegal', false]);
}
// Sauvegarder
$this->setData([
'locale',
[
'homePageId' => $this->getInput('configHomePageId', helper::FILTER_ID, true),
'page404' => $this->getInput('configPage404'),
'page403' => $this->getInput('configPage403'),
'page302' => $this->getInput('configPage302'),
'legalPageId' => $this->getInput('configLegalPageId'),
'searchPageId' => $this->getInput('configSearchPageId'),
'searchPageLabel' => empty($this->getInput('configSearchPageLabel', helper::FILTER_STRING_SHORT)) ? 'Rechercher' : $this->getInput('configSearchPageLabel', helper::FILTER_STRING_SHORT),
'legalPageLabel' => empty($this->getInput('configLegalPageLabel', helper::FILTER_STRING_SHORT)) ? 'Mentions légales' : $this->getInput('configLegalPageLabel', helper::FILTER_STRING_SHORT),
'sitemapPageLabel' => empty($this->getInput('configSitemapPageLabel', helper::FILTER_STRING_SHORT)) ? 'Plan du site' : $this->getInput('configSitemapPageLabel', helper::FILTER_STRING_SHORT),
'metaDescription' => $this->getInput('configMetaDescription', helper::FILTER_STRING_LONG, true),
'title' => $this->getInput('configTitle', helper::FILTER_STRING_SHORT, true)
],
]);
$this->setData(['config', 'i18n', 'enable', $this->getInput('configI18n',helper::FILTER_BOOLEAN) ]);
// Valeurs en sortie
$this->addOutput([
'redirect' => helper::baseUrl() . $this->getUrl(),
'notification' => 'Modifications enregistrées',
'state' => true
]);
}
// Liste des pages
self::$pagesList = $this->getData(['page']); self::$pagesList = $this->getData(['page']);
foreach(self::$pagesList as $page => $pageId) { foreach(self::$pagesList as $page => $pageId) {
if ($this->getData(['page',$page,'block']) === 'bar' || if ($this->getData(['page',$page,'block']) === 'bar' ||
@ -548,112 +565,14 @@ class config extends common {
unset(self::$orphansList[$page]); unset(self::$orphansList[$page]);
} }
} }
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'title' => 'Localisation', 'title' => 'Configuration',
'view' => 'locale' 'view' => 'index'
]); ]);
} }
/**
* Sécurité de la connexion
**/
public function safety() {
// Soumission du formulaire
if($this->isPost()) {
$this->setData([ 'config', 'captchaStrong', $this->getInput('configAdvancedCaptchaStrong',helper::FILTER_BOOLEAN)]);
$this->setData([ 'config', 'autoDisconnect', $this->getInput('configAdvancedAutoDisconnect',helper::FILTER_BOOLEAN)]);
$this->setData([ 'config', 'connect' => [
'attempt' => $this->getInput('configAdvancedConnectAttempt',helper::FILTER_INT),
'timeout' => $this->getInput('configAdvancedConnectTimeout',helper::FILTER_INT),
'log' => $this->getInput('configAdvancedConnectLog',helper::FILTER_BOOLEAN),
'anonymousIp' => $this->getInput('configAdvancedConnectAnonymousIp',helper::FILTER_INT),
'captcha' => $this->getInput('configAdvancedConnectCaptcha',helper::FILTER_BOOLEAN)
]]);
}
// Valeurs en sortie
$this->addOutput([
'title' => 'Configuration avancée',
'view' => 'safety'
]);
}
/**
* Configuration
*/
public function social() {
// Soumission du formulaire
if($this->isPost()) {
// Sauvegarder
$this->setData([ 'config', 'analyticsId', $this->getInput('configAdvancedAnalyticsId')]);
$this->setData([ 'config', 'social' => [
'facebookId' => $this->getInput('configAdvancedSocialFacebookId'),
'linkedinId' => $this->getInput('configAdvancedSocialLinkedinId'),
'instagramId' => $this->getInput('configAdvancedSocialInstagramId'),
'pinterestId' => $this->getInput('configAdvancedSocialPinterestId'),
'twitterId' => $this->getInput('configAdvancedSocialTwitterId'),
'youtubeId' => $this->getInput('configAdvancedSocialYoutubeId'),
'youtubeUserId' => $this->getInput('configAdvancedSocialYoutubeUserId'),
'githubId' => $this->getInput('configAdvancedSocialGithubId')
]]);
$this->setData([ 'config', 'seo' => [
'robots' => $this->getInput('configAdvancedSeoRobots',helper::FILTER_BOOLEAN)
]]);
// Valeurs en sortie
$this->addOutput([
'redirect' => helper::baseUrl() . $this->getUrl(),
'notification' => 'Modifications enregistrées ' ,
'state' => true
]);
}
// Valeurs en sortie
$this->addOutput([
'title' => 'Référencement',
'view' => 'social'
]);
}
/**
* Configuration avancée
*/
public function network() {
// Soumission du formulaire
if($this->isPost()) {
// Sauvegarder
$this->setData([ 'config', 'proxyType', $this->getInput('configAdvancedProxyType')]);
$this->setData([ 'config', 'proxyUrl', $this->getInput('configAdvancedProxyUrl')]);
$this->setData([ 'config', 'proxyUrl', $this->getInput('configAdvancedProxyUrl')]);
$this->setData([ 'config', 'smtp' => [
'enable' => $this->getInput('configAdvancedSmtpEnable',helper::FILTER_BOOLEAN),
'host' => $this->getInput('configAdvancedSmtpHost',helper::FILTER_STRING_SHORT),
'port' => $this->getInput('configAdvancedSmtpPort',helper::FILTER_INT),
'auth' => $this->getInput('configAdvancedSmtpAuth',helper::FILTER_BOOLEAN),
'secure' => $this->getInput('configAdvancedSmtpSecure'),
'username' => $this->getInput('configAdvancedSmtpUsername',helper::FILTER_STRING_SHORT),
'password' =>helper::encrypt($this->getData(['config','smtp','username']),$this->getInput('configAdvancedSmtpPassword')),
'sender' => $this->getInput('configAdvancedSmtpSender',helper::FILTER_MAIL)
]]);
// Valeurs en sortie
$this->addOutput([
'redirect' => helper::baseUrl() . $this->getUrl(),
'notification' => 'Modifications enregistrées ' ,
'state' => true
]);
}
// Valeurs en sortie
$this->addOutput([
'title' => 'Reseau et scripts',
'view' => 'network'
]);
}
public function script() { public function script() {
// Soumission du formulaire // Soumission du formulaire
if($this->isPost()) { if($this->isPost()) {

44
core/module/config/view/index/index.js.php
View File

@ -14,24 +14,24 @@ $( document).ready(function() {
/** /**
* Afficher et masquer options SMTP * Afficher et masquer options SMTP
*/ */
if ($("input[name=configAdvancedSmtpEnable]").is(':checked')) { if ($("input[name=SmtpEnable]").is(':checked')) {
$("#configAdvancedSmtpParam").addClass("disabled"); $("#SmtpParam").addClass("disabled");
$("#configAdvancedSmtpParam").slideDown(); $("#SmtpParam").slideDown();
} else { } else {
$("#configAdvancedSmtpParam").removeClass("disabled"); $("#SmtpParam").removeClass("disabled");
$("#configAdvancedSmtpParam").slideUp(); $("#SmtpParam").slideUp();
} }
/** /**
* Afficher et masquer options Auth * Afficher et masquer options Auth
*/ */
if ($("select[name=configAdvancedSmtpEnable]").val() == true) { if ($("select[name=SmtpEnable]").val() == true) {
$("#configAdvancedSmtpAuthParam").addClass("disabled"); $("#SmtpAuthParam").addClass("disabled");
$("#configAdvancedSmtpAuthParam").slideDown(); $("#SmtpAuthParam").slideDown();
} else { } else {
$("#configAdvancedSmtpAuthParam").removeClass("disabled"); $("#SmtpAuthParam").removeClass("disabled");
$("#configAdvancedSmtpAuthParam").slideUp(); $("#SmtpAuthParam").slideUp();
} }
@ -40,13 +40,13 @@ $( document).ready(function() {
/** /**
* Afficher et masquer options SMTP * Afficher et masquer options SMTP
*/ */
$("input[name=configAdvancedSmtpEnable]").on("change", function() { $("input[name=SmtpEnable]").on("change", function() {
if ($("input[name=configAdvancedSmtpEnable]").is(':checked')) { if ($("input[name=SmtpEnable]").is(':checked')) {
$("#configAdvancedSmtpParam").addClass("disabled"); $("#SmtpParam").addClass("disabled");
$("#configAdvancedSmtpParam").slideDown(); $("#SmtpParam").slideDown();
} else { } else {
$("#configAdvancedSmtpParam").removeClass("disabled"); $("#SmtpParam").removeClass("disabled");
$("#configAdvancedSmtpParam").slideUp(); $("#SmtpParam").slideUp();
} }
}); });
@ -54,13 +54,13 @@ $( document).ready(function() {
* Afficher et masquer options Auth * Afficher et masquer options Auth
*/ */
$("select[name=configAdvancedSmtpAuth]").on("change", function() { $("select[name=SmtpAuth]").on("change", function() {
if ($("select[name=configAdvancedSmtpAuth]").val() == true) { if ($("select[name=SmtpAuth]").val() == true) {
$("#configAdvancedSmtpAuthParam").addClass("disabled"); $("#SmtpAuthParam").addClass("disabled");
$("#configAdvancedSmtpAuthParam").slideDown(); $("#SmtpAuthParam").slideDown();
} else { } else {
$("#configAdvancedSmtpAuthParam").removeClass("disabled"); $("#SmtpAuthParam").removeClass("disabled");
$("#configAdvancedSmtpAuthParam").slideUp(); $("#SmtpAuthParam").slideUp();
} }
}); });

14
core/module/config/view/index/index.php
View File

@ -9,45 +9,45 @@
]); ?> ]); ?>
</div> </div>
<div class="col2"> <div class="col2">
<?php echo template::button('configAdvancedHelp', [ <?php echo template::button('Help', [
'class' => 'buttonHelp', 'class' => 'buttonHelp',
'ico' => 'help', 'ico' => 'help',
'value' => 'Aide' 'value' => 'Aide'
]); ?> ]); ?>
</div> </div>
<div class="col2 offset6"> <div class="col2 offset6">
<?php echo template::submit('configAdvancedSubmit'); ?> <?php echo template::submit('Submit'); ?>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<div class="row textAlignCenter"> <div class="row textAlignCenter">
<div class="col2"> <div class="col2">
<?php echo template::button('configAdvancedButton', [ <?php echo template::button('Button', [
'href' => helper::baseUrl() . 'config/index', 'href' => helper::baseUrl() . 'config/index',
'value' => 'Paramètres' 'value' => 'Paramètres'
]); ?> ]); ?>
</div> </div>
<div class="col2"> <div class="col2">
<?php echo template::button('configAdvancedButton', [ <?php echo template::button('Button', [
'href' => helper::baseUrl() . 'config/locale', 'href' => helper::baseUrl() . 'config/locale',
'value' => 'Localisation' 'value' => 'Localisation'
]); ?> ]); ?>
</div> </div>
<div class="col2"> <div class="col2">
<?php echo template::button('configAdvancedButton', [ <?php echo template::button('Button', [
'href' => helper::baseUrl() . 'config/social', 'href' => helper::baseUrl() . 'config/social',
'value' => 'Référencement' 'value' => 'Référencement'
]); ?> ]); ?>
</div> </div>
<div class="col2"> <div class="col2">
<?php echo template::button('configAdvancedButton', [ <?php echo template::button('Button', [
'href' => helper::baseUrl() . 'config/safety', 'href' => helper::baseUrl() . 'config/safety',
'value' => 'Sécurité' 'value' => 'Sécurité'
]); ?> ]); ?>
</div> </div>
<div class="col2"> <div class="col2">
<?php echo template::button('configAdvancedButton', [ <?php echo template::button('Button', [
'href' => helper::baseUrl() . 'config/network', 'href' => helper::baseUrl() . 'config/network',
'value' => 'Réseau' 'value' => 'Réseau'
]); ?> ]); ?>

24
core/module/config/view/network/network.php
View File

@ -5,20 +5,20 @@
<h4>Réseau</h4> <h4>Réseau</h4>
<div class="row"> <div class="row">
<div class="col2"> <div class="col2">
<?php echo template::select('configAdvancedProxyType', $module::$proxyType, [ <?php echo template::select('ProxyType', $module::$proxyType, [
'label' => 'Type de proxy', 'label' => 'Type de proxy',
'selected' => $this->getData(['config', 'proxyType']) 'selected' => $this->getData(['config', 'proxyType'])
]); ?> ]); ?>
</div> </div>
<div class="col8"> <div class="col8">
<?php echo template::text('configAdvancedProxyUrl', [ <?php echo template::text('ProxyUrl', [
'label' => 'Adresse du proxy', 'label' => 'Adresse du proxy',
'placeholder' => 'cache.proxy.fr', 'placeholder' => 'cache.proxy.fr',
'value' => $this->getData(['config', 'proxyUrl']) 'value' => $this->getData(['config', 'proxyUrl'])
]); ?> ]); ?>
</div> </div>
<div class="col2"> <div class="col2">
<?php echo template::text('configAdvancedProxyPort', [ <?php echo template::text('ProxyPort', [
'label' => 'Port du proxy', 'label' => 'Port du proxy',
'placeholder' => '6060', 'placeholder' => '6060',
'value' => $this->getData(['config', 'proxyPort']) 'value' => $this->getData(['config', 'proxyPort'])
@ -34,52 +34,52 @@
<h4>SMTP</h4> <h4>SMTP</h4>
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<?php echo template::checkbox('configAdvancedSmtpEnable', true, 'Activer SMTP', [ <?php echo template::checkbox('SmtpEnable', true, 'Activer SMTP', [
'checked' => $this->getData(['config', 'smtp','enable']), 'checked' => $this->getData(['config', 'smtp','enable']),
'help' => 'Paramètres à utiliser lorsque votre hébergeur ne propose pas la fonctionnalité d\'envoi de mail.' 'help' => 'Paramètres à utiliser lorsque votre hébergeur ne propose pas la fonctionnalité d\'envoi de mail.'
]); ?> ]); ?>
</div> </div>
</div> </div>
<div id="configAdvancedSmtpParam"> <div id="SmtpParam">
<div class="row"> <div class="row">
<div class="col8"> <div class="col8">
<?php echo template::text('configAdvancedSmtpHost', [ <?php echo template::text('SmtpHost', [
'label' => 'Adresse SMTP', 'label' => 'Adresse SMTP',
'placeholder' => 'smtp.fr', 'placeholder' => 'smtp.fr',
'value' => $this->getData(['config', 'smtp','host']) 'value' => $this->getData(['config', 'smtp','host'])
]); ?> ]); ?>
</div> </div>
<div class="col2"> <div class="col2">
<?php echo template::text('configAdvancedSmtpPort', [ <?php echo template::text('SmtpPort', [
'label' => 'Port SMTP', 'label' => 'Port SMTP',
'placeholder' => '589', 'placeholder' => '589',
'value' => $this->getData(['config', 'smtp','port']) 'value' => $this->getData(['config', 'smtp','port'])
]); ?> ]); ?>
</div> </div>
<div class="col2"> <div class="col2">
<?php echo template::select('configAdvancedSmtpAuth', $module::$SMTPauth, [ <?php echo template::select('SmtpAuth', $module::$SMTPauth, [
'label' => 'Authentification', 'label' => 'Authentification',
'selected' => $this->getData(['config', 'smtp','auth']) 'selected' => $this->getData(['config', 'smtp','auth'])
]); ?> ]); ?>
</div> </div>
</div> </div>
<div id="configAdvancedSmtpAuthParam"> <div id="SmtpAuthParam">
<div class="row"> <div class="row">
<div class="col5"> <div class="col5">
<?php echo template::text('configAdvancedSmtpUsername', [ <?php echo template::text('SmtpUsername', [
'label' => 'Nom utilisateur', 'label' => 'Nom utilisateur',
'value' => $this->getData(['config', 'smtp','username' ]) 'value' => $this->getData(['config', 'smtp','username' ])
]); ?> ]); ?>
</div> </div>
<div class="col5"> <div class="col5">
<?php echo template::password('configAdvancedSmtpPassword', [ <?php echo template::password('SmtpPassword', [
'label' => 'Mot de passe', 'label' => 'Mot de passe',
'autocomplete' => 'off', 'autocomplete' => 'off',
'value' => $this->getData(['config', 'smtp','username' ]) ? helper::decrypt ($this->getData(['config', 'smtp','username' ]),$this->getData(['config','smtp','password'])) : '' 'value' => $this->getData(['config', 'smtp','username' ]) ? helper::decrypt ($this->getData(['config', 'smtp','username' ]),$this->getData(['config','smtp','password'])) : ''
]); ?> ]); ?>
</div> </div>
<div class="col2"> <div class="col2">
<?php echo template::select('configAdvancedSmtpSecure', $module::$SMTPEnc , [ <?php echo template::select('SmtpSecure', $module::$SMTPEnc , [
'label' => 'Sécurité', 'label' => 'Sécurité',
'selected' => $this->getData(['config', 'smtp','secure']) 'selected' => $this->getData(['config', 'smtp','secure'])
]); ?> ]); ?>

22
core/module/config/view/safety/safety.php
View File

@ -5,18 +5,18 @@
<h4>Sécurité de la connexion</h4> <h4>Sécurité de la connexion</h4>
<div class="row"> <div class="row">
<div class="col4"> <div class="col4">
<?php echo template::checkbox('configAdvancedConnectCaptcha', true, 'Captcha à la connexion', [ <?php echo template::checkbox('ConnectCaptcha', true, 'Captcha à la connexion', [
'checked' => $this->getData(['config', 'connect','captcha']) 'checked' => $this->getData(['config', 'connect','captcha'])
]); ?> ]); ?>
</div> </div>
<div class="col4"> <div class="col4">
<?php echo template::checkbox('configAdvancedCaptchaStrong', true, 'Captcha complexe', [ <?php echo template::checkbox('CaptchaStrong', true, 'Captcha complexe', [
'checked' => $this->getData(['config','captchaStrong']), 'checked' => $this->getData(['config','captchaStrong']),
'help' => 'Option recommandée pour sécuriser la connexion. S\'applique à tous les captchas du site. Le captcha simple se limite à une addition de nombres de 0 à 10. Le captcha complexe utilise quatre opérations de nombres de 0 à 20. Activation recommandée.' 'help' => 'Option recommandée pour sécuriser la connexion. S\'applique à tous les captchas du site. Le captcha simple se limite à une addition de nombres de 0 à 10. Le captcha complexe utilise quatre opérations de nombres de 0 à 20. Activation recommandée.'
]); ?> ]); ?>
</div> </div>
<div class="col4"> <div class="col4">
<?php echo template::checkbox('configAdvancedAutoDisconnect', true, 'Déconnexion automatique', [ <?php echo template::checkbox('AutoDisconnect', true, 'Déconnexion automatique', [
'checked' => $this->getData(['config','autoDisconnect']), 'checked' => $this->getData(['config','autoDisconnect']),
'help' => 'Déconnecte les sessions ouvertes précédemment sur d\'autres navigateurs ou terminaux. Activation recommandée.' 'help' => 'Déconnecte les sessions ouvertes précédemment sur d\'autres navigateurs ou terminaux. Activation recommandée.'
]); ?> ]); ?>
@ -24,13 +24,13 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col3"> <div class="col3">
<?php echo template::select('configAdvancedConnectAttempt', $module::$connectAttempt , [ <?php echo template::select('ConnectAttempt', $module::$connectAttempt , [
'label' => 'Connexions successives', 'label' => 'Connexions successives',
'selected' => $this->getData(['config', 'connect', 'attempt']) 'selected' => $this->getData(['config', 'connect', 'attempt'])
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col3">
<?php echo template::select('configAdvancedConnectTimeout', $module::$connectTimeout , [ <?php echo template::select('ConnectTimeout', $module::$connectTimeout , [
'label' => 'Blocage après échecs', 'label' => 'Blocage après échecs',
'selected' => $this->getData(['config', 'connect', 'timeout']) 'selected' => $this->getData(['config', 'connect', 'timeout'])
]); ?> ]); ?>
@ -42,14 +42,14 @@
Après le nombre de tentatives autorisées, l\'IP et le compte sont bloqués.'); Après le nombre de tentatives autorisées, l\'IP et le compte sont bloqués.');
?> ?>
</label> </label>
<?php echo template::button('configAdvancedConnectblacListDownload', [ <?php echo template::button('ConnectblacListDownload', [
'href' => helper::baseUrl() . 'config/blacklistDownload', 'href' => helper::baseUrl() . 'config/blacklistDownload',
'value' => 'Télécharger la liste', 'value' => 'Télécharger la liste',
'ico' => 'download' 'ico' => 'download'
]); ?> ]); ?>
</div> </div>
<div class="col3 verticalAlignBottom"> <div class="col3 verticalAlignBottom">
<?php echo template::button('configAdvancedConnectReset', [ <?php echo template::button('ConnectReset', [
'class' => 'buttonRed', 'class' => 'buttonRed',
'href' => helper::baseUrl() . 'config/blacklistReset', 'href' => helper::baseUrl() . 'config/blacklistReset',
'value' => 'Réinitialiser la liste', 'value' => 'Réinitialiser la liste',
@ -66,26 +66,26 @@
<h4>Journalisation</h4> <h4>Journalisation</h4>
<div class="row"> <div class="row">
<div class="col3"> <div class="col3">
<?php echo template::checkbox('configAdvancedConnectLog', true, 'Activer la journalisation', [ <?php echo template::checkbox('ConnectLog', true, 'Activer la journalisation', [
'checked' => $this->getData(['config', 'connect', 'log']) 'checked' => $this->getData(['config', 'connect', 'log'])
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col3">
<?php echo template::select('configAdvancedConnectAnonymousIp', $module::$anonIP, [ <?php echo template::select('ConnectAnonymousIp', $module::$anonIP, [
'label' => 'Anonymat des adresses IP', 'label' => 'Anonymat des adresses IP',
'selected' => $this->getData(['config', 'connect', 'anonymousIp']), 'selected' => $this->getData(['config', 'connect', 'anonymousIp']),
'help' => 'La réglementation française impose un anonymat de niveau 2' 'help' => 'La réglementation française impose un anonymat de niveau 2'
]); ?> ]); ?>
</div> </div>
<div class="col3 verticalAlignBottom"> <div class="col3 verticalAlignBottom">
<?php echo template::button('configAdvancedLogDownload', [ <?php echo template::button('LogDownload', [
'href' => helper::baseUrl() . 'config/logDownload', 'href' => helper::baseUrl() . 'config/logDownload',
'value' => 'Télécharger le journal', 'value' => 'Télécharger le journal',
'ico' => 'download' 'ico' => 'download'
]); ?> ]); ?>
</div> </div>
<div class="col3 verticalAlignBottom"> <div class="col3 verticalAlignBottom">
<?php echo template::button('configAdvancedLogReset', [ <?php echo template::button('LogReset', [
'class' => 'buttonRed', 'class' => 'buttonRed',
'href' => helper::baseUrl() . 'config/logReset', 'href' => helper::baseUrl() . 'config/logReset',
'value' => 'Réinitialiser le journal', 'value' => 'Réinitialiser le journal',

18
core/module/config/view/setup/setup.php
View File

@ -5,7 +5,7 @@
<h4>Paramètres</h4> <h4>Paramètres</h4>
<div class="row"> <div class="row">
<div class="col4"> <div class="col4">
<?php echo template::file('configAdvancedFavicon', [ <?php echo template::file('Favicon', [
'type' => 1, 'type' => 1,
'help' => 'Pensez à supprimer le cache de votre navigateur si la favicon ne change pas.', 'help' => 'Pensez à supprimer le cache de votre navigateur si la favicon ne change pas.',
'label' => 'Favicon', 'label' => 'Favicon',
@ -13,7 +13,7 @@
]); ?> ]); ?>
</div> </div>
<div class="col4"> <div class="col4">
<?php echo template::file('configAdvancedFaviconDark', [ <?php echo template::file('FaviconDark', [
'type' => 1, 'type' => 1,
'help' => 'Sélectionnez une icône adaptée à un thème sombre.<br>Pensez à supprimer le cache de votre navigateur si la favicon ne change pas.', 'help' => 'Sélectionnez une icône adaptée à un thème sombre.<br>Pensez à supprimer le cache de votre navigateur si la favicon ne change pas.',
'label' => 'Favicon thème sombre', 'label' => 'Favicon thème sombre',
@ -21,7 +21,7 @@
]); ?> ]); ?>
</div> </div>
<div class="col4"> <div class="col4">
<?php echo template::select('configAdvancedTimezone', $module::$timezones, [ <?php echo template::select('Timezone', $module::$timezones, [
'label' => 'Fuseau horaire', 'label' => 'Fuseau horaire',
'selected' => $this->getData(['config', 'timezone']), 'selected' => $this->getData(['config', 'timezone']),
'help' => 'Le fuseau horaire est utile au bon référencement' 'help' => 'Le fuseau horaire est utile au bon référencement'
@ -30,7 +30,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col6"> <div class="col6">
<?php echo template::checkbox('configAdvancedCookieConsent', true, 'Message de consentement aux cookies', [ <?php echo template::checkbox('CookieConsent', true, 'Message de consentement aux cookies', [
'checked' => $this->getData(['config', 'cookieConsent']), 'checked' => $this->getData(['config', 'cookieConsent']),
'help' => 'Activation obligatoire selon les lois françaises sauf si vous utilisez votre propre système de consentement.' 'help' => 'Activation obligatoire selon les lois françaises sauf si vous utilisez votre propre système de consentement.'
]); ?> ]); ?>
@ -52,21 +52,21 @@
<?php $updateError = helper::urlGetContents(common::ZWII_UPDATE_URL . common::ZWII_UPDATE_CHANNEL . '/version');?> <?php $updateError = helper::urlGetContents(common::ZWII_UPDATE_URL . common::ZWII_UPDATE_CHANNEL . '/version');?>
<div class="row"> <div class="row">
<div class="col4"> <div class="col4">
<?php echo template::checkbox('configAdvancedAutoUpdate', true, 'Rechercher une mise à jour en ligne', [ <?php echo template::checkbox('AutoUpdate', true, 'Rechercher une mise à jour en ligne', [
'checked' => $this->getData(['config', 'autoUpdate']), 'checked' => $this->getData(['config', 'autoUpdate']),
'help' => 'La vérification est quotidienne. Option désactivée si la configuration du serveur ne le permet pas.', 'help' => 'La vérification est quotidienne. Option désactivée si la configuration du serveur ne le permet pas.',
'disabled' => !$updateError 'disabled' => !$updateError
]); ?> ]); ?>
</div> </div>
<div class="col4"> <div class="col4">
<?php echo template::checkbox('configAdvancedAutoUpdateHtaccess', true, 'Préserver le fichier htaccess racine', [ <?php echo template::checkbox('AutoUpdateHtaccess', true, 'Préserver le fichier htaccess racine', [
'checked' => $this->getData(['config', 'autoUpdateHtaccess']), 'checked' => $this->getData(['config', 'autoUpdateHtaccess']),
'help' => 'Lors d\'une mise à jour automatique, conserve le fichier htaccess de la racine du site.', 'help' => 'Lors d\'une mise à jour automatique, conserve le fichier htaccess de la racine du site.',
'disabled' => !$updateError 'disabled' => !$updateError
]); ?> ]); ?>
</div> </div>
<div class="col4"> <div class="col4">
<?php echo template::button('configAdvancedUpdateForced', [ <?php echo template::button('UpdateForced', [
'ico' => 'download-cloud', 'ico' => 'download-cloud',
'href' => helper::baseUrl() . 'install/update', 'href' => helper::baseUrl() . 'install/update',
'value' => 'Mise à jour manuelle', 'value' => 'Mise à jour manuelle',
@ -84,13 +84,13 @@
<h4>Maintenance</h4> <h4>Maintenance</h4>
<div class="row"> <div class="row">
<div class="col6"> <div class="col6">
<?php echo template::checkbox('configAdvancedAutoBackup', true, 'Sauvegarde automatique quotidienne du site', [ <?php echo template::checkbox('AutoBackup', true, 'Sauvegarde automatique quotidienne du site', [
'checked' => $this->getData(['config', 'autoBackup']), 'checked' => $this->getData(['config', 'autoBackup']),
'help' => 'Une archive contenant le dossier /site/data est copiée dans le dossier \'site/backup\'. La sauvegarde est conservée pendant 30 jours.</p><p>Les fichiers du site ne sont pas sauvegardés automatiquement. Activation recommandée.' 'help' => 'Une archive contenant le dossier /site/data est copiée dans le dossier \'site/backup\'. La sauvegarde est conservée pendant 30 jours.</p><p>Les fichiers du site ne sont pas sauvegardés automatiquement. Activation recommandée.'
]); ?> ]); ?>
</div> </div>
<div class="col6"> <div class="col6">
<?php echo template::checkbox('configAdvancedMaintenance', true, 'Site en maintenance', [ <?php echo template::checkbox('Maintenance', true, 'Site en maintenance', [
'checked' => $this->getData(['config', 'maintenance']) 'checked' => $this->getData(['config', 'maintenance'])
]); ?> ]); ?>
</div> </div>

28
core/module/config/view/social/social.php
View File

@ -7,7 +7,7 @@
<div class="col4 offset1"> <div class="col4 offset1">
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<?php echo template::button('configAdvancedMetaImage', [ <?php echo template::button('MetaImage', [
'href' => helper::baseUrl() . 'config/configMetaImage', 'href' => helper::baseUrl() . 'config/configMetaImage',
'value' => 'Générer une capture Open Graph' 'value' => 'Générer une capture Open Graph'
]); ?> ]); ?>
@ -15,7 +15,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<?php echo template::button('configAdvancedSiteMap', [ <?php echo template::button('SiteMap', [
'href' => helper::baseUrl() . 'config/generateFiles', 'href' => helper::baseUrl() . 'config/generateFiles',
'value' => 'Générer sitemap.xml et robots.txt' 'value' => 'Générer sitemap.xml et robots.txt'
]); ?> ]); ?>
@ -23,7 +23,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<?php echo template::checkbox('configAdvancedSeoRobots', true, 'Autoriser les robots à référencer le site', [ <?php echo template::checkbox('SeoRobots', true, 'Autoriser les robots à référencer le site', [
'checked' => $this->getData(['config', 'seo','robots']) 'checked' => $this->getData(['config', 'seo','robots'])
]); ?> ]); ?>
</div> </div>
@ -48,28 +48,28 @@
<h4>Réseaux sociaux</h4> <h4>Réseaux sociaux</h4>
<div class="row"> <div class="row">
<div class="col3"> <div class="col3">
<?php echo template::text('configAdvancedSocialFacebookId', [ <?php echo template::text('SocialFacebookId', [
'help' => 'Saisissez votre ID : https://www.facebook.com/[ID].', 'help' => 'Saisissez votre ID : https://www.facebook.com/[ID].',
'label' => 'Facebook', 'label' => 'Facebook',
'value' => $this->getData(['config', 'social', 'facebookId']) 'value' => $this->getData(['config', 'social', 'facebookId'])
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col3">
<?php echo template::text('configAdvancedSocialInstagramId', [ <?php echo template::text('SocialInstagramId', [
'help' => 'Saisissez votre ID : https://www.instagram.com/[ID].', 'help' => 'Saisissez votre ID : https://www.instagram.com/[ID].',
'label' => 'Instagram', 'label' => 'Instagram',
'value' => $this->getData(['config', 'social', 'instagramId']) 'value' => $this->getData(['config', 'social', 'instagramId'])
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col3">
<?php echo template::text('configAdvancedSocialYoutubeId', [ <?php echo template::text('SocialYoutubeId', [
'help' => 'ID de la chaîne : https://www.youtube.com/channel/[ID].', 'help' => 'ID de la chaîne : https://www.youtube.com/channel/[ID].',
'label' => 'Chaîne Youtube', 'label' => 'Chaîne Youtube',
'value' => $this->getData(['config', 'social', 'youtubeId']) 'value' => $this->getData(['config', 'social', 'youtubeId'])
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col3">
<?php echo template::text('configAdvancedSocialYoutubeUserId', [ <?php echo template::text('SocialYoutubeUserId', [
'help' => 'Saisissez votre ID Utilisateur : https://www.youtube.com/user/[ID].', 'help' => 'Saisissez votre ID Utilisateur : https://www.youtube.com/user/[ID].',
'label' => 'Youtube', 'label' => 'Youtube',
'value' => $this->getData(['config', 'social', 'youtubeUserId']) 'value' => $this->getData(['config', 'social', 'youtubeUserId'])
@ -78,28 +78,28 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col3"> <div class="col3">
<?php echo template::text('configAdvancedSocialTwitterId', [ <?php echo template::text('SocialTwitterId', [
'help' => 'Saisissez votre ID : https://twitter.com/[ID].', 'help' => 'Saisissez votre ID : https://twitter.com/[ID].',
'label' => 'Twitter', 'label' => 'Twitter',
'value' => $this->getData(['config', 'social', 'twitterId']) 'value' => $this->getData(['config', 'social', 'twitterId'])
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col3">
<?php echo template::text('configAdvancedSocialPinterestId', [ <?php echo template::text('SocialPinterestId', [
'help' => 'Saisissez votre ID : https://pinterest.com/[ID].', 'help' => 'Saisissez votre ID : https://pinterest.com/[ID].',
'label' => 'Pinterest', 'label' => 'Pinterest',
'value' => $this->getData(['config', 'social', 'pinterestId']) 'value' => $this->getData(['config', 'social', 'pinterestId'])
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col3">
<?php echo template::text('configAdvancedSocialLinkedinId', [ <?php echo template::text('SocialLinkedinId', [
'help' => 'Saisissez votre ID Linkedin : https://fr.linkedin.com/in/[ID].', 'help' => 'Saisissez votre ID Linkedin : https://fr.linkedin.com/in/[ID].',
'label' => 'Linkedin', 'label' => 'Linkedin',
'value' => $this->getData(['config', 'social', 'linkedinId']) 'value' => $this->getData(['config', 'social', 'linkedinId'])
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col3">
<?php echo template::text('configAdvancedSocialGithubId', [ <?php echo template::text('SocialGithubId', [
'help' => 'Saisissez votre ID Github : https://github.com/[ID].', 'help' => 'Saisissez votre ID Github : https://github.com/[ID].',
'label' => 'Github', 'label' => 'Github',
'value' => $this->getData(['config', 'social', 'githubId']) 'value' => $this->getData(['config', 'social', 'githubId'])
@ -115,7 +115,7 @@
<h4>Scripts externes</h4> <h4>Scripts externes</h4>
<div class="row"> <div class="row">
<div class="col3"> <div class="col3">
<?php echo template::text('configAdvancedAnalyticsId', [ <?php echo template::text('AnalyticsId', [
'help' => 'Saisissez l\'ID de suivi.', 'help' => 'Saisissez l\'ID de suivi.',
'label' => 'Google Analytics', 'label' => 'Google Analytics',
'placeholder' => 'UA-XXXXXXXX-X', 'placeholder' => 'UA-XXXXXXXX-X',
@ -123,14 +123,14 @@
]); ?> ]); ?>
</div> </div>
<div class="col3 offset3 verticalAlignBottom"> <div class="col3 offset3 verticalAlignBottom">
<?php echo template::button('configAdvancedScriptHead', [ <?php echo template::button('ScriptHead', [
'href' => helper::baseUrl() . 'config/script/head', 'href' => helper::baseUrl() . 'config/script/head',
'value' => 'Script dans head', 'value' => 'Script dans head',
'ico' => 'pencil' 'ico' => 'pencil'
]); ?> ]); ?>
</div> </div>
<div class="col3 verticalAlignBottom"> <div class="col3 verticalAlignBottom">
<?php echo template::button('configAdvancedScriptBody', [ <?php echo template::button('ScriptBody', [
'href' => helper::baseUrl() . 'config/script/body', 'href' => helper::baseUrl() . 'config/script/body',
'value' => 'Script dans body', 'value' => 'Script dans body',
'ico' => 'pencil' 'ico' => 'pencil'

2
core/module/translate/view/index/index.php
View File

@ -16,7 +16,7 @@
]); ?> ]); ?>
</div> </div>
<div class="col3 offset3"> <div class="col3 offset3">
<?php echo template::button('configAdvancedButton', [ <?php echo template::button('translateButton', [
'href' => helper::baseUrl() . 'translate/copy', 'href' => helper::baseUrl() . 'translate/copy',
'value' => 'Utilitaire de copie', 'value' => 'Utilitaire de copie',
'ico' => 'cog-alt', 'ico' => 'cog-alt',