Various bug fixes

iosdeveloper · Sep 9, 2011 · f078c64 · f078c64
1 parent 4e76bc0
commit f078c64
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 40 deletions.
diff --git a/Redeemer/Classes/AppDelegate.m b/Redeemer/Classes/AppDelegate.m
@@ -13,32 +13,25 @@ @implementation AppDelegate
 - (BOOL)textFieldShouldReturn:(UITextField *)textField {
 	[textField resignFirstResponder];
 
-	redeemer = [[Redeemer alloc] initWithVoucher:[textField text]];
+	redeemer = [[Redeemer alloc] initWithVoucher:textField.text];
 	[redeemer setDelegate:self];
 
 	return NO;
 }
 
-- (void)redemptionFinished:(NSString *)responseString withSuccess:(BOOL)redeemed {
+- (void)redemptionFinished:(NSString *)responseString {
 	[redeemer release];
 
 	UIAlertView *alert = nil;
 
-	if (redeemed) {
-		if ([responseString isEqualToString:@"OK"]) {
-			alert = [[UIAlertView alloc] initWithTitle:@"Voucher redeemed"
-											   message:@"One-year subscription unlocked."
-											  delegate:nil
-									 cancelButtonTitle:@"OK"
-									 otherButtonTitles:nil];
-		} else if ([responseString length] == 6) {
-			responseString = [responseString stringByReplacingOccurrencesOfString:@"-" withString:@"/"];
-			alert = [[UIAlertView alloc] initWithTitle:@"Voucher redeemed"
-											   message:[NSString stringWithFormat:@"Issue %@ unlocked.", responseString]
-											  delegate:nil
-									 cancelButtonTitle:@"OK"
-									 otherButtonTitles:nil];
-		}
+	if (responseString.length == 6) {
+		responseString = [responseString stringByReplacingOccurrencesOfString:@"-" withString:@"/"];
+
+		alert = [[UIAlertView alloc] initWithTitle:@"Voucher redeemed"
+										   message:[NSString stringWithFormat:@"Issue %@ unlocked.", responseString]
+										  delegate:nil
+								 cancelButtonTitle:@"OK"
+								 otherButtonTitles:nil];
 	} else {
 		alert = [[UIAlertView alloc] initWithTitle:nil
 										   message:@"Voucher invalid or already redeemed."
@@ -55,7 +48,7 @@ - (void)redemptionFailed:(NSError *)error {
 	[redeemer release];
 
 	UIAlertView *alert = [[UIAlertView alloc] initWithTitle:nil
-													message:[error localizedDescription]
+													message:error.localizedDescription
 												   delegate:nil
 										  cancelButtonTitle:@"OK"
 										  otherButtonTitles:nil];

diff --git a/Redeemer/Classes/Redeemer.h b/Redeemer/Classes/Redeemer.h
@@ -10,7 +10,7 @@
 
 @optional
 
-- (void)redemptionFinished:(NSString *)responseString withSuccess:(BOOL)redeemed;
+- (void)redemptionFinished:(NSString *)responseString;
 - (void)redemptionFailed:(NSError *)error;
 
 @end

diff --git a/Redeemer/Classes/Redeemer.m b/Redeemer/Classes/Redeemer.m
@@ -27,22 +27,14 @@ - (id)initWithVoucher:(NSString *)code {
 }
 
 - (void)requestFinished:(ASIHTTPRequest *)request {
-	NSString *responseString = [request responseString];
-
-	if ([responseString length]) {
-		if (self.delegate != nil && [self.delegate respondsToSelector:@selector(redemptionFinished:withSuccess:)]) {
-			[self.delegate redemptionFinished:responseString withSuccess:YES];
-		}
-	} else {
-		if (self.delegate != nil && [self.delegate respondsToSelector:@selector(redemptionFinished:withSuccess:)]) {
-			[self.delegate redemptionFinished:nil withSuccess:NO];
-		}
+	if (self.delegate != nil && [self.delegate respondsToSelector:@selector(redemptionFinished:)]) {
+		[self.delegate redemptionFinished:request.responseString];
 	}
 }
 
 - (void)requestFailed:(ASIHTTPRequest *)request {
-	if (self.delegate != nil && [self.delegate respondsToSelector:@selector(redemptionFinished:withSuccess:)]) {
-		[self.delegate redemptionFailed:[request error]];
+	if (self.delegate != nil && [self.delegate respondsToSelector:@selector(redemptionFailed:)]) {
+		[self.delegate redemptionFailed:request.error];
 	}
 }
 

diff --git a/Redeemer/redeem.php b/Redeemer/redeem.php
@@ -4,19 +4,20 @@
 
 mysql_select_db("database_name") or die(mysql_error());
 
-$query = "SELECT * from codes WHERE code='".mysql_real_escape_string($_POST['code'])."'";
+$code = mysql_real_escape_string($_POST["code"]);
+
+$query = "SELECT * FROM codes WHERE code = '".$code."'";
+
 $result = mysql_query($query) or die(mysql_error());
-$row = mysql_fetch_array( $result );
+
+$row = mysql_fetch_array($result);
 
 if ($row['id'] && $row['redeemed'] == 0) {
-	$query = "UPDATE codes SET redeemed=1 WHERE code='".mysql_real_escape_string($_POST['code'])."'";
-	$result = mysql_query($query) or die(mysql_error());
+	$query = "UPDATE codes SET redeemed = '1' WHERE code = '".$code."'";
+
+	mysql_query($query) or die(mysql_error());
 
-	if ($row['issue'] == 0) {
-		echo 'OK';
-	} else {
-		echo $row['issue'];
-	}
+	echo $row['issue'];
 }
 
 ?>