components/static.php

@@ -5,81 +5,81 @@
 $permission = "html";
 
 // Get the right filename...
-$myfile = $base."static".$path.$language['file'].".txt";
-$secondaryfile = $base."static".$path.$language['file']."-secondary.txt";
+$myfile = $base . "static" . $path . $language['file'] . ".txt";
+$secondaryfile = $base . "static" . $path . $language['file'] . "-secondary.txt";
 if (!file_exists($myfile)) {
-	$myfile = $base."static$path.txt";
-	$secondaryfile = $base."static$path-secondary.txt";
-	// If the file doesn't exist...
-	if (!file_exists($myfile)) {
-		if (isset($session->groups[$permission]) && @$_REQUEST['action']=="create") {
-			// ...and we have permission and have been asked to, create it
-			$body = "foo";
-		} else {
-			$redirect_path = $DB->GetOne("SELECT to_uri FROM redirect where from_uri=?", array("/".$pathlist[1]));
-			if (isset($_SERVER['HTTPS'])) $proto = "https://";
-			else $proto = "http://";
-			if ($redirect_path!="") {
-				$variables = "";
-				for ($i=2;$i<count($pathlist);$i++) {
-					$variables .= "/".$pathlist[$i];
-				}
-				$redirect_uri = $proto.$_SERVER['SERVER_NAME'].$redirect_path.$variables;
-				if ($_SERVER['QUERY_STRING']!="") $redirect_uri.="?".$_SERVER['QUERY_STRING'];
-				header("HTTP/1.1 301 Moved Permanently");
-				header("Location: ".$redirect_uri);
-			} else {
-				// ...serve a 404 error
-				header("HTTP/1.1 404 Not Found");
-				$body = @file_get_contents($base."static/404.txt");
-				$smarty->assign("pathlist", array("", "Error"));
-				$title = "File not found";
-				$smarty->assign("title", $title);
-				$smarty->assign("body", $body);
-				// Give those with permission the chance to create the page
-				if (isset($session->groups[$permission])) $smarty->assign("creatable", TRUE);
-			}
-			return;
-		}
-	}
+    $myfile = $base . "static$path.txt";
+    $secondaryfile = $base . "static$path-secondary.txt";
+    // If the file doesn't exist...
+    if (!file_exists($myfile)) {
+        if (isset($session->groups[$permission]) && @$_REQUEST['action'] == "create") {
+            // ...and we have permission and have been asked to, create it
+            $body = "foo";
+        } else {
+            $redirect_path = $DB->GetOne("SELECT to_uri FROM redirect where from_uri=?", array("/" . $pathlist[1]));
+            if (isset($_SERVER['HTTPS'])) $proto = "https://";
+            else $proto = "http://";
+            if ($redirect_path != "") {
+                $variables = "";
+                for ($i = 2; $i < count($pathlist); $i++) {
+                    $variables .= "/" . $pathlist[$i];
+                }
+                $redirect_uri = $proto . $_SERVER['SERVER_NAME'] . $redirect_path . $variables;
+                if ($_SERVER['QUERY_STRING'] != "") $redirect_uri .= "?" . $_SERVER['QUERY_STRING'];
+                header("HTTP/1.1 301 Moved Permanently");
+                header("Location: " . $redirect_uri);
+            } else {
+                // ...serve a 404 error
+                header("HTTP/1.1 404 Not Found");
+                $body = @file_get_contents($base . "static/404.txt");
+                $smarty->assign("pathlist", array("", "Error"));
+                $title = "File not found";
+                $smarty->assign("title", $title);
+                $smarty->assign("body", $body);
+                // Give those with permission the chance to create the page
+                if (isset($session->groups[$permission])) $smarty->assign("creatable", TRUE);
+            }
+            return;
+        }
+    }
 }
 
 // If we've got edit permission...
 if (isset($session->groups[$permission])) {
-	switch (@$_REQUEST['action']) {
-	case "Save":
-		// ...save the file
-		$savesuccess = @file_put_contents($myfile, $_REQUEST['body'], LOCK_EX);
-		if (!$savesuccess) trigger_error("Write failed", E_USER_ERROR);
-		$id = $DB->GetOne("select id from static where path=?", array($path));
-		$record = array();
-		$record['summary'] = $_REQUEST['summary'];
-		$record['editor'] = $session->username;
-		$record['path'] = $path;
-		if ($id>0) {
-			$DB->AutoExecute("static", $record, 'UPDATE', "id = '".$id."'");
-		} else {
-			$DB->AutoExecute("static", $record, 'INSERT');
-		}
-		// probably need some error-handling here...
-		break;
-	case "Delete":
-		$deleted = unlink($myfile);
-		break;
-	}
+    switch (@$_REQUEST['action']) {
+        case "Save":
+            // ...save the file
+            $savesuccess = @file_put_contents($myfile, $_REQUEST['body'], LOCK_EX);
+            if (!$savesuccess) trigger_error("Write failed", E_USER_ERROR);
+            $id = $DB->GetOne("select id from static where path=?", array($path));
+            $record = array();
+            $record['summary'] = $_REQUEST['summary'];
+            $record['editor'] = $session->username;
+            $record['path'] = $path;
+            if ($id > 0) {
+                $DB->AutoExecute("static", $record, 'UPDATE', "id = '" . $id . "'");
+            } else {
+                $DB->AutoExecute("static", $record, 'INSERT');
+            }
+            // probably need some error-handling here...
+            break;
+        case "Delete":
+            $deleted = unlink($myfile);
+            break;
+    }
 }
 
 $title = end($pathlist);
 
 if (file_exists($myfile)) {
-	$body = file_get_contents($myfile);
-	$modified = date("r", filectime($myfile));
-	$modifiedby = $DB->GetOne("select editor from static where path=?", array($path));
+    $body = file_get_contents($myfile);
+    $modified = date("r", filectime($myfile));
+    $modifiedby = $DB->GetOne("select editor from static where path=?", array($path));
 }
 
 if (file_exists($secondaryfile)) {
-	$secondary = file_get_contents($secondaryfile);
-	$smarty->assign("secondary", $secondary);
+    $secondary = file_get_contents($secondaryfile);
+    $smarty->assign("secondary", $secondary);
 }
 
 // include a widget for leaving feedback on this page if the user is logged in
@@ -92,27 +92,27 @@ $smarty->assign("title", str_replace("_", " ", $title));
 // Editing static pages - does the user have permission?
 if (isset($session->groups[$permission])) {
 // display Edit link on page
-	$smarty->assign("editable", TRUE);
+    $smarty->assign("editable", TRUE);
 
-	switch (@$_REQUEST['action']) {
+    switch (@$_REQUEST['action']) {
 // load the editing template
-	case "create":
-		if (!file_exists($myfile)) file_put_contents($myfile, "Page under construction\n", LOCK_EX);
-	case "edit":
-		$smarty->assign("editcontent", $body);
-		$record['summary'] = $DB->GetOne("select summary from static where path=?", array($path));
-		$smarty->assign("record", $record);
-		$smarty->assign("action", "edit");
-		$modified = NULL;
-		$body = $smarty->fetch('static_edit.tpl');
-		break;
-	case "delete-query":
-		$body = $smarty->fetch('static_delete.tpl').$body;
-		break;
-	case "Delete":
-		if ($deleted) $body = "File deleted";
-		break;
-	}
+        case "create":
+            if (!file_exists($myfile)) file_put_contents($myfile, "Page under construction\n", LOCK_EX);
+        case "edit":
+            $smarty->assign("editcontent", $body);
+            $record['summary'] = $DB->GetOne("select summary from static where path=?", array($path));
+            $smarty->assign("record", $record);
+            $smarty->assign("action", "edit");
+            $modified = NULL;
+            $body = $smarty->fetch('static_edit.tpl');
+            break;
+        case "delete-query":
+            $body = $smarty->fetch('static_delete.tpl') . $body;
+            break;
+        case "Delete":
+            if ($deleted) $body = "File deleted";
+            break;
+    }
 }
 
 $smarty->assign("body", $body);

components/susignup-admin.php

-<?PHP
-/***
- * SU Signup admin
- * Allows us to search the SU api for a given student number and checks if they're a SUCS member.
- * If they are - allows account renewal
- * If not - allows signup to be bootstrapped as per susignup component
- ***/
+<?php
 
+// gib errars plox
+//error_reporting(E_ALL);
+//ini_set('display_errors', 1);
+
+// include functions and shit we need
 include("../lib/member_functions.php");
 include("../lib/date.php");
-include("../suapi.inc.php");
+include("../lib/suapiv2.php");
 
 //Restrict access to staff.
-$permission="sucsstaff";
-$apibaseurl="https://$suapi_user:$suapi_pass@su-api.sucs.org/memberships/Membership.asmx";
+$permission = "sucsstaff";
 
