From 2dae538f996498a55b779e26a4c63b6e87bbe055 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Thu, 28 May 2015 15:08:02 +0200 Subject: [PATCH] reverse for readability --- public/mirror.php | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/public/mirror.php b/public/mirror.php index aa83c48..753a114 100644 --- a/public/mirror.php +++ b/public/mirror.php @@ -41,30 +41,28 @@ switch ($evt) { $response->setResponseStatus("PONG"); break; case "push": - if (($json = json_decode($request->getBody()))) { - if (in_array($json->repository->owner->name, $owners, true)) { - $repo = $json->repository->full_name; - $path = $mirror . "/" . $repo; - if (is_dir($path) && chdir($path)) { - passthru("git fetch -vp 2>&1", $rv); - if ($rv == 0) { - $response->setResponseCode(200); - } - } elseif (mkdir($path, 0755, true) && chdir($path)) { - $source = escapeshellarg($json->repository->clone_url); - passthru("git clone --mirror $source . 2>&1", $rv); - if ($rv == 0) { - $response->setResponseCode(200); - } - } - } else { - $response->setResponseCode(403); - $response->getBody()->append("Invalid owner"); - } - } else { + if (!($json = json_decode($request->getBody()))) { $response->setResponseCode(415); $response->setContentType($request->getHeader("Content-Type")); $response->getBody()->append($request->getBody()); + } elseif (!in_array($json->repository->owner->name, $owners, true)) { + $response->setResponseCode(403); + $response->getBody()->append("Invalid owner"); + } else { + $repo = $json->repository->full_name; + $path = $mirror . "/" . $repo; + if (is_dir($path) && chdir($path)) { + passthru("git fetch -vp 2>&1", $rv); + if ($rv == 0) { + $response->setResponseCode(200); + } + } elseif (mkdir($path, 0755, true) && chdir($path)) { + $source = escapeshellarg($json->repository->clone_url); + passthru("git clone --mirror $source . 2>&1", $rv); + if ($rv == 0) { + $response->setResponseCode(200); + } + } } break; } -- 2.30.2