diff --git a/.gitignore b/.gitignore index b9c4024..4dfc547 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ sessions/* conf/conf.local.php ignore +kanban/ .pi-tasks docs/framework_review.md diff --git a/conf/conf.php b/conf/conf.php index 67f380a..801c3e6 100755 --- a/conf/conf.php +++ b/conf/conf.php @@ -6,9 +6,6 @@ define('MAX_WORDS', 4); define('MAX_ZAPS', 9); -define('ZAP_DEFAULT_WIDTH', 1067); -define('ZAP_DEFAULT_HEIGHT', 600); - define('ZAP_CURL_TIMEOUT', 12); define('ZAP_IMG_TYPE', 'jpg'); define('ZAP_CANVAS_NAME', 'collage'); diff --git a/kanban/.lock b/kanban/.lock deleted file mode 100644 index e69de29..0000000 diff --git a/kanban/activity.jsonl b/kanban/activity.jsonl deleted file mode 100644 index 0aab3a4..0000000 --- a/kanban/activity.jsonl +++ /dev/null @@ -1,93 +0,0 @@ -{"timestamp":"2026-07-15T14:55:51.244024579+02:00","action":"create","task_id":1,"detail":"pixabay api"} -{"timestamp":"2026-07-15T14:56:56.736534944+02:00","action":"edit","task_id":1,"detail":"pixabay api"} -{"timestamp":"2026-07-15T14:58:10.598825995+02:00","action":"create","task_id":2,"detail":"Pexels api"} -{"timestamp":"2026-07-15T14:58:27.253134741+02:00","action":"edit","task_id":2,"detail":"Pexels api"} -{"timestamp":"2026-07-15T15:00:10.532523584+02:00","action":"create","task_id":3,"detail":"random words"} -{"timestamp":"2026-07-15T15:02:31.109387111+02:00","action":"create","task_id":4,"detail":"search for original images"} -{"timestamp":"2026-07-15T15:02:43.403448994+02:00","action":"edit","task_id":4,"detail":"search for original images"} -{"timestamp":"2026-07-15T15:13:21.132728219+02:00","action":"create","task_id":5,"detail":"image processing"} -{"timestamp":"2026-07-15T15:15:54.327404411+02:00","action":"create","task_id":6,"detail":"full screen gui"} -{"timestamp":"2026-07-15T15:17:54.955029144+02:00","action":"create","task_id":7,"detail":"ai generated images for input"} -{"timestamp":"2026-07-15T15:20:29.077954887+02:00","action":"create","task_id":8,"detail":"automatic mode"} -{"timestamp":"2026-07-15T15:22:18.569491561+02:00","action":"create","task_id":9,"detail":"library guide"} -{"timestamp":"2026-07-15T15:22:33.368044405+02:00","action":"move","task_id":9,"detail":"backlog -\u003e todo"} -{"timestamp":"2026-07-15T15:23:07.895052923+02:00","action":"move","task_id":6,"detail":"backlog -\u003e todo"} -{"timestamp":"2026-07-15T15:23:14.910744836+02:00","action":"move","task_id":5,"detail":"backlog -\u003e todo"} -{"timestamp":"2026-07-17T00:46:24.790499349+02:00","action":"edit","task_id":9,"detail":"framework guide"} -{"timestamp":"2026-07-17T01:14:23.984206626+02:00","action":"move","task_id":9,"detail":"todo -\u003e in-progress"} -{"timestamp":"2026-07-17T02:16:23.061670813+02:00","action":"create","task_id":10,"detail":"check framework"} -{"timestamp":"2026-07-17T02:16:52.676988996+02:00","action":"move","task_id":9,"detail":"in-progress -\u003e done"} -{"timestamp":"2026-07-17T02:54:59.922251442+02:00","action":"move","task_id":10,"detail":"todo -\u003e in-progress"} -{"timestamp":"2026-07-17T03:04:14.08873263+02:00","action":"priority","task_id":10,"detail":"high -\u003e medium"} -{"timestamp":"2026-07-17T03:04:15.072297537+02:00","action":"priority","task_id":10,"detail":"medium -\u003e low"} -{"timestamp":"2026-07-17T03:04:23.967707693+02:00","action":"priority","task_id":10,"detail":"low -\u003e medium"} -{"timestamp":"2026-07-17T03:04:24.575872692+02:00","action":"priority","task_id":10,"detail":"medium -\u003e high"} -{"timestamp":"2026-07-17T03:25:58.441011923+02:00","action":"edit","task_id":10,"detail":"check framework"} -{"timestamp":"2026-07-17T03:26:01.636755342+02:00","action":"move","task_id":10,"detail":"in-progress -\u003e review"} -{"timestamp":"2026-07-17T03:26:18.979779542+02:00","action":"edit","task_id":10,"detail":"check framework"} -{"timestamp":"2026-07-17T03:26:18.979863107+02:00","action":"release","task_id":10,"detail":"tui@mcBookje"} -{"timestamp":"2026-07-17T03:50:56.347742215+02:00","action":"move","task_id":6,"detail":"todo -\u003e backlog"} -{"timestamp":"2026-07-17T03:51:00.178032766+02:00","action":"move","task_id":5,"detail":"todo -\u003e backlog"} -{"timestamp":"2026-07-17T03:57:00.446052295+02:00","action":"create","task_id":11,"detail":"Fix Brave request building: lazy URL + single encode"} -{"timestamp":"2026-07-17T03:57:06.830184988+02:00","action":"create","task_id":12,"detail":"Fix autoloader: use PATH_SEPARATOR instead of hardcoded ':'"} -{"timestamp":"2026-07-17T03:57:13.889026673+02:00","action":"create","task_id":13,"detail":"Config hygiene: ZAP_DEBUG=false, secrets in git-ignored local file, sessions perms"} -{"timestamp":"2026-07-17T03:57:20.700148188+02:00","action":"create","task_id":14,"detail":"Add CSRF protection to word-input form"} -{"timestamp":"2026-07-17T03:57:28.29860719+02:00","action":"create","task_id":15,"detail":"Replace die('Wrong parameter') with proper 404/error handler"} -{"timestamp":"2026-07-17T03:57:35.273661605+02:00","action":"create","task_id":16,"detail":"Fix and secure cli_scripts/reset.php"} -{"timestamp":"2026-07-17T03:57:50.885872288+02:00","action":"create","task_id":17,"detail":"Make session folder names unique, stop suppressing mkdir errors"} -{"timestamp":"2026-07-17T03:57:59.05551049+02:00","action":"create","task_id":18,"detail":"Introduce ZAPHandler interface for getContent()"} -{"timestamp":"2026-07-17T03:58:05.367581371+02:00","action":"create","task_id":19,"detail":"Single source of truth for word count + cleanup handleWords"} -{"timestamp":"2026-07-17T03:58:11.989024488+02:00","action":"create","task_id":20,"detail":"Consistent template rendering pattern across all handlers"} -{"timestamp":"2026-07-17T03:58:20.432255313+02:00","action":"create","task_id":21,"detail":"Consolidate duplicated screen-size constants"} -{"timestamp":"2026-07-17T03:58:30.405465201+02:00","action":"create","task_id":22,"detail":"Fix convertGifsToPng extension + rename/fix log.xml"} -{"timestamp":"2026-07-17T03:58:37.159090865+02:00","action":"create","task_id":23,"detail":"Anchor ZAP_APP_BASE_DIR to __DIR__, make getZAPTemplate throw"} -{"timestamp":"2026-07-17T03:58:43.664420067+02:00","action":"create","task_id":24,"detail":"Refresh README (Yahoo→Brave, drop outdated roadmap, fix tone)"} -{"timestamp":"2026-07-17T12:26:07.265732515+02:00","action":"move","task_id":10,"detail":"review -\u003e done"} -{"timestamp":"2026-07-17T12:26:29.348995723+02:00","action":"move","task_id":11,"detail":"todo -\u003e in-progress"} -{"timestamp":"2026-07-17T12:26:34.350031444+02:00","action":"edit","task_id":11,"detail":"Fix Brave request building: lazy URL + single encode"} -{"timestamp":"2026-07-17T12:26:38.760178641+02:00","action":"move","task_id":11,"detail":"in-progress -\u003e review"} -{"timestamp":"2026-07-17T12:26:38.760294679+02:00","action":"handoff","task_id":11,"detail":"Fix Brave request building: lazy URL + single encode"} -{"timestamp":"2026-07-17T12:26:38.760385873+02:00","action":"release","task_id":11,"detail":"Fix Brave request building: lazy URL + single encode"} -{"timestamp":"2026-07-17T12:27:40.64656083+02:00","action":"move","task_id":12,"detail":"todo -\u003e in-progress"} -{"timestamp":"2026-07-17T12:27:53.052811022+02:00","action":"edit","task_id":12,"detail":"Fix autoloader: use PATH_SEPARATOR instead of hardcoded ':'"} -{"timestamp":"2026-07-17T12:27:53.056394858+02:00","action":"move","task_id":12,"detail":"in-progress -\u003e review"} -{"timestamp":"2026-07-17T12:27:53.056484271+02:00","action":"handoff","task_id":12,"detail":"Fix autoloader: use PATH_SEPARATOR instead of hardcoded ':'"} -{"timestamp":"2026-07-17T12:27:53.056530205+02:00","action":"release","task_id":12,"detail":"Fix autoloader: use PATH_SEPARATOR instead of hardcoded ':'"} -{"timestamp":"2026-07-17T21:40:38.025770941+02:00","action":"move","task_id":13,"detail":"todo -\u003e in-progress"} -{"timestamp":"2026-07-17T21:54:34.996015797+02:00","action":"move","task_id":13,"detail":"in-progress -\u003e review"} -{"timestamp":"2026-07-17T22:27:10.995630482+02:00","action":"move","task_id":13,"detail":"review -\u003e done"} -{"timestamp":"2026-07-18T11:42:51.254205784+02:00","action":"move","task_id":18,"detail":"todo -\u003e in-progress"} -{"timestamp":"2026-07-18T11:50:59.773873861+02:00","action":"edit","task_id":18,"detail":"Introduce ZAPHandler interface for getContent()"} -{"timestamp":"2026-07-18T11:51:03.257951319+02:00","action":"edit","task_id":18,"detail":"Introduce ZAPHandler interface for getContent()"} -{"timestamp":"2026-07-18T11:51:03.258056745+02:00","action":"release","task_id":18,"detail":"tui@mcBookje"} -{"timestamp":"2026-07-18T11:51:03.28154522+02:00","action":"move","task_id":18,"detail":"in-progress -\u003e done"} -{"timestamp":"2026-07-19T19:06:12.923187222+02:00","action":"edit","task_id":17,"detail":"Make session folder names unique, stop suppressing mkdir errors"} -{"timestamp":"2026-07-19T19:06:12.930146038+02:00","action":"claim","task_id":17,"detail":"rain-raven"} -{"timestamp":"2026-07-19T19:06:58.839482716+02:00","action":"move","task_id":17,"detail":"todo -\u003e done"} -{"timestamp":"2026-07-19T20:09:41.967705512+02:00","action":"edit","task_id":16,"detail":"Fix and secure cli_scripts/reset.php"} -{"timestamp":"2026-07-19T20:09:41.967823882+02:00","action":"claim","task_id":16,"detail":"rain-raven"} -{"timestamp":"2026-07-19T20:09:41.988956545+02:00","action":"move","task_id":16,"detail":"todo -\u003e done"} -{"timestamp":"2026-07-19T20:20:19.991872348+02:00","action":"edit","task_id":15,"detail":"Replace die('Wrong parameter') with proper 404/error handler"} -{"timestamp":"2026-07-19T20:20:19.991950864+02:00","action":"claim","task_id":15,"detail":"rain-raven"} -{"timestamp":"2026-07-19T20:20:20.013428274+02:00","action":"move","task_id":15,"detail":"todo -\u003e done"} -{"timestamp":"2026-07-19T21:23:27.794040982+02:00","action":"edit","task_id":14,"detail":"Add CSRF protection to word-input form"} -{"timestamp":"2026-07-19T21:23:27.794120976+02:00","action":"claim","task_id":14,"detail":"rain-raven"} -{"timestamp":"2026-07-19T21:23:27.819566153+02:00","action":"move","task_id":14,"detail":"todo -\u003e done"} -{"timestamp":"2026-07-19T21:31:14.49434419+02:00","action":"edit","task_id":24,"detail":"Refresh README (Yahoo→Brave, drop outdated roadmap, fix tone)"} -{"timestamp":"2026-07-19T21:31:14.494474852+02:00","action":"claim","task_id":24,"detail":"rain-raven"} -{"timestamp":"2026-07-19T21:31:14.518300878+02:00","action":"move","task_id":24,"detail":"todo -\u003e done"} -{"timestamp":"2026-07-19T21:39:02.761552753+02:00","action":"edit","task_id":23,"detail":"Anchor ZAP_APP_BASE_DIR to __DIR__, make getZAPTemplate throw"} -{"timestamp":"2026-07-19T21:39:02.761712873+02:00","action":"claim","task_id":23,"detail":"rain-raven"} -{"timestamp":"2026-07-19T21:39:02.783567342+02:00","action":"move","task_id":23,"detail":"todo -\u003e done"} -{"timestamp":"2026-07-19T21:42:54.751029245+02:00","action":"edit","task_id":22,"detail":"Fix convertGifsToPng extension + rename/fix log.xml"} -{"timestamp":"2026-07-19T21:42:54.751140546+02:00","action":"claim","task_id":22,"detail":"rain-raven"} -{"timestamp":"2026-07-19T21:42:54.773029003+02:00","action":"move","task_id":22,"detail":"todo -\u003e done"} -{"timestamp":"2026-07-19T21:49:54.312195218+02:00","action":"edit","task_id":21,"detail":"Consolidate duplicated screen-size constants"} -{"timestamp":"2026-07-19T21:49:54.312297605+02:00","action":"claim","task_id":21,"detail":"rain-raven"} -{"timestamp":"2026-07-19T21:49:54.334491216+02:00","action":"move","task_id":21,"detail":"todo -\u003e done"} -{"timestamp":"2026-07-19T22:54:27.983080764+02:00","action":"edit","task_id":20,"detail":"Consistent template rendering pattern across all handlers"} -{"timestamp":"2026-07-19T22:54:27.98319541+02:00","action":"claim","task_id":20,"detail":"rain-raven"} -{"timestamp":"2026-07-19T22:54:28.007952955+02:00","action":"move","task_id":20,"detail":"todo -\u003e done"} -{"timestamp":"2026-07-20T01:09:23.947300407+02:00","action":"edit","task_id":19,"detail":"Single source of truth for word count + cleanup handleWords"} -{"timestamp":"2026-07-20T01:09:23.947430566+02:00","action":"claim","task_id":19,"detail":"rain-raven"} -{"timestamp":"2026-07-20T01:09:23.97076796+02:00","action":"move","task_id":19,"detail":"todo -\u003e done"} diff --git a/kanban/config.yml b/kanban/config.yml deleted file mode 100644 index eb9fd78..0000000 --- a/kanban/config.yml +++ /dev/null @@ -1,47 +0,0 @@ -version: 10 -board: - name: ZapMachine -tasks_dir: tasks -statuses: - - name: backlog - show_duration: false - - name: todo - - name: in-progress - require_claim: true - - name: review - require_claim: true - - name: done - show_duration: false - - name: archived - show_duration: false -priorities: - - low - - medium - - high - - critical -defaults: - status: backlog - priority: medium - class: standard -claim_timeout: 1m -classes: - - name: expedite - wip_limit: 1 - bypass_column_wip: true - - name: fixed-date - - name: standard - - name: intangible -tui: - title_lines: 2 - age_thresholds: - - after: 0s - color: "242" - - after: 1h - color: "34" - - after: 24h - color: "226" - - after: 72h - color: "208" - - after: 168h - color: "196" -next_id: 25 diff --git a/kanban/tasks/001-pixabay-api.md b/kanban/tasks/001-pixabay-api.md deleted file mode 100644 index 85e9e35..0000000 --- a/kanban/tasks/001-pixabay-api.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -id: 1 -title: pixabay api -status: backlog -priority: high -created: 2026-07-15T14:55:51.243108541+02:00 -updated: 2026-07-15T14:56:56.735673124+02:00 -tags: - - search -class: standard ---- - -Add Pixabay api as search engine diff --git a/kanban/tasks/002-pexels-api.md b/kanban/tasks/002-pexels-api.md deleted file mode 100644 index 3d8f41b..0000000 --- a/kanban/tasks/002-pexels-api.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -id: 2 -title: Pexels api -status: backlog -priority: high -created: 2026-07-15T14:58:10.597616484+02:00 -updated: 2026-07-15T14:58:27.252246225+02:00 -tags: - - search -class: standard ---- - -Use pexels api as a seach engine diff --git a/kanban/tasks/003-random-words.md b/kanban/tasks/003-random-words.md deleted file mode 100644 index 28991e1..0000000 --- a/kanban/tasks/003-random-words.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -id: 3 -title: random words -status: backlog -priority: high -created: 2026-07-15T15:00:10.530100379+02:00 -updated: 2026-07-15T15:00:10.530100379+02:00 -tags: - - search -class: standard ---- - -random word version (https://random-words-api.kushcreates.com/) diff --git a/kanban/tasks/004-search-for-original-images.md b/kanban/tasks/004-search-for-original-images.md deleted file mode 100644 index 0cb420b..0000000 --- a/kanban/tasks/004-search-for-original-images.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -id: 4 -title: search for original images -status: backlog -priority: low -created: 2026-07-15T15:02:31.107843015+02:00 -updated: 2026-07-15T15:02:43.402550141+02:00 -tags: - - search -class: standard ---- - -input number and search for a fresh photo with a camera filename like 'img####.jpg' diff --git a/kanban/tasks/005-image-processing.md b/kanban/tasks/005-image-processing.md deleted file mode 100644 index c472770..0000000 --- a/kanban/tasks/005-image-processing.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -id: 5 -title: image processing -status: backlog -priority: critical -created: 2026-07-15T15:13:21.131166647+02:00 -updated: 2026-07-17T03:51:00.175266589+02:00 -started: 2026-07-15T15:23:14.91034394+02:00 -tags: - - image_processing -class: standard ---- - -Put back the original image processing from the old Zap Machine diff --git a/kanban/tasks/006-full-screen-gui.md b/kanban/tasks/006-full-screen-gui.md deleted file mode 100644 index 4c107a0..0000000 --- a/kanban/tasks/006-full-screen-gui.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -id: 6 -title: full screen gui -status: backlog -priority: critical -created: 2026-07-15T15:15:54.325695132+02:00 -updated: 2026-07-17T03:50:56.343336322+02:00 -started: 2026-07-15T15:23:07.894599552+02:00 -tags: - - gui -class: standard ---- - -Full screen GUI with the collage covering the background and a partly transparen control panel and feedback screen on the right diff --git a/kanban/tasks/007-ai-generated-images-for-input.md b/kanban/tasks/007-ai-generated-images-for-input.md deleted file mode 100644 index 0680553..0000000 --- a/kanban/tasks/007-ai-generated-images-for-input.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -id: 7 -title: ai generated images for input -status: backlog -priority: medium -created: 2026-07-15T15:17:54.953039352+02:00 -updated: 2026-07-15T15:17:54.953039352+02:00 -tags: - - search - - source -class: standard ---- - -use a scraper (brightdata) or write one ourselves to scrape for ai genarated images as sources diff --git a/kanban/tasks/008-automatic-mode.md b/kanban/tasks/008-automatic-mode.md deleted file mode 100644 index b71b059..0000000 --- a/kanban/tasks/008-automatic-mode.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -id: 8 -title: automatic mode -status: backlog -priority: medium -created: 2026-07-15T15:20:29.075465548+02:00 -updated: 2026-07-15T15:20:29.075465548+02:00 -tags: - - gui - - mode -class: standard ---- - -if one or more people are watching automatically generate a zap layer every 21 seconds diff --git a/kanban/tasks/009-framework-guide.md b/kanban/tasks/009-framework-guide.md deleted file mode 100644 index 7b5abd3..0000000 --- a/kanban/tasks/009-framework-guide.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -id: 9 -title: framework guide -status: done -priority: critical -created: 2026-07-15T15:22:18.567355625+02:00 -updated: 2026-07-17T02:16:52.6730631+02:00 -started: 2026-07-15T15:22:33.367755161+02:00 -completed: 2026-07-17T02:16:52.676581649+02:00 -class: standard ---- - -add the usage of the framework in the README. How does this framework work, how to add templates with interactive elements diff --git a/kanban/tasks/010-check-framework.md b/kanban/tasks/010-check-framework.md deleted file mode 100644 index f2fe51f..0000000 --- a/kanban/tasks/010-check-framework.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -id: 10 -title: check framework -status: done -priority: high -created: 2026-07-17T02:16:23.059189291+02:00 -updated: 2026-07-17T12:26:07.258170416+02:00 -started: 2026-07-17T12:26:07.265125164+02:00 -completed: 2026-07-17T12:26:07.265125164+02:00 -class: standard ---- - -Check if the framework is the optimal, most simple and flexible way to go. If not: suggest some changes. - -[[2026-07-17]] Fri 03:25 -Framework review committed: docs/framework_review.md (commit 2f61b07). Verdict: architecture is simple/flexible (zero-config routing, autoloader, Search plugin interface, native templates) — keep as-is. Not optimal due to 3 P0 correctness bugs (Brave size/offset params never sent because setQuery builds URL before setParam; query double-URL-encoded; autoloader hardcodes ':' vs PATH_SEPARATOR), P1 config/security (ZAP_DEBUG=true & placeholder key committed, no CSRF, die() routing, unsafe reset.php, second-resolution session folder collisions), P2 consistency. NO source edits — deliverable is docs-only. Includes recommended-task table for follow-up fixes (each independently approvable). Handing to review for Fabian's approval before any code changes. diff --git a/kanban/tasks/011-fix-brave-request-building-lazy-url-single-encode.md b/kanban/tasks/011-fix-brave-request-building-lazy-url-single-encode.md deleted file mode 100644 index 5f2c2cc..0000000 --- a/kanban/tasks/011-fix-brave-request-building-lazy-url-single-encode.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -id: 11 -title: 'Fix Brave request building: lazy URL + single encode' -status: review -priority: high -created: 2026-07-17T03:57:00.444816503+02:00 -updated: 2026-07-17T12:26:38.759875442+02:00 -tags: - - search - - bug -class: standard ---- - -From framework review (docs/framework_review.md). Two-part fix in resource/Brave.class.php + lib/ImgSearch.class.php: -1. Move URL construction from setQuery() to getData() so setParam('start'/'size') values are applied (currently size defaults to 3 instead of 16, offset is never sent). -2. Remove double urlencode: ImgSearch passes urlencode(word) into Brave::setQuery which urlencodes again → %2520 for spaces. Fix: pass raw word from ImgSearch; engine owns encoding. - -[[2026-07-17]] Fri 12:26 -P0-1: Moved URL construction from setQuery() to new buildRequest() called from getData() — size/offset now use setParam() values (resource/Brave.class.php). P0-2: Removed urlencode() call from ImgSearch::getImageData() — raw word passed to engine, single encode in Brave (lib/ImgSearch.class.php). Both pass php -l. - -[[2026-07-17]] Fri 12:26 -P0-1 + P0-2 implemented. Changes to resource/Brave.class.php and lib/ImgSearch.class.php. Both pass php -l. Ready for your commit. diff --git a/kanban/tasks/012-fix-autoloader-use-path-separator-instead-of.md b/kanban/tasks/012-fix-autoloader-use-path-separator-instead-of.md deleted file mode 100644 index 211a40d..0000000 --- a/kanban/tasks/012-fix-autoloader-use-path-separator-instead-of.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -id: 12 -title: 'Fix autoloader: use PATH_SEPARATOR instead of hardcoded '':''' -status: review -priority: high -created: 2026-07-17T03:57:06.82901804+02:00 -updated: 2026-07-17T12:27:53.056263524+02:00 -tags: - - framework - - bug -class: standard ---- - -From framework review (docs/framework_review.md). conf/init.php uses explode(':', get_include_path()) but the include path separator is ':' on Unix and ';' on Windows. Makes the autoloader fail on Windows. Fix: explode(PATH_SEPARATOR, get_include_path()). - -[[2026-07-17]] Fri 12:27 -Changed explode(':', ...) to explode(PATH_SEPARATOR, ...) in conf/init.php. PHP passes php -l. - -[[2026-07-17]] Fri 12:27 -P0-3 fixed. One-line change in conf/init.php. Ready for your commit. diff --git a/kanban/tasks/013-config-hygiene-zap-debug-false-secrets-in-git.md b/kanban/tasks/013-config-hygiene-zap-debug-false-secrets-in-git.md deleted file mode 100644 index 0d6ba07..0000000 --- a/kanban/tasks/013-config-hygiene-zap-debug-false-secrets-in-git.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -id: 13 -title: 'Config hygiene: ZAP_DEBUG=false, secrets in git-ignored local file, sessions perms' -status: done -priority: medium -created: 2026-07-17T03:57:13.88777683+02:00 -updated: 2026-07-17T22:27:10.989415474+02:00 -started: 2026-07-17T22:27:10.994979516+02:00 -completed: 2026-07-17T22:27:10.994979516+02:00 -tags: - - security - - config -class: standard ---- - -From framework review (docs/framework_review.md), P1-1. conf/conf.php is git-tracked and ships with ZAP_DEBUG=true, BRAVE_API_KEY='your api key' placeholder. Fixes: -- Default ZAP_DEBUG=false in committed conf.php -- Add git-ignored conf/conf.local.php loaded by init.php if present, for secrets -- Tighten sessions/ permissions from 777 to 770 (or document webserver-user group) diff --git a/kanban/tasks/014-add-csrf-protection-to-word-input-form.md b/kanban/tasks/014-add-csrf-protection-to-word-input-form.md deleted file mode 100644 index 1dc212c..0000000 --- a/kanban/tasks/014-add-csrf-protection-to-word-input-form.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -id: 14 -title: Add CSRF protection to word-input form -status: done -priority: medium -created: 2026-07-17T03:57:20.699057952+02:00 -updated: 2026-07-19T21:23:27.817959707+02:00 -started: 2026-07-19T21:23:27.819406405+02:00 -completed: 2026-07-19T21:23:27.819406405+02:00 -tags: - - security -claimed_by: rain-raven -claimed_at: 2026-07-19T21:23:27.817959707+02:00 -class: standard ---- - -From framework review (docs/framework_review.md), P1-2. tpl/index.tpl POSTs to mode=display which writes session state and triggers image downloads. No CSRF token means a cross-site request can drive the machine. Fix: add session-bound CSRF token to the form, validate in ZAPDisplay. diff --git a/kanban/tasks/015-replace-die-wrong-parameter-with-proper-404-error.md b/kanban/tasks/015-replace-die-wrong-parameter-with-proper-404-error.md deleted file mode 100644 index 0119a46..0000000 --- a/kanban/tasks/015-replace-die-wrong-parameter-with-proper-404-error.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -id: 15 -title: Replace die('Wrong parameter') with proper 404/error handler -status: done -priority: medium -created: 2026-07-17T03:57:28.297533467+02:00 -updated: 2026-07-19T20:20:20.011896223+02:00 -started: 2026-07-19T20:20:20.013282064+02:00 -completed: 2026-07-19T20:20:20.013282064+02:00 -tags: - - framework -claimed_by: rain-raven -claimed_at: 2026-07-19T20:20:20.011896223+02:00 -class: standard ---- - -From framework review (docs/framework_review.md), P1-3. ZAPController::__construct() calls die('Wrong parameter') when an unknown mode is given — no HTTP status, no HTML, and the polling onerror contract expects ERROR_PREFIX HTML. Fix: return a proper 404 response (or brand error page via ZAPError handler). Also consider mode allowlist. diff --git a/kanban/tasks/016-fix-and-secure-cli-scripts-reset-php.md b/kanban/tasks/016-fix-and-secure-cli-scripts-reset-php.md deleted file mode 100644 index 1932343..0000000 --- a/kanban/tasks/016-fix-and-secure-cli-scripts-reset-php.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -id: 16 -title: Fix and secure cli_scripts/reset.php -status: done -priority: medium -created: 2026-07-17T03:57:35.272402311+02:00 -updated: 2026-07-19T20:09:41.987393047+02:00 -started: 2026-07-19T20:09:41.988806323+02:00 -completed: 2026-07-19T20:09:41.988806323+02:00 -tags: - - cli - - security -claimed_by: rain-raven -claimed_at: 2026-07-19T20:09:41.987393047+02:00 -class: standard ---- - -From framework review (docs/framework_review.md), P1-4. cli_scripts/reset.php has multiple issues: -- Case mismatch: glob('./Sessions/*') vs actual 'sessions/' directory → no-op on case-sensitive FS -- No auth/CSRF: bare $_GET['allcollages'] == 'clear' triggers destructive unlink/rmdir -- If web-accessible it's an unauthenticated destructive endpoint -- Misplaced in cli_scripts/ (uses $_GET like a web script) -Fix: correct path, add CLI guard (php_sapi_name()), gate destructive branch behind confirmation. diff --git a/kanban/tasks/017-make-session-folder-names-unique-stop-suppressing.md b/kanban/tasks/017-make-session-folder-names-unique-stop-suppressing.md deleted file mode 100644 index 746f354..0000000 --- a/kanban/tasks/017-make-session-folder-names-unique-stop-suppressing.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -id: 17 -title: Make session folder names unique, stop suppressing mkdir errors -status: done -priority: medium -created: 2026-07-17T03:57:50.884126062+02:00 -updated: 2026-07-19T19:06:58.837663313+02:00 -started: 2026-07-19T19:06:58.839287746+02:00 -completed: 2026-07-19T19:06:58.839287746+02:00 -tags: - - session -claimed_by: rain-raven -claimed_at: 2026-07-19T19:06:58.837663313+02:00 -class: standard ---- - -From framework review (docs/framework_review.md), P1-5. ZAP_MOMENT = date('Y-m-d-H_i_s') has second resolution. Two submissions in the same second collide on mkdir — suppressed with @, returns null folder, silently breaks all downstream operations. Fix: append random suffix to folder name, drop @, add recursive flag. diff --git a/kanban/tasks/018-introduce-zaphandler-interface-for-getcontent.md b/kanban/tasks/018-introduce-zaphandler-interface-for-getcontent.md deleted file mode 100644 index 16cde7e..0000000 --- a/kanban/tasks/018-introduce-zaphandler-interface-for-getcontent.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -id: 18 -title: Introduce ZAPHandler interface for getContent() -status: done -priority: medium -created: 2026-07-17T03:57:59.054256365+02:00 -updated: 2026-07-18T11:51:03.280085523+02:00 -started: 2026-07-18T11:51:03.281402582+02:00 -completed: 2026-07-18T11:51:03.281402582+02:00 -tags: - - framework -class: standard ---- - -From framework review (docs/framework_review.md), P1-7. Currently getContent() is convention-only — no interface enforces it. A handler missing the method fails at runtime, not definition time. Fix: create a ZAPHandler (or ModeHandler) interface with public function getContent(), implement it on all existing handlers, add instanceof check in ZAPController. - -[[2026-07-18]] Sat 11:50 -Created ZAPHandler interface with getContent(), implemented on ZAPHome/ZAPDisplay/ZAPZap, added instanceof check in ZAPController::fetch(). diff --git a/kanban/tasks/019-single-source-of-truth-for-word-count-cleanup.md b/kanban/tasks/019-single-source-of-truth-for-word-count-cleanup.md deleted file mode 100644 index c0685a6..0000000 --- a/kanban/tasks/019-single-source-of-truth-for-word-count-cleanup.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -id: 19 -title: Single source of truth for word count + cleanup handleWords -status: done -priority: low -created: 2026-07-17T03:58:05.365933671+02:00 -updated: 2026-07-20T01:09:23.968637294+02:00 -started: 2026-07-20T01:09:23.970603129+02:00 -completed: 2026-07-20T01:09:23.970603129+02:00 -tags: - - cleanup -claimed_by: rain-raven -claimed_at: 2026-07-20T01:09:23.968637294+02:00 -class: standard ---- - -From framework review (docs/framework_review.md), P2-1/2. MAX_WORDS drives the template loop but handleWords() independently re-scans POST. Also has / typo. Fix: iterate 1..MAX_WORDS in handleWords, clean up variable naming. diff --git a/kanban/tasks/020-consistent-template-rendering-pattern-across-all.md b/kanban/tasks/020-consistent-template-rendering-pattern-across-all.md deleted file mode 100644 index 9dd7b1d..0000000 --- a/kanban/tasks/020-consistent-template-rendering-pattern-across-all.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -id: 20 -title: Consistent template rendering pattern across all handlers -status: done -priority: low -created: 2026-07-17T03:58:11.987251314+02:00 -updated: 2026-07-19T22:54:28.006158702+02:00 -started: 2026-07-19T22:54:28.007766996+02:00 -completed: 2026-07-19T22:54:28.007766996+02:00 -tags: - - cleanup -claimed_by: rain-raven -claimed_at: 2026-07-19T22:54:28.006158702+02:00 -class: standard ---- - -From framework review (docs/framework_review.md), P2-3. ZAPHome uses extract(get_object_vars()) (the documented pattern); ZAPDisplay does not — it manually declares local vars and accesses directly in the template. Pick one pattern (extract or explicit) and apply consistently. diff --git a/kanban/tasks/021-consolidate-duplicated-screen-size-constants.md b/kanban/tasks/021-consolidate-duplicated-screen-size-constants.md deleted file mode 100644 index 91ccbdd..0000000 --- a/kanban/tasks/021-consolidate-duplicated-screen-size-constants.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -id: 21 -title: Consolidate duplicated screen-size constants -status: done -priority: low -created: 2026-07-17T03:58:20.43055577+02:00 -updated: 2026-07-19T21:49:54.332882291+02:00 -started: 2026-07-19T21:49:54.33435439+02:00 -completed: 2026-07-19T21:49:54.33435439+02:00 -tags: - - cleanup -claimed_by: rain-raven -claimed_at: 2026-07-19T21:49:54.332882291+02:00 -class: standard ---- - -From framework review (docs/framework_review.md), P2-5. ImgIOTools and ImgTools both define $maxScreenWidth/$maxScreenHeight to the same values (1067/600). Drift risk. Consolidate into one place. diff --git a/kanban/tasks/022-fix-convertgifstopng-extension-rename-fix-log-xml.md b/kanban/tasks/022-fix-convertgifstopng-extension-rename-fix-log-xml.md deleted file mode 100644 index a0bcc07..0000000 --- a/kanban/tasks/022-fix-convertgifstopng-extension-rename-fix-log-xml.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -id: 22 -title: Fix convertGifsToPng extension + rename/fix log.xml -status: done -priority: low -created: 2026-07-17T03:58:30.403935395+02:00 -updated: 2026-07-19T21:42:54.771387687+02:00 -started: 2026-07-19T21:42:54.772886896+02:00 -completed: 2026-07-19T21:42:54.772886896+02:00 -tags: - - cleanup -claimed_by: rain-raven -claimed_at: 2026-07-19T21:42:54.771387687+02:00 -class: standard ---- - -From framework review (docs/framework_review.md), P2-6/7. Two small fixes: -1. convertGifsToPng produces cat.gif.png (appends .png instead of replacing .gif) — confusing filenames. -2. Log writes HTML fragments (
) into log.xml — not valid XML. Rename to log.html or emit proper XML. diff --git a/kanban/tasks/023-anchor-zap-app-base-dir-to-dir-make-getzaptemplate.md b/kanban/tasks/023-anchor-zap-app-base-dir-to-dir-make-getzaptemplate.md deleted file mode 100644 index 8bb0a12..0000000 --- a/kanban/tasks/023-anchor-zap-app-base-dir-to-dir-make-getzaptemplate.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -id: 23 -title: Anchor ZAP_APP_BASE_DIR to __DIR__, make getZAPTemplate throw -status: done -priority: low -created: 2026-07-17T03:58:37.157613187+02:00 -updated: 2026-07-19T21:39:02.781954542+02:00 -started: 2026-07-19T21:39:02.783424942+02:00 -completed: 2026-07-19T21:39:02.783424942+02:00 -tags: - - cleanup -claimed_by: rain-raven -claimed_at: 2026-07-19T21:39:02.781954542+02:00 -class: standard ---- - -From framework review (docs/framework_review.md), P2-8/9. Two fixes in conf/init.php: -1. ZAP_APP_BASE_DIR = realpath('.'.DIRECTORY_SEPARATOR.'..') is cwd-dependent — breaks if entry point is not www/ or cli_scripts/. Use realpath(__DIR__ . '/..') instead. -2. getZAPTemplate returns ERROR_PREFIX . 'No template' string on missing file instead of throwing — inconsistent with other error paths. Make it throw. diff --git a/kanban/tasks/024-refresh-readme-yahoo-brave-drop-outdated-roadmap.md b/kanban/tasks/024-refresh-readme-yahoo-brave-drop-outdated-roadmap.md deleted file mode 100644 index 2f8f118..0000000 --- a/kanban/tasks/024-refresh-readme-yahoo-brave-drop-outdated-roadmap.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -id: 24 -title: Refresh README (Yahoo→Brave, drop outdated roadmap, fix tone) -status: done -priority: low -created: 2026-07-17T03:58:43.662424712+02:00 -updated: 2026-07-19T21:31:14.516637296+02:00 -started: 2026-07-19T21:31:14.51815456+02:00 -completed: 2026-07-19T21:31:14.51815456+02:00 -tags: - - docs -claimed_by: rain-raven -claimed_at: 2026-07-19T21:31:14.516637296+02:00 -class: standard ---- - -From framework review (docs/framework_review.md), P2-11. README.md still says 'the most relevant image that search engine Yahoo comes up with', tells Windows users 'Windows suck', and lists a roadmap that doesn't map to kanban. Refresh prose to match current state (Brave search, no Yahoo). diff --git a/lib/ImgIOTools.class.php b/lib/ImgIOTools.class.php index 724d091..a41127f 100755 --- a/lib/ImgIOTools.class.php +++ b/lib/ImgIOTools.class.php @@ -3,6 +3,9 @@ * Image Input Output Tools */ class ImgIOTools { + public static $maxScreenWidth = 1067; //screen dimensions + + public static $maxScreenHeight = 600; /** * Flushes image to screen @@ -10,9 +13,9 @@ class ImgIOTools { * @return void */ public static function onScreen(Imagick $img) { - $img->scaleImage(ZAP_DEFAULT_WIDTH, ZAP_DEFAULT_HEIGHT, true); + $img->scaleImage(self::$maxScreenWidth, self::$maxScreenHeight, true); - //$img = self::scaleByLength($img, ZAP_DEFAULT_WIDTH, ZAP_DEFAULT_HEIGHT); + //$img = self::scaleByLength($img, $this->maxScreenWidth, $this->maxScreenHeight); header('Content-type: image/' . ZAP_IMG_TYPE); echo $img->getImageBlob(); } @@ -43,4 +46,5 @@ class ImgIOTools { $path = $folder . $filename . '.' . ZAP_IMG_TYPE; return $img->writeImage($path); } -} \ No newline at end of file +} +?> \ No newline at end of file diff --git a/lib/ImgTools.class.php b/lib/ImgTools.class.php index 2cd68b0..e743235 100755 --- a/lib/ImgTools.class.php +++ b/lib/ImgTools.class.php @@ -3,6 +3,10 @@ * Library of tool functions to manipulate an image */ class ImgTools { + public static $maxScreenWidth = 1067; //screen dimensions + + public static $maxScreenHeight = 600; + public static $minFuzzFactor = 0.08; //minimal factor for $fuzz public static $maxFuzzFactor = 0.64; //maximal factor for $fuzz @@ -157,7 +161,7 @@ class ImgTools { public static function scaleByLength(Imagick $img, $maxW, $maxH) { $width = $img->getImageWidth(); $height = $img->getImageHeight(); - if(($width <= ZAP_DEFAULT_WIDTH) && ($height <= ZAP_DEFAULT_HEIGHT)) { + if(($width <= self::$maxScreenWidth) && ($height <= self::$maxScreenHeight)) { return $img; } else { if ($width >= $height) { //horizontal image diff --git a/lib/ZAPDisplay.class.php b/lib/ZAPDisplay.class.php index 3be56b0..65656e9 100755 --- a/lib/ZAPDisplay.class.php +++ b/lib/ZAPDisplay.class.php @@ -80,11 +80,15 @@ class ZAPDisplay implements ZAPHandler { */ private function handleWords() { $words = array(); - for ($i = 1; $i <= MAX_WORDS; $i++) { - $key = 'word' . sprintf("%02d", $i); - if (!empty($_POST[$key])) { - $words[] = $_POST[$key]; - } + $ix = 1; + $postix = sprintf("%02d", $ix); + $wd = 'word' . $postix; + + while(!empty($_POST[$wd])) { + array_push($words, $_POST[$wd]); + $ix++; + $postfix = sprintf("%02d", $ix); + $wd = 'word' . $postfix; } return $words; } diff --git a/lib/ZAPHome.class.php b/lib/ZAPHome.class.php index 207b0f8..21de450 100755 --- a/lib/ZAPHome.class.php +++ b/lib/ZAPHome.class.php @@ -8,6 +8,11 @@ class ZAPHome implements ZAPHandler { */ private $template = 'index'; + /** + * ZAP version + */ + private $ver; + /** * Parsable content */ @@ -17,8 +22,10 @@ class ZAPHome implements ZAPHandler { * Constructor */ public function __construct() { + $this->ver = ZAP_VERSION; + extract(get_object_vars($this)); + ob_start(); - $ver = ZAP_VERSION; include getZAPTemplate($this->template); $this->tpl .= ob_get_clean(); } diff --git a/tpl/index.tpl b/tpl/index.tpl index 68354e2..249b112 100755 --- a/tpl/index.tpl +++ b/tpl/index.tpl @@ -32,10 +32,10 @@
- width px + width px
- height px + height px