lapervenche/ZwiiCMS
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Issues Pull Requests Projects Releases Activity

10400 #1

Merged
lapervenche merged 16 commits from ZwiiCMS-Team/ZwiiCMS:10400 into 10400 2021-01-08 16:19:45 +01:00
Conversation 0 Commits 16 Files Changed 11 +2 -4
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit beff8b1012 - Show all commits

2
core/core.php
View File

@ -44,7 +44,7 @@ class common {
const ACCESS_TIMER = 1800; const ACCESS_TIMER = 1800;
// Numéro de version // Numéro de version
const ZWII_VERSION = '10.4.00.012'; const ZWII_VERSION = '10.4.00.013';
const ZWII_UPDATE_CHANNEL = "v10"; const ZWII_UPDATE_CHANNEL = "v10";
public static $actions = []; public static $actions = [];

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

@ -485,7 +485,6 @@ class config extends common {
[ [
'analyticsId' => $this->getInput('configAdvancedAnalyticsId'), 'analyticsId' => $this->getInput('configAdvancedAnalyticsId'),
'autoBackup' => $this->getInput('configAdvancedAutoBackup', helper::FILTER_BOOLEAN), 'autoBackup' => $this->getInput('configAdvancedAutoBackup', helper::FILTER_BOOLEAN),
'fileBackup' => $this->getInput('configAdvancedFileBackup', helper::FILTER_BOOLEAN),
'maintenance' => $this->getInput('configAdvancedMaintenance', helper::FILTER_BOOLEAN), 'maintenance' => $this->getInput('configAdvancedMaintenance', helper::FILTER_BOOLEAN),
'cookieConsent' => $this->getInput('configAdvancedCookieConsent', helper::FILTER_BOOLEAN), 'cookieConsent' => $this->getInput('configAdvancedCookieConsent', helper::FILTER_BOOLEAN),
'favicon' => $this->getInput('configAdvancedFavicon'), 'favicon' => $this->getInput('configAdvancedFavicon'),

2
core/module/config/view/advanced/advanced.php
View File

@ -103,7 +103,7 @@
</div> </div>
<div class="col4"> <div class="col4">
<?php echo template::checkbox('configAdvancedFileBackup', true, 'Copie de sauvegarde', [ <?php echo template::checkbox('configAdvancedFileBackup', true, 'Copie de sauvegarde', [
'checked' => $this->getData(['config', 'fileBackup']), 'checked' => file_exists('site/data/.backup'),
'help' => '<p>Un fichier .backup.json est généré à chaque édition ou effacement d\'une donnée. La désactivation entraîne la suppression de ces fichiers.</p>' 'help' => '<p>Un fichier .backup.json est généré à chaque édition ou effacement d\'une donnée. La désactivation entraîne la suppression de ces fichiers.</p>'
]); ?> ]); ?>
</div> </div>

1
core/module/install/ressource/defaultdata.php
View File

@ -4,7 +4,6 @@ class init extends common {
'config' => [ 'config' => [
'analyticsId' => '', 'analyticsId' => '',
'autoBackup' => true, 'autoBackup' => true,
'fileBackup' => true,
'autoUpdate' => true, 'autoUpdate' => true,
'autoUpdateHtaccess' => false, 'autoUpdateHtaccess' => false,
'cookieConsent' => true, 'cookieConsent' => true,