diff --git a/README.md b/README.md index a46ecb0..7160d32 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ To run Surveillance using docker, decide between development/testing or producti 3. Run `docker compose up` and wait for services to start up -3. Visit `http://localhost:8081/` in a browser to open the web interface +3. Visit `http://localhost:8081/` in a browser; you should see an interactive OpenStreetMap 4. You can see most cameras on the map immediately; the `data_handler` background process continuously applies updates from OpenStreetMap which become visible after refrshing the page diff --git a/data_handler/utils/create_camera_update_statements.php b/data_handler/utils/create_camera_update_statements.php index a2a072c..cf18dfc 100755 --- a/data_handler/utils/create_camera_update_statements.php +++ b/data_handler/utils/create_camera_update_statements.php @@ -2,18 +2,6 @@ include "config.php"; -$seqNum = $_SERVER['argv'][1] ?? ''; -if (!ctype_digit($seqNum)) { - echo "Invalid sequence number\n"; - exit(1); -} - -// Quote a value for the generated SQL file. Values come from OSM data and are untrusted. -function sqlString($value) { - global $mysqli; - return "'" . $mysqli->real_escape_string((string) $value) . "'"; -} - $elementTypes = array(); $count = 0; $countDelete = 0; @@ -103,7 +91,7 @@ function endElement ($parser, $name) { $mode = ''; } else if ($name == 'node') { if ($mode == 'delete') { - $id = (int) $curNodeAttrs['id']; + $id = $curNodeAttrs['id']; if (! $deleteTagStmt->execute()) { echo "***** Error : Deleting tags $id : ". $deleteTagStmt->error . "\n"; @@ -131,7 +119,7 @@ function endElement ($parser, $name) { - $id = (int) $curNodeAttrs['id']; + $id = $curNodeAttrs['id']; if ($mode == 'modify') { if (! $deleteTagStmt->execute()) { @@ -152,36 +140,36 @@ function endElement ($parser, $name) { $k = 'lat'; $v = $curNodeAttrs['lat']; - $sql_statement = $sql_statement . "INSERT INTO tag (id, k, v) VALUES ($id, " . sqlString($k) . ", " . sqlString($v) . ");\n"; + $sql_statement = $sql_statement . "INSERT INTO tag (id, k, v) VALUES ($id, '$k', '$v');\n"; $k = 'lon'; $v = $curNodeAttrs['lon']; - $sql_statement = $sql_statement . "INSERT INTO tag (id, k, v) VALUES ($id, " . sqlString($k) . ", " . sqlString($v) . ");\n"; + $sql_statement = $sql_statement . "INSERT INTO tag (id, k, v) VALUES ($id, '$k', '$v');\n"; $k = 'userid'; $v = $curNodeAttrs['user']; - $sql_statement = $sql_statement . "INSERT INTO tag (id, k, v) VALUES ($id, " . sqlString($k) . ", " . sqlString($v) . ");\n"; + $sql_statement = $sql_statement . "INSERT INTO tag (id, k, v) VALUES ($id, '$k', '$v');\n"; $k = 'version'; $v = $curNodeAttrs['version']; - $sql_statement = $sql_statement . "INSERT INTO tag (id, k, v) VALUES ($id, " . sqlString($k) . ", " . sqlString($v) . ");\n"; + $sql_statement = $sql_statement . "INSERT INTO tag (id, k, v) VALUES ($id, '$k', '$v');\n"; $k = 'timestamp'; $v = $curNodeAttrs['timestamp']; - $sql_statement = $sql_statement . "INSERT INTO tag (id, k, v) VALUES ($id, " . sqlString($k) . ", " . sqlString($v) . ");\n"; + $sql_statement = $sql_statement . "INSERT INTO tag (id, k, v) VALUES ($id, '$k', '$v');\n"; foreach($curNodeTags as $k => $v) { - $sql_statement = $sql_statement . "INSERT INTO tag (id, k, v) VALUES ($id, " . sqlString($k) . ", " . sqlString($v) . ");\n"; + $sql_statement = $sql_statement . "INSERT INTO tag (id, k, v) VALUES ($id, '$k', '$v');\n"; } } else if ($mode == 'modify') { // delete former surveillance nodes that were modified to non-surveillance nodes - $id = (int) $curNodeAttrs['id']; + $id = $curNodeAttrs['id']; if (! $deleteTagStmt->execute()) { echo "***** Error : Deleting tags $id for non-surveillance node : ". $deleteTagStmt->error . "\n"; @@ -220,13 +208,11 @@ while ($data = fread($fp, 4096)) { } } -$syncStmt = $mysqli->prepare("UPDATE sync_state SET v=? WHERE k='sequenceNumber'"); -$syncStmt->bind_param('s', $seqNum); -$syncStmt->execute(); -$syncStmt->close(); -$sql_statement = $sql_statement . "UPDATE sync_state SET v='" . $seqNum ."' WHERE k='sequenceNumber';\n"; +$sql="UPDATE sync_state SET v='" . $_SERVER['argv'][1] ."' WHERE k='sequenceNumber';"; +$mysqli->query($sql); +$sql_statement = $sql_statement . "UPDATE sync_state SET v='" . $_SERVER['argv'][1] ."' WHERE k='sequenceNumber';\n"; $sql_statement = $sql_statement . "COMMIT;"; -$sql_file = "/migrations/".$seqNum.".sql"; +$sql_file = "/migrations/".$_SERVER['argv'][1].".sql"; file_put_contents($sql_file, $sql_statement); $mysqli->close(); diff --git a/data_handler/utils/update_camera.php b/data_handler/utils/update_camera.php index 539e0ca..dc88e48 100755 --- a/data_handler/utils/update_camera.php +++ b/data_handler/utils/update_camera.php @@ -2,12 +2,6 @@ include "config.php"; -$seqNum = $_SERVER['argv'][1] ?? ''; -if (!ctype_digit($seqNum)) { - echo "Invalid sequence number\n"; - exit(1); -} - $elementTypes = array(); $count = 0; $countDelete = 0; @@ -287,10 +281,8 @@ while ($data = fread($fp, 4096)) { } } -$syncStmt = $mysqli->prepare("UPDATE sync_state SET v=? WHERE k='sequenceNumber'"); -$syncStmt->bind_param('s', $seqNum); -$syncStmt->execute(); -$syncStmt->close(); +$sql="UPDATE sync_state SET v='" . $_SERVER['argv'][1] ."' WHERE k='sequenceNumber';"; +$mysqli->query($sql); $mysqli->commit(); printDebug(); diff --git a/docker-compose.yml b/docker-compose.yml index 290227d..99ed328 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: DEFAULT_LANGUAGE: en IMPRESSUM_URL: https://hamburg.ccc.de/imprint/ ports: - - "8080:80" + - "8081:80" depends_on: db: condition: service_started diff --git a/web/Containerfile b/web/Containerfile index 984e64c..e8b5998 100644 --- a/web/Containerfile +++ b/web/Containerfile @@ -1,17 +1,4 @@ -FROM docker.io/library/php:8.5.12-apache +FROM docker.io/library/php:apache RUN docker-php-ext-install mysqli bcmath - -# Use PHP's production defaults (no error output to clients) and hide the PHP version. -RUN cp "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \ - && printf 'expose_php = Off\n' > "$PHP_INI_DIR/conf.d/zz-hardening.ini" - -# Disable directory listings and reduce the server signature. -RUN sed -i 's/^\(\s*Options\) Indexes FollowSymLinks/\1 FollowSymLinks/' /etc/apache2/apache2.conf \ - && sed -i -e 's/^ServerTokens .*/ServerTokens Prod/' -e 's/^ServerSignature .*/ServerSignature Off/' /etc/apache2/conf-available/security.conf - -COPY ./www/* /var/www/html - -# The web server must not be able to create or modify files in the document root. -RUN chown -R root:root /var/www/html \ - && chmod -R u=rwX,go=rX /var/www/html +COPY ./www/* /var/www/html \ No newline at end of file diff --git a/web/www/sunders/camera.php b/web/www/sunders/camera.php index f7c26e4..9c94d7f 100644 --- a/web/www/sunders/camera.php +++ b/web/www/sunders/camera.php @@ -3,17 +3,6 @@ define('MAX_POINTS_FOR_QUICKHULL', 3000); - // Fields set by this script; OSM tags with these keys are not passed on. - define('RESERVED_KEYS', array('lat', 'lon', 'id', 'count', 'multi', 'poly')); - - define('JSON_FLAGS', JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_INVALID_UTF8_SUBSTITUTE); - - function exitWithError($message) { - header('Content-type: application/json; charset=utf-8'); - echo json_encode(array('error' => $message), JSON_FLAGS); - exit; - } - class OsmPoint { var $id; var $lat; @@ -189,47 +178,63 @@ || !array_key_exists('zoom', $_GET) || !array_key_exists('width', $_GET) || !array_key_exists('height', $_GET)) { - exitWithError('bbox, zoom, width and height parameters are required. ' + header('Content-type: application/json'); + $result = '{"error":"bbox, zoom, width and height parameters are required. ' .(array_key_exists('bbox', $_GET) ? '' : 'bbox is empty. ') .(array_key_exists('zoom', $_GET) ? '' : 'zoom is empty. ') .(array_key_exists('width', $_GET) ? '' : 'width is empty. ') - .(array_key_exists('height', $_GET) ? '' : 'height is empty. ')); + .(array_key_exists('height', $_GET) ? '' : 'height is empty. ') + .'"}'; + echo $result; + exit; } /* Check zoom */ $zoom = $_GET['zoom']; - if ( !is_string($zoom) - || !is_numeric($zoom) + if ( !is_numeric($zoom) || intval($zoom) < 1 || intval($zoom) > 19) { - exitWithError('unexpected zoom value'); + header('Content-type: application/json'); + $result = '{"error":"unexpected zoom value : ' + .htmlentities($zoom) + .'"}'; + echo $result; + exit; } /* Check bounds box --> bbox=boundsSW.lng,boundsSW.lat,boundsNE.lng,boundsNE.lat */ - if (!is_string($_GET['bbox'])) { - exitWithError('unexpected bbox value'); - } $bbox = explode(',', $_GET['bbox']); - if ( count($bbox) != 4 - || !is_numeric($bbox[0]) || $bbox[0] > 180 // 0 = SW.lng + if ( !is_numeric($bbox[0]) || $bbox[0] > 180 // 0 = SW.lng || !is_numeric($bbox[2]) || $bbox[2] < -180 // 2 = NE.lng || !is_numeric($bbox[1]) || $bbox[1] < -90 || $bbox[1] > 90 // 1 = SW.lat || !is_numeric($bbox[3]) || $bbox[3] < -90 || $bbox[3] > 90) { // 3 = NE.lat - exitWithError('unexpected bbox longitude and latitude values : ' - .'lon ['.$bbox[0].', '.$bbox[2].'], ' - .'lat ['.$bbox[1].', '.$bbox[3].']'); + header('Content-type: application/json'); + $result = '{"error":"unexpected bbox longitude and latitude values : ' + .'lon ['.htmlentities($bbox[0]).', '.htmlentities($bbox[2]).'], ' + .'lat ['.htmlentities($bbox[1]).', '.htmlentities($bbox[3]).']' + .'"}'; + echo $result; + exit; } if ($bbox[0] >= $bbox[2]) { // 0 = SW.lng | 2 = NE.lng - exitWithError('min longitude greater than max longitude : ' - .'lon ['.$bbox[0].', '.$bbox[2].']'); + header('Content-type: application/json'); + $result = '{"error":"min longitude greater than max longitude : ' + .'lon ['.htmlentities($bbox[0]).', '.htmlentities($bbox[2]).']' + .'"}'; + echo $result; + exit; } if ($bbox[1] >= $bbox[3]) { // 1 = SW.lat | 3 = NE.lat - exitWithError('min latitude greater than max latitude : ' - .'lat ['.$bbox[1].', '.$bbox[3].']'); + header('Content-type: application/json'); + $result = '{"error":"min latitude greater than max latitude : ' + .'lat ['.htmlentities($bbox[1]).', '.htmlentities($bbox[3]).']' + .'"}'; + echo $result; + exit; } $lonMin = $bbox[0]; // 0 = SW.lng @@ -241,7 +246,12 @@ $pixelHeight = (int) $_GET['height']; if ($pixelWidth == 0 || $pixelHeight == 0) { - exitWithError('width or height is null : '.$pixelWidth.'x'.$pixelHeight); + header('Content-type: application/json'); + $result = '{"error":"width or height is null : ' + .htmlentities($pixelWidth).'x'.htmlentities($pixelHeight) + .'"}'; + echo $result; + exit; } $lonWidth = $lonMax - $lonMin; // NE.lng - SW.lng @@ -257,7 +267,10 @@ /* Connect to database */ $mysqli = new mysqli(MYSQL_HOST, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DB); if($mysqli->connect_errno) { - exitWithError('error while connecting to db'); + header('Content-type: application/json'); + $result = '{"error":"error while connecting to db : ' . $mysqli->error . '"}'; + echo $result; + exit; } $rqtLonMin = $lonMin; // SW.lng @@ -351,7 +364,10 @@ $stmt->close(); } else { $mysqli->close(); - exitWithError('error while querying db'); + header('Content-type: application/json'); + $result = '{"error":"Error while request : ' . $mysqli->error . '"}'; + echo $result; + exit; } /* Unify some clusters if nodes center are near */ @@ -363,7 +379,8 @@ } } - $result = array(); + $result='['; + $separator=''; /* Writing selected points */ $sql='SELECT k, v @@ -375,49 +392,53 @@ $stmt->bind_param('d', $id); $stmt->bind_result($k, $v); - /* Writing grouped items or not. All values are passed on unescaped; the client - must escape them before inserting them into HTML. */ + /* Writing grouped items or not */ foreach($resArray as $val) { if ($val['count'] > 0) { - $entry = array( - 'lat' => (string) ($val['latitude'] / $val['count']), - 'lon' => (string) ($val['longitude'] / $val['count'])); + $result = $result.$separator + .'{"lat":"'.($val['latitude'] / $val['count']).'"' + .',"lon":"'.($val['longitude'] / $val['count']).'"'; if ($val['count'] == 1) { $id = $val['points'][0]->id; - $entry['id'] = (string) $id; + $result = $result.',"id":"'.$id.'"'; $stmt->execute(); while($stmt->fetch()) { - if (!in_array($k, RESERVED_KEYS, true)) { - $entry[$k] = (string) $v; - } + $result = $result.',"'.htmlentities($k).'":"'.htmlentities($v, ENT_COMPAT, 'UTF-8').'"'; } } else { - $entry['count'] = (string) $val['count']; - $entry['multi'] = 'yes'; - $entry['poly'] = array(); + $result = $result + .',"count":"'.$val['count'].'"' + .',"multi":"yes"' + .',"poly":['; if ($pointsCount < MAX_POINTS_FOR_QUICKHULL) { $convexPoly = quickHull($val['points'], $val['count']); + $sepPoly = ''; foreach($convexPoly as $point) { - $entry['poly'][] = array( - 'lat' => (string) $point->lat, - 'id' => (string) $point->id, - 'lon' => (string) $point->lon); + $result = $result.$sepPoly.'{' + .'"lat":"'.$point->lat.'"' + .',"id":"'.$point->id.'"' + .',"lon":"'.$point->lon.'"}'; + $sepPoly=','; } } + $result=$result.']'; } - $result[] = $entry; + $result = $result.'}'; + $separator=','; } } $stmt->close(); + $result = $result . ']'; + $mysqli->close(); - header('Content-type: application/json; charset=utf-8'); - echo json_encode($result, JSON_FLAGS); + header('Content-type: application/json; Charset : utf-8'); + echo $result; ?> diff --git a/web/www/sunders/js/leafletembed_functions.js b/web/www/sunders/js/leafletembed_functions.js index a2db7a5..1cbdd46 100644 --- a/web/www/sunders/js/leafletembed_functions.js +++ b/web/www/sunders/js/leafletembed_functions.js @@ -129,11 +129,7 @@ function onClick(e) { function onStateChanged() { if (ajaxRequest.readyState == 4) { // 0 = UNSENT, 1 = OPENED, 2 = HEADERS_RECEIVED, 3 = LOADING, 4 = DONE if (ajaxRequest.status == 200) { // 200 = OK, 404 = Page not found - try { - plotList = JSON.parse(ajaxRequest.responseText); - } catch(e) { - return; - } + plotList = eval('(' + ajaxRequest.responseText + ')'); removeMarkers(); for (i=0; i/g, '>') - .replace(/"/g, '"') - .replace(/'/g, '''); -} - // Add camera popup to camera marker. -// All values in plot come unescaped from OSM data and must be escaped. function addCameraDetailsData(plotMarker, plot) { - var id = escapeHtml(plot.id); popupDataTable = '' - + '' - // + '' - + '' - + ''; + + '' + // + '' + + '' + + ''; for (x in plot) { if (plot[x] !== '' && x != 'multi' && x != 'id' && x != 'userid' && x != 'lat' && x != 'lon') { - popupDataTable = popupDataTable + ''; } diff --git a/web/www/sunders/js/search.js b/web/www/sunders/js/search.js index 38f69a5..4ba00a0 100644 --- a/web/www/sunders/js/search.js +++ b/web/www/sunders/js/search.js @@ -37,32 +37,15 @@ function searchLocation(maxResults) { searchLimit = 11; } - var searchUrl = 'https://nominatim.openstreetmap.org/search?q=' + encodeURIComponent(searchString) - + '&format=json&limit=' + encodeURIComponent(searchLimit); - fetch(searchUrl) - .then(function(response) { return response.json(); }) - .then(parseResult) - .catch(function() { parseResult([]); }); + var searchScript = document.createElement('script'); + searchScript.src = 'https://nominatim.openstreetmap.org/search.php?q=' + searchString + '&format=json&json_callback=parseResult&limit=' + searchLimit; + document.body.appendChild(searchScript); } } -// Escape a value for use in HTML text and in double-quoted attributes. -function escapeSearchHtml(value) { - return String(value) - .replace(/&/g, '&') - .replace(//g, '>') - .replace(/"/g, '"') - .replace(/'/g, '''); -} - function parseResult(response) { var searchResultDivs = ''; - if (!Array.isArray(response)) { - response = []; - } - if (response.length == searchLimit) { var lastResultIndex = searchLimit - 1; var nextSearchLimit = searchLimit + 10; @@ -84,15 +67,10 @@ function parseResult(response) { // Show the current 10 search results. for (var i=searchLimit-11; i' + - '
' + escapeSearchHtml(searchResult.class) + ' / ' + escapeSearchHtml(searchResult.type) + '
' + - '
' + escapeSearchHtml(searchResult.display_name) + '
' + + '
' + + '
' + searchResult.class + ' / ' + searchResult.type + '
' + + '
' + searchResult.display_name + '
' + '
'; } diff --git a/web/www/sunders/json/links.json b/web/www/sunders/json/links.json index 3f8aeda..f597479 100644 --- a/web/www/sunders/json/links.json +++ b/web/www/sunders/json/links.json @@ -3,17 +3,22 @@ { "sectionTitle": "", "isExpandable": false, "isExpandedByDefault": true, "listEntries": [ { "sourceText": "1984 Actionday", "href": "https://1984actionday.wordpress.com/", "linkText": "When will you fight back?" }, { "sourceText": "ACLU", "href": "https://www.aclu.org/sites/default/files/field_document/061819-robot_surveillance.pdf", "linkText": "The Dawn of Robot Surveillance" }, + { "sourceText": "Adversarial Fashion", "href": "https://adversarialfashion.com/", "linkText": "Patterns on goods designed to trigger Automated License Plate Readers" }, { "sourceText": "Atlas of Surveillance", "href": "https://atlasofsurveillance.org/", "linkText": "Documenting Police Tech in Our Communities" }, { "sourceText": "Ban Facial Recognition", "href": "https://www.banfacialrecognition.com/", "linkText": "Ban Facial Recognition" }, { "sourceText": "Ban Facial Recognition", "href": "https://www.banfacialrecognition.com/festivals/", "linkText": "Ban Facial Recognition at Festivals" }, + { "sourceText": "Ban Facial Recognition", "href": "https://ban-facial-recognition.wesign.it/droitshumains/ban-facial-recognition-europe", "linkText": "Ban Facial Recognition Europe!" }, { "sourceText": "Electronic Frontier Foundation", "href": "https://www.eff.org/sls", "linkText": "Street Level Surveillance" }, + { "sourceText": "Every Two Years", "href": "https://everytwoyears.org/", "linkText": "Help Make Democracy" }, { "sourceText": "Fawkes", "href": "http://sandlab.cs.uchicago.edu/fawkes/", "linkText": "Image “Cloaking” for Personal Privacy" }, { "sourceText": "GitHub", "href": "https://github.com/unsurv", "linkText": "unsurv" }, - { "sourceText": "Insecam", "href": "http://www.insecam.org/", "linkText": "World biggest online cameras directory" }, + { "sourceText": "Insecam", "href": "https://www.insecam.org/", "linkText": "World biggest online cameras directory" }, { "sourceText": "No CCTV", "href": "http://www.no-cctv.org.uk/", "linkText": "Campaigning against camera surveillance in the UK & beyond" }, { "sourceText": "NYC Surveillance Camera Project", "href": "http://www.mediaeater.com/cameras/", "linkText": "NYC Surveillance Camera Project" }, { "sourceText": "Reclaim Your Face", "href": "https://reclaimyourface.eu/", "linkText": "Reclaim Your Face" }, { "sourceText": "S.T.O.P.", "href": "https://www.stopspying.org/", "linkText": "The Surveillance Technology Oversight Project" }, + { "sourceText": "Spy Blog", "href": "https://p10.secure.hostingprod.com/@spyblog.org.uk/ssl/spyblog/cctv-surveillance-cameras/", "linkText": "Category: CCTV surveillance cameras" }, + { "sourceText": "unsurv", "href": "https://www.unsurv.org/", "linkText": "unsurv.org" }, { "sourceText": "Wikipedia", "href": "https://www.wikipedia.org/wiki/Mass_surveillance_in_the_United_States", "linkText": "Mass Surveillance in the United States" }, { "sourceText": "Yale University", "href": "https://privacylab.yale.edu/", "linkText": "Privacy Lab" } ] } @@ -22,6 +27,7 @@ { "listTitle": "fra", "sections": [ { "sectionTitle": "", "isExpandable": false, "isExpandedByDefault": true, "listEntries": [ + { "sourceText": "Ban Facial Recognition", "href": "https://ban-facial-recognition.wesign.it/droitshumains/bannissons-la-reconnaissance-faciale-en-europe", "linkText": "Bannissons la reconnaissance faciale en Europe!" }, { "sourceText": "BUG BROTHER", "href": "http://bugbrother.blog.lemonde.fr/", "linkText": "Qui surveillera les surveillants?" }, { "sourceText": "LA QUADRATURE DU NET", "href": "https://www.laquadrature.net/fr", "linkText": "Internet & Libertés" }, { "sourceText": "Reclaim Your Face", "href": "https://reclaimyourface.eu/fr/", "linkText": "Reclaim Your Face FR" }, @@ -32,17 +38,20 @@ { "listTitle": "ger", "sections": [ { "sectionTitle": "", "isExpandable": false, "isExpandedByDefault": true, "listEntries": [ - { "sourceText": "AK Vorrat", "href": "http://wiki.vorratsdatenspeicherung.de/Arbeitsgruppe_Videoüberwachung", "linkText": "Arbeitsgruppe Videoüberwachung" }, + { "sourceText": "AK Vorrat", "href": "http://wiki.vorratsdatenspeicherung.de/Arbeitsgruppe_Video%C3%BCberwachung", "linkText": "Arbeitsgruppe Videoüberwachung" }, { "sourceText": "AK Vorrat", "href": "http://wiki.vorratsdatenspeicherung.de/images/Folder_cctv.pdf", "linkText": "Infobroschüre: Videoüberwachung? Sicherheit geht anders!" }, { "sourceText": "AK Vorrat, Ortsgruppe Hannover", "href": "http://wiki.vorratsdatenspeicherung.de/Ortsgruppen/Hannover/Videoueberwachung_in_Hannover", "linkText": "Videoüberwachung in Hannover" }, { "sourceText": "AKTION FREIHEIT STATT ANGST", "href": "https://www.aktion-freiheitstattangst.org/", "linkText": "Aktion Freiheit statt Angst e.V." }, + { "sourceText": "Ban Facial Recognition", "href": "https://ban-facial-recognition.wesign.it/droitshumains/verbot-der-gesichtserkennung-in-europa", "linkText": "Verbot der Gesichtserkennung in Europa!" }, { "sourceText": "Benjamin J. Kees", "href": "https://algoropticon.de/", "linkText": "Algorithmisches Panopticon" }, { "sourceText": "dieDatenschützer Rhein-Main", "href": "https://ddrm.de/category/videouberwachung-2/", "linkText": "Kategoriearchiv: Videoüberwachung" }, { "sourceText": "EPICENTER.WORKS", "href": "https://epicenter.works/thema/face-recognition", "linkText": "Face Recognition - Gesichtserkennung" }, { "sourceText": "EPICENTER.WORKS", "href": "https://überwachungspaket.at/", "linkText": "Stoppt das Überwachungspaket!" }, { "sourceText": "Frag den Staat", "href": "https://fragdenstaat.de/anfrage/informationen-zum-projekt-sicherheitsbahnhof-berlin-sudkreuz/", "linkText": "Informationen zum „Projekt Sicherheitsbahnhof“ Berlin Südkreuz" }, { "sourceText": "Frag den Staat", "href": "https://fragdenstaat.de/anfrage/datenschutzkonzept-fur-videouberwachung-am-bahnhof-berlin-sudkreuz/", "linkText": "Datenschutzkonzept für Videoüberwachung am Bahnhof Berlin Südkreuz" }, - { "sourceText": "Reclaim Your Face", "href": "https://reclaimyourface.eu/de/", "linkText": "Reclaim Your Face DE" } + { "sourceText": "Kassel-Watch-Log", "href": "https://www.ks-watch.de/", "linkText": "Videoüberwachung im öffentlichen Raum Kassel" }, + { "sourceText": "Reclaim Your Face", "href": "https://reclaimyourface.eu/de/", "linkText": "Reclaim Your Face DE" }, + { "sourceText": "_STATTKAMERAS", "href": "https://stattkameras.de/", "linkText": "Gegen Videoüberwachung am Hansaplatz" } ] } ] } diff --git a/web/www/sunders/stats/index.php b/web/www/sunders/stats/index.php index 56ef660..7a0dac4 100644 --- a/web/www/sunders/stats/index.php +++ b/web/www/sunders/stats/index.php @@ -84,8 +84,8 @@ } else { $i18n = $i18nCountries; $i18nDefault = $i18nCountriesDefault; - // Check if $key consists of 2 capital letters or is '--' (unknown country). - $key = (preg_match('/^[A-Z]{2}$/', $valsArray[$i]) === 1 || $valsArray[$i] === '--') ? $valsArray[$i] : 'dontfindme'; + // Check if $key consists of 2 capital letters. + $key = preg_match('/\b[A-Z]{2}\b/', $valsArray[$i]) === 1 || '--' ? $valsArray[$i] : 'dontfindme'; } if (!isValidValue($i18n, $i18nDefault, $key)) { // ignore 'vals' and 'cols'