fix saveToCache() usage; move hook controllers around

[pharext/pharext.org] / app / Controller / Github.php

diff --git a/app/Controller/Github.php b/app/Controller/Github.php
index 49b14885be7eb986f88e88e73a884ac0a67ee961..0c38bd7721cb3daf40f36e65ac8dbcf9a389e271 100644 (file)
--- a/app/Controller/Github.php
+++ b/app/Controller/Github.php
@@ -26,11 +26,15 @@ abstract class Github implements Controller
         * @var \app\Session
         */
        protected $session;
-
-       function __construct(Web $app, API $github) {
+       
+       function __construct(Web $app, API $github, Session $session) {
                $this->app = $app;
                $this->github = $github;
-               $this->app->getView()->addData(["location" => "github"]);
+               $this->session = $session;
+               $this->app->getView()->addData(compact("session") + [
+                       "location" => "github", 
+                       "title" => "Github"
+               ]);
                $this->app->getView()->registerFunction("check", [$this, "checkRepoHook"]);
        }
 
@@ -45,19 +49,20 @@ abstract class Github implements Controller
                return false;
        }
 
-       function setSession(Session $session) {
-               $this->session = $session;
-       }
-
+       /**
+        * Check if the pharext webhook is set for the repo and return its id
+        * @param object $repo
+        * @return int hook id
+        */
        function checkRepoHook($repo) {
                if ($repo->hooks) {
                        foreach ($repo->hooks as $hook) {
                                if ($hook->name === "web" && $hook->config->url === $this->github->getConfig()->hook->url) {
-                                       return true;
+                                       return $hook;
                                }
                        }
                }
-               return false;
+               return null;
        }
 
        function createLinkGenerator($links) {