Changes to be committed:

modified:   Web/user.py

.docker-build.env

@@ -1,7 +1,7 @@
 NUITKA_BUILD=0
 INVENTAR_HTTP_PORT=10000
 INVENTAR_HTTP_PORTS=10000
-INVENTAR_APP_IMAGE=ghcr.io/aiirondev/legendary-octo-garbanzo:latest
+INVENTAR_APP_IMAGE=ghcr.io/aiirondev/legendary-octo-garbanzo:v0.7.42
 INVENTAR_APP_CPUS=1.0
 INVENTAR_APP_MEM_LIMIT=384m
 INVENTAR_APP_MEM_SWAP_LIMIT=768m

.release-version

@@ -0,0 +1 @@
+v0.7.42

Web/app.py

@@ -25,9 +25,10 @@ Features:
 - Booking and reservation of items
 """
 
-from flask import Flask, render_template, request, redirect, url_for, session, flash, send_from_directory, get_flashed_messages, jsonify, Response, make_response, send_file
+from flask import Flask, render_template, request, redirect, url_for, session, flash, send_from_directory, get_flashed_messages, jsonify, Response, make_response, send_file, abort
 from werkzeug.utils import secure_filename
 from werkzeug.middleware.proxy_fix import ProxyFix
+from jinja2 import TemplateNotFound
 import user as us
 import items as it
 import ausleihung as au
@@ -353,7 +354,7 @@ def _enforce_active_session_user():
 @app.before_request
 def _enforce_module_access():
     endpoint = request.endpoint or ''
-    if endpoint == 'static' or endpoint.startswith('static') or request.path.startswith('/api/'):
+    if endpoint == 'static' or endpoint.startswith('static'):
         return None
     
     for name, matcher in cfg.MODULES._path_matchers.items():
@@ -363,7 +364,18 @@ def _enforce_module_access():
                 'inventory': "Inventar-Modul ist deaktiviert.",
                 'student_cards': "Schülerausweis-Modul ist deaktiviert."
             }.get(name, f"{name.capitalize()}-Modul ist deaktiviert.")
-            return msg, 403
+            
+            if request.path.startswith('/api/') or request.is_json:
+                return jsonify({'ok': False, 'message': msg}), 403
+            
+            flash(msg, 'info')
+            
+            if name != 'inventory' and cfg.MODULES.is_enabled('inventory'):
+                return redirect(url_for('home'))
+            elif name != 'library' and cfg.MODULES.is_enabled('library'):
+                return redirect(url_for('library_view'))
+            
+            return redirect(url_for('my_borrowed_items'))
 
 """ -----------------------------------------------------------After Request Handlers----------------------------------------------------------------------------- """
 
@@ -401,6 +413,26 @@ def _set_security_headers(response):
     return response
 
 
+@app.errorhandler(TemplateNotFound)
+def handle_template_not_found(e):
+    """Handle missing template files with a 404 response."""
+    app.logger.error(f"Template not found: {e.name}")
+    if request.is_json or request.path.startswith('/api/'):
+        return jsonify({'error': 'Template not found', 'status': 404}), 404
+    return abort(404)
+
+
+@app.errorhandler(404)
+def handle_not_found(e):
+    """Handle 404 errors with a user-friendly response."""
+    app.logger.warning(f"404 Not Found: {request.path}")
+    if request.is_json or request.path.startswith('/api/'):
+        return jsonify({'error': 'Not found', 'status': 404}), 404
+    if 'username' in session:
+        return render_template('error.html', error_code=404, error_message='Seite nicht gefunden.'), 404
+    return redirect(url_for('login'))
+
+
 def _csrf_error_response(message='CSRF token fehlt oder ist ungültig.'):
     if request.is_json or request.path.startswith('/api/') or request.path in {'/download_book_cover', '/proxy_image', '/log_mobile_issue'}:
         return jsonify({'error': message}), 400
@@ -2619,7 +2651,8 @@ def home():
             library_module_enabled=cfg.MODULES.is_enabled('library'),
             student_cards_module_enabled=cfg.MODULES.is_enabled('student_cards'),
             student_default_borrow_days=cfg.STUDENT_DEFAULT_BORROW_DAYS,
-            student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS
+            student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS,
+            open_item=request.args.get('open_item')
         )
     else:
         permissions = _get_current_user_permissions() or us.build_default_permission_payload('standard_user')
@@ -2662,6 +2695,7 @@ def home_admin():
         student_default_borrow_days=cfg.STUDENT_DEFAULT_BORROW_DAYS,
         student_max_borrow_days=cfg.STUDENT_MAX_BORROW_DAYS,
         school_info=_get_school_info_for_export(),
+        open_item=request.args.get('open_item')
     )
 
 
@@ -4667,12 +4701,26 @@ def upload_item():
 
     # Check if base code is unique for single-item uploads
     if code_4 and item_count == 1 and not it.is_code_unique(code_4[0]):
-        error_msg = 'Der Code wird bereits verwendet. Bitte wählen Sie einen anderen Code.'
+        existing_item = it._get_items_collection().find_one({"code_4": code_4[0]})
-        if is_mobile:
+        if existing_item:
-            return jsonify({'success': False, 'message': error_msg}), 400
+            error_msg = 'Der Code wird bereits verwendet. Umleitung zum Eintrag.'
+            if is_mobile:
+                return jsonify({
+                    'success': False, 
+                    'message': error_msg,
+                    'existing_item_id': str(existing_item['_id']),
+                    'redirect_to_item': True
+                }), 400
+            
+            flash(error_msg, 'info')
+            return redirect(url_for(success_redirect_endpoint, open_item=str(existing_item['_id'])))
         else:
-            flash(error_msg, 'error')
+            error_msg = 'Der Code wird bereits verwendet. Bitte wählen Sie einen anderen Code.'
-            return redirect(url_for(success_redirect_endpoint))
+            if is_mobile:
+                return jsonify({'success': False, 'message': error_msg}), 400
+            else:
+                flash(error_msg, 'error')
+                return redirect(url_for(success_redirect_endpoint))
 
     # Validate optional per-item codes
     if individual_codes:

Web/settings.py

@@ -230,6 +230,7 @@ MODULES.register('library', LIBRARY_MODULE_ENABLED, _match_library)
 MODULES.register('student_cards', STUDENT_CARDS_MODULE_ENABLED, _match_student_cards)
 
 STUDENT_DEFAULT_BORROW_DAYS = int(_get(_conf, ['modules', 'student_cards', 'default_borrow_days'], DEFAULTS['modules']['student_cards']['default_borrow_days']))
+STUDENT_MAX_BORROW_DAYS = int(_get(_conf, ["modules", "student_cards", "max_borrow_days"], DEFAULTS["modules"]["student_cards"]["max_borrow_days"]))
 
 # Upload/paths
 ALLOWED_EXTENSIONS = set(_get(_conf, ['allowed_extensions'], DEFAULTS['upload']['allowed_extensions']))

Web/templates/error.html

@@ -0,0 +1,75 @@
+{% extends "base.html" %}
+
+{% block title %}
+    {% if error_code == 404 %}
+        Seite nicht gefunden - Inventarsystem
+    {% else %}
+        Fehler - Inventarsystem
+    {% endif %}
+{% endblock %}
+
+{% block content %}
+<div class="error-container" style="text-align: center; padding: 60px 20px; min-height: 70vh; display: flex; flex-direction: column; justify-content: center; align-items: center;">
+    <div style="max-width: 600px;">
+        <!-- Error Code Display -->
+        <div style="font-size: 120px; font-weight: bold; color: #ef4444; margin-bottom: 20px;">
+            {{ error_code }}
+        </div>
+
+        <!-- Error Title -->
+        <h1 style="font-size: 32px; margin: 20px 0; color: #1f2937;">
+            {% if error_code == 404 %}
+                Seite nicht gefunden
+            {% else %}
+                Ein Fehler ist aufgetreten
+            {% endif %}
+        </h1>
+
+        <!-- Error Message -->
+        <p style="font-size: 18px; color: #6b7280; margin: 20px 0 40px;">
+            {{ error_message or 'Es tut uns leid, aber die angeforderte Seite konnte nicht gefunden werden.' }}
+        </p>
+
+        <!-- Action Buttons -->
+        <div style="display: flex; gap: 15px; justify-content: center; flex-wrap: wrap;">
+            <a href="{{ url_for('home') }}" class="button" style="background-color: #3b82f6; color: white; padding: 12px 30px; text-decoration: none; border-radius: 5px; display: inline-block; font-weight: 500;">
+                Zur Startseite
+            </a>
+            <a href="javascript:history.back()" class="button" style="background-color: #6b7280; color: white; padding: 12px 30px; text-decoration: none; border-radius: 5px; display: inline-block; font-weight: 500;">
+                Zurück
+            </a>
+        </div>
+
+        <!-- Additional Help -->
+        <div style="margin-top: 60px; padding: 20px; background-color: #f3f4f6; border-radius: 8px;">
+            <p style="color: #6b7280; font-size: 14px;">
+                Wenn Sie denken, dass dies ein Fehler ist, oder Sie Hilfe benötigen, 
+                <a href="{{ url_for('impressum') }}" style="color: #3b82f6; text-decoration: none;">kontaktieren Sie den Administrator</a>.
+            </p>
+        </div>
+    </div>
+</div>
+
+<style>
+    .error-container {
+        animation: fadeIn 0.3s ease-in;
+    }
+
+    @keyframes fadeIn {
+        from {
+            opacity: 0;
+            transform: translateY(10px);
+        }
+        to {
+            opacity: 1;
+            transform: translateY(0);
+        }
+    }
+
+    .button:hover {
+        opacity: 0.9;
+        transform: translateY(-2px);
+        transition: all 0.2s ease;
+    }
+</style>
+{% endblock %}

Web/templates/main.html

@@ -4614,6 +4614,18 @@ function openItemQuick(id){
     }
 }
 </style>
+
+{% if open_item %}
+<script>
+    document.addEventListener("DOMContentLoaded", function() {
+        if (typeof openEditModalFromServer === 'function') {
+            setTimeout(function() {
+                openEditModalFromServer('{{ open_item }}');
+            }, 500);
+        }
+    });
+</script>
+{% endif %}
 {% endblock %}
 <style>
     /* Admin/Main Content Container align */

Web/templates/main_admin.html

@@ -5716,4 +5716,16 @@ document.addEventListener('DOMContentLoaded', ()=>{
     }
 }
 </style>
+
+{% if open_item %}
+<script>
+    document.addEventListener("DOMContentLoaded", function() {
+        if (typeof openEditModalFromServer === 'function') {
+            setTimeout(function() {
+                openEditModalFromServer('{{ open_item }}');
+            }, 500);
+        }
+    });
+</script>
+{% endif %}
 {% endblock %}

Web/templates/upload_admin.html

@@ -709,7 +709,6 @@
 </style>
 
 <div class="upload-container">
-    <a href="{{ url_for(back_target|default('home_admin')) }}" class="nav-back-button">← Zurück zur Artikelübersicht</a>
 
     {% if show_library_features %}
     <div style="border:1px solid #dbe4ee; border-radius:8px; padding:14px; margin-bottom:16px; background:#f8fbff;">

Web/tenant.py

@@ -96,6 +96,10 @@ def get_tenant_config(tenant_id=None):
 
     if tenant_id in TENANT_REGISTRY:
         return TENANT_REGISTRY[tenant_id] or {}
+        
+    for alias in _tenant_db_aliases(tenant_id):
+        if alias in TENANT_REGISTRY:
+            return TENANT_REGISTRY[alias] or {}
 
     return TENANT_REGISTRY.get('default', {}) or {}
 

Web/user.py

@@ -498,8 +498,6 @@ def check_nm_pwd(username, password):
     finally:
         client.close()
 
-    return None
-
 
 def add_user(
     username,
@@ -536,16 +534,12 @@ def add_user(
         for key, value in page_permissions.items():
             permission_defaults['pages'][str(key)] = bool(value)
 
-    alias_first = name if str(name or '').strip() else username
-    alias_last = last_name if str(last_name or '').strip() else ''
-    name_alias = build_name_synonym(alias_first, alias_last)
-
     user_doc = {
         'Username': username,
         'Password': hashing(password),
         'Admin': False,
         'active_ausleihung': None,
-        'name': name_alias,
+        'name': name.strip() if name else '',
         'last_name': last_name.strip() if last_name else '',
         'IsStudent': bool(is_student),
         'PermissionPreset': permission_defaults['preset'],

docker-compose.yml

@@ -1,41 +1,63 @@
-version: "3.8"
-
 services:
   app:
-    build: .
+    image: ghcr.io/aiirondev/legendary-octo-garbanzo:v0.7.39
-    container_name: inventory-app
+    container_name: inventarsystem-app
     restart: unless-stopped
-    environment:
+    ports:
-      - MONGO_URL=mongodb://mongodb:27017/inventar
+      - "10000:8000"
-      - REDIS_URL=redis://redis:6379
-      - BASE_URL=https://inventar.maximiliangruendinger.de #alle öffentliche subdomains
     depends_on:
       - mongodb
       - redis
+    environment:
+      INVENTAR_MONGODB_HOST: mongodb
+      INVENTAR_MONGODB_PORT: "27017"
+      INVENTAR_MONGODB_DB: Inventarsystem
+      INVENTAR_BACKUP_FOLDER: /data/backups
+      INVENTAR_LOGS_FOLDER: /data/logs
+    expose:
+      - "8000"
+    volumes:
+      - ./config.json:/app/config.json:ro
+      - app_uploads:/app/Web/uploads
+      - app_thumbnails:/app/Web/thumbnails
+      - app_previews:/app/Web/previews
+      - app_qrcodes:/app/Web/QRCodes
+      - app_backups:/data/backups
+      - app_logs:/data/logs
 
   mongodb:
-    image: mongo:latest
+    image: mongo:7.0
-    container_name: mongodb
+    container_name: inventarsystem-mongodb
     restart: unless-stopped
     volumes:
-      - mongo_data:/data/db
+      - mongodb_data:/data/db
+    healthcheck:
+      test: ["CMD", "mongosh", "--quiet", "--eval", "db.adminCommand('ping').ok"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
 
   redis:
-    image: redis:alpine
+    image: redis:7-alpine
-    container_name: redis
+    container_name: inventarsystem-redis
     restart: unless-stopped
-
+    command: redis-server --appendonly yes --maxmemory 512mb --maxmemory-policy allkeys-lru
-  cloudflared:
+    ports:
-    image: cloudflare/cloudflared:latest
+      - "6379:6379"
-    container_name: cloudflared
-    restart: unless-stopped
-    # Der Tunnel-Name 'homeserver' muss zu deiner credentials.json passen
-    command: tunnel run homeserver
     volumes:
-      - ./config.yml:/etc/cloudflared/config.yml
+      - redis_data:/data
-      - ./credentials.json:/etc/cloudflared/credentials.json
+    healthcheck:
-    depends_on:
+      test: ["CMD", "redis-cli", "ping"]
-      - app
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
 volumes:
-  mongo_data:
+  mongodb_data:
+  app_uploads:
+  app_thumbnails:
+  app_previews:
+  app_qrcodes:
+  app_backups:
+  app_logs:
+  redis_data: