simplify
authorMichael Wallner <mike@php.net>
Mon, 20 Jul 2015 12:46:28 +0000 (14:46 +0200)
committerMichael Wallner <mike@php.net>
Mon, 20 Jul 2015 12:46:28 +0000 (14:46 +0200)
mdref/Action.php
public/index.php

index e35b3f5f43bf5f2b9d59141e8cbcb70835cf2011..68f64a7edb8f41a4293af90ae4ce3d162187a68d 100644 (file)
@@ -38,6 +38,7 @@ class Action {
                $this->request = $req;
                $this->response = $res;
                $this->baseUrl = $baseUrl;
+               ob_start($res);
        }
 
        function esc($txt) {
@@ -72,6 +73,7 @@ class Action {
        private function serveCanonical($cnn) {
                $this->response->setHeader("Location", $this->baseUrl->mod(["path" => $cnn]));
                $this->response->setResponseCode(301);
+               $this->response->send();
        }
        
        /**
@@ -79,7 +81,8 @@ class Action {
         */
        private function serveStylesheet() {
                $this->response->setHeader("Content-Type", "text/css");
-               $this->esponse->setBody(new \http\Message\Body(fopen(ROOT."/public/index.css", "r")));
+               $this->response->setBody(new \http\Message\Body(fopen(ROOT."/public/index.css", "r")));
+               $this->response->send();
        }
        
        /**
@@ -88,6 +91,7 @@ class Action {
        private function serveJavascript() {
                $this->response->setHeader("Content-Type", "application/javascript");
                $this->response->setBody(new \http\Message\Body(fopen(ROOT."/public/index.js", "r")));
+               $this->response->send();
        }
        
        /**
@@ -116,6 +120,7 @@ class Action {
        private function serve() {
                extract((array) func_get_arg(0));
                include ROOT."/views/layout.phtml";
+               $this->response->send();
        }
        
        public function handle() {
index 853c0916398ec77e7878c34c8ec99ff8d5aaa2e0..56cf3a27fb6119c75db0cd626237eed489fe6a5d 100644 (file)
@@ -20,8 +20,4 @@ new ExceptionHandler;
 
 $reference = new Reference(($refs = getenv("REFPATH")) ? explode(PATH_SEPARATOR, $refs) : glob(ROOT."/refs/*"));
 $action = new Action($reference, new Request, new Response, new BaseUrl);
-
-ob_start($response);
 $action->handle();
-ob_end_flush();
-$response->send();