From imranh at sucs.org Wed Feb 6 14:25:35 2019 From: imranh at sucs.org (Imran Hussain) Date: Wed, 06 Feb 2019 14:25:35 +0000 Subject: [SUCS Devel] [Git][sucssite/sucs-site][master] [1/?] Allow student IDs > 6 digits Message-ID: <5c5aee5f210a5_7fe93fa73ec2dd4462044@gitlab.mail> Imran Hussain pushed to branch master at sucssite / sucs-site Commits: 83f21ec5 by Imran Hussain at 2019-02-06T14:25:31Z [1/?] Allow student IDs > 6 digits - - - - - 1 changed file: - lib/validation.php Changes: ===================================== lib/validation.php ===================================== @@ -125,7 +125,7 @@ function validSID($SID, $override) return true; } } else { - if (!preg_match("/^[0-9]*$/", $SID) || strlen($SID) != 6) { + if (!preg_match("/^[0-9]{6,}$/", $SID)) { $error = "Invalid student ID"; return false; } elseif (sidUsed($SID)) { View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/83f21ec5225627b5ba5f1d6ed03e2aef444ab8cc -- View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/83f21ec5225627b5ba5f1d6ed03e2aef444ab8cc You're receiving this email because of your account on projects.sucs.org. -------------- next part -------------- An HTML attachment was scrubbed... URL: From imranh at sucs.org Wed Feb 6 14:33:24 2019 From: imranh at sucs.org (Imran Hussain) Date: Wed, 06 Feb 2019 14:33:24 +0000 Subject: [SUCS Devel] [Git][sucssite/sucs-site][beta] 3 commits: Cut a bit too much from motd.php :) Message-ID: <5c5af03466ce7_7fe93fa73ec2dd4462844@gitlab.mail> Imran Hussain pushed to branch beta at sucssite / sucs-site Commits: 23899139 by Imran Hussain at 2019-01-24T12:02:12Z Cut a bit too much from motd.php :) - - - - - 83f21ec5 by Imran Hussain at 2019-02-06T14:25:31Z [1/?] Allow student IDs > 6 digits - - - - - adbc05b8 by Imran Hussain at 2019-02-06T14:33:19Z Merge branch 'master' into 'beta' Allow student IDs > 6 digits to beta See merge request sucssite/sucs-site!103 - - - - - 2 changed files: - components/motd.php - lib/validation.php Changes: ===================================== components/motd.php ===================================== @@ -4,6 +4,7 @@ $motd_file = "/etc/motd"; function decode_entities($text, $quote_style = ENT_COMPAT) { $text = html_entity_decode($text, $quote_style, 'ISO-8859-1'); // NOTE: UTF-8 does not work! + $text = preg_replace('~&ndash\;~i', '-', $text); $text = preg_replace_callback('~&#x([0-9a-f]+);~i', function ($matches) { foreach ($matches as $match) { ===================================== lib/validation.php ===================================== @@ -125,7 +125,7 @@ function validSID($SID, $override) return true; } } else { - if (!preg_match("/^[0-9]*$/", $SID) || strlen($SID) != 6) { + if (!preg_match("/^[0-9]{6,}$/", $SID)) { $error = "Invalid student ID"; return false; } elseif (sidUsed($SID)) { View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/51e49732549e896d166258c1a78bc6a73077344a...adbc05b8a7d7d83d88d7b09d1fa713f49546a92b -- View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/51e49732549e896d166258c1a78bc6a73077344a...adbc05b8a7d7d83d88d7b09d1fa713f49546a92b You're receiving this email because of your account on projects.sucs.org. -------------- next part -------------- An HTML attachment was scrubbed... URL: From imranh at sucs.org Wed Feb 6 14:36:31 2019 From: imranh at sucs.org (Imran Hussain) Date: Wed, 06 Feb 2019 14:36:31 +0000 Subject: [SUCS Devel] [Git][sucssite/sucs-site][sucs-site] 4 commits: Cut a bit too much from motd.php :) Message-ID: <5c5af0efa70c4_7fe93fa7406f134c6379b@gitlab.mail> Imran Hussain pushed to branch sucs-site at sucssite / sucs-site Commits: 23899139 by Imran Hussain at 2019-01-24T12:02:12Z Cut a bit too much from motd.php :) - - - - - 83f21ec5 by Imran Hussain at 2019-02-06T14:25:31Z [1/?] Allow student IDs > 6 digits - - - - - adbc05b8 by Imran Hussain at 2019-02-06T14:33:19Z Merge branch 'master' into 'beta' Allow student IDs > 6 digits to beta See merge request sucssite/sucs-site!103 - - - - - c274976e by Imran Hussain at 2019-02-06T14:36:28Z Merge branch 'beta' into 'sucs-site' Beta to live See merge request sucssite/sucs-site!104 - - - - - 2 changed files: - components/motd.php - lib/validation.php Changes: ===================================== components/motd.php ===================================== @@ -4,6 +4,7 @@ $motd_file = "/etc/motd"; function decode_entities($text, $quote_style = ENT_COMPAT) { $text = html_entity_decode($text, $quote_style, 'ISO-8859-1'); // NOTE: UTF-8 does not work! + $text = preg_replace('~&ndash\;~i', '-', $text); $text = preg_replace_callback('~&#x([0-9a-f]+);~i', function ($matches) { foreach ($matches as $match) { ===================================== lib/validation.php ===================================== @@ -125,7 +125,7 @@ function validSID($SID, $override) return true; } } else { - if (!preg_match("/^[0-9]*$/", $SID) || strlen($SID) != 6) { + if (!preg_match("/^[0-9]{6,}$/", $SID)) { $error = "Invalid student ID"; return false; } elseif (sidUsed($SID)) { View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/52425b803ba0bfb4335317a891c570237f0bdd8f...c274976e15ea4bbde96c8153817b2b0268de4974 -- View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/52425b803ba0bfb4335317a891c570237f0bdd8f...c274976e15ea4bbde96c8153817b2b0268de4974 You're receiving this email because of your account on projects.sucs.org. -------------- next part -------------- An HTML attachment was scrubbed... URL: From imranh at sucs.org Mon Feb 18 15:35:01 2019 From: imranh at sucs.org (Imran Hussain) Date: Mon, 18 Feb 2019 15:35:01 +0000 Subject: [SUCS Devel] [Git][sucs/sucs][master] 3 commits: Add outpost as a host Message-ID: <5c6ad0a5c7494_7fe93fa7406f0f28725de@gitlab.mail> Imran Hussain pushed to branch master at sucs / SUCS Commits: c4041eaa by Imran Hussain at 2019-02-18T15:33:33Z Add outpost as a host - - - - - 7042d810 by Imran Hussain at 2019-02-18T15:33:45Z service name is now mw3 - - - - - cd730b31 by Imran Hussain at 2019-02-18T15:34:52Z Merge branch 'master' of projects.sucs.org:sucs/sucs - - - - - 1 changed file: - ansible/inventory/hosts Changes: ===================================== ansible/inventory/hosts ===================================== @@ -29,4 +29,5 @@ iodine [other] door remote_user=root pi -#vanadium \ No newline at end of file +#vanadium +outpost remote_user=root \ No newline at end of file View it on GitLab: https://projects.sucs.org/sucs/sucs/compare/b4ded4f9024c60428e0f762695b23bcf2cf90d54...cd730b31aa77e41b2e1921d7090350d65817dae4 -- View it on GitLab: https://projects.sucs.org/sucs/sucs/compare/b4ded4f9024c60428e0f762695b23bcf2cf90d54...cd730b31aa77e41b2e1921d7090350d65817dae4 You're receiving this email because of your account on projects.sucs.org. -------------- next part -------------- An HTML attachment was scrubbed... URL: