Dispatch app explicitly

carlesjove · Jan 13, 2019 · 3adbd3a · 3adbd3a
1 parent 4cc6170
commit 3adbd3a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/a.php b/a.php
@@ -22,7 +22,29 @@ public function __construct($path)
     {
       $this->path = $this->ignore_ending_slash( explode('/', $path) );
       $this->layout = $this->as_file($this->layout);
-      $this->dispatch();
+    }
+
+    public function dispatch() {
+      try {
+        $this->find_matches();
+
+        // Include custom functions
+        if ( file_exists( $this->as_file('functions') ) ) {
+          include $this->as_file('functions');
+        }
+
+        if ( $this->uses_layout() ) {
+          include $this->global_data();
+          if ( $this->is_multilingual() and $this->current_lang ) {
+            include $this->global_data($this->current_lang);
+          }
+          include $this->layout;
+        } else {
+          $this->content();
+        }
+      } catch (Exception $e) {
+        echo $e->getMessage();
+      }
     }
 
     protected function find_matches() {
@@ -100,29 +122,6 @@ protected function content() {
       include $this->request;
     }
 
-    protected function dispatch() {
-      try {
-        $this->find_matches();
-
-        // Include custom functions
-        if ( file_exists( $this->as_file('functions') ) ) {
-          include $this->as_file('functions');
-        }
-
-        if ( $this->uses_layout() ) {
-          include $this->global_data();
-          if ( $this->is_multilingual() and $this->current_lang ) {
-            include $this->global_data($this->current_lang);
-          }
-          include $this->layout;
-        } else {
-          $this->content();
-        }
-      } catch (Exception $e) {
-        echo $e->getMessage();
-      }
-    }
-
     protected function global_data($lang = '') {
       if ( $lang != '' and file_exists( "data/langs/{$lang}/" . $this->as_file('global') ) ) {
         return "data/langs/{$lang}/" . $this->as_file('global');
@@ -199,4 +198,4 @@ public function lang($lang) {
     }
   }
 
-}
+}
diff --git a/index.php b/index.php
@@ -10,7 +10,8 @@
       A::generate_htaccess();
     }
     $path = isset($_GET['path']) ? $_GET['path'] : '';
-    new A( $path );
+    $a = new A( $path );
+    $a->dispatch();
   }
 } else {
   die("Could not find A");