+// if they have the right privs then lets do shit
 if (isset($session->groups[$permission])) {
-	//Setup smarty magic, step 1
-	$smarty->assign("staff", TRUE);
-
-	if(!isset($_REQUEST['mode'])) {
-		$mode = 'menu';
-	} else {
-		$mode = urldecode($_REQUEST['mode']);
-	}
-
-	if ($mode == 'search') {
-		if (empty($_REQUEST['sid']) || empty($_REQUEST['snsubmit'])) {
-			$mode = 'error';
-			$smarty->assign("error_text", "Invalid search request");	
-		}else{
-			$pres=preg_match("/^[0-9]{6}$/",$_REQUEST['sid'],$sid);
-			if ($pres!=1) {
-				$mode = 'error';
-				$smarty->assign("error_text", "Search term doesn't look like a valid student ID");
-			} else {
-				$url = "$apibaseurl/IsPersonMember?strCriteria=".$sid[0]."&GroupingId=6613";
-				$apiReq = curl_init();
-				curl_setopt($apiReq, CURLOPT_URL, $url);
-				curl_setopt($apiReq, CURLOPT_RETURNTRANSFER, TRUE);
-
-				$apiResult = curl_exec($apiReq);
-				if ($apiResult === FALSE) {
-					$mode = 'error';
-					$smarty->assign("error_text", "An error occurred communicating with the SUSU API.");
-				}else {
-					// Ostensibly we now have a valid search result from the SU - go to work
-					libxml_use_internal_errors(true);
-					$xml=simplexml_load_string($apiResult);
-					if (!$xml||isset($xml->head->title)) {
-						$mode='error';
-						$smarty->assign("error_text", "An error occurred communicating with the SUSU API");
-					} else {
-						$ismember = $xml[0];
-						if ($ismember=="true") {
-							//Yay, we have a student who has paid and needs to be signed up.
-							//Check they don't have a signup slip already
-							$query = "SELECT transactionid, signupid FROM transactions WHERE cardNumber = ?;";
-							$qres = $sucsDB->Execute($query, $sid);
-							
-							if ($qres->RecordCount()==0) {
-								// No transaction, but might have unused signup slip. If so, retrieve values.
-								$query = "SELECT id, username, password FROM signup WHERE sid=?;";
-								$qres = $sucsDB->Execute($query, array($sid[0]));
-								if ($qres && $qres->RecordCount() > 0) {
-									if ($qres->RecordCount() > 1) {
-										$mode='error';
-										$smarty->assign("error_text", "Student has multiple signup slips in the DB. Bork! Bork! Bork!");
-									} else if (!empty($qres->fields['username'])) {
-										$mode='error';
-										$smarty->assign("error_text", "Student hasn't tried to use the SU signup component (No transaction in DB), but has a previously used Signup Slip with username ".$qres->fields['username'].".<br />Is this a renewal? If not, ask an admin to generate a new signup slip for this student");
-										//TODO: Add option to generate new signup slip?
-									} else {
-										$id = $qres->fields['id'];
-										$pass = $qres->fields['password'];
-									}
-								} else {
-									$pass = make_password();
-									$query = "INSERT INTO signup (password,sid,issuedby) VALUES ( ?, ?, ?) RETURNING id";
-									$attribs[]=$pass;
-									$attribs[]=$sid[0];
-									$attribs[]='99999'; //SUCS Magic internal use UID
-
-									$id = $sucsDB->Execute($query,$attribs);
-									$id = $id->fields['id'];
-									if (!$id) {
-										$mode="error";
-										$smarty->assign("error_text", "An error occurred generating a signup ID. Report the following message to the admins:<br /><pre>".$sucsDB->ErrorMsg()."</pre>");
-									} else {
-										$smarty->assign('slipid', $id);
-										$smarty->assign('slippass', $pass);
-										$smarty->assign('sid', $sid[0]);
-									}
-								}
-							} else {
-								//Retrieve existing slip
-								$id = $qres->fields['signupid'];
-								$tid = $qres->fields['transactionid'];
-								if (empty($id)) {
-									$pass = make_password();
-									$query = "INSERT INTO signup (password,sid,issuedby) VALUES ( ?, ?, ?) RETURNING id";
-									$attribs[]=$pass;
-									$attribs[]=$sid[0];
-									$attribs[]='99999'; //SUCS Magic internal use UID
-
-									$qres = $sucsDB->Execute($query,$attribs);
-									if (!$qres) {
-										$mode="error";
-										$smarty->assign("error_text", "An error occurred generating a signup ID. Report the following message to the admins:<br /><pre>".$sucsDB->ErrorMsg()."</pre>");
-									} else {
-										$id = $qres->fields['id'];
-										$query = "UPDATE transactions SET signupid=? WHERE transactionid=?;";
-										$qres = $sucsDB->Execute($query, array($id, $tid));
-										$smarty->assign('slipid', $id);
-										$smarty->assign('slippass', $pass);
-										$smarty->assign('sid', $sid[0]);
-									}
-
-								}else {
-									$query = "SELECT username, password FROM signup WHERE id=?;";
-									$qres = $sucsDB->Execute($query, array($id));
-									if (!$qres) {
-										$mode="error";
-										$smarty->assign("error_text", "The user appears to have generated a signup ID using the SU Signup system (Slip ID: ".$id."), but the password for that slip can't be retrieved.<br />Request assistance.");
-									} else if ($qres->fields['username'] !== NULL) {
-										$mode="error";
-										$smarty->assign("error_text", "This user appears to have completed signup, with username <strong>".$qres->fields['username']."</strong><br />Check that this user exists, and offer to reset their password if necessary.");
-									}
-									$pass = $qres->fields['password'];
-									$smarty->assign('slipid', $id);
-									$smarty->assign('slippass', $pass);
-									$smarty->assign('sid', $sid[0]);
-								}
-							}
-
-							if(!$mode=='error') {
-								//Right, this should be the point where we hand off to signup
-								$smarty->assign('slipid', $id);
-								$smarty->assign('slippass', $pass);
-								$smarty->assign('sid', $sid[0]);
-							}
-
-						}else{
-							$mode='error';
-							$smarty->assign("error_text", "Student does not appear to have paid. Extract fees");
-						}
-					}
-				}
-			}
-		}
-	} else if ($mode=="renew") {
-		if (empty($_REQUEST['member'])){
-			$mode='error';
-			$smarty->assign('error_text',"Can't renew a member without knowing their username!");
-		} else if (!isset($_REQUEST['renewconf'])) {
-			//Should be trying to renew $_REQUEST['member']
-			$username=urldecode($_REQUEST['member']);
-			$q = "SELECT username, typename, sid, paid, email FROM members, member_type WHERE username=?";
-			$res = $sucsDB->Execute($q,array($username));
-			if (!$res) {
-				$mode='error';
-				$smarty->assign('error_text', "A database error occurred while trying to retrieve member details");
-			} else if ($res->fields['paid'] == paidUntil(time())) {
-					$mode='error';
-					$smarty->assign('error_text', 'User appears to have been renewed already?');
-			} else {
-				$smarty->assign('renew_user', $username);
-				$smarty->assign('renew_paid', $res->fields['paid']);
-				$smarty->assign('renew_type', $res->fields['typename']);
-				$url = "$apibaseurl/IsPersonMember?strCriteria=".$res->fields['sid']."&GroupingId=6613";
-                                $apiReq = curl_init();
-                                curl_setopt($apiReq, CURLOPT_URL, $url);
-                                curl_setopt($apiReq, CURLOPT_RETURNTRANSFER, TRUE);
-
-                                $apiResult = curl_exec($apiReq);
-				libxml_use_internal_errors(true);
-				$xml=simplexml_load_string($apiResult);
-				if (!$xml || isset($xml->head->title)) {
-					$mode='error';
-					$smarty->assign("error_text", "An error occurred communicating with the SUSU API.");
-				} else {
-					$ismember = $xml[0];
-
-					$user = posix_getpwnam($session->username);
-
-					if ($ismember!="true") {
-						$mode='error';
-						$smarty->assign('error_text', 'Member does not appear to have paid via the SU system. Use the old renewals system if they have paid using some other method');;
-					} else {
-						if (renew_member($username, $user['uid'], $user['name'])) {
-							message_flash("Successfully renewed");
-							$mode='menu';
-						} else {
-							$mode='error';
-							$smarty->assign('error_text', 'An error occurred renewing account '.$username);
-						}
-
-					}
-
-				}
-			}
-		}
-			
-	} else if ($mode == 'renewals') {
-		//Get list of members according to the SU
-		$url = "$apibaseurl/GetMemberListData?GroupingId=6613";
-		$apiReq = curl_init();
-		curl_setopt($apiReq, CURLOPT_URL, $url);
-		curl_setopt($apiReq, CURLOPT_RETURNTRANSFER, TRUE);
-
-		$apiResult = curl_exec($apiReq);
-		$sumembers = su_response_decode($apiResult);
-		if (!$sumembers) {
-			$mode ='error';
-			$smarty->assign("error_text", "An error occurred communicating with the SUSU API.");
-		} else {
-			$matches = array();
-			$others=0;
-			$paidup=0;
-			foreach ($sumembers as $sumem) {
-				$sucsmem = get_sucs_record($sumem['uni_card_number']);
-				if ($sucsmem && $sucsmem['paid'] != paidUntil(time()) && $sucsmem['type']==1) {
-					$matches[]=array($sumem['firstName']." ".$sumem['lastName'], $sucsmem['realname'], $sumem['uni_card_number'], $sucsmem['username'], $sucsmem['paid']);
-				} else if ($sucsmem && $sucsmem['paid'] == paidUntil(time())) {
-					$others++;
-					$paidup++;
-				} else {
-					$others++;
-				}
-			}
-			$smarty->assign("matches", $matches);
-			$smarty->assign("others", $others);
-			$smarty->assign("paidup", $paidup);
-			$smarty->assign("pending", $others - $paidup);
-		}
-	} else if ($mode == 'renewals2') {
-		$failures = array();
-		$successes = array();
-
-		if (empty($_REQUEST['renew'])) {
-			$mode='error';
-			$smarty->assign("error_text", "Can't renew an empty list!");
-		} else {
-			foreach($_REQUEST['renew'] as $user) {
-				$admin_user=posix_getpwnam($session->username);
-				if (renew_member($user, $admin_user['uid'], $admin_user['name'])) {
-					$successes[]=$user;
-				} else {
-					$failures[]=$user;
-				}
-			}
-			$smarty->assign("attempt", count($_REQUEST['renew']));
-			$smarty->assign("failures", count($failures));
-			$smarty->assign("failusers", $failures);
-			$smarty->assign("successes", count($successes));
-		}
-	} else if ($mode == 'list') {
-		//Get list of members according to the SU
-		$url="$apibaseurl/GetMemberListData?GroupingId=6613";
-		$apiReq = curl_init();
-		curl_setopt($apiReq, CURLOPT_URL, $url);
-		curl_setopt($apiReq, CURLOPT_RETURNTRANSFER, TRUE);
-
-		$apiResult = curl_exec($apiReq);
-		$sumembers = su_response_decode($apiResult);
-		if (!$sumembers) {
-			$mode='error';
-			$smarty->assign("error_text", "An error occurred communicating with the SUSU API.");
-		} else {
-			$matches = array();
-			foreach ($sumembers as $sumem) {
-				$sucsmem = get_sucs_record($sumem['uni_card_number']);
-				if ($sucsmem) {
-					$matches[]=array($sumem['firstName']." ".$sumem['lastName'], $sucsmem['realname'], $sumem['uni_card_number'], $sucsmem['username'], $sucsmem['paid']);
-				} else {
-					$matches[]=array($sumem['firstName']." ".$sumem['lastName'], "N/A", $sumem['uni_card_number'], "N/A", "Not signed up");
-				}
-			}
-			function sortbypaid($a, $b) {
-				//Lets us array sort by final column ('Paid')
-				return ($a[4] < $b[4]) ? -1  : 1;
-			}
-			usort($matches, 'sortbypaid');
-			$smarty->assign("matches", $matches);
-		}
-	}
-$smarty->assign('renewables', get_renewable_members());
+    //Setup smarty magic, step 1
+    $smarty->assign("staff", TRUE);
+
+    // if no mode has been requested then show options
+    if (!isset($_REQUEST['mode'])) {
+        $mode = 'menu';
+    } else {
+        $mode = urldecode($_REQUEST['mode']);
+    }
+
+    // We have a mode, lets try and work out wtf they want to do
+
+    // they have typed in a sid and want to bootstrap the signup processs
+    if ($mode == 'search') {
+        if (empty($_REQUEST['sid']) || empty($_REQUEST['snsubmit'])) {
+            $mode = 'error';
+            $smarty->assign("error_text", "Invalid search request");
+        } else {
+            $pres = preg_match("/^[0-9]{6}$/", $_REQUEST['sid'], $sid);
+            if ($pres != 1) {
+                $mode = 'error';
+                $smarty->assign("error_text", "Search term doesn't look like a valid student ID");
+            } else {
+                // they have given us a valid sid lets check to see if they have paid
+                $sid = $_REQUEST['sid'];
+
+                // make sure the user/admin/exec isn't an idiot
+                // check if they are already signed up and tell them so
+                $tmpresult = $sucsDB->Execute("SELECT * FROM members WHERE sid=?", array($_REQUEST['sid']));
+                if ($tmpresult->fields["sid"] == $sid && $tmpresult->fields["paid"] == paidUntil(time())) {
+                    // let them know they are already signed up and renewed
+                    $mode = 'error';
+                    message_flash("You are a numpty and have already signed up and paid for this year.");
+                    // else if check to see if they have signedup and paid for the new year but haven't renewed
+                } else if ($tmpresult->fields["sid"] == $sid && $tmpresult->fields["paid"] != paidUntil(time())) {
+                    // renew them!
+                    $mode = 'error';
+                    renew_membership($tmpresult->fields["username"]);
+                    // let them know that their account has been renewed
+                    message_flash("Your SUCS account has been renewed.");
+                } else {
+                    if (check_su_sid($_REQUEST['sid'])) {
+                        // lets make them a signup slip
+                        $pass = make_password();
+                        $query = "INSERT INTO signup (password,sid,issuedby) VALUES ( ?, ?, ?) RETURNING id";
+                        $attribs[] = $pass;
+                        $attribs[] = $_REQUEST['sid'];
+                        $attribs[] = '99999'; //SUCS Magic internal use UID
+
+                        $id = $sucsDB->Execute($query, $attribs);
+                        $id = $id->fields['id'];
+                        if (!$id) {
+                            $mode = "error";
+                            $smarty->assign("error_text", "An error occurred generating a signup ID. Report the following message to the admins:<br /><pre>" . $sucsDB->ErrorMsg() . "</pre>");
+                        } else {
+                            $smarty->assign('slipid', $id);
+                            $smarty->assign('slippass', $pass);
+                            $smarty->assign('sid', $_REQUEST['sid']);
+                        }
+                    } else {
+                        $mode = 'error';
+                        $smarty->assign("error_text", "Student does not appear to have paid. Extract fees");
+                    }
+                }
+            }
+        }
+        // mass renewals page
+    } else if ($mode == 'renewals') {
+
+        $matches = array();
+        $others = 0;
+        $paidup = 0;
+        foreach ($just_members as $sumem) {
+            $sucsmem = get_sucs_record($sumem['card_number']);
+            if ($sucsmem && $sucsmem['paid'] != paidUntil(time()) && $sucsmem['type'] == 1) {
+                $matches[] = array($sumem['purchaser'], $sucsmem['realname'], $sumem['card_number'], $sucsmem['username'], $sucsmem['paid']);
+            } else if ($sucsmem && $sucsmem['paid'] == paidUntil(time())) {
+                $others++;
+                $paidup++;
+            } else {
+                $others++;
+            }
+        }
+        $smarty->assign("matches", $matches);
+        $smarty->assign("others", $others);
+        $smarty->assign("paidup", $paidup);
+        $smarty->assign("pending", $others - $paidup);
+    } else if ($mode == 'renewals2') {
+        $failures = array();
+        $successes = array();
+
+        if (empty($_REQUEST['renew'])) {
+            $mode = 'error';
+            $smarty->assign("error_text", "Can't renew an empty list!");
+        } else {
+            foreach ($_REQUEST['renew'] as $user) {
+                if (admin_renew_member($user, $session->username)) {
+                    $successes[] = $user;
+                } else {
+                    $failures[] = $user;
+                }
+            }
+            $smarty->assign("attempt", count($_REQUEST['renew']));
+            $smarty->assign("failures", count($failures));
+            $smarty->assign("failusers", $failures);
+            $smarty->assign("successes", count($successes));
+        }
+    } else if ($mode == 'list') {
+        $matches = array();
+        foreach ($just_members as $sumem) {
+            $sucsmem = get_sucs_record($sumem['card_number']);
+            if ($sucsmem) {
+                $matches[] = array($sumem['purchaser'], $sucsmem['realname'], $sumem['card_number'], $sucsmem['username'], $sucsmem['paid']);
+            } else {
+                $matches[] = array($sumem['purchaser'], "N/A", $sumem['card_number'], "N/A", "Not signed up");
+            }
+        }
+        function sortbypaid($a, $b)
+        {
+            //Lets us array sort by final column ('Paid')
+            return ($a[4] < $b[4]) ? -1 : 1;
+        }
+
+        usort($matches, 'sortbypaid');
+        $smarty->assign("matches", $matches);
+    }
+    $smarty->assign('renewables', get_renewable_members());
 }
 
 
