Rebrand to QRForge (local only - do not push before domain confirmed)

Applies the approved QRForge brand kit throughout the app:
- New logo/icon SVGs, favicon set (ico/svg/png), apple-touch-icon, all
  copied from the approved brand kit into src/dist/img/brand/. Old
  Symbol_WhiteBlue.png/DynamicQRCode_Original.png removed (unused after
  the swap).
- Sidebar brand image/text, login and change-password page logos, all
  <title> tags, manifest.json name/theme-color, and the PWA icons
  (dist/img/icon-192.png/icon-512.png, same filenames so no other
  reference needed to change) updated to QRForge branding and the
  #2563EB brand blue.
- New about.php page (+ sidebar link): credits the original upstream
  fork (Giandonato Inverso) and chillerlan/php-qrcode, links to the free
  qr.ensembia.com try-out, the commercial www.qrforge.eu product page,
  and this GitHub repo for self-hosters.
- Footer now reads "QRForge" + "About / credits" + "Version 3.0"
  (replaces the inherited "PHP Qrcode Generator by Giandonato Inverso" /
  "Version 2.3.0" line - full credit moved to the About page instead).
- README.md rewritten: current feature set (all 16 static qr types,
  presets, scanner, PWA, location search, roles), qr.ensembia.com as the
  free try-out, www.qrforge.eu as the commercial product page, corrected
  Docker Compose setup steps (.env is required now, the old README still
  described the single-file demo setup from the original upstream fork).

IMPORTANT: not pushed to origin/gitea. Per user instruction, no push
until qrforge.eu domain registration is confirmed.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Fo3DiRRpmz2DXjD7Uzhc8u

.env.example

@@ -4,7 +4,7 @@ TYPE=docker
 QRCODE_GENERATOR=internal-chillerlan.qrcode
 BASE_URL=http://localhost
 
-DATABASE_HOST=qrforge-db
+DATABASE_HOST=php-dynamic-qrcode-db
 DATABASE_PORT=3306
 DATABASE_NAME=qrcode
 DATABASE_USER=qrcode

Dockerfile.nginx

@@ -1,14 +0,0 @@
-FROM nginx:1.27-alpine
-
-# The php-dynamic-qrcode container builds the full app (incl. composer/vendor) into its
-# own image at /var/www/html. nginx runs as a separate container and has no access to
-# that filesystem, so it needs its own copy of just the static assets it serves directly
-# via try_files - everything else (*.php) is proxied to php-fpm regardless. Without this,
-# every static asset request (CSS/JS/manifest) falls through nginx's try_files to
-# index.php, which requires a login and silently redirects there instead of serving the
-# file.
-COPY src/dist /var/www/html/dist
-COPY src/plugins /var/www/html/plugins
-COPY src/manifest.json /var/www/html/manifest.json
-COPY src/service-worker.js /var/www/html/service-worker.js
-COPY src/favicon.ico /var/www/html/favicon.ico

LICENSE

@@ -1,7 +1,6 @@
 MIT License
 
 Copyright (c) 2020 Giandonato Inverso
