From 96061966ba52280180227a15971a13eb779c8d44 Mon Sep 17 00:00:00 2001
From: Andy Pover <andy@sucs.org>
Date: Fri, 2 Jun 2017 11:18:24 +0100
Subject: [PATCH 01/30] Update Donations.txt to add imranh's PS2 donation

---
 static/About/Donations.txt | 268 +++++++++++++++++++------------------
 1 file changed, 138 insertions(+), 130 deletions(-)

diff --git a/static/About/Donations.txt b/static/About/Donations.txt
index e891bf1..0814fa9 100644
--- a/static/About/Donations.txt
+++ b/static/About/Donations.txt
@@ -1,131 +1,139 @@
-<h2>Donations Policy</h2>
-<ol>
-<li> All donations to the society are final, and non-returnable. Any equipment loaned to the society must have the terms of the loan (e.g. time period and/or conditions of fair use) laid out clearly before the loan is accepted.</li>
-<li>The society shall not feel obligated to reimburse a donator in any way. Donations should be given freely for the benefit of the society and its members, not for personal gain.</li>
-<li>Only equipment that has a direct and immediate use, or a clearly defined planned near-future use, shall be accepted. We simply do not have the storage capacity to collect items that 'may be useful someday'.</li>
-<li>A clear log shall be kept of who, what and when equipment was donated, and kept in a prominent place so as to honour our benefactors.</li>
-<li> The Society can not be held responsible for the safe keeping of any items loaned or otherwise to it. Whilst every effort will be maintained to protect it, any subsequent damage or theft is entirely at your own risk.</li>
-<li> The Society retains the right to return or dispose of any item that threatens, or is believed to threaten the safety rules laid down by the Student Union and the University.</li>
-<li> The Society may use, or dispose of donated equipment (non-loan items) in any manner that benefits the society, this includes potentially selling items in order to raise funds to purchase more directly useful items, or donating or swapping equipment with others for good will and favour towards the society.</li>
-</ol>
-<h2>Donated Equipment List</h2>
-<p>  This list is incomplete</p>
-<table border="0" class="border wide">
-<tbody>
-<tr>
-<th>Who</th><th>Date</th><th>Type</th><th>Items</th>
-</tr>
-<tr>
-<td>Arthur</td>
-<td>Sept 99</td>
-<td>Loan</td>
-<td>Deskjet 540 colour printer</td>
-</tr>
-<tr>
-<td>Zaphod &amp; Spook</td>
-<td>2000</td>
-<td>Loan</td>
-<td>Sun Workstations</td>
-</tr>
-<tr>
-<td>Anarchy</td>
-<td>2000</td>
-<td>Loan</td>
-<td>Motherboard, CPU, and RAM for Platinum</td>
-</tr>
-<tr>
-<td>Milamber</td>
-<td>2001</td>
-<td>Loan</td>
-<td>Brother Mono Laser Printer.</td>
-</tr>
-<tr>
-<td>Weazel</td>
-<td>Sep 2002</td>
-<td>Loan</td>
-<td>120Gb IDE Hard disk for Silver</td>
-</tr>
-<tr>
-<td>Rohan</td>
-<td>Jan 2003</td>
-<td>Donated</td>
-<td>PII 350MHz machine to be used as Cobalt<br />      Dual CPU machine<br />      Empty 1U Rack Case </td>
-</tr>
-<tr>
-<td>Anarchy</td>
-<td>Feb 2003</td>
-<td>Donated</td>
-<td>17" Dell Monitor for Cobalt</td>
-</tr>
-<tr>
-<td>Anarchy &amp; Dick</td>
-<td>Feb 2003</td>
-<td>Donated</td>
-<td>Profits from 2002 BT lecture, presented as components to build 2 new workstations</td>
-</tr>
-<tr>
-<td>Anarchy</td>
-<td>Dec 2003</td>
-<td>Loan</td>
-<td>Pentium to replace the router, a Cyrix machine for workstation</td>
-</tr>
-<tr>
-<td>jk</td>
-<td>June 2005</td>
-<td>Donated</td>
-<td>PIII 1GHz + Board + Memory, used to create thorium</td>
-</tr>
-<tr>
-<td>aeternus</td>
-<td>Nov 2005</td>
-<td>Donated</td>
-<td>19" monitor. Used to replace platinum's old small one</td>
-</tr>
-<tr>
-<td>Rohan</td>
-<td>Nov 2005</td>
-<td>Donated</td>
-<td>Dual PIII 1GHz machine with SCSI disk<br />      2 other boxes (expand on this..)</td>
-</tr>
-<tr>
-<td>EMC via Rohan</td>
-<td>Nov 2005</td>
-<td>Donated</td>
-<td>PIII 800MHz 1U box with 4x80GB disks</td>
-</tr>
-<tr>
-<td>gimbo</td>
-<td>Feb 2006</td>
-<td>Donated</td>
-<td>17" monitor. Used to replace zinc's old one.</td>
-</tr>
-<tr>
-<td>mattaw</td>
-<td>Sep 2006</td>
-<td>Donated</td>
-<td>Athlon PC</td>
-</tr>
-<tr>
-<td>Rohan<br /></td>
-<td>Summer 2006<br /></td>
-<td>Donated<br /></td>
-<td>Another Dual PIII 1GHz machine with SCSI disk</td>
-</tr>
-<tr>
-<td>Rohan<br /></td>
-<td>August 2011<br /></td>
-<td>Loan<br /></td>
-<td>
-<p>UPS (Smart-UPS 1400) and Switch (3Com 3870)</p>
-</td>
-</tr>
-<tr>
-<td>Problaze<br /></td>
-<td>September 2012<br /></td>
-<td>Donated<br /></td>
-<td>
-<p>Dell Poweredge 1950</p>
-</td>
-</tr>
-</tbody>
+<h2>Donations Policy</h2>
+<ol>
+<li> All donations to the society are final, and non-returnable. Any equipment loaned to the society must have the terms of the loan (e.g. time period and/or conditions of fair use) laid out clearly before the loan is accepted.</li>
+<li>The society shall not feel obligated to reimburse a donator in any way. Donations should be given freely for the benefit of the society and its members, not for personal gain.</li>
+<li>Only equipment that has a direct and immediate use, or a clearly defined planned near-future use, shall be accepted. We simply do not have the storage capacity to collect items that 'may be useful someday'.</li>
+<li>A clear log shall be kept of who, what and when equipment was donated, and kept in a prominent place so as to honour our benefactors.</li>
+<li> The Society can not be held responsible for the safe keeping of any items loaned or otherwise to it. Whilst every effort will be maintained to protect it, any subsequent damage or theft is entirely at your own risk.</li>
+<li> The Society retains the right to return or dispose of any item that threatens, or is believed to threaten the safety rules laid down by the Student Union and the University.</li>
+<li> The Society may use, or dispose of donated equipment (non-loan items) in any manner that benefits the society, this includes potentially selling items in order to raise funds to purchase more directly useful items, or donating or swapping equipment with others for good will and favour towards the society.</li>
+</ol>
+<h2>Donated Equipment List</h2>
+<p>  This list is incomplete</p>
+<table border="0" class="border wide">
+<tbody>
+<tr>
+<th>Who</th><th>Date</th><th>Type</th><th>Items</th>
+</tr>
+<tr>
+<td>Arthur</td>
+<td>Sept 99</td>
+<td>Loan</td>
+<td>Deskjet 540 colour printer</td>
+</tr>
+<tr>
+<td>Zaphod &amp; Spook</td>
+<td>2000</td>
+<td>Loan</td>
+<td>Sun Workstations</td>
+</tr>
+<tr>
+<td>Anarchy</td>
+<td>2000</td>
+<td>Loan</td>
+<td>Motherboard, CPU, and RAM for Platinum</td>
+</tr>
+<tr>
+<td>Milamber</td>
+<td>2001</td>
+<td>Loan</td>
+<td>Brother Mono Laser Printer.</td>
+</tr>
+<tr>
+<td>Weazel</td>
+<td>Sep 2002</td>
+<td>Loan</td>
+<td>120Gb IDE Hard disk for Silver</td>
+</tr>
+<tr>
+<td>Rohan</td>
+<td>Jan 2003</td>
+<td>Donated</td>
+<td>PII 350MHz machine to be used as Cobalt<br />      Dual CPU machine<br />      Empty 1U Rack Case </td>
+</tr>
+<tr>
+<td>Anarchy</td>
+<td>Feb 2003</td>
+<td>Donated</td>
+<td>17" Dell Monitor for Cobalt</td>
+</tr>
+<tr>
+<td>Anarchy &amp; Dick</td>
+<td>Feb 2003</td>
+<td>Donated</td>
+<td>Profits from 2002 BT lecture, presented as components to build 2 new workstations</td>
+</tr>
+<tr>
+<td>Anarchy</td>
+<td>Dec 2003</td>
+<td>Loan</td>
+<td>Pentium to replace the router, a Cyrix machine for workstation</td>
+</tr>
+<tr>
+<td>jk</td>
+<td>June 2005</td>
+<td>Donated</td>
+<td>PIII 1GHz + Board + Memory, used to create thorium</td>
+</tr>
+<tr>
+<td>aeternus</td>
+<td>Nov 2005</td>
+<td>Donated</td>
+<td>19" monitor. Used to replace platinum's old small one</td>
+</tr>
+<tr>
+<td>Rohan</td>
+<td>Nov 2005</td>
+<td>Donated</td>
+<td>Dual PIII 1GHz machine with SCSI disk<br />      2 other boxes (expand on this..)</td>
+</tr>
+<tr>
+<td>EMC via Rohan</td>
+<td>Nov 2005</td>
+<td>Donated</td>
+<td>PIII 800MHz 1U box with 4x80GB disks</td>
+</tr>
+<tr>
+<td>gimbo</td>
+<td>Feb 2006</td>
+<td>Donated</td>
+<td>17" monitor. Used to replace zinc's old one.</td>
+</tr>
+<tr>
+<td>mattaw</td>
+<td>Sep 2006</td>
+<td>Donated</td>
+<td>Athlon PC</td>
+</tr>
+<tr>
+<td>Rohan<br /></td>
+<td>Summer 2006<br /></td>
+<td>Donated<br /></td>
+<td>Another Dual PIII 1GHz machine with SCSI disk</td>
+</tr>
+<tr>
+<td>Rohan<br /></td>
+<td>August 2011<br /></td>
+<td>Loan<br /></td>
+<td>
+<p>UPS (Smart-UPS 1400) and Switch (3Com 3870)</p>
+</td>
+</tr>
+<tr>
+<td>Problaze<br /></td>
+<td>September 2012<br /></td>
+<td>Donated<br /></td>
+<td>
+<p>Dell Poweredge 1950</p>
+</td>
+</tr>
+<tr>
+<td>imranh<br /></td>
+<td>June 2017<br /></td>
+<td>Donated<br /></td>
+<td>
+<p>PlayStation 2</p>
+</td>
+</tr>
+</tbody>
 </table>
