5 files changed, 76 insertions, 64 deletions
diff --git a/site/download/index.php b/site/download/index.php
index 1026dd9..f4c5753 100644
--- a/site/download/index.php
+++ b/site/download/index.php
@@ -20,6 +20,7 @@
 <?php
 	include_once "../variables.php";
 	include_once "../torrents.php";
+	include_once "../functions.php";
 ?>
 <!DOCTYPE html>
 <html>
diff --git a/site/download/oldtorrent/index.php b/site/download/oldtorrent/index.php
index fb8e369..ad1ee76 100644
--- a/site/download/oldtorrent/index.php
+++ b/site/download/oldtorrent/index.php
@@ -20,6 +20,7 @@
 <?php
 	include_once "../../variables.php";
 	include_once "../../torrents.php";
+	include_once "../../functions.php";
 ?>
 <!DOCTYPE html>
 <html>
diff --git a/site/functions.php b/site/functions.php
new file mode 100644
index 0000000..e930638
--- /dev/null
+++ b/site/functions.php
@@ -0,0 +1,74 @@
+<?php
+/*
+    Generic functions used by the rest of the site
+    Copyright (C) 2015  Francis Rowe <info@gluglug.org.uk>
+
+    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/>.
+*/
+?>
+<?php
+
+/* Functions */
+
+	/* Generic function for showing a list of torrents */
+	function torrent_list($arrayTorrentLink, $forIndexStart, $forIndexBelow) {
+
+		if ((count($arrayTorrentLink)>=($forIndexStart+1)) && (count($arrayTorrentLink)>=$forIndexBelow)) {
+			for ($release=$forIndexStart; $release<$forIndexBelow; $release++) {
+?>
+				<h2><?php echo $arrayTorrentLink[$release][0][0]; ?></h2>
+					<p>
+						Released on <?php echo $arrayTorrentLink[$release][0][1]; ?>.
+					</p>
+					<ul>
+<?php
+				for ($archive=1; $archive<count($arrayTorrentLink[$release]); $archive++) {
+?>
+						<li><a href="<?php echo $arrayTorrentLink[$release][$archive][1]; ?>"><?php echo $arrayTorrentLink[$release][$archive][0]; ?></a></li>
+<?php
+				}
+?>
+					</ul>
+<?php
+			}
+		} else {
+?>
+					<p>No torrents found.</p>
+<?php
+		}
+		
+		return;
+	}
+	
+	/* Generic function for showing a list of URLs */
+	function list_items($arrayMirrors,$strNotFoundMessage,$forIndexStart,$forIndexbelow) {
+?>
+				<ul>
+<?php
+		if (count($arrayMirrors)>0) {
+			for ($server=$forIndexStart; $server<$forIndexbelow; $server++) {
+?>
+					<li><a href="<?php echo $arrayMirrors[$server]; ?>"><?php echo $arrayMirrors[$server]; ?></a></li>
+<?php
+			}
+		} else {
+?>
+					<li><?php echo $strNotFoundMessage; ?></li>
+<?php
+		}
+?>
+				</ul>
+<?php
+	}
+?>
diff --git a/site/torrents.template.php b/site/torrents.template.php
index c80861c..e15f0ee 100644
--- a/site/torrents.template.php
+++ b/site/torrents.template.php
@@ -16,41 +16,6 @@
     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/>.
 */
-?>
-<?php
-
-/* Functions */
-
-	function torrent_list($arrayTorrentLink, $forIndexStart, $forIndexBelow) {
-
-		if ((count($arrayTorrentLink)>=($forIndexStart+1)) && (count($arrayTorrentLink)>=$forIndexBelow)) {
-			for ($release=$forIndexStart; $release<$forIndexBelow; $release++) {
-?>
-				<h2><?php echo $arrayTorrentLink[$release][0][0]; ?></h2>
-					<p>
-						Released on <?php echo $arrayTorrentLink[$release][0][1]; ?>.
-					</p>
-					<ul>
-<?php
-				for ($archive=1; $archive<count($arrayTorrentLink[$release]); $archive++) {
-?>
-						<li><a href="<?php echo $arrayTorrentLink[$release][$archive][1]; ?>"><?php echo $arrayTorrentLink[$release][$archive][0]; ?></a></li>
-<?php
-				}
-?>
-					</ul>
-<?php
-			}
-		} else {
-?>
-					<p>No torrents found.</p>
-<?php
-		}
-		
-		return;
-	}
-	
-/* Data */
 
 	/* Copy this to torrents.php, and adapt for your needs */
 	
diff --git a/site/variables.template.php b/site/variables.template.php
index 760c104..dc4d7e9 100644
--- a/site/variables.template.php
+++ b/site/variables.template.php
@@ -20,35 +20,6 @@
 <?php
 	/* Copy this to variables.php, and adapt for your needs */
 
-	/*
-	 * ------FUNCTIONS:
-	 */
-	 
-	/* Generic function for showing a list of URLs */
-	function list_items($arrayMirrors,$strNotFoundMessage,$forIndexStart,$forIndexbelow) {
-?>
-				<ul>
-<?php
-		if (count($arrayMirrors)>0) {
-			for ($server=$forIndexStart; $server<$forIndexbelow; $server++) {
-?>
-					<li><a href="<?php echo $arrayMirrors[$server]; ?>"><?php echo $arrayMirrors[$server]; ?></a></li>
-<?php
-			}
-		} else {
-?>
-					<li><?php echo $strNotFoundMessage; ?></li>
-<?php
-		}
-?>
-				</ul>
-<?php
-	}
-
-	/*
-	 * ------DATA:
-	 */
-
 	/* Project name
 	 * NOTE: Not all parts of the site use this, because
 	 *       parts of the site talking about things that are very