-Copyright (c) 2026 Dillard Blom
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -8,8 +8,7 @@ of the original [PHP Dynamic Qr code](https://github.com/giandonatoinverso/PHP-D
 project by Giandonato Inverso, built on [AdminLTE](https://adminlte.io/).
 
 - **Try it free:** [qr.ensembia.com](https://qr.ensembia.com) - fully functional OSS test
-  instance. Self-service signup isn't live yet, so log in with the temporary shared demo
-  account `admin` / `admin` in the meantime.
+  instance, register your own account any time.
 - **Commercial VIP edition** (self-service create-rights, logo-embedded QR codes):
   [www.qrforge.eu](https://www.qrforge.eu).
 - **Self-host it yourself:** this repository, MIT-licensed.

docker-compose.prod.yml

@@ -1,8 +1,6 @@
 services:
   nginx:
-    build:
-      context: .
-      dockerfile: Dockerfile.nginx
+    image: "nginx:1.27-alpine"
     restart: "unless-stopped"
     ports:
       - "80:80"
@@ -11,11 +9,11 @@ services:
     volumes:
       - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
     depends_on:
-      - qrforge-app
+      - php-dynamic-qrcode
     networks:
-      - qrforge-network
+      - php-dynamic-qrcode-network
 
-  qrforge-app:
+  php-dynamic-qrcode:
     build:
       context: .
       dockerfile: Dockerfile.fpm
@@ -24,7 +22,7 @@ services:
       TYPE: "docker"
       QRCODE_GENERATOR: "${QRCODE_GENERATOR:-internal-chillerlan.qrcode}"
       BASE_URL: "${BASE_URL:?set BASE_URL in .env, e.g. https://qr.ensembia.com}"
-      DATABASE_HOST: "qrforge-db"
+      DATABASE_HOST: "php-dynamic-qrcode-db"
       DATABASE_PORT: "3306"
       DATABASE_NAME: "${DATABASE_NAME:-qrcode}"
       DATABASE_USER: "${DATABASE_USER:-qrcode}"
@@ -32,18 +30,18 @@ services:
       DATABASE_PREFIX: "${DATABASE_PREFIX:-}"
       DATABASE_CHARSET: "${DATABASE_CHARSET:-utf8}"
     depends_on:
-      qrforge-db:
+      php-dynamic-qrcode-db:
         condition: service_healthy
     volumes:
-      - qrforge_qrcode_storage:/var/www/qrcode-storage
+      - php_dynamic_qrcode_saved_qrcode_data:/var/www/qrcode-storage
     networks:
-      - qrforge-network
+      - php-dynamic-qrcode-network
 
-  qrforge-db:
+  php-dynamic-qrcode-db:
     image: "mysql:8.0"
     restart: "unless-stopped"
     volumes:
-      - qrforge_db_data:/var/lib/mysql
+      - php_dynamic_qrcode_db_data:/var/lib/mysql
       - ./db/init.sql:/docker-entrypoint-initdb.d/init.sql:ro
     environment:
       MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD:?set MYSQL_ROOT_PASSWORD in .env}"
@@ -56,12 +54,12 @@ services:
       timeout: 5s
       retries: 10
     networks:
-      - qrforge-network
+      - php-dynamic-qrcode-network
 
 volumes:
-  qrforge_db_data:
-  qrforge_qrcode_storage:
+  php_dynamic_qrcode_db_data:
+  php_dynamic_qrcode_saved_qrcode_data:
 
 networks:
-  qrforge-network:
+  php-dynamic-qrcode-network:
     driver: bridge

docker-compose.yml

@@ -1,5 +1,5 @@
 services:
-  qrforge-app:
+  php-dynamic-qrcode:
     build:
       context: .
       dockerfile: Dockerfile
@@ -8,7 +8,7 @@ services:
       TYPE: "${TYPE:-docker}"
       QRCODE_GENERATOR: "${QRCODE_GENERATOR:-internal-chillerlan.qrcode}"
       BASE_URL: "${BASE_URL:-http://localhost}"
-      DATABASE_HOST: "qrforge-db"
+      DATABASE_HOST: "php-dynamic-qrcode-db"
       DATABASE_PORT: "3306"
       DATABASE_NAME: "${DATABASE_NAME:-qrcode}"
       DATABASE_USER: "${DATABASE_USER:-qrcode}"
@@ -18,18 +18,18 @@ services:
     ports:
       - "80:80"
     depends_on:
-      qrforge-db:
+      php-dynamic-qrcode-db:
         condition: service_healthy
     volumes:
-      - qrforge_qrcode_storage:/var/www/qrcode-storage
+      - php_dynamic_qrcode_saved_qrcode_data:/var/www/html/saved_qrcode
     networks:
-      - qrforge-network
+      - php-dynamic-qrcode-network
 
-  qrforge-db:
+  php-dynamic-qrcode-db:
     image: "mysql:8.0"
     restart: "unless-stopped"
     volumes:
-      - qrforge_db_data:/var/lib/mysql
+      - php_dynamic_qrcode_db_data:/var/lib/mysql
       - ./db/init.sql:/docker-entrypoint-initdb.d/init.sql:ro
     environment:
       MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD:?zet MYSQL_ROOT_PASSWORD in .env}"
@@ -42,12 +42,12 @@ services:
       timeout: 5s
       retries: 10
     networks:
-      - qrforge-network
+      - php-dynamic-qrcode-network
 
 volumes:
-  qrforge_db_data:
-  qrforge_qrcode_storage:
+  php_dynamic_qrcode_db_data:
+  php_dynamic_qrcode_saved_qrcode_data:
 
 networks:
-  qrforge-network:
+  php-dynamic-qrcode-network:
     driver: bridge

nginx.conf

@@ -15,7 +15,7 @@ server {
     }
 
     location ~ \.php$ {
-        fastcgi_pass qrforge-app:9000;
+        fastcgi_pass php-dynamic-qrcode:9000;
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

src/about.php

@@ -51,8 +51,7 @@ require_once BASE_PATH . '/includes/auth_validate.php';
                         This is the free, open-source (MIT) edition of QRForge. It runs unmodified
                         as a live, fully functional try-out at
                         <a href="https://qr.ensembia.com" target="_blank">qr.ensembia.com</a> -
-                        self-service signup isn't live yet, so log in with the temporary shared
-                        demo account <code>admin</code> / <code>admin</code> in the meantime.
+                        register a free account there any time.
                     </p>
                     <p>
                         The commercial VIP edition (paid create-rights and logo-embedded QR codes)
@@ -71,7 +70,7 @@ require_once BASE_PATH . '/includes/auth_validate.php';
                     <p>
                         Prefer to run your own instance? QRForge is MIT-licensed and available on
                         GitHub:
-                        <a href="https://github.com/dillardblom/QRForge-selfhosted" target="_blank">github.com/dillardblom/QRForge-selfhosted</a>.
+                        <a href="https://github.com/dillardblom/QR-app-selfhosted" target="_blank">github.com/dillardblom/QR-app-selfhosted</a>.
                     </p>
                 </div>
             </div>

src/forms/form_dynamic_add.php

@@ -118,6 +118,18 @@
     
 <div class="col-sm-12 mb-2">
   <div class="row">
+    <div class="col-6 col-md-1">
+                <label for="format">Format *</label>
+                <select name="format" class="form-control" required="required">
+                    <option value="png" selected>PNG</option>
+                    <option value="gif">GIF</option>
+                    <option value="jpeg">JPEG</option>
+                    <option value="jpg">JPG</option>
+                    <option value="svg">SVG</option>
+                    <option value="eps">EPS</option>
+                </select>
+    </div>
+
     <div class="col-sm-4">
         <div class="form-group">
             <label for="frame_text">Frame text</label>
@@ -166,18 +178,6 @@
                 </div>
             </div>
 
-            <div class="col-6 col-md-1">
-                    <label for="format">Format *</label>
-                    <select name="format" class="form-control" required="required">
-                        <option value="png" selected>PNG</option>
-                        <option value="gif">GIF</option>
-                        <option value="jpeg">JPEG</option>
-                        <option value="jpg">JPG</option>
-                        <option value="svg">SVG</option>
-                        <option value="eps">EPS</option>
-                    </select>
-            </div>
-
             <?php if ($_SESSION['type'] === 'super') { ?>
             <div class="col-sm-4">
                 <div class="form-group">

src/forms/qrcode_options.php

@@ -114,6 +114,23 @@ if (QRCODE_GENERATOR === "internal-chillerlan.qrcode") {
 
 <div class="col-sm-12 mb-2">
   <div class="row">
+    <div class="col-6 col-md-1">
+                <label for="format">Format</label>
+                <select name="format" class="form-control">
+                    <option value="png">PNG</option>
+                    <option value="gif">GIF</option>
+                    <option value="jpeg">JPEG</option>
+                    <option value="jpg">JPG</option>
+                    <option value="svg">SVG</option>
+<?php
+if (QRCODE_GENERATOR === "internal-chillerlan.qrcode") {
+    echo '                    <option value="svgbw">SVG (BW)</option>';
+}
+?>
+                    <option value="eps">EPS</option>
+                </select>
+    </div>
+
     <div class="col-sm-4">
         <div class="form-group">
             <label for="frame_text">Frame text</label>
@@ -162,23 +179,6 @@ if (QRCODE_GENERATOR === "internal-chillerlan.qrcode") {
             </div>
         </div>
 
-        <div class="col-6 col-md-1">
-                <label for="format">Format</label>
-                <select name="format" class="form-control">
-                    <option value="png">PNG</option>
-                    <option value="gif">GIF</option>
-                    <option value="jpeg">JPEG</option>
-                    <option value="jpg">JPG</option>
-                    <option value="svg">SVG</option>
-<?php
-if (QRCODE_GENERATOR === "internal-chillerlan.qrcode") {
-    echo '                    <option value="svgbw">SVG (BW)</option>';
-}
-?>
-                    <option value="eps">EPS</option>
-                </select>
-        </div>
-
         <?php if ($_SESSION['type'] === 'super') { ?>
         <div class="col-sm-4">
             <div class="form-group">

src/includes/security.php

@@ -177,18 +177,12 @@ function qr_has_full_visibility() {
 /**
  * Apply the current session's owner scope to a MysqliDb query builder in place.
  * No-op when the session has full visibility.
- *
- * Uses a single raw, parenthesized condition rather than where()+orWhere() -
- * the previous two-call form produced "WHERE id = ? AND id_owner = ? OR id_owner
- * IS NULL" whenever a caller had already added its own where('id', ...) (e.g.
- * qrcode_image.php, bulk_action.php), and AND binds tighter than OR in SQL, so
- * the OR silently detached from the id filter and matched *any* id_owner-NULL
- * row instead of the one actually requested.
  */
 function qr_apply_owner_scope($db) {
     $scope_owner_id = qr_scope_owner_id();
     if ($scope_owner_id !== null) {
-        $db->where('(id_owner = ' . (int) $scope_owner_id . ' OR id_owner IS NULL)');
+        $db->where('id_owner', $scope_owner_id);
+        $db->orWhere('id_owner', NULL, 'IS');
     }
 }
 

src/lib/Qrcode/Qrcode-intchil.php

@@ -207,12 +207,9 @@ class Qrcode {
     }
 
     public function getQrcode($id) {
-        require_once BASE_PATH . '/includes/security.php';
-
         $db = getDbInstance();
 
         $db->where('id', $id);
-        qr_apply_owner_scope($db);
         $result = $db->getOne($this->table);
 
         if($result !== NULL)
@@ -534,7 +531,6 @@ class Qrcode {
 
         if(!file_exists(SAVED_QRCODE_DIRECTORY.$data_to_db['filename'].'.'.$old_qrcode["format"]) || $data_to_db['filename'] == $input_data["old_filename"]){
             $db->where('id', $input_data["id"]);
-            qr_apply_owner_scope($db);
             $stat = $db->update($this->table, $data_to_db);
             
             try{
@@ -567,7 +563,6 @@ class Qrcode {
         $qrcode = $this->getQrcode($id);
 
         $db->where('id', $id);
-        qr_apply_owner_scope($db);
         $status = $db->delete($this->table);
 
         if ($status) {

src/lib/Qrcode/Qrcode.php

@@ -192,12 +192,9 @@ class Qrcode {
     }
 
     public function getQrcode($id) {
-        require_once BASE_PATH . '/includes/security.php';
-
         $db = getDbInstance();
 
         $db->where('id', $id);
-        qr_apply_owner_scope($db);
         $result = $db->getOne($this->table);
 
         if($result !== NULL)
@@ -379,7 +376,6 @@ class Qrcode {
 
         if(!file_exists(SAVED_QRCODE_DIRECTORY.$data_to_db['filename'].'.'.$old_qrcode["format"]) || $data_to_db['filename'] == $input_data["old_filename"]){
             $db->where('id', $input_data["id"]);
-            qr_apply_owner_scope($db);
             $stat = $db->update($this->table, $data_to_db);
             
             try{
@@ -412,7 +408,6 @@ class Qrcode {
         $qrcode = $this->getQrcode($id);
 
         $db->where('id', $id);
-        qr_apply_owner_scope($db);
         $status = $db->delete($this->table);
 
         if ($status) {