Update from xhtml to html and add /files/stat

2025-09-17 16:03:45 +02:00
parent cc3c0cab45
commit 2007c21fe4
4 changed files with 63 additions and 40 deletions
--- a/www/de/index.xhtml
+++ b/www/de/index.xhtml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="de" prefix="og: https://ogp.me/ns#">
+<html lang="de" prefix="og: https://ogp.me/ns#">
 <head>
  <meta charset="UTF-8"/>
  <title>Elwig - Elektronische Winzergenossenschaftsverwaltung</title>
@@ -39,7 +38,7 @@
        <li><a href="https://git.necronda.net/winzer/">Quellcode</a></li>
      </ul>
      <div>
-        <a href="/en/" class="flag"><div/></a>
+        <a href="/en/" class="flag"><div></div></a>
      </div>
    </nav>
  </header>
@@ -55,11 +54,11 @@
          </div>
        </div>
      </a>
-      <div class="blur bottom"/>
+      <div class="blur bottom"></div>
    </section>

    <section class="about">
-      <span id="about"/>
+      <span id="about"></span>
      <h3>Elwig</h3>
      <p>
        Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore etdolore magna aliquyam erat, sed diam voluptua.
@@ -76,12 +75,12 @@
    </section>

    <section class="picture-1 background">
-      <div class="blur top"/>
-      <div class="blur bottom"/>
+      <div class="blur top"></div>
+      <div class="blur bottom"></div>
    </section>

    <section class="clients">
-      <span id="clients"/>
+      <span id="clients"></span>
      <h3>Die Genossenschaften</h3>
      <div class="container background">
        <div>
@@ -92,9 +91,9 @@
          <p class="link">
            <a href="https://winzermatzen.at/">winzermatzen.at</a>
          </p>
-          <div class="edge"/><div class="edge"/><div class="edge"/><div class="edge"/>
+          <div class="edge"></div><div class="edge"></div><div class="edge"></div><div class="edge"></div>
        </div>
-        <div class="filling"/>
+        <div class="filling"></div>
        <div>
          <h4>Winzerkeller im Weinviertel</h4>
          <h5><span>Winzerkeller im Weinviertel</span><br/><span>reg. Gen.m.b.H.</span></h5>
@@ -103,18 +102,18 @@
          <p class="link">
            <a href="http://www.winzerkeller.eu/">winzerkeller.eu</a>
          </p>
-          <div class="edge"/><div class="edge"/><div class="edge"/><div class="edge"/>
+          <div class="edge"></div><div class="edge"></div><div class="edge"></div><div class="edge"></div>
        </div>
-        <div class="filling"/>
+        <div class="filling"></div>
        <div>
          <h4>WG Weinland</h4>
          <h5><span>Winzergenossenschaft Weinland,</span> <span>mit dem Sitz in Groß-Inzersdorf,</span><br/><span>reg. Gen.m.b.H.</span></h5>
          <h6>Zweigstellen:</h6>
          <div class="branches">Groß-Inzersdorf</div>
          <p class="link"></p>
-          <div class="edge"/><div class="edge"/><div class="edge"/><div class="edge"/>
+          <div class="edge"></div><div class="edge"></div><div class="edge"></div><div class="edge"></div>
        </div>
-        <div class="filling"/>
+        <div class="filling"></div>
        <div>
          <h4>WG Baden</h4>
          <h5><span>Winzergenossenschaft</span> <span>Baden - Bad Vöslau</span><br/><span>reg. Gen.m.b.H.</span></h5>
@@ -123,13 +122,13 @@
          <p class="link">
            <a href="http://www.wg-baden.at/">wg-baden.at</a>
          </p>
-          <div class="edge"/><div class="edge"/><div class="edge"/><div class="edge"/>
+          <div class="edge"></div><div class="edge"></div><div class="edge"></div><div class="edge"></div>
        </div>
      </div>
    </section>

    <section class="picture-2 background">
-      <div class="blur top"/>
+      <div class="blur top"></div>
    </section>
  </main>