\ No newline at end of file
-- 
GitLab


From 09cb85e1459319d7b8b3e5abbf64be59fc3be210 Mon Sep 17 00:00:00 2001
From: Isabel Jenkins <unreturnable@sucs.org>
Date: Mon, 19 Jun 2017 06:54:25 +0100
Subject: [PATCH 02/30] Updated CSS to try and give a more modern feel

---
 htdocs/css/box.css                     |   2 +-
 htdocs/css/common.css                  |   5 +-
 htdocs/css/sucs.css                    | 149 +++++++++++--------------
 htdocs/images/sucslogo-trans-white.png | Bin 0 -> 23120 bytes
 templates/branding.tpl                 |   2 +-
 templates/foot.tpl                     |   9 +-
 templates/login.tpl                    |   3 +-
 7 files changed, 74 insertions(+), 96 deletions(-)
 create mode 100644 htdocs/images/sucslogo-trans-white.png

diff --git a/htdocs/css/box.css b/htdocs/css/box.css
index 4d2ef24..ceb4fef 100644
--- a/htdocs/css/box.css
+++ b/htdocs/css/box.css
@@ -6,7 +6,7 @@
     margin: 1em 0;
     margin-left: 0.5em;
     margin-right: 0.5em;
-    background: #e76808;
+    background: #ff6600;
     font-size: 85%;
 }
 
diff --git a/htdocs/css/common.css b/htdocs/css/common.css
index e7f8b7c..675649b 100644
--- a/htdocs/css/common.css
+++ b/htdocs/css/common.css
@@ -62,7 +62,8 @@ acronym, abbr {
     float: left;
     padding: 0.2em;
     min-width: 170px;
-    width: 17%;
+    margin-left: 1%;
+    width: 16%;
 }
 
 #title {
@@ -170,7 +171,7 @@ table.wide {
 }
 
 table.border, table.border td, table.border th {
-    border: 1px solid #e76808;
+    border: 1px solid #ff6600;
     border-collapse: collapse;
 }
 
diff --git a/htdocs/css/sucs.css b/htdocs/css/sucs.css
index 7ce8a82..25e3735 100644
--- a/htdocs/css/sucs.css
+++ b/htdocs/css/sucs.css
@@ -3,12 +3,14 @@
    -------------------------------------------------- */
 
 body {
-    background: #fff;
+    padding: 0;
+    margin: 0;
+    background: #f5f5f5;
     min-width: 600px;
 }
 
 hr {
-    border: 1px solid #e76808;
+    border: 1px solid #ff6600;
 }
 
 /* --------------------------------------------------
@@ -16,7 +18,7 @@ hr {
    -------------------------------------------------- */
 
 a:link {
-    color: #d45e08;
+    color: #ff6600;
 }
 
 a:visited {
@@ -31,23 +33,6 @@ a:hover {
 
 }
 
-/* --------------------------------------------------
-    Page corners
-   -------------------------------------------------- */
-#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;
-    border-bottom-right-radius: 15px;
-    -moz-border-radius-bottomleft: 15px;
-    -moz-border-radius-bottomright: 15px;
-}
-
 /* --------------------------------------------------
     Branding
    -------------------------------------------------- */
@@ -58,11 +43,11 @@ a:hover {
 }
 
 #brandingC {
-    background: url('/images/bgfade.png') repeat-y;
+    background: #ff6600;
 }
 
 #title {
-    color: #a52f0f;
+    color: #f5f5f5;
 }
 
 #loginForm {
@@ -78,6 +63,35 @@ a:hover {
     width: 8em;
 }
 
+#loginText a:link {
+    color: #f5f5f5;
+}
+
+#loginText a:visited {
+    color: #f5f5f5;
+}
+
+#loginForm input[type=text] {
+    padding: 5px 15px;
+    box-sizing: border-box;
+    border: 0px;
+}
+
+#loginForm input[type=password] {
+    padding: 5px 15px;
+    box-sizing: border-box;
+    border: 0px;
+}
+
+#loginForm input[type=submit] {
+    padding: 5px 15px;
+    background: #f5f5f5;
+    border: 0 none;
+    cursor: pointer;
+    -webkit-border-radius: 5px;
+    border-radius: 0px
+}
+
 /* --------------------------------------------------
     Breadcrumb
    -------------------------------------------------- */
@@ -85,7 +99,15 @@ a:hover {
 #breadcrumb {
     font-weight: bold;
     font-size: 80%;
-    color: #ffc62b;
+    color: #f5f5f5;
+}
+
+#breadcrumb a:link {
+    color: #f5f5f5;
+}
+
+#breadcrumb a:visited {
+    color: #f5f5f5;
 }
 
 #breadcrumb ul {
