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

Merge branch 'master' of https://github.com/fredtempez/ZwiiCMS

Browse Source
This commit is contained in:
fredtempez 2019-12-03 17:56:43 +01:00
commit d26f8a38ba
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -4,6 +4,7 @@
- Corrections
- Gestionnaire de fichiers, modifications des paramètres des miniatures.
- Suppression d'options inutiles dans l'édition d'une page de type de barre latérale.
- Filtrage du nom des pages dans la fenêtre d'édition des pages.
## version 9.2.12
- Modifications

12
core/core.php
View File

@ -561,23 +561,23 @@ class common {
if ($this->getData(['page', $parentId, 'block']) !== 'bar' ) {
// Boucler sur les enfants et récupérer le tableau children avec la liste des enfants
foreach($childIds as $childId) {
$children [] = [ 'title' => ' » '. $this->getData(['page', $childId, 'title']) ,
$children [] = [ 'title' => ' » '. html_entity_decode($this->getData(['page', $childId, 'title']), ENT_QUOTES) ,
'value'=> $rewrite.$childId
];
}
// Traitement
if (empty($childIds)) {
// Pas d'enfant, uniuement l'entrée du parent
$parents [] = ['title' => $this->getData(['page', $parentId, 'title']) ,
$parents [] = ['title' => html_entity_decode($this->getData(['page', $parentId, 'title']), ENT_QUOTES) ,
'value'=> $rewrite.$parentId
];
} else {
// Des enfants, on ajoute la page parent en premier
array_unshift ($children , ['title' => $this->getData(['page', $parentId, 'title']) ,
array_unshift ($children , ['title' => html_entity_decode($this->getData(['page', $parentId, 'title']), ENT_QUOTES) ,
'value'=> $rewrite.$parentId
]);
// puis on ajoute les enfants au parent
$parents [] = ['title' => $this->getData(['page', $parentId, 'title']) ,
$parents [] = ['title' => html_entity_decode($this->getData(['page', $parentId, 'title']), ENT_QUOTES) ,
'value'=> $rewrite.$parentId ,
'menu' => $children
];
@ -731,8 +731,8 @@ class common {
*/
public function sendMail($to, $subject, $content) {
// Utilisation de PHPMailer version 6.0.6
require "core/vendor/phpmailer/phpmailer.php";
require "core/vendor/phpmailer/exception.php";
require_once "core/vendor/phpmailer/phpmailer.php";
require_once "core/vendor/phpmailer/exception.php";
// Layout
ob_start();

6
core/module/page/page.php
View File

@ -53,8 +53,8 @@ class page extends common {
];
public static $displayMenu = [
'none' => 'Aucun',
'parents' => 'Menu principal',
'children' => 'Sous-menu de la page parente'
'parents' => 'Le menu horizontal',
'children' => 'Le sous-menu de la page parente'
];
/**
@ -260,7 +260,7 @@ class page extends common {
'group' => $this->getinput('pageEditBlock') !== 'bar' ? $this->getInput('pageEditGroup', helper::FILTER_INT) : 0,
'targetBlank' => $this->getInput('pageEditTargetBlank', helper::FILTER_BOOLEAN),
'targetLity' => $this->getInput('pageEditTargetBlank', helper::FILTER_BOOLEAN) === true ? false : $this->getInput('pageEditTargetLity', helper::FILTER_BOOLEAN),
'title' => htmlspecialchars_decode($this->getInput('pageEditTitle', helper::FILTER_STRING_SHORT, true), ENT_QUOTES),
'title' => $this->getInput('pageEditTitle', helper::FILTER_STRING_SHORT),
'block' => $this->getinput('pageEditBlock'),
'barLeft' => $barLeft,
'barRight' => $barRight,

4
core/module/page/view/edit/edit.js.php
View File

@ -515,7 +515,7 @@ $("#pageEditParentPageId").on("change", function() {
positionPrevious++;
// Ajout à la liste
positionDOM.append(
$("<option>").val(positionPrevious).text("Après \"" + (pages[key].title) + "\"")
$("<option>").val(positionPrevious).html("Après \"" + (pages[key].title) + "\"")
);
}
}
@ -540,7 +540,7 @@ $("#pageEditParentPageId").on("change", function() {
positionPrevious++;
// Ajout à la liste
positionDOM.append(
$("<option>").val(positionPrevious).text("Après \"" + (pages[hierarchy[parentSelected][i]].title) + "\"")
$("<option>").val(positionPrevious).html("Après \"" + (pages[hierarchy[parentSelected][i]].title) + "\"")
);
}
}

4
core/module/page/view/edit/edit.php
View File

@ -1,7 +1,7 @@
<?php
echo template::formOpen('pageEditForm');
// Mise à jour de la liste des pages pour TinyMCE
$this->pages2Json();
echo template::formOpen('pageEditForm'); ?>
$this->pages2Json(); ?>
<div class="row">
<div class="col2">
<?php $href = helper::baseUrl() . $this->getUrl(2); ?>