Class structure

3 months ago · 1569912204
parent a22d013776
commit 1569912204
5 changed files with 13 additions and 7 deletions
--- a/core/class/router.class.php
+++ b/core/class/router.class.php
@ -1,4 +1,12 @@
 <?php
+
+/**
+ * Chargement des classes filles
+ * router : aiguillage des pages
+ */
+
+require_once('core/class/layout.class.php');
+
 class core extends common
 {

@ -453,6 +461,10 @@ class core extends common
 	 */
 	public function router()
 	{
+
+		// 		
+		$layout = new layout($this);
+
 		// Installation
 		if (
 			$this->getData(['user']) === []
--- a/core/core.php
+++ b/core/core.php
@ -15,12 +15,9 @@

 /**
 * Chargement des classes filles
- * layout : composition des écrans
 * router : aiguillage des pages
 */
-require_once('class/layout.class.php');
-require_once('class/router.class.php');
-
+require_once('core/class/router.class.php');

 class common
 {
--- a/core/layout/blank.php
+++ b/core/layout/blank.php
@ -1,4 +1,3 @@
-<?php $layout = new layout($this); ?>
 <!DOCTYPE html>
 <html prefix="og: http://ogp.me/ns#" lang="<?php echo substr(self::$i18nContent, 0, 2); ?>">
 <head>
--- a/core/layout/light.php
+++ b/core/layout/light.php
@ -1,4 +1,3 @@
-<?php $layout = new layout($this); ?>
 <!DOCTYPE html>
 <html prefix="og: http://ogp.me/ns#" lang="<?php echo substr(self::$i18nContent, 0, 2); ?>">
 <head>
--- a/core/layout/main.php
+++ b/core/layout/main.php
@ -1,4 +1,3 @@
-<?php $layout = new layout($this); ?>
 <!DOCTYPE html>
 <html prefix="og: http://ogp.me/ns#" lang="<?php echo substr(self::$i18nContent, 0, 2); ?>">
 <head>