Browse Source

Merge branch 'master' into dev

pull/9/head
Fred 2 years ago
parent
commit
c6aee2862f
  1. 1
      CHANGES.md
  2. 4
      README.md
  3. 0
      core/class/SitemapGenerator.class.php
  4. 0
      core/class/autoload.php
  5. 0
      core/class/helper.class.php
  6. 0
      core/class/jsondb/Dot.class.php
  7. 0
      core/class/jsondb/JsonDb.class.php
  8. 0
      core/class/phpmailer/Exception.class.php
  9. 0
      core/class/phpmailer/PHPMailer.class.php
  10. 0
      core/class/phpmailer/SMTP.class.php
  11. 0
      core/class/template.class.php
  12. 0
      core/core.js.php
  13. 12
      core/core.php
  14. 0
      core/layout/blank.php
  15. 0
      core/layout/light.php
  16. 0
      core/layout/mail.php
  17. 0
      core/layout/main.php
  18. 0
      core/module/config/config.php
  19. 0
      core/module/config/view/backup/backup.php
  20. 0
      core/module/config/view/index/index.js.php
  21. 0
      core/module/config/view/index/index.php
  22. 0
      core/module/config/view/manage/manage.php
  23. 0
      core/module/config/view/restore/restore.php
  24. 0
      core/module/config/view/script/script.php
  25. 0
      core/module/install/install.php
  26. 0
      core/module/install/ressource/defaultdata.php
  27. 0
      core/module/install/view/index/index.js.php
  28. 0
      core/module/install/view/index/index.php
  29. 0
      core/module/install/view/update/update.js.php
  30. 0
      core/module/install/view/update/update.php
  31. 0
      core/module/maintenance/maintenance.php
  32. 0
      core/module/maintenance/view/index/index.php
  33. 0
      core/module/page/page.php
  34. 0
      core/module/page/view/edit/edit.js.php
  35. 0
      core/module/page/view/edit/edit.php
  36. 0
      core/module/search/search.php
  37. 0
      core/module/search/view/index/index.php
  38. 0
      core/module/search/view/result/result.php
  39. 0
      core/module/sitemap/sitemap.php
  40. 0
      core/module/sitemap/view/index/index.php
  41. 0
      core/module/theme/theme.php
  42. 0
      core/module/theme/view/admin/admin.js.php
  43. 0
      core/module/theme/view/admin/admin.php
  44. 0
      core/module/theme/view/advanced/advanced.js.php
  45. 0
      core/module/theme/view/advanced/advanced.php
  46. 0
      core/module/theme/view/body/body.js.php
  47. 0
      core/module/theme/view/body/body.php
  48. 0
      core/module/theme/view/footer/footer.js.php
  49. 0
      core/module/theme/view/footer/footer.php
  50. 0
      core/module/theme/view/header/header.js.php
  51. 0
      core/module/theme/view/header/header.php
  52. 0
      core/module/theme/view/index/index.js.php
  53. 0
      core/module/theme/view/index/index.php
  54. 0
      core/module/theme/view/manage/manage.php
  55. 0
      core/module/theme/view/menu/menu.js.php
  56. 0
      core/module/theme/view/menu/menu.php
  57. 0
      core/module/theme/view/site/site.js.php
  58. 0
      core/module/theme/view/site/site.php
  59. 0
      core/module/user/user.php
  60. 0
      core/module/user/view/add/add.js.php
  61. 0
      core/module/user/view/add/add.php
  62. 0
      core/module/user/view/edit/edit.js.php
  63. 0
      core/module/user/view/edit/edit.php
  64. 0
      core/module/user/view/forgot/forgot.php
  65. 0
      core/module/user/view/index/index.js.php
  66. 0
      core/module/user/view/index/index.php
  67. 0
      core/module/user/view/login/login.php
  68. 0
      core/module/user/view/reset/reset.php
  69. 0
      core/vendor/filemanager/UploadHandler.php
  70. 0
      core/vendor/filemanager/ajax_calls.php
  71. 0
      core/vendor/filemanager/config/config.php
  72. 0
      core/vendor/filemanager/dialog.php
  73. 0
      core/vendor/filemanager/execute.php
  74. 0
      core/vendor/filemanager/force_download.php
  75. 0
      core/vendor/filemanager/include/FtpClient.php
  76. 0
      core/vendor/filemanager/include/FtpException.php
  77. 0
      core/vendor/filemanager/include/FtpWrapper.php
  78. 0
      core/vendor/filemanager/include/Response.php
  79. 0
      core/vendor/filemanager/include/ftp_class.php
  80. 0
      core/vendor/filemanager/include/mime_type_lib.php
  81. 0
      core/vendor/filemanager/include/php_image_magician.php
  82. 0
      core/vendor/filemanager/include/utils.php
  83. 0
      core/vendor/filemanager/index.php
  84. 0
      core/vendor/filemanager/lang/az_AZ.php
  85. 0
      core/vendor/filemanager/lang/bg_BG.php
  86. 0
      core/vendor/filemanager/lang/ca.php
  87. 0
      core/vendor/filemanager/lang/cs.php
  88. 0
      core/vendor/filemanager/lang/da.php
  89. 0
      core/vendor/filemanager/lang/de.php
  90. 0
      core/vendor/filemanager/lang/el_GR.php
  91. 0
      core/vendor/filemanager/lang/en_EN.php
  92. 0
      core/vendor/filemanager/lang/es.php
  93. 0
      core/vendor/filemanager/lang/fa.php
  94. 0
      core/vendor/filemanager/lang/fr_FR.php
  95. 0
      core/vendor/filemanager/lang/he_IL.php
  96. 0
      core/vendor/filemanager/lang/hr.php
  97. 0
      core/vendor/filemanager/lang/hu_HU.php
  98. 0
      core/vendor/filemanager/lang/id.php
  99. 0
      core/vendor/filemanager/lang/it.php
  100. 0
      core/vendor/filemanager/lang/ja.php
  101. Some files were not shown because too many files have changed in this diff Show More

