From 94d16a17fb0b1195fea4e34f4decdbb061367e01 Mon Sep 17 00:00:00 2001
From: Terranom674 <thomas_dannenberg@web.de>
Date: Sat, 15 Aug 2026 14:40:29 +0200
Subject: [PATCH] Complete watermark administration controller

---
 admin.php | 45 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/admin.php b/admin.php
index 70959fa..5cd295f 100644
--- a/admin.php
+++ b/admin.php
@@ -7,7 +7,6 @@ if (!defined('PHPWG_ROOT_PATH'))
 check_status(ACCESS_ADMINISTRATOR);
 
 require_once(BRATONIEN_TOOLS_PATH . 'include/tool_registry.inc.php');
-require_once(BRATONIEN_TOOLS_PATH . 'tools/watermark_profiles.inc.php');
 
 $tools = bratonien_tools_get_tools();
 $messages = array();
@@ -16,8 +15,7 @@ $errors = array();
 if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['bratonien_tool']))
 {
   check_pwg_token();
-
-  $tool_id = (string) $_POST['bratonien_tool'];
+  $tool_id = (string)$_POST['bratonien_tool'];
 
   if (!isset($tools[$tool_id]))
   {
@@ -35,18 +33,51 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST' && isset($_POST['bratonien_tool']))
     }
     catch (Throwable $e)
     {
-      $errors[] = 'Werkzeug fehlgeschlagen: ' . $e->getMessage();
+      $errors[] = $e->getMessage();
     }
   }
 }
 
+$watermark = bratonien_tools_get_watermark_data();
+$profiles = bratonien_tools_get_watermark_profiles();
+$defaults = bratonien_tools_get_watermark_defaults();
+$categories = bratonien_tools_get_category_tree();
+$rules = bratonien_tools_get_album_rules();
+$engine = bratonien_tools_get_watermark_engine_config();
+
+$profile_names = array();
+foreach ($profiles as $profile)
+{
+  $profile_names[(int)$profile['id']] = $profile['name'];
+}
+
+foreach ($categories as &$category)
+{
+  $id = (int)$category['id'];
+  $category['rule'] = $rules[$id] ?? array('mode'=>'inherit','profile_id'=>null);
+  $category['effective'] = bratonien_tools_resolve_album_rule($id, $categories, $rules, $defaults);
+
+  if ($category['effective']['mode'] === 'disabled')
+  {
+    $category['effective_label'] = 'Kein Wasserzeichen';
+  }
+  else
+  {
+    $pid = (int)$category['effective']['profile_id'];
+    $category['effective_label'] = $profile_names[$pid] ?? ('Profil #'.$pid);
+  }
+}
+unset($category);
+
 $template->assign(array(
-  'BRATONIEN_TOOLS' => $tools,
   'BRATONIEN_MESSAGES' => $messages,
   'BRATONIEN_ERRORS' => $errors,
   'PWG_TOKEN' => get_pwg_token(),
-  'WATERMARK' => bratonien_tools_get_watermark_data(),
-  'WATERMARK_PROFILES' => bratonien_tools_get_watermark_profiles(),
+  'WATERMARK' => $watermark,
+  'WATERMARK_PROFILES' => $profiles,
+  'WATERMARK_DEFAULTS' => $defaults,
+  'WATERMARK_CATEGORIES' => $categories,
+  'WATERMARK_ENGINE' => $engine,
 ));
 
 $template->set_filename('plugin_admin_content', BRATONIEN_TOOLS_PATH . 'template/admin.tpl');