--- 3m-810.pl	2010/02/11 14:14:21	66
+++ 3m-810.pl	2010/02/11 22:12:34	75
@@ -84,7 +84,7 @@
 					$d->{security} = $tags_security->{$_};
 					push @{ $json->{tags} },  $d;
 				} keys %$tags;
-				print $client "HTTP/1.0 200 OK\r\nContent-Type: application/x-javascript\r\n\r\n",
+				print $client "HTTP/1.0 200 OK\r\nContent-Type: application/json\r\n\r\n",
 					$param->{callback}, "(", to_json($json), ")\r\n";
 			} elsif ( $method =~ m{/program} ) {
 
@@ -99,15 +99,39 @@
 
 					warn "PROGRAM $tag $content\n";
 					write_tag( $tag, $content );
+					secure_tag_with( $tag, $param->{$p} =~ /^130/ ? 'DA' : 'D7' );
 				}
 
 				print $client "HTTP/1.0 $status $method\r\nLocation: $server_url\r\n\r\n";
 
+			} elsif ( $method =~ m{/secure(.js)} ) {
+
+				my $json = $1;
+
+				my $status = 501; # Not implementd
+
+				foreach my $p ( keys %$param ) {
+					next unless $p =~ m/^(E[0-9A-F]{15})$/;
+					my $tag = $1;
+					my $data = $param->{$p};
+					$status = 302;
+
+					warn "SECURE $tag $data\n";
+					secure_tag_with( $tag, $data );
+				}
+
+				if ( $json ) {
+					print $client "HTTP/1.0 200 OK\r\nContent-Type: application/json\r\n\r\n",
+						$param->{callback}, "({ ok: 1 })\r\n";
+				} else {
+					print $client "HTTP/1.0 $status $method\r\nLocation: $server_url\r\n\r\n";
+				}
+
 			} else {
-				print $client "HTTP/1.0 404 Unkown method\r\n";
+				print $client "HTTP/1.0 404 Unkown method\r\n\r\n";
 			}
 		} else {
-			print $client "HTTP/1.0 500 No method\r\n";
+			print $client "HTTP/1.0 500 No method\r\n\r\n";
 		}
 		close $client;
 	}
@@ -144,7 +168,8 @@
 my $http_server = 1;
 
 # 3M defaults: 8,4
-my $max_rfid_block = 16;
+# cards 16, stickers: 8
+my $max_rfid_block = 8;
 my $read_blocks = 8;
 
 my $response = {
@@ -395,6 +420,12 @@
 	return $hash;
 }
 
+sub forget_tag {
+	my $tag = shift;
+	delete $tags_data->{$tag};
+	delete $visible_tags->{$tag};
+}
+
 sub read_tag {
 	my ( $tag ) = @_;
 
@@ -483,9 +514,18 @@
 	rename $path, $to;
 	print ">> $to\n";
 
-	# force re-read of tag
-	delete $tags_data->{$tag};
-	delete $visible_tags->{$tag};
+	forget_tag $tag;
+}
+
+sub secure_tag_with {
+	my ( $tag, $data ) = @_;
+
+	cmd(
+		"d6 00  0c  09  $tag $data BEEF", "secure $tag -> $data",
+		"d6 00  0c  09 00  $tag    BEEF", sub { assert() },
+	);
+
+	forget_tag $tag;
 }
 
 sub secure_tag {
@@ -494,10 +534,7 @@
 	my $path = "$secure_path/$tag";
 	my $data = substr(read_file( $path ),0,2);
 
-	cmd(
-		"d6 00  0c  09  $tag $data BEEF", "secure $tag -> $data",
-		"d6 00  0c  09 00  $tag    BEEF", sub { assert() },
-	);
+	secure_tag_with( $tag, $data );
 
 	my $to = $path;
 	$to .= '.' . time();