Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unregistered user protected messages fix #249

Merged
merged 3 commits into from
Feb 1, 2021
Merged

Unregistered user protected messages fix #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3374052
Correct spelling of 'protected'
tofu-rocketry Aug 24, 2020
a70d9da
Improve 'protected' messages
tofu-rocketry Aug 24, 2020
c9cd260
Make logic for auth check for getEmail consistent
tofu-rocketry Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions htdocs/web_portal/views/ngi/view_ngi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<a href="mailto:<?php xecho($params['ngi']->getEmail()) ?>">
<?php xecho($params['ngi']->getEmail()) ?>
</a>
<?php } else {echo('PROTECTED - Auth Required');} ?>
<?php } else {echo('PROTECTED - Registration required');} ?>
</td>
</tr>
<tr class="site_table_row_2">
Expand All @@ -63,7 +63,7 @@
<a href="mailto:<?php xecho($params['ngi']->getRodEmail()) ?>">
<?php xecho($params['ngi']->getRodEmail()) ?>
</a>
<?php } else {echo('PROTECTED - Auth Required');} ?>
<?php } else {echo('PROTECTED - Registration required');} ?>
</td>
</tr>
<tr class="site_table_row_1">
Expand All @@ -72,7 +72,7 @@
<a href="mailto:<?php xecho($params['ngi']->getHelpdeskEmail()) ;?>">
<?php xecho($params['ngi']->getHelpdeskEmail()) ?>
</a>
<?php } else {echo('PROTECTED - Auth Required');} ?>
<?php } else {echo('PROTECTED - Registration required');} ?>
</td>
</tr>
<tr class="site_table_row_2">
Expand All @@ -81,14 +81,14 @@
<a href="mailto:<?php echo $params['ngi']->getSecurityEmail() ?>">
<?php xecho($params['ngi']->getSecurityEmail()) ?>
</a>
<?php } else {echo('PROTECTED - Auth Required');} ?>
<?php } else {echo('PROTECTED - Registration required');} ?>
</td>
</tr>
<tr class="site_table_row_1">
<td class="site_table" style="width: 30%">GGUS Support Unit</td><td class="site_table">
<?php if($params['authenticated']) { ?>
<?php xecho($params['ngi']->getGgus_Su()) ?>
<?php } else {echo('PROTECTED - Auth Required');} ?>
<?php } else {echo('PROTECTED - Registration required');} ?>
</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion htdocs/web_portal/views/search_results.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
if ($params['authenticated']) {
xecho($user->getEmail());
} else {
echo 'PROTECTED - Authentication required';
echo 'PROTECTED - Registration required';
}
?>
</td>
Expand Down
21 changes: 9 additions & 12 deletions htdocs/web_portal/views/service/view_service.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,45 +53,42 @@
<td class="site_table">Host name</td><td class="site_table">
<?php if ($params['authenticated']) {
xecho($se->getHostName());
} else echo('PROTECTED - Auth required'); ?>
} else echo('PROTECTED - Registration required'); ?>
</td>
</tr>
<tr class="site_table_row_2">
<td class="site_table">IP Address</td><td class="site_table">
<?php if ($params['authenticated']) {
xecho($se->getIpAddress());
}else echo('PROTECED - Auth required'); ?>
}else echo('PROTECTED - Registration required'); ?>
</td>
</tr>
<tr class="site_table_row_1">
<td class="site_table">IP v6 Address</td><td class="site_table">
<?php if ($params['authenticated']) {
xecho($se->getIpV6Address());
} else echo('PROTECED - Auth required'); ?>
} else echo('PROTECTED - Registration required'); ?>
</td>
</tr>
<tr class="site_table_row_2">
<td class="site_table">Operating System</td><td class="site_table">
<?php if ($params['authenticated']) {
xecho($se->getOperatingSystem());
} else echo('PROTECTED - Auth required'); ?>
} else echo('PROTECTED - Registration required'); ?>
</td>
</tr>
<tr class="site_table_row_1">
<td class="site_table">Architecture</td><td class="site_table">
<?php if ($params['authenticated']) {
xecho($se->getArchitecture());
} else echo('PROTECTED - Auth required'); ?>
} else echo('PROTECTED - Registration required'); ?>
</td>
</tr>
<tr class="site_table_row_2">
<td class="site_table">Contact E-Mail</td><td class="site_table">
<?php if (!$params['authenticated']) : ?>
PROTECTED - Auth required
<?php endif; ?>
<?php if ($params['authenticated']) : ?>
<?php xecho($se->getEmail()) ?>
<?php endif; ?>
<?php if ($params['authenticated']) {
xecho($se->getEmail());
} else echo('PROTECTED - Registration required'); ?>
</td>
</tr>
<tr class="site_table_row_1">
Expand Down Expand Up @@ -119,7 +116,7 @@
<div style="word-wrap: break-word;">
<?php if ($params['authenticated']) {
xecho($se->getDn()) ;
} else echo('PROTECTED - Auth required'); ?>
} else echo('PROTECTED - Registration required'); ?>
</div>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion htdocs/web_portal/views/service_group/view_sgroup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<a href="mailto:<?php xecho($params['sGroup']->getEmail()); ?>">
<?php xecho($params['sGroup']->getEmail()); ?>
</a>
<?php } else {echo('PROTECTED - Auth Required');} ?>
<?php } else {echo('PROTECTED - Registration required');} ?>
</td>
</tr>
</table>
Expand Down
26 changes: 13 additions & 13 deletions htdocs/web_portal/views/site/view_site.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,31 +58,31 @@
<a href="mailto:<?php xecho($site->getEmail()) ?>">
<?php xecho($site->getEmail()) ?>
</a>
<?php } else echo('PROTECTED - Auth Required'); ?>
<?php } else echo('PROTECTED - Registration required'); ?>
</td>
</tr>
<tr class="site_table_row_2">
<td class="site_table">Telephone</td><td class="site_table"><?php
if ($params['authenticated']) {
xecho($site->getTelephone());
} else
echo('PROTECTED - Auth Required');
echo('PROTECTED - Registration required');
?></td>
</tr>
<tr class="site_table_row_1">
<td class="site_table">Emergency Tel</td><td class="site_table"><?php
if ($params['authenticated']) {
xecho($site->getEmergencyTel());
} else
echo('PROTECTED - Auth Required');
echo('PROTECTED - Registration required');
?></td>
</tr>
<tr class="site_table_row_2">
<td class="site_table">CSIRT Tel</td><td class="site_table"><?php
if ($params['authenticated']) {
xecho($site->getCsirtTel());
} else
echo('PROTECTED - Auth Required')
echo('PROTECTED - Registration required')
?></td>
</tr>
<tr class="site_table_row_1">
Expand All @@ -92,7 +92,7 @@
<a href="mailto:<?php xecho($site->getCsirtEmail()) ?>">
<?php xecho($site->getCsirtEmail()) ?>
</a>
<?php } else echo('PROTECTED - Auth Required'); ?>
<?php } else echo('PROTECTED - Registration required'); ?>
</td>
</tr>
<tr class="site_table_row_2">
Expand All @@ -102,7 +102,7 @@
<a href="mailto:<?php xecho($site->getEmergencyEmail()) ?>">
<?php xecho($site->getEmergencyEmail()) ?>
</a>
<?php } else echo('PROTECTED - Auth Required'); ?>
<?php } else echo('PROTECTED - Registration required'); ?>
</td>
</tr>
<tr class="site_table_row_1">
Expand All @@ -112,7 +112,7 @@
<a href="mailto:<?php xecho($site->getHelpdeskEmail()); ?>">
<?php xecho($site->getHelpdeskEmail()) ?>
</a>
<?php } else echo('PROTECTED - Auth Required'); ?>
<?php } else echo('PROTECTED - Registration required'); ?>
</td>
</tr>
<tr class="site_table_row_2">
Expand Down Expand Up @@ -154,7 +154,7 @@
<?php if (!$portalIsReadOnly): ?>
<a href="index.php?Page_Type=Edit_Certification_Status&amp;id=<?php echo($site->getId()) ?>">Change</a>
<?php endif; ?>
<?php } else echo('PROTECTED - Auth Required'); ?>
<?php } else echo('PROTECTED - Registration required'); ?>
</td>
</tr>

