From c387d9fecca39427b515d1d159cafd9c07d2a412 Mon Sep 17 00:00:00 2001
From: Hanne Moa <hanne.moa@uninett.no>
Date: Fri, 28 Oct 2016 10:48:29 +0200
Subject: [PATCH] Change tabs to spaces, remove whitespace at end of line
For: #458
---
.../consentAdmin/templates/consentadmin.php | 164 +++++++++---------
1 file changed, 82 insertions(+), 82 deletions(-)
diff --git a/modules/consentAdmin/templates/consentadmin.php b/modules/consentAdmin/templates/consentadmin.php
index 7baec47f9..a16c0fa9f 100644
--- a/modules/consentAdmin/templates/consentadmin.php
+++ b/modules/consentAdmin/templates/consentadmin.php
@@ -2,131 +2,131 @@
<!-- default theme -->
<script>
- function setConsentText(consentStatus, show_spid) {
- document.getElementById("consentText" + show_spid).innerHTML = consentStatus;
- }
+ function setConsentText(consentStatus, show_spid) {
+ document.getElementById("consentText" + show_spid).innerHTML = consentStatus;
+ }
</script>
-<script src="includes/consentSimpleAjax.js"></script>
+<script src="includes/consentSimpleAjax.js"></script>
<style>
.caSPName {
- font-weight: bold;
+ font-weight: bold;
}
td.caSPName {
- vertical-align: top;
+ vertical-align: top;
}
.caAllowed {
-
+
}
td.caAllowed {
- vertical-align: top;
+ vertical-align: top;
}
td.caAttributes {
-
+
}
tr.row0 td {
- background-color: #888888;
- color: black;
+ background-color: #888888;
+ color: black;
}
tr.row1 td {
- background-color: #aaaaaa;
- color: black;
+ background-color: #aaaaaa;
+ color: black;
}
a.orange {
- color: #ffd633;
+ color: #ffd633;
}
span.showhide {
-
+
}
</style>
-
-
- <!-- <h2><?php if (isset($this->data['header'])) { echo $this->t($this->data['header']); } else { echo "Some error occurred"; } ?></h2> -->
- <h2><?php echo $this->t('consentadmin_header') ?></h2>
- <p>
- <?php echo $this->t('consentadmin_description1') ?> </p>
-
-
- <table>
- <tr>
- <th width="80%"><?php echo $this->t('service_provider_header') ?></th>
- <th width="140"><?php echo $this->t('status_header') ?></th>
- </tr>
- <?php
- $spList = $this->data['spList'];
- $show_spid = 0;
- $show_text = $this->t('show');
- $hide_text = $this->t('hide');
- $attributes_text = $this->t('attributes_text');
- foreach ($spList AS $spName => $spValues) {
- $this->getTranslator()->includeInlineTranslation('spname', $spValues['name']);
- $this->getTranslator()->includeInlineTranslation('spdescription', $spValues['description']);
+
+
+ <!-- <h2><?php if (isset($this->data['header'])) { echo $this->t($this->data['header']); } else { echo "Some error occurred"; } ?></h2> -->
+ <h2><?php echo $this->t('consentadmin_header') ?></h2>
+ <p>
+ <?php echo $this->t('consentadmin_description1') ?> </p>
+
+
+ <table>
+ <tr>
+ <th width="80%"><?php echo $this->t('service_provider_header') ?></th>
+ <th width="140"><?php echo $this->t('status_header') ?></th>
+ </tr>
+ <?php
+ $spList = $this->data['spList'];
+ $show_spid = 0;
+ $show_text = $this->t('show');
+ $hide_text = $this->t('hide');
+ $attributes_text = $this->t('attributes_text');
+ foreach ($spList AS $spName => $spValues) {
+ $this->getTranslator()->includeInlineTranslation('spname', $spValues['name']);
+ $this->getTranslator()->includeInlineTranslation('spdescription', $spValues['description']);
if (!is_null($spValues['serviceurl'])) {
$htmlSpName = '<a href="' . $spValues['serviceurl'] . '" style="color: black; font-weight: bold;">' . htmlspecialchars($this->t('spname', array(), false, true)) . '</a>';
} else {
$htmlSpName = htmlspecialchars($this->t('spname', array(), false, true));
}
- $spDescription = htmlspecialchars($this->t('spdescription',array(), false, true));
- $checkedAttr = $spValues['consentStatus'] == 'ok' ? 'checked="checked"' : '';
- $consentValue = $spValues['consentValue'];
- $consentText = $spValues['consentStatus'] == 'changed' ? "attributes has changed" : "";
- $row_class = ($show_spid % 2) ? "row0" : "row1";
- echo <<<TRSTART
+ $spDescription = htmlspecialchars($this->t('spdescription',array(), false, true));
+ $checkedAttr = $spValues['consentStatus'] == 'ok' ? 'checked="checked"' : '';
+ $consentValue = $spValues['consentValue'];
+ $consentText = $spValues['consentStatus'] == 'changed' ? "attributes has changed" : "";
+ $row_class = ($show_spid % 2) ? "row0" : "row1";
+ echo <<<TRSTART
<tr class="$row_class">
<td>
- <table>
- <tr class="$row_class"><td><span class='caSPName'><span title='$spDescription'>$htmlSpName</span> <span style="font-size: 80%;"onclick="javascript:toggleShowAttributes('$show_spid');"><span id=showing_$show_spid >$show_text</span><span id=hiding_$show_spid style='display:none;'>$hide_text</span> $attributes_text</span></span></td>
- <tr><td colspan="2" class="caAttributes"><div id="attributes_$show_spid" style="display: none;">
+ <table>
+ <tr class="$row_class"><td><span class='caSPName'><span title='$spDescription'>$htmlSpName</span> <span style="font-size: 80%;"onclick="javascript:toggleShowAttributes('$show_spid');"><span id=showing_$show_spid >$show_text</span><span id=hiding_$show_spid style='display:none;'>$hide_text</span> $attributes_text</span></span></td>
+ <tr><td colspan="2" class="caAttributes"><div id="attributes_$show_spid" style="display: none;">
TRSTART;
- $attributes = $spValues['attributes_by_sp'];
- if ($this->data['showDescription']) {
+ $attributes = $spValues['attributes_by_sp'];
+ if ($this->data['showDescription']) {
echo '<p>' . $this->t('consentadmin_purpose') . ' ' . $spDescription . '</p>';
}
echo "\n<ul>\n";
- foreach ($attributes AS $name => $value) {
-
- if (isset($this->data['attribute_' . htmlspecialchars(strtolower($name)) ])) {
- $name = $this->data['attribute_' . htmlspecialchars(strtolower($name))];
- }
- $name = $this->getTranslator()->getAttributeTranslation($name); // translate
- if (sizeof($value) > 1) {
- echo "<li>" . htmlspecialchars($name) . ":\n<ul>\n";
- foreach ($value AS $v) {
- echo '<li>' . htmlspecialchars($v) . "</li>\n";
- }
- echo "</ul>\n</li>\n";
- } else {
- echo "<li>" . htmlspecialchars($name) . ": " . htmlspecialchars($value[0]) . "</li>\n";
- }
- }
- echo "</ul>";
- echo <<<TRSTART
- </div></td></tr>
- </table>
+ foreach ($attributes AS $name => $value) {
+
+ if (isset($this->data['attribute_' . htmlspecialchars(strtolower($name)) ])) {
+ $name = $this->data['attribute_' . htmlspecialchars(strtolower($name))];
+ }
+ $name = $this->getTranslator()->getAttributeTranslation($name); // translate
+ if (sizeof($value) > 1) {
+ echo "<li>" . htmlspecialchars($name) . ":\n<ul>\n";
+ foreach ($value AS $v) {
+ echo '<li>' . htmlspecialchars($v) . "</li>\n";
+ }
+ echo "</ul>\n</li>\n";
+ } else {
+ echo "<li>" . htmlspecialchars($name) . ": " . htmlspecialchars($value[0]) . "</li>\n";
+ }
+ }
+ echo "</ul>";
+ echo <<<TRSTART
+ </div></td></tr>
+ </table>
</td>
-
+
<td class='caAllowed'><input onClick="javascript:checkConsent(this.value, $show_spid, this.checked)" value='$consentValue' type='checkbox' $checkedAttr><span id="consentText$show_spid">$consentText</span></td>
TRSTART;
- echo "</td></tr>\n";
- $show_spid++;
- }
- ?>
- </table>
-
- <p>
- <?php echo $this->t('consentadmin_description2') ?> </p>
-
- <h2>Logout</h2>
-
- <p><a href="<?php echo \SimpleSAML\Utils\HTTP::getSelfURL() . '?logout'; ?>">Logout</a></p>
-
+ echo "</td></tr>\n";
+ $show_spid++;
+ }
+ ?>
+ </table>
+
+ <p>
+ <?php echo $this->t('consentadmin_description2') ?> </p>
+
+ <h2>Logout</h2>
+
+ <p><a href="<?php echo \SimpleSAML\Utils\HTTP::getSelfURL() . '?logout'; ?>">Logout</a></p>
+
<?php $this->includeAtTemplateBase('includes/footer.php');
--
GitLab