diff --git a/CHANGELOG.md b/CHANGELOG.md index 84e79b0fa94d18c3ca54ab5d6d11c233b949e666..e94818e1bd2bf2dea3cfc331f7599054f1569b95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] + [Removed] + - Removed present_attributes() method from consentform.php ## [v1.2.1] [Fixed] diff --git a/themes/elixir/consent/consentform.php b/themes/elixir/consent/consentform.php index 72d033778aebc1c1166ef61a5f7d37080d4d5592..37dddb2ece64bd3ade84443c4d9586b3a82dc509 100644 --- a/themes/elixir/consent/consentform.php +++ b/themes/elixir/consent/consentform.php @@ -94,97 +94,6 @@ if ($this->data['sppp'] !== false) { echo "</p>"; } -/** - * Recursive attribute array listing function - * - * @param SimpleSAML_XHTML_Template $t Template object - * @param array $attributes Attributes to be presented - * @param string $nameParent Name of parent element - * - * @return string HTML representation of the attributes - */ -function present_attributes($t, $attributes, $nameParent) -{ - $i = 0; - $summary = 'summary="' . $t->t('{consent:consent:table_summary}') . '"'; - - if (strlen($nameParent) > 0) { - $parentStr = strtolower($nameParent) . '_'; - $str = '<table class="table attributes" ' . $summary . '>'; - } else { - $parentStr = ''; - $str = '<table id="table_with_attributes" class="table attributes" '. $summary .'>'; - $str .= "\n" . '<caption>' . $t->t('{consent:consent:table_caption}') . - '</caption>'; - } - - foreach ($attributes as $name => $value) { - $nameraw = $name; - $name = $t->getAttributeTranslation($parentStr . $nameraw); - - if (preg_match('/^child_/', $nameraw)) { - // insert child table - $parentName = preg_replace('/^child_/', '', $nameraw); - foreach ($value as $child) { - $str .= "\n" . '<tr class="odd"><td style="padding: 2em">' . - present_attributes($t, $child, $parentName) . '</td></tr>'; - } - } else { - // insert values directly - - $str .= "\n" . '<tr><td><span class="attrname">' . htmlspecialchars($name) . '</span>'; - - $isHidden = in_array($nameraw, $t->data['hiddenAttributes'], true); - if ($isHidden) { - $hiddenId = SimpleSAML\Utils\Random::generateID(); - - $str .= '<div class="attrvalue" style="display: none;" id="hidden_' . $hiddenId . '">'; - } else { - $str .= '<div class="attrvalue">'; - } - - if (sizeof($value) > 1) { - // we hawe several values - $str .= '<ul>'; - foreach ($value as $listitem) { - if ($nameraw === 'jpegPhoto') { - $str .= '<li><img src="data:image/jpeg;base64,' . - htmlspecialchars($listitem) . - '" alt="User photo" /></li>'; - } else { - $str .= '<li>' . htmlspecialchars($listitem) . '</li>'; - } - } - $str .= '</ul>'; - } elseif (isset($value[0])) { - // we hawe only one value - if ($nameraw === 'jpegPhoto') { - $str .= '<img src="data:image/jpeg;base64,' . - htmlspecialchars($value[0]) . - '" alt="User photo" />'; - } else { - $str .= htmlspecialchars($value[0]); - } - } // end of if multivalue - $str .= '</div>'; - - if ($isHidden) { - $str .= '<div class="attrvalue consent_showattribute" id="visible_' . $hiddenId . '">'; - $str .= '... '; - $str .= '<a class="consent_showattributelink" href="javascript:SimpleSAML_show(\'hidden_' . $hiddenId; - $str .= '\'); SimpleSAML_hide(\'visible_' . $hiddenId . '\');">'; - $str .= $t->t('{consent:consent:show_attribute}'); - $str .= '</a>'; - $str .= '</div>'; - } - - $str .= '</td></tr>'; - } // end else: not child table - } // end foreach - $str .= isset($attributes)? '</table>':''; - return $str; -} - echo '<h3 id="attributeheader">' . $this->t( '{consent:consent:consent_attributes_header}',