.gitlab-ci.yml

 # specify what docker image
 # go with the default image for now and mangle it
-#image: ruby:2.1
+#image: debian:jessie
 
 stages:
   - test
@@ -14,7 +14,7 @@ php-syntax-check:
   script:
    - apt-get clean
    - apt-get update
-   - apt-get install -y php5-cli        
+   - apt-get install -y php-cli
    - php -l htdocs/index.php
    - find components -name *.php | xargs -n 1 php -l
    - find plugins -name *.php | xargs -n 1 php -l
@@ -22,24 +22,27 @@ php-syntax-check:
 
 js-syntax-check:
   stage: test
+  image: node:current
   script:
-   - apt-get clean
-   - apt-get update
-   - apt-get install -y npm
-   - ln -s /usr/bin/nodejs /usr/bin/node
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
 
-fake-deploy-beta:
+deploy-beta:
   stage: deploy
   script:
-   - echo "Hello World!"
+   - apt update
+   - apt install -y curl
+   - curl https://beta.sucs.org/pull.php
   only:
    - beta
+  environment: beta
 
-fake-deploy-live:
+deploy-live:
   stage: deploy
   script:
-   - echo "Hello World!"
+   - apt update
+   - apt install -y curl
+   - curl https://sucs.org/pull.php
   only:
-   - sucs-site
\ No newline at end of file
+   - sucs-site
+  environment: live

components/disk.graph.php

