Merge branch 'master' into dev

This commit is contained in:
Fred 2020-06-30 22:53:00 +02:00
commit c6aee2862f
163 changed files with 10 additions and 7 deletions

View File

@ -6,6 +6,7 @@
- Erreur des noms de champ barre des membres dans le pied de page. - Erreur des noms de champ barre des membres dans le pied de page.
- Génération de l'image tag, amélioration du code et du message d'erreur. - Génération de l'image tag, amélioration du code et du message d'erreur.
- Edition de page, erreur lors de la sélection d'une icône de menu. - Edition de page, erreur lors de la sélection d'une icône de menu.
- Problème lors de l'installation, impossibilité d'obtenir l'écran de configuration.
## version 10.2.00 ## version 10.2.00
- Mise à jour : - Mise à jour :

View File

@ -1,11 +1,11 @@
![](https://img.shields.io/github/last-commit/fredtempez/ZwiiCMS/master) ![](https://img.shields.io/github/release-date/fredtempez/ZwiiCMS) ![](https://img.shields.io/github/last-commit/fredtempez/ZwiiCMS/master) ![](https://img.shields.io/github/release-date/fredtempez/ZwiiCMS)
# ZwiiCMS 10.2.00 # ZwiiCMS 10.2.01
Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation. Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation.
ZwiiCMS a été créé par un développeur de talent, [Rémi Jean](https://remijean.fr/). Il est désormais maintenu par [Frédéric Tempez](mailto:frederic.tempe«@outlook.com) aidé de la communauté. ZwiiCMS a été créé par un développeur de talent, [Rémi Jean](https://remijean.fr/). Il est désormais maintenu par Fred Tempez aidé de la communauté.
[Site](http://zwiicms.com/) - [Forum](http://forum.zwiicms.com/) - [Version initiale](https://github.com/remijean/ZwiiCMS/) - [GitHub](https://github.com/fredtempez/ZwiiCMS) [Site](http://zwiicms.com/) - [Forum](http://forum.zwiicms.com/) - [Version initiale](https://github.com/remijean/ZwiiCMS/) - [GitHub](https://github.com/fredtempez/ZwiiCMS)

0
core/class/SitemapGenerator.class.php Executable file → Normal file
View File

0
core/class/autoload.php Executable file → Normal file
View File

0
core/class/helper.class.php Executable file → Normal file
View File

0
core/class/jsondb/Dot.class.php Executable file → Normal file
View File

0
core/class/jsondb/JsonDb.class.php Executable file → Normal file
View File

0
core/class/phpmailer/Exception.class.php Executable file → Normal file
View File

0
core/class/phpmailer/PHPMailer.class.php Executable file → Normal file
View File

0
core/class/phpmailer/SMTP.class.php Executable file → Normal file
View File

0
core/class/template.class.php Executable file → Normal file
View File

0
core/core.js.php Executable file → Normal file
View File

2
core/core.php Executable file → Normal file
View File

@ -1315,11 +1315,13 @@ class common {
// Version 10.2.00 // Version 10.2.00
if ($this->getData(['core', 'dataVersion']) < 10200) { if ($this->getData(['core', 'dataVersion']) < 10200) {
// Paramètres du compte connecté // Paramètres du compte connecté
if ($this->getUser('id')) {
$this->setData(['user', $this->getUser('id'), 'connectFail',0]); $this->setData(['user', $this->getUser('id'), 'connectFail',0]);
$this->setData(['user', $this->getUser('id'), 'connectTimeout',0]); $this->setData(['user', $this->getUser('id'), 'connectTimeout',0]);
$this->setData(['user', $this->getUser('id'), 'accessTimer',0]); $this->setData(['user', $this->getUser('id'), 'accessTimer',0]);
$this->setData(['user', $this->getUser('id'), 'accessUrl','']); $this->setData(['user', $this->getUser('id'), 'accessUrl','']);
$this->setData(['user', $this->getUser('id'), 'accessCsrf',$_SESSION['csrf']]); $this->setData(['user', $this->getUser('id'), 'accessCsrf',$_SESSION['csrf']]);
}
// Paramètres de sécurité // Paramètres de sécurité
$this->setData(['config', 'connect', 'attempt',999]); $this->setData(['config', 'connect', 'attempt',999]);
$this->setData(['config', 'connect', 'timeout',0]); $this->setData(['config', 'connect', 'timeout',0]);

0
core/layout/blank.php Executable file → Normal file
View File

0
core/layout/light.php Executable file → Normal file
View File

0
core/layout/mail.php Executable file → Normal file
View File

0
core/layout/main.php Executable file → Normal file
View File

0
core/module/config/config.php Executable file → Normal file
View File

0
core/module/config/view/backup/backup.php Executable file → Normal file
View File

0
core/module/config/view/index/index.js.php Executable file → Normal file
View File

0
core/module/config/view/index/index.php Executable file → Normal file
View File

0
core/module/config/view/manage/manage.php Executable file → Normal file
View File

0
core/module/config/view/restore/restore.php Executable file → Normal file
View File

0
core/module/config/view/script/script.php Executable file → Normal file
View File

0
core/module/install/install.php Executable file → Normal file
View File

0
core/module/install/ressource/defaultdata.php Executable file → Normal file
View File

0
core/module/install/view/index/index.js.php Executable file → Normal file
View File

0
core/module/install/view/index/index.php Executable file → Normal file
View File

0
core/module/install/view/update/update.js.php Executable file → Normal file
View File

0
core/module/install/view/update/update.php Executable file → Normal file
View File

0
core/module/maintenance/maintenance.php Executable file → Normal file
View File

0
core/module/maintenance/view/index/index.php Executable file → Normal file
View File

0
core/module/page/page.php Executable file → Normal file
View File

0
core/module/page/view/edit/edit.js.php Executable file → Normal file
View File

0
core/module/page/view/edit/edit.php Executable file → Normal file
View File

0
core/module/search/search.php Executable file → Normal file
View File

0
core/module/search/view/index/index.php Executable file → Normal file
View File

0
core/module/search/view/result/result.php Executable file → Normal file
View File

0
core/module/sitemap/sitemap.php Executable file → Normal file
View File

0
core/module/sitemap/view/index/index.php Executable file → Normal file
View File

0
core/module/theme/theme.php Executable file → Normal file
View File

0
core/module/theme/view/admin/admin.js.php Executable file → Normal file
View File

0
core/module/theme/view/admin/admin.php Executable file → Normal file
View File

0
core/module/theme/view/advanced/advanced.js.php Executable file → Normal file
View File

0
core/module/theme/view/advanced/advanced.php Executable file → Normal file
View File

0
core/module/theme/view/body/body.js.php Executable file → Normal file
View File

0
core/module/theme/view/body/body.php Executable file → Normal file
View File

0
core/module/theme/view/footer/footer.js.php Executable file → Normal file
View File

0
core/module/theme/view/footer/footer.php Executable file → Normal file
View File

0
core/module/theme/view/header/header.js.php Executable file → Normal file
View File

0
core/module/theme/view/header/header.php Executable file → Normal file
View File

0
core/module/theme/view/index/index.js.php Executable file → Normal file
View File

0
core/module/theme/view/index/index.php Executable file → Normal file
View File

0
core/module/theme/view/manage/manage.php Executable file → Normal file
View File

0
core/module/theme/view/menu/menu.js.php Executable file → Normal file
View File

0
core/module/theme/view/menu/menu.php Executable file → Normal file
View File

0
core/module/theme/view/site/site.js.php Executable file → Normal file
View File

0
core/module/theme/view/site/site.php Executable file → Normal file
View File

0
core/module/user/user.php Executable file → Normal file
View File

0
core/module/user/view/add/add.js.php Executable file → Normal file
View File

0
core/module/user/view/add/add.php Executable file → Normal file
View File

0
core/module/user/view/edit/edit.js.php Executable file → Normal file
View File

0
core/module/user/view/edit/edit.php Executable file → Normal file
View File

0
core/module/user/view/forgot/forgot.php Executable file → Normal file
View File

0
core/module/user/view/index/index.js.php Executable file → Normal file
View File

0
core/module/user/view/index/index.php Executable file → Normal file
View File

0
core/module/user/view/login/login.php Executable file → Normal file
View File

0
core/module/user/view/reset/reset.php Executable file → Normal file
View File

0
core/vendor/filemanager/UploadHandler.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/ajax_calls.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/config/config.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/dialog.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/execute.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/force_download.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/include/FtpClient.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/include/FtpException.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/include/FtpWrapper.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/include/Response.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/include/ftp_class.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/include/mime_type_lib.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/include/php_image_magician.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/include/utils.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/index.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/az_AZ.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/bg_BG.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/ca.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/cs.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/da.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/de.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/el_GR.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/en_EN.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/es.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/fa.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/fr_FR.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/he_IL.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/hr.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/hu_HU.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/id.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/it.php vendored Executable file → Normal file
View File

0
core/vendor/filemanager/lang/ja.php vendored Executable file → Normal file
View File

Some files were not shown because too many files have changed in this diff Show More