From 89655d93beea770254f608459909c9dfae2f1948 Mon Sep 17 00:00:00 2001 From: Cameron Ball Date: Tue, 25 Nov 2014 17:15:34 +0800 Subject: [PATCH] Cleanup this sick filth. --- Controllers/FileController.php | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/Controllers/FileController.php b/Controllers/FileController.php index 656a182..4b627db 100644 --- a/Controllers/FileController.php +++ b/Controllers/FileController.php @@ -30,25 +30,9 @@ class FileController implements IDivineController // list simfiles public function serveBannerAction($hash) { - if($hash == 'default') - { - $file = '../files/banners/default.png'; - $this->_response->setHeader('Content-Type', 'image/png') - ->setHeader('Content-Length', filesize($file)) - ->setBody(file_get_contents($file)) - ->sendResponse(); - } - $file = $this->_fileRepository->findByHash($hash); - - if(!$file) - { - $this->_response->setHeader('HTTP/1.0 404 Not Found', 'Nothing to see here') - ->setBody('Move along.') - ->sendResponse(); - - return; - } + if($hash == 'default') $this->serveDefaultBanner(); + if(!$file) $this->notFound(); $match = reset(glob('../files/' . $file->getPath() . '/' . $file->getHash() . '.*')); @@ -57,4 +41,22 @@ class FileController implements IDivineController ->setBody(file_get_contents($match)) ->sendResponse(); } + + private function serveDefaultBanner() + { + $file = '../files/banners/default.png'; + $this->_response->setHeader('Content-Type', 'image/png') + ->setHeader('Content-Length', filesize($file)) + ->setBody(file_get_contents($file)) + ->sendResponse(); + exit(); + } + + private function notFound() + { + $this->_response->setHeader('HTTP/1.0 404 Not Found', 'Nothing to see here') + ->setBody('Move along.') + ->sendResponse(); + exit(); + } } -- 2.11.0