@@ -294,73 +150,46 @@ $body = $smarty->fetch("susignup-admin.tpl");
 $smarty->assign('body', $body);
 $smarty->assign("extra_styles", array("$baseurl/css/susignup-admin.css"));
 
-function su_response_decode($text) {
-	global $smarty;
-	libxml_use_internal_errors(true);
-	$xml=simplexml_load_string($text);
-	if (!$xml || isset($xml->head->title)) {
-		return false;
-	} else {
-		return json_decode($xml[0],TRUE);
-	}
-} 
+function get_sucs_record($sid)
+{
+    global $sucsDB;
 
-function get_sucs_record($sid) {
-	global $sucsDB;
-
-	$query = "SELECT * FROM members WHERE sid=?;";
-	$res  = $sucsDB->Execute($query, array($sid));
-	if (!$res || $res->RecordCount()<>1) {
-		return FALSE;
-	}
-        return $res->FetchRow();	
+    $query = "SELECT * FROM members WHERE sid=?;";
+    $res = $sucsDB->Execute($query, array($sid));
+    if (!$res || $res->RecordCount() <> 1) {
+        return FALSE;
+    }
+    return $res->FetchRow();
 }
 
-function get_renewable_members() {
-	global $sucsDB;
-	$q = "SELECT username, username||' ('||realname||')' AS display FROM members, member_type WHERE paid != ? AND type=1 AND type=member_type.id ORDER BY paid;";
-	$r = $sucsDB->Execute($q, array(paidUntil(time())));
-	if(!$r) {
-		return FALSE;
-	}
-	$retvals = array();
-	while ($rec=$r->FetchRow()) {
-		$retvals[$rec['username']]=$rec['display'];
-	}
-	return $retvals;
+function get_renewable_members()
+{
+    global $sucsDB;
+    $q = "SELECT username, username||' ('||realname||')' AS display FROM members, member_type WHERE paid != ? AND type=1 AND type=member_type.id ORDER BY paid;";
+    $r = $sucsDB->Execute($q, array(paidUntil(time())));
+    if (!$r) {
+        return FALSE;
+    }
+    $retvals = array();
+    while ($rec = $r->FetchRow()) {
+        $retvals[$rec['username']] = $rec['display'];
+    }
+    return $retvals;
 }
 
-function renew_member($renew_name, $admin_uid, $admin_name) {
-	global $sucsDB;
-
-	$q="UPDATE members SET paid=?, lastupdate=DEFAULT, lastedit=? WHERE username=?;";
-	$r=$sucsDB->Execute($q, array(paidUntil(time()), $admin_uid, $renew_name));
-	if (!$r) {
-		print $sucsDB->ErrorMsg();
-		return FALSE;
-	} else {	
-		$q="SELECT email, typename FROM members, member_type WHERE username=?  AND type=member_type.id;";
-		$r=$sucsDB->Execute($q, array($renew_name));
-
-		$message  = "Account Renewal notification\n\n";
-		$message .= "Account   : ".$renew_name."\n";
-		$message .= "User Type : ".$r->fields['typename']."\n";
-		$message .= "Renewed by: ".$admin_name."\n\n";
-		$message .= "**** Payment was made via the SU payments system ****\n";
-		$message .= "Regards\n  The SU Renewals script";
-		mail("treasurer@sucs.org","Account Renewal",$message);
-		
-		$message = "Your Swansea University Computer Society (SUCS) membership has been renewed\n\n";
-		$message .= "Username: ".$renew_name."\n";
-		$message .= "If you do not know or have forgotten your password, please email admin@sucs.org to arrange for it to be changed.\n\n";
-		$message .= "Regards\n  The SUCS admin";
-		$header = "From: admin@sucs.org\r\n";
-		$header .= "Reply-To: admin@sucs.org";
-		// Personal account
-		mail($r->fields['email'],"SUCS account renewal",$message,$header);
-		// sucs account
-		mail($renew_name."@sucs.org","SUCS account renewal",$message,$header);
-		return TRUE;
-	}
-
+function admin_renew_member($renew_name, $admin_name)
+{
+    global $sucsDB;
+    renew_membership($renew_name);
+    $q = "SELECT email, typename FROM members, member_type WHERE username=?  AND type=member_type.id;";
+    $r = $sucsDB->Execute($q, array($renew_name));
+    $message = "Account Renewal notification\n\n";
+    $message .= "Account   : " . $renew_name . "\n";
+    $message .= "User Type : " . $r->fields['typename'] . "\n";
+    $message .= "Renewed by: " . $admin_name . "\n\n";
+    $message .= "**** Payment was made via the SU payments system ****\n";
+    $message .= "Regards\n  The SU Renewals script";
+    mail("exec@sucs.org", "Account Renewal", $message);
+    return TRUE;
 }
+

components/susignup.php

 <?php
 
-//unique society identifier
-$GroupingID = "6613";
+// gib errars plox
+//error_reporting(E_ALL);
+//ini_set('display_errors', 1);
 
+// this is the php for sucs.org/susignup
+
+// Include shit we need. like the renew_membership fucntion
 include "../lib/member_functions.php";
 include "../lib/date.php";
-include "../suapi.inc.php";
-
-$error_email = "admin@sucs.org";
-$mode = 'login';
-//login
-if(!empty($_REQUEST['sid'])&&!empty($_REQUEST['transactionID'])){
-//set signup details
-
-	$sid = $_REQUEST['sid'];
-        $transactionID = $_REQUEST['transactionID'];
-
-	//set POST variables
-	$url = "https://$suapi_user:$suapi_pass@su-api.sucs.org/memberships/Membership.asmx/GetMemberByTransactionID";
-	$fields = array(
-	       'transactionID'=>urlencode($transactionID),
-	       'GroupingID'=>urlencode($GroupingID),
-	       );
-	//url-ify the data for the POST
-	$field_string = "";
-	foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
-	rtrim($fields_string,'&');
-	//open connection
-	$ch = curl_init();
-
-	//set the url, number of POST vars, POST data
-	curl_setopt($ch,CURLOPT_URL,$url);
-	curl_setopt($ch,CURLOPT_POST,count($fields));
-	curl_setopt($ch,CURLOPT_POSTFIELDS,$fields_string);
-	curl_setopt($ch,CURLOPT_RETURNTRANSFER,TRUE);
-	//execute post
-	$result = curl_exec($ch);
-
-	//close connection
-	curl_close($ch);
-	if(!$result){
-		$mode = "error";
-		$smarty->assign("error_text", "Invalid query returned");
-	} else {
-		libxml_use_internal_errors(true);
-		$xml=simplexml_load_string($result);
-		if (!$xml||isset($xml->head->title)) {
-			$mode='error';
-			$smarty->assign("error_text", "An error occurred communicating with the SUSU API");		
-		} else{
-			$re1='.*?';
-			$re2='(\\{.*?\\})';
-			if ($c=preg_match_all ("/".$re1.$re2."/is", $result, $matches))
-			{
-			  	$json_string=$matches[1][0];
-			} else{
-			  $mode = "error";
-			}
-			$array = json_decode($json_string,TRUE);
-			if($array['cardNumber'] == $sid && $sid != ""){
-				$mode = 'form';
-
-				// SET THIS FOR DEBUG MODE
-				// $sucsDB->debug = true;
-
-				$fullName = $array['firstName']." ".$array['lastName'];
-				$query = "INSERT INTO transactions (transactionID,fullName,emailAddress,cardNumber,personID) values(?, ?, ?, ?, ?)";
-				$attribs[] = $transactionID;
-				$attribs[] = $fullName;
-				$attribs[] = $array['emailAddress'];
-				$attribs[] = $array['cardNumber'];
-				$attribs[] = $array['personID'];
 
-				$valid = true;
-				if(!$sucsDB->Execute($query,$attribs)) {
-					// We did this because Adodb ErrorNo command is broken
-					$query = "SELECT * FROM transactions WHERE transactionID = ?";
-					unset($attribs);
-					$attribs[]=$transactionID;
-					if($sucsDB->Execute($query,$attribs)) {
+// include the suapiv2 stuff like check_su_sid_and_trans()
+include "../lib/suapiv2.php";
 
-						$query = "SELECT * FROM transactions WHERE transactionID = ?";
-						$attribs= array();
-						$attribs[]=$transactionID;
-						$data = $sucsDB->GetAll($query,$attribs);
-						if(is_array($data)&&sizeof($data)==1&&$data[0]['signupid']==NULL){
-							// As it stands this shouldn't happen but if it does, no reason not to let them carry on
-							$valid = true;
-						} elseif(is_array($data)&&sizeof($data)==1&&$data[0]['signupid']!=NULL) {
-							$query = "SELECT * FROM signup WHERE sid = ?";
-							unset($attribs);
-							$attribs[]=$sid;
-							$data = $sucsDB->Execute($query, $attribs);
-							if(!$data) {
-								mail(
-									$error_email,
-									"SUSignup Error",
-									"An error occured in the susignup system at stage 0\n Love the signup system.\n\nP.S. The Error is:\n ".$sucsDB->ErrorMsg(),
-									"From: \"SUCS Admin\" <admin@sucs.org>"
-							);
-								$valid=false;
-							} else if($data->fields['username']!=NULL){
-								$smarty->assign("username", $data->fields['username']);
-								$mode='numpty2';		
-								// This happens if they already ahve a SUCS account and are trying to create a new signupid
-								$valid = false;
-							} else {
-								$smarty->assign("id", $data->fields['id']);
-								$smarty->assign("pass", $data->fields['password']);
-								$mode='numpty';
-								// If this happens they tried to get a new signupid/pass after already getting one, and should get weekly reminders about it  
-								$valid = false;
-							}
-						} else {
-							$mode="error";
-							mail(
-								$error_email,
-								"SUSignup Error",
-								"An error occured in the susignup system at stage 1\n Love the signup system.\n\nP.S. The Error is:\n ".$sucsDB->ErrorMsg(),
-								"From: \"SUCS Admin\" <admin@sucs.org>"
-							);
-
-							$valid = false;
-						}
-
-					} else {
-						$mode="error";
-						mail(
-							$error_email,
-							"SUSignup Error",
-							"An error occured in the susignup system at stage 2\n Love the signup system.\n\nP.S. The Error is:\n ".$sucsDB->ErrorMsg(),
-							"From: \"SUCS Admin\" <admin@sucs.org>"
-						);
-
-						$valid = false;
-					}
-				}
-
-				if($valid)
-				{
-					unset($attribs);
-					unset($query);
-					$query = "SELECT * FROM members WHERE sid = ?";
-					$attribs[] = $sid;
-					unset($data);
-					$data = $sucsDB->Execute($query, $attribs);
-					if (!$data) {
-						$mode = "error";
-						$smarty->assign("error_text", "Error in internal database check");
-					} elseif ($data->RecordCount()==1) {
-						$mode = "renew";
-						$q="UPDATE members SET paid=?, lastupdate=DEFAULT, lastedit=? WHERE username=?;";
-        					$r=$sucsDB->Execute($q, array(paidUntil(time()), '99999', $data->fields['username']));
-						if (!$r) {
-							mail(
-								$error_email,
-								"SUSignup Error",
-								"An error occured in the susignup system at stage 2.5\n Love the signup system.\n\nP.S. The Error is:\n ".$sucsDB->ErrorMsg(),
-								"From: \"SUCS Admin\" <admin@sucs.org>"
-							);
-
-					        } else {
-							$q="SELECT email, typename FROM members, member_type WHERE username=?  AND type=member_type.id;";
-							$r=$sucsDB->Execute($q, array($data->fields['username']));
-
-							$message  = "Account Renewal notification\n\n";
-							$message .= "Account   : ".$data->fields['username']."\n";
-							$message .= "User Type : ".$r->fields['typename']."\n";
-							$message .= "Renewed by: ".$data->fields['username'].".\n\n";
-							$message .= "**** Payment was made via the SU payments system ****\n";
-							$message .= "Regards\n  The SU Renewals script";
-							mail("treasurer@sucs.org","Account Renewal",$message);
+// since the rewrite by ~imranh this no longer sends out emails
+// feel free to add it
+// Where do errors go?
+$error_email = "admin@sucs.org";
 
-							$message = "Your Swansea University Computer Society (SUCS) membership has been renewed\n\n";
-							$message .= "Username: ".$renew_name."\n";
-							$message .= "If you do not know or have forgotten your password, please email admin@sucs.org to arrange for it to be changed.\n\n";
-							$message .= "Regards\n  The SUCS admin";
-							$header = "From: admin@sucs.org\r\n";
-							$header .= "Reply-To: admin@sucs.org";
-							// Personal account
-							mail($r->fields['email'],"SUCS account renewal",$message,$header);
-							// sucs account
-							mail($data->fields['username']."@sucs.org","SUCS account renewal",$message,$header);
-							unset($query);
-							unset($attribs);
-							$query = "UPDATE transactions set signupid=? WHERE transactionID=?";
-							$attribs[]="000";
-							$attribs[]=$transactionID;
-							$data = $sucsDB->Execute($query,$attribs);
-							if (!$data) { 
-								$mode="error";
-								mail(
-									$error_email,
-									"SUSignup Error",
-									"An error occured in the susignup system at stage 2.6\n Love the signup system.\n\nP.S. The Error is:\n ".$sucsDB->ErrorMsg(),
-									"From: \"SUCS Admin\" <admin@sucs.org>"
-								);
-							}
-				        	}
-					} else {
-						$pass = make_password();
-						unset($query);
-						$query = "insert into signup (password,sid,issuedby) values( ?, ?, ?) returning id";
-						unset($attribs);
-						$attribs[]=$pass;
-						$attribs[]=$array['cardNumber'];
-						$attribs[]='99999';
+// By default display a page asking for sid and transid
+// this is called "login"
+$mode = 'login';
 
-						$iddata = $sucsDB->Execute($query,$attribs);
-						$id = $iddata->fields['id'];
-						if (!$iddata) {
-							$mode="error";
-							mail(
-								$error_email,
-								"SUSignup Error",
-								"An error occured in the susignup system at stage 3\n Love the signup system.\n\nP.S. The Error is:\n ".$sucsDB->ErrorMsg(),
-								"From: \"SUCS Admin\" <admin@sucs.org>"
-							);
-						} else {
-							$query = "update transactions set signupid=? WHERE transactionID=?";
-							unset($attribs);
-							$attribs[]=$id;
-							$attribs[]=$transactionID;
-							if(!$sucsDB->Execute($query,$attribs)) {
-								$mode="error";
-								mail(
-									$error_email,
-									"SUSignup Error",
-									"An error occured in the susignup system at stage 4\n Love the signup system.\n\nP.S. The Error is:\n ".$sucsDB->ErrorMsg(),
-									"From: \"SUCS Admin\" <admin@sucs.org>"
-								);
-								print($sucsDB->ErrorMsg());
-							} else {
-								$smarty->assign("id", $id);
-								$smarty->assign("pass", $pass);
-								mail(
-									$array['emailAddress'].','.$sid.'@swansea.ac.uk',
-									"SUCS Signup Information",
-									"Thankyou for joining Swansea University Computer Society, your signup details are below;\nSignupID: $id\nSignup Password: $pass\nIf you have successfully completed signup immediately then you can disregard this message.\n\nSUCS Admin Team.",
-									"From: \"SUCS Admin\" <admin@sucs.org>"
-								);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+// if somone has post'd data to the page then do shit
+if (!empty($_REQUEST['sid']) && !empty($_REQUEST['transactionID'])) {
+
+    // stick the post'd data in a variable we can call easily
+    $sid = $_REQUEST['sid'];
+    $transactionID = $_REQUEST['transactionID'];
+
+    // check if the data posted is valid
+    if (check_su_sid_and_trans($sid, $transactionID)) {
+
+        // probe the db for some info thatwe want to use in the if statements below
+        $tmpresult = $sucsDB->Execute("SELECT * FROM members WHERE sid=?", array($sid));
+        $signuptmpresult = $sucsDB->Execute("SELECT * FROM signup WHERE sid=?", array($sid));
+
+        // check to see if they are already a valid and paid member
+        if ($tmpresult->fields["sid"] == $sid && $tmpresult->fields["paid"] == paidUntil(time())) {
+            // let them know they are already signed up and renewed
+            message_flash("You are a numpty and have already signed up and paid for this year.");
+        // else if check to see if they have signedup and paid for the new year but haven't renewed
+        } else if ($tmpresult->fields["sid"] == $sid && $tmpresult->fields["paid"] != paidUntil(time())) {
+            // renew them!
+            renew_membership($tmpresult->fields["username"]);
+            // let them know that their account has been renewed
+            message_flash("Your SUCS account has been renewed.");
+        // else if they aren't in the SUCS DB but have a signup slip, take them back to that part of signup
+        } else if ($tmpresult->fields == false && $signuptmpresult->fields["sid"] == $sid && $signuptmpresult->fields["activated"] == NULL) {
+            $mode = "form";
+            $smarty->assign("id", $signuptmpresult->fields["id"]);
+            $smarty->assign("pass", $signuptmpresult->fields["password"]);
+            $smarty->assign("sid", $signuptmpresult->fields["sid"]);
+        // else if they aren't in the SUCS DB, then bootstrap signup process
+        } else if ($tmpresult->fields == false) {
+            $mode = "form";
+            $pass = make_password();
+            $iddata = $sucsDB->Execute("insert into signup (password,sid,issuedby) values( ?, ?, ?) returning id", array($pass, $sid, "99999"));
+            $id = $iddata->fields['id'];
+            $smarty->assign("id", $id);
+            $smarty->assign("pass", $pass);
+            $smarty->assign("sid", $sid);
+        } else {
+            // they should never get here
+            die("You'll see this if there has been a database error. Someone probably knows and is trying to fix it. Sorry.");
+        }
+    } else {
+        trigger_error("That Student Number and Transaction ID combo are invalid.", E_USER_ERROR);
+    }
 }
 
+
 $smarty->assign("mode", $mode);
 $output = $smarty->fetch("susignup.tpl");
 

components/uri.php

-<?php 
-$uritable="shorturi";
+<?php
+$uritable = "shorturi";
 
-$chrs = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S' ,'T', 'U', 'V', 'W', 'X', 'Y', 'Z');
+$chrs = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z');
 $output = "";
 
-function int_to_alph($int, $chrs) {
-	$int = (int) $int;
-	$base = (int) sizeof($chrs);
-	$alph = "";
-	do {
-		$alph = $chrs[($int % $base)] . $alph;
-	} while($int = intval($int / $base));
-	return $alph;
+function int_to_alph($int, $chrs)
+{
+    $int = (int)$int;
+    $base = (int)sizeof($chrs);
+    $alph = "";
+    do {
+        $alph = $chrs[($int % $base)] . $alph;
+    } while ($int = intval($int / $base));
+    return $alph;
 }
 
-function alph_to_int($alph, $chrs) {
-	$base = sizeof($chrs);
-	for($i = 0, $int = 0; $i < strlen($alph); $i++) {
-		$int += intval(array_search(substr($alph, strlen($alph) - $i - 1, 1), $chrs)) * pow($base, $i);
-	}
-	return (int) $int;
+function alph_to_int($alph, $chrs)
+{
+    $base = sizeof($chrs);
+    for ($i = 0, $int = 0; $i < strlen($alph); $i++) {
+        $int += intval(array_search(substr($alph, strlen($alph) - $i - 1, 1), $chrs)) * pow($base, $i);
+    }
+    return (int)$int;
 }
 
 if (isset($pathlist[3])) {
-  $url=$DB->GetOne("select url from $uritable where id='".alph_to_int($pathlist[3], $chrs)."'");
+    $url = $DB->GetOne("select url from $uritable where id='" . alph_to_int($pathlist[3], $chrs) . "'");
 
-	if ($url) {
-		header('Location: '.$url);
-	} else {
-		echo "URL not found";
-	}
+    if ($url) {
+        header('Location: ' . $url);
+    } else {
+        echo "URL not found";
+    }
 
 } else {
-	if ($session->loggedin) {
-		if (@$_REQUEST['action']) {
-			$shorturi=$DB->GetOne("select id from $uritable where url=?", array(@$_REQUEST['uri']));
-			if (!$shorturi) {
-				$headers=get_headers($_REQUEST['uri'], 1);
-				if ($headers) {
-					if (preg_match("/ 4/", $headers[0])) {
-						trigger_error("HTTP 4xx error detected - not creating ShortURI", E_USER_WARNING);
-					} else {				
-						$record['url'] = @$_REQUEST['uri'];
-						$record['creator'] = $session->username;
-						$record['created'] = "now";
-						$DB->AutoExecute($uritable, $record, 'INSERT');
-						$shorturi=$DB->GetOne("select id from $uritable where url=?", array(@$_REQUEST['uri']));
-					}
-				} else {
-					trigger_error("URI supplied is not valid", E_USER_WARNING);
-				}
-			}
+    if ($session->loggedin) {
+        if (@$_REQUEST['action']) {
+            $shorturi = $DB->GetOne("select id from $uritable where url=?", array(@$_REQUEST['uri']));
+            if (!$shorturi) {
+                $headers = get_headers($_REQUEST['uri'], 1);
+                if ($headers) {
+                    if (preg_match("/ 4/", $headers[0])) {
+                        trigger_error("HTTP 4xx error detected - not creating ShortURI", E_USER_WARNING);
+                    } else {
+                        $record['url'] = @$_REQUEST['uri'];
+                        $record['creator'] = $session->username;
+                        $record['created'] = "now";
+                        $DB->AutoExecute($uritable, $record, 'INSERT');
+                        $shorturi = $DB->GetOne("select id from $uritable where url=?", array(@$_REQUEST['uri']));
+                    }
+                } else {
+                    trigger_error("URI supplied is not valid", E_USER_WARNING);
+                }
+            }
 
-			if ($shorturi>0) $smarty->assign("uri", "http://".$_SERVER['SERVER_NAME']."/uri/".int_to_alph($shorturi, $chrs));
-		}
+            if ($shorturi > 0) $smarty->assign("uri", "http://" . $_SERVER['SERVER_NAME'] . "/uri/" . int_to_alph($shorturi, $chrs));
+        }
 
-	} else {
-		trigger_error("You are not logged in", E_USER_WARNING);
-	}
+    } else {
+        trigger_error("You are not logged in", E_USER_WARNING);
+    }
 }
 
 $output = $smarty->fetch('uri.tpl');

db_changes/sucssite-0.3.sql

-DELETE FROM session;
-ALTER TABLE session DROP COLUMN time;
-ALTER TABLE session ADD COLUMN logintime timestamp(0) without time zone;
-ALTER TABLE session ADD COLUMN lastseen timestamp(0) without time zone;
-DELETE FROM menu WHERE title='Bananas';

htdocs/3step.html

+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<title>SUCS 3 Step Signup</title>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+		<link rel="stylesheet" href="plaster-files/css/3step.css">
+		<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+		<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+	</head>
+
+<body>
+
+	<div class="jumbotron jumbotron-fluid text-center">
+		<!--h1>Swansea University Computer Society</h1-->
+		<img src="https://sucs.org/~imranh/img/sucslogo_trans_white.png"/>
+		<!--p>1. Pay, 2. Create, 3. Enjoy</p--> 
+	</div>
+
+	<div class="container text-center">
+		<div class="row d-flex justify-content-center">
+			<div class="col-8">
+				<div class="card mb-4">
+					<div class="card-body">
+						<h4 class="card-title">💳</h4>
+						<p class="card-text">1. Pay for membership</p>
+						<a href="https://sucs.org/join" target="_blank" rel="noopener noreferrer" class="btn btn-primary">Pay Online</a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="row d-flex justify-content-center">
+			<div class="col-8">
+				<div class="card mb-4">
+					<div class="card-body">
+						<h5 class="card-title">👤</h5>
+						<p class="card-text">2. Create your username</p>
+						<a href="https://sucs.org/susignup" target="_blank" rel="noopener noreferrer" class="btn btn-primary">Create Username</a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="row d-flex justify-content-center">
+			<div class="col-8">
+				<div class="card mb-4">
+					<div class="card-body">
+						<h5 class="card-title">💬</h5>
+						<p class="card-text">3. Join the conversation</p>
+						<a href="https://chat.sucs.org" target="_blank" rel="noopener noreferrer" class="btn btn-primary">Join Discord</a>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	</body>
+
+</html>
\ No newline at end of file

htdocs/crossdomain.xml

+<?xml version="1.0"?>
+<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
+<cross-domain-policy>
+  <allow-access-from domain="sucs.org" />
+  <allow-access-from domain="www.sucs.org" />
+  <allow-access-from domain="www.swansea-union.co.uk" />
+  <allow-access-from domain="swansea-union.co.uk" />
+  <allow-access-from domain="stream.sucs.org" />
+  <allow-access-from domain="www.fomore.com" />
+</cross-domain-policy>
+

htdocs/css/blog.css

 .archivelink {
-	text-align: right;
+    text-align: right;
 }
 
 ul.blognav {
-	text-align: left;
-	float: left;
-	width: 100%;
-	list-style-type: none;
-	margin: 0;
-	padding: 0;
+    text-align: left;
+    float: left;
+    width: 100%;
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
 }
 
 li.prev {
-	float: left;
+    float: left;
 }
 
 li.next {
-	float: right;
+    float: right;
 }
 
 .errorinfo {
-	color: red;
+    color: red;
 }
 
 #spinner {
-	visibility: hidden;
-	margin-left: 4px;
-	margin-right: 4px;
+    visibility: hidden;
+    margin-left: 4px;
+    margin-right: 4px;
 }
 

htdocs/css/box.css

@@ -2,95 +2,103 @@
 ================================================*/
 /* Default styling. Used when JavaScript is unsupported */
 .cbb {
-	padding: 5px 10px;
-	margin:1em 0;
-	margin-left: 0.5em;
-	margin-right: 0.5em;
-	background:#e76808;
-	font-size: 85%;
-	}
+    padding: 5px 10px;
+    margin: 1em 0;
+    margin-left: 0.5em;
+    margin-right: 0.5em;
+    background: #e76808;
+    font-size: 85%;
+}
+
 .cbb h1 {
-	margin:0 -10px;
-	padding:0.3em 10px;
-	background:#efece6;
-	font:bold 1.2em Arial, Helvetica, sans-serif;
-	}
+    margin: 0 -10px;
+    padding: 0.3em 10px;
+    background: #efece6;
+    font: bold 1.2em Arial, Helvetica, sans-serif;
+}
 
 div.cbb img.emblem, div.cb img.emblem {
-	float: right;
-	position: relative;
-	top: -1.5em;
+    float: right;
+    position: relative;
+    top: -1.5em;
 }
 
 /* Insert the custom corners and borders for browsers with sufficient JavaScript support */
 
 /* Two of the boxes are floated just for this demo. Adjust to your needs. */
 .cb {
-	margin:0.5em 0;
-	font-size: 85%;
-	}
+    margin: 0.5em 0;
+    font-size: 85%;
+}
+
 .two {
-	width:45%;
-	float:left;
-	}
+    width: 45%;
+    float: left;
+}
+
 .three {
-	width:45%;
-	float:right;
-	}
+    width: 45%;
+    float: right;
+}
+
 /* Rules for the top corners and border */
 .bt {
-	background:url('/images/box.png') no-repeat 100% 0;
-	margin:0 0 0 19px;
-	height:18px;
-	}
+    background: url('/images/box.png') no-repeat 100% 0;
+    margin: 0 0 0 19px;
+    height: 18px;
+}
+
 .bt div {
-	height:18px;
-	width:19px;
-	position:relative;
-	left:-19px;
-	background:url('/images/box.png') no-repeat 0 0;
-	}
+    height: 18px;
+    width: 19px;
+    position: relative;
+    left: -19px;
+    background: url('/images/box.png') no-repeat 0 0;
+}
 
 /* Rules for the bottom corners and border */
 .bb {
-	background:url('/images/box.png') no-repeat 100% 100%;
-	margin:0 0 0 19px;
-	height:18px;
-	}
+    background: url('/images/box.png') no-repeat 100% 100%;
+    margin: 0 0 0 19px;
+    height: 18px;
+}
+
 .bb div {
-	height:18px;
-	width:19px;
-	position:relative;
-	left:-19px;
-	background:url('/images/box.png') no-repeat 0 100%;
-	}
+    height: 18px;
+    width: 19px;
+    position: relative;
+    left: -19px;
+    background: url('/images/box.png') no-repeat 0 100%;
+}
 
 /* Insert the left border */
 .i1 {
-	padding:0 0 0 12px;
-	background:url('/images/borders.png') repeat-y 0 0;
-	height: 100%;
-	}
+    padding: 0 0 0 12px;
+    background: url('/images/borders.png') repeat-y 0 0;
+    height: 100%;
+}
+
 /* Insert the right border */
 .i2 {
-	padding:0 12px 0 0;
-	background:url('/images/borders.png') repeat-y 100% 0;
-	}
+    padding: 0 12px 0 0;
+    background: url('/images/borders.png') repeat-y 100% 0;
+}
+
 /* Wrapper for the content. Use it to set the background colour and insert some padding between the borders and the content. */
 .i3 {
-	background:#e76808;
-	border:1px solid #e76808;
-	border-width:1px 0;
-	padding:0 10px;
-	}
+    background: #e76808;
+    border: 1px solid #e76808;
+    border-width: 1px 0;
+    padding: 0 10px;
+}
 
 .cbb h3, .cb h3 {
-	margin: 0;
-	color: #ffc62b;
+    margin: 0;
+    color: #ffc62b;
 }
 
 .cbb p, .cb p, .cbb ul, .cb ul {
-	margin: 0;
+    margin: 0;
 }
 
 /* --------------------------------------------------
@@ -98,15 +106,15 @@ div.cbb img.emblem, div.cb img.emblem {
    -------------------------------------------------- */
 
 .cb a:link, .cbb a:link {
-	color: #ffc62b;
+    color: #ffc62b;
 }
 
 .cb a:visited, .cbb a:visited {
-	color: #a52f0f;
+    color: #a52f0f;
 }
 
 .cb a:active, .cbb a:active {
-	color: #ffffff;
+    color: #ffffff;
 }
 
 .cb a:hover, .cbb a:hover {

htdocs/css/boxie.css

 /* Serve gif images to IE/Win pre version 7 */
 .i1, .i2 {
-	background-image:url('/images/borders.gif');
+    background-image: url('/images/borders.gif');
 }
 
 .bt, .bt div, .bb, .bb div {
-	background-image:url('/images/box.gif');
+    background-image: url('/images/box.gif');
 }
 
 /* Set a height to fix up some rendering issues. */
 .i1, .i3 {
-	height:1px;
+    height: 1px;
 }

htdocs/css/common.css

@@ -3,130 +3,128 @@
    -------------------------------------------------- */
 
 body {
-	font-family: Arial, sans-serif;
+    font-family: Arial, sans-serif;
 }
 
 p {
-	line-height: 1.4em;
+    line-height: 1.4em;
 }
 
 form {
-	margin-top: 0;
-	margin-bottom: 1em;
+    margin-top: 0;
+    margin-bottom: 1em;
 }
 
 img {
-	border: 0;
+    border: 0;
 }
 
 h1, h2, h3, h4, h5, h6 {
-	text-align: left;
-	margin-bottom: 0;
+    text-align: left;
+    margin-bottom: 0;
 }
 
-h2+p, h2+ul, h2+ol, h3+p, h3+ul, h3+ol, h4+p, h4+ul, h4+ol {
-	margin-top: 0;
+h2 + p, h2 + ul, h2 + ol, h3 + p, h3 + ul, h3 + ol, h4 + p, h4 + ul, h4 + ol {
+    margin-top: 0;
 }
 
 #project pre, #plan pre {
-	margin: 0;
+    margin: 0;
 }
 
 dd {
-	margin-bottom: 0.5em;
+    margin-bottom: 0.5em;
 }
 
 acronym, abbr {
-	text-transform: lowercase;
-	font-variant: small-caps;
+    text-transform: lowercase;
+    font-variant: small-caps;
 }
 
-
 /* --------------------------------------------------
     Branding
    -------------------------------------------------- */
 
 #branding {
-	width: 100%;
-	height: 5.2em;
-	min-height: 76px;
-	overflow: hidden;
+    width: 100%;
+    height: 5.2em;
+    min-height: 76px;
+    overflow: hidden;
 }
 
 #brandingC {
