From 29e70796f68abb4ae6bab4b0795f16ac81a38139 Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Thu, 16 Apr 2015 16:05:39 +0000 Subject: [PATCH] Fax Server: Log detail view now available. Resolves issue 923. --- app/fax/app_config.php | 4 - app/fax/fax_log_view.php | 162 +++++++++++++++++++++++++++++++++++++++ app/fax/fax_logs.php | 12 +-- 3 files changed, 166 insertions(+), 12 deletions(-) create mode 100644 app/fax/fax_log_view.php diff --git a/app/fax/app_config.php b/app/fax/app_config.php index 1207a50dac..4501ee8fa8 100644 --- a/app/fax/app_config.php +++ b/app/fax/app_config.php @@ -112,10 +112,6 @@ $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; $y++; - $apps[$x]['permissions'][$y]['name'] = "fax_log_edit"; - $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; - $apps[$x]['permissions'][$y]['groups'][] = "admin"; - $y++; $apps[$x]['permissions'][$y]['name'] = "fax_log_delete"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; diff --git a/app/fax/fax_log_view.php b/app/fax/fax_log_view.php new file mode 100644 index 0000000000..5b5a14195c --- /dev/null +++ b/app/fax/fax_log_view.php @@ -0,0 +1,162 @@ + $value) { + $text[$key] = $value[$_SESSION['domain']['language']['code']]; + } + +//pre-populate the form + if (isset($_REQUEST["id"]) && isset($_REQUEST["fax_uuid"])) { + $fax_log_uuid = check_str($_REQUEST["id"]); + $fax_uuid = check_str($_REQUEST["fax_uuid"]); + + $sql = "select * from v_fax_logs "; + $sql .= "where domain_uuid = '".$domain_uuid."' "; + $sql .= "and fax_log_uuid = '".$fax_log_uuid."' "; + $prep_statement = $db->prepare(check_sql($sql)); + $prep_statement->execute(); + $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); + foreach ($result as &$row) { + $fax_log_uuid = $row["fax_log_uuid"]; + $fax_success = $row["fax_success"]; + $fax_result_code = $row["fax_result_code"]; + $fax_result_text = $row["fax_result_text"]; + $fax_file = $row["fax_file"]; + $fax_ecm_used = $row["fax_ecm_used"]; + $fax_local_station_id = $row["fax_local_station_id"]; + $fax_document_transferred_pages = $row["fax_document_transferred_pages"]; + $fax_document_total_pages = $row["fax_document_total_pages"]; + $fax_image_resolution = $row["fax_image_resolution"]; + $fax_image_size = $row["fax_image_size"]; + $fax_bad_rows = $row["fax_bad_rows"]; + $fax_transfer_rate = $row["fax_transfer_rate"]; + $fax_retry_attempts = $row["fax_retry_attempts"]; + $fax_retry_limit = $row["fax_retry_limit"]; + $fax_retry_sleep = $row["fax_retry_sleep"]; + $fax_uri = $row["fax_uri"]; + $fax_date = $row["fax_date"]; + $fax_epoch = $row["fax_epoch"]; + break; //limit to 1 row + } + unset ($prep_statement); + } + +//show the header + require_once "resources/header.php"; + +//show the content + echo "
"; + echo "".$text['title-fax_log']."\n"; + echo "

\n"; + + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "
".$text['label-fax_success']."".$fax_success."
".$text['label-fax_result_code']."".$fax_result_code."
".$text['label-fax_result_text']."".$fax_result_text."
".$text['label-fax_file']."".$fax_file."
".$text['label-fax_ecm_used']."".$fax_ecm_used."
".$text['label-fax_local_station_id']."".$fax_local_station_id."
".$text['label-fax_document_transferred_pages']."".$fax_document_transferred_pages."
".$text['label-fax_document_total_pages']."".$fax_document_total_pages."
".$text['label-fax_image_resolution']."".$fax_image_resolution."
".$text['label-fax_image_size']."".$fax_image_size."
".$text['label-fax_bad_rows']."".$fax_bad_rows."
".$text['label-fax_transfer_rate']."".$fax_transfer_rate."
".$text['label-fax_retry_attempts']."".$fax_retry_attempts."
".$text['label-fax_retry_limit']."".$fax_retry_limit."
".$text['label-fax_retry_sleep']."".$fax_retry_sleep."
".$text['label-fax_uri']."".$fax_uri."
".$text['label-fax_date']."".$fax_date."
".$text['label-fax_epoch']."".$fax_epoch."
"; + echo "

"; + + echo ""; + +//include the footer + require_once "resources/footer.php"; +?> \ No newline at end of file diff --git a/app/fax/fax_logs.php b/app/fax/fax_logs.php index 8415fdf584..ee0e270112 100755 --- a/app/fax/fax_logs.php +++ b/app/fax/fax_logs.php @@ -111,9 +111,7 @@ else { if ($result_count > 0) { foreach($result as $row) { - if (permission_exists('fax_log_edit')) { - $tr_link = "href='fax_log_edit.php?id=".$row['fax_log_uuid']."&fax_uuid=$fax_uuid'"; - } + $tr_link = "href='fax_log_view.php?id=".$row['fax_log_uuid']."&fax_uuid=".$fax_uuid."'"; echo "\n"; echo " ".$row['fax_success']." \n"; echo " ".$row['fax_result_code']." \n"; @@ -134,13 +132,11 @@ else { echo " ".$row['fax_date']." \n"; //echo " ".$row['fax_epoch']." \n"; echo " "; - if (permission_exists('fax_log_edit')) { - echo "$v_link_label_edit"; - } + echo "".$v_link_label_view.""; if (permission_exists('fax_log_delete')) { - echo "$v_link_label_delete"; + echo "".$v_link_label_delete.""; } - echo " \n"; + echo "\n"; echo "\n"; if ($c==0) { $c=1; } else { $c=0; } } //end foreach