<!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>
</head>
<body>
<style type="text/css">
img {
max-width: 100%; height: auto;
}
</style>
<div class="content">
<h3>
Imran Hussain pushed to branch master
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/592f6ce002635d3d4a16bc0d9e06eb10eed973ea">592f6ce0</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2016-10-13T10:36:28+01:00</i>
</div>
<pre class="commit-message" style="margin: 0; white-space: pre-wrap">Revert "Fix old members returning with the same student id while still being a student."
This reverts commit f772dc7a1da618a609b3312ce390e7cf11abde8c.
Better fix incoming
</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/766f09dd13cd0a36481a80b4fc4699ca333f1b03">766f09dd</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2016-10-13T10:47:11+01:00</i>
</div>
<pre class="commit-message" style="margin: 0; white-space: pre-wrap">Fix old student members coming back with the same student id after thier account has been deleted and they paid via the su
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#diff-0" style="text-decoration: none">
components/susignup.php
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="diff-0">
<a href="https://projects.sucs.org/sucssite/sucs-site/compare/f772dc7a1da618a609b3312ce390e7cf11abde8c...766f09dd13cd0a36481a80b4fc4699ca333f1b03#diff-0"><strong>components/susignup.php</strong></a>
<hr>
<table class="code white" style="-premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; background: #fff; font-family: monospace; font-size: 13px" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" style="line-height: 1.5">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="46" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="46" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="background: #fafafa; color: rgba(0,0,0,0.3); padding-left: 0.5em; padding-right: 0.5em" bgcolor="#fafafa">@@ -46,6 +46,11 @@ if (!empty($_REQUEST['sid']) && !empty($_REQUEST['transactionID'])) {</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="46" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
46
</td>
<td class="diff-line-num new_line" data-linenumber="46" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
46
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC46" class="line"> <span class="nx">renew_membership</span><span class="p">(</span><span class="nv" style="color: teal">$tmpresult</span><span class="o" style="font-weight: bold">-></span><span class="na" style="color: teal">fields</span><span class="p">[</span><span class="s2" style="color: #d14">"username"</span><span class="p">]);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="47" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
47
</td>
<td class="diff-line-num new_line" data-linenumber="47" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
47
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC47" class="line"> <span class="c1" style="color: #998; font-style: italic">// let them know that their account has been renewed</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="48" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
48
</td>
<td class="diff-line-num new_line" data-linenumber="48" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
48
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC48" class="line"> <span class="nx">message_flash</span><span class="p">(</span><span class="s2" style="color: #d14">"Your SUCS account has been renewed."</span><span class="p">);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" style="line-height: 1.5">
<td class="diff-line-num new old_line" data-linenumber="49" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="49" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
49
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0"> <span id="LC49" class="line"> <span class="c1" style="color: #998; font-style: italic">// else if they aren't in the SUCS DB but have a signup slip, take them back to that part of signup</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" style="line-height: 1.5">
<td class="diff-line-num new old_line" data-linenumber="49" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="50" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
50
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0"> <span id="LC50" class="line"> <span class="p">}</span> <span class="k" style="font-weight: bold">else</span> <span class="k" style="font-weight: bold">if</span> <span class="p">(</span><span class="nv" style="color: teal">$tmpresult</span><span class="o" style="font-weight: bold">-></span><span class="na" style="color: teal">fields</span> <span class="o" style="font-weight: bold">==</span> <span class="kc" style="font-weight: bold">false</span> <span class="o" style="font-weight: bold">&&</span> <span class="nv" style="color: teal">$signuptmpresult</span><span class="o" style="font-weight: bold">-></span><span class="na" style="color: teal">fields</span><span class="p">[</span><span class="s2" style="color: #d14">"sid"</span><span class="p">]</span> <span class="o" style="font-weight: bold">==</span> <span class="nv" style="color: teal">$sid</span> <span class="o" style="font-weight: bold">&&</span> <span class="nv" style="color: teal">$signuptmpresult</span><span class="o" style="font-weight: bold">-></span><span class="na" style="color: teal">fields</span><span class="p">[</span><span class="s2" style="color: #d14">"activated"</span><span class="p">]</span> <span class="o" style="font-weight: bold">!=</span> <span class="k" style="font-weight: bold">NULL</span><span class="p">)</span> <span class="p">{</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" style="line-height: 1.5">
<td class="diff-line-num new old_line" data-linenumber="49" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="51" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
51
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0"> <span id="LC51" class="line"> <span class="nv" style="color: teal">$mode</span> <span class="o" style="font-weight: bold">=</span> <span class="s2" style="color: #d14">"form"</span><span class="p">;</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" style="line-height: 1.5">
<td class="diff-line-num new old_line" data-linenumber="49" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="52" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
52
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0"> <span id="LC52" class="line"> <span class="nv" style="color: teal">$smarty</span><span class="o" style="font-weight: bold">-></span><span class="na" style="color: teal">assign</span><span class="p">(</span><span class="s2" style="color: #d14">"id"</span><span class="p">,</span> <span class="nv" style="color: teal">$signuptmpresult</span><span class="o" style="font-weight: bold">-></span><span class="na" style="color: teal">fields</span><span class="p">[</span><span class="s2" style="color: #d14">"id"</span><span class="p">]);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" style="line-height: 1.5">
<td class="diff-line-num new old_line" data-linenumber="49" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="53" style="background: #ddfbe6; border-right-color: #c7f0d2; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
53
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; padding-left: 0.5em; padding-right: 0.5em" bgcolor="#ecfdf0">
<pre style="margin: 0"> <span id="LC53" class="line"> <span class="nv" style="color: teal">$smarty</span><span class="o" style="font-weight: bold">-></span><span class="na" style="color: teal">assign</span><span class="p">(</span><span class="s2" style="color: #d14">"pass"</span><span class="p">,</span> <span class="nv" style="color: teal">$signuptmpresult</span><span class="o" style="font-weight: bold">-></span><span class="na" style="color: teal">fields</span><span class="p">[</span><span class="s2" style="color: #d14">"password"</span><span class="p">]);</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="49" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
49
</td>
<td class="diff-line-num new_line" data-linenumber="54" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
54
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC54" class="line"> <span class="c1" style="color: #998; font-style: italic">// else if they aren't in the SUCS DB, then bootstrap signup process</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="50" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
50
</td>
<td class="diff-line-num new_line" data-linenumber="55" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
55
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC55" class="line"> <span class="p">}</span> <span class="k" style="font-weight: bold">else</span> <span class="k" style="font-weight: bold">if</span> <span class="p">(</span><span class="nv" style="color: teal">$tmpresult</span><span class="o" style="font-weight: bold">-></span><span class="na" style="color: teal">fields</span> <span class="o" style="font-weight: bold">==</span> <span class="kc" style="font-weight: bold">false</span> <span class="o" style="font-weight: bold">&&</span> <span class="nv" style="color: teal">$signuptmpresult</span><span class="o" style="font-weight: bold">-></span><span class="na" style="color: teal">fields</span> <span class="o" style="font-weight: bold">==</span> <span class="kc" style="font-weight: bold">false</span><span class="p">)</span> <span class="p">{</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" style="line-height: 1.5">
<td class="diff-line-num old_line" data-linenumber="51" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
51
</td>
<td class="diff-line-num new_line" data-linenumber="56" style="background: #fafafa; border-right-color: #f0f0f0; border-right-style: solid; border-right-width: 1px; color: rgba(0,0,0,0.3); padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
56
</td>
<td class="line_content noteable_line" style="padding-left: 0.5em; padding-right: 0.5em">
<pre style="margin: 0"> <span id="LC56" class="line"> <span class="nv" style="color: teal">$mode</span> <span class="o" style="font-weight: bold">=</span> <span class="s2" style="color: #d14">"form"</span><span class="p">;</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px">
<p style="color: #777; font-size: small">
—
<br>
<a href="https://projects.sucs.org/sucssite/sucs-site/compare/f772dc7a1da618a609b3312ce390e7cf11abde8c...766f09dd13cd0a36481a80b4fc4699ca333f1b03">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>