-	width: 100%;
-	height: 100%;
-	float: left;
+    width: 100%;
+    height: 100%;
+    float: left;
 }
 
 #logo {
-        float: left;
-        padding: 0.2em;
-	min-width: 170px;
-	width: 17%;
+    float: left;
+    padding: 0.2em;
+    min-width: 170px;
+    width: 17%;
 }
 
 #title {
-        float: left;
-	padding-left: 0.5em;
+    float: left;
+    padding-left: 0.5em;
 }
 
 #title h1 {
-        margin-top: 0.4em;
+    margin-top: 0.4em;
 }
 
 #loginForm form {
-	margin: 0;
+    margin: 0;
 }
 
 /* --------------------------------------------------
     Columns
    -------------------------------------------------- */
 #primaryC {
-	margin: 0.5em 0;
-	text-align: justify;
+    margin: 0.5em 0;
+    text-align: justify;
 }
 
 #primaryC > *:first-child {
-	margin-top: 0;
-	padding-top: 0;
+    margin-top: 0;
+    padding-top: 0;
 }
 
 .clear {
-	clear: both;
-	height: 0;
-	margin: 0;
-	padding: 0;
+    clear: both;
+    height: 0;
+    margin: 0;
+    padding: 0;
 }
 
-
 /* --------------------------------------------------
     Content box (e.g. for news items)
    -------------------------------------------------- */
 
 .box, .error {
-	margin: 0.5em 0;
+    margin: 0.5em 0;
 }
 
 .box div.boxcontent, .error div.errorcontent {
-	padding: 0 0.5em;
+    padding: 0 0.5em;
 }
 
 .box .boxhead h2, .box .boxhead h3, .box .boxfoot p, .error h3 {
-	margin: 0;
-	padding: 0 0.5em;
+    margin: 0;
+    padding: 0 0.5em;
 }
 
 .box .boxfoot p {
-	text-align: right;
-	font-weight: bold;
-	font-size: 95%;
+    text-align: right;
+    font-weight: bold;
+    font-size: 95%;
 }
 
 .box div.boxcontent img.emblem {
-	float: right;
-	position: relative;
-	top: -1.5em;
+    float: right;
+    position: relative;
+    top: -1.5em;
 }
 
 /* --------------------------------------------------
@@ -134,29 +132,29 @@ acronym, abbr {
    -------------------------------------------------- */
 
 ol.roman {
-	list-style-type: lower-roman;
+    list-style-type: lower-roman;
 }
 
 dt {
-	font-weight: bold;
+    font-weight: bold;
 }
 
 ul.boxes {
-	display: inline;
+    display: inline;
 }
 
 ul.boxes li {
-	float: left;
-	display: inline;
-	text-align: center;
-	margin-right: 1em;
+    float: left;
+    display: inline;
+    text-align: center;
+    margin-right: 1em;
 }
 
 dd#plan, dd#project {
