From 6880203b6435bf81b25999b51ba307853751226a Mon Sep 17 00:00:00 2001
From: Nick White <git@njw.me.uk>
Date: Fri, 6 Nov 2009 05:11:28 +0000
Subject: Lay groundwork for content negotiation

Separate webpage rendering into a separate file, containing functions
for each output format
Improve loading of php not in /webpages
---
 includes/render-webpage.php | 32 ++++++++++++++++++++++++++++++++
 index.php                   | 23 ++++++++++++-----------
 2 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 includes/render-webpage.php

diff --git a/includes/render-webpage.php b/includes/render-webpage.php
new file mode 100644
index 0000000..cb059d3
--- /dev/null
+++ b/includes/render-webpage.php
@@ -0,0 +1,32 @@
+<?php
+/*
+ * Copyright (C) 2009  Nick White
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+function render_xhtml($path)
+{
+	include($path);
+
+	include($_SERVER['DOCUMENT_ROOT'] . "/includes/header.php");
+	xhtml_header($title);
+
+	print($body);
+
+	include($_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php");
+	page_footer($path);
+}
+
+?>
diff --git a/index.php b/index.php
index 29d468c..a4912f0 100644
--- a/index.php
+++ b/index.php
@@ -22,7 +22,6 @@ $request = $_SERVER['REQUEST_URI'];
 if (preg_match ( '/\.\./', $request )  || /* don't go up the filesystem */
 	preg_match ( '/[\'\"]/', $request )|| /* string terminators */
 	preg_match ( '/\\\0/', $request ) )   /* null bytes */
-
 {
 	header('HTTP/1.0 500 Internal Error');
 	echo "<h1>Error</h1>";
@@ -30,10 +29,14 @@ if (preg_match ( '/\.\./', $request )  || /* don't go up the filesystem */
 }
 
 $contentpath = $_SERVER['DOCUMENT_ROOT'] . '/webpages/' . $request;
+$webpage = true;
 
 /* if nothing exists in webpages directory, try root */
 if ( ! is_dir($contentpath) && ! is_file($contentpath.'.php') )
+{
 	$contentpath = $_SERVER['DOCUMENT_ROOT'] . $request;
+	$webpage = false;
+}
 
 if ( is_dir($contentpath) == TRUE )
 	$contentpath .= 'index.php';
@@ -47,16 +50,14 @@ if ( ! is_file($contentpath) )
 	exit (0);
 }
 
-include($_SERVER['DOCUMENT_ROOT'] . "/includes/header.php");
-
-include($contentpath);
-
-xhtml_header($title);
-
-print($body);
-
-include($_SERVER['DOCUMENT_ROOT'] . "/includes/footer.php");
+if($webpage)
+{
+	include($_SERVER['DOCUMENT_ROOT'] . "/includes/render-webpage.php");
 
-page_footer($contentpath);
+	/* todo: base the function to use on content negotiation */
+	render_xhtml($contentpath);
+}
+else
+	include($contentpath);
 
 ?>
-- 
cgit v1.2.3