nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Continued work on formatting the mac address for upper or lower case.

Browse Source
This commit is contained in:
markjcrane
2016-01-09 11:10:37 -07:00
parent 10f74f391e
commit 9f49e6537a
3 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/devices/device_edit.php
View File

@@ -357,10 +357,6 @@ require_once "resources/require.php";
unset ($prep_statement);
}
//format the mac address
$format = new provision();
$formatted_mac_address = $format->format_mac($device_mac_address, $device_vendor);
//use the mac address to get the vendor
if (strlen($device_vendor) == 0) {
$template_array = explode("/", $device_template);
@@ -557,7 +553,7 @@ require_once "resources/require.php";
else {
$domain_name = $_SESSION['domain_name'];
}
echo " window.location = 'https://".$domain_name."/app/provision?mac=".$formatted_mac_address."&file=' + d + '&content_type=application/octet-stream';\n";
echo " window.location = 'https://".$domain_name."/app/provision?mac=".$device_mac_address."&file=' + d + '&content_type=application/octet-stream';\n";
echo " }\n";
echo "\n";
@@ -607,7 +603,7 @@ require_once "resources/require.php";
echo " <option value=''>".$text['label-download']."</option>\n";
foreach ($files as $file) {
//render the file name
$file_name = str_replace("{\$mac}",$device_mac_address,basename($file));
$file_name = str_replace("{\$mac}",$mac,basename($file));
//add the select option
echo " <option value='".basename($file)."'>".$file_name."</option>\n";
}

25
app/provision/index.php
View File

@@ -298,15 +298,22 @@ openlog("fusion-provisioning", LOG_PID | LOG_PERROR, LOG_LOCAL0);
//deliver the customized config over HTTP/HTTPS
//need to make sure content-type is correct
if ($_REQUEST['content_type'] == 'application/octet-stream') {
$file_name = str_replace("{\$mac}",$mac,$file);
header('Content-Description: File Transfer');
header('Content-Type: application/octet-stream');
header('Content-Disposition: attachment; filename="'.basename($file_name).'"');
header('Content-Transfer-Encoding: binary');
header('Expires: 0');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public');
header('Content-Length: ' . filesize($file_contents));
//format the mac address and
$format = new provision();
$mac = $format->format_mac($mac, $device_vendor);
//replace the variable name with the value
$file_name = str_replace("{\$mac}", $mac, $file);
//set the headers
header('Content-Description: File Transfer');
header('Content-Type: application/octet-stream');
header('Content-Disposition: attachment; filename="'.basename($file_name).'"');
header('Content-Transfer-Encoding: binary');
header('Expires: 0');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public');
header('Content-Length: ' . filesize($file_contents));
}
else {
$cfg_ext = ".cfg";

12
app/provision/resources/classes/provision.php
View File

@@ -891,15 +891,11 @@ include "root.php";
$this->file = $file_name;
$file_contents = $this->render();
//format the mac address
$mac = $this->format_mac($device_mac_address, $device_vendor);
//replace {$mac} in the file name
if ($device_vendor == "aastra" || $device_vendor == "cisco") {
//upper case the mac address for aastra phones
$file_name = str_replace("{\$mac}", strtoupper($device_mac_address), $file_name);
}
else {
//all other phones
$file_name = str_replace("{\$mac}", $device_mac_address, $file_name);
}
$file_name = str_replace("{\$mac}", $mac, $file_name);
//write the file
//echo $directory.'/'.$file_name."\n";