@@ -107,12 +129,9 @@ a:hover {
    -------------------------------------------------- */
 
 #wrapper {
-    background: #fff0cd;
-    padding: 0;
-    clear: both;
-    border: 2px solid #e76808;
-    border-top: 0;
-    border-bottom: 0;
+    background: #f5f5f5;
+    min-height: 100%;
+    margin-top: 10px;
 }
 
 #navigation {
@@ -160,13 +179,11 @@ a:hover {
     line-height: 1.5em;
     font-size: 95%;
     color: #ffc62b;
-    background: #e76808;
-    border-top-right-radius: 7px;
-    border-bottom-right-radius: 7px;
-    -moz-border-radius-topright: 7px;
-    -moz-border-radius-bottomright: 7px;
+    background: #ff6600;
     padding-left: 1em;
     margin-bottom: 2px;
+    padding-top: 5px;
+    padding-bottom: 5px;
 }
 
 #navigationC ul li a:hover {
@@ -185,10 +202,6 @@ a:hover {
     font-weight: normal;
     padding-left: 2em;
     background: #ffa405;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    -moz-border-radius-topright: 0;
-    -moz-border-radius-bottomright: 0;
     color: #d45e08;
 }
 
@@ -200,24 +213,14 @@ a:hover {
     color: #fff0cd;
 }
 
-#navigationC ul ul li.lastsub a {
-    border-bottom-right-radius: 7px;
-    -moz-border-radius-bottomright: 7px;
-}
-
 #navigationC ul li.lastsub a {
     display: block;
-    border-bottom-right-radius: 7px;
-    -moz-border-radius-bottomright: 7px;
 }
 
 /* --------------------------------------------------
     Boxes
    -------------------------------------------------- */
 div.cbb {
-    border-radius: 12px;
-    -moz-border-radius: 12px;
-    -webkit-border-radius: 12px;
     padding: 1em;
     box-shadow: 3px 3px 5px #777;
     -moz-box-shadow: 3px 3px 5px #777;
@@ -261,16 +264,14 @@ ul#valid {
    -------------------------------------------------- */
 
 #footer {
-    margin: 0;
-    margin-bottom: 0.5em;
-    background: url('/images/orangefade-bottom.png') top repeat-x #ffc62b;
+    background: #ff6600;
+    margin-bottom: -20px;
 }
 
 #footer p {
-    margin: 0;
     text-align: center;
-    font-size: 80%;
-    padding: 0.5em;
+    padding-top: 5px;
+    padding-bottom: 5px;
 }
 
 /* --------------------------------------------------
@@ -279,13 +280,11 @@ ul#valid {
 
 .box {
     background: #ffffff;
-    border-radius: 7px;
-    -moz-border-radius: 7px;
 }
 
 .box div.boxcontent {
-    border: 2px solid #e76808;
-    border-top: 1px solid #e76808;
+    border: 2px solid #ff6600;
+    border-top: 1px solid #ff6600;
     border-bottom: 1px solid #ffffff;
 }
 
@@ -294,33 +293,21 @@ ul#valid {
 }
 
 .box .boxhead {
-    background: #e76808;
-    border-top-left-radius: 7px;
-    border-top-right-radius: 7px;
-    -moz-border-radius-topleft: 7px;
-    -moz-border-radius-topright: 7px;
+    background: #ff6600;
 }
 
 .box .hollowhead {
     background: #ffffff;
-    border-top: 2px solid #e76808;
-    border-left: 2px solid #e76808;
-    border-right: 2px solid #e76808;
-    border-top-left-radius: 7px;
-    border-top-right-radius: 7px;
-    -moz-border-radius-topleft: 7px;
-    -moz-border-radius-topright: 7px;
+    border-top: 2px solid #ff6600;
+    border-left: 2px solid #ff6600;
+    border-right: 2px solid #ff6600;
     height: 5px;
     margin: 0;
     padding: 0;
 }
 
 .box .boxfoot {
-    background: #e76808;
-    border-bottom-left-radius: 7px;
-    border-bottom-right-radius: 7px;
-    -moz-border-radius-bottomleft: 7px;
-    -moz-border-radius-bottomright: 7px;
+    background: #ff6600;
 }
 
 .box .hollowfoot {
@@ -328,13 +315,9 @@ ul#valid {
     height: 5px;
     margin: 0;
     padding: 0;
-    border-bottom: 2px solid #e76808;
-    border-left: 2px solid #e76808;
-    border-right: 2px solid #e76808;
-    border-bottom-left-radius: 7px;
-    border-bottom-right-radius: 7px;
-    -moz-border-radius-bottomleft: 7px;
-    -moz-border-radius-bottomright: 7px;
+    border-bottom: 2px solid #ff6600;
+    border-left: 2px solid #ff6600;
+    border-right: 2px solid #ff6600;
 }
 
 /* --------------------------------------------------
@@ -421,7 +404,7 @@ ul#valid {
    -------------------------------------------------- */
 
 table.border th {
-    background: #e76808;
+    background: #ff6600;
     color: #ffc62b;
 }
 
diff --git a/htdocs/images/sucslogo-trans-white.png b/htdocs/images/sucslogo-trans-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a49c8302319dadf67a76ed1169d835767ddaa09
GIT binary patch
literal 23120
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

literal 0
HcmV?d00001

diff --git a/templates/branding.tpl b/templates/branding.tpl
index c2aac96..b235b01 100644
--- a/templates/branding.tpl
+++ b/templates/branding.tpl
@@ -3,7 +3,7 @@
         <div class="cornerTopLeft">
             <div class="cornerTopRight">
                 <div id="logo">
-                    <a href="{$baseurl}/"><img src="{$baseurl}/images/sucslogo-halo.png" width="170" height="76"
+                    <a href="{$baseurl}/"><img src="{$baseurl}/images/sucslogo-trans-white.png" height="76"
                                                alt="SUCS"/></a>
                 </div>
 
diff --git a/templates/foot.tpl b/templates/foot.tpl
index 9c40c47..09f8a9a 100644
--- a/templates/foot.tpl
+++ b/templates/foot.tpl
@@ -17,13 +17,8 @@
 </div>
 
 <div id="footer">
-    <div class="cornerBottomLeft">
-        <div class="cornerBottomRight">
-            <p>Site designed and maintained by SUCS. All opinions expressed are those of the relevant individual and not
-                of the society.</p>
-            {if isset($totaltime)}<p>Script executed in {$totaltime} seconds</p>{/if}
-        </div>
-    </div>
+    <p>Site designed and maintained by SUCS. All opinions expressed are those of the relevant individual and not of the society.</p>
+    {if isset($totaltime)}<p>Script executed in {$totaltime} seconds</p>{/if}
 </div>
 
 {if $action=="edit"}
diff --git a/templates/login.tpl b/templates/login.tpl
index d26970a..58771a8 100644
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -1,6 +1,6 @@
 <div id="loginForm">
     <form method="post" action="{$ssl_url|escape:'htmlall'}{getparams gets=$gets}">
-        <div>
+        <div id="loginText">
             {if $session->loggedin}
                 Hello
                 <a href="{$baseurl}/Community/Members/{$session->username}">{$session->username}</a>
@@ -17,7 +17,6 @@
                     <br/>
                     Print balance: {$session->printbalance} |
                     <a href="{$baseurl}/Options">Membership Options</a>
-                    <br/>
                 {/if}
                 <input type="submit" class="button" name="Logout" id="Logout" value="Logout"/>
             {else}
-- 
GitLab


From 5711b51700ba8515e7de16852410cfafdc8c6d41 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:35:30 +0100
Subject: [PATCH 03/30] Switch to using debian jessie docker image

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df19a98..ae16b4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 # specify what docker image
 # go with the default image for now and mangle it
