aboutsummaryrefslogtreecommitdiff
path: root/views/default/admin
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-06-02 07:14:18 -0700
committerCash Costello <cash.costello@gmail.com>2012-06-02 07:14:18 -0700
commit4abe9e6727108efd1f834a80a7942ed92cae2a52 (patch)
tree14cb4712274f343ecc1dffb277b7521b19e9db3e /views/default/admin
parentb546494ea20aad1514f4127341a303c435e0d8f4 (diff)
parent7c0215018897bfb578e6116ef9d36e5edc1fe5cf (diff)
downloadelgg-4abe9e6727108efd1f834a80a7942ed92cae2a52.tar.gz
elgg-4abe9e6727108efd1f834a80a7942ed92cae2a52.tar.bz2
Merge pull request #222 from mrclay/issue2411
Fixes #2411: Show message when upload exceeds PHP limits
Diffstat (limited to 'views/default/admin')
-rw-r--r--views/default/admin/statistics/server/php.php17
1 files changed, 17 insertions, 0 deletions
diff --git a/views/default/admin/statistics/server/php.php b/views/default/admin/statistics/server/php.php
index 4a59b95fb..7c6a51383 100644
--- a/views/default/admin/statistics/server/php.php
+++ b/views/default/admin/statistics/server/php.php
@@ -8,6 +8,15 @@ if (!$php_log) {
$php_log = elgg_echo('admin:server:error_log');
}
+$post_max_size = elgg_get_ini_setting_in_bytes('post_max_size');
+$upload_max_filesize = elgg_get_ini_setting_in_bytes('upload_max_filesize');
+
+$post_max_size_warning = '';
+if ($upload_max_filesize > $post_max_size) {
+ // @todo show a link to something like http://nigel.mcnie.name/blog/uploadmaxfilesizepostmaxsize-experimentation ?
+ $post_max_size_warning = elgg_echo('admin:server:warning:post_max_too_small');
+}
+
?>
<table class="elgg-table-alt">
<tr class="odd">
@@ -30,4 +39,12 @@ if (!$php_log) {
<td><b><?php echo elgg_echo('admin:server:label:mem_used'); ?> :</b></td>
<td><?php echo number_format(memory_get_peak_usage()); ?></td>
</tr>
+ <tr class="even">
+ <td><b><?php echo elgg_echo('admin:server:label:post_max_size'); ?> :</b></td>
+ <td><?php echo number_format($post_max_size); ?></td>
+ </tr>
+ <tr class="odd">
+ <td><b><?php echo elgg_echo('admin:server:label:upload_max_filesize'); ?> :</b></td>
+ <td><?php echo number_format($upload_max_filesize) . '&nbsp; ' . $post_max_size_warning; ?></td>
+ </tr>
</table>