-now accounts for @bama.ua.edu email addresses

uacaps · Jun 19, 2014 · fb76d50 · fb76d50
1 parent 8b0fbe4
commit fb76d50
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/UniversityPrograms/UniversityPrograms/SpecificEventViewController.m b/UniversityPrograms/UniversityPrograms/SpecificEventViewController.m
@@ -315,7 +315,7 @@ - (void)didTapRSVP {
 
             NSString *responseCode = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
 
-            NSLog(@"%@", responseCode);
+            //NSLog(@"%@", responseCode);
             if([responseCode isEqualToString:@"true"]){
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [self confirmAlertView];

diff --git a/UniversityPrograms/UniversityPrograms/SpecificEventViewController.xib b/UniversityPrograms/UniversityPrograms/SpecificEventViewController.xib
@@ -98,12 +98,12 @@
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <subviews>
                                 <view alpha="0.14999999999999999" contentMode="scaleToFill" id="BDq-KK-5B0">
-                                    <rect key="frame" x="110" y="0.0" width="100" height="1"/>
+                                    <rect key="frame" x="105" y="0.0" width="110" height="1"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                     <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                 </view>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="0dp-Nl-7af">
-                                    <rect key="frame" x="84" y="17" width="55" height="25"/>
+                                <button opaque="NO" contentMode="scaleAspectFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="0dp-Nl-7af">
+                                    <rect key="frame" x="90" y="0.0" width="55" height="45"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <state key="normal" image="Twitter.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -112,8 +112,8 @@
                                         <action selector="didTweet:" destination="-1" eventType="touchUpInside" id="Ses-FS-A8F"/>
                                     </connections>
                                 </button>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="AgE-Hl-4zd">
-                                    <rect key="frame" x="183" y="17" width="55" height="25"/>
+                                <button opaque="NO" contentMode="scaleAspectFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="AgE-Hl-4zd">
+                                    <rect key="frame" x="175" y="0.0" width="55" height="45"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                                     <state key="normal" image="Facebook.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -149,12 +149,6 @@
                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" id="UMs-0I-jQh">
-                            <rect key="frame" x="1" y="15" width="20" height="20"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                            <color key="color" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                        </activityIndicatorView>
                         <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Labely" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Uls-hh-Np7">
                             <rect key="frame" x="10" y="9" width="300" height="31"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -170,6 +164,12 @@
                             <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             <nil key="highlightedColor"/>
                         </label>
+                        <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="whiteLarge" id="UMs-0I-jQh">
+                            <rect key="frame" x="142" y="47" width="37" height="37"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <color key="color" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                        </activityIndicatorView>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                 </view>

diff --git a/UniversityPrograms/UniversityPrograms/UserInfoViewController.m b/UniversityPrograms/UniversityPrograms/UserInfoViewController.m
@@ -132,7 +132,7 @@ - (BOOL)validateString:(NSString *)string withPattern:(NSString *)pattern
 
 - (void)saveInfo{
 
-    if([self.cwid.text length]<8 || [self.cwid.text length]>8||![self validateString:self.cwid.text withPattern:@"^[0-9]{8}$"] || ![self validateString:self.lastName.text withPattern:@"^[a-zA-Z]{1,}$"]|| ![self validateString:self.email.text withPattern:@"^[a-zA-Z]{1,64}@crimson\\.ua\\.edu$"]||![self validateString:self.firstName.text withPattern:@"^[a-zA-Z]{1,}$"]){
+    if([self.cwid.text length]<8 || [self.cwid.text length]>8||![self validateString:self.cwid.text withPattern:@"^[0-9]{8}$"] || ![self validateString:self.lastName.text withPattern:@"^[a-zA-Z]{1,}$"]|| ![self validateString:self.email.text withPattern:@"^[a-zA-Z]{1,64}@(?:crimson)|(?:bama)\\.ua\\.edu$"]||![self validateString:self.firstName.text withPattern:@"^[a-zA-Z]{1,}$"]){
         [self addInvalidAlertView];
 
     }