diff --git a/www/OPNProxy/Makefile b/www/OPNProxy/Makefile index c225b41a1..b982f8d23 100644 --- a/www/OPNProxy/Makefile +++ b/www/OPNProxy/Makefile @@ -1,6 +1,6 @@ PLUGIN_NAME= OPNProxy PLUGIN_VERSION= 1.0.5 -PLUGIN_REVISION= 3 +PLUGIN_REVISION= 4 PLUGIN_COMMENT= OPNsense proxy additions PLUGIN_DEPENDS= os-redis${PLUGIN_PKGSUFFIX} \ os-squid${PLUGIN_PKGSUFFIX} \ diff --git a/www/OPNProxy/src/etc/inc/plugins.inc.d/opnproxy.inc b/www/OPNProxy/src/etc/inc/plugins.inc.d/opnproxy.inc index 96f00a995..bf6370946 100644 --- a/www/OPNProxy/src/etc/inc/plugins.inc.d/opnproxy.inc +++ b/www/OPNProxy/src/etc/inc/plugins.inc.d/opnproxy.inc @@ -28,22 +28,21 @@ function opnproxy_configure() { - return array( + return [ 'user_changed' => ['opnproxy_user_changed:2'], 'webproxy' => ['opnproxy_webproxy:2'], - ); + ]; } - -function opnproxy_user_changed($verbose = false, $username = '') +function opnproxy_user_changed($unused, $username = '') { - exec("/usr/local/opnsense/scripts/OPNProxy/redis_sync_users.py " . escapeshellarg($username)); + mwexecf('/usr/local/opnsense/scripts/OPNProxy/redis_sync_users.py %', $username); } - function opnproxy_webproxy($verbose = false, $action = null) { $response = configd_run('template reload Deciso/Proxy'); + if ($verbose) { printf("template reload Deciso/Proxy: %s\n", trim($response)); }