-#image: ruby:2.1
+image: debian:jessie
 
 stages:
   - test
-- 
GitLab


From 4f6760ff922978f4306261e5b799df329a90098f Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:37:47 +0100
Subject: [PATCH 04/30] That didn't work so lets go back to using the default
 ruby image and test php against php7

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae16b4e..e58fac6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 # specify what docker image
 # go with the default image for now and mangle it
-image: debian:jessie
+#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
-- 
GitLab


From 9cf975b215947426283eef0df4d2bd1b858584be Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:43:38 +0100
Subject: [PATCH 05/30] npm is part of nodejs

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e58fac6..7b8777d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ js-syntax-check:
   script:
    - apt-get clean
    - apt-get update
-   - apt-get install -y npm
+   - apt-get install -y nodejs
    - ln -s /usr/bin/nodejs /usr/bin/node
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
-- 
GitLab


From aa48cb72d97de458503d5afe098234a8b70a4476 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:46:42 +0100
Subject: [PATCH 06/30] install nodejs from the main site, debian stable
 packages are screweed up

---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b8777d..1436ce9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,8 +25,9 @@ js-syntax-check:
   script:
    - apt-get clean
    - apt-get update
-   - apt-get install -y nodejs
-   - ln -s /usr/bin/nodejs /usr/bin/node
+#   - apt-get install -y nodejs
+#   - ln -s /usr/bin/nodejs /usr/bin/node
+   - curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
 
-- 
GitLab


From 84780e5d5b10def9d42044f86563878f654b2d71 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:48:51 +0100
Subject: [PATCH 07/30] need curl, doh!

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1436ce9..e92303c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,8 @@ js-syntax-check:
    - apt-get update
 #   - apt-get install -y nodejs
 #   - ln -s /usr/bin/nodejs /usr/bin/node
-   - curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
+   - apt-get install curl
+   - curl -sL https://deb.nodesource.com/setup_8.x | bash -
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
 
-- 
GitLab


From d8584f0556897ebf19f942840d969a95c8dc8400 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:50:36 +0100
Subject: [PATCH 08/30] forgot a -y

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e92303c..d79bcbd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ js-syntax-check:
    - apt-get update
 #   - apt-get install -y nodejs
 #   - ln -s /usr/bin/nodejs /usr/bin/node
-   - apt-get install curl
+   - apt-get install -y curl
    - curl -sL https://deb.nodesource.com/setup_8.x | bash -
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
-- 
GitLab


From 850dc2977269e5ea30b607fbfe73f9b249f1e6c0 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:53:31 +0100
Subject: [PATCH 09/30] nodejs install that is supposed to install deps doesn't
 actually do so, install gnupg manually

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d79bcbd..7d0a717 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ js-syntax-check:
    - apt-get update
 #   - apt-get install -y nodejs
 #   - ln -s /usr/bin/nodejs /usr/bin/node
-   - apt-get install -y curl
+   - apt-get install -y curl gnupg
    - curl -sL https://deb.nodesource.com/setup_8.x | bash -
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
-- 
GitLab


From f522dda59a653f4df20c420d7849a76e3611d4af Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:59:07 +0100
Subject: [PATCH 10/30] the script to install nodejs DOESN'T INSTALL NODEJS!

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d0a717..0dbc258 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,7 @@ js-syntax-check:
 #   - ln -s /usr/bin/nodejs /usr/bin/node
    - apt-get install -y curl gnupg
    - curl -sL https://deb.nodesource.com/setup_8.x | bash -
+   - apt-get install -y nodejs
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
 
-- 
GitLab


From c0a4eedbc98d134d570e3aa69811a25719814736 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:35:30 +0100
Subject: [PATCH 11/30] Switch to using debian jessie docker image

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df19a98..ae16b4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 # specify what docker image
 # go with the default image for now and mangle it
-#image: ruby:2.1
+image: debian:jessie
 
 stages:
   - test
-- 
GitLab


From 2fb3504b9eb1eab9e1142d792534ad2080e2b12d Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:37:47 +0100
Subject: [PATCH 12/30] That didn't work so lets go back to using the default
 ruby image and test php against php7

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae16b4e..e58fac6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 # specify what docker image
 # go with the default image for now and mangle it
-image: debian:jessie
+#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
-- 
GitLab


From e21e849b5458aa0628da80bae161de0a967a3e73 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:43:38 +0100
Subject: [PATCH 13/30] npm is part of nodejs

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e58fac6..7b8777d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ js-syntax-check:
   script:
    - apt-get clean
    - apt-get update
-   - apt-get install -y npm
+   - apt-get install -y nodejs
    - ln -s /usr/bin/nodejs /usr/bin/node
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
-- 
GitLab


From 6ae8257cef6654bcfd91fa41b545fdfee1097479 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:46:42 +0100
Subject: [PATCH 14/30] install nodejs from the main site, debian stable
 packages are screweed up

---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b8777d..1436ce9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,8 +25,9 @@ js-syntax-check:
   script:
    - apt-get clean
    - apt-get update
-   - apt-get install -y nodejs
-   - ln -s /usr/bin/nodejs /usr/bin/node
+#   - apt-get install -y nodejs
+#   - ln -s /usr/bin/nodejs /usr/bin/node
+   - curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
 
-- 
GitLab


From b3af94da3ca5566c14fc639015455eea1c157de1 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:48:51 +0100
Subject: [PATCH 15/30] need curl, doh!

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1436ce9..e92303c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,8 @@ js-syntax-check:
    - apt-get update
 #   - apt-get install -y nodejs
 #   - ln -s /usr/bin/nodejs /usr/bin/node
-   - curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
+   - apt-get install curl
+   - curl -sL https://deb.nodesource.com/setup_8.x | bash -
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
 
-- 
GitLab


From 027503716e0ffa52029ac1dd3074f7516fd8e8f2 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:50:36 +0100
Subject: [PATCH 16/30] forgot a -y

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e92303c..d79bcbd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ js-syntax-check:
    - apt-get update
 #   - apt-get install -y nodejs
 #   - ln -s /usr/bin/nodejs /usr/bin/node
-   - apt-get install curl
+   - apt-get install -y curl
    - curl -sL https://deb.nodesource.com/setup_8.x | bash -
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
-- 
GitLab


From c749c42b22c7f3bc3ba2182b590416c3b604bd32 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:53:31 +0100
Subject: [PATCH 17/30] nodejs install that is supposed to install deps doesn't
 actually do so, install gnupg manually

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d79bcbd..7d0a717 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ js-syntax-check:
    - apt-get update
 #   - apt-get install -y nodejs
 #   - ln -s /usr/bin/nodejs /usr/bin/node
-   - apt-get install -y curl
+   - apt-get install -y curl gnupg
    - curl -sL https://deb.nodesource.com/setup_8.x | bash -
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
-- 
GitLab


From 058a41c28ac81594325ff0a155fa6c51b359d0b0 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Fri, 30 Jun 2017 12:59:07 +0100
Subject: [PATCH 18/30] the script to install nodejs DOESN'T INSTALL NODEJS!

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d0a717..0dbc258 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,7 @@ js-syntax-check:
 #   - ln -s /usr/bin/nodejs /usr/bin/node
    - apt-get install -y curl gnupg
    - curl -sL https://deb.nodesource.com/setup_8.x | bash -
+   - apt-get install -y nodejs
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
 
-- 
GitLab


From 1ed84067a0d49facee3abb3a27fe8e7692f0e04d Mon Sep 17 00:00:00 2001
From: Isabel Jenkins <unreturnable@sucs.org>
Date: Sun, 2 Jul 2017 22:16:31 +0100
Subject: [PATCH 19/30] who turned out the lights

