From 0a662e33ee432e2583a934cb161a0a1e5b49b76f Mon Sep 17 00:00:00 2001 From: Aaron Parecki Date: Sat, 17 Dec 2016 15:52:33 -0800 Subject: [PATCH] move logged-out routes to new file --- controllers/auth.php | 17 ----------------- controllers/controllers.php | 18 ------------------ controllers/editor.php | 1 - controllers/static.php | 37 +++++++++++++++++++++++++++++++++++++ public/index.php | 1 + 5 files changed, 38 insertions(+), 36 deletions(-) create mode 100644 controllers/static.php diff --git a/controllers/auth.php b/controllers/auth.php index e2242de..fb8b6da 100644 --- a/controllers/auth.php +++ b/controllers/auth.php @@ -4,23 +4,6 @@ function buildRedirectURI() { return Config::$base_url . 'auth/callback'; } -$app->get('/', function($format='html') use($app) { - $res = $app->response(); - $params = $app->request()->params(); - if (k($params, 'me')) { - $app->redirect('/auth/start?'.http_build_query($params), 302); - } - - ob_start(); - render('index', array( - 'title' => 'Quill', - 'meta' => '', - 'authorizing' => false - )); - $html = ob_get_clean(); - $res->body($html); -}); - $app->get('/auth/start', function() use($app) { $req = $app->request(); diff --git a/controllers/controllers.php b/controllers/controllers.php index 1b832b9..09133cf 100644 --- a/controllers/controllers.php +++ b/controllers/controllers.php @@ -221,24 +221,6 @@ $app->post('/prefs', function() use($app) { ))); }); -$app->get('/creating-a-token-endpoint', function() use($app) { - $app->redirect('http://indiewebcamp.com/token-endpoint', 301); -}); -$app->get('/creating-a-micropub-endpoint', function() use($app) { - $html = render('creating-a-micropub-endpoint', array('title' => 'Creating a Micropub Endpoint', 'authorizing' => false)); - $app->response()->body($html); -}); - -$app->get('/docs', function() use($app) { - $html = render('docs', array('title' => 'Documentation', 'authorizing' => false)); - $app->response()->body($html); -}); - -$app->get('/privacy', function() use($app) { - $html = render('privacy', array('title' => 'Quill Privacy Policy', 'authorizing' => false)); - $app->response()->body($html); -}); - $app->get('/add-to-home', function() use($app) { $params = $app->request()->params(); header("Cache-Control: no-cache, must-revalidate"); diff --git a/controllers/editor.php b/controllers/editor.php index fbb72cf..c880a00 100644 --- a/controllers/editor.php +++ b/controllers/editor.php @@ -8,7 +8,6 @@ $app->get('/editor', function() use($app) { }); $app->post('/editor/publish', function() use($app) { - if($user=require_login($app)) { $params = $app->request()->params(); diff --git a/controllers/static.php b/controllers/static.php new file mode 100644 index 0000000..bf9740d --- /dev/null +++ b/controllers/static.php @@ -0,0 +1,37 @@ +get('/', function($format='html') use($app) { + $res = $app->response(); + $params = $app->request()->params(); + if (k($params, 'me')) { + $app->redirect('/auth/start?'.http_build_query($params), 302); + } + + ob_start(); + render('index', array( + 'title' => 'Quill', + 'meta' => '', + 'authorizing' => false + )); + $html = ob_get_clean(); + $res->body($html); +}); + +$app->get('/creating-a-token-endpoint', function() use($app) { + $app->redirect('http://indiewebcamp.com/token-endpoint', 301); +}); + +$app->get('/creating-a-micropub-endpoint', function() use($app) { + $html = render('creating-a-micropub-endpoint', array('title' => 'Creating a Micropub Endpoint', 'authorizing' => false)); + $app->response()->body($html); +}); + +$app->get('/docs', function() use($app) { + $html = render('docs', array('title' => 'Documentation', 'authorizing' => false)); + $app->response()->body($html); +}); + +$app->get('/privacy', function() use($app) { + $html = render('privacy', array('title' => 'Quill Privacy Policy', 'authorizing' => false)); + $app->response()->body($html); +}); \ No newline at end of file diff --git a/public/index.php b/public/index.php index e6a0f6a..0909780 100644 --- a/public/index.php +++ b/public/index.php @@ -13,6 +13,7 @@ $app = new \Slim\Slim(array( require 'controllers/auth.php'; require 'controllers/controllers.php'; +require 'controllers/static.php'; require 'controllers/editor.php'; require 'controllers/hooks.php';