-	margin-left: 0;
-	word-wrap: break-word;
-	white-space: pre-wrap;
-	font-family: monospace;
+    margin-left: 0;
+    word-wrap: break-word;
+    white-space: pre-wrap;
+    font-family: monospace;
 }
 
 /* --------------------------------------------------
@@ -164,25 +162,25 @@ dd#plan, dd#project {
    -------------------------------------------------- */
 
 table {
-	text-align: left;
+    text-align: left;
 }
 
 table.wide {
-	width: 100%;
+    width: 100%;
 }
 
 table.border, table.border td, table.border th {
-	border: 1px solid #e76808;	
-	border-collapse: collapse;
+    border: 1px solid #e76808;
+    border-collapse: collapse;
 }
 
 table.border {
-	border-width: 2px;
+    border-width: 2px;
 }
 
 table.border td, table.border th {
-	padding: 0.2em;
-	vertical-align: top;
+    padding: 0.2em;
+    vertical-align: top;
 }
 
 /* --------------------------------------------------
@@ -190,23 +188,23 @@ table.border td, table.border th {
    -------------------------------------------------- */
 
 div.row {
-	clear: both;
-	padding-top: 0.5em;
+    clear: both;
+    padding-top: 0.5em;
 }
 
 div.row label {
-	float: left;
-	width: 20%;
-	text-align: right;
+    float: left;
+    width: 20%;
+    text-align: right;
 }
 
 div.row span.textinput {
-	float: right;
-	width: 78%;
-	text-align: left;
+    float: right;
+    width: 78%;
+    text-align: left;
 }
 
 .note {
-	color: #888888;
-	font-size: 80%;
+    color: #888888;
+    font-size: 80%;
 }