---
 htdocs/css/box.css  |  2 +-
 htdocs/css/sucs.css | 50 ++++++++++++++++++++++-----------------------
 templates/head.tpl  |  1 +
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/htdocs/css/box.css b/htdocs/css/box.css
index ceb4fef..bfbdf75 100644
--- a/htdocs/css/box.css
+++ b/htdocs/css/box.css
@@ -6,7 +6,7 @@
     margin: 1em 0;
     margin-left: 0.5em;
     margin-right: 0.5em;
-    background: #ff6600;
+    background: #e65c00;
     font-size: 85%;
 }
 
diff --git a/htdocs/css/sucs.css b/htdocs/css/sucs.css
index 25e3735..de09d8b 100644
--- a/htdocs/css/sucs.css
+++ b/htdocs/css/sucs.css
@@ -5,12 +5,12 @@
 body {
     padding: 0;
     margin: 0;
-    background: #f5f5f5;
+    background: #f2f2f2;
     min-width: 600px;
 }
 
 hr {
-    border: 1px solid #ff6600;
+    border: 1px solid #e65c00;
 }
 
 /* --------------------------------------------------
@@ -18,7 +18,7 @@ hr {
    -------------------------------------------------- */
 
 a:link {
-    color: #ff6600;
+    color: #e65c00;
 }
 
 a:visited {
@@ -43,11 +43,11 @@ a:hover {
 }
 
 #brandingC {
-    background: #ff6600;
+    background: #e65c00;
 }
 
 #title {
-    color: #f5f5f5;
+    color: #f2f2f2;
 }
 
 #loginForm {
@@ -64,11 +64,11 @@ a:hover {
 }
 
 #loginText a:link {
-    color: #f5f5f5;
+    color: #f2f2f2;
 }
 
 #loginText a:visited {
-    color: #f5f5f5;
+    color: #f2f2f2;
 }
 
 #loginForm input[type=text] {
@@ -85,7 +85,7 @@ a:hover {
 
 #loginForm input[type=submit] {
     padding: 5px 15px;
-    background: #f5f5f5;
+    background: #f2f2f2;
     border: 0 none;
     cursor: pointer;
     -webkit-border-radius: 5px;
@@ -99,15 +99,15 @@ a:hover {
 #breadcrumb {
     font-weight: bold;
     font-size: 80%;
-    color: #f5f5f5;
+    color: #f2f2f2;
 }
 
 #breadcrumb a:link {
-    color: #f5f5f5;
+    color: #f2f2f2;
 }
 
 #breadcrumb a:visited {
-    color: #f5f5f5;
+    color: #f2f2f2;
 }
 
 #breadcrumb ul {
@@ -129,7 +129,7 @@ a:hover {
    -------------------------------------------------- */
 
 #wrapper {
-    background: #f5f5f5;
+    background: #f2f2f2;
     min-height: 100%;
     margin-top: 10px;
 }
@@ -179,7 +179,7 @@ a:hover {
     line-height: 1.5em;
     font-size: 95%;
     color: #ffc62b;
-    background: #ff6600;
+    background: #e65c00;
     padding-left: 1em;
     margin-bottom: 2px;
     padding-top: 5px;
@@ -264,7 +264,7 @@ ul#valid {
    -------------------------------------------------- */
 
 #footer {
-    background: #ff6600;
+    background: #e65c00;
     margin-bottom: -20px;
 }
 
@@ -283,8 +283,8 @@ ul#valid {
 }
 
 .box div.boxcontent {
-    border: 2px solid #ff6600;
-    border-top: 1px solid #ff6600;
+    border: 2px solid #e65c00;
+    border-top: 1px solid #e65c00;
     border-bottom: 1px solid #ffffff;
 }
 
@@ -293,21 +293,21 @@ ul#valid {
 }
 
 .box .boxhead {
-    background: #ff6600;
+    background: #e65c00;
 }
 
 .box .hollowhead {
     background: #ffffff;
-    border-top: 2px solid #ff6600;
-    border-left: 2px solid #ff6600;
-    border-right: 2px solid #ff6600;
+    border-top: 2px solid #e65c00;
+    border-left: 2px solid #e65c00;
+    border-right: 2px solid #e65c00;
     height: 5px;
     margin: 0;
     padding: 0;
 }
 
 .box .boxfoot {
-    background: #ff6600;
+    background: #e65c00;
 }
 
 .box .hollowfoot {
@@ -315,9 +315,9 @@ ul#valid {
     height: 5px;
     margin: 0;
     padding: 0;
-    border-bottom: 2px solid #ff6600;
-    border-left: 2px solid #ff6600;
-    border-right: 2px solid #ff6600;
+    border-bottom: 2px solid #e65c00;
+    border-left: 2px solid #e65c00;
+    border-right: 2px solid #e65c00;
 }
 
 /* --------------------------------------------------
@@ -404,7 +404,7 @@ ul#valid {
    -------------------------------------------------- */
 
 table.border th {
-    background: #ff6600;
+    background: #e65c00;
     color: #ffc62b;
 }
 
diff --git a/templates/head.tpl b/templates/head.tpl
index d7168c1..910439c 100644
--- a/templates/head.tpl
+++ b/templates/head.tpl
@@ -3,6 +3,7 @@
 
 <head>
     <meta http-equiv="Content-type" content="text/html;charset=UTF-8"/>
+    <meta name="theme-color" content="#e65c00">
     <title>{$title} - SUCS</title>
     <link rel="SHORTCUT ICON" href="{$baseurl}/favicon.ico"/>
     <link rel="apple-touch-icon" href="{$baseurl}/images/apple-touch-icon.png"/>
-- 
GitLab


From 521ddbcdd5ccb6509727e06d44a402c9de7ab159 Mon Sep 17 00:00:00 2001
From: Isabel Jenkins <unreturnable@sucs.org>
Date: Sun, 20 Aug 2017 21:10:57 +0100
Subject: [PATCH 20/30] Site now does some basic scaling for mobile phone. As
 well as fixed footer

---
 htdocs/css/sucs.css       | 102 +++++++++++++++++++++++++++++++-------
 static/fragments/Join.txt |   2 +-
 templates/foot.tpl        |   1 +
 templates/head.tpl        |  14 +++---
 4 files changed, 93 insertions(+), 26 deletions(-)

diff --git a/htdocs/css/sucs.css b/htdocs/css/sucs.css
index de09d8b..7b27e55 100644
--- a/htdocs/css/sucs.css
+++ b/htdocs/css/sucs.css
@@ -7,6 +7,7 @@ body {
     margin: 0;
     background: #f2f2f2;
     min-width: 600px;
+    height: calc(100vh - 30px);
 }
 
 hr {
@@ -38,7 +39,6 @@ a:hover {
    -------------------------------------------------- */
 
 #branding {
-    background: url('/images/orangefade.png') repeat-x #ffc62b bottom;
     clear: both;
 }
 
@@ -92,6 +92,13 @@ a:hover {
     border-radius: 0px
 }
 
+.join-header {
+  font-size: 30pt;
+  margin-left: 10px;
+  text-decoration: none;
+  color: #ffc62b !important;
+}
+
 /* --------------------------------------------------
     Breadcrumb
    -------------------------------------------------- */
@@ -129,36 +136,92 @@ a:hover {
    -------------------------------------------------- */
 
 #wrapper {
-    background: #f2f2f2;
-    min-height: 100%;
-    margin-top: 10px;
+  background: #f2f2f2;
+  min-height: 100%;
+  margin-top: 10px;
 }
 
 #navigation {
-    float: left;
-    width: 17%;
-    padding-top: 0.5em;
-    /*	overflow: auto; */
+  float: left;
+  width: 300px;
+  padding-top: 0.5em;
 }
 
 #content {
-    float: right;
-    width: 82%;
+  float: right;
+  width: calc(100% - 300px);
 }
 
 #primary {
-    float: left;
-    width: 66%;
-    padding: 0;
+  float: left;
+  width: calc(100% - 400px);
 }
 
 #primaryC {
