Merge branch 'master' of projects.sucs.org:gigosaurus/sucs-site

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;

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

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/>