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

Fix the redirect on the fax file delete and change the tabbing.

Browse Source
This commit is contained in:
Mark Crane
2015-05-01 12:38:30 +00:00
parent 3e53a658b2
commit bce8490f3e
2 changed files with 66 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/fax/fax_box.php
View File

@@ -46,9 +46,9 @@ else {
//get fax extension
if (strlen($_GET['id']) > 0) {
if (is_uuid($_GET["id"])) {
$fax_uuid = $_GET["id"];
}
//get the key
$fax_uuid = check_str($_REQUEST["id"]);
if (if_group("superadmin") || if_group("admin")) {
//show all fax extensions
$sql = "select * from v_fax ";

123
app/fax/fax_file_delete.php
View File

@@ -41,76 +41,79 @@ else {
}
//get the id
if (is_uuid($_GET["id"])) {
$id = $_GET["id"];
if (isset($_REQUEST["id"])) {
$id = check_str($_REQUEST["id"]);
}
if (strlen($id) > 0) {
//get the fax file data
$sql = "select * from v_fax_files ";
$sql .= "where fax_file_uuid = '$id' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
foreach ($result as &$row) {
$domain_uuid = $row["domain_uuid"];
$fax_uuid = $row["fax_uuid"];
$fax_mode = $row["fax_mode"];
$fax_file_path = $row["fax_file_path"];
$fax_file_type = $row["fax_file_type"];
}
unset($prep_statement);
//validate the id
if (strlen($id) > 0) {
//get the fax file data
$sql = "select * from v_fax_files ";
$sql .= "where fax_file_uuid = '$id' ";
//echo $sql."\n";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
foreach ($result as &$row) {
$domain_uuid = $row["domain_uuid"];
$fax_uuid = $row["fax_uuid"];
$fax_mode = $row["fax_mode"];
$fax_file_path = $row["fax_file_path"];
$fax_file_type = $row["fax_file_type"];
}
unset($prep_statement);
//get the fax file data
$sql = "select * from v_fax_files ";
$sql .= "where fax_uuid = '$fax_uuid' ";
$sql .= "and domain_uuid = '$domain_uuid' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
foreach ($result as &$row) {
$fax_extension = $row["fax_extension"];
}
unset($prep_statement);
//get the fax file data
$sql = "select * from v_fax_files ";
$sql .= "where fax_uuid = '$fax_uuid' ";
$sql .= "and domain_uuid = '$domain_uuid' ";
//echo $sql."\n";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
foreach ($result as &$row) {
$fax_extension = $row["fax_extension"];
}
unset($prep_statement);
//delete fax_file
$sql = "delete from v_fax_files ";
$sql .= "where fax_file_uuid = '$id' ";
$sql .= "and domain_uuid = '$domain_uuid' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
unset($prep_statement);
//delete fax_file
$sql = "delete from v_fax_files ";
$sql .= "where fax_file_uuid = '$id' ";
$sql .= "and domain_uuid = '$domain_uuid' ";
//echo $sql."\n";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
unset($prep_statement);
//set the type
if ($fax_mode == 'rx') {
$type = 'inbox';
}
if ($fax_mode == 'tx') {
$type = 'sent';
}
//set the type
if ($fax_mode == 'rx') {
$type = 'inbox';
}
if ($fax_mode == 'tx') {
$type = 'sent';
}
//set the fax directory
$fax_dir = $_SESSION['switch']['storage']['dir'].'/fax'.((count($_SESSION["domains"]) > 1) ? '/'.$_SESSION['domain_name'] : null);
$file = basename($row['fax_file_path']);
$file_ext = substr($file, -3);
$dir_fax = $fax_dir.'/'.$fax_extension.'/'.$type;
if (strtolower(substr($file, -3)) == "tif" || strtolower(substr($file, -3)) == "pdf") {
$file_name = substr($file, 0, (strlen($file) -4));
}
//set the fax directory
$fax_dir = $_SESSION['switch']['storage']['dir'].'/fax'.((count($_SESSION["domains"]) > 1) ? '/'.$_SESSION['domain_name'] : null);
$file = basename($row['fax_file_path']);
$file_ext = substr($file, -3);
$dir_fax = $fax_dir.'/'.$fax_extension.'/'.$type;
if (strtolower(substr($file, -3)) == "tif" || strtolower(substr($file, -3)) == "pdf") {
$file_name = substr($file, 0, (strlen($file) -4));
}
//if the file does not exist then remove temp/ out of the path
if (!file_exists($fax_file_path)) {
$file = str_replace("temp/", $type."/", $file);
}
//if the file does not exist then remove temp/ out of the path
if (!file_exists($fax_file_path)) {
$file = str_replace("temp/", $type."/", $file);
}
//delete the files
unlink($dir_fax.'/'.$file_name.'.tif');
unlink($dir_fax.'/'.$file_name.'.pdf');
}
//delete the files
unlink($dir_fax.'/'.$file_name.'.tif');
unlink($dir_fax.'/'.$file_name.'.pdf');
}
//redirect the user
$_SESSION['message'] = $text['message-delete'];
header('Location: fax_files.php?id='.$id.'&box='.$type);
header('Location: fax_files.php?id='.$fax_uuid.'&box='.$type);
?>