lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-19 19:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

OpenVPN export, move base filename into own method for easier reuse. https://github.com/opnsense/core/issues/2787

Browse Source
This commit is contained in:
Ad Schellevis 2018-11-20 20:39:31 +01:00
parent 0a0e5ee747
commit ceb54b9657
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opnsense/mvc/app/library/OPNsense/OpenVPN/ArchiveOpenVPN.php
View File

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

14
src/opnsense/mvc/app/library/OPNsense/OpenVPN/PlainOpenVPN.php
View File

@ -52,9 +52,9 @@ class PlainOpenVPN extends BaseExporter implements IExportProvider
}
/**
* @return string filename
* @return string base filename without extension
*/
public function getFilename()
protected function getBaseFilename()
{
$result = array();
if (!empty($this->config['description'])) {
@ -65,7 +65,15 @@ class PlainOpenVPN extends BaseExporter implements IExportProvider
if (!empty($this->config['client_cn'])) {
$result[] = $this->config['client_cn'];
}
return implode("_", $result) . ".". $this->fileExtension;
return implode("_", $result);
}
/**
* @return string filename
*/
public function getFilename()
{
return $this->getBaseFilename() . ".". $this->fileExtension;
}
/**