ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 22:25:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

move email-validation to a common place

Browse Source 
instead of c&p it - lazy bastard :-)
This commit is contained in:
Stephan Diederich
2013-09-06 19:18:32 +02:00
parent 79df67ec4a
commit 9747495ae3
4 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Classes/BITFeedbackUserDataViewController.m
View File

@@ -106,21 +106,6 @@
}
#pragma mark - Private methods
- (BOOL)validateEmail {
NSString *emailRegex =
@"(?:[a-z0-9!#$%\\&'*+/=?\\^_`{|}~-]+(?:\\.[a-z0-9!#$%\\&'*+/=?\\^_`{|}"
@"~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\"
@"x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-"
@"z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5"
@"]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-"
@"9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21"
@"-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])";
NSPredicate *emailTest = [NSPredicate predicateWithFormat:@"SELF MATCHES[c] %@", emailRegex];
return [emailTest evaluateWithObject:self.email];
}
- (BOOL)allRequiredFieldsEntered {
if ([self.manager requireUserName] == BITFeedbackUserDataElementRequired && [self.name length] == 0)
return NO;
@@ -128,7 +113,7 @@
if ([self.manager requireUserEmail] == BITFeedbackUserDataElementRequired && [self.email length] == 0)
return NO;
if ([self.email length] > 0 && ![self validateEmail])
if ([self.email length] > 0 && !BITValidateEmail(self.email))
return NO;
return YES;