Fase 3 feedback round: style preview, icon upload, font choice, optional bitcoin amount, WPA3

- Default the Owner select to the creator's own account instead of "All", so
  superadmin-created codes no longer silently become visible to every admin
  (the underlying NULL-fallback sharing behavior for an explicit "All" choice
  is unchanged).
- Add a live color/precision/size preview swatch next to the preset picker.
- Let the frame text use a chosen DejaVu font + font size instead of a fixed
  GD bitmap font.
- Add an optional self-uploaded icon rendered above the qr code (not embedded
  in it, so scanability is unaffected).
- Make the Bitcoin qr amount optional; a standing wallet address is useful
  without forcing a one-off amount per code.
- Add a WPA3 option to the WiFi qr encryption select.
- Fix a real bug surfaced while testing the preview/style JS: qrcode_options.php
  was included once per static qr type (16 times on one page) and each
  inclusion re-executed <script src="qrcode-style-tools.js">, so every button
  click fired once per type - e.g. saving one preset wrote 16 duplicate rows,
  and every tab except the first ("Text") had dead random-style/preset
  buttons since only the first DOM match ever got a listener. Moved the
  script include to load once per page and rewrote the JS to scope every
  lookup to the triggering element's own tab-pane/form instead of relying on
  getElementById's first-match behavior.

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

.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

@@ -1,70 +1,65 @@
-<p align="center"><img src="src/dist/img/brand/logo.svg" alt="QRForge" width="320"></p>
+<p align="center"><img src="https://www.giandonatoinverso.it/qrcode/dist/img/DynamicQRCode_Original.png"></p>
 
