openvpn: style fixes, annotate property issue

This commit is contained in:
Franco Fichtner 2018-11-21 08:03:46 +01:00
parent cecd7b68c1
commit 10df4a19a3
2 changed files with 3 additions and 4 deletions

View File

@ -67,7 +67,7 @@ class ArchiveOpenVPN extends PlainOpenVPN
{
$conf = $this->openvpnConfParts();
$base_filename = $this->getBaseFilename();
$tempdir = tempnam(sys_get_temp_dir(), '_ovpn') ;
$tempdir = tempnam(sys_get_temp_dir(), '_ovpn');
$content_dir = $tempdir . "/" . $base_filename;
if (file_exists($tempdir)) {
unlink($tempdir);

View File

@ -34,8 +34,7 @@ namespace OPNsense\OpenVPN;
*/
abstract class BaseExporter
{
var $config = array();
var $config = array(); /* XXX make visibility not var */
/**
* @param array $conf configuration to use
@ -52,7 +51,7 @@ abstract class BaseExporter
* @param array|null $cas list of CA-certificates
* @return string pkcs12
*/
protected function export_pkcs12($crt, $prv, $pass="", $cas=null)
protected function export_pkcs12($crt, $prv, $pass = '', $cas = null)
{
$p12 = null;
$crt = openssl_x509_read($crt);