summaryrefslogtreecommitdiff
path: root/pages/account
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-03-20 17:19:55 +0100
committerMichael Tänzer <neo@nhng.de>2014-03-20 17:19:55 +0100
commit9183b44586f9eb798057e0a42a9eee5be4f96160 (patch)
tree042cb8fd64493d9a1ad0459e9f25b1356732391f /pages/account
parent1a9707d982c6978bbb6d70fa860291d9198d163a (diff)
downloadcacert-devel-9183b44586f9eb798057e0a42a9eee5be4f96160.tar.gz
cacert-devel-9183b44586f9eb798057e0a42a9eee5be4f96160.tar.xz
cacert-devel-9183b44586f9eb798057e0a42a9eee5be4f96160.zip
bug 807: Avoid redundant data
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'pages/account')
-rw-r--r--pages/account/10.php7
-rw-r--r--pages/account/16.php7
-rw-r--r--pages/account/20.php7
-rw-r--r--pages/account/3.php7
4 files changed, 16 insertions, 12 deletions
diff --git a/pages/account/10.php b/pages/account/10.php
index df95b48..17999a7 100644
--- a/pages/account/10.php
+++ b/pages/account/10.php
@@ -61,14 +61,15 @@
<p class="attach_ul"><?=_("Hash algorithm used when signing the certificate:")?></p>
<ul class="no_indent">
<?
-foreach (HashAlgorithms::display_strings() as $algorithm => $display_string) {
+foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
?>
<li>
<input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
- <label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label>
+ <label for="hash_alg_<?=$algorithm?>"><?=$display_info['name']?><?=$display_info['info']?' - '.$display_info['info']:''?></label>
</li>
<?
-} ?>
+}
+?>
</ul>
</div>
diff --git a/pages/account/16.php b/pages/account/16.php
index 2a9d734..28aa614 100644
--- a/pages/account/16.php
+++ b/pages/account/16.php
@@ -71,12 +71,13 @@ if (array_key_exists('emails',$_SESSION['_config']) && is_array($_SESSION['_conf
<td class="DataTD" colspan="2" align="left">
<?=_("Hash algorithm used when signing the certificate:")?><br />
<?
- foreach (HashAlgorithms::display_strings() as $algorithm => $display_string) {
+ foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
?>
<input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
- <label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label><br />
+ <label for="hash_alg_<?=$algorithm?>"><?=$display_info['name']?><?=$display_info['info']?' - '.$display_info['info']:''?></label><br />
<?
- } ?>
+ }
+ ?>
</td>
</tr>
diff --git a/pages/account/20.php b/pages/account/20.php
index 470b59a..89bbc30 100644
--- a/pages/account/20.php
+++ b/pages/account/20.php
@@ -55,14 +55,15 @@
<p class="attach_ul"><?=_("Hash algorithm used when signing the certificate:")?></p>
<ul class="no_indent">
<?
-foreach (HashAlgorithms::display_strings() as $algorithm => $display_string) {
+foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
?>
<li>
<input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
- <label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label>
+ <label for="hash_alg_<?=$algorithm?>"><?=$display_info['name']?><?=$display_info['info']?' - '.$display_info['info']:''?></label>
</li>
<?
-} ?>
+}
+?>
</ul>
</div>
diff --git a/pages/account/3.php b/pages/account/3.php
index 8c386cd..cd62ce0 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -119,12 +119,13 @@ if($_SESSION['profile']['points'] >= 50)
<td class="DataTD" colspan="2" align="left">
<?=_("Hash algorithm used when signing the certificate:")?><br />
<?
- foreach (HashAlgorithms::display_strings() as $algorithm => $display_string) {
+ foreach (HashAlgorithms::getInfo() as $algorithm => $display_info) {
?>
<input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
- <label for="hash_alg_<?=$algorithm?>"><?=$display_string?></label><br />
+ <label for="hash_alg_<?=$algorithm?>"><?=$display_info['name']?><?=$display_info['info']?' - '.$display_info['info']:''?></label><br />
<?
- } ?>
+ }
+ ?>
</td>
</tr>