diff --git a/2011-28c3/questions.yaml b/2011-28c3/questions.yaml
index e8e8701..a42447a 100644
--- a/2011-28c3/questions.yaml
+++ b/2011-28c3/questions.yaml
@@ -1,3 +1,4 @@
+#TODO Sojus Koppelmanöver
#--- !Question
#question: What is the question?
#answers:
@@ -22,17 +23,17 @@ answers:
- true: Sony
- true: Sony
tier: 1
-game_round: 2
+game_round: 1
media:
question:
- - pix/q_target.png
+ - pix/q_target.png TODO
explanation:
- - pix/a_target.jpg
+ - pix/a_target.jpg TODO
--- !Question
# http://de.wikipedia.org/wiki/Strahlenkrankheit
# Wie gut koennen sich Leute die Fukushima facts merken?
-question: What is leathal doses of radioactivity that causes death with 100% probability within 14 days after exposition (LD100/14)? (1 Gray (Gy) == 1 Sievert (Sv))
+question: What is leathal doses of radioactivity that causes death with 100% probability within 14 days after exposition (LD100/14)? (1 Gray (Gy) == 1 Sievert (Sv)) #TODO Inforgrafik, und Frage kuerzer
answers:
- false: "> 6 mGy"
- false: "> 600 mGy"
@@ -48,7 +49,7 @@ media:
--- !Question
# http://www.justiz.sachsen.de/smj/content/2674.php Offizielle Pressemitteilung
-question: Why did Saxony (German State) not use the Bundestrojaner (governmental trojan horse)?
+question: Why did Saxony (German State) not use the Staatstrojaner (governmental trojan horse)?
answers:
- true: Technically not capable of doing so.
- false: Ethically not justifiable.
@@ -159,7 +160,7 @@ answers:
- false: 415 days
- true: 541 days
- false: 451 days
- - false: 154 days
+ - false: 514 days
tier: 8
game_round: 1
media:
@@ -202,7 +203,7 @@ media:
--- !Question
# http://linux.slashdot.org/story/11/10/05/1920255/welcome-back-kernelorg
-question: How many weeks did it take to bring kernel.org back up after it has been hacked in end of August 2011?
+question: How many weeks did it take to bring kernel.org back up after they found out that it has been hacked in end of August 2011?
answers:
- false: ~ 1 week
- false: It is still not up
@@ -236,7 +237,7 @@ media:
# http://arstechnica.com/tech-policy/news/2011/10/get-hacked-dont-tell-drone-base-didnt-report-virus.ars
question: How did the US Airforce cyber security departement learn about the virus infected drones?
answers:
- - false: Advanced intrusion detection mechanisms
+ - false: Intrusion detection mechanisms
- true: Read it in the news
- false: The badly programmed virus caused system instabilities
- false: By random, during standart maintainance
@@ -399,7 +400,7 @@ answers:
- true: It can run the same viruses?
- false: It can import MS Word now.
- false: It has the same plugin-api.
- - true: It fucks up documents just as well.
+ - false: It fucks up documents just as well.
tier: 6
game_round: 2
media:
@@ -424,7 +425,7 @@ media:
- videos/question1.webm
--- !Question
-question: Which company delivers software that could reboot by a IPv6 ping in 2011?
+question: Which company delivers software that could be rebooted by a IPv6 ping in 2011?
answers:
- false: Microsoft
- true: Cisco
@@ -441,10 +442,10 @@ media:
--- !Question
question: How much money has HP spent in CEO pay-offs since 2005?
answers:
- - false: $10 mio
+ - false: $100 mio
- true: $80 mio
- - false: $50 mio
- - false: $25 mio
+ - false: $1 bln
+ - false: $500 mio
tier: 9
game_round: 2
media:
@@ -499,7 +500,7 @@ media:
- videos/question1.webm
--- !Question
-question: What is the gain in round trip time by the new $300 mio EU-US cable (first in 10 years)?
+question: What is the improvement of round trip time by the new $300 mio EU-US cable (first in 10 years)?
answers:
- false: 6s
- false: 0.6s
@@ -529,22 +530,7 @@ media:
- videos/phonestory.webm
--- !Question
-question: Which App wasn't removed from the Apple app store this year?
-answers:
- - false: Phone Story
- - true: Cure-Gay
- - false: Smuggle Truck
- - false: Conterfai Lugary
-tier: 5
-game_round: 3
-media:
- question:
- - pix/question1.png
- explanation:
- - videos/question1.webm
-
---- !Question
-question: Why does the German SPD politician Sebastian Edathy wants the data retention law?
+question: Why does the German SPD politician Sebastian Edathy want the data retention law?
answers:
- true: to catch who send him a plastic pussy
- false: to catch file sharers
@@ -559,7 +545,7 @@ media:
- videos/question1.webm
--- !Question
-question: What was not patented to our knowledge?;Snowman;Snowball;Patenting;Geotracking;1;
+question: What was not patented to our knowledge?
answers:
- true: Snowman
- false: Snowball
@@ -588,21 +574,6 @@ media:
explanation:
- videos/question1.webm
---- !Question
-question: Which country did not get his copyright law dictated by the US?
-answers:
- - false: Canada
- - false: Spain
- - false: Sweden
- - true: Russia
-tier: 9
-game_round: 3
-media:
- question:
- - pix/question1.png
- explanation:
- - videos/question1.webm
-
--- !Question
question: What vendor/project did not violate the GPL?
answers:
@@ -647,21 +618,6 @@ media:
explanation:
- videos/question1.webm
---- !Question
-question: Which city is going to support founding of 100 hackerspaces?
-answers:
- - false: Paris
- - false: New York
- - true: Shanghai
- - false: Rio de Janeiro
-tier: 3
-game_round: 4
-media:
- question:
- - pix/question1.png
- explanation:
- - pix/shanghai.jpg
-
--- !Question
question: Who did not die this year?
answers:
@@ -693,7 +649,7 @@ media:
- pix/shanghai.jpg
--- !Question
-question: How many babies were given away in Spain between and the 90-es?
+question: How many babies were given away in Spain between TODO and the 90-es?
answers:
- false: PHP
- true: 300,000
@@ -708,12 +664,14 @@ media:
- pix/shanghai.jpg
--- !Question
-question: How many Mrs USA finalists think evolution should be taught in school?
+question: How many Mrs USA finalists think evolution should be taught in school (out of 51)?
+source: http://themoderatevoice.com/114102/americas-rejection-of-evolution-reflected-in-miss-usa-pageant/
+comment: I’m a big science geek
answers:
- - false: PHP
- - true: 300,000
- - false: Java
- - false: Dennis Ritchie
+ - true: 1
+ - false: 2
+ - false: 4
+ - false: 8
tier: 7
game_round: 4
media:
@@ -767,6 +725,22 @@ media:
explanation:
- videos/question1.webm
+--- !Question
+question: What answers Siri when you ask it "Can you call me an ambulance?"
+answers:
+ - true: goose
+ - false: sheep
+ - false: chicken
+ - false: dog
+tier: 10
+game_round: 4
+media:
+ question:
+ - pix/question1.png
+ explanation:
+ - videos/question1.webm
+
+
#8;What detail the Homeland Security software FAST doesn't take into account to compute potential criminals?;ethnische Zugehörigkeit;Körpermaße;Abstammung;Haarfarbe;4
#1;Welches Land hat ACTA noch nicht unterzeichnet?;Australien;Japan;Kanada;Deutschland;4;
diff --git a/TODO b/TODO
index 072183a..5a86a53 100644
--- a/TODO
+++ b/TODO
@@ -46,6 +46,15 @@
= Hotfixes =
DONE: nedap flush
DONE: nedap encoding
-timeout sound
+DONE: timeout sound
DONE: irc+nedap auf 1. screen
-overload
+DONE: overload
+
+
+= 28C3 =
+
+how to reproduce: shift to self & dead keys?
+
+credits + battletoads.ogg
+websocket keys change
+fragen mit quelle live auf identi.ca posten
diff --git a/censor.html b/censor.html
index eb7fda7..86c8d97 100644
--- a/censor.html
+++ b/censor.html
@@ -17,6 +17,18 @@
.image img {
max-width: 30%;
}
+ .image .accept {
+ font-size: 150%;
+ color: #007f00;
+ }
+ .image .reject {
+ font-size: 150%;
+ color: #7f0000;
+ }
+ .image .postpone {
+ font-size: 125%;
+ color: #7f7f00;
+ }
diff --git a/nedap/server.js b/nedap/server.js
index 97a96c6..4d4acff 100644
--- a/nedap/server.js
+++ b/nedap/server.js
@@ -6,6 +6,11 @@ var mime = require('mime');
var WS_KEY = 'nedap-kneemFothbedchoadHietEnobKavLub1';
var MIME_HTML = 'text/html; charset=UTF-8';
+var ROOT_HEADERS = { 'Content-type': MIME_HTML,
+ 'Pragma': 'no-cache',
+ 'Expires': '-1',
+ 'Cache-Control': 'no-cache, must-revalidate, max-age=1'
+ };
var UPLOAD_DIR = "static/gifs";
var GIFS_PREFIX = "http://localhost:2342/gifs/";
try { fs.mkdirSync(UPLOAD_DIR); } catch (e) {}
@@ -56,6 +61,12 @@ function updateBackend() {
}
}
+function errorResponse(res) {
+ res.writeHead(503, { 'Content-type': MIME_HTML });
+ res.write("![](\"/503.png\")
");
+ res.end();
+}
+
function nedap(app) {
app.get('/', function(req, res) {
if (mode === 'nedap' &&
@@ -83,11 +94,10 @@ function nedap(app) {
form.c('input', { type: 'submit',
value: 'Submit' });
- res.writeHead(200, { 'Content-type': MIME_HTML });
+ res.writeHead(200, ROOT_HEADERS);
res.write(html(form.toString()));
res.end();
} else if (mode === 'gif') {
- res.writeHead(200, { 'Content-type': MIME_HTML });
var form = new ltx.Element('form', { action: "/i",
method: "POST",
enctype: "multipart/form-data"
@@ -99,10 +109,11 @@ function nedap(app) {
name: 'token',
value: Token.generate() });
form.c('p').t("Max file size: 2 MB");
+ res.writeHead(200, ROOT_HEADERS);
res.write(html(form.toString()));
res.end();
} else {
- res.writeHead(404, { 'Content-type': MIME_HTML });
+ res.writeHead(404, ROOT_HEADERS);
res.write(html('No question left on server.
'));
res.end();
}
@@ -120,30 +131,23 @@ function nedap(app) {
'Location': '/thanks' });
res.end();
} else {
- res.writeHead(400, { 'Content-type': MIME_HTML,
- 'Location': '/' });
- res.write(html("Face validation error.
"));
- res.end();
+ errorResponse(res);
}
} else {
- res.writeHead(400, { 'Content-type': MIME_HTML,
- 'Location': '/' });
- res.write(html("Huh?
"));
- res.end();
+ errorResponse(res);
}
});
app.get('/thanks', function(req, res) {
res.writeHead(200, { 'Content-type': MIME_HTML });
- res.write(html("Thanks, your vote may have been counted.
"));
+ res.write(html("Thanks, your vote may have been counted. Back
"));
res.end();
});
app.post('/i', function(req, res) {
if (req.files.gif) {
if (!Token.validate(req.body.token)) {
- res.writeHead(200, { 'Content-type': MIME_HTML });
- res.end("Cheater!");
+ errorResponse(res);
return;
}
/* pass to frontend */
@@ -161,13 +165,12 @@ function nedap(app) {
} }));
});
- res.writeHead(200, { 'Content-type': MIME_HTML });
- res.write(html("Image eval() successful!
"));
+ res.writeHead(303, { 'Content-type': MIME_HTML,
+ 'Location': '/thanks' });
res.end();
} else {
console.error(err.stack || err);
- res.writeHead(500, { 'Content-type': 'text/plain' });
- res.end("Oops");
+ errorResponse(res);
}
});
diff --git a/nedap/static/503.png b/nedap/static/503.png
new file mode 100644
index 0000000..17d66eb
Binary files /dev/null and b/nedap/static/503.png differ
diff --git a/quiz.css b/quiz.css
index 02fe3a3..c5fac17 100644
--- a/quiz.css
+++ b/quiz.css
@@ -144,8 +144,9 @@ ul#tiers li.done {
font-size: 175%;
}
#scoreboard dl dd {
- margin-left: 4em;
+ margin-left: 1em;
margin-bottom: 0.65em;
+ font-size: 90%;
}
#scoreboard dl dd .score {
font-size: 125%;
@@ -153,7 +154,7 @@ ul#tiers li.done {
}
#scoreboard dl dd img {
- margin-left: 0.5em;
+ margin-left: 0.2em;
}
#timer {
@@ -184,5 +185,6 @@ ul#tiers li.done {
}
#gifs img {
+ display: inline-block;
max-width: 20%;
}
\ No newline at end of file