@@ -108,52 +111,62 @@
-
- Users (Click on name to manage roles)
-
- ?>img/people.png)
- 0): ?>
-
-
-
+
-
There are currently no users with roles over this project
"; endif; ?> +
+
+ ?>img/person.png)
+
+
+
+
+ getUser()->getFullName()?>
+
+
+
+
+ getRoleType()->getName()); } else {echo('PROTECTED'); } ?>
+
+
+
+
+
+
There are currently no users with roles over this project
"; + } + } else { + require_once __DIR__.'/../fragments/hidePersonalData.php'; + } + ?> - +?>img/add.png)
diff --git a/htdocs/web_portal/views/service/view_service.php b/htdocs/web_portal/views/service/view_service.php
index 5c77446f4..1d4efe983 100644
--- a/htdocs/web_portal/views/service/view_service.php
+++ b/htdocs/web_portal/views/service/view_service.php
@@ -1,12 +1,12 @@
getParentSite()->getName();
$extensionProperties = $se->getServiceProperties();
$seId = $se->getId();
$configService = \Factory::getConfigService();
+$showPD = $params['authenticated'];
?>
- 0): ?>
- | - | Name | -Role | -
|---|
|
-
- |
- - - - getUser()->getFullName()?> - - - | -- getRoleType()->getName()); } else {echo('PROTECTED'); } ?> - | ++ | Name | +Role |
|---|
There are currently no users with roles over this project
"; endif; ?> +
+ There are currently no users with roles over this project
"; + } + } else { + require_once __DIR__.'/../fragments/hidePersonalData.php'; + } + ?> - +
diff --git a/htdocs/web_portal/views/service/view_service.php b/htdocs/web_portal/views/service/view_service.php
index 5c77446f4..1d4efe983 100644
--- a/htdocs/web_portal/views/service/view_service.php
+++ b/htdocs/web_portal/views/service/view_service.php
@@ -1,12 +1,12 @@
getParentSite()->getName();
$extensionProperties = $se->getServiceProperties();
$seId = $se->getId();
$configService = \Factory::getConfigService();
+$showPD = $params['authenticated'];
?>
@@ -51,44 +51,44 @@
@@ -174,43 +177,44 @@
| Host name | - getHostName()); - } else echo('PROTECTED - Registration required'); ?> + } else echo(getInfoMessage()); ?> | ||
| IP Address | - getIpAddress()); - }else echo('PROTECTED - Registration required'); ?> + } else echo(getInfoMessage()); ?> | ||
| IP v6 Address | - getIpV6Address()); - } else echo('PROTECTED - Registration required'); ?> + } else echo(getInfoMessage()); ?> | ||
| Operating System | - getOperatingSystem()); - } else echo('PROTECTED - Registration required'); ?> + } else echo(getInfoMessage()); ?> | ||
| Architecture | - getArchitecture()); - } else echo('PROTECTED - Registration required'); ?> + } else echo(getInfoMessage()); ?> | ||
| Contact E-Mail | - getEmail()); - } else echo('PROTECTED - Registration required'); ?> + getEmail()); + } else echo(getInfoMessage()); ?> | ||
| Host DN |
- getDn()) ;
- } else echo('PROTECTED - Registration required'); ?>
+ } else echo(getInfoMessage()); ?>
|
Id | getId() ?> |
| Contact E-mail | getEmail() ?> | +Contact E-mail | + getEmail()); + } else { + echo getInfoMessage(); + } + ?> + |
| Monitored | diff --git a/htdocs/web_portal/views/service_group/view_sgroup.php b/htdocs/web_portal/views/service_group/view_sgroup.php index 03cd4f402..9a4961486 100644 --- a/htdocs/web_portal/views/service_group/view_sgroup.php +++ b/htdocs/web_portal/views/service_group/view_sgroup.php @@ -1,5 +1,8 @@ getServiceGroupProperties(); +$showPD = $params['authenticated']; ?> @@ -41,7 +44,7 @@ - +|||
| Contact E-Mail | - + getEmail()); ?> - + |
- Users (Click on name to manage roles)
-
-
-
+
-
+
diff --git a/htdocs/web_portal/views/site/add_api_auth.php b/htdocs/web_portal/views/site/add_api_auth.php
index 005e710ac..675734656 100644
--- a/htdocs/web_portal/views/site/add_api_auth.php
+++ b/htdocs/web_portal/views/site/add_api_auth.php
@@ -1,19 +1,32 @@
- Caution: it is possible to delete information using the write functionality of the API. -
+
diff --git a/htdocs/web_portal/views/site/delete_api_auth.php b/htdocs/web_portal/views/site/delete_api_auth.php
index e7f143f26..cd41913bd 100644
--- a/htdocs/web_portal/views/site/delete_api_auth.php
+++ b/htdocs/web_portal/views/site/delete_api_auth.php
@@ -6,7 +6,7 @@
- | Name | -Role | -||||
|---|---|---|---|---|---|
|
-
-
+
-
+
+ Users (Click on name to manage roles)
+
+
|
+ + getRoleType()->getName()); ?> + | +
diff --git a/htdocs/web_portal/views/site/add_api_auth.php b/htdocs/web_portal/views/site/add_api_auth.php
index 005e710ac..675734656 100644
--- a/htdocs/web_portal/views/site/add_api_auth.php
+++ b/htdocs/web_portal/views/site/add_api_auth.php
@@ -1,19 +1,32 @@
Add new API credential to getName());?>
-- Caution: it is possible to delete information using the write functionality of the API. -
+
The credential added will be linked to GOCDB account + + getForename()." ".$params['user']->getSurname())?> + +
Delete API Authentication Credential
You are about to delete the following API authorisation credential:
- Creedential identifier: getIdentifier());?>
+ Credential identifier: getIdentifier());?>
Credential type: getType());?>
Site Name: getName());?>
-
-
diff --git a/htdocs/web_portal/views/site/view_site.php b/htdocs/web_portal/views/site/view_site.php
index 538bcd8f3..32ab5f00a 100644
--- a/htdocs/web_portal/views/site/view_site.php
+++ b/htdocs/web_portal/views/site/view_site.php
@@ -1,9 +1,12 @@
getNgi()->getName();
$portalIsReadOnly = $params['portalIsReadOnly'];
$extensionProperties = $site->getSiteProperties();
+$showPD = $params['authenticated']; // display Personal Data
?>
Edit API credential for getName());?>
--
@@ -54,65 +57,65 @@
- getDecoratorObject() != null):?>
-
-
+
+ getDecoratorObject();
+ if(!$params['portalIsReadOnly'] && $decorator != null) {
+ echo '';
+ };
+ ?>
+
+
+
-
+ title="Your roles allowing revoke: " >
@@ -330,7 +356,46 @@
?>
-
+ isEmpty()) { ?>
+
+ | - + getEmail()) ?> - + | ||||||||||||||
| Telephone | getTelephone()); } else - echo('PROTECTED - Registration required'); + echo(getInfoMessage()); ?> | |||||||||||||
| Emergency Tel | getEmergencyTel()); } else - echo('PROTECTED - Registration required'); + echo(getInfoMessage()); ?> | |||||||||||||
| CSIRT Tel | getCsirtTel()); } else - echo('PROTECTED - Registration required') + echo(getInfoMessage()) ?> | |||||||||||||
| CSIRT E-Mail | - + getCsirtEmail()) ?> - + | |||||||||||||
| Emergency E-Mail | - + getEmergencyEmail()) ?> - + | |||||||||||||
| Helpdesk E-Mail | - + getHelpdeskEmail()) ?> - + | |||||||||||||
| Certification Status | - + getCertificationStatus()->getName()) ?> Change - + | |||||||||||||
| Home URL | - + getHomeUrl()) ?> - + | |||||||||||||
| GIIS URL | getGiisUrl()); } else - echo('PROTECTED - Registration required'); + echo(getInfoMessage()); ?> | IP Range | getIpRange()); } else - echo('PROTECTED - Registration required'); + echo(getInfoMessage()); ?> | @@ -232,10 +235,10 @@IP v6 Range | getIpV6Range()); } else - echo('PROTECTED - Registration required'); + echo(getInfoMessage()); ?> | @@ -243,10 +246,10 @@Domain | getDomain()); } else - echo('PROTECTED - Registration required'); + echo(getInfoMessage()); ?> | @@ -261,10 +264,10 @@|||||||
| Country | getCountry()->getName()); } else { - echo 'PROTECTED'; + echo getInfoMessage(); } ?> | @@ -272,10 +275,10 @@|||||||||||||
| Latitude | getLatitude()); } else { - echo 'PROTECTED'; + echo getInfoMessage(); } ?> | @@ -283,10 +286,10 @@|||||||||||||
| Longitude | getLongitude()); } else { - echo 'PROTECTED'; + echo getInfoMessage(); } ?> | @@ -294,10 +297,10 @@|||||||||||||
| Time Zone | getTimezoneId()); } else { - echo 'PROTECTED'; + echo getInfoMessage(); } ?> | @@ -305,10 +308,10 @@|||||||||||||
| Location | getLocation()); } else { - echo 'PROTECTED'; + echo getInfoMessage(); } ?> | @@ -434,54 +437,53 @@
| Name | -Role | -
|---|---|
| - - | -- getRoleType()->getName()); - } else { - echo 'PROTECTED'; - } - ?> - | -
 ?>img/people.png)
+ | Name | +Role | +
|---|---|
| + + | ++ getRoleType()->getName()); + ?> + | +
 . 'img/people.png)
';
+ }
+ ?>
-
+
@@ -181,7 +195,8 @@
 ?>img/add.png)
@@ -553,40 +555,77 @@
 ?>img/key.png)
?>img/pencil.png)
- ?>img/cross.png)
- ?>img/trash.png)
-
+
+ Owned API Credentials (Add and remove credentials by clicking the relevant Site.)
+
+ ?>img/key.png)
+
+
+
+
+ | Type | +Identifier | +Site | +API Write | +
|---|---|---|---|
| getType());?> | +getIdentifier());?> | ++ + getParentSite()->getShortName(),0,16));?> + + | +
+ |
+