htdocs/css/downloads.css

 .downloads .screenshot {
-	padding: 0.4em;
-	margin: 0.2em;
-	float: right;
-	text-align: center;
+    padding: 0.4em;
+    margin: 0.2em;
+    float: right;
+    text-align: center;
 }
 
 .downloads h3 {
-	margin: 0.5em 0 0.2em 0;
-	padding: 0 0 0.1em 0;
-	border-bottom: 1px solid #ccc;
-	font-family: arial, verdana, sans-serif;
-	font-weight: bold;
+    margin: 0.5em 0 0.2em 0;
+    padding: 0 0 0.1em 0;
+    border-bottom: 1px solid #ccc;
+    font-family: arial, verdana, sans-serif;
+    font-weight: bold;
 }
 
 .downloads .links {
-	text-align: right;
-	font-size: 90%;
+    text-align: right;
+    font-size: 90%;
 }

htdocs/css/ie.css

@@ -3,165 +3,168 @@
    -------------------------------------------------- */
 
 .cornerTopLeft {
-	height: 100%;
-	background: url('/images/left-top-corner.png') top left no-repeat;
+    height: 100%;
+    background: url('/images/left-top-corner.png') top left no-repeat;
 }
 
 .cornerTopRight {
-	height: 100%;
-	background: url('/images/right-top-corner.png') top right no-repeat;
+    height: 100%;
+    background: url('/images/right-top-corner.png') top right no-repeat;
 }
 
 .cornerBottomLeft {
-	height: 100%;
-	background: url('/images/left-bottom-corner.png') bottom left no-repeat;
+    height: 100%;
+    background: url('/images/left-bottom-corner.png') bottom left no-repeat;
 }
 
 .cornerBottomRight {
-	height: 100%;
-	background: url('/images/right-bottom-corner.png') bottom right no-repeat;
+    height: 100%;
+    background: url('/images/right-bottom-corner.png') bottom right no-repeat;
 }
 
 /* --------------------------------------------------
     Menu
    -------------------------------------------------- */
 #navigationC ul li a {