Expand Down Expand Up @@ -203,7 +203,7 @@
<a href="<?php xecho($site->getHomeUrl()) ?>">
<?php xecho($site->getHomeUrl()) ?>
</a>
<?php } else echo('PROTECTED - Auth Required'); ?>
<?php } else echo('PROTECTED - Registration required'); ?>
</td>
</tr>
<tr class="site_table_row_2">
Expand All @@ -213,7 +213,7 @@
if ($params['authenticated']) {
xecho($site->getGiisUrl());
} else
echo('PROTECTED - Auth Required');
echo('PROTECTED - Registration required');
?>
</td>
</tr>
Expand All @@ -224,7 +224,7 @@
if ($params['authenticated']) {
xecho($site->getIpRange());
} else
echo('PROTECTED - Auth Required');
echo('PROTECTED - Registration required');
?>
</td>
</tr>
Expand All @@ -235,7 +235,7 @@
if ($params['authenticated']) {
xecho($site->getIpV6Range());
} else
echo('PROTECTED - Auth Required');
echo('PROTECTED - Registration required');
?>
</td>
</tr>
Expand All @@ -246,7 +246,7 @@
if ($params['authenticated']) {
xecho($site->getDomain());
} else
echo('PROTECTED - Auth Required');
echo('PROTECTED - Registration required');
?>
</td>
</tr>
Expand Down