From 55b7948891bb1a3d198996725e40b2fc32f6a5a7 Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Sun, 8 Mar 2015 06:36:00 +0100
Subject: [PATCH] More direct porting over from sockhub without testing

---
 _sakura/components/Main.php | 54 ++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/_sakura/components/Main.php b/_sakura/components/Main.php
index 9ecb39d..54d8d95 100644
--- a/_sakura/components/Main.php
+++ b/_sakura/components/Main.php
@@ -7,33 +7,44 @@ namespace Flashii;
 
 class Flashii {
 
-	public static $_CONF;
-	public static $_DB;
-    public $twig;
-
+	public $_TPL;
+	public $_MD;
+    public static $_CNF;
+    public static $_TPLPUBPATH;
+    
 	// Constructor
 	function __construct($config) {
+        
 		// Stop the execution if the PHP Version is older than 5.4.0
 		if(version_compare(phpversion(), '5.4.0', '<'))
 			die('<h3>Upgrade your PHP Version to at least PHP 5.4!</h3>');
 	
-		// Assign $config values to $_CONF
-		self::$_CONF = $config;
+        // Start session
+        if(session_status() != PHP_SESSION_ACTIVE)
+            session_start();
+    
+		// Configuration Management and local configuration
+		Configuration::init($config);
 		
-		// Initialise database
-		self::$_DB = new Database();
+		// Database
+		Database::init();
+        
+        // "Dynamic" Configuration
+        Configuration::initDB();
+        
+        // Templating engine
+        $this->initTwig();
+        
+        // Markdown Parser
+        $this->initParsedown();
+        
 	}
     
-	// Get values from the configuration
-	public static function getConfig($key, $subkey = null) {
-		if(array_key_exists($key, self::$_CONF)) {
-			if($subkey)
-				return self::$_CONF[$key][$subkey];
-			else
-				return self::$_CONF[$key];
-		} else {
-			return false;
-        }
+	// Alias for Configuration::getConfig(), only exists because I'm lazy
+	public static function getConfig($key) {
+        
+		return Configuration::getConfig($key);
+        
 	}
     
     // Initialise Twig
@@ -49,6 +60,13 @@ class Flashii {
         $this->twig = new \Twig_Environment($twigLoader, array(
            // 'cache' => $satoko['cacheFolder']
         ));
+    }
+    
+    // Initialise Parsedown
+    private function initParsedown() {
+        
+        $this->_MD = new \Parsedown();
+        
     }
 	
 	// Error Handler