From 61e34e7711e12fb6cf8af5c9cf5328c174cab2e5 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 22 Aug 2009 14:08:33 +0000
Subject: moved server analysis to new page structure

---
 pages/server_analysis.php                | 138 +++++++++++++++++++++++++++++++
 system.php                               | 138 -------------------------------
 views/default/settings/tidypics/edit.php |   4 +-
 views/default/tidypics/settings.php      |   2 +-
 4 files changed, 141 insertions(+), 141 deletions(-)
 create mode 100644 pages/server_analysis.php
 delete mode 100644 system.php

diff --git a/pages/server_analysis.php b/pages/server_analysis.php
new file mode 100644
index 000000000..f1f956f0b
--- /dev/null
+++ b/pages/server_analysis.php
@@ -0,0 +1,138 @@
+<?php
+
+/********************************************************************
+ *
+ *   Tidypics System Analysis Script
+ *
+ *   Helps admins configure their server
+ *
+ ********************************************************************/   
+
+	include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
+
+	global $CONFIG;
+
+	admin_gatekeeper();
+
+	set_context('admin');
+
+	$title = 'TidyPics Server Analysis'; 
+
+
+	function tp_readable_size($bytes) 
+	{
+		if (strpos($bytes, 'M'))
+			return $bytes . 'B';
+		
+		$size = $bytes / 1024;
+		if ($size < 1024) {
+			$size = number_format($size, 2);
+			$size .= ' KB';
+		} else {
+			$size = $size / 1024;
+			if($size < 1024) {
+				$size = number_format($size, 2);
+				$size .= ' MB';
+			} else {
+				$size = $size / 1024;
+				$size = number_format($size, 2);
+				$size .= ' GB';
+			} 
+		}
+	return $size;
+	}
+
+	$disablefunc = explode(',', ini_get('disable_functions'));
+	$exec_avail = "Disabled";
+	if (is_callable('exec') && !in_array('exec',$disablefunc))
+		$exec_avail = "Enabled";
+
+	ob_start();
+
+	echo elgg_view_title($title);
+?>
+<div class="contentWrapper">
+	<table width="100%">
+		<tr>
+			<td>PHP version</td>
+			<td><?php echo phpversion(); ?></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>GD</td>
+			<td><?php echo (extension_loaded('gd')) ? 'Enabled' : 'Disabled'; ?></td>
+			<td>Elgg requires the GD extension to be loaded</td>
+		</tr>
+		<tr>
+			<td>ImageMagick PHP</td>
+			<td><?php echo (extension_loaded('imagick')) ? 'Enabled' : 'Disabled'; ?></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>exec()</td>
+			<td><?php echo $exec_avail; ?></td>
+			<td>Required for ImageMagick command line</td>
+		</tr>
+		<tr>
+			<td>Memory Available to PHP</td>
+			<td><?php echo tp_readable_size(ini_get('memory_limit')); ?></td>
+			<td>Change memory_limit to increase</td>
+		</tr>
+		<tr>
+			<td>Memory Used to Load This Page</td>
+			<td><?php if (function_exists('memory_get_peak_usage')) echo tp_readable_size(memory_get_peak_usage()); ?></td>
+			<td>This is approximately the minimum per page</td>
+		</tr>
+		<tr>
+			<td>Max File Upload Size</td>
+			<td><?php echo tp_readable_size(ini_get('upload_max_filesize')); ?></td>
+			<td>Max size of an uploaded image</td>
+		</tr>
+		<tr>
+			<td>Max Post Size</td>
+			<td><?php echo tp_readable_size(ini_get('post_max_size')); ?></td>
+			<td>Max post size = sum of images + html form</td>
+		</tr>
+		<tr>
+			<td>Max Input Time</td>
+			<td><?php echo ini_get('max_input_time'); ?> s</td>
+			<td>Time script waits for upload to finish</td>
+		</tr>
+		<tr>
+			<td>Max Execution Time</td>
+			<td><?php echo ini_get('max_execution_time'); ?> s</td>
+			<td>Max time a script will run</td>
+		</tr>
+		<tr>
+			<td>GD imagejpeg</td>
+			<td><?php echo (is_callable('imagejpeg')) ? 'Enabled' : 'Disabled'; ?></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>GD imagepng</td>
+			<td><?php echo (is_callable('imagepng')) ? 'Enabled' : 'Disabled'; ?></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>GD imagegif</td>
+			<td><?php echo (is_callable('imagegif')) ? 'Enabled' : 'Disabled'; ?></td>
+			<td></td>
+		</tr>
+		<tr>
+			<td>EXIF</td>
+			<td><?php echo (is_callable('exif_read_data')) ? 'Enabled' : 'Disabled'; ?></td>
+			<td></td>
+		</tr>
+	</table>
+	<div style="margin-top:20px;">
+		<a href="<?php echo $CONFIG->url . "mod/tidypics/docs/configure_server.txt"; ?>">Server configuration doc</a>
+	</div>
+</div>
+<?php
+
+	$content = ob_get_clean();
+
+	$body = elgg_view_layout('two_column_left_sidebar', '', $content);
+
+	echo page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/system.php b/system.php
deleted file mode 100644
index 85397fc08..000000000
--- a/system.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-/********************************************************************
- *
- *   Tidypics System Analysis Script
- *
- *   Helps admins configure their server
- *
- ********************************************************************/   
-
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
-	global $CONFIG;
-
-	admin_gatekeeper();
-
-	set_context('admin');
-
-	$title = 'TidyPics Server Analysis'; 
-
-
-	function tp_readable_size($bytes) 
-	{
-		if (strpos($bytes, 'M'))
-			return $bytes . 'B';
-		
-		$size = $bytes / 1024;
-		if ($size < 1024) {
-			$size = number_format($size, 2);
-			$size .= ' KB';
-		} else {
-			$size = $size / 1024;
-			if($size < 1024) {
-				$size = number_format($size, 2);
-				$size .= ' MB';
-			} else {
-				$size = $size / 1024;
-				$size = number_format($size, 2);
-				$size .= ' GB';
-			} 
-		}
-	return $size;
-	}
-
-	$disablefunc = explode(',', ini_get('disable_functions'));
-	$exec_avail = "Disabled";
-	if (is_callable('exec') && !in_array('exec',$disablefunc))
-		$exec_avail = "Enabled";
-
-	ob_start();
-
-	echo elgg_view_title($title);
-?>
-<div class="contentWrapper">
-	<table width="100%">
-		<tr>
-			<td>PHP version</td>
-			<td><?php echo phpversion(); ?></td>
-			<td></td>
-		</tr>
-		<tr>
-			<td>GD</td>
-			<td><?php echo (extension_loaded('gd')) ? 'Enabled' : 'Disabled'; ?></td>
-			<td>Elgg requires the GD extension to be loaded</td>
-		</tr>
-		<tr>
-			<td>ImageMagick PHP</td>
-			<td><?php echo (extension_loaded('imagick')) ? 'Enabled' : 'Disabled'; ?></td>
-			<td></td>
-		</tr>
-		<tr>
-			<td>exec()</td>
-			<td><?php echo $exec_avail; ?></td>
-			<td>Required for ImageMagick command line</td>
-		</tr>
-		<tr>
-			<td>Memory Available to PHP</td>
-			<td><?php echo tp_readable_size(ini_get('memory_limit')); ?></td>
-			<td>Change memory_limit to increase</td>
-		</tr>
-		<tr>
-			<td>Memory Used to Load This Page</td>
-			<td><?php if (function_exists('memory_get_peak_usage')) echo tp_readable_size(memory_get_peak_usage()); ?></td>
-			<td>This is approximately the minimum per page</td>
-		</tr>
-		<tr>
-			<td>Max File Upload Size</td>
-			<td><?php echo tp_readable_size(ini_get('upload_max_filesize')); ?></td>
-			<td>Max size of an uploaded image</td>
-		</tr>
-		<tr>
-			<td>Max Post Size</td>
-			<td><?php echo tp_readable_size(ini_get('post_max_size')); ?></td>
-			<td>Max post size = sum of images + html form</td>
-		</tr>
-		<tr>
-			<td>Max Input Time</td>
-			<td><?php echo ini_get('max_input_time'); ?> s</td>
-			<td>Time script waits for upload to finish</td>
-		</tr>
-		<tr>
-			<td>Max Execution Time</td>
-			<td><?php echo ini_get('max_execution_time'); ?> s</td>
-			<td>Max time a script will run</td>
-		</tr>
-		<tr>
-			<td>GD imagejpeg</td>
-			<td><?php echo (is_callable('imagejpeg')) ? 'Enabled' : 'Disabled'; ?></td>
-			<td></td>
-		</tr>
-		<tr>
-			<td>GD imagepng</td>
-			<td><?php echo (is_callable('imagepng')) ? 'Enabled' : 'Disabled'; ?></td>
-			<td></td>
-		</tr>
-		<tr>
-			<td>GD imagegif</td>
-			<td><?php echo (is_callable('imagegif')) ? 'Enabled' : 'Disabled'; ?></td>
-			<td></td>
-		</tr>
-		<tr>
-			<td>EXIF</td>
-			<td><?php echo (is_callable('exif_read_data')) ? 'Enabled' : 'Disabled'; ?></td>
-			<td></td>
-		</tr>
-	</table>
-	<div style="margin-top:20px;">
-		<a href="<?php echo $CONFIG->url . "mod/tidypics/docs/configure_server.txt"; ?>">Server configuration doc</a>
-	</div>
-</div>
-<?php
-
-	$content = ob_get_clean();
-
-	$body = elgg_view_layout('two_column_left_sidebar', '', $content);
-
-	echo page_draw($title, $body);
-?>
\ No newline at end of file
diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php
index ca388cd0e..81db3c5e8 100644
--- a/views/default/settings/tidypics/edit.php
+++ b/views/default/settings/tidypics/edit.php
@@ -1,7 +1,7 @@
 <?
 	global $CONFIG;  
-	$system_url = $CONFIG->wwwroot . 'mod/tidypics/system.php';
-	$settings_url = $CONFIG->wwwroot . 'mod/tidypics/admin.php';
+	$system_url = $CONFIG->wwwroot . 'mod/tidypics/pages/server_analysis.php';
+	$settings_url = $CONFIG->wwwroot . 'mod/tidypics/pages/admin.php';
 ?>
 
 <p>
diff --git a/views/default/tidypics/settings.php b/views/default/tidypics/settings.php
index c8d12d861..774dc35bd 100644
--- a/views/default/tidypics/settings.php
+++ b/views/default/tidypics/settings.php
@@ -3,7 +3,7 @@
 	echo elgg_view('output/longtext', array('value' => elgg_echo("tidypics:admin:instructions")));
 	
 	global $CONFIG;  
-	$system_url = $CONFIG->wwwroot . 'mod/tidypics/system.php';
+	$system_url = $CONFIG->wwwroot . 'mod/tidypics/pages/server_analysis.php';
 	$upgrade_url = $CONFIG->wwwroot . 'mod/tidypics/upgrade.php';
 	
 	$upgrade = false;
-- 
cgit v1.2.3