From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Thu, 26 Jan 2023 22:27:20 +0000 (+0100)
Subject: Extensions: fixed gettext support for modules.
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=7124250802b8c978f3ad690f48d5130ba79dac30

Extensions: fixed gettext support for modules.
---

diff --git a/includes/hooks.inc b/includes/hooks.inc
index 609eac31..6a158a76 100644
--- a/includes/hooks.inc
+++ b/includes/hooks.inc
@@ -242,6 +242,7 @@ function install_hooks($lang_code=null)
 			$hook_class = 'hooks_'.$ext['package'];
 			if ($ext['active'] && class_exists($hook_class)) {
 				$Hooks[$ext['package']] = new $hook_class;
+				$Hooks[$ext['package']]->path = $ext['path'];
 			}
 		}	
 	}
@@ -279,7 +280,7 @@ function hook_invoke($ext, $method, &$data, $opts=null)
 
 	$ret = null;
 	if (isset($Hooks[$ext]) && method_exists($Hooks[$ext], $method)) {
-		set_ext_domain('modules/'.$ext);
+		set_ext_domain($Hooks[$ext]->path);
 		$ret = $Hooks[$ext]->$method($data, $opts);
 		set_ext_domain();
 	} 
@@ -299,7 +300,7 @@ function hook_invoke_all($method, &$data, $opts=null)
 	{
 		foreach($Hooks as $ext => $hook)
 			if (method_exists($hook, $method)) {
-				set_ext_domain('modules/'.$ext);
+				set_ext_domain($hook->path);
 				$result = $hook->$method($data, $opts);
 				if (isset($result) && is_array($result)) {
 					$return = array_merge_recursive($return, $result);
@@ -322,7 +323,7 @@ function hook_invoke_first($method, &$data, $opts=null)
 	$result = null;
 	foreach($Hooks as $ext => $hook) {
 		if (method_exists($hook, $method)) {
-			set_ext_domain('modules/'.$ext);
+			set_ext_domain($hook->path);
 			$result = $hook->$method($data, $opts);
 			set_ext_domain();
 			if (isset($result))
@@ -344,7 +345,7 @@ function hook_invoke_last($method, &$data, $opts=null)
 	$Reverse = array_reverse($Hooks);
 	foreach($Reverse as $ext => $hook) {
 		if (method_exists($hook, $method)) {
-			set_ext_domain('modules/'.$ext);
+			set_ext_domain($hook->path);
 			$result = $hook->$method($data, $opts);
 			set_ext_domain();
 			if (isset($result))
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 7f680eaf..dcd7fe68 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -314,7 +314,7 @@ function button($name, $value, $title=false, $icon=false,  $aspect='')
 	}
 	else
 		return "<input type='submit' class='editbutton' name='"
-			.htmlentities(strtr($name, array('.'=>'=2E', '='=>'=3D',// ' '=>'=20','['=>'=5B'
+			.html_specials_encode(strtr($name, array('.'=>'=2E', '='=>'=3D',// ' '=>'=20','['=>'=5B'
 			)))
 			."' value='$value'"
 			.($title ? " title='$title'":'')