From 8447c7a41a276137ff4f91ec9cf3de7bca71dd52 Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@sihnon.net>
Date: Sun, 9 Mar 2008 17:02:16 +0000
Subject: [PATCH] Backing up laptop, committing all unsaved changes

---
 .htaccess               |   6 +--
 code/iauthenticator.php | 114 ++++++++++++++++++++--------------------
 page-sources/home.php   |  13 +++++
 resources/normal.css    |  20 ++++++-
 templates/default.php   |   3 +-
 test.php                |  10 ++++
 6 files changed, 104 insertions(+), 62 deletions(-)

diff --git a/.htaccess b/.htaccess
index f91abd8..1dd9fb2 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,7 +1,7 @@
-<IfModule mod_rewrite.c>
+# Magic Quotes are the Root-of-all-Evil and must be burned at the stake.
+php_flag magic_quotes_gpc off
 
-	# Magic Quotes are the Root-of-all-Evil and must be burned at the stake.
-	php_flag magic_quotes_gpc off
+<IfModule mod_rewrite.c>
 
 	# Enable mod_rewrite for pretty urls
 	RewriteEngine on
diff --git a/code/iauthenticator.php b/code/iauthenticator.php
index cb2080b..7f77cfb 100644
--- a/code/iauthenticator.php
+++ b/code/iauthenticator.php
@@ -1,60 +1,60 @@
 <?php
-    
-    /*
-     * IAuthenticator
-     * Interface for authentication classes
-     */
-     
-     interface IAuthenticator {
-     	 
-     	 // Do any module-specific initialisation
-     	 public function initialise();
-     	 // Shutdown the module cleanly when finished
-     	 public function uninitialise();
-     	 
-     	 // Identifies whether a user with a given name exists
-     	 public function user_exists( $username );
-     	 // Checks a given username and password
-     	 public function authenticate( $username, $password );
-     	 
-     	 // Does translation between a username and full name
-     	 public function username2fullname( $username );
-     	 // And vice versa
-     	 public function fullname2username( $fullname );
-     	 
-	 };
+	
+	/*
+	 * IAuthenticator
+	 * Interface for authentication classes
+	 */
 	 
-	 /*
-	  * IAuthenticatorFactory
-	  * Creates an instance of an Authenticator module, given its name
-	  */
-	 class IAuthenticatorFactory {
-	 	 
-	 	 // Prevent any instances of this class being constructed
-	 	 private function __construct() {
-	 	 	 
-		 }
-	 	 
-	 	 public static function get( $module ) {
-	 	 	 global $_meta;
-	 	 	 
-	 	 	 // Get the filename and classnames for this module
-	 	 	 $filename = "{$_meta['script-dir']}/code/auth_{$module}.php";
-	 	 	 $classname = "Authenticator_{$module}";
-	 	 	 
-	 	 	 // Check to make sure this module exists
-	 	 	 if( !file_exists($filename) ) throw new ConfigException("Authentication module could not be found: '{$filename}.'", 500);
-	 	 	 
-	 	 	 // Import the auth modules code
-	 	 	 require_once( $filename );
-	 	 	 
-	 	 	 // Ensure the class has been defined
-	 	 	 if( !class_exists( $classname ) ) throw new ConfigException("Authentication module is invalid: '{$classname}'.", 500);
-	 	 	 
-	 	 	 // Create an instance of the module, and return it
-	 	 	 return new $classname();
-	 	 	 
-		 }
-	 };
-    
+	interface IAuthenticator {
+		
+		// Do any module-specific initialisation
+		public function initialise();
+		// Shutdown the module cleanly when finished
+		public function uninitialise();
+		
+		// Identifies whether a user with a given name exists
+		public function user_exists( $username );
+		// Checks a given username and password
+		public function authenticate( $username, $password );
+		
+		// Does translation between a username and full name
+		public function username2fullname( $username );
+		// And vice versa
+		public function fullname2username( $fullname );
+		
+	};
+	
+	/*
+	 * IAuthenticatorFactory
+	 * Creates an instance of an Authenticator module, given its name
+	 */
+	class IAuthenticatorFactory {
+	 
+		// Prevent any instances of this class being constructed
+		private function __construct() {
+		 
+		}
+		 
+		public static function get( $module ) {
+			global $_meta;
+			 
+			// Get the filename and classnames for this module
+			$filename = "{$_meta['script-dir']}/code/auth_{$module}.php";
+			$classname = "Authenticator_{$module}";
+			
+			// Check to make sure this module exists
+			if( !file_exists($filename) ) throw new ConfigException("Authentication module could not be found: '{$filename}.'", 500);
+			
+			// Import the auth modules code
+			require_once( $filename );
+			
+			// Ensure the class has been defined
+			if( !class_exists( $classname ) ) throw new ConfigException("Authentication module is invalid: '{$classname}'.", 500);
+			
+			// Create an instance of the module, and return it
+			return new $classname();
+			
+		}
+	};
+	
 ?>
