ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 145 Activity

[10.0.21.dev] chargement des modules

This commit is contained in:
fredtempez 2019-10-06 15:02:56 +02:00
parent 21c63e337c
commit bcb19fd01d
6 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/core.php
View File

@ -14,10 +14,6 @@
* @link http://zwiicms.com/
*/
// Classes personnalisées
require_once "core/vendor/autoload.php";
// Classe internes
class common {
const DISPLAY_RAW = 0;
const DISPLAY_JSON = 1;
@ -35,7 +31,7 @@ class common {
const TEMP_DIR = 'site/tmp/';
// Numéro de version
const ZWII_VERSION = '10.0.20.dev';
const ZWII_VERSION = '10.0.21.dev';
public static $actions = [];
public static $coreModuleIds = [
@ -116,7 +112,7 @@ class common {
// 'codemirror', // Désactivé par défaut
'tippy',
'zwiico',
'imagemap',
// 'imagemap',
'simplelightbox'
],
'view' => ''
@ -317,7 +313,9 @@ class common {
public function deleteData($keys) {
//Retourne une chaine contenant le dossier à créer
$folder = $this->dirData ($keys[0],$this->geti18n());
// Constructeur
// Constructeur JsonDB
require_once "core/vendor/jsondb/Dot.php";
require_once "core/vendor/jsondb/JsonDb.php";
$db = new \Prowebcraft\JsonDb([
'name' => $keys[0] . '.json',
'dir' => $folder,
@ -421,7 +419,9 @@ class common {
if (count($keys) >= 1) {
//Retourne une chaine contenant le dossier à créer
$folder = $this->dirData ($keys[0],$this->geti18n());
// Constructeur du module de sauvegarde
// Constructeur JsonDB
require_once "core/vendor/jsondb/Dot.php";
require_once "core/vendor/jsondb/JsonDb.php";
$db = new \Prowebcraft\JsonDb([
'name' => $keys[0] . '.json',
'dir' => $folder,
@ -756,7 +756,7 @@ class common {
public function createSitemap($command = "all") {
//require_once "core/vendor/sitemap/SitemapGenerator.php";
require_once "core/vendor/sitemap/SitemapGenerator.php";
$timezone = $this->getData(['config','timezone']);
@ -906,7 +906,9 @@ class common {
//Retourne une chaine contenant le dossier à créer
$folder = $this->dirData ($keys[0],$this->geti18n());
// Constructeur
// Constructeur JsonDB
require_once "core/vendor/jsondb/Dot.php";
require_once "core/vendor/jsondb/JsonDb.php";
$db = new \Prowebcraft\JsonDb([
'name' => $keys[0] . '.json',
'dir' => $folder,
@ -956,7 +958,9 @@ class common {
mkdir (self::DATA_DIR . '/' . $lang);
}
$folder = $this->dirData ($module,$lang);
// Constructeur
// Constructeur JsonDB
require_once "core/vendor/jsondb/Dot.php";
require_once "core/vendor/jsondb/JsonDb.php";
$db = new \Prowebcraft\JsonDb([
'name' => $module . '.json',
'dir' => $folder,
@ -1111,8 +1115,8 @@ class common {
}
// Version 10.0.00
if($this->getData(['core', 'dataVersion']) < 10000) {
$this->setData(['page',$this->getData(['config','homePageId']),'homePageId', true]);
$this->deleteData(['config','homePageId']);
//$this->setData(['page',$this->getData(['config','homePageId']),'homePageId', true]);
//$this->deleteData(['config','homePageId']);
$this->setData(['core', 'dataVersion', 10000]);
}

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

@ -12,6 +12,7 @@
* @link http://zwiicms.com/
*/
class install extends common {
public static $actions = [
@ -86,7 +87,10 @@ class install extends common {
'mail' => $userMail,
'password' => $this->getInput('installPassword', helper::FILTER_PASSWORD, true)
]
]);
]);
// phpMailer
require_once "core/vendor/phpmailer/phpmailer.php";
require_once "core/vendor/phpmailer/exception.php";
// Envoie le mail
$sent = $this->sendMail(
$userMail,

9
core/module/user/user.php
View File

@ -12,6 +12,7 @@
* @link http://zwiicms.com/
*/
class user extends common {
public static $actions = [
@ -72,7 +73,10 @@ class user extends common {
}
// Envoie le mail
$sent = true;
if($this->getInput('userAddSendMail', helper::FILTER_BOOLEAN) && $check === true) {
if($this->getInput('userAddSendMail', helper::FILTER_BOOLEAN) && $check === true) {
// phpMailer
require_once "core/vendor/phpmailer/phpmailer.php";
require_once "core/vendor/phpmailer/exception.php";
$sent = $this->sendMail(
$userMail,
'Compte créé sur ' . $this->getData(['config', 'title']),
@ -261,6 +265,9 @@ class user extends common {
$this->setData(['user', $userId, 'forgot', time()]);
// Crée un id unique pour la réinitialisation
$uniqId = md5(json_encode($this->getData(['user', $userId])));
// phpMailer
require_once "core/vendor/phpmailer/phpmailer.php";
require_once "core/vendor/phpmailer/exception.php";
// Envoi le mail
$sent = $this->sendMail(
$this->getData(['user', $userId, 'mail']),

9
core/vendor/autoload.php vendored
View File

@ -1,9 +0,0 @@
<?php
// JsonDB
require "core/vendor/jsondb/Dot.php";
require "core/vendor/jsondb/JsonDb.php";
// phpMailer
require "core/vendor/phpmailer/phpmailer.php";
require "core/vendor/phpmailer/exception.php";
// Sitemap Creator
require "core/vendor/sitemap/SitemapGenerator.php";

5
module/blog/blog.php
View File

@ -12,6 +12,8 @@
* @link http://zwiicms.com/
*/
class blog extends common {
public static $actions = [
@ -349,6 +351,9 @@ class blog extends common {
}
// Envoi du mail $sent code d'erreur ou de réusssite
if ($this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'mailNotification']) === true) {
// phpMailer
require_once "core/vendor/phpmailer/phpmailer.php";
require_once "core/vendor/phpmailer/exception.php";
$sent = $this->sendMail(
$to,
'Nouveau commentaire',

6
module/form/form.php
View File

@ -14,6 +14,7 @@
* @link http://zwiicms.com/
*/
class form extends common {
public static $actions = [
@ -353,7 +354,10 @@ class form extends common {
$subject = $this->getData(['module', $this->getUrl(0), 'config', 'subject']);
if($subject === '') {
$subject = 'Nouveau message en provenance de votre site';
}
}
// phpMailer
require_once "core/vendor/phpmailer/phpmailer.php";
require_once "core/vendor/phpmailer/exception.php";
// Envoi le mail
$sent = $this->sendMail(
$to,