Merge branch '10303' into data_engine
This commit is contained in:
commit
00ad2cc3a4
@ -95,14 +95,14 @@
|
||||
]); ?>
|
||||
</div>
|
||||
<div class="col4 verticalAlignBottom">
|
||||
<?php echo template::checkbox('configCookieConsent', true, 'Message de consentement aux cookies', [
|
||||
<?php echo template::checkbox('configCookieConsent', true, 'Consentement aux cookies', [
|
||||
'checked' => $this->getData(['config', 'cookieConsent'])
|
||||
]); ?>
|
||||
</div>
|
||||
<div class="col4 verticalAlignBottom">
|
||||
<?php echo template::checkbox('configCaptchaStrong', true, 'Captcha simple', [
|
||||
'checked' => $this->getData(['config', 'captchaStrong']),
|
||||
'help' => 'Addition de nombres de 0 à 20.'
|
||||
<?php echo template::checkbox('configConnectCaptcha10', true, 'Captcha simple', [
|
||||
'checked' => $this->getData(['config', 'connect','captcha10']),
|
||||
'help' => 'Addition limitée aux chiffres de 0 à 9. S\'applique à tous les captchas du site.'
|
||||
]); ?>
|
||||
</div>
|
||||
</div>
|
||||
@ -119,7 +119,7 @@
|
||||
]); ?>
|
||||
</div>
|
||||
<div class="col4">
|
||||
<?php echo template::checkbox('configAutoBackup', true, 'Sauvegarde automatique quotidienne', [
|
||||
<?php echo template::checkbox('configAutoBackup', true, 'Sauvegarde quotidienne', [
|
||||
'checked' => $this->getData(['config', 'autoBackup']),
|
||||
'help' => '<p>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.</p>'
|
||||
]); ?>
|
||||
|
@ -21,7 +21,7 @@ if(version_compare(PHP_VERSION, '5.6.0', '<')) {
|
||||
exit('PHP 5.6+ required.');
|
||||
}
|
||||
|
||||
/* Set locale to French */
|
||||
/* Localisation */
|
||||
date_default_timezone_set('Europe/Paris');
|
||||
setlocale (LC_ALL, 'fr_FR.utf8','fra');
|
||||
|
||||
@ -37,4 +37,4 @@ autoload::autoloader();
|
||||
require 'core/core.php';
|
||||
$core = new core;
|
||||
spl_autoload_register('core::autoload');
|
||||
echo $core->router();
|
||||
echo $core->router();
|
||||
|
Loading…
Reference in New Issue
Block a user