fix: correct URL format in docker-compose files and improve viewport handling in index.php

docker-compose-dev.yml

@@ -13,6 +13,6 @@ services:
       - ./logs:/srv/logs
 
     environment:
-      - URL=http://localhost:8080
+      - URL=http://localhostxxx:8080
     ports:
       - 8080:80

docker-compose.yml

@@ -1,9 +1,10 @@
-version: '3.3'
 services:
   http2pic:
     image: gitea.haschek.at/haschek-solutions/http2pic:2
     restart: unless-stopped
-
+    volumes:
+      - ./cache:/srv/cache
+      - ./logs:/srv/logs
     environment:
       - URL=http://localhost:8080
     ports:

docker/start.sh

@@ -20,6 +20,6 @@ _buildConfig() {
     echo ""
 }
 
-_buildConfig > src/inc/config.inc.php
+_buildConfig > /srv/src/config.inc.php
 
 caddy run --config /etc/caddy/Caddyfile

src/.gitignore

@@ -1 +1,2 @@
 vendor/
+config.inc.php

src/config.inc.php.php

@@ -0,0 +1,3 @@
+<?php 
+
+define('URL','http://localhost:8080'); //no trailing slash

web/index.php

@@ -30,7 +30,12 @@ switch ($url[0]) {
         }
         $ip = getUserIP();
 
-        $viewport = $_REQUEST['viewport'];
+        $viewport = $_REQUEST['viewport'] ?: '1024x768';
+        if (!preg_match('/^\d+x\d+$/', $viewport)) {
+            header('HTTP/1.0 400 Bad Request');
+            echo 'Invalid viewport format. Use WIDTHxHEIGHT (e.g., 1024x768)';
+            exit;
+        }
         $js = $_REQUEST['js'] == 'false' ? false : true;
 
         $serverUrl = 'http://localhost:4444';
@@ -58,9 +63,11 @@ switch ($url[0]) {
                 $viewport = explode('x', $viewport);
                 $driver->manage()->window()->setSize(new \Facebook\WebDriver\WebDriverDimension($viewport[0], $viewport[1]));
             } else {
-                $driver->manage()->window()->setSize(new \Facebook\WebDriver\WebDriverDimension(1024, 768));
+                $viewport = [1024, 768];
+                $driver->manage()->window()->setSize(new \Facebook\WebDriver\WebDriverDimension($viewport[0], $viewport[1]));
             }
-            addToLog("$ip\tRequested $target with viewport " . implode('x', $viewport) . " and js " . ($js ? 'enabled' : 'disabled'));
+            $viewportLabel = is_array($viewport) ? implode('x', $viewport) : (string) $viewport;
+            addToLog("$ip\tRequested $target with viewport " . $viewportLabel . " and js " . ($js ? 'enabled' : 'disabled'));
         } catch (Exception $e) {
             header('HTTP/1.0 500 Internal Server Error');
             addToLog("$ip\tRequested $target but resulted in error:\t" . $e->getMessage());