dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the case sensitivity of the fax file extension. Applied to the dev branch. 

http://code.google.com/p/fusionpbx/issues/detail?id=503&start=100
This commit is contained in:
Mark Crane 2013-11-16 17:10:27 +00:00
parent 92be86f8a2
commit 00ed809125
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/fax/fax_view.php
View File

@ -231,9 +231,9 @@ else {
} }
$fax_name = $_FILES['fax_file']['name']; $fax_name = $_FILES['fax_file']['name'];
$fax_name = str_replace(" ", "_", $fax_name); $fax_name = str_replace(" ", "_", $fax_name);
$fax_name = str_replace(".tif", "", $fax_name); $fax_name = str_ireplace(".tif", "", $fax_name);
$fax_name = str_replace(".tiff", "", $fax_name); $fax_name = str_ireplace(".tiff", "", $fax_name);
$fax_name = str_replace(".pdf", "", $fax_name); $fax_name = str_ireplace(".pdf", "", $fax_name);
//lua doesn't seem to like special chars with env:GetHeader //lua doesn't seem to like special chars with env:GetHeader
$fax_name = str_replace(";", "_", $fax_name); $fax_name = str_replace(";", "_", $fax_name);
$fax_name = str_replace(",", "_", $fax_name); $fax_name = str_replace(",", "_", $fax_name);
@ -264,7 +264,9 @@ else {
//get the fax file extension //get the fax file extension
$fax_file_extension = substr($dir_fax_temp.'/'.$_FILES['fax_file']['name'], -4); $fax_file_extension = substr($dir_fax_temp.'/'.$_FILES['fax_file']['name'], -4);
if ($fax_file_extension == "tiff") { $fax_file_extension = ".tif"; } if (strtolower($fax_file_extension) == "tiff") { $fax_file_extension = ".tif"; }
if (strtolower($fax_file_extension) == ".tif") { $fax_file_extension = ".tif"; }
if (strtolower($fax_file_extension) == ".pdf") { $fax_file_extension = ".pdf"; }
//upload the file //upload the file
move_uploaded_file($_FILES['fax_file']['tmp_name'], $dir_fax_temp.'/'.$fax_name.$fax_file_extension); move_uploaded_file($_FILES['fax_file']['tmp_name'], $dir_fax_temp.'/'.$fax_name.$fax_file_extension);
@ -300,7 +302,7 @@ else {
if ($mailto_address_user != $mailto_address_fax) { if ($mailto_address_user != $mailto_address_fax) {
$mailto_address = "'".$mailto_address_fax."\,".$mailto_address_user."'"; $mailto_address = "'".$mailto_address_fax."\,".$mailto_address_user."'";
} }
else { else {
$mailto_address = $mailto_address_user; $mailto_address = $mailto_address_user;
} }
@ -350,8 +352,9 @@ else {
exec($_SESSION['switch']['bin']['dir']."/tiff2pdf -f -o ".$fax_name.".pdf ".$dir_fax_sent.$fax_name.".tif"); exec($_SESSION['switch']['bin']['dir']."/tiff2pdf -f -o ".$fax_name.".pdf ".$dir_fax_sent.$fax_name.".tif");
} }
header("Location: fax_view.php?id=".$fax_uuid."&msg=".$response); //redirect the browser
exit; header("Location: fax_view.php?id=".$fax_uuid."&msg=".$response);
exit;
} //end upload and send fax } //end upload and send fax
//delete the fax //delete the fax
@ -475,7 +478,6 @@ else {
echo " <th width=\"10%\" class=\"listhdr\" nowrap>Size".$text['table-size']."</td>\n"; echo " <th width=\"10%\" class=\"listhdr\" nowrap>Size".$text['table-size']."</td>\n";
echo " </tr>"; echo " </tr>";
if ($handle = opendir($dir_fax_inbox)) { if ($handle = opendir($dir_fax_inbox)) {
//build an array of the files in the inbox //build an array of the files in the inbox
$i = 0; $i = 0;
@ -730,4 +732,4 @@ else {
//show the footer //show the footer
require_once "resources/footer.php"; require_once "resources/footer.php";
?> ?>