Fixes #2411: Show message when upload exceeds PHP limits, and show limits in Server Info

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>