diff options
| author | Hanne Moa <hanne.moa@uninett.no> | 2016-09-15 14:32:50 +0200 |
|---|---|---|
| committer | Hanne Moa <hanne.moa@uninett.no> | 2016-09-16 11:33:36 +0200 |
| commit | dd63390d64a53b8866592dd2016a228d0247da10 (patch) | |
| tree | 9a0968d113aa836ed2165f9ddebff41cf44f2e37 /modules/authX509 | |
| parent | 15ad1d9abd67e6cf1f9bcd4004f1c06edb949908 (diff) | |
| download | simplesamlphp-origin/errorcode-class.zip simplesamlphp-origin/errorcode-class.tar.gz simplesamlphp-origin/errorcode-class.tar.bz2 | |
Avoid concatenated error messagesorigin/errorcode-class
For #455
Diffstat (limited to 'modules/authX509')
| -rw-r--r-- | modules/authX509/templates/X509error.php | 4 | ||||
| -rw-r--r-- | modules/authX509/www/expirywarning.php | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/modules/authX509/templates/X509error.php b/modules/authX509/templates/X509error.php index 1f27230..459bbf2 100644 --- a/modules/authX509/templates/X509error.php +++ b/modules/authX509/templates/X509error.php @@ -11,8 +11,8 @@ if ($this->data['errorcode'] !== NULL) { <div style="border-left: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8; background: #f5f5f5"> <img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" class="float-l" style="margin: 15px" alt="" /> <h2><?php echo $this->t('{login:error_header}'); ?></h2> - <p><b><?php echo $this->t('{errors:title_' . $this->data['errorcode'] . '}'); ?></b></p> - <p><?php echo $this->t('{errors:descr_' . $this->data['errorcode'] . '}'); ?></p> + <p><b><?php echo $this->t($this->data['errorcodes']['title'][$this->data['errorcode']]); ?></b></p> + <p><?php echo $this->t($this->data['errorcodes']['descr'][$this->data['errorcode']]); ?></p> </div> <?php } diff --git a/modules/authX509/www/expirywarning.php b/modules/authX509/www/expirywarning.php index b5faa22..02b2b22 100644 --- a/modules/authX509/www/expirywarning.php +++ b/modules/authX509/www/expirywarning.php @@ -27,4 +27,5 @@ $t->data['target'] = SimpleSAML\Module::getModuleURL('authX509/expirywarning.php $t->data['data'] = array('StateId' => $id); $t->data['daysleft'] = $state['daysleft']; $t->data['renewurl'] = $state['renewurl']; +$t->data['errorcodes'] = SimpleSAML\Error\Errorcodes::getAllErrorCodeMessages(); $t->show(); |