-	background: #e76808 url('/images/menu-top-right.png') no-repeat top right;
+    background: #e76808 url('/images/menu-top-right.png') no-repeat top right;
 }
+
 #navigationC ul ul li a span {
-	background: url('/images/menu-bottom-right.png') no-repeat bottom right;
+    background: url('/images/menu-bottom-right.png') no-repeat bottom right;
 }
 
 #navigationC ul li a span {
-	display: block;
-	background: url('/images/menu-bottom-right.png') no-repeat bottom right;
+    display: block;
+    background: url('/images/menu-bottom-right.png') no-repeat bottom right;
 }
+
 /* --------------------------------------------------
     Error box
    -------------------------------------------------- */
 
 .error {
-	margin-right: 0.5em;
-	margin-bottom: 0.5em;
+    margin-right: 0.5em;
+    margin-bottom: 0.5em;
 }
 
 .error div.errorcontent {
-	background: #ffffff;
-	border: 2px solid #ff0000;
+    background: #ffffff;
+    border: 2px solid #ff0000;
 }
 
 .error .errorhead h3 {
-	color: #ffffff;
+    color: #ffffff;
 }
 
 .error .errorhead {
-	background: #ff0000 url('/images/menu-top-left.png') no-repeat top left;
+    background: #ff0000 url('/images/menu-top-left.png') no-repeat top left;
 }
 
 .errorbar, .navbar, .infobar {
-	margin: 0.5em 0 0 0;
-	font-size: 80%;
+    margin: 0.5em 0 0 0;
+    font-size: 80%;
 }
 
 .errorbar {
-	background: #ff0000 url('/images/menu-top-left.png') no-repeat top left;
-	color: #ffffff;
-	margin-right: 0.5em;
+    background: #ff0000 url('/images/menu-top-left.png') no-repeat top left;
+    color: #ffffff;
+    margin-right: 0.5em;
 }
 
 .infobar {
-	background: #e76808 url('/images/menu-top-left.png') no-repeat top left;
-	color: #ffffff;
-	margin-right: 0.5em; 
+    background: #e76808 url('/images/menu-top-left.png') no-repeat top left;
+    color: #ffffff;
+    margin-right: 0.5em;
 }
 
 .infobar a {
-	color: #ffc62b;
+    color: #ffc62b;
 }
 
 .infobar a:active {
-	color: #ffffff;
+    color: #ffffff;
 }
 
 .navbar {
-	background: #e76808 url('/images/menu-top-left.png') no-repeat top left;
+    background: #e76808 url('/images/menu-top-left.png') no-repeat top left;
 }
 
 .navbar a {
-	color: #ffc62b;
-	font-weight: bold;
-	text-decoration: none;
+    color: #ffc62b;
+    font-weight: bold;
+    text-decoration: none;
 }
 
 .errorbar div, .navbar div, .infobar div {
-	background:  url('/images/menu-top-right.png') no-repeat top right;
+    background: url('/images/menu-top-right.png') no-repeat top right;
 }
 
 .errorbar div div, .navbar div div, .infobar div div {
-	background:  url('/images/menu-bottom-left.png') no-repeat bottom left;
+    background: url('/images/menu-bottom-left.png') no-repeat bottom left;
 }
 
 .errorbar div div div, .navbar div div div, .infobar div div div {
-	background:  url('/images/menu-bottom-right.png') no-repeat bottom right;
-	padding: 0.2em 0.5em;
+    background: url('/images/menu-bottom-right.png') no-repeat bottom right;
+    padding: 0.2em 0.5em;
 }
+
 /* --------------------------------------------------
     Content box (e.g. for news items)
    -------------------------------------------------- */
 .box .boxhead {
-	background: #e76808 url('/images/menu-top-left.png') no-repeat top left;
+    background: #e76808 url('/images/menu-top-left.png') no-repeat top left;
 }
 
 .box .hollowhead {
-	background: #ffffff url('/images/border-bottom.png') repeat-x top;
-	height: 5px;
-	margin: 0;
-	padding: 0;
-	border: none;
+    background: #ffffff url('/images/border-bottom.png') repeat-x top;
+    height: 5px;
+    margin: 0;
+    padding: 0;
+    border: none;
 }
 
 .box .hollowhead div {
-	background: url('/images/border-top-left.png') no-repeat top left;
-	height: 100%;
+    background: url('/images/border-top-left.png') no-repeat top left;
+    height: 100%;
 }
 
 .box .hollowhead div div {
-	background: url('/images/border-top-right.png') no-repeat top right;
-	height: 100%;
+    background: url('/images/border-top-right.png') no-repeat top right;
+    height: 100%;
 }
 
-
 .box .boxhead h2, .box .boxhead h3, .error .errorhead h3 {
-	background: url('/images/menu-top-right.png') no-repeat top right;
+    background: url('/images/menu-top-right.png') no-repeat top right;
 }
 
 .box .boxfoot {
-	background: #e76808 url('/images/menu-bottom-left.png') no-repeat bottom left;
+    background: #e76808 url('/images/menu-bottom-left.png') no-repeat bottom left;
 }
 
 .box .boxfoot p {
-	background: url('/images/menu-bottom-right.png') no-repeat bottom right;
+    background: url('/images/menu-bottom-right.png') no-repeat bottom right;
 }
 
 .box .hollowfoot {
-	background: #ffffff url('/images/border-bottom.png') repeat-x bottom;
-	height: 5px;
-	margin: 0;
-	padding: 0;
+    background: #ffffff url('/images/border-bottom.png') repeat-x bottom;
+    height: 5px;
+    margin: 0;
+    padding: 0;
 }
 
 .box .hollowfoot div {
-	background: url('/images/border-bottom-left.png') no-repeat bottom left;
-	height: 100%;
+    background: url('/images/border-bottom-left.png') no-repeat bottom left;
+    height: 100%;
 }
 
 .box .hollowfoot div div {
-	background: url('/images/border-bottom-right.png') no-repeat bottom right;
-	height: 100%;
+    background: url('/images/border-bottom-right.png') no-repeat bottom right;
+    height: 100%;
 }
+
 /* --------------------------------------------------
     Error box
    -------------------------------------------------- */
 .error .errorhead {
-	background: #ff0000 url('/images/menu-top-left.png') no-repeat top left;
+    background: #ff0000 url('/images/menu-top-left.png') no-repeat top left;
 }

htdocs/css/ie8.css

 div#searchbox {
-	height: 5em;
+    height: 5em;
 }
 
 .buttons {
-	padding-top: 5px;
+    padding-top: 5px;
 }
\ No newline at end of file

htdocs/css/ielt7.css

@@ -3,19 +3,19 @@
    -------------------------------------------------- */
 
 .cornerTopLeft {
-	background: url('/images/left-top-corner.gif') top left no-repeat;
+    background: url('/images/left-top-corner.gif') top left no-repeat;
 }
 
 .cornerTopRight {
-	background: url('/images/right-top-corner.gif') top right no-repeat;
+    background: url('/images/right-top-corner.gif') top right no-repeat;
 }
 
 .cornerBottomLeft {
-	background: url('/images/left-bottom-corner.gif') bottom left no-repeat;
+    background: url('/images/left-bottom-corner.gif') bottom left no-repeat;
 }
 
 .cornerBottomRight {
-	background: url('/images/right-bottom-corner.gif') bottom right no-repeat;
+    background: url('/images/right-bottom-corner.gif') bottom right no-repeat;
 }
 
 /* --------------------------------------------------
@@ -23,43 +23,42 @@
    -------------------------------------------------- */
 
 #branding {
-/*	background: #ffc62b;
-	filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=scale src='/images/orangefade.png'); */
+    /*	background: #ffc62b;
+        filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=scale src='/images/orangefade.png'); */
 }
 
 #loginForm {
-	margin-right: 0.5em;
-	margin-bottom: 0.2em;
+    margin-right: 0.5em;
+    margin-bottom: 0.2em;
 }
 
 #brandingC {
