diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-09-23 18:36:40 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-09-23 18:36:40 +0200 |
| commit | 75e45ac78653198fc2575c39c533dc27c3003a0e (patch) | |
| tree | 15d3cceed862c72efa5ead07cc352f85722c2935 /core | |
| parent | 89e02e89d4a0cf28a9318f4dacd070783cbb7531 (diff) | |
| parent | c6eab9aaba3be7b77d543fde49fee889563fcd90 (diff) | |
| download | nextcloud-server-75e45ac78653198fc2575c39c533dc27c3003a0e.tar.gz nextcloud-server-75e45ac78653198fc2575c39c533dc27c3003a0e.zip | |
Merge pull request #11019 from owncloud/do-not-show-exception-to-enduser
Do not show exception to the end-user - use a proper error page instead
Diffstat (limited to 'core')
| -rw-r--r-- | core/templates/error.php | 4 | ||||
| -rw-r--r-- | core/templates/exception.php | 29 |
2 files changed, 32 insertions, 1 deletions
diff --git a/core/templates/error.php b/core/templates/error.php index e8b7a49264f..030fbf07fcb 100644 --- a/core/templates/error.php +++ b/core/templates/error.php @@ -2,7 +2,9 @@ <?php foreach($_["errors"] as $error):?> <li class='error'> <?php p($error['error']) ?><br/> - <p class='hint'><?php if(isset($error['hint']))print_unescaped($error['hint']) ?></p> + <?php if(isset($error['hint']) && $error['hint']): ?> + <p class='hint'><?php print_unescaped($error['hint']) ?></p> + <?php endif;?> </li> <?php endforeach ?> </ul> diff --git a/core/templates/exception.php b/core/templates/exception.php new file mode 100644 index 00000000000..cf0e4c74825 --- /dev/null +++ b/core/templates/exception.php @@ -0,0 +1,29 @@ +<?php + /** @var array $_ */ + /** @var OC_L10N $l */ +?> +<span class="error error-wide"> + <h2><strong><?php p('Internal Server Error') ?></strong></h2> + <p><?php p($l->t('The server encountered an internal error and was unable to complete your request.')) ?></p> + <p><?php p($l->t('Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.')) ?></p> + <p><?php p($l->t('More details can be found in the server log.')) ?></p> + <br /> + + <h2><strong><?php p($l->t('Technical details')) ?></strong></h2> + <ul> + <li><?php p($l->t('Remote Address: %s', $_['remoteAddr'])) ?></li> + <li><?php p($l->t('Request ID: %s', $_['requestID'])) ?></li> + <?php if($_['debugMode']): ?> + <li><?php p($l->t('Code: %s', $_['errorCode'])) ?></li> + <li><?php p($l->t('Message: %s', $_['errorMsg'])) ?></li> + <li><?php p($l->t('File: %s', $_['file'])) ?></li> + <li><?php p($l->t('Line: %s', $_['line'])) ?></li> + <?php endif; ?> + </ul> + + <?php if($_['debugMode']): ?> + <br /> + <h2><strong><?php p($l->t('Trace')) ?></strong></h2> + <pre><?php p($_['trace']) ?></pre> + <?php endif; ?> +</span> |