diff --git a/_sakura/sakura.php b/_sakura/sakura.php index 85523db..896bdf9 100644 --- a/_sakura/sakura.php +++ b/_sakura/sakura.php @@ -7,45 +7,45 @@ // Declare namespace namespace Sakura; -// Start output buffering -ob_start(); -print '2'; -// Define Sakura version -define('SAKURA_VERSION', '20150330'); -print '3'; -// Define Sakura Path -define('ROOT_DIRECTORY', str_replace('_sakura', '', dirname(__FILE__))); -print '4'; // Error Reporting: 0 for production and -1 for testing error_reporting(-1); -print '5'; + +// Start output buffering +ob_start(); + +// Define Sakura version +define('SAKURA_VERSION', '20150330'); + +// Define Sakura Path +define('ROOT_DIRECTORY', str_replace('_sakura', '', dirname(__FILE__))); + // Include Configuration require_once ROOT_DIRECTORY .'_sakura/config/config.php'; -print '6'; + // Include libraries -require_once ROOT_DIRECTORY .'_sakura/vendor/autoload.php';print ':twig'; -require_once ROOT_DIRECTORY .'_sakura/components/Main.php';print ':main'; -require_once ROOT_DIRECTORY .'_sakura/components/Hashing.php';print ':hash'; -require_once ROOT_DIRECTORY .'_sakura/components/Configuration.php';print ':conf'; -require_once ROOT_DIRECTORY .'_sakura/components/Templates.php';print ':temp'; -require_once ROOT_DIRECTORY .'_sakura/components/Sessions.php';print ':sess'; -require_once ROOT_DIRECTORY .'_sakura/components/Users.php';print ':user:'; -print '7'; +require_once ROOT_DIRECTORY .'_sakura/vendor/autoload.php'; +require_once ROOT_DIRECTORY .'_sakura/components/Main.php'; +require_once ROOT_DIRECTORY .'_sakura/components/Hashing.php'; +require_once ROOT_DIRECTORY .'_sakura/components/Configuration.php'; +require_once ROOT_DIRECTORY .'_sakura/components/Templates.php'; +require_once ROOT_DIRECTORY .'_sakura/components/Sessions.php'; +require_once ROOT_DIRECTORY .'_sakura/components/Users.php'; + // Generate path to database driver $_DBNGNPATH = ROOT_DIRECTORY .'_sakura/components/database/'. $sakuraConf['db']['driver'] .'.php'; -print '8'; + // Include database driver if(file_exists($_DBNGNPATH)) require_once $_DBNGNPATH; else die('

Failed to load database driver.

'); -print '9'; + // Set Error handler set_error_handler(array('Sakura\Main', 'ErrorHandler')); -print 'x1'; + // Initialise Flashii Class Main::init($sakuraConf); -print 'x2'; + // Set base page rendering data $renderData = array( 'sakura' => [ @@ -62,4 +62,3 @@ $renderData = array( 'loggedin' => Users::loggedIn() ] ); -print 'x3';