-	background: transparent;
-/*	filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=crop src='/images/bgfade.png'); */
+    background: transparent;
+    /*	filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=crop src='/images/bgfade.png'); */
 }
 
-
 /* --------------------------------------------------
     Menu
    -------------------------------------------------- */
 
 #navigationC ul li {
-	line-height: 0;
+    line-height: 0;
 }
 
 #navigationC ul li a {
-	background-image: url('/images/menu-top-right.gif');
+    background-image: url('/images/menu-top-right.gif');
 }
 
 #navigationC ul ul li a {
-	background: #ffc62b url('/images/menu-top-right.gif') norepeat top right;
+    background: #ffc62b url('/images/menu-top-right.gif') norepeat top right;
 }
 
 #navigationC ul li a span {
-	background-image: url('/images/menu-bottom-right.gif');
+    background-image: url('/images/menu-bottom-right.gif');
 }
 
 #navigationC ul ul li a span {
-	background-image: url('/images/menu-bottom-right.gif');
+    background-image: url('/images/menu-bottom-right.gif');
 }
 
 /* --------------------------------------------------
@@ -67,7 +66,7 @@
    -------------------------------------------------- */
 
 #search input.text {
-	width: 95%;
+    width: 95%;
 }
 
 /* --------------------------------------------------
@@ -75,8 +74,8 @@
    -------------------------------------------------- */
 
 #footer {
-/*	background: #ffc62b;
-	filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=scale src='/images/orangefade-bottom.png'); */
+    /*	background: #ffc62b;
+        filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=scale src='/images/orangefade-bottom.png'); */
 }
 
 /* --------------------------------------------------
@@ -84,43 +83,43 @@
    -------------------------------------------------- */
 
 .box {
-	line-height: 1.1;
+    line-height: 1.1;
 }
 
-.box .boxhead {      
-        background: #e76808 url('/images/menu-top-left.gif') no-repeat top left;
+.box .boxhead {
+    background: #e76808 url('/images/menu-top-left.gif') no-repeat top left;
 }
 
 .box .hollowhead, .box .hollowfoot {
-	font-size: 0;
+    font-size: 0;
 }
 
 .box .hollowhead div {
-	background: url('/images/border-top-left.gif') no-repeat top left;
+    background: url('/images/border-top-left.gif') no-repeat top left;
 }
 
 .box .hollowhead div div {
-	background: url('/images/border-top-right.gif') no-repeat top right;
+    background: url('/images/border-top-right.gif') no-repeat top right;
 }
 
 .box .boxhead h2, .box .boxhead h3, .error .errorhead h3 {
-        background: url('/images/menu-top-right.gif') no-repeat top right;
+    background: url('/images/menu-top-right.gif') no-repeat top right;
 }
 
-.box .boxfoot { 
-        background: #e76808 url('/images/menu-bottom-left.gif') no-repeat bottom left;  
+.box .boxfoot {
+    background: #e76808 url('/images/menu-bottom-left.gif') no-repeat bottom left;
 }
 
 .box .boxfoot p {
-        background: url('/images/menu-bottom-right.gif') no-repeat bottom right;      
+    background: url('/images/menu-bottom-right.gif') no-repeat bottom right;
 }
 
 .box .hollowfoot div {
-	background: url('/images/border-bottom-left.gif') no-repeat bottom left;
+    background: url('/images/border-bottom-left.gif') no-repeat bottom left;
 }
 
 .box .hollowfoot div div {
-	background: url('/images/border-bottom-right.gif') no-repeat bottom right;
+    background: url('/images/border-bottom-right.gif') no-repeat bottom right;
 }
 
 /* --------------------------------------------------
@@ -128,21 +127,21 @@
    -------------------------------------------------- */
 
 .error .errorhead {
-        background: #ff0000 url('/images/menu-top-left.gif') no-repeat top left;
+    background: #ff0000 url('/images/menu-top-left.gif') no-repeat top left;
 }
 
 .errorbar {
-        background: #ff0000 url('/images/menu-top-left.gif') no-repeat top left;
+    background: #ff0000 url('/images/menu-top-left.gif') no-repeat top left;
 }
 
 .errorbar div {
-        background:  url('/images/menu-top-right.gif') no-repeat top right;
+    background: url('/images/menu-top-right.gif') no-repeat top right;
 }
 
 .errorbar div div {
-        background:  url('/images/menu-bottom-left.gif') no-repeat bottom left;
+    background: url('/images/menu-bottom-left.gif') no-repeat bottom left;
 }
 
-.errorbar div div div { 
-        background:  url('/images/menu-bottom-right.gif') no-repeat bottom right;
+.errorbar div div div {
+    background: url('/images/menu-bottom-right.gif') no-repeat bottom right;
 }

htdocs/css/ielt8.css

 form {
-	margin: 0;
-	padding: 0;
+    margin: 0;
+    padding: 0;
 }
 
 #navigationC ul li {
-	line-height: 0;
+    line-height: 0;
 }
 
 #loginForm input.button {
-	font-size: 80%;	
+    font-size: 80%;
 }
 
 /* --------------------------------------------------
@@ -16,11 +16,12 @@ form {
    -------------------------------------------------- */
 
 ol.roman {
-	list-style-type: i;
+    list-style-type: i;
 }
+
 /* --------------------------------------------------
     Secondary content
    -------------------------------------------------- */
 #secondary ul {
-	margin-left: 2em;
+    margin-left: 2em;
 }
\ No newline at end of file

htdocs/css/members.css

 li.column1 {
-	margin-left: 0em; 
+    margin-left: 0em;
 }
 
 li.column2 {
-	margin-left: 10em; 
+    margin-left: 10em;
 }
 
 div.memberlist ul li {
-	line-height: 1.2em;
+    line-height: 1.2em;
 }
 
 div.memberlist ul {
-	margin-top: 0;
+    margin-top: 0;
 }
 
-
 ul.bananas {
-	margin-left: 0;
-	padding-left: 0;
-	list-style: none;
+    margin-left: 0;
+    padding-left: 0;
+    list-style: none;
 }
 
 ul.bananas li {
-	margin-bottom: 0.5em;
-	background-repeat: no-repeat;
-	padding-left: 30px;
+    margin-bottom: 0.5em;
+    background-repeat: no-repeat;
+    padding-left: 30px;
 }
 
 ul.bananas li small {
-	color: grey;
+    color: grey;
 }
 
 ul.bananas li.yellow1 {
-	background-image: url('/images/bananas/banana1.png');
-	background-position: 0.5em;
+    background-image: url('/images/bananas/banana1.png');
+    background-position: 0.5em;
 }
 
 ul.bananas li.yellow2 {
-	background-image: url('/images/bananas/banana2.png'); 
-	background-position: 0.2em;
+    background-image: url('/images/bananas/banana2.png');
+    background-position: 0.2em;
 }
 
 ul.bananas li.yellow3 {
-	background-position: 0;
-	background-image: url('/images/bananas/banana3.png');
+    background-position: 0;
+    background-image: url('/images/bananas/banana3.png');
 }
 
 ul.bananas li.green1 {
-	background-position: 0.5em;
-	background-image: url('/images/bananas/banana-g-1.png');
+    background-position: 0.5em;
+    background-image: url('/images/bananas/banana-g-1.png');
 }
 
 ul.bananas li.green2 {
-	background-position: 0.2em;
-	background-image: url('/images/bananas/banana-g-2.png');
+    background-position: 0.2em;
+    background-image: url('/images/bananas/banana-g-2.png');
 }
 
 ul.bananas li.green3 {
-	background-position: 0;
-	background-image: url('/images/bananas/banana-g-3.png');
+    background-position: 0;
+    background-image: url('/images/bananas/banana-g-3.png');
 }
 

htdocs/css/milliways.css

-.date {background-color: #e0e0ff; }
-.time {background-color: #e0ffe0; }
-.user {background-color: #ffe0e0; }
-.taglist {background-color: #ffffe0; }
+.date {
+    background-color: #e0e0ff;
+}
+
+.time {
+    background-color: #e0ffe0;
+}
+
+.user {
+    background-color: #ffe0e0;
+}
+
+.taglist {
+    background-color: #ffffe0;
+}

htdocs/css/pastebin.css

-
 /********************************************************************************
  * CodeHighlight Classes
  * Originally from the Wordpress Code Highlight Plugin
@@ -16,27 +15,82 @@
 }
 
 /* .hl-surround, .hl-surround pre, .hl-surround span, */
-.hl-main { font: normal 10pt 'Courier New', monospace;}
-
-.hl-default     { color: Black; }
-.hl-code        { color: Black; }
-.hl-brackets    { color: Olive; }
-.hl-comment     { color: #ffa500; } /* Orange */
-.hl-quotes      { color: #8b0000; } /* Dark red */
-.hl-string      { color: Red; }
-.hl-identifier  { color: Blue; }
-.hl-builtin     { color: Teal; }
-.hl-reserved    { color: Green; }
-.hl-inlinedoc   { color: Blue; }
-.hl-var         { color: #00008b; } /* Dark blue */
-.hl-url         { color: Blue; }
-.hl-special     { color: Navy; }
-.hl-number      { color: Maroon; }
-.hl-inlinetags  { color: Blue; }
-.hl-main        { background-color: transparent; }
-
-.hl-main pre { margin: 0; padding: 0; }
+.hl-main {
+    font: normal 10pt 'Courier New', monospace;
+}
+
+.hl-default {
+    color: Black;
+}
+
+.hl-code {
+    color: Black;
+}
+
+.hl-brackets {
+    color: Olive;
+}
+
+.hl-comment {
+    color: #ffa500;
+}
+
+/* Orange */
+.hl-quotes {
+    color: #8b0000;
+}
+
+/* Dark red */
+.hl-string {
+    color: Red;
+}
+
+.hl-identifier {
+    color: Blue;
+}
+
+.hl-builtin {
+    color: Teal;
+}
+
+.hl-reserved {
+    color: Green;
+}
+
+.hl-inlinedoc {
+    color: Blue;
+}
+
+.hl-var {
+    color: #00008b;
+}
+
+/* Dark blue */
+.hl-url {
+    color: Blue;
+}
+
+.hl-special {
+    color: Navy;
+}
+
+.hl-number {
+    color: Maroon;
+}
+
+.hl-inlinetags {
+    color: Blue;
+}
+
+.hl-main {
+    background-color: transparent;
+}
+
+.hl-main pre {
+    margin: 0;
+    padding: 0;
+}
 
 div#displayCode * {
-	font: normal 10pt 'Courier New', monospace;
+    font: normal 10pt 'Courier New', monospace;
 }