From aeae65daf8514fe75dc165803de9973e49792f66 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sat, 4 May 2019 21:20:39 +0200 Subject: [PATCH] Move mod/like to src/Module/Like --- mod/like.php | 48 ------------------------------------------ src/App/Router.php | 1 + src/Module/Like.php | 51 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 48 deletions(-) delete mode 100644 mod/like.php create mode 100644 src/Module/Like.php diff --git a/mod/like.php b/mod/like.php deleted file mode 100644 index 7fc7b2b42c..0000000000 --- a/mod/like.php +++ /dev/null @@ -1,48 +0,0 @@ -argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : 0); - - $r = Item::performLike($item_id, $verb); - if (!$r) { - return; - } - - // See if we've been passed a return path to redirect to - $return_path = defaults($_REQUEST, 'return', ''); - - like_content_return($a, $return_path); - exit(); -} - - -// Decide how to return. If we were called with a 'return' argument, -// then redirect back to the calling page. If not, just quietly end - -function like_content_return(App $a, $return_path) { - if ($return_path) { - $rand = '_=' . time(); - if (strpos($return_path, '?')) { - $rand = "&$rand"; - } else { - $rand = "?$rand"; - } - - $a->internalRedirect($return_path . $rand); - } -} diff --git a/src/App/Router.php b/src/App/Router.php index d35977dde1..fcd1b0c263 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -131,6 +131,7 @@ class Router $collector->addRoute(['GET'], '/testrewrite', Module\Install::class); }); $this->routeCollector->addRoute(['GET', 'POST'], '/itemsource[/{guid}]', Module\Itemsource::class); + $this->routeCollector->addRoute(['GET'], '/like/{item:\d+}', Module\Like::class); $this->routeCollector->addRoute(['GET', 'POST'], '/localtime', Module\Localtime::class); $this->routeCollector->addRoute(['GET', 'POST'], '/login', Module\Login::class); $this->routeCollector->addRoute(['GET', 'POST'], '/logout', Module\Logout::class); diff --git a/src/Module/Like.php b/src/Module/Like.php new file mode 100644 index 0000000000..f57cbadfd3 --- /dev/null +++ b/src/Module/Like.php @@ -0,0 +1,51 @@ +argc > 1) ? Strings::escapeTags(trim($app->argv[1])) : 0); + + if (!Item::performLike($itemId, $verb)) { + throw new HTTPException\BadRequestException(); + } + + // Decide how to return. If we were called with a 'return' argument, + // then redirect back to the calling page. If not, just quietly end + $returnPath = defaults($_REQUEST, 'return', ''); + + if (!empty($returnPath)) { + $rand = '_=' . time(); + if (strpos($returnPath, '?')) { + $rand = "&$rand"; + } else { + $rand = "?$rand"; + } + + $app->internalRedirect($returnPath . $rand); + } + } +}