-    padding-right: 0.5em;
+  padding-left: 20px;
+  padding-right: 20px;
 }
 
 #secondary {
-    float: right;
-    width: 33%;
+  float: right;
+  width: 400px;
+}
+
+@media only screen and (max-width: 1080px) {
+  #wrapper {
+    margin-top: -5px;
+    display: flex;
+    flex-direction: column;
+  }
+
+  #navigation {
+    order: 1;
+    width: 100%;
+    float: top;
+  }
+
+  #content {
+    margin-top: 10px;
+    order: 2;
+    float: bottom;
+    width: 100%;
+  }
+
+  #primary {
+    float: none;
+    width: 100%;
+  }
+
+  #secondary {
+    float: none;
+    width: 100%;
+  }
+
+  #footer {
+    height: auto !important;
+  }
+
+  #branding {
+    height: auto !important;
+  }
+
+  #logo {
+    padding-right: 0;
+  }
+
+  #title h1 {
+    margin-top: 20px;
+    font-size: 12pt;
+    padding-left: 0;
+  }
+
+  #breadcrumb li {
+    display: block;
+  }
+
+  #loginForm {
+    padding-top: 1em;
+  }
 }
 
 /* --------------------------------------------------
@@ -263,15 +326,18 @@ ul#valid {
     Footer
    -------------------------------------------------- */
 
+#footer-fix {
+    min-height: calc(100% - 16px);
+}
+
 #footer {
     background: #e65c00;
-    margin-bottom: -20px;
+    height: 30px;
 }
 
 #footer p {
     text-align: center;
     padding-top: 5px;
-    padding-bottom: 5px;
 }
 
 /* --------------------------------------------------
diff --git a/static/fragments/Join.txt b/static/fragments/Join.txt
index 3759360..57f60db 100644
--- a/static/fragments/Join.txt
+++ b/static/fragments/Join.txt
@@ -1,6 +1,6 @@
 <!-- Joining box --> 
 <div class="cbb"> 
-<h3>Join SUCS!</h3> 
+<a class="join-header" href="https://www.swansea-union.co.uk/activities/society/sucs/" target="_blank">Join SUCS!</a>
 <p>As well as being an excellent way to meet people with similar interests (we have regular social events and we&#39;re all really nice), you also get all this great stuff: </p> 
 <ul> <li>Use of our dedicated <a href="../Games/" title="Gameserver">games server</a></li> 
 <li><a href="../Knowledge/Help/SUCS%20Services/Using%20your%20web%20space">Web hosting</a> with scripting and database support</li>
diff --git a/templates/foot.tpl b/templates/foot.tpl
index 09f8a9a..7644691 100644
--- a/templates/foot.tpl
+++ b/templates/foot.tpl
@@ -15,6 +15,7 @@
 
 <div class="clear"></div>
 </div>
+</div>
 
 <div id="footer">
     <p>Site designed and maintained by SUCS. All opinions expressed are those of the relevant individual and not of the society.</p>
diff --git a/templates/head.tpl b/templates/head.tpl
index 910439c..c2ede33 100644
--- a/templates/head.tpl
+++ b/templates/head.tpl
@@ -31,7 +31,8 @@
           content="Swansea University Computer Society - providing student computing facilities and personal web pages."/>
     {if $refresh}
         <meta http-equiv="REFRESH" content="{$refresh}" />{/if}
-
+    
+    <meta name="viewport" content="width=device-width">
 
     {if isset($extra_scripts)}
         {foreach from=$extra_scripts item=script}
@@ -54,10 +55,9 @@
 </head>
 <body>
 
-{include file="branding.tpl"}
-
-
-<div id="wrapper">
+  <div id="footer-fix">
+    {include file="branding.tpl"}
 
-    <div id="content">
-        {include file="usermessages.tpl"}
+    <div id="wrapper">
+	<div id="content">
+	  {include file="usermessages.tpl"}
-- 
GitLab


From 83f35798bbde0c1d14a1bf3ffd966e18917ba558 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Tue, 19 Sep 2017 16:49:23 +0100
Subject: [PATCH 21/30] Update sucs iss ldap info for signup system

---
 lib/validationData.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/validationData.php b/lib/validationData.php
index 1eec498..d496789 100644
--- a/lib/validationData.php
+++ b/lib/validationData.php
@@ -2,14 +2,12 @@
 // lookup real names from sid's using campus ldap
 function lookupSID($sid)
 {
-    $ds = ldap_connect("ccs-suld1.swan.ac.uk");
-    $ldappw = file_get_contents("/etc/unildap.secret");
-    $ldappw = trim($ldappw);
-    ldap_bind($ds, "cn=SUCS-BIND,ou=ServiceAccount,o=SWANUNI", $ldappw);
-    $sr = ldap_search($ds, "ou=students,ou=Swansea,o=swanuni", "uid=" . $sid);
+    $ds = ldap_connect("192.168.10.16");
+    ldap_bind($ds);
+    $sr = ldap_search($ds, "ou=Active,ou=Resources,o=Swansea", "uid=" . $sid);
     $info = ldap_get_entries($ds, $sr);
     ldap_unbind($ds);
-    return ucwords(strtolower($info[0]['givenname'][0] . " " . $info[0]['sn'][0]));
+    return ucwords(strtolower($info[0]['givenName'][0] . " " . $info[0]['sn'][0]));
 }
 
 // lookup addresses from postcodes using the university's website
-- 
GitLab


From 1a4237a8d48046bcd4cfc452fcbfc886db8bfef7 Mon Sep 17 00:00:00 2001
From: Isabel Jenkins <unreturnable@sucs.org>
Date: Sun, 24 Sep 2017 12:57:09 +0100
Subject: [PATCH 22/30] Update Live chat link

---
 components/front.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/front.php b/components/front.php
index 30cc90e..116aa32 100644
--- a/components/front.php
+++ b/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');
-- 
GitLab


From 52510509648083629f5de76d44d017b0a38695b3 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Tue, 26 Sep 2017 11:49:54 +0100
Subject: [PATCH 23/30] shitty iss dropped uid for EDUPERSONTARGETEDID

---
 lib/validationData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/validationData.php b/lib/validationData.php
index d496789..14c475b 100644
--- a/lib/validationData.php
+++ b/lib/validationData.php
@@ -4,7 +4,7 @@ function lookupSID($sid)
 {
     $ds = ldap_connect("192.168.10.16");
     ldap_bind($ds);
-    $sr = ldap_search($ds, "ou=Active,ou=Resources,o=Swansea", "uid=" . $sid);
+    $sr = ldap_search($ds, "ou=Active,ou=Resources,o=Swansea", "EDUPERSONTARGETEDID=" . $sid);
     $info = ldap_get_entries($ds, $sr);
     ldap_unbind($ds);
     return ucwords(strtolower($info[0]['givenName'][0] . " " . $info[0]['sn'][0]));
-- 
GitLab


From 620c9b63aa61855cee81ac9c9ab55be6e370f69c Mon Sep 17 00:00:00 2001
From: gigosaurus <gigosaurus@sucs.org>
Date: Tue, 26 Sep 2017 21:59:10 +0100
Subject: [PATCH 24/30] Fix signup validation. Emails, names and addresses are
 now much less strict, and more valid postcodes are allowed.

---
 components/signup.php     |   6 +-
 components/signupajax.php |   4 +-
 lib/validation.php        | 128 +++++++++-----------------------------
 3 files changed, 34 insertions(+), 104 deletions(-)

diff --git a/components/signup.php b/components/signup.php
index c850da5..ddfda22 100644
--- a/components/signup.php
+++ b/components/signup.php
@@ -80,18 +80,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;
                     }
diff --git a/components/signupajax.php b/components/signupajax.php
index 3e4bca4..2da8fa2 100644
--- a/components/signupajax.php
+++ b/components/signupajax.php
@@ -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;
diff --git a/lib/validation.php b/lib/validation.php
index 9994eae..69d6fbf 100644
--- a/lib/validation.php
+++ b/lib/validation.php
@@ -7,18 +7,22 @@ require_once("sanitization.php");
 function validEmail($email)
 {
     global $error;
-    //split user and domain
-    list($user, $domain) = explode("@", $email);
-    // check for bad characters, and check for zero length user & domain
-    if (!preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/i", $email) or !$user or !$domain) {
-        $error = 'an invalid email address (syntax)';
+
+    // check for valid syntax
+    if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
+        $error = 'Invalid email address (syntax)';
         return false;
     }
+
     // Syntax OK
 
+    // domain consists of any character after a '@' and cannot contain '@'
+    // therefore any character after the last '@' is part of the domain
+    $domain = substr($email, strrpos($email, '@') + 1);
+
     // Check for an mail server
-    elseif (!getmxrr($domain, $mx) or !gethostbyname($domain)) {
-        $error = "no mail servers listed for '$domain'";
+    if (!getmxrr($domain, $mx) or !gethostbyname($domain)) {
+        $error = "No mail servers listed for '$domain'";
         return false;
     } else {
         // Email address valid from technical point of view
@@ -26,41 +30,6 @@ function validEmail($email)
     }
 }
 
-// test whether a password is considered Strong Enough
-// ideally we'd want to use cracklib or something here, but no RPM for the php bindings :-(
-// dont use this, use weakPassword instead it uses cracklib
-function strongPassword($pass)
-{
-
-    // you call this a password? my cat could bruteforce this.
-    if (strlen($pass) < 6) {
-        return false;
-    }
-
-// start at 0, and increment for certain features
-    $score = 0;
-
-
-// greater than 8 characters
-    if (strlen($pass) > 8) $score++;
-// includes lowercase characters
-    if (preg_match("/[a-z]/", $pass)) $score++;
-// includes uppercase characters
-    if (preg_match("/[A-Z]/", $pass)) $score++;
-// includes digits
-    if (preg_match("/\d/", $pass)) $score++;
-// includes "non-word" characters
-    if (preg_match("/\W/", $pass)) $score++;
-
-// I reckons if it has at least 3 of the above it should be... adequate
-// better if it checked for dictionary words too though
-    if ($score > 3) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
 # Use cracklib to check for weak passwords.
 # returns FALSE if the password is good i.e. not weak
 # otherwise returns a string saying why its weak
@@ -112,7 +81,7 @@ function isAlias($username)
     return $ok;
 }
 
-//check if a user with a sid already exsists
+//check if a user with a sid already exists
 function sidUsed($sid)
 {
     $sucsDB = NewADOConnection('postgres8');
@@ -127,12 +96,12 @@ function sidUsed($sid)
 function validUsername($username)
 {
     global $error;
-    // check if uname is sytactically valid
+    // check if uname is syntactically valid
     $syntax = preg_match("/^[a-z][a-z0-9_]*$/", $username);
     if (!$syntax || (strlen($username) < 2)) {
-        $error = "Usernames must start with a letter, only contain lowercase letter, numbers 0-9 and underscores (_) and be at least 2 characters.";
+        $error = "Usernames must start with a letter, only contain lowercase letters, numbers 0-9 and underscores (_) and be at least 2 characters.";
         return false;
-    } // check if the username already exsists
+    } // check if the username already exists
     elseif (posix_getpwnam($username)) {
         $error = "Username already taken";
         return false;
@@ -171,7 +140,7 @@ function validSID($SID, $override)
     }
 }
 
-function validRealName($realName, $override)
+function validName($realName, $override)
 {
     global $error;
     if ($override) {
@@ -182,56 +151,12 @@ function validRealName($realName, $override)
             return true;
         }
     } else {
-        //check for enough names for real name (we insist on at least 2
-        if (count(explode(" ", $realName)) < 2) {
-            $error = "Too few names given, please give at least two.";
-            return false;
-        } //check for a sane realname, see comment below
-        elseif (!preg_match("/^([A-Z]([.]+ +[A-Z])*([\']+[A-Z])*[a-z]+[ -]*)+$/", $realName)) {
-            $error = "Name incorrectly formatted, email <a href=\"mailto:admin@sucs.org\">admin@sucs.org</a> if this is an error.";
-            return false;
-        } /*
- * This should force sane real names, with capitals for the first letter of each word,
- * Whist alowing for complex names such as Robin M. O'Leary
- * 
- * break down of regexp
- * 
- * (
- * [A-Z]                - start with a single capital
- * ([.]+ +[A-Z])*       - zero or more of, (at least one "." followed by at least one space then another single capital)  //we dont expect people to have initals at the end of there names so this is alright
- * ([\']+[A-Z])*        - zero or more of, (at least one "'"s followed by a single capital letter)
- * [a-z]+               - One or more lower case letters, this forces initals to be followed by a "."
- *[ -]*           - zero or more " "s or "-"s so double barreled names are supported
- * )
- * 
- * In its current state 
- * Robin M. O'Leary is valid
- * Robin M O'Leary is not
- * Robin M. OLeary is Not
- * Robin M. O'LeaRy is valid (though its not meant to be.. bad side effect of not requireing at least one space...)
- * BUT... this alows for McSmith's... which is rather nice :)... and of course delibrate
- * RObin M O'Leary is not
- *
- */
-        else {
-            return true;
-        }
-    }
-}
 
