Merge branch 'master' into formatting

bin/fatfree

@@ -8,7 +8,7 @@ foreach([ __DIR__.'/../vendor/autoload.php', __DIR__.'/../../../autoload.php' ]
 	}
 }
 
-define("DEVTOOLS_VERSION", '0.1.2');
+define("DEVTOOLS_VERSION", '0.3.1');
 
 $fw = Base::instance();
 $fw->DEBUG = 3;

config/webtools_config.ini

@@ -10,7 +10,7 @@ PROJECT_CONFIG = {{ @PROJECT_DATA_DIR.'project_config' }}
 CACHE = false
 
 [routes]
-GET / = n0nag0n\Root_Controller->index
+GET / = n0nag0n\Index_Controller->index
 GET /init-environment = n0nag0n\Init_Environment_Controller->indexAction
 GET /init-environment/build = n0nag0n\Init_Environment_Controller->build
 GET /init-environment/@page = n0nag0n\Init_Environment_Controller->pageAction
@@ -40,4 +40,4 @@ GET /manage-composer = n0nag0n\Manage_Composer_Controller->indexAction
 
 [maps]
 
-[redirects]
+[redirects]

controllers/Base_Controller.php

@@ -9,13 +9,13 @@ abstract class Base_Controller {
 
 	public function __construct(\Base $fw) {
 		$this->fw = $fw;
-		$has_been_initted = $this->hasBeenInitted();
-		if($this->hasBeenInitted() === false && strpos($this->fw->URI, '/init-environment') === false) {
+		$has_been_inited = $this->hasBeenInited();
+		if($this->hasBeenInited() === false && strpos($this->fw->URI, '/init-environment') === false) {
 			$this->fw->reroute('/init-environment', false);
 		}
 
-		$this->fw->set('has_been_initted', $has_been_initted);
-		if($has_been_initted) {
+		$this->fw->set('has_been_inited', $has_been_inited);
+		if($has_been_inited) {
 			$project_config = new Project_Config($fw->DB);
 			$project_config->load();
 			$this->fw->set('project_config', $project_config);
@@ -28,7 +28,7 @@ public function renderHtml(string $file_path, array $hive = []): void {
 		echo \Template::instance()->render('layout.htm');
 	}
 
-	public function hasBeenInitted(): bool {
+	public function hasBeenInited(): bool {
 		return file_exists($this->fw->PROJECT_CONFIG);
 	}
 }

controllers/Index_Controller.php

@@ -4,14 +4,16 @@
 
 namespace n0nag0n;
 
-class Root_Controller extends Base_Controller {
+class Index_Controller extends Base_Controller {
+
 	public function index(\Base $fw): void {
 
 		// if the main config file is missing, start initing this bad boy
-		if(!$fw->has_been_initted) {
-			$fw->reroute('/init-environment', false);
+		if(!$fw->has_been_inited) {
+			$fw->reroute('/init-environment');
 		}
 
 		$this->renderHtml('index/index.htm');
 	}
+
 }

ui/layout.htm

@@ -18,7 +18,7 @@
 		</button>
 
 		<div class="collapse navbar-collapse" id="navbarsExampleDefault">
-			<check if="{{ @has_been_initted }}">
+			<check if="{{ @has_been_inited }}">
 				<ul class="navbar-nav mr-auto">
 					<li class="nav-item {{ strpos(@URI, 'controllers') !== false ? 'active' : '' }}">
 						<a class="nav-link" href="/controllers">Controllers</a>