<html lang='en'>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<title>
GitLab
</title>
</meta>
</head>
<style>
  img {
    max-width: 100%;
    height: auto;
  }
  p.details {
    font-style:italic;
    color:#777
  }
  .footer p {
    font-size:small;
    color:#777
  }
  pre.commit-message {
    white-space: pre-wrap;
  }
  .file-stats a {
    text-decoration: none;
  }
  .file-stats .new-file {
    color: #090;
  }
  .file-stats .deleted-file {
    color: #B00;
  }
</style>
<body>
<div class='content'>
<h3>Peter Jenkins 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/0fc217a232d86028277202abe92b09dbc41b9bef">0fc217a2</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-10-12T17:22:17Z</i>
</div>
<pre class='commit-message'>Use the built in sucs-site error handling stuff.</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/a023341d3d70b474502526a204f6ae48607bc44e">a023341d</a></strong>
<div>
<span>by Imran Hussain</span>
<i>at 2015-10-12T17:32:56Z</i>
</div>
<pre class='commit-message'>Merge remote-tracking branch 'upstream/master'

Conflicts:
        templates/susignup-admin.tpl</pre>
</li>
<li>
<strong><a href="https://projects.sucs.org/sucssite/sucs-site/commit/15751affc636bef0012b0e8887575f692edafbc7">15751aff</a></strong>
<div>
<span>by Peter Jenkins</span>
<i>at 2015-10-12T17:59:04Z</i>
</div>
<pre class='commit-message'>Merge branch 'master' into 'master'

Use the built in sucs-site error handling stuff.

See merge request !29</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
components/susignup-admin.php
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
templates/susignup-admin.tpl
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/03cf6db852f88dbf34feb31151924a605dc99a9b...15751affc636bef0012b0e8887575f692edafbc7#diff-0'>
<strong>
components/susignup-admin.php
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/components/susignup-admin.php
</span><span style="color: #000000;background-color: #ddffdd">+++ b/components/susignup-admin.php
</span><span style="color: #aaaaaa">@@ -38,16 +38,19 @@ if (isset($session->groups[$permission])) {
</span>                 $smarty->assign("error_text", "Search term doesn't look like a valid student ID");
             } else {
                 // they have given us a valid sid lets check to see if they have paid
<span style="color: #000000;background-color: #ddffdd">+                $sid = $_REQUEST['sid'];
</span> 
                 // make sure the user/admin/exec isn't an idiot
                 // check if they are already signed up and tell them so
                 $tmpresult = $sucsDB->Execute("SELECT * FROM members WHERE sid=?", array($_REQUEST['sid']));
                 if ($tmpresult->fields["sid"] == $sid && $tmpresult->fields["paid"] == paidUntil(time())) {
                     // let them know they are already signed up and renewed
<span style="color: #000000;background-color: #ddffdd">+                    $mode = 'error';
</span>                     message_flash("You are a numpty and have already signed up and paid for this year.");
                     // else if check to see if they have signedup and paid for the new year but haven't renewed
                 } else if ($tmpresult->fields["sid"] == $sid && $tmpresult->fields["paid"] != paidUntil(time())) {
                     // renew them!
<span style="color: #000000;background-color: #ddffdd">+                    $mode = 'error';
</span>                     renew_membership($tmpresult->fields["username"]);
                     // let them know that their account has been renewed
                     message_flash("Your SUCS account has been renewed.");
</code></pre>

<br>
</li>
<li id='diff-1'>
<a href='https://projects.sucs.org/sucssite/sucs-site/compare/03cf6db852f88dbf34feb31151924a605dc99a9b...15751affc636bef0012b0e8887575f692edafbc7#diff-1'>
<strong>
templates/susignup-admin.tpl
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/templates/susignup-admin.tpl
</span><span style="color: #000000;background-color: #ddffdd">+++ b/templates/susignup-admin.tpl
</span><span style="color: #aaaaaa">@@ -1,9 +1,9 @@
</span> {if $staff == TRUE}
<span style="color: #000000;background-color: #ffdddd">-    {if $mode == 'error'}
</span><span style="color: #000000;background-color: #ddffdd">+    {*{if $mode == 'error'}
</span>         <div class='errorbar'>
             <strong>Error: </strong> {$error_text}
         </div>
<span style="color: #000000;background-color: #ffdddd">-    {/if}
</span><span style="color: #000000;background-color: #ddffdd">+    {/if}*}
</span>     {if $mode == 'renewals'}
         <form action='{$componentpath}' method='post'>
             <table id='susignup-renewals'>
</code></pre>

<br>
</li>

</div>
<div class='footer' style='margin-top: 10px;'>
<p>

<br>
<a href="https://projects.sucs.org/sucssite/sucs-site/compare/03cf6db852f88dbf34feb31151924a605dc99a9b...15751affc636bef0012b0e8887575f692edafbc7">View it on GitLab</a>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":["merge_requests","issues","commit"],"url":"https://projects.sucs.org/sucssite/sucs-site/compare/03cf6db852f88dbf34feb31151924a605dc99a9b...15751affc636bef0012b0e8887575f692edafbc7"}}</script>
</p>
</div>
</body>
</html>