1
CHANGES.md

@ -6,6 +6,7 @@
- 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.
- 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
- Mise à jour :

4
README.md

@ -1,11 +1,11 @@
![](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.
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)

0
core/class/SitemapGenerator.class.php

0
core/class/autoload.php

0
core/class/helper.class.php

0
core/class/jsondb/Dot.class.php

0
core/class/jsondb/JsonDb.class.php

0
core/class/phpmailer/Exception.class.php

0
core/class/phpmailer/PHPMailer.class.php

0
core/class/phpmailer/SMTP.class.php

0
core/class/template.class.php

0
core/core.js.php

12
core/core.php

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

0
core/layout/blank.php

0
core/layout/light.php

0
core/layout/mail.php

0
core/layout/main.php

0
core/module/config/config.php

0
core/module/config/view/backup/backup.php

0
core/module/config/view/index/index.js.php

0
core/module/config/view/index/index.php

0
core/module/config/view/manage/manage.php

0
core/module/config/view/restore/restore.php

0
core/module/config/view/script/script.php

0
core/module/install/install.php

0
core/module/install/ressource/defaultdata.php

0
core/module/install/view/index/index.js.php

0
core/module/install/view/index/index.php

0
core/module/install/view/update/update.js.php

0
core/module/install/view/update/update.php

0
core/module/maintenance/maintenance.php

0
core/module/maintenance/view/index/index.php

0
core/module/page/page.php

0
core/module/page/view/edit/edit.js.php

0
core/module/page/view/edit/edit.php

0
core/module/search/search.php

0
core/module/search/view/index/index.php

0
core/module/search/view/result/result.php

0
core/module/sitemap/sitemap.php

0
core/module/sitemap/view/index/index.php

0
core/module/theme/theme.php

0
core/module/theme/view/admin/admin.js.php

0
core/module/theme/view/admin/admin.php

0
core/module/theme/view/advanced/advanced.js.php

0
core/module/theme/view/advanced/advanced.php

0
core/module/theme/view/body/body.js.php

0
core/module/theme/view/body/body.php

0
core/module/theme/view/footer/footer.js.php

0
core/module/theme/view/footer/footer.php

0
core/module/theme/view/header/header.js.php

0
core/module/theme/view/header/header.php

0
core/module/theme/view/index/index.js.php

0
core/module/theme/view/index/index.php

0
core/module/theme/view/manage/manage.php

0
core/module/theme/view/menu/menu.js.php

0
core/module/theme/view/menu/menu.php

0
core/module/theme/view/site/site.js.php

0
core/module/theme/view/site/site.php

0
core/module/user/user.php

0
core/module/user/view/add/add.js.php

0
core/module/user/view/add/add.php

0
core/module/user/view/edit/edit.js.php

0
core/module/user/view/edit/edit.php

0
core/module/user/view/forgot/forgot.php

0
core/module/user/view/index/index.js.php

0
core/module/user/view/index/index.php

0
core/module/user/view/login/login.php

0
core/module/user/view/reset/reset.php

0
core/vendor/filemanager/UploadHandler.php vendored

0
core/vendor/filemanager/ajax_calls.php vendored

0
core/vendor/filemanager/config/config.php vendored

0
core/vendor/filemanager/dialog.php vendored

0
core/vendor/filemanager/execute.php vendored

0
core/vendor/filemanager/force_download.php vendored

0
core/vendor/filemanager/include/FtpClient.php vendored

0
core/vendor/filemanager/include/FtpException.php vendored

0
core/vendor/filemanager/include/FtpWrapper.php vendored

0
core/vendor/filemanager/include/Response.php vendored

0
core/vendor/filemanager/include/ftp_class.php vendored

0
core/vendor/filemanager/include/mime_type_lib.php vendored

0
core/vendor/filemanager/include/php_image_magician.php vendored

0
core/vendor/filemanager/include/utils.php vendored

0
core/vendor/filemanager/index.php vendored

0
core/vendor/filemanager/lang/az_AZ.php vendored

0
core/vendor/filemanager/lang/bg_BG.php vendored

0
core/vendor/filemanager/lang/ca.php vendored

0
core/vendor/filemanager/lang/cs.php vendored

0
core/vendor/filemanager/lang/da.php vendored

0
core/vendor/filemanager/lang/de.php vendored

0
core/vendor/filemanager/lang/el_GR.php vendored

0
core/vendor/filemanager/lang/en_EN.php vendored

0
core/vendor/filemanager/lang/es.php vendored

0
core/vendor/filemanager/lang/fa.php vendored

0
core/vendor/filemanager/lang/fr_FR.php vendored

0
core/vendor/filemanager/lang/he_IL.php vendored

0
core/vendor/filemanager/lang/hr.php vendored

0
core/vendor/filemanager/lang/hu_HU.php vendored

0
core/vendor/filemanager/lang/id.php vendored

0
core/vendor/filemanager/lang/it.php vendored

0
core/vendor/filemanager/lang/ja.php vendored

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

Loading…
Cancel
Save