Merge branch 'origin/develop' into phoenix

Author: carlbennett

.travis.yml

@@ -4,11 +4,8 @@ os:
   - linux
 sudo: false
 php:
-# - 5.3 (doesn't recognize $var=[], only recognizes $var=array())
-# - 5.4 (doesn't have finally{} in try blocks)
-  - 5.5
-  - 5.6
-  - 7.0
+  - 7.2
+  - 7.3
   - nightly
 matrix:
   allow_failures:

etc/config.sample.json

@@ -40,6 +40,12 @@
       "username_length_min": 3
     }
   },
+  "email": {
+    "smtp_host": "smtp.example.com",
+    "smtp_password": "",
+    "smtp_port": 587,
+    "smtp_user": ""
+  },
   "memcache": {
     "connect_timeout": 1.0,
     "tcp_nodelay": true,

src/controllers/User/Register.php

@@ -136,6 +136,13 @@ protected function tryRegister(Router &$router, UserRegisterModel &$model) {
         return;
       }
     } catch (UserNotFoundException $e) {}
+    
+    try {
+      if (User::findIdByUsername($username)) {
+        $model->error = "USERNAME_TAKEN";
+        return;
+      }
+    } catch (UserNotFoundException $e) {}
 
     try {
 

src/templates/User/Register.phtml

@@ -70,6 +70,10 @@ switch ($this->getContext()->error) {
     $af      = "email";
     $message = "The email address is already in use, use another.";
     break;
+  case "USERNAME_TAKEN":
+    $af      = "username";
+    $message = "That username is taken, try another.";
+    break;
   case "INTERNAL_ERROR":
     $af      = null;
     $message = "An internal error occurred while processing your request. "