diff --git a/page-sources/home.php b/page-sources/home.php
index a8b50cf..fd49340 100644
--- a/page-sources/home.php
+++ b/page-sources/home.php
@@ -8,3 +8,16 @@
      $_template['title'] = 'Home';
     
 ?>
+<div>
+	<img class="bio" src="<?php echo $_meta['base-dir']; ?>/resources/bios_scott.jpg" alt="Me?" />
+	
+	<p>
+		I am a third year student at ECS in Southampton, studying for a Masters degree in Computer Science (with Networks and Distributed Systems).
+	</p>
+	<p>
+		Here you can find a copy of my <a href="<?php echo $_req->construct('page','cv'); ?>" title="Curriculum Vitae">CV</a>,
+		or you can contact me via bar105<img class="at" src="<?php echo $_meta['base-dir']; ?>/resources/at.png" alt="@" />ecs.soton.ac.uk.
+	</p>
+	
+	
+</div>
\ No newline at end of file
diff --git a/resources/normal.css b/resources/normal.css
index 7fd1b58..257ac7f 100644
--- a/resources/normal.css
+++ b/resources/normal.css
@@ -24,7 +24,7 @@ div.sidebar {
 
 div.page {
 	margin: 1em;
-	margin-left: 9em;
+	margin-left: 15em;
 }
 
 div.footer {
@@ -79,6 +79,10 @@ div.quote blockquote {
 	background-color: lightyellow;
 }
 
+img.at {
+	height: 1em;
+	width: 1em;
+}
 
 /*
 	Dialog boxes
@@ -130,4 +134,18 @@ p.loginform label {
 }
 p.loginform input {
 	float:				right;
+}
+
+
+/*
+	Homepage
+*/
+
+img.bio {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+	
+	border: 1px solid grey;
+	padding: 0.2em;
 }
\ No newline at end of file
diff --git a/templates/default.php b/templates/default.php
index b0aff0e..005d750 100644
--- a/templates/default.php
+++ b/templates/default.php
@@ -13,6 +13,7 @@
 <head>
 	<title><?php echo $_template['title']; ?></title>
 	<link rel="stylesheet" type="text/css" href="<?php echo $_meta['base-dir']; ?>/resources/normal.css" />
+	<script language="javascript" type="text/javascript" src="<?php echo $_meta['base-dir']; ?>/resources/email.js" />
 <?php
 	// If we have a redirection, implement a meta refresh here
 	if( $_template['redirect-to'] ) {
@@ -36,7 +37,7 @@
 		<strong>Navigation</strong>
 		<ul>
 			<li><a href="<?php echo $_req->construct('page','home'); ?>" title="Homepage">Home</a></li>
-			<li><a href="<?php echo $_req->construct('page','cv'); ?>" title="Curriculum Vitae">CV</a></li>
+			<li><a href="<?php echo $_req->construct('page','cv'); ?>" title="Curriculum Vitae">Curriculum Vitae</a></li>
 <?php if( $_session->is_logged_in() ) { ?>
 			<li><a href="<?php echo $_req->construct('page','logout'); ?>" title="Logout">Logout</a></li>
 <?php } ?>
diff --git a/test.php b/test.php
index b5ff16c..ff20c75 100644
--- a/test.php
+++ b/test.php
@@ -35,5 +35,15 @@
 	 	var_dump($_SESSION);
 	 	echo '</pre>';
 	 }
+	 
+	 if (isset($_GET['validate'])) {
+	 	 require_once('code/validation/ivalidator.php');
+	 	 
+	 	 try {
+	 	 	 Validator::check('Value', $_GET['value'], IValidatorFactory::get('Range',5,32));
+		 } catch (ValidationException $e) {
+		 	 	 echo $e->getMessage();
+		 }
+	 }
     
 ?>
\ No newline at end of file