diff options
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 2 | ||||
| -rw-r--r-- | usr/local/www/system_certmanager.php | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 61d6428..9b7cafb 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -2896,7 +2896,7 @@ function pkg_call_plugins($plugin_type, $plugin_params) { else continue; $plugin_function = $pkgname . '_'. $plugin_type; - $results[$pkgname] = @eval($plugin_function($plugin_params)); + $results[$pkgname] = call_user_func($plugin_function, $plugin_params); } } } diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index f825cde..b640212 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -1084,6 +1084,10 @@ function internalca_change() { <td width="10%" class="list"></td> </tr> <?php + $pluginparams = array(); + $pluginparams['type'] = 'certificates'; + $pluginparams['event'] = 'used_certificates'; + $certificates_used_by_packages = pkg_call_plugins('plugin_certificates', $pluginparams); $i = 0; foreach($a_cert as $cert): $name = htmlspecialchars($cert['descr']); @@ -1174,6 +1178,21 @@ function internalca_change() { <?php if (is_captiveportal_cert($cert['refid'])): ?> Captive Portal<br /> <?php endif; ?> + <? + $refid = $cert['refid']; + foreach($certificates_used_by_packages as $name => $package){ + if(isset($package['certificatelist'][$refid])){ + $hint = "" ; + foreach($package['certificatelist'][$refid] as $cert_used){ + $hint = $hint . $cert_used['usedby']."\n"; + } + $count = count($package['certificatelist'][$refid]); + echo "<div title='".htmlspecialchars($hint)."'>"; + echo htmlspecialchars($package['pkgname'])." ($count)<br />"; + echo "</div>"; + } + } + ?> </td> <td valign="middle" class="list nowrap"> <a href="system_certmanager.php?act=exp&id=<?=$i;?>"> |
