From 7c231393844331d8b1c0d63f22792263d58bc425 Mon Sep 17 00:00:00 2001
From: madpwnhammer <m.shcherbakov@bit.games>
Date: Thu, 26 Sep 2024 18:38:23 +0300
Subject: [PATCH] Fixed: flt_class work with int

---
 CHANGELOG.md    |  3 +++
 filters.inc.php | 35 +++++++++++++++++++++++------------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e683dcf..c65dabb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v1.0.8
+- Fixed flt_class filter. Now it can be used with int values that contains configs id.
+
 ## v1.0.7
 - Adding support for plain class names besides to arrays, e.g: 
 `@flt_class:ProtoItem` == `@flt_class:["ProtoItem"]`
\ No newline at end of file
diff --git a/filters.inc.php b/filters.inc.php
index 73c6d7b..2cf9a79 100644
--- a/filters.inc.php
+++ b/filters.inc.php
@@ -85,21 +85,32 @@ function flt_class($val, $name, $struct, $args)
       $conf_path = substr($conf_path, 1) . '.conf.js';
 
     $conf_path = \taskman\config_real_path($conf_path);
-    
     $cce = \taskman\config_fetch_by_path($conf_path);
+    check_config_class($cce, $args);
+  }
 
-    $conf_class = $cce->class;
-
-    $target_class = $args;
-    if(is_array($target_class))
-      $target_class = $target_class[0];
-
-    if(!class_exists($target_class))
-      throw new Exception($val.". Target class \"".$target_class."\" is not valid");
-    
-    if($conf_class != $target_class && !is_subclass_of($conf_class, $target_class))
-      throw new Exception($val.". Config class is \"".$conf_class."\". Must be \"".$target_class."\" or it's child");
+  if(is_numeric($val))
+  {
+    if($val == 0)
+      return $val;
+    static $configs_cache;
+    if(!isset($configs_cache))
+      $configs_cache = \taskman\config_fetch_all();
+    $cce = \taskman\config_find_by_id($configs_cache, $val);
+    check_config_class($cce, $args);
   }
   
   return $val;
 }
+
+function check_config_class($cce, $target_class)
+{
+  if(is_array($target_class))
+    $target_class = $target_class[0];
+
+  if(!class_exists($target_class))
+    throw new Exception($val.". Target class \"".$target_class."\" is not valid");
+  
+  if($cce->class != $target_class && !is_subclass_of($cce->class, $target_class))
+    throw new Exception($val.". Config class is \"".$cce->class."\". Must be \"".$target_class."\" or it's child");
+}