--- a/www/en/index.xhtml
+++ b/www/en/index.xhtml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" prefix="og: https://ogp.me/ns#">
+<html lang="en" prefix="og: https://ogp.me/ns#">
 <head>
  <meta charset="UTF-8"/>
  <title>Elwig - Electronic Management for Vintners' Cooperatives</title>
@@ -39,7 +38,7 @@
        <li><a href="https://git.necronda.net/winzer/">Source&#160;Code</a></li>
      </ul>
      <div>
-        <a href="/de/" class="flag"><div/></a>
+        <a href="/de/" class="flag"><div></div></a>
      </div>
    </nav>
  </header>
@@ -55,11 +54,11 @@
          </div>
        </div>
      </a>
-      <div class="blur bottom"/>
+      <div class="blur bottom"></div>
    </section>

    <section class="about">
-      <span id="about"/>
+      <span id="about"></span>
      <h3>Elwig</h3>
      <p>
        Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore etdolore magna aliquyam erat, sed diam voluptua.
@@ -76,12 +75,12 @@
    </section>

    <section class="picture-1 background">
-      <div class="blur top"/>
-      <div class="blur bottom"/>
+      <div class="blur top"></div>
+      <div class="blur bottom"></div>
    </section>

    <section class="clients">
-      <span id="clients"/>
+      <span id="clients"></span>
      <h3>The Cooperatives</h3>
      <div class="container background">
        <div>
@@ -92,9 +91,9 @@
          <p class="link">
            <a href="https://winzermatzen.at/">winzermatzen.at</a>
          </p>
-          <div class="edge"/><div class="edge"/><div class="edge"/><div class="edge"/>
+          <div class="edge"></div><div class="edge"></div><div class="edge"></div><div class="edge"></div>
        </div>
-        <div class="filling"/>
+        <div class="filling"></div>
        <div>
          <h4>Winzerkeller im Weinviertel</h4>
          <h5><span>Winzerkeller im Weinviertel</span><br/><span>reg. Gen.m.b.H.</span></h5>
@@ -103,18 +102,18 @@
          <p class="link">
            <a href="http://www.winzerkeller.eu/">winzerkeller.eu</a>
          </p>
-          <div class="edge"/><div class="edge"/><div class="edge"/><div class="edge"/>
+          <div class="edge"></div><div class="edge"></div><div class="edge"></div><div class="edge"></div>
        </div>
-        <div class="filling"/>
+        <div class="filling"></div>
        <div>
          <h4>WG Weinland</h4>
          <h5><span>Winzergenossenschaft Weinland,</span> <span>mit dem Sitz in Groß-Inzersdorf,</span><br/><span>reg. Gen.m.b.H.</span></h5>
          <h6>Branches:</h6>
          <div class="branches">Groß-Inzersdorf</div>
          <p class="link"></p>
-          <div class="edge"/><div class="edge"/><div class="edge"/><div class="edge"/>
+          <div class="edge"></div><div class="edge"></div><div class="edge"></div><div class="edge"></div>
        </div>
-        <div class="filling"/>
+        <div class="filling"></div>
        <div>
          <h4>WG Baden</h4>
          <h5><span>Winzergenossenschaft</span> <span>Baden - Bad Vöslau</span><br/><span>reg. Gen.m.b.H.</span></h5>
@@ -123,13 +122,13 @@
          <p class="link">
            <a href="http://www.wg-baden.at/">wg-baden.at</a>
          </p>
-          <div class="edge"/><div class="edge"/><div class="edge"/><div class="edge"/>
+          <div class="edge"></div><div class="edge"></div><div class="edge"></div><div class="edge"></div>
        </div>
      </div>
    </section>

    <section class="picture-2 background">
-      <div class="blur top"/>
+      <div class="blur top"></div>
    </section>
  </main>

--- a/www/files/create.sql.php
+++ b/www/files/create.sql.php
@@ -3,7 +3,7 @@ require "../.php/auth.inc";
 require "../.php/credentials.inc";
 global $GITEA_TOKEN;

