updates

Author: webdevlabs

.gitignore

@@ -1,4 +1,6 @@
 vendor/*
+config/*.php
+!config/base.php
 storage/cache/smarty/*
 storage/cache/stash/*
 storage/languages/*

bootstrap.php

@@ -23,40 +23,43 @@
 /**
  * Load BASE config first
  */
-include __DIR__ . '/config/base.php';
+require_once __DIR__ . '/config/base.php';
 
 /**
  * Load AutoLoaders
  */
-include __DIR__ . '/system/functions.php';
-include __DIR__ . '/system/autoload.php';
-include __DIR__ . '/vendor/autoload.php';
+require_once __DIR__ . '/system/functions.php';
+require_once __DIR__ . '/system/autoload.php';
+require_once __DIR__ . '/vendor/autoload.php';
 
 /**
  * Load Dependency Injector Container (PHP-DI)
  */
 $container = DI\ContainerBuilder::buildDevContainer();
 
 /**
- * Load System Configs
+ * Load System Config
  */
-include __DIR__ . '/config/system.php';
-include __DIR__ . '/config/cache.php';
-include __DIR__ . '/config/database.php';
 $config = $container->get('System\Config');
 
+/**
+ * Load System Logger
+ */
+$logger = $container->get('System\Logger');
+
 /**
  * Load Cache Library (Stash)
  */
 $cachedriver = new Stash\Driver\FileSystem(['path'=>$config->cache['stash']['cachedir']]);
 $cache = new Stash\Pool($cachedriver);
 
+
 /**
  * Load Database
  * Create a new PDO connection to MySQL
  * Create a new static DB class object
  */
-System\DB::$c = (new System\Database($config))->connect();
+System\DB::$c = (new System\Database($container))->connect();
 
 /**
  * Load System Language 
@@ -99,7 +102,7 @@
 /**
  * Cache Routes
  */
-if ($config->system['cache_routes']) {
+if ($config->system['cache_routes']) {    
     $item = $cache->getItem('routes');
     $routesData = $item->get();
     if ($item->isMiss()) {
@@ -121,15 +124,16 @@
 /**
  * Load Middlewares
  */
-//Create a relay dispatcher and add some middlewares:
 use Psr7Middlewares\Middleware;
 $relay = new Relay\RelayBuilder();
 
+//Create a relay dispatcher and add some middlewares
 $relaydispatcher = $relay->newInstance([
     Middleware::basePath(BASE_PATH),
     Middleware::trailingSlash(),
     Middleware::responseTime(),
     new System\Middlewares\LanguageDetect($language),
     new System\Middlewares\Phroute($dispatcher)    
 ]);
+
 $response = $relaydispatcher($request, $response);

composer.lock

@@ -1,6 +1,5 @@
 <?php
 /* BASE SETTINGS */
 define('BASE_PATH',"/phreak"); // leave empty if not in subdir or "/phreak" for example subdir
-//define('BASE_URL',"http://localhost:8080".BASE_PATH);
 define('BASE_URL',"http://".$_SERVER['HTTP_HOST'].BASE_PATH);
 define('ROOT_DIR', dirname(__DIR__));

config/base.php

@@ -4,8 +4,10 @@
  */ 
 return [
     'site_key'=>'put_your_encryption_key_here',
-    'max_upload_size'=>'52428800', //filesize in bytes also depends on server settings inside php.ini (1MB=1048576bytes)
-    'session_expire'=>'30', // session TTL (time to live) in minutes
+    //filesize in bytes also depends on server settings inside php.ini (1MB=1048576bytes)
+    'max_upload_size'=>'52428800',
+    // session TTL (time to live) in minutes 
+    'session_expire'=>'30', 
     'websocket_server'=>'ws://127.0.0.1:12345',
     'cache_routes'=>true
 ];

config/system.php

@@ -1,14 +1,13 @@
 <?php
-define('SITE_KEY','put_your_encryption_key_here');
-
-/* BASE SETTINGS */
-define('BASE_PATH',"/phreak"); // leave empty if not in subdir or "/phreak" for example subdir
-//define('BASE_URL',"http://localhost:8080".BASE_PATH);
-define('BASE_URL',"http://".$_SERVER['HTTP_HOST'].BASE_PATH);
-define('ROOT_DIR', dirname(__DIR__));
-
-/* OTHERS */
-// filesize in bytes also depends on server settings inside php.ini (1MB=1048576bytes)
-define('MAX_UPLOAD_SIZE','52428800');
-define('SESSION_EXPIRE','30'); // session TTL (time to live) in minutes
-define('WEBSOCKET_SERVER','ws://127.0.0.1:12345');
+/**
+ * SYSTEM CONFIG 
+ */ 
+return [
+    'site_key'=>'put_your_encryption_key_here',
+    //filesize in bytes also depends on server settings inside php.ini (1MB=1048576bytes)
+    'max_upload_size'=>'52428800',
+    // session TTL (time to live) in minutes 
+    'session_expire'=>'30', 
+    'websocket_server'=>'ws://127.0.0.1:12345',
+    'cache_routes'=>true
+];

config/system.php.sample

@@ -18,7 +18,6 @@ echo "Copying sample configs...\n";
 copyFiles([
     "config/system.php.sample"=>"config/system.php",
     "config/cache.php.sample"=>"config/cache.php",
-    "config/database.php.sample"=>"config/database.php",
     "config/modules.php.sample"=>"config/modules.php"            
 ]);
 echo "\nPhreak! has been successfuly installed!\n";

installer

@@ -1,4 +1,7 @@
 <?php
+/**
+ * DEFAULT ROUTES
+ */
 
 // Add default homepage route
 $router->get('/', ['App\HomeController','showIndex']);
@@ -12,4 +15,4 @@
         ]);
     $template->display('layout.tpl');
 });
-*/
+*/

routes.php

@@ -26,7 +26,6 @@ public function __get($name) {
 	}
 
     public function build ($conf) {
-//        echo "Building conf...<br/>";
         foreach ($this->configfiles as $cfgkey => $cfgfile) {
             if (is_readable($cfgfile)) {
                 $conf[$cfgkey]=include($cfgfile);

system/Config.php

@@ -1,12 +1,15 @@
 <?php
 namespace System;
+use DI\Container;
 
 class Database {
-    public function __construct (Config $conf) {
-        $this->conf = $conf;
+    public function __construct (Container $container) {
+        $this->conf = $container->get('System\Config');
+        $this->log = $container->get('System\Logger');
     }
 
     public function connect () {
+        if ($this->conf->database) {
         /** Create a new PDO connection to MySQL **/
         try {
             $pdo = new \PDO(
@@ -24,9 +27,10 @@ public function connect () {
             $pdo->exec("SET CHARACTER_SET_CONNECTION=".$this->conf->database['mysql']['charset']);
             $pdo->exec("SET SQL_MODE = ''");
         } catch (\PDOException $err) {
-            die('Unable to connect to database: ' . $err->getMessage());
+            $this->log->write('system','error','Unable to connect to database: ' . $err->getMessage());
         }
 
         return $pdo;    
     }
+    }
 }