-<?
+<?php
 exec("/usr/local/bin/shame.py -a", $Shame);
 for ($i = 1; $i < (count($Shame) - 1); $i++) {
     list($space, $place, $user, $size) = preg_split("/ +/", $Shame[$i]);

components/disk.php

-<? exec("/usr/local/bin/shame.py -a", $Shame);
+<?php exec("/usr/local/bin/shame.py -a", $Shame);
 $max = 10; //SET to number of users to display
 $smarty->assign('title', "The SUCS Hall of Shame");
 //$o="<div style='text-align: center;'><img src=\"/images/disk.graph.php\" alt=\"pie chart of top 12 disk users\"/></div>";

components/front.php

@@ -9,7 +9,7 @@ if (!$session->loggedin) {
     $output = file_get_contents("../static/fragments/Join.txt");
 } else {
     $output = "<div class=\"cbb\"><h3>You are logged in</h3><p>If you would like to contribute to the site or report a bug, please contact imranh.</p></div>";
-    $output = "<div class=\"cbb\"><h3>You are logged in</h3><p style=\"text-align: center;\">Why not join our <a href=\"#\" onclick=\"window.open('/mw/','Milliways','height=600,width=800,menubar=no,resizable=yes,location=no,directories=no,scrollbars=yes,status=no,toolbar=no')\" style=\"font-size: 150%; font-weight: bold; color: #ffc62b;\">Live Chat</a>?</p></div>";
+    $output = "<div class=\"cbb\"><h3>You are logged in</h3><p style=\"text-align: center;\">Why not join our <a href=\"https://chat.sucs.org\" target=\"_blank\">Live Chat</a>?</p></div>";
 //include('users.php');
 //$output .= $result;
     include('electionreminder.php');

components/id.php

-<?
+<?php
 $out = exec("/usr/bin/id");
 $smarty->assign("body", $out);
 ?>

components/members.php

@@ -48,11 +48,11 @@ if ($session->loggedin) {
                 $homedir = explode('/', $usernames[0]['homedir']);
                 $usernames[0]['acctype'] = ucfirst($homedir[2]);
                 // Project
-                if (file_exists($usernames[0]['homedir'] . '/.project')) {
+                if (file_exists($usernames[0]['homedir'] . '/.project') && ! is_link($usernames[0]['homedir'] . '/.project')) {
                     $usernames[0]['project'] = file_get_contents($usernames[0]['homedir'] . '/.project');
                 }
                 // Plan
-                if (file_exists($usernames[0]['homedir'] . '/.plan')) {
+                if (file_exists($usernames[0]['homedir'] . '/.plan') && ! is_link($usernames[0]['homedir'] . '/.plan')) {
                     $usernames[0]['plan'] = file_get_contents($usernames[0]['homedir'] . '/.plan');
                 }
                 // Website

components/motd.php

@@ -3,16 +3,22 @@ $motd_file = "/etc/motd";
 
 function decode_entities($text, $quote_style = ENT_COMPAT)
 {
-    if (function_exists('html_entity_decode')) {
-        $text = html_entity_decode($text, $quote_style, 'ISO-8859-1'); // NOTE: UTF-8 does not work!
-    } else {
-        $trans_tbl = get_html_translation_table(HTML_ENTITIES, $quote_style);
-        $trans_tbl = array_flip($trans_tbl);
-        $text = strtr($text, $trans_tbl);
-    }
+    $text = html_entity_decode($text, $quote_style, 'ISO-8859-1'); // NOTE: UTF-8 does not work!
     $text = preg_replace('~&ndash\;~i', '-', $text);
-    $text = preg_replace('~&#x([0-9a-f]+);~ei', 'chr(hexdec("\\1"))', $text);
-    $text = preg_replace('~&#([0-9]+);~e', 'chr("\\1")', $text);
+    $text = preg_replace_callback('~&#x([0-9a-f]+);~i',
+                    function ($matches) {
+                        foreach ($matches as $match) {
+                            return chr(hexdec($match));
+                       }
+                    },
+                    $text);
+    $text = preg_replace_callback('~&#([0-9]+);~',
+                    function ($matches) {
+                        foreach ($matches as $match) {
+                            return chr($match);
+                        }
+                    },
+                    $text);
     return $text;
 }
 
@@ -52,7 +58,12 @@ for ($i = count($news) - 1; $i > -1; $i--) {
     $body = str_replace("…", "...", $body);
     $body = str_replace("'", "'", $body);
 // remove hyperlinks, collect to display later
-    $body = preg_replace(":<a href=['\"](.+?)['\"].*?>(.*?)</a>:e", "'\\2['.linkcounter('\\1').']'", $body);
+    $body = preg_replace_callback(":<a href=['\"](.+?)['\"].*?>(.*?)</a>:",
+                function ($matches) {
+                        $i = linkcounter($matches[1]);
+                        return $matches[0]."[".$i."]";
+                },
+                $body);
     $body = strip_tags($body);
     $body = decode_entities($body);
     $body = wordwrap($body, 75, "\n    ", 1);
@@ -76,9 +87,11 @@ for ($i = count($news) - 1; $i > -1; $i--) {
 }
 $motd .= "---------------------------- [ http://sucs.org/ ] -----------------------------\n";
 
+//print($motd);
+
 //if (time()-filemtime($motd_file) < 86000  && $poemmode == 1) { //86000 to allow a little slack depending on when cron runs
 // print "MOTD too recent to replace with a poem!\n";
 //} else {
 file_put_contents($motd_file, $motd);
 //}
-?>
+?>
\ No newline at end of file

components/motd_wrapper.php

@@ -4,9 +4,9 @@ require("/var/www/sucssite/htdocs/settings.php");
 require("/usr/share/php/adodb/adodb.inc.php");
 
 $dbname = 'sucssite';
-$dbuser = 'apache';
+$dbuser = 'sucs_site_user';
 
-$DB = NewADOConnection('postgres8');
+$DB = NewADOConnection('postgres9');
 $DB->Connect('dbname=' . $dbname . ' user=' . $dbuser);
 $DB->SetCharSet('utf8');
 $DB->SetFetchMode(ADODB_FETCH_ASSOC);

components/mw.php

-<?
+<?php
 // guard against corrupt folder data
 define("TOOBIG", 102400);
 

components/options.php

@@ -5,6 +5,8 @@ require_once("../lib/validation.php");
 require_once("Net/MAC.php");
 include_once("../lib/date.php");
 
+// password hash, renewal functions
+include_once("../lib/member_functions.php");
 
 // Some Constants
 // These could possibly be moved somewhere saner?
@@ -47,7 +49,7 @@ function changePassword($oldpass, $newpass1, $newpass2)
 
     // if everything looks OK, attempt to make the change
     $success = ldap_mod_replace($ldap, "uid=" . $session->username . ",ou=People,dc=sucs,dc=org",
-        array('userpassword' => "{SHA}" . base64_encode(pack("H*", sha1($newpass1)))));
+        array('userpassword' => "{CRYPT}" . cryptPassword($newpass1)));
 
     ldap_close($ldap);
     return $success;
@@ -214,7 +216,6 @@ function updateRenew()
         return FALSE;
     }
 
-    include_once("../lib/member_functions.php");
     renew_membership($member['username']);
     $sucsDB->Execute("update signup set activated=NOW(), username=? where id=?", array($member['username'], $signup['id']));
     return TRUE;

components/printer.graph.php

-<?
+<?php
 
 $res = $sucsDB->Execute("select username, sum(pages) as pages from printer where username != 'old' group by username order by sum(pages) desc");
 $num = $res->RecordCount();

components/printer.php

@@ -98,7 +98,7 @@ $res->Close();
 //get the number of pages printed by "old" users and add it to the total
 $res = $sucsDB->Execute("select sum(pages) as pages from printer where username = 'old' group by username order by sum(pages) desc");
 $old = $res->FetchRow();
-$old = $old[0];
+$old = $old['pages'];
 $res->Close();
 $total += $old;
 //Output two lines at the bottem of the table, one for "old" users and the other for the total

components/signup.php

@@ -50,6 +50,10 @@ if (isset($_REQUEST['signupid']) && isset($_REQUEST['signuppw'])) {
             // pass on the id and passwd and id the validation is overridable
             $smarty->assign("signupid", $signupid);
             $smarty->assign("signuppw", $signuppw);
+            // pass on the student id if it exists
+            if (isset($_REQUEST['signupsid'])) {
+                $smarty->assign("signupsid", $_REQUEST['signupsid']);
+            }
             $smarty->assign("overridable", $overridable);
             $smarty->assign("usertype", $row[type]);
             // if accepting the form
@@ -80,18 +84,18 @@ if (isset($_REQUEST['signupid']) && isset($_REQUEST['signuppw'])) {
                         $errors['address'] = $error;
                     }
                     $fields['address'] = sanitizeAddress($_POST['address']);
-                    if (!validRealName($_REQUEST['realname'], $override)) {
+                    if (!validName($_REQUEST['realname'], $override)) {
                         $valid = false;
                         $errors['realname'] = $error;
                     }
                     $fields['realname'] = $_REQUEST['realname'];
                 } else {
-                    if (!(validRealName($_REQUEST['contact'], false) || $override)) {
+                    if (!(validName($_REQUEST['contact'], false) || $override)) {
                         $valid = false;
                         $errors['contact'] = $error;
                     }
                     $fields['contact'] = $_REQUEST['contact'];
-                    if (!validSocName($_REQUEST['realname'], $override)) {
+                    if (!validName($_REQUEST['realname'], $override)) {
                         $valid = false;
                         $errors['realname'] = $error;
                     }
@@ -128,16 +132,8 @@ if (isset($_REQUEST['signupid']) && isset($_REQUEST['signuppw'])) {
                         );
                         $failed = true;
                     } else {
-                        // determine the uid range
-                        if ($row[type] == 2) {
-                            $baseuid = 8;
-                        } else {
-                            $baseuid = 29;
-                        }
-                        $minuid = $baseuid * 1000;
-                        $maxuid = $minuid + 999;
-                        //get the new uid
-                        $uid = findUid($minuid, $maxuid);
+                        //generate the new uid
+                        $uid = generateUid();
                         // make a password
                         $password = make_password();
                         // make the ldif
@@ -171,7 +167,7 @@ if (isset($_REQUEST['signupid']) && isset($_REQUEST['signuppw'])) {
                                 mail(
                                     $error_email,
                                     "Signup Error",
-                                    "User " . $fields['username'] . " already exists in the databse, THIS SHOULD NEVER HAPPEN\n Love the signup system.\n\nP.S. the signup id is: " . $signupid,
+                                    "User " . $fields['username'] . " already exists in the database, THIS SHOULD NEVER HAPPEN\n Love, the signup system.\n\nP.S. the signup id is: " . $signupid,
                                     "From: \"SUCS Admin\" <admin@sucs.org>"
                                 );
                                 $failed = true;
@@ -255,16 +251,10 @@ if (isset($_REQUEST['signupid']) && isset($_REQUEST['signuppw'])) {
                                     if ($override) {
                                         $logsmessage .= "User " . $session->username . " overrode validation.\n";
                                     }
-                                    $logsmessage .= "Love The Signup System";
+                                    $logsmessage .= "Love, The Signup System";
                                     // DEV: CHANGE THIS EMAIL ADDRESS
                                     mail(
-                                        "logs@sucs.org",
-                                        "User '" . $fields['username'] . "' Created on SUCS",
-                                        $logsmessage,
-                                        "From: \"SUCS Admin\" <admin@sucs.org>"
-                                    );
-                                    mail(
-                                        "treasurer@sucs.org",
+                                        "logs@sucs.org,treasurer@sucs.org",
                                         "User '" . $fields['username'] . "' Created on SUCS",
                                         $logsmessage,
                                         "From: \"SUCS Admin\" <admin@sucs.org>"
@@ -339,7 +329,7 @@ if (isset($_REQUEST['signupid']) && isset($_REQUEST['signuppw'])) {
                         foreach ($errorreparray as $key => $value) {
                             $errorreport .= $key . ": " . $value . "\n";
                         }
-                        $errorreport .= "\nLove from the Signup System";
+                        $errorreport .= "\nLove, the Signup System";
                         mail(
                             $error_email,
                             "Signup system error report",

components/signupajax.php

-<?
+<?php
 require_once("../lib/validation.php");
 // don't output the site template
 $no_template = TRUE;
@@ -29,7 +29,7 @@ if (isset($_GET['key'])) {
             break;
         case "realname":
             $realname = $_GET['value'];
-            if (validRealName($realname, false)) {
+            if (validName($realname, false)) {
                 echo "OK";
             } else {
                 echo $error;
@@ -37,7 +37,7 @@ if (isset($_GET['key'])) {
             break;
         case "socname":
             $socname = $_GET['value'];
-            if (validSocName($socname, false)) {
+            if (validName($socname, false)) {
                 echo "OK";
             } else {
                 echo $error;

components/susignup.php

@@ -40,26 +40,27 @@ if (!empty($_REQUEST['sid']) && !empty($_REQUEST['transactionID'])) {
         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 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
-            // I don't know how you would end up in a state like this but the old code dealt with it so I will as well
-        } else if ($tmpresult->fields == false && $signuptmpresult->fields["sid"] == $sid) {
+        // 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"]);
-            // else if they aren't in the SUCS DB, then bootstrap signup process
-        } else if ($tmpresult->fields == false && $signuptmpresult->fields == false) {
+            $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.");

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/css/sucs.css

@@ -3,8 +3,9 @@
    -------------------------------------------------- */
 
 body {
-    background: #fff;
+    background: #fff0cd;
     min-width: 600px;
+    margin: 0px;
 }
 
 hr {
@@ -34,12 +35,12 @@ a:hover {
 /* --------------------------------------------------
     Page corners
    -------------------------------------------------- */
-#branding, #brandingC {
+/*#branding, #brandingC {
     border-top-left-radius: 15px;
     border-top-right-radius: 15px;
     -moz-border-radius-topleft: 15px;
     -moz-border-radius-topright: 15px;
-}
+}*/
 
 #footer {
     border-bottom-left-radius: 15px;
@@ -110,7 +111,7 @@ a:hover {
     background: #fff0cd;
     padding: 0;
     clear: both;
-    border: 2px solid #e76808;
+    /*border: 2px solid #e76808;*/
     border-top: 0;
     border-bottom: 0;
 }
@@ -264,6 +265,7 @@ ul#valid {
     margin: 0;
     margin-bottom: 0.5em;
     background: url('/images/orangefade-bottom.png') top repeat-x #ffc62b;
+    visibility: hidden;
 }
 
 #footer p {

htdocs/index.html

+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+
+	<title>Swansea University Computer Society</title>
+
+	<!-- Google font -->
+	<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700%7CVarela+Round" rel="stylesheet">
+
+	<!-- Bootstrap -->
+	<link type="text/css" rel="stylesheet" href="plaster-files/css/bootstrap.min.css" />
+
+	<!-- Owl Carousel -->
+	<link type="text/css" rel="stylesheet" href="plaster-files/css/owl.carousel.css" />
+	<link type="text/css" rel="stylesheet" href="plaster-files/css/owl.theme.default.css" />
+
+	<!-- Magnific Popup -->
+	<link type="text/css" rel="stylesheet" href="plaster-files/css/magnific-popup.css" />
+
+	<!-- Font Awesome Icon -->
+	<link rel="stylesheet" href="plaster-files/css/font-awesome.min.css">
+
+	<!-- Custom stlylesheet -->
+	<link type="text/css" rel="stylesheet" href="plaster-files/css/style.css" />
+
+	<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+	<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+	<!--[if lt IE 9]>
+		<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+		<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+	<![endif]-->
+</head>
+
+<body>
+	<!-- Header -->
+	<header id="home">
+		<!-- Background Image -->
+		<div class="bg-img" style="background-image: url('./plaster-files/img/background1.jpg');">
+			<div class="overlay"></div>
+		</div>
+		<!-- /Background Image -->
+
+		<!-- Nav -->
+		<nav id="nav" class="navbar nav-transparent">
+			<div class="container">
+
+				<div class="navbar-header">
+					<!-- Logo -->
+					<div class="navbar-brand">
+						<a href="index.html">
+							<img class="logo" src="plaster-files/img/sucslogo_trans.svg" alt="logo">
+							<img class="logo-alt" src="plaster-files/img/sucslogo_trans.svg" alt="logo">
+						</a>
+					</div>
+					<!-- /Logo -->
+
+					<!-- Collapse nav button -->
+					<div class="nav-collapse">
+						<span></span>
+					</div>
+					<!-- /Collapse nav button -->
+				</div>
+
+				<!--  Main navigation  -->
+				<ul class="main-nav nav navbar-nav navbar-right">
+					<li><a href="#home">Home</a></li>
+					<li><a href="#about">About</a></li>
+					<li><a href="#service">Services</a></li>
+					<li><a href="#contact">Contact</a></li>
+					<li><a href=https://sucs.org/index.php>Main Site</a></li>
+				</ul>
+				<!-- /Main navigation -->
+
+			</div>
+		</nav>
+		<!-- /Nav -->
+
+		<!-- home wrapper -->
+		<div class="home-wrapper">
+			<div class="container">
+				<div class="row">
+
+					<!-- home content -->
+					<div class="col-md-10 col-md-offset-1">
+						<div class="home-content">
+							<h1 class="white-text">Swansea University Computer Society</h1>
+							<p class="white-text">SUCS is one of the university's longest-running and largest societies. In addition to providing members with a range of IT services, we hold regular events and socials throughout the year.
+							</p>
+							<a href="https://sucs.org/join" class="white-btn">Join Now!</a>
+							<a href="#about" class="main-btn">Learn more</a>
+						</div>
+					</div>
+					<!-- /home content -->
+
+				</div>
+			</div>
+		</div>
+		<!-- /home wrapper -->
+
+	</header>
+	<!-- /Header -->
+
+	<!-- About -->
+	<div id="about" class="section md-padding">
+
+		<!-- Container -->
+		<div class="container">
+
+			<!-- Row -->
+			<div class="row">
+
+				<!-- Section header -->
+				<div class="section-header text-center">
+					<h2 class="title">A little about us...</h2>
+				</div>
+				<!-- /Section header -->
+
+				<!-- about -->
+				<div class="col-md-6">
+					<!--<div class="section-header">
+						<h2 class="title">Breif Outline</h2>
+					</div>-->
+					<p>Established in 1988 we are a community that enjoys technology and being creative. We also offer a wide variety of services that our members greatly benefit from.</p>
+					<div class="feature">
+						<i class="fa fa-check"></i>
+						<p>Hold regular events both technical and non-technical.</p>
+					</div>
+					<div class="feature">
+						<i class="fa fa-check"></i>
+						<p>Have several active projects going on that any member can join in on.</p>
+					</div>
+					<div class="feature">
+						<i class="fa fa-check"></i>
+						<p>Offer our members a dedicated 24/7 space.</p>
+					</div>
+					<div class="feature">
+						<i class="fa fa-check"></i>
+						<p>Active alumni network with members working at Red Hat, Google, Microsoft, etc...</p>
+					</div>
+				</div>
+
+				<div class="col-md-6">
+					<p>
+						Come chat with us on one of the oldest Bulletin Board Systems in the UK, Milliways! Existing members can log in by SSH'ing into silver (ssh sucs.org) and running the command 'mw'. Non-members can join by SSH'ing in as the user 'bbs' with the password 'bbs' (ssh bbs@sucs.org). There is a quick guide on <a href="https://sucs.org/Knowledge/Help/SUCS%20Services/Using%20Milliways">Using MW</a> that is recommended.
+					</p>
+					<p>
+						We also run a <a href="https://chat.sucs.org">Discord</a> server that is more easily accessible on a wider variety of platforms.
+					</p>
+				</div>
+
+
+				<!-- /about -->
+
+			</div>
+			<!-- /Row -->
+
+		</div>
+		<!-- /Container -->
+
+	</div>
+	<!-- /About -->
+
+	<!-- Service -->
+	<div id="service" class="section md-padding">
+
+		<!-- Container -->
+		<div class="container">
+
+			<!-- Row -->
+			<div class="row">
+
+				<!-- Section header -->
+				<div class="section-header text-center">
+					<h2 class="title">What we offer</h2>
+				</div>
+				<!-- /Section header -->
+
+				<!-- service -->
+				<div class="col-md-4 col-sm-6">
+					<div class="service">
+						<i class="fa fa-calendar"></i>
+						<h3>Regular Events</h3>
+						<p>We run regular technical and non-technical events.</p>
+					</div>
+				</div>
+				<!-- /service -->
+
+				<!-- service -->
+				<div class="col-md-4 col-sm-6">
+					<div class="service">
+						<i class="fa fa-building"></i>
+						<h3>Dedicated Lab</h3>
+						<p>We run our own dedicated lab that's accessible 24/7.</p>
+					</div>
+				</div>
+				<!-- /service -->
+
+				<!-- service -->
+				<div class="col-md-4 col-sm-6">
+					<div class="service">
+						<i class="fa fa-users"></i>
+						<h3>Community</h3>
+						<p>With over 100 members from all manner of backgrounds SUCS has a rich and diverse community.</p>
+					</div>
+				</div>
+				<!-- /service -->
+
+				<!-- service -->
+				<div class="col-md-4 col-sm-6">
+					<div class="service">
+						<i class="fa fa-laptop"></i>
+						<h3>Virtual Machines</h3>
+						<p>Members can request virtual machines for use for projects or prototyping.</p>
+					</div>
+				</div>
+				<!-- /service -->
+
+				<!-- service -->
+				<div class="col-md-4 col-sm-6">
+					<div class="service">
+						<i class="fa fa-server"></i>
+						<h3>Web Hosting</h3>
+						<p>Members can take advantage of our web-hosting facilities to showcase their work or ideas.</p>
+					</div>
+				</div>
+				<!-- /service -->
+
+				<!-- service -->
+				<div class="col-md-4 col-sm-6">
+					<div class="service">
+						<i class="fa fa-code"></i>
+						<h3>Projects</h3>
+						<p>We run numerous projects that people can jump in and out of. Hosting your own projects is possible with our own GitLab server</p>
+					</div>
+				</div>
+				<!-- /service -->
+
+			</div>
+			<!-- /Row -->
+
+		</div>
+		<!-- /Container -->
+
+	</div>
+	<!-- /Service -->
+
+	<!-- Contact -->
+	<div id="contact" class="section md-padding">
+
+		<!-- Container -->
+		<div class="container">
+
+			<!-- Row -->
+			<div class="row">
+
+				<!-- Section-header -->
+				<div class="section-header text-center">
+					<h2 class="title">Get in touch</h2>
+				</div>
+				<!-- /Section-header -->
+
+				<!-- contact -->
+				<div class="col-sm-4">
+					<div class="contact">
+						<i class="fa fa-facebook"></i>
+						<h3><a href="https://sucs.org/fb">Facebook</a></h3>
+					</div>
+				</div>
+				<!-- /contact -->
+
+
+				<!-- contact -->
+				<div class="col-sm-4">
+					<div class="contact">
+						<i class="fa fa-envelope"></i>
+						<h3><a href="mailto:joinus@sucs.org?Subject=Hello">Email</a></h3>
+						<p>joinus@sucs.org</p>
+					</div>
+				</div>
+				<!-- /contact -->
+
+				<!-- contact -->
+				<div class="col-sm-4">
+					<div class="contact">
+						<i class="fa fa-twitter"></i>
+						<h3><a href="https://twitter.com/sucsexec">Twitter</a></h3>
+					</div>
+				</div>
+				<!-- /contact -->
+
+
+			</div>
+			<!-- /Row -->
+
+		</div>
+		<!-- /Container -->
+
+	</div>
+	<!-- /Contact -->
+
+
+	<!-- Footer -->
+	<footer id="footer" class="sm-padding bg-dark">
+
+		<!-- Container -->
+		<div class="container">
+
+			<!-- Row -->
+			<div class="row">
+
+				<div class="col-md-12">
+
+
+					<!-- footer copyright -->
+					<div class="footer-copyright">
+						<p>Designed stolen from <a href="https://colorlib.com" target="_blank">Colorlib</a> (with permission)</p>
+					</div>
+					<!-- /footer copyright -->
+
+				</div>
+
+			</div>
+			<!-- /Row -->
+
+		</div>
+		<!-- /Container -->
+
+	</footer>
+	<!-- /Footer -->
+
+	<!-- Back to top -->
+	<div id="back-to-top"></div>
+	<!-- /Back to top -->
+
+	<!-- Preloader -->
+	<div id="preloader">
+		<div class="preloader">
+			<span></span>
+			<span></span>
+			<span></span>
+			<span></span>
+		</div>
+	</div>
+	<!-- /Preloader -->
+
+	<!-- jQuery Plugins -->
+	<script type="text/javascript" src="plaster-files/js/jquery.min.js"></script>
+	<script type="text/javascript" src="plaster-files/js/bootstrap.min.js"></script>
+	<script type="text/javascript" src="plaster-files/js/owl.carousel.min.js"></script>
+	<script type="text/javascript" src="plaster-files/js/jquery.magnific-popup.js"></script>
+	<script type="text/javascript" src="plaster-files/js/main.js"></script>
+
+</body>
+
+</html>

htdocs/plaster-files/css/3step.css

+.jumbotron {
+	background-image: linear-gradient(to bottom left, #FA0, #f60);
+}
+
+.jumbotron img {
+	width: auto;
+	height: auto;
+	max-height: 12em;
+}
+
+h1 {
+	color: #fff;
+	font-weight: bold;
+}
+
+.btn-primary {
+	background-color: #f60;
+	border-color: #f60;
+}
+.btn-primary:hover {
+	background-color: #f80;
+	border-color: #f80;
+}
\ No newline at end of file