-<p align="center"><strong>Self-hosted, open-source QR code generator.</strong></p>
+**PHP Dynamic Qr code** is a script that allows the generation and saving of dynamic and static QR codes. It has a clean, responsive, and user-friendly design. It is based on [AdminLte](https://adminlte.io/), the "Best open source admin dashboard & control panel theme. Built on top of Bootstrap" and [Core PHP Admin Panel](https://github.com/chetans9/core-php-admin-panel), a simple Admin Panel written in core PHP that contains an implementation of general features you might need in your website admin panel like: record management (CRUD), secure authentication, pagination, filters.
 
-**QRForge** creates and manages static and dynamic QR codes from a clean,
+[LIVE DEMO](https://qrcode.giandonatoinverso.dev/)
-responsive control panel. It's a security-hardened, actively maintained fork
-of the original [PHP Dynamic Qr code](https://github.com/giandonatoinverso/PHP-Dynamic-Qr-code)
-project by Giandonato Inverso, built on [AdminLTE](https://adminlte.io/).
 
-- **Try it free:** [qr.ensembia.com](https://qr.ensembia.com) - fully functional OSS test
+username: admin
-  instance. Self-service signup isn't live yet, so log in with the temporary shared demo
+
-  account `admin` / `admin` in the meantime.
+password: admin
-- **Commercial VIP edition** (self-service create-rights, logo-embedded QR codes):
+
-  [www.qrforge.eu](https://www.qrforge.eu).
+[DOCUMENTATION](https://giandonatoinverso.it/qrcode/documentation)
-- **Self-host it yourself:** this repository, MIT-licensed.
 
 # Features
 
-- Dynamic QR codes with a database-backed URL shortener
+- **#1 Dynamic Qr code generator on GitHub with a database to store Qr codes**
-    - Create, edit, delete, enable/disable the redirect
+- Create unlimited Qr codes
-    - Download any time, bulk download/delete
+- Docker compose support
-    - Batch-generate from a CSV file
+- Control panel with 2 access levels
-- 16 static QR code types: Text, Email, Phone, SMS, WhatsApp, Skype, Location,
+- Multi-account 
-  vCard, Event/calendar, Bookmark, WiFi (incl. WPA3), PayPal, Bitcoin, 2FA,
+- Dashboard with advanced statistics on Qr codes created and on scans
-  App Link (Android intent / universal links), Bluetooth
+- Bulk download, bulk delete
-- QR code styling: 6 export formats, foreground/background color, 4 precision
+- Dynamic Qr code
-  levels, 10 sizes, optional label text below the code (custom font + size),
+    - Create, modify, and delete Qr codes
-  optional icon shown above the code, save/load your own style presets
+    - You can download your Qr codes when you want
-- Address search (OpenStreetMap Nominatim) for Location QR codes
+    - URL shortener with redirect
-- Built-in QR scanner (camera or image upload, decodes entirely client-side)
+    - Enable or disable the link redirect
-- Installable as a PWA
+- Static Qr code
-- Role-based access: `super` (full access + user management), `admin`
+    - Text QR Code
-  (scoped to their own codes and sub-users), `user` (read-only, with
+    - Email QR Code
-  optional per-account create rights and view toggles set by an admin)
+    - Phone QR Code
-- Dashboard with QR/scan statistics and a 7-day activity chart
+    - Sms QR Code
-- CSRF protection, login rate limiting, session hardening, audit log
+    - Whatsapp QR Code
-- Docker Compose setup, both a dev image and a production Nginx + PHP-FPM image
+    - Skype QR Code
+    - Location QR Code
+    - Vcard QR Code
+    - Event/calendar QR Code
+    - Bookmark QR Code
+    - Wifi QR Code
+    - Paypal QR Code
+    - Bitcoin QR Code
+- Customization of Qr codes
+    - 6 formats for images
+    - Foreground color
+    - Background color
+    - 4 levels of precision
+    - 10 sizes
+- Responsive bootstrap-based design
+- Easy to understand and expand code
+- Full OOP with classes and well-documented
 
-# What is included
+## What is included
 
-- PHP 8.4 application source
+- PHP files
-- Database schema + migrations
+- .sql file with sample data
-- Docker Compose files (dev and production)
+- JS files
-- CSS/JS assets
+- CSS files
+- Docker compose file
 
-# Setup with Docker Compose
+## Setup with docker compose
-
+1. download docker-compose.yml file
-1. Clone this repository.
+2. Start docker stack
-2. Copy `.env.example` to `.env` and set a real `DATABASE_PASSWORD` /
+```bash
-   `MYSQL_ROOT_PASSWORD`.
+docker compose build --no-cache && docker compose up -d
-3. Start the stack:
+```
-   ```bash
+3. Open your browser at http://localhost:80 and login with (username: superadmin, password: superadmin)
-   docker compose up -d --build
-   ```
-4. Open `http://localhost` and log in with `superadmin` / `superadmin`. You'll
-   be required to set a new password on first login.
-
-For a production deployment behind a reverse proxy, use
-`docker-compose.prod.yml` (Nginx + PHP-FPM) instead of the dev stack.
-
-# Credits
-
-- Originally forked from [PHP Dynamic Qr code](https://github.com/giandonatoinverso/PHP-Dynamic-Qr-code)
-  by Giandonato Inverso.
-- QR code rendering powered by [chillerlan/php-qrcode](https://github.com/chillerlan/php-qrcode).
-- Admin panel UI built on [AdminLTE](https://adminlte.io/).
-
-# License
-
-MIT - see [LICENSE](LICENSE).

docker-compose.prod.yml

@@ -1,8 +1,6 @@
 services:
   nginx:
-    build:
+    image: "nginx:1.27-alpine"
-      context: .
-      dockerfile: Dockerfile.nginx
     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:
+  php_dynamic_qrcode_db_data:
-  qrforge_qrcode_storage:
+  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:
+  php_dynamic_qrcode_db_data:
-  qrforge_qrcode_storage:
+  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

@@ -1,102 +0,0 @@
-<?php
-require_once 'includes/bootstrap.php';
-require_once BASE_PATH . '/includes/auth_validate.php';
-?>
-<!DOCTYPE html>
-<html lang="en">
-    <title>About - QRForge</title>
-    <head>
-    <?php include './includes/head.php'; ?>
-    </head>
-<body class="hold-transition sidebar-mini layout-fixed layout-navbar-fixed layout-footer-fixed">
-<div class="wrapper">
-  <!-- Navbar -->
-  <?php include './includes/navbar.php'; ?>
-  <!-- /.navbar -->
-
-  <!-- Main Sidebar Container -->
-  <?php include './includes/sidebar.php'; ?>
-  <!-- /.Main Sidebar Container -->
-
-  <!-- Content Wrapper. Contains page content -->
-  <div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-    <div class="content-header">
-      <div class="container-fluid">
-        <div class="row mb-2">
-          <div class="col-sm-6">
-              <h1 class="m-0 text-dark">About</h1>
-          </div><!-- /.col -->
-        </div><!-- /.row -->
-      </div><!-- /.container-fluid -->
-    </div>
-    <!-- /.content-header -->
-
-    <!-- Main content -->
-    <section class="content">
-        <div class="container-fluid">
-            <div class="card card-primary">
-                <div class="card-body text-center">
-                    <img src="dist/img/brand/logo-stacked.svg" alt="QRForge" style="max-width: 220px; margin: 20px 0;">
-                    <p class="text-muted">Self-hosted static and dynamic QR code generator. Version 3.0.</p>
-                </div>
-            </div>
-
-            <div class="card">
-                <div class="card-header">
-                    <h3 class="card-title">Commercial version</h3>
-                </div>
-                <div class="card-body">
-                    <p>
-                        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.
-                    </p>
-                    <p>
-                        The commercial VIP edition (paid create-rights and logo-embedded QR codes)
-                        is a separate product built on the same OSS core - see
-                        <a href="https://www.qrforge.eu" target="_blank">www.qrforge.eu</a> for
-                        pricing and details.
-                    </p>
-                </div>
-            </div>
-
-            <div class="card">
-                <div class="card-header">
-                    <h3 class="card-title">Self-hosting</h3>
-                </div>
-                <div class="card-body">
-                    <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>.
-                    </p>
-                </div>
-            </div>
-
-            <div class="card">
-                <div class="card-header">
-                    <h3 class="card-title">Credits</h3>
-                </div>
-                <div class="card-body">
-                    <p>
-                        Originally forked from
-                        <a href="https://github.com/giandonatoinverso/PHP-Dynamic-Qr-code" target="_blank">PHP Qrcode Generator by Giandonato Inverso</a>.
-                    </p>
-                    <p>
-                        QR code rendering is powered by the
-                        <a href="https://github.com/chillerlan/php-qrcode" target="_blank">chillerlan/php-qrcode</a>
-                        library.
-                    </p>
-                </div>
-            </div>
-        </div><!--/. container-fluid -->
-    </section><!-- /.content -->
-  </div><!-- /.content-wrapper -->
-
-<!-- Footer and scripts -->
-<?php include './includes/footer.php'; ?>
-</body>
-</html>

src/batch_qrcode.php

@@ -99,7 +99,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
 ?>
 <!DOCTYPE html>
 <html lang="en">
-    <title>QRForge</title>
+    <title>Qrcode Generator</title>
     <head>
     <?php include './includes/head.php'; ?>
     </head>

src/change_password.php

@@ -47,13 +47,13 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
 ?>
 <!DOCTYPE html>
 <html lang="en">
-<title>Change password - QRForge</title>
+<title>Change password - Qrcode Generator</title>
 <?php include './includes/head.php'; ?>
 
 <body class="login-page" style="min-height: 512.391px;">
     <div class="login-box">
   <div class="login-logo">
-    <img src="dist/img/brand/logo.svg" alt="QRForge" style="max-width: 260px;">
+    <img src="dist/img/DynamicQRCode_Original.png" style="width: 95%; height: 95%">
   </div>
 
   <div class="card">

src/dist/css/custom.css

@@ -7,20 +7,3 @@
     display: none;
     color: red;
 }
-
-/* List-page qr code thumbnails: fixed box, but object-fit:contain instead of
-   width/height attrs so taller images (e.g. icon-above-qr) don't get squashed. */
-.qr-thumb-link {
-    display: inline-block;
-    padding: 0;
-    border: 0;
-    background: none;
-    cursor: pointer;
-}
-.qr-thumb-img {
-    width: 100px;
-    height: 100px;
-    object-fit: contain;
-    background: #fff;
-    border: 1px solid #dee2e6;
-}

src/dist/img/brand/favicon.svg

@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 151.74 151.74" role="img" aria-labelledby="qfi-title qfi-desc">
-  <title id="qfi-title">QRForge icon</title>
-  <desc id="qfi-desc">QR-block mark with outbound arrow tile.</desc>
-  <g transform="translate(-8.95,-2.57)">
-    <rect id="block-top-left" x="5.24" y="16.81" width="42.29" height="40.70" rx="2.5" fill="#334155" />
-    <rect id="block-mid" x="59.57" y="68.79" width="24.90" height="23.46" rx="2.5" fill="#334155" />
-    <rect id="block-bottom-right" x="96.08" y="103.32" width="40.59" height="31.68" rx="2.5" fill="#334155" />
-    <path id="block-bottom-left-L" d="M 5.24,71.29 Q 5.24,68.79 7.74,68.79 L 45.03,68.79 Q 47.53,68.79 47.53,71.29 L 47.53,103.32 Q 47.53,103.32 47.53,103.32 L 81.97,103.32 Q 84.47,103.32 84.47,105.82 L 84.47,132.50 Q 84.47,135.00 81.97,135.00 L 7.74,135.00 Q 5.24,135.00 5.24,132.50 Z" fill="#334155" />
-    <path id="arrow-tile" d="M 105.68,6.94 Q 104.67,5.88 106.13,5.88 L 145.89,5.88 Q 148.39,5.88 148.39,8.38 L 148.39,44.14 Q 148.39,46.64 146.42,45.11 L 133.00,34.67 Q 133.00,34.67 133.00,34.67 L 112.50,56.87 Q 112.50,56.87 112.50,56.87 L 134.08,56.87 Q 136.58,56.87 136.58,59.37 L 136.58,89.50 Q 136.58,92.00 134.08,92.00 L 98.63,92.00 Q 96.13,92.00 96.13,89.50 L 96.13,56.87 Q 96.13,56.87 96.13,56.87 L 62.10,56.87 Q 59.60,56.87 59.60,54.37 L 59.60,19.60 Q 59.60,17.10 62.10,17.10 L 93.63,17.10 Q 96.13,17.10 96.13,19.60 L 96.13,41.00 Q 96.13,41.00 96.13,41.00 L 97.00,42.17 Q 97.00,42.17 97.00,42.17 L 117.19,22.73 Q 118.99,21.00 117.27,19.18 L 107.68,9.06 Q 106.68,8.00 105.68,6.94 Z" fill="#2563EB" />
-  </g>
-</svg>

src/dist/img/brand/icon-inverse.svg

@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 151.74 151.74" role="img" aria-labelledby="qfi-title qfi-desc">
-  <title id="qfi-title">QRForge icon</title>
-  <desc id="qfi-desc">QR-block mark with outbound arrow tile.</desc>
-  <g transform="translate(-8.95,-2.57)">
-    <rect id="block-top-left" x="5.24" y="16.81" width="42.29" height="40.70" rx="2.5" fill="#FFFFFF" />
-    <rect id="block-mid" x="59.57" y="68.79" width="24.90" height="23.46" rx="2.5" fill="#FFFFFF" />
-    <rect id="block-bottom-right" x="96.08" y="103.32" width="40.59" height="31.68" rx="2.5" fill="#FFFFFF" />
-    <path id="block-bottom-left-L" d="M 5.24,71.29 Q 5.24,68.79 7.74,68.79 L 45.03,68.79 Q 47.53,68.79 47.53,71.29 L 47.53,103.32 Q 47.53,103.32 47.53,103.32 L 81.97,103.32 Q 84.47,103.32 84.47,105.82 L 84.47,132.50 Q 84.47,135.00 81.97,135.00 L 7.74,135.00 Q 5.24,135.00 5.24,132.50 Z" fill="#FFFFFF" />
-    <path id="arrow-tile" d="M 105.68,6.94 Q 104.67,5.88 106.13,5.88 L 145.89,5.88 Q 148.39,5.88 148.39,8.38 L 148.39,44.14 Q 148.39,46.64 146.42,45.11 L 133.00,34.67 Q 133.00,34.67 133.00,34.67 L 112.50,56.87 Q 112.50,56.87 112.50,56.87 L 134.08,56.87 Q 136.58,56.87 136.58,59.37 L 136.58,89.50 Q 136.58,92.00 134.08,92.00 L 98.63,92.00 Q 96.13,92.00 96.13,89.50 L 96.13,56.87 Q 96.13,56.87 96.13,56.87 L 62.10,56.87 Q 59.60,56.87 59.60,54.37 L 59.60,19.60 Q 59.60,17.10 62.10,17.10 L 93.63,17.10 Q 96.13,17.10 96.13,19.60 L 96.13,41.00 Q 96.13,41.00 96.13,41.00 L 97.00,42.17 Q 97.00,42.17 97.00,42.17 L 117.19,22.73 Q 118.99,21.00 117.27,19.18 L 107.68,9.06 Q 106.68,8.00 105.68,6.94 Z" fill="#2563EB" />
-  </g>
-</svg>

src/dist/img/brand/icon.svg

@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 151.74 151.74" role="img" aria-labelledby="qfi-title qfi-desc">
-  <title id="qfi-title">QRForge icon</title>
-  <desc id="qfi-desc">QR-block mark with outbound arrow tile.</desc>
-  <g transform="translate(-8.95,-2.57)">
-    <rect id="block-top-left" x="5.24" y="16.81" width="42.29" height="40.70" rx="2.5" fill="#334155" />
-    <rect id="block-mid" x="59.57" y="68.79" width="24.90" height="23.46" rx="2.5" fill="#334155" />
-    <rect id="block-bottom-right" x="96.08" y="103.32" width="40.59" height="31.68" rx="2.5" fill="#334155" />
-    <path id="block-bottom-left-L" d="M 5.24,71.29 Q 5.24,68.79 7.74,68.79 L 45.03,68.79 Q 47.53,68.79 47.53,71.29 L 47.53,103.32 Q 47.53,103.32 47.53,103.32 L 81.97,103.32 Q 84.47,103.32 84.47,105.82 L 84.47,132.50 Q 84.47,135.00 81.97,135.00 L 7.74,135.00 Q 5.24,135.00 5.24,132.50 Z" fill="#334155" />
-    <path id="arrow-tile" d="M 105.68,6.94 Q 104.67,5.88 106.13,5.88 L 145.89,5.88 Q 148.39,5.88 148.39,8.38 L 148.39,44.14 Q 148.39,46.64 146.42,45.11 L 133.00,34.67 Q 133.00,34.67 133.00,34.67 L 112.50,56.87 Q 112.50,56.87 112.50,56.87 L 134.08,56.87 Q 136.58,56.87 136.58,59.37 L 136.58,89.50 Q 136.58,92.00 134.08,92.00 L 98.63,92.00 Q 96.13,92.00 96.13,89.50 L 96.13,56.87 Q 96.13,56.87 96.13,56.87 L 62.10,56.87 Q 59.60,56.87 59.60,54.37 L 59.60,19.60 Q 59.60,17.10 62.10,17.10 L 93.63,17.10 Q 96.13,17.10 96.13,19.60 L 96.13,41.00 Q 96.13,41.00 96.13,41.00 L 97.00,42.17 Q 97.00,42.17 97.00,42.17 L 117.19,22.73 Q 118.99,21.00 117.27,19.18 L 107.68,9.06 Q 106.68,8.00 105.68,6.94 Z" fill="#2563EB" />
-  </g>
-</svg>

src/dist/img/brand/logo-stacked.svg

@@ -1,12 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 236.20 246.50" role="img" aria-labelledby="qfs-title qfs-desc">
-  <title id="qfs-title">QRForge stacked logo</title>
-  <desc id="qfs-desc">Stacked QRForge logo.</desc>
-  <g transform="translate(33.28,14.75)">
-    <rect id="block-top-left" x="5.24" y="16.81" width="42.29" height="40.70" rx="2.5" fill="#334155" />
-    <rect id="block-mid" x="59.57" y="68.79" width="24.90" height="23.46" rx="2.5" fill="#334155" />
-    <rect id="block-bottom-right" x="96.08" y="103.32" width="40.59" height="31.68" rx="2.5" fill="#334155" />
-    <path id="block-bottom-left-L" d="M 5.24,71.29 Q 5.24,68.79 7.74,68.79 L 45.03,68.79 Q 47.53,68.79 47.53,71.29 L 47.53,103.32 Q 47.53,103.32 47.53,103.32 L 81.97,103.32 Q 84.47,103.32 84.47,105.82 L 84.47,132.50 Q 84.47,135.00 81.97,135.00 L 7.74,135.00 Q 5.24,135.00 5.24,132.50 Z" fill="#334155" />
-    <path id="arrow-tile" d="M 105.68,6.94 Q 104.67,5.88 106.13,5.88 L 145.89,5.88 Q 148.39,5.88 148.39,8.38 L 148.39,44.14 Q 148.39,46.64 146.42,45.11 L 133.00,34.67 Q 133.00,34.67 133.00,34.67 L 112.50,56.87 Q 112.50,56.87 112.50,56.87 L 134.08,56.87 Q 136.58,56.87 136.58,59.37 L 136.58,89.50 Q 136.58,92.00 134.08,92.00 L 98.63,92.00 Q 96.13,92.00 96.13,89.50 L 96.13,56.87 Q 96.13,56.87 96.13,56.87 L 62.10,56.87 Q 59.60,56.87 59.60,54.37 L 59.60,19.60 Q 59.60,17.10 62.10,17.10 L 93.63,17.10 Q 96.13,17.10 96.13,19.60 L 96.13,41.00 Q 96.13,41.00 96.13,41.00 L 97.00,42.17 Q 97.00,42.17 97.00,42.17 L 117.19,22.73 Q 118.99,21.00 117.27,19.18 L 107.68,9.06 Q 106.68,8.00 105.68,6.94 Z" fill="#2563EB" />
-  </g>
-  <text x="118.10" y="203.67" text-anchor="middle" font-family="Inter, Manrope, Geist, Arial, sans-serif" font-size="48.39" font-weight="700" letter-spacing="-3.43" fill="#334155">QRForge</text>
-</svg>

src/dist/img/brand/logo.svg

@@ -1,12 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="5.24 5.88 573.81 145.12" role="img" aria-labelledby="qf-title qf-desc">
-  <title id="qf-title">QRForge logo</title>
-  <desc id="qf-desc">QRForge wordmark with a QR-block mark and outbound arrow tile.</desc>
-  <g id="icon">
-    <rect id="block-top-left" x="5.24" y="16.81" width="42.29" height="40.70" rx="2.5" fill="#334155" />
-    <rect id="block-mid" x="59.57" y="68.79" width="24.90" height="23.46" rx="2.5" fill="#334155" />
-    <rect id="block-bottom-right" x="96.08" y="103.32" width="40.59" height="31.68" rx="2.5" fill="#334155" />
-    <path id="block-bottom-left-L" d="M 5.24,71.29 Q 5.24,68.79 7.74,68.79 L 45.03,68.79 Q 47.53,68.79 47.53,71.29 L 47.53,103.32 Q 47.53,103.32 47.53,103.32 L 81.97,103.32 Q 84.47,103.32 84.47,105.82 L 84.47,132.50 Q 84.47,135.00 81.97,135.00 L 7.74,135.00 Q 5.24,135.00 5.24,132.50 Z" fill="#334155" />
-    <path id="arrow-tile" d="M 105.68,6.94 Q 104.67,5.88 106.13,5.88 L 145.89,5.88 Q 148.39,5.88 148.39,8.38 L 148.39,44.14 Q 148.39,46.64 146.42,45.11 L 133.00,34.67 Q 133.00,34.67 133.00,34.67 L 112.50,56.87 Q 112.50,56.87 112.50,56.87 L 134.08,56.87 Q 136.58,56.87 136.58,59.37 L 136.58,89.50 Q 136.58,92.00 134.08,92.00 L 98.63,92.00 Q 96.13,92.00 96.13,89.50 L 96.13,56.87 Q 96.13,56.87 96.13,56.87 L 62.10,56.87 Q 59.60,56.87 59.60,54.37 L 59.60,19.60 Q 59.60,17.10 62.10,17.10 L 93.63,17.10 Q 96.13,17.10 96.13,19.60 L 96.13,41.00 Q 96.13,41.00 96.13,41.00 L 97.00,42.17 Q 97.00,42.17 97.00,42.17 L 117.19,22.73 Q 118.99,21.00 117.27,19.18 L 107.68,9.06 Q 106.68,8.00 105.68,6.94 Z" fill="#2563EB" />
-  </g>
-  <text id="wordmark" x="177" y="101" font-family="Inter, Manrope, Geist, Arial, sans-serif" font-size="103" font-weight="700" letter-spacing="-7.3" fill="#334155">QRForge</text>
-</svg>

src/dist/js/location-search.js

@@ -1,69 +0,0 @@
-(function () {
-    document.addEventListener('DOMContentLoaded', function () {
-        var searchInput = document.getElementById('location_search');
-        var searchBtn = document.getElementById('location_search_btn');
-        var resultsBox = document.getElementById('location_search_results');
-        var latInput = document.getElementById('latitude');
-        var lngInput = document.getElementById('longitude');
-
-        if (!searchInput || !searchBtn || !resultsBox || !latInput || !lngInput) {
-            return;
-        }
-
-        function clearResults() {
-            resultsBox.innerHTML = '';
-        }
-
-        function doSearch() {
-            var query = searchInput.value.trim();
-            if (!query) {
-                return;
-            }
-
-            clearResults();
-            resultsBox.innerHTML = '<div class="list-group-item">Searching...</div>';
-
-            fetch('https://nominatim.openstreetmap.org/search?format=json&limit=5&q=' + encodeURIComponent(query))
-                .then(function (response) { return response.json(); })
-                .then(function (results) {
-                    clearResults();
-
-                    if (!results.length) {
-                        resultsBox.innerHTML = '<div class="list-group-item">No results found.</div>';
-                        return;
-                    }
-
-                    results.forEach(function (place) {
-                        var item = document.createElement('button');
-                        item.type = 'button';
-                        item.className = 'list-group-item list-group-item-action';
-                        item.textContent = place.display_name;
-                        item.addEventListener('click', function () {
-                            latInput.value = place.lat;
-                            lngInput.value = place.lon;
-                            searchInput.value = place.display_name;
-                            clearResults();
-                        });
-                        resultsBox.appendChild(item);
-                    });
-                })
-                .catch(function () {
-                    resultsBox.innerHTML = '<div class="list-group-item text-danger">Search failed (network error).</div>';
-                });
-        }
-
-        searchBtn.addEventListener('click', doSearch);
-        searchInput.addEventListener('keydown', function (e) {
-            if (e.key === 'Enter') {
-                e.preventDefault();
-                doSearch();
-            }
-        });
-
-        document.addEventListener('click', function (e) {
-            if (e.target !== searchInput && !resultsBox.contains(e.target)) {
-                clearResults();
-            }
-        });
-    });
-})();

src/dist/js/qrcode-style-tools.js

@@ -95,18 +95,9 @@
         });
 
         document.querySelectorAll('#foreground, #background').forEach(function (input) {
-            // bootstrap-colorpicker sets the value and fires 'change' via jQuery's
-            // synthetic .trigger(), which a native addEventListener never sees - so the
-            // preview only updates via jQuery's event binding, not the native one below.
-            if (window.jQuery) {
-                jQuery(input).on('change', function () {
-                    updateStylePreview(scopeOf(input));
-                });
-            } else {
             input.addEventListener('change', function () {
                 updateStylePreview(scopeOf(input));
             });
-            }
         });
 
         document.querySelectorAll('select[name="level"]').forEach(function (select) {

src/dynamic_qrcode.php

@@ -60,7 +60,7 @@ if($_SERVER["REQUEST_METHOD"] === "POST" && !isset($_POST["edit"]) && !isset($_P
 ?>
 <!DOCTYPE html>
 <html lang="en">
-    <title>QRForge</title>
+    <title>Qrcode Generator</title>
     <head>
     <?php include './includes/head.php'; ?>
     </head>

src/dynamic_qrcodes.php

@@ -29,7 +29,7 @@ $total_pages = $db->totalPages;
 
 <!DOCTYPE html>
 <html lang="en">
-    <title>QRForge</title>
+    <title>Qrcode Generator</title>
     <head>
     <?php include './includes/head.php'; ?>
     </head>

src/forms/form_dynamic_add.php

@@ -118,6 +118,26 @@
     
 <div class="col-sm-12 mb-2">
   <div class="row">    
+    <div class="col-sm-4">
+        <div class="form-group">
+            <label for="filename">Filename *</label>
+            <input type="text" name="filename" value="" placeholder="My first Qrcode" class="form-control error" required="required" id="filename">
+          
+        </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>
+
     <div class="col-sm-4">
         <div class="form-group">
             <label for="frame_text">Frame text</label>
@@ -157,32 +177,13 @@
   </div>
 </div>
 
+    <?php if($_SESSION['type'] ===  'super') { ?>
     <div class="col-sm-12 mb-2">
         <div class="row">
-            <div class="col-sm-4">
-                <div class="form-group">
-                    <label for="filename">Filename *</label>
-                    <input type="text" name="filename" value="" placeholder="My first Qrcode" class="form-control error" required="required" id="filename">
-                </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">
                     <label for="id_owner">Owner *</label>
-                    <select name="id_owner" id="id_owner" class="form-control">
+                    <select name="id_owner" class="form-control">
                         <option value="">All (shared with every admin)</option>
                         <?php
 
@@ -198,9 +199,9 @@
                     </select>
                 </div>
             </div>
+        </div>
+    </div>
     <?php } else { ?>
         <input type="hidden" name="id_owner" value="<?php echo $_SESSION["user_id"];?>"/>
     <?php } ?>
-        </div>
-    </div>
 </fieldset>

src/forms/qrcode_options.php

@@ -58,7 +58,7 @@ if (QRCODE_GENERATOR === "internal-chillerlan.qrcode") {
     <div class="col-sm-12 mb-2">
         <div class="row">
             <div class="col-6 col-md-3">
-                <label>Randomize</label>
+                <label>&nbsp;</label>
                 <button type="button" id="random_style_btn" class="btn btn-outline-secondary btn-block">
                     <i class="fa fa-dice"></i> Random style
                 </button>
@@ -114,6 +114,31 @@ if (QRCODE_GENERATOR === "internal-chillerlan.qrcode") {
 
 <div class="col-sm-12 mb-2">
   <div class="row">    
+    <div class="col-sm-4">
+        <div class="form-group">
+            <label for="filename">Filename *</label>
+            <input type="text" name="filename" value="" placeholder="My first Qrcode" class="form-control error" required="required" id = "filename">
+          
+        </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>
+
     <div class="col-sm-4">
         <div class="form-group">
             <label for="frame_text">Frame text</label>
@@ -153,37 +178,13 @@ if (QRCODE_GENERATOR === "internal-chillerlan.qrcode") {
   </div>
 </div>
 
-<div class="col-sm-12 mb-2">
+<?php if($_SESSION['type'] ===  'super') { ?>
+    <div class="col-sm-12 mb-2">
         <div class="row">
-        <div class="col-sm-4">
-            <div class="form-group">
-                <label for="filename">Filename *</label>
-                <input type="text" name="filename" value="" placeholder="My first Qrcode" class="form-control error" required="required" id="filename">
-            </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">
                     <label for="id_owner">Owner *</label>
-                <select name="id_owner" id="id_owner" class="form-control">
+                    <select name="id_owner" class="form-control">
                         <option value="">All (shared with every admin)</option>
                         <?php
 
@@ -199,9 +200,9 @@ if (QRCODE_GENERATOR === "internal-chillerlan.qrcode") {
                     </select>
                 </div>
             </div>
-        <?php } else { ?>
-        <input type="hidden" name="id_owner" value="<?php echo $_SESSION["user_id"];?>"/>
-        <?php } ?>
         </div>
-</div>
+    </div>
+<?php } else { ?>
+    <input type="hidden" name="id_owner" value="<?php echo $_SESSION["user_id"];?>"/>
+<?php } ?>
     <br>

src/forms/static/location.php

@@ -2,31 +2,17 @@
 <?php echo csrf_field(); ?>
     <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
-    <div class="col-sm-8">
+    <div class="col-sm-4">
-        <div class="form-group" style="position: relative;">
+        <div class="form-group">
-            <label for="location_search">Search address</label>
+            <label>Latitude *</label>
-            <div class="input-group">
+            <input type="text" name="latitude" value="" placeholder="40.7127753" class="form-control">
-                <input type="text" id="location_search" class="form-control" placeholder="Search for an address or place...">
-                <div class="input-group-append">
-                    <button type="button" id="location_search_btn" class="btn btn-outline-secondary"><i class="fa fa-search"></i></button>
-                </div>
-            </div>
-            <div id="location_search_results" class="list-group" style="position:absolute;z-index:1000;width:100%;"></div>
-            <small class="form-text text-muted">Looks up coordinates via OpenStreetMap Nominatim (your search leaves this server and goes to nominatim.openstreetmap.org). Or enter coordinates directly below.</small>
         </div>
     </div>
     
     <div class="col-sm-4">
         <div class="form-group">
-            <label for="latitude">Latitude *</label>
+            <label>Longitude *</label>
-            <input type="text" name="latitude" id="latitude" value="" placeholder="40.7127753" class="form-control">
+            <input type="text" name="longitude" value="" placeholder="-74.0059728" class="form-control">
-        </div>
-    </div>
-
-    <div class="col-sm-4">
-        <div class="form-group">
-            <label for="longitude">Longitude *</label>
-            <input type="text" name="longitude" id="longitude" value="" placeholder="-74.0059728" class="form-control">
         </div>
     </div>
     
@@ -38,5 +24,4 @@
     </div>
 </div>
                 
-<script src="dist/js/location-search.js"></script>
 </form>

src/forms/table_dynamic.php

@@ -70,11 +70,7 @@
                 <td><?php echo htmlspecialchars($row['identifier']); ?></td>
                 <td><?php echo htmlspecialchars($row['link']); ?></td>
                 <td>
-                    <a href="#" class="qr-thumb-link" data-toggle="modal" data-target="#preview-modal"
+                    <?php echo '<img src="qrcode_image.php?type=dynamic&id='.$row['id'].'" width="100" height="100">'; ?>
-                       data-qr-src="qrcode_image.php?type=dynamic&id=<?php echo $row['id']; ?>"
-                       data-qr-name="<?php echo htmlspecialchars($row['filename']); ?>">
-                        <img src="qrcode_image.php?type=dynamic&id=<?php echo $row['id']; ?>" class="qr-thumb-img" alt="QR code for <?php echo htmlspecialchars($row['filename']); ?>">
-                    </a>
                 </td>
                 <td><?php echo htmlspecialchars($row['scan']); ?></td>
                 <td><?php echo htmlspecialchars($row['state']); ?></td>
@@ -139,32 +135,6 @@
 <!-- /.Delete Confirmation Modal -->
 <?php endif; ?>
 
-<!-- Qr Code Preview Modal -->
-<div class="modal fade" id="preview-modal" role="dialog">
-    <div class="modal-dialog modal-dialog-centered">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title" id="preview-modal-title">QR code preview</h4>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            </div>
-            <div class="modal-body text-center">
-                <img id="preview-modal-img" src="" alt="" style="max-width:100%;max-height:70vh;">
-            </div>
-        </div>
-    </div>
-</div>
-<!-- /.Qr Code Preview Modal -->
-
-<script>
-    document.querySelectorAll('.qr-thumb-link').forEach(function (link) {
-        link.addEventListener('click', function (e) {
-            e.preventDefault();
-            document.getElementById('preview-modal-img').src = link.getAttribute('data-qr-src');
-            document.getElementById('preview-modal-title').textContent = link.getAttribute('data-qr-name');
-        });
-    });
-</script>
-
 <script>
     const deleteButtons = document.querySelectorAll('.delete_btn');
 

src/forms/table_static.php

@@ -68,11 +68,7 @@
                 <td><?php echo htmlspecialchars($row['type']); ?></td>
                 <td><?php echo htmlspecialchars_decode($row['content']); ?></td>
                 <td>
-                    <a href="#" class="qr-thumb-link" data-toggle="modal" data-target="#preview-modal"
+                    <?php echo '<img src="qrcode_image.php?type=static&id='.$row['id'].'" width="100" height="100">'; ?>
-                       data-qr-src="qrcode_image.php?type=static&id=<?php echo $row['id']; ?>"
-                       data-qr-name="<?php echo htmlspecialchars($row['filename']); ?>">
-                        <img src="qrcode_image.php?type=static&id=<?php echo $row['id']; ?>" class="qr-thumb-img" alt="QR code for <?php echo htmlspecialchars($row['filename']); ?>">
-                    </a>
                 </td>
                 <td>
                     <?php if (!$is_readonly_user): ?>
@@ -135,32 +131,6 @@
 <!-- /.Delete Confirmation Modal -->
 <?php endif; ?>
 
-<!-- Qr Code Preview Modal -->
-<div class="modal fade" id="preview-modal" role="dialog">
-    <div class="modal-dialog modal-dialog-centered">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title" id="preview-modal-title">QR code preview</h4>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            </div>
-            <div class="modal-body text-center">
-                <img id="preview-modal-img" src="" alt="" style="max-width:100%;max-height:70vh;">
-            </div>
-        </div>
-    </div>
-</div>
-<!-- /.Qr Code Preview Modal -->
-
-<script>
-    document.querySelectorAll('.qr-thumb-link').forEach(function (link) {
-        link.addEventListener('click', function (e) {
-            e.preventDefault();
-            document.getElementById('preview-modal-img').src = link.getAttribute('data-qr-src');
-            document.getElementById('preview-modal-title').textContent = link.getAttribute('data-qr-name');
-        });
-    });
-</script>
-
 <script>
     const deleteButtons = document.querySelectorAll('.delete_btn');
 

src/includes/footer.php

@@ -6,10 +6,9 @@
 
   <!-- Main Footer -->
   <footer class="main-footer text-sm">
-    <strong><a href="https://www.qrforge.eu" target="_blank">QRForge</a></strong> -
+    <strong><a href="https://github.com/giandonatoinverso/PHP-Dynamic-Qr-code" target="_blank">PHP Qrcode Generator</a> by </strong> Giandonato Inverso
-    <a href="./about.php">About</a> / credits
     <div class="float-right d-none d-sm-inline-block">
-      <b>Version</b> 3.0
+      <b>Version</b> 2.3.0
     </div>
   </footer>
 </div>

src/includes/head.php

@@ -2,12 +2,9 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta http-equiv="x-ua-compatible" content="ie=edge">
   <meta name="csrf-token" content="<?php echo csrf_token(); ?>">
-  <meta name="theme-color" content="#2563EB">
+  <meta name="theme-color" content="#007bff">
   <link rel="manifest" href="manifest.json">
-  <link rel="icon" href="dist/img/brand/favicon.svg" type="image/svg+xml">
+  <link rel="apple-touch-icon" href="dist/img/icon-192.png">
-  <link rel="icon" href="dist/img/brand/favicon-32.png" sizes="32x32" type="image/png">
-  <link rel="icon" href="dist/img/brand/favicon-16.png" sizes="16x16" type="image/png">
-  <link rel="apple-touch-icon" href="dist/img/brand/apple-touch-icon.png">
 
   <!-- Font Awesome Icons -->
   <link rel="stylesheet" href="plugins/fontawesome-free/css/all.min.css">

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/includes/sidebar.php

@@ -2,9 +2,9 @@
   <aside class="main-sidebar sidebar-dark-primary elevation-4">
     <!-- Brand Logo -->
     <a href="./index.php" class="brand-link">
-      <img src="dist/img/brand/icon-inverse.svg" alt="QRForge" class="brand-image"
+      <img src="dist/img/Symbol_WhiteBlue.png" alt="Logo" class="brand-image"
            style="opacity: .8">
-      <span class="brand-text font-weight-light">QRForge</span>
+      <span class="brand-text font-weight-light">Qrcode Generator</span>
     </a>
 
     <!-- Sidebar -->
@@ -53,20 +53,20 @@
             <ul class="nav nav-treeview">
               <li class="nav-item">
                 <a href="./dynamic_qrcodes.php" <?php echo ((substr(CURRENT_PAGE, 0, 19) == 'dynamic_qrcodes.php')) ? ' class="nav-link active"' : ' class="nav-link"'; ?>>
-                  <i class="fas fa-angle-right nav-icon"></i>
+                  <i class="far fa-circle nav-icon"></i>
                   <p>List all</p>
                 </a>
               </li>
               <?php if ($_SESSION['type'] !== 'user'): ?>
               <li class="nav-item">
                 <a href="./dynamic_qrcode.php" <?php echo (CURRENT_PAGE == 'dynamic_qrcode.php') ? ' class="nav-link active"' : ' class="nav-link"'; ?>>
-                  <i class="fas fa-angle-right nav-icon"></i>
+                  <i class="far fa-circle nav-icon"></i>
                   <p>Add new</p>
                 </a>
               </li>
               <li class="nav-item">
                 <a href="./batch_qrcode.php" <?php echo (CURRENT_PAGE == 'batch_qrcode.php') ? ' class="nav-link active"' : ' class="nav-link"'; ?>>
-                  <i class="fas fa-angle-right nav-icon"></i>
+                  <i class="far fa-circle nav-icon"></i>
                   <p>Batch create (CSV)</p>
                 </a>
               </li>
@@ -86,14 +86,14 @@
                 <ul class="nav nav-treeview">
                     <li class="nav-item">
                         <a href="./static_qrcodes.php" <?php echo ((substr(CURRENT_PAGE, 0, 18) == 'static_qrcodes.php')) ? ' class="nav-link active"' : ' class="nav-link"'; ?>>
-                            <i class="fas fa-angle-right nav-icon"></i>
+                            <i class="far fa-circle nav-icon"></i>
                             <p>List all</p>
                         </a>
                     </li>
                     <?php if ($_SESSION['type'] !== 'user'): ?>
                     <li class="nav-item">
                         <a href="./static_qrcode.php" <?php echo (CURRENT_PAGE == 'static_qrcode.php') ? ' class="nav-link active"' : ' class="nav-link"'; ?>>
-                            <i class="fas fa-angle-right nav-icon"></i>
+                            <i class="far fa-circle nav-icon"></i>
                             <p>Add new</p>
                         </a>
                     </li>
@@ -109,12 +109,6 @@
             </a>
           </li>
           <?php endif; ?>
-          <li class="nav-item">
-            <a href="./about.php" <?php echo (CURRENT_PAGE == 'about.php') ? ' class="nav-link active"' : ' class="nav-link"'; ?>>
-                <i class="fas fa-info-circle nav-icon"></i>
-              <p>About</p>
-            </a>
-          </li>
         </ul>
       </nav>
       <!-- /.sidebar-menu -->

src/index.php

@@ -70,7 +70,7 @@ foreach ($createdQrcode_static as $row) {
 
 <!DOCTYPE html>
 <html lang="en">
-    <title>QRForge</title>
+    <title>Qr Code Generator</title>
     <head>
     <?php include './includes/head.php'; ?>
     </head>
@@ -120,7 +120,6 @@ foreach ($createdQrcode_static as $row) {
                                 </div><!-- /.col -->
                                     
                                 <div class="col-12 col-sm-6 col-md-3">
-                                    <a href="dynamic_qrcodes.php" class="d-block">
                                     <div class="info-box mb-3 bg-success">
                                         <span class="info-box-icon"><i class="fa fa-qrcode"></i></span>
 
@@ -129,14 +128,12 @@ foreach ($createdQrcode_static as $row) {
                                             <span class="info-box-number"><?php echo $numQrcode_dynamic; ?></span>
                                         </div><!-- /.info-box-content -->
                                     </div>
-                                    </a>
                                 </div><!-- /.col -->
 
                                 <!-- fix for small devices only -->
                                 <div class="clearfix hidden-md-up"></div>
 
                                 <div class="col-12 col-sm-6 col-md-3">
-                                    <a href="static_qrcodes.php" class="d-block">
                                     <div class="info-box mb-3 bg-danger">
                                         <span class="info-box-icon"><i class="fa fa-qrcode"></i></span>
 
@@ -146,7 +143,6 @@ foreach ($createdQrcode_static as $row) {
                                         </div><!-- /.info-box-content -->
 
                                     </div>
-                                    </a>
                                 </div><!-- /.col -->
                                 
                                 <div class="col-12 col-sm-6 col-md-3">

src/lib/Qrcode/Qrcode-intchil.php

@@ -174,7 +174,7 @@ class Qrcode {
         $iconWidth = imagesx($icon);
         $iconHeight = imagesy($icon);
 
-        $maxIconHeight = (int) ($height * 0.625);
+        $maxIconHeight = (int) ($height * 0.25);
         $scale = min($maxIconHeight / $iconHeight, ($width * 0.6) / $iconWidth, 1);
         $targetWidth = max(1, (int) ($iconWidth * $scale));
         $targetHeight = max(1, (int) ($iconHeight * $scale));
@@ -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

@@ -159,7 +159,7 @@ class Qrcode {
         $iconWidth = imagesx($icon);
         $iconHeight = imagesy($icon);
 
-        $maxIconHeight = (int) ($height * 0.625);
+        $maxIconHeight = (int) ($height * 0.25);
         $scale = min($maxIconHeight / $iconHeight, ($width * 0.6) / $iconWidth, 1);
         $targetWidth = max(1, (int) ($iconWidth * $scale));
         $targetHeight = max(1, (int) ($iconHeight * $scale));
@@ -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) {

src/login.php

@@ -68,13 +68,13 @@ if (isset($_COOKIE['series_id']) && isset($_COOKIE['remember_token']))
 
 <!DOCTYPE html>
 <html lang="en">
-<title>Login - QRForge</title>
+<title>Login - Qrcode Generator</title>
 <?php include './includes/head.php'; ?>
 
 <body class="login-page" style="min-height: 512.391px;">
     <div class="login-box">
   <div class="login-logo">
-    <img src="dist/img/brand/logo.svg" alt="QRForge" style="max-width: 260px;">
+    <img src="dist/img/DynamicQRCode_Original.png" style="width: 95%; height: 95%">
   </div>
   
   <div class="card">

src/manifest.json

@@ -1,12 +1,12 @@
 {
-  "name": "QRForge",
+  "name": "Qrcode Generator",
-  "short_name": "QRForge",
+  "short_name": "QRcode",
   "description": "Self-hosted static and dynamic qr code generator",
   "start_url": "index.php",
   "scope": "./",
   "display": "standalone",
   "background_color": "#ffffff",
-  "theme_color": "#2563EB",
+  "theme_color": "#007bff",
   "icons": [
     { "src": "dist/img/icon-192.png", "sizes": "192x192", "type": "image/png" },
     { "src": "dist/img/icon-512.png", "sizes": "512x512", "type": "image/png" }

src/scan_qrcode.php

@@ -4,7 +4,7 @@ require_once BASE_PATH . '/includes/auth_validate.php';
 ?>
 <!DOCTYPE html>
 <html lang="en">
-    <title>QRForge</title>
+    <title>Qrcode Generator</title>
     <head>
     <?php include './includes/head.php'; ?>
     </head>

src/static_qrcode.php

@@ -96,7 +96,7 @@ if($_SERVER["REQUEST_METHOD"] === "POST" && !isset($_POST["edit"]) && !isset($_P
 ?>
 <!DOCTYPE html>
 <html lang="en">
-    <title>QRForge</title>
+    <title>Qrcode Generator</title>
     <head>
     <?php include './includes/head.php'; ?>
     </head>

src/static_qrcodes.php

@@ -29,7 +29,7 @@ $total_pages = $db->totalPages;
 
 <!DOCTYPE html>
 <html lang="en">
-    <title>QRForge</title>
+    <title>Qrcode Generator</title>
     <head>
     <?php include './includes/head.php'; ?>
     </head>

src/user.php

@@ -51,7 +51,7 @@ if($_SERVER["REQUEST_METHOD"] === "POST" && !isset($_POST["edit"])) {
 
 <!DOCTYPE html>
 <html lang="en">
-    <title>QRForge</title>
+    <title>Qrcode Generator</title>
     <head>
     <?php include './includes/head.php'; ?>
     </head>

src/users.php

@@ -27,7 +27,7 @@ $total_pages = $db->totalPages;
 
 <!DOCTYPE html>
 <html lang="en">
-    <title>QRForge</title>
+    <title>Qrcode Generator</title>
     <head>
     <?php include './includes/head.php'; ?>
     </head>