summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2016-07-13 21:34:50 +0200
committerFlorian Pritz <bluewind@xinu.at>2016-07-13 21:34:50 +0200
commit13206d03280dc138583815984b7bde20e63bf94d (patch)
tree3cd1d2e400a67ee36db8de4498d9667fbd3f5208 /application/controllers
parentd787d79c2b3148093e844a418da74dee82315257 (diff)
controllers/user: Deduplicate username verification
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/controllers')
-rw-r--r--application/controllers/user.php17
1 files changed, 15 insertions, 2 deletions
diff --git a/application/controllers/user.php b/application/controllers/user.php
index e68a544f1..4ff9ae530 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -200,7 +200,7 @@ class User extends MY_Controller {
$password = $this->input->post("password");
$password_confirm = $this->input->post("password_confirm");
- if (!$username || strlen($username) > 32 || !preg_match("/^[a-z0-9]+$/", $username)) {
+ if (!$this->valid_username($username)) {
$error[]= "Invalid username (only up to 32 chars of a-z0-9 are allowed).";
} else {
if ($this->muser->username_exists($username)) {
@@ -615,6 +615,19 @@ class User extends MY_Controller {
}
}
+ /*
+ * Check if a given username is valid.
+ *
+ * Valid usernames contain only lowercase characters and numbers. They are
+ * also <= 32 characters in length.
+ *
+ * @return boolean
+ */
+ private function valid_username($username)
+ {
+ return !$username || strlen($username) > 32 || !preg_match("/^[a-z0-9]+$/", $username);
+ }
+
function add_user()
{
if (!$this->input->is_cli_request()) return;
@@ -624,7 +637,7 @@ class User extends MY_Controller {
// FIXME: deduplicate username/email verification with register()
$username = $this->_get_line_cli("Username", function($username) {
- if (!$username || strlen($username) > 32 || !preg_match("/^[a-z0-9]+$/", $username)) {
+ if (!$this->valid_username($username)) {
echo "Invalid username (only up to 32 chars of a-z0-9 are allowed).\n";
return false;
} else {