-function validSocName($socname, $override)
-{
-    global $error;
-    if ($override) {
-        if ($socname == "") {
-            $error = "You MUST provide some sort of name";
-            return false;
-        } else {
-            return true;
-        }
-    } else {
-        if (!preg_match('/^[A-Z1-9]/', $socname) || strlen($socname) < 2) {
-            $error = "Must start with a capital letter or a number and be more than 1 character";
+        // names can legally be really weird so just check that it is at least 1 visible character
+        // followed by any number of non-control characters
+        $realName = trim($realName);
+        if (!preg_match("/^[[:graph:]][[:print:]]*$/", $realName)) {
+            $error = "Invalid name";
             return false;
         } else {
             return true;
@@ -243,9 +168,11 @@ function validAddress($address)
 {
     global $error;
     $address = sanitizeAddress($address);
-    $regex = "/^([A-Z0-9]([[:alnum:]]|[ .\/'-])*\n)+[A-Z0-9]([[:alnum:]]|[ .\/'-])*$/";
+
+    // check that they at least entered in something. Address doesn't need to be as strict when the postcode is.
+    $regex = "/^.{5,}+$/s";
     if (!preg_match($regex, $address)) {
-        $error = "Please supply at least two valid lines of address.";
+        $error = "Please supply a valid address.";
         return false;
     } else {
         return true;
@@ -255,7 +182,10 @@ function validAddress($address)
 function validPostcode($postcode)
 {
     $postcode = sanitizePostcode($postcode);
-    if (!preg_match('/^[A-Z]{1,2}[0-9]{1,2}[A-Z]{0,1} [0-9][A-Z]{2}$/', $postcode)) {
+
+    // matches all postcodes following the valid format described in a 2012 government published document
+    $postcodeRegex = "/^([A-Z](([0-9][0-9]?)|([A-Z][0-9][0-9]?)|([A-Z]?[0-9][A-Z])) ?[0-9][ABD-HJLNP-UW-Z]{2})$/";
+    if (!preg_match($postcodeRegex, $postcode)) {
         return false;
     } else {
         return $postcode;
-- 
GitLab


From 777965c6a5b8f1376f205d48cf62a73a93acfd6a Mon Sep 17 00:00:00 2001
From: Kit Manners <gigosaurus@sucs.org>
Date: Wed, 27 Sep 2017 00:07:42 +0100
Subject: [PATCH 25/30] Fix typo in signup completion

---
 templates/signup.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/signup.tpl b/templates/signup.tpl
index f96d25e..2b97a42 100644
--- a/templates/signup.tpl
+++ b/templates/signup.tpl
@@ -136,7 +136,7 @@
     {if !$failed}
         <h1>Welcome to SUCS</h1>
         <p>Signup is complete, please see below for your password, a copy has also been send to {$email}, we request you
-            change this immediatley. See our <a href="{$baseurl}/Getting%20Started">Getting Started</a> page for some
+            change this immediately. See our <a href="{$baseurl}/Getting%20Started">Getting Started</a> page for some
             ways you can start using your new SUCS account!</p>
         <p>
             Username: <strong>{$username}</strong><br/>
-- 
GitLab


From fcfabbae140b7ba17f7f03a575e73c45b7cffe79 Mon Sep 17 00:00:00 2001
From: Kit Manners <gigosaurus@sucs.org>
Date: Wed, 27 Sep 2017 01:13:07 +0100
Subject: [PATCH 26/30] Fix retrieving full name from campus ldap

---
 lib/validationData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/validationData.php b/lib/validationData.php
index 14c475b..06d16cb 100644
--- a/lib/validationData.php
+++ b/lib/validationData.php
@@ -7,7 +7,7 @@ function lookupSID($sid)
     $sr = ldap_search($ds, "ou=Active,ou=Resources,o=Swansea", "EDUPERSONTARGETEDID=" . $sid);
     $info = ldap_get_entries($ds, $sr);
     ldap_unbind($ds);
-    return ucwords(strtolower($info[0]['givenName'][0] . " " . $info[0]['sn'][0]));
+    return ucwords(strtolower($info[0]['givenname'][0] . " " . $info[0]['sn'][0]));
 }
 
 // lookup addresses from postcodes using the university's website
-- 
GitLab


From 86ccc6b7187951a49ec8875e755fa68174c6551f Mon Sep 17 00:00:00 2001
From: Kit Manners <gigosaurus@sucs.org>
Date: Wed, 27 Sep 2017 01:20:53 +0100
Subject: [PATCH 27/30] Add missing space in error message

---
 lib/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/validation.php b/lib/validation.php
index 69d6fbf..b981c9a 100644
--- a/lib/validation.php
+++ b/lib/validation.php
@@ -132,7 +132,7 @@ function validSID($SID, $override)
             $error = "A user with that student ID already exists, email <a href=\"mailto:admin@sucs.org\">admin@sucs.org</a> if this is an error.";
             return false;
         } elseif (lookupSID($SID) == " ") {
-            $error = "Student not found, email<a href=\"mailto:admin@sucs.org\">admin@sucs.org</a> if this is an error.";
+            $error = "Student not found, email <a href=\"mailto:admin@sucs.org\">admin@sucs.org</a> if this is an error.";
             return false;
         } else {
             return true;
-- 
GitLab


From 4063d666a99a4f452b0036d409634fc7ccd826a5 Mon Sep 17 00:00:00 2001
From: gigosaurus <gigosaurus@sucs.org>
Date: Wed, 27 Sep 2017 02:11:31 +0100
Subject: [PATCH 28/30] Remember the student number if they entered it in a
 previous form

---
 components/signup.php   | 4 ++++
 components/susignup.php | 2 ++
 templates/signup.tpl    | 2 +-
 templates/susignup.tpl  | 3 ++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/components/signup.php b/components/signup.php
index ddfda22..27b3c79 100644
--- a/components/signup.php
+++ b/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", $signupsid);
+            }
             $smarty->assign("overridable", $overridable);
             $smarty->assign("usertype", $row[type]);
             // if accepting the form
diff --git a/components/susignup.php b/components/susignup.php
index f33cdb4..0bfde55 100755
--- a/components/susignup.php
+++ b/components/susignup.php
@@ -51,6 +51,7 @@ if (!empty($_REQUEST['sid']) && !empty($_REQUEST['transactionID'])) {
             $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";
@@ -59,6 +60,7 @@ if (!empty($_REQUEST['sid']) && !empty($_REQUEST['transactionID'])) {
             $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.");
diff --git a/templates/signup.tpl b/templates/signup.tpl
index f96d25e..c144585 100644
--- a/templates/signup.tpl
+++ b/templates/signup.tpl
@@ -36,7 +36,7 @@
             <div class="row" id="studentiddiv">
                 <label for="studentid">Student Number</label>
                 <span class="textinput"><input type="text" id="studentid" name="studentid" size="30"
-                                               {if $mode=='re-form'}value='{$fields.studentid}'{/if} /></span>
+                                               {if $mode=='re-form'}value='{$fields.studentid}'{elseif isset($signupsid)}value='{$signupsid}'{/if} /></span>
 
                 <div id="studentidmessage"{if $mode=='re-form'}{if isset($errors.studentid)}
                      style="color:red; float:right; clear:right;">{$errors.studentid}{else} style="color:green;
diff --git a/templates/susignup.tpl b/templates/susignup.tpl
index 322625f..abde068 100644
--- a/templates/susignup.tpl
+++ b/templates/susignup.tpl
@@ -39,6 +39,7 @@
     <form action="{$baseurl}/signup/" method="post">
         <input type=hidden name="signupid" id="id" value="{$id}"/>
         <input type=hidden name="signuppw" id="pass" value="{$pass}"/>
+        <input type=hidden name="signupsid" id="sid" value="{$sid}"/>
         <input type=submit name="submit" value="Proceed"/>
     </form>
 {else}
@@ -49,4 +50,4 @@
     An error occured during signup, please email, with as much information as you can provide,
     <a href='mailto:admin@sucs.org'>admin@sucs.org</a>
     for assistance.
-{/if}
\ No newline at end of file
+{/if}
-- 
GitLab


From 3eb75c79ec5dca889b3baac4a7142796dfa3ac06 Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Wed, 27 Sep 2017 10:44:26 +0100
Subject: [PATCH 29/30] if you're a student then you don't get to choose your
 real name

---
 templates/signup.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/signup.tpl b/templates/signup.tpl
index b8b93db..2e77ae6 100644
--- a/templates/signup.tpl
+++ b/templates/signup.tpl
@@ -55,7 +55,7 @@
         <div class="row" id="realnamediv">
             <label for="realname">{if $usertype!=2}Real Name{else}Society Name{/if}</label>
             <span class="textinput"><input type="text" id="realname" name="realname" size="30"
-                                           {if $mode=='re-form'}value='{$fields.realname}'{/if}/></span>
+                                           {if $mode=='re-form'}value='{$fields.realname}'{/if} {if $usertype==1}readonly{/if}/></span>
 
             <div id="realnamemessage"{if $mode=='re-form'}{if isset($errors.realname)}
                  style="color:red; float:right; clear:right;">{$errors.realname}{else} style="color:green; float:right;
-- 
GitLab


From fbac20963e0d091e0ebf070655fbab492a2df654 Mon Sep 17 00:00:00 2001
From: Kit Manners <gigosaurus@sucs.org>
Date: Wed, 27 Sep 2017 12:30:00 +0100
Subject: [PATCH 30/30] Fix retrieving student number

---
 components/signup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/signup.php b/components/signup.php
index 27b3c79..31633b9 100644
--- a/components/signup.php
+++ b/components/signup.php
@@ -52,7 +52,7 @@ if (isset($_REQUEST['signupid']) && isset($_REQUEST['signuppw'])) {
             $smarty->assign("signuppw", $signuppw);
             // pass on the student id if it exists
             if (isset($_REQUEST['signupsid'])) {
-                $smarty->assign("signupsid", $signupsid);
+                $smarty->assign("signupsid", $_REQUEST['signupsid']);
             }
             $smarty->assign("overridable", $overridable);
             $smarty->assign("usertype", $row[type]);
-- 
GitLab