Merge pull request #4460 from wordpress-mobile/issue/4459-disallow-spaces

Disallow spaces in every field except password

Author: kwonye

WordPress/Classes/ViewRelated/NUX/CreateAccountAndBlogViewController.m

@@ -151,6 +151,10 @@ - (BOOL)textFieldShouldReturn:(UITextField *)textField
 - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range
                                                        replacementString:(NSString *)string
 {
+    if ([string isEqualToString:@" "] && ![textField isEqual:_passwordField]) { // Disallow spaces in every field except password
+        return NO;
+    }
+    
     NSArray *fields = @[_emailField, _usernameField, _passwordField, _siteAddressField];
 
     NSMutableString *updatedString = [[NSMutableString alloc] initWithString:textField.text];
@@ -696,7 +700,7 @@ - (BOOL)isSiteAddressFilled
 
 - (BOOL)fieldsValid
 {
-    return [self fieldsFilled] && [self isUsernameUnderFiftyCharacters];
+    return [self fieldsFilled] && [self isUsernameUnderFiftyCharacters] && ![self emailOrUsernameOrSiteAddressContainsSpaces];
 }
 
 - (NSString *)generateSiteTitleFromUsername:(NSString *)username
@@ -711,11 +715,22 @@ - (void)showAllErrors
 {
     if (![self isUsernameUnderFiftyCharacters]) {
         [self showError:NSLocalizedString(@"Username must be less than fifty characters.", nil)];
+    } else if ([self emailOrUsernameOrSiteAddressContainsSpaces]) {
+        [self showError:NSLocalizedString(@"Email, Username, and Site Address cannot contain spaces", @"No spaces error message")];
     } else {
         [self showFieldsNotFilledError];
     }
 }
 
+- (BOOL)emailOrUsernameOrSiteAddressContainsSpaces {
+    NSString *space = @" ";
+    NSString *emailTrimmed = [_emailField.text trim];
+    NSString *userNameTrimmed = [_usernameField.text trim];
+    NSString *siteAddressTrimmed = [_siteAddressField.text trim];
+    
+    return ([emailTrimmed containsString:space] || [userNameTrimmed containsString:space] || [siteAddressTrimmed containsString:space]);
+}
+
 - (void)showFieldsNotFilledError
 {
     [self showError:NSLocalizedString(@"Please fill out all the fields", nil)];