<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Imran Hussain pushed to branch sucs-site
at <a href="https://projects.sucs.org/sucssite/sucs-site">sucssite / sucs-site</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/23899139e50e4928cf55d84eeff631b41c6d48c8">23899139</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2019-01-24T12:02:12Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Cut a bit too much from motd.php :)</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/83f21ec5225627b5ba5f1d6ed03e2aef444ab8cc">83f21ec5</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2019-02-06T14:25:31Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">[1/?] Allow student IDs > 6 digits</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/adbc05b8a7d7d83d88d7b09d1fa713f49546a92b">adbc05b8</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2019-02-06T14:33:19Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Merge branch 'master' into 'beta'
Allow student IDs > 6 digits to beta
See merge request sucssite/sucs-site!103</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/c274976e15ea4bbde96c8153817b2b0268de4974">c274976e</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2019-02-06T14:36:28Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Merge branch 'beta' into 'sucs-site'
Beta to live
See merge request sucssite/sucs-site!104</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#0766b07fe8982d3c4780edad912df3c4add52b1c">
components/motd.php
</a>
</li>
<li class="file-stats">
<a href="#591f40ef0e0465ed0f687a6fc43966fd37c658f6">
lib/validation.php
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="0766b07fe8982d3c4780edad912df3c4add52b1c">
<a href="https://projects.sucs.org/sucssite/sucs-site/compare/52425b803ba0bfb4335317a891c570237f0bdd8f...c274976e15ea4bbde96c8153817b2b0268de4974#0766b07fe8982d3c4780edad912df3c4add52b1c"><strong>components/motd.php</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="4" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="4" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -4,6 +4,7 @@ $motd_file = "/etc/motd";</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="4" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
4
</td>
<td class="diff-line-num new_line" data-linenumber="4" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
4
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC4" class="line" lang="php"><span class="k" style="font-weight: 600;">function</span> <span class="nf" style="color: #900; font-weight: 600;">decode_entities</span><span class="p">(</span><span class="nv" style="color: teal;">$text</span><span class="p">,</span> <span class="nv" style="color: teal;">$quote_style</span> <span class="o" style="font-weight: 600;">=</span> <span class="nx">ENT_COMPAT</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="5" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
5
</td>
<td class="diff-line-num new_line" data-linenumber="5" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
5
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC5" class="line" lang="php"><span class="p">{</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="6" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
6
</td>
<td class="diff-line-num new_line" data-linenumber="6" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
6
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC6" class="line" lang="php"> <span class="nv" style="color: teal;">$text</span> <span class="o" style="font-weight: 600;">=</span> <span class="nb" style="color: #0086b3;">html_entity_decode</span><span class="p">(</span><span class="nv" style="color: teal;">$text</span><span class="p">,</span> <span class="nv" style="color: teal;">$quote_style</span><span class="p">,</span> <span class="s1" style="color: #d14;">'ISO-8859-1'</span><span class="p">);</span> <span class="c1" style="color: #998; font-style: italic;">// NOTE: UTF-8 does not work!</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="7" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="7" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
7
</td>
<td class="line_content new noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC7" class="line" lang="php"> <span class="nv" style="color: teal;">$text</span> <span class="o" style="font-weight: 600;">=</span> <span class="nb" style="color: #0086b3;">preg_replace</span><span class="p">(</span><span class="s1" style="color: #d14;">'~&ndash\;~i'</span><span class="p">,</span> <span class="s1" style="color: #d14;">'-'</span><span class="p">,</span> <span class="nv" style="color: teal;">$text</span><span class="p">);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="7" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
7
</td>
<td class="diff-line-num new_line" data-linenumber="8" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
8
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC8" class="line" lang="php"> <span class="nv" style="color: teal;">$text</span> <span class="o" style="font-weight: 600;">=</span> <span class="nb" style="color: #0086b3;">preg_replace_callback</span><span class="p">(</span><span class="s1" style="color: #d14;">'~&#x([0-9a-f]+);~i'</span><span class="p">,</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="8" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
8
</td>
<td class="diff-line-num new_line" data-linenumber="9" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
9
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC9" class="line" lang="php"> <span class="k" style="font-weight: 600;">function</span> <span class="p">(</span><span class="nv" style="color: teal;">$matches</span><span class="p">)</span> <span class="p">{</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="9" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
9
</td>
<td class="diff-line-num new_line" data-linenumber="10" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
10
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC10" class="line" lang="php"> <span class="k" style="font-weight: 600;">foreach</span> <span class="p">(</span><span class="nv" style="color: teal;">$matches</span> <span class="k" style="font-weight: 600;">as</span> <span class="nv" style="color: teal;">$match</span><span class="p">)</span> <span class="p">{</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
<li id="591f40ef0e0465ed0f687a6fc43966fd37c658f6">
<a href="https://projects.sucs.org/sucssite/sucs-site/compare/52425b803ba0bfb4335317a891c570237f0bdd8f...c274976e15ea4bbde96c8153817b2b0268de4974#591f40ef0e0465ed0f687a6fc43966fd37c658f6"><strong>lib/validation.php</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="125" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="125" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -125,7 +125,7 @@ function validSID($SID, $override)</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="125" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
125
</td>
<td class="diff-line-num new_line" data-linenumber="125" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
125
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC125" class="line" lang="php"> <span class="k" style="font-weight: 600;">return</span> <span class="kc" style="font-weight: 600;">true</span><span class="p">;</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="126" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
126
</td>
<td class="diff-line-num new_line" data-linenumber="126" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
126
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC126" class="line" lang="php"> <span class="p">}</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="127" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
127
</td>
<td class="diff-line-num new_line" data-linenumber="127" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
127
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC127" class="line" lang="php"> <span class="p">}</span> <span class="k" style="font-weight: 600;">else</span> <span class="p">{</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="128" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
128
</td>
<td class="diff-line-num new_line old" data-linenumber="128" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC128" class="line" lang="php"> <span class="k" style="font-weight: 600;">if</span> <span class="p">(</span><span class="o" style="font-weight: 600;">!</span><span class="nb" style="color: #0086b3;">preg_match</span><span class="p">(</span><span class="s2" style="color: #d14;">"/^[0-9]<span class="idiff left">*$/"</span></span><span class="p"><span class="idiff">,</span></span><span class="idiff"> </span><span class="nv" style="color: teal;"><span class="idiff">$SID</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">||</span></span><span class="idiff"> </span><span class="nb" style="color: #0086b3;"><span class="idiff">strlen</span></span><span class="p"><span class="idiff">(</span></span><span class="nv" style="color: teal;"><span class="idiff">$SID</span></span><span class="p"><span class="idiff">)</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">!=</span></span><span class="idiff"> </span><span class="mi" style="color: #099;"><span class="idiff right">6</span></span><span class="p">)</span> <span class="p">{</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="129" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="128" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
128
</td>
<td class="line_content new noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC128" class="line" lang="php"> <span class="k" style="font-weight: 600;">if</span> <span class="p">(</span><span class="o" style="font-weight: 600;">!</span><span class="nb" style="color: #0086b3;">preg_match</span><span class="p">(</span><span class="s2" style="color: #d14;">"/^[0-9]</span><span class="si" style="color: #d14;"><span class="idiff left">{</span></span><span class="nv" style="color: teal;"><span class="idiff">6,</span></span><span class="si" style="color: #d14;"><span class="idiff">}</span></span><span class="s2" style="color: #d14;"><span class="idiff">$/"</span></span><span class="p"><span class="idiff">,</span></span><span class="idiff"> </span><span class="nv" style="color: teal;"><span class="idiff">$SID</span></span><span class="p"><span class="idiff right">)</span>)</span> <span class="p">{</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="129" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
129
</td>
<td class="diff-line-num new_line" data-linenumber="129" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
129
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC129" class="line" lang="php"> <span class="nv" style="color: teal;">$error</span> <span class="o" style="font-weight: 600;">=</span> <span class="s2" style="color: #d14;">"Invalid student ID"</span><span class="p">;</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="130" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
130
</td>
<td class="diff-line-num new_line" data-linenumber="130" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
130
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC130" class="line" lang="php"> <span class="k" style="font-weight: 600;">return</span> <span class="kc" style="font-weight: 600;">false</span><span class="p">;</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="131" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
131
</td>
<td class="diff-line-num new_line" data-linenumber="131" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
131
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC131" class="line" lang="php"> <span class="p">}</span> <span class="k" style="font-weight: 600;">elseif</span> <span class="p">(</span><span class="nx">sidUsed</span><span class="p">(</span><span class="nv" style="color: teal;">$SID</span><span class="p">))</span> <span class="p">{</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777777;">
—
<br>
<a href="https://projects.sucs.org/sucssite/sucs-site/compare/52425b803ba0bfb4335317a891c570237f0bdd8f...c274976e15ea4bbde96c8153817b2b0268de4974">View it on GitLab</a>.
<br>
You're receiving this email because of your account on projects.sucs.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
</p>
</div>
</body>
</html>