-if ($_SERVER['PHP_AUTH_USER'] !== 'elwig' || $_SERVER['PHP_AUTH_PW'] !== 'ganzGeheim123!') {
+if (!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW']) || $_SERVER['PHP_AUTH_USER'] !== 'elwig' || $_SERVER['PHP_AUTH_PW'] !== 'ganzGeheim123!') {
    http_401_unauthorized();
 }

--- a/www/files/index.php
+++ b/www/files/index.php
@@ -2,6 +2,8 @@
 require "../.php/format.inc";
 require "../.php/auth.inc";

+$ua = $_SERVER['HTTP_USER_AGENT'] ?? null;;
+
 if ($_SERVER['REQUEST_METHOD'] === 'PUT') {
    authenticate();

@@ -49,6 +51,23 @@ if ($_SERVER['REQUEST_METHOD'] === 'PUT') {
    exit("405 Method Not Allowed\n");
 }

+if ($_SERVER['PATH_INFO'] === '/stat') {
+    if (!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW']) || $_SERVER['PHP_AUTH_USER'] !== 'elwig' || $_SERVER['PHP_AUTH_PW'] !== 'ganzGeheim123!') {
+        http_401_unauthorized();
+    }
+
+    header("Content-Type: text/html; charset=UTF-8");
+    echo "<!DOCTYPE html><html lang='en'><head><style>table{border-collapse:collapse;}th,td{border:1px solid black;}</style></head><body><table>\n";
+    echo "<tr><th>Timestamp</th><th>IP Address</th><th>Method</th><th>URI</th><th>Format</th><th>User Agent</th></tr>\n";
+    passthru(<<<EOF
+cat .log.csv \
+| awk -F'|' -vOFS='|' '{\$1 = strftime("%F %T", $1); print $0}' \
+| sed 's:|:</td><td>:g;s:^:<tr><td>:g;s:$:</td></tr>:g'
+EOF);
+    echo "</table></body></html>\n";
+    exit;
+}
+
 global $getProd;
 global $getVers;
 $getProd = null;
@@ -56,7 +75,7 @@ $getVers = null;
 $info = explode('/', $_SERVER['PATH_INFO']);
 if (sizeof($info) > 1 && ($info[1] === 'elwig' || $info[1] === 'winziprint')) {
    $getProd = $info[1];
-    $getVers = $info[2];
+    if (sizeof($info) > 2) $getVers = $info[2];
    if (sizeof($info) > 3) {
        header('Status: 404');
        header('Content-Length: 0');
@@ -78,13 +97,18 @@ foreach ($filesRaw as $file) {

 $entities = [];
 foreach ($files as $name => [$size, $mtime, $ctime]) {
-    $p1 = strrpos($name, '-') + 1;
+    $p1 = strrpos($name, '-');
    $p2 = strrpos($name, '.');
-    $vers = substr($name, $p1, $p2 - $p1);
    $url = "https://elwig.at/files/$name";
+    if ($p1 === false || $p2 === false) {
+        $vers = null;
+        $prod = null;
+    } else {
+        $vers = substr($name, $p1 + 1, $p2 - $p1 - 1);
+        $prod = strtolower(substr($name, 0, $p1));
+    }
    $mod = date(DATE_ATOM, $mtime);
    $cre = date(DATE_ATOM, $ctime);
-    $prod = strtolower(substr($name, 0, $p1 - 1));
    $entities[$name] = [
        $prod,
        $vers,
@@ -113,6 +137,8 @@ $entities = array_filter($entities, function($e) {
 });

 $format = get_fmt();
+file_put_contents('.log.csv', time() . "|$_SERVER[REMOTE_ADDR]|$_SERVER[REQUEST_METHOD]|$_SERVER[REQUEST_URI]|$format|$ua\n", FILE_APPEND);
+
 if ($format === 'json') {
    header('Content-Type: application/json; charset=UTF-8');
    echo "{\"data\": [\n";
@@ -135,10 +161,9 @@ if ($format === 'json') {
        header('Content-Length: 0');
        exit();
    }
-    header('Content-Type: application/xhtml+xml; charset=UTF-8');
-    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+    header('Content-Type: text/html; charset=UTF-8');
    ?>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="de" prefix="og: https://ogp.me/ns#">
+<html lang="de" prefix="og: https://ogp.me/ns#">
 <head>
  <meta charset="UTF-8"/>
  <title>Downloads - Elwig</title>