6 files changed, 135 insertions, 75 deletions
diff --git a/views/default/admin/statistics/overview.php b/views/default/admin/statistics/overview.php
index c8cc682d5..ac5aaac36 100644
--- a/views/default/admin/statistics/overview.php
+++ b/views/default/admin/statistics/overview.php
@@ -6,81 +6,8 @@
  * @subpackage Core
  */
 
-// Work out number of users
-$users_stats = get_number_users();
-$total_users = get_number_users(true);
-
-// Get version information
-$version = get_version();
-$release = get_version(true);
-
 echo elgg_view('admin/statistics/extend');
 
-?>
-<div class="elgg-module elgg-module-inline">
-	<div class="elgg-head">
-		<h3><?php echo elgg_echo('admin:statistics:label:basic'); ?></h3>
-	</div>
-	<div class="elgg-body">
-		<?php //@todo extract this table to a view so we can use elgg_view_module ?>
-		<table class="elgg-table-alt">
-			<tr class="odd">
-				<td><b><?php echo elgg_echo('admin:statistics:label:version'); ?> :</b></td>
-				<td><?php echo elgg_echo('admin:statistics:label:version:release'); ?> - <?php echo $release; ?>, <?php echo elgg_echo('admin:statistics:label:version:version'); ?> - <?php echo $version; ?></td>
-			</tr>
-			<tr class="even">
-				<td><b><?php echo elgg_echo('admin:statistics:label:numusers'); ?> :</b></td>
-				<td><?php echo $users_stats; ?> <?php echo elgg_echo('active'); ?> / <?php echo $total_users; ?> <?php echo elgg_echo('total') ?></td>
-			</tr>
-		</table>
-	</div>
-</div>
-
-<?php
-
-// Get entity statistics
-$entity_stats = get_entity_statistics();
-$even_odd = "";
-?>
-<div class="elgg-module elgg-module-inline">
-	<div class="elgg-head">
-		<h3><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h3>
-	</div>
-	<div class="elgg-body">
-		<?php //@todo extract this table to a view so we can use elgg_view_module ?>
-		<table class="elgg-table-alt">
-		<?php
-			foreach ($entity_stats as $k => $entry) {
-				arsort($entry);
-				foreach ($entry as $a => $b) {
-
-					//This function controls the alternating class
-					$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
-
-					if ($a == "__base__") {
-						$a = elgg_echo("item:{$k}");
-						if (empty($a))
-							$a = $k;
-					} else {
-							if (empty($a)) {
-								$a = elgg_echo("item:{$k}");
-							} else {
-								$a = elgg_echo("item:{$k}:{$a}");
-							}
+echo elgg_view_module('inline', elgg_echo('admin:statistics:label:basic'), elgg_view('admin/statistics/overview/basic'));
 
-							if (empty($a)) {
-								$a = "$k $a";
-							}
-						}
-					echo <<< END
-						<tr class="{$even_odd}">
-							<td>{$a}:</td>
-							<td>{$b}</td>
-						</tr>
-END;
-				}
-			}
-		?>
-		</table>
-	</div>
-</div>
-\ No newline at end of file
+echo elgg_view_module('inline', elgg_echo('admin:statistics:label:numentities'), elgg_view('admin/statistics/overview/numentities'));
diff --git a/views/default/admin/statistics/overview/basic.php b/views/default/admin/statistics/overview/basic.php
new file mode 100644
index 000000000..2c9b3b88e
--- /dev/null
+++ b/views/default/admin/statistics/overview/basic.php
@@ -0,0 +1,19 @@
+<?php
+// Work out number of users
+$users_stats = get_number_users();
+$total_users = get_number_users(true);
+
+// Get version information
+$version = get_version();
+$release = get_version(true);
+?>
+<table class="elgg-table-alt">
+	<tr class="odd">
+		<td><b><?php echo elgg_echo('admin:statistics:label:version'); ?> :</b></td>
+		<td><?php echo elgg_echo('admin:statistics:label:version:release'); ?> - <?php echo $release; ?>, <?php echo elgg_echo('admin:statistics:label:version:version'); ?> - <?php echo $version; ?></td>
+	</tr>
+	<tr class="even">
+		<td><b><?php echo elgg_echo('admin:statistics:label:numusers'); ?> :</b></td>
+		<td><?php echo $users_stats; ?> <?php echo elgg_echo('active'); ?> / <?php echo $total_users; ?> <?php echo elgg_echo('total') ?></td>
+	</tr>
+</table>
+\ No newline at end of file
diff --git a/views/default/admin/statistics/overview/numentities.php b/views/default/admin/statistics/overview/numentities.php
new file mode 100644
index 000000000..af4ae2773
--- /dev/null
+++ b/views/default/admin/statistics/overview/numentities.php
@@ -0,0 +1,40 @@
+<?php
+// Get entity statistics
+$entity_stats = get_entity_statistics();
+$even_odd = "";
+?>		
+<table class="elgg-table-alt">
+<?php
+foreach ($entity_stats as $k => $entry) {
+	arsort($entry);
+	foreach ($entry as $a => $b) {
+
+		//This function controls the alternating class
+		$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
+
+		if ($a == "__base__") {
+			$a = elgg_echo("item:{$k}");
+			if (empty($a))
+				$a = $k;
+		} else {
+			if (empty($a)) {
+				$a = elgg_echo("item:{$k}");
+			} else {
+				$a = elgg_echo("item:{$k}:{$a}");
+			}
+
+			if (empty($a)) {
+				$a = "$k $a";
+			}
+		}
+		
+		echo <<< END
+			<tr class="{$even_odd}">
+				<td>{$a}:</td>
+				<td>{$b}</td>
+			</tr>
+END;
+		}
+	}
+?>
+</table>
diff --git a/views/default/admin/statistics/server.php b/views/default/admin/statistics/server.php
new file mode 100644
index 000000000..9d21addc1
--- /dev/null
+++ b/views/default/admin/statistics/server.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Server information
+ */
+
+echo elgg_view_module('inline', elgg_echo('admin:server:label:web_server'), elgg_view('admin/statistics/server/web_server'));
+
+echo elgg_view_module('inline', elgg_echo('admin:server:label:php'), elgg_view('admin/statistics/server/php'));
diff --git a/views/default/admin/statistics/server/php.php b/views/default/admin/statistics/server/php.php
new file mode 100644
index 000000000..7c6a51383
--- /dev/null
+++ b/views/default/admin/statistics/server/php.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Server PHP info
+ */
+
+$php_log = ini_get('error_log');
+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">
+		<td><b><?php echo elgg_echo('admin:server:label:php_version'); ?> :</b></td>
+		<td><?php echo phpversion(); ?></td>
+	</tr>
+	<tr class="even">
+		<td><b><?php echo elgg_echo('admin:server:label:php_ini'); ?> :</b></td>
+		<td><?php echo php_ini_loaded_file(); ?></td>
+	</tr>
+	<tr class="odd">
+		<td><b><?php echo elgg_echo('admin:server:label:php_log'); ?> :</b></td>
+		<td><?php echo $php_log; ?></td>
+	</tr>
+	<tr class="even">
+		<td><b><?php echo elgg_echo('admin:server:label:mem_avail'); ?> :</b></td>
+		<td><?php echo number_format(elgg_get_ini_setting_in_bytes('memory_limit')); ?></td>
+	</tr>
+	<tr class="odd">
+		<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>
diff --git a/views/default/admin/statistics/server/web_server.php b/views/default/admin/statistics/server/web_server.php
new file mode 100644
index 000000000..904a54f4b
--- /dev/null
+++ b/views/default/admin/statistics/server/web_server.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Web server info
+ */
+
+?>
+<table class="elgg-table-alt">
+	<tr class="odd">
+		<td><b><?php echo elgg_echo('admin:server:label:server'); ?> :</b></td>
+		<td><?php echo $_SERVER['SERVER_SOFTWARE']; ?></td>
+	</tr>
+	<tr class="even">
+		<td><b><?php echo elgg_echo('admin:server:label:log_location'); ?> :</b></td>
+		<td><?php echo getenv('APACHE_LOG_DIR'); ?></td>
+	</tr>
+</table>