From 1032877b50b6a0cd7b892320f0c50cdb15cc789f Mon Sep 17 00:00:00 2001
From: Prof Langues <Prof_LVE@EDU.UA>
Date: Fri, 7 Feb 2020 09:11:22 +0100
Subject: [PATCH] [10.0.029.dev] suppression de warning lors d el'installation
 - faviconDark

---
 core/core.php                                    |   3 ++-
 core/module/install/install.php                  |  14 ++++++++++----
 .../ressource/file/source/faviconDark.ico        | Bin 0 -> 1150 bytes
 site/data/.htaccess                              |   2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 core/module/install/ressource/file/source/faviconDark.ico

diff --git a/core/core.php b/core/core.php
index 3861733e..42aa8a8a 100644
--- a/core/core.php
+++ b/core/core.php
@@ -34,7 +34,7 @@ class common {
 	const TEMP_DIR = 'site/tmp/';
 
 	// Numéro de version 
-	const ZWII_VERSION = '10.0.028.dev';
+	const ZWII_VERSION = '10.0.029.dev';
 
 	public static $actions = [];
 	public static $coreModuleIds = [
@@ -1061,6 +1061,7 @@ class common {
 		}
 		// Version 10.0.00
 		if($this->getData(['core', 'dataVersion']) < 10000) {
+			$this->setData(['config', 'faviconDark','faviconDark.ico']);
 			$this->setData(['core', 'dataVersion', 10000]);
 		}		
 	}
diff --git a/core/module/install/install.php b/core/module/install/install.php
index 3e61511a..512b0216 100755
--- a/core/module/install/install.php
+++ b/core/module/install/install.php
@@ -51,13 +51,19 @@ class install extends common {
 				$userLastname = $this->getInput('installLastname', helper::FILTER_STRING_SHORT, true);
 				$userMail = $this->getInput('installMail', helper::FILTER_MAIL, true);
 				$userId = $this->getInput('installId', helper::FILTER_ID, true);
-				// Copie la bannière par défaut
-				mkdir(self::FILE_DIR.'source/banner/');
-				mkdir(self::FILE_DIR.'thumb/banner/');
+				// Bannière par défaut
+				// Créer les dossiers
+				if (!is_dir(self::FILE_DIR.'source/banner/')) {
+					mkdir(self::FILE_DIR.'source/banner/');}
+				if (!is_dir(self::FILE_DIR.'thumb/banner/')) {					
+					mkdir(self::FILE_DIR.'thumb/banner/');
+					}
+				// Copier les fichiers
 				copy('core/module/install/ressource/file/source/banner960.jpg',self::FILE_DIR.'source/banner/banner960.jpg');
 				copy('core/module/install/ressource/file/thumb/banner960.jpg',self::FILE_DIR.'thumb/banner/banner960.jpg');
-				// Copie l'icône de favori
+				// Copie des icônes
 				copy('core/module/install/ressource/file/source/favicon.ico',self::FILE_DIR.'source/favicon.ico'); 
+				copy('core/module/install/ressource/file/source/faviconDark.ico',self::FILE_DIR.'source/faviconDark.ico'); 
 				// Configure certaines données par défaut
 				if ($this->getInput('installDefaultData',helper::FILTER_BOOLEAN) === TRUE) {					
 					$this->initData('page','fr',true);
diff --git a/core/module/install/ressource/file/source/faviconDark.ico b/core/module/install/ressource/file/source/faviconDark.ico
new file mode 100644
index 0000000000000000000000000000000000000000..2063f4bf0645d587b0f8d9310f00a0ee09a53310
GIT binary patch
literal 1150
zcmb7^F-pWx6h#vhL_|oVtz#hyVqq;VK&BK|V4)xuE<mybv9J;g5pfA(W$g+qEG<Pu
z#KJ0`GvvYJBg}Y*Gynek-phQFFjZCaX_`T$4yUVXk#!9k7(hMx#!xHObzNPs%Kidg
z;JZg}X07bc`<D7RwKU|J@aN+OQ~j*C#xT_;wa&zEKTSH6`kZmzds6C+-~={%^zTq=
zgP=V7E7=mn*<xKLvzF!TP7d(95Hp@_CGGd{S<dJ4|FE9}=eHrWg)y52dqSSy{J9T4
z`@PvgpSkRVnS6k9W(v$&2(4qxX25q&^k&vVrx-I?fVl2$%A+3Z9W~{%a3*rsV+dVh
z<{|2Ov(OPHYI(hh2G%cl?9qp=F?pu+SJC*#>KWpmm2-JNr0)TI9&!)9C%I?j%m0J_
G?tcNUhJ;N3

literal 0
HcmV?d00001

diff --git a/site/data/.htaccess b/site/data/.htaccess
index 9dd60d3f..279d74aa 100755
--- a/site/data/.htaccess
+++ b/site/data/.htaccess
@@ -1,5 +1,5 @@
 # Bloque l'accès aux données
-<FilesMatch "\.json$">
+<FilesMatch "\.json">
 	Order deny,allow
 	Deny from all
 </FilesMatch>