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

[10.0.020.dev] function update url WIP

Browse Source
This commit is contained in:
fredtempez 2019-12-22 19:10:16 +01:00
parent a66f710c75
commit 7eb5f82c67
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.php
View File

@ -34,7 +34,7 @@ class common {
const TEMP_DIR = 'site/tmp/';
// Numéro de version
const ZWII_VERSION = '10.0.019.dev';
const ZWII_VERSION = '10.0.020.dev';
public static $actions = [];
public static $coreModuleIds = [

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

@ -475,7 +475,7 @@ class config extends common {
// Récuperer les données
// Les contrôles ont été effectués sur la page de formulaire
$old = $this->getData(['core', 'baseUrl']);
$new = helper::baseUrl(false,false);
$new = helper::baseUrl(true,false);
// Boucler sur les pages
foreach($this->getHierarchy(null,null,null) as $parentId => $childIds) {
$content = $this->getData(['page',$parentId,'content']);
@ -487,7 +487,7 @@ class config extends common {
$this->setData(['page',$childId,'content', $replace ]);
}
}
$this->setData(['core','baseUrl',helper::baseUrl(false,false)]);
$this->setData(['core','baseUrl',helper::baseUrl(true,false)]);
// Valeurs en sortie
$this->addOutput([
'title' => 'Sauvegarder / Restaurer',

6
core/module/config/view/manage/manage.php
View File

@ -69,10 +69,10 @@
$buttonClass = 'disabled';
} elseif ($this->getData(['core', 'baseUrl']) === '') {
$baseUrlValue = '/';
$buttonClass = (helper::baseUrl(false,false) !== $this->getData(['core', 'baseUrl']) ) ? '' : 'disabled';
$buttonClass = (helper::baseUrl(true,false) !== $this->getData(['core', 'baseUrl']) ) ? '' : 'disabled';
} else {
$baseUrlValue = $this->getData(['core', 'baseUrl']);
$buttonClass = (helper::baseUrl(false,false) !== $this->getData(['core', 'baseUrl']) ) ? '' : 'disabled';
$buttonClass = (helper::baseUrl(true,false) !== $this->getData(['core', 'baseUrl']) ) ? '' : 'disabled';
}
echo template::text('configManageBaseURLToConvert', [
'label' => 'Dossier d\'installation de l\'archive' ,
@ -84,7 +84,7 @@
<div class="col5">
<?php echo template::text('configManageCurrentURL', [
'label' => 'Dossier du site actuel',
'value' => helper::baseUrl(false,false),
'value' => helper::baseUrl(true,false),
'readonly' => true,
'help' => 'Dossier du site installé.'
]); ?>