From e822d84474f233d36a31985fdae22dbf609fc0f0 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 4 Feb 2019 15:53:23 +0100
Subject: [PATCH] Fixes for modules/portal
---
modules/portal/hooks/hook_htmlinject.php | 1 +
modules/portal/lib/Portal.php | 29 ++++++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/modules/portal/hooks/hook_htmlinject.php b/modules/portal/hooks/hook_htmlinject.php
index efa1984a3..72235d733 100644
--- a/modules/portal/hooks/hook_htmlinject.php
+++ b/modules/portal/hooks/hook_htmlinject.php
@@ -4,6 +4,7 @@
* Hook to inject HTML content into all pages...
*
* @param array &$hookinfo hookinfo
+ * @return void
*/
function portal_hook_htmlinject(&$hookinfo)
{
diff --git a/modules/portal/lib/Portal.php b/modules/portal/lib/Portal.php
index 517ce2edf..e4edd87cd 100644
--- a/modules/portal/lib/Portal.php
+++ b/modules/portal/lib/Portal.php
@@ -4,15 +4,28 @@ namespace SimpleSAML\Module\portal;
class Portal
{
+ /** @var array */
private $pages;
+
+ /** @var array|null */
private $config;
+
+ /**
+ * @param array $pages
+ * @param array|null $config
+ */
public function __construct($pages, $config = null)
{
$this->pages = $pages;
$this->config = $config;
}
+
+ /**
+ * @param string $thispage
+ * @return array|null
+ */
public function getTabset($thispage)
{
if (!isset($this->config)) {
@@ -26,6 +39,11 @@ class Portal
return null;
}
+
+ /**
+ * @param string $thispage
+ * @return bool
+ */
public function isPortalized($thispage)
{
foreach ($this->config as $set) {
@@ -36,6 +54,12 @@ class Portal
return false;
}
+
+ /**
+ * @param \SimpleSAML\Locate\Translate $translator
+ * @param string $thispage
+ * @return array
+ */
public function getLoginInfo($translator, $thispage)
{
$info = ['info' => '', 'translator' => $translator, 'thispage' => $thispage];
@@ -43,6 +67,11 @@ class Portal
return $info['info'];
}
+
+ /**
+ * @param string
+ * @return string
+ */
public function getMenu($thispage)
{
$config = \SimpleSAML\Configuration::getInstance();
--
GitLab