X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=cgi%2Fcgi_blerg.c;h=8f502a261057b87394e16d650f85381834053b66;hb=476c970903c4f3d29a8da3fa7c6f6f237745a8b7;hp=95b180949a913fe3f04d8d9c24c0717e1bf59dfc;hpb=948ce5be6ef6bba36edfb544565ca22e316afb0a;p=blerg.git

diff --git a/cgi/cgi_blerg.c b/cgi/cgi_blerg.c
index 95b1809..8f502a2 100644
--- a/cgi/cgi_blerg.c
+++ b/cgi/cgi_blerg.c
@@ -341,37 +341,32 @@ int main(int argc, char *argv[]) {
 			exit(0);
 
 		auth_logout(ac.name, ac.token);
+		printf("Set-Cookie: auth=X; Expires=Thu, 01 Jan 1970 00:00:00 GMT\r\n");
 		respond_JSON_Success();
-	} else if (strncmp(path, "/subscribe", 10) == 0 || strncmp(path, "/unsubscribe", 12) == 0) {
+	} else if (strncmp(path, "/subscribe", 10) == 0) {
 		if (!check_auth(&ac))
 			exit(0);
 
-		if (path[1] == 'u') {
-			if (path[12] != '/') {
-				respond_404();
-				exit(0);
-			}
-
-			ret = parse_url_info(path + 13, &info);
-			if ((ret & URL_INFO_NAME) == 0) {
-				respond_404();
-				exit(0);
-			}
+		if (path[10] != '/') {
+			respond_404();
+			exit(0);
+		}
 
-			subscription_remove(ac.name, info.name);
-		} else {
-			if (path[10] != '/') {
-				respond_404();
-				exit(0);
-			}
+		ret = parse_url_info(path + 11, &info);
+		if ((ret & URL_INFO_NAME) == 0) {
+			respond_404();
+			exit(0);
+		}
 
-			ret = parse_url_info(path + 11, &info);
-			if ((ret & URL_INFO_NAME) == 0) {
-				respond_404();
-				exit(0);
-			}
+		const char *subscribed = cgi_getentrystr("subscribed");
 
+		if (strncmp(subscribed, "true", 4) == 0) {
 			subscription_add(ac.name, info.name);
+		} else if (strncmp(subscribed, "false", 5) == 0) {
+			subscription_remove(ac.name, info.name);
+		} else {
+			respond_JSON_Failure();
+			exit(0);
 		}
 		respond_JSON_Success();
 	} else if (strncmp(path, "/feed", 6) == 0) {
@@ -390,14 +385,7 @@ int main(int argc, char *argv[]) {
 		if (!check_auth(&ac))
 			exit(0);
 
-		if (strncmp(request_method, "POST", 4) != 0) {
-			respond_405();
-			exit(0);
-		}
-
-		yajl_gen g;
-
-		if (path[7] == 0) {  /* No username */
+		if (strncmp(request_method, "POST", 4) == 0) {
 			const char *clear = cgi_getentrystr("clear");
 
 			if (clear != NULL) {
@@ -409,7 +397,11 @@ int main(int argc, char *argv[]) {
 				}
 				blerg_close(b);
 				respond_JSON_Success();
-			} else {
+			}
+		} else if (strncmp(request_method, "GET", 3) == 0) {
+			yajl_gen g;
+
+			if (path[7] == 0) {  /* No username */
 				g = yajl_gen_alloc(&yajl_c, NULL);
 				yajl_gen_map_open(g);
 
@@ -427,22 +419,25 @@ int main(int argc, char *argv[]) {
 				yajl_gen_map_close(g);
 				respond_yajl(g);
 				yajl_gen_free(g);
-			}
-		} else {  /* with username */
-			g = yajl_gen_alloc(&yajl_c, NULL);
-			yajl_gen_map_open(g);
-
-			yajl_gen_string(g, (unsigned char *)"subscribed", 10);
-			ret = parse_url_info(path + 8, &info);
-			if ((ret & URL_INFO_NAME) == 1) {
-				yajl_gen_bool(g, is_subscribed(ac.name, info.name));
-			} else {
-				yajl_gen_bool(g, 0);
-			}
+			} else {  /* with username */
+				g = yajl_gen_alloc(&yajl_c, NULL);
+				yajl_gen_map_open(g);
 
-			yajl_gen_map_close(g);
-			respond_yajl(g);
-			yajl_gen_free(g);
+				yajl_gen_string(g, (unsigned char *)"subscribed", 10);
+				ret = parse_url_info(path + 8, &info);
+				if ((ret & URL_INFO_NAME) == 1) {
+					yajl_gen_bool(g, is_subscribed(ac.name, info.name));
+				} else {
+					yajl_gen_bool(g, 0);
+				}
+
+				yajl_gen_map_close(g);
+				respond_yajl(g);
+				yajl_gen_free(g);
+			}
+		} else {
+			respond_405();
+			exit(0);
 		}
 	} else if (strncmp(path, "/passwd", 7) == 0) {
 		if (!check_auth(&ac))