Email Log: Database class integration.

This commit is contained in:
Nate
2019-08-05 21:22:26 -06:00
parent b47615c389
commit 72ae5998a3
4 changed files with 91 additions and 81 deletions

View File

@@ -1,7 +1,7 @@
<?php <?php
//restrict to command line only //restrict to command line only
if(defined('STDIN')) { if (defined('STDIN')) {
$document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]); $document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]);
preg_match("/^(.*)\/app\/.*$/", $document_root, $matches); preg_match("/^(.*)\/app\/.*$/", $document_root, $matches);
$document_root = $matches[1]; $document_root = $matches[1];
@@ -22,13 +22,12 @@
//get the failed emails //get the failed emails
$sql = "select email_log_uuid, email from v_email_logs limit 100"; $sql = "select email_log_uuid, email from v_email_logs limit 100";
$prep_statement = $db->prepare(check_sql($sql)); $database = new database;
$prep_statement->execute(); $emails = $database->select($sql, null, 'all');
$emails = $prep_statement->fetchAll(PDO::FETCH_NAMED);
//process the emails //process the emails
if (is_array($emails)) { if (is_array($emails) && @sizeof($emails) != 0) {
foreach($emails as $row) { foreach($emails as $index => $row) {
$email_log_uuid = $row['email_log_uuid']; $email_log_uuid = $row['email_log_uuid'];
$msg = $row['email']; $msg = $row['email'];
@@ -37,15 +36,23 @@
//get the message //get the message
message::add($text['message-message_resent']); message::add($text['message-message_resent']);
//delete the email //add to array
$sql = "delete from v_email_logs "; $array['email_logs'][$index]['email_log_uuid'] = $email_log_uuid;
$sql .= "where email_log_uuid = '".$email_log_uuid."' ";
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute();
unset($sql, $prep_statement);
} }
unset($mailer_error); unset($mailer_error);
} }
if (is_array($array) && @sizeof($array) != 0) {
$p = new permissions;
$p->add('email_log_delete', 'temp');
$database = new database;
$database->app_name = 'email_logs';
$database->app_uuid = 'bd64f590-9a24-468d-951f-6639ac728694';
$database->delete($array);
unset($array);
$p->delete('email_log_delete', 'temp');
}
} }
unset ($prep_statement, $sql, $emails); unset ($prep_statement, $sql, $emails);

View File

@@ -44,22 +44,25 @@
//get posted values, if any //get posted values, if any
$email_log_uuid = $_REQUEST["id"]; $email_log_uuid = $_REQUEST["id"];
$showall = $_REQUEST['showall'];
if (is_uuid($email_log_uuid)) { if (is_uuid($email_log_uuid)) {
$sql = "delete from v_email_logs "; $array['email_logs'][0]['email_log_uuid'] = $email_log_uuid;
$sql .= "where email_log_uuid = '".$email_log_uuid."' "; if (!permission_exists('email_log_all') || $_REQUEST['showall'] != 'true') {
if (permission_exists('email_log_all') && $_REQUEST['showall'] == 'true') { $array['email_logs'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
$sql .= '';
} else {
$sql .= "and domain_uuid = '".$_SESSION['domain_uuid']."' ";
} }
$prep_statement = $db->prepare(check_sql($sql));
$prep_statement->execute(); $database = new database;
unset($sql, $prep_statement); $database->app_name = 'email_logs';
$database->app_uuid = 'bd64f590-9a24-468d-951f-6639ac728694';
$database->delete($array);
unset($array);
message::add($text['message-delete']); message::add($text['message-delete']);
} }
//redirect user //redirect user
header("Location: email_logs.php"); header("Location: email_logs.php".($showall == 'true' ? '?showall=true' : null));
exit;
?> ?>

View File

@@ -43,36 +43,35 @@
$text = $language->get(); $text = $language->get();
//get email //get email
$email_log_uuid = check_str($_REQUEST["id"]); $email_log_uuid = $_REQUEST["id"];
$msg_found = false;
if (is_uuid($email_log_uuid)) { if (is_uuid($email_log_uuid)) {
$sql = "select * from v_email_logs "; $sql = "select * from v_email_logs ";
$sql .= "where email_log_uuid = '".$email_log_uuid."' "; $sql .= "where email_log_uuid = :email_log_uuid ";
$sql .= "and domain_uuid = '".$domain_uuid."' "; $sql .= "and domain_uuid = :domain_uuid ";
$prep_statement = $db->prepare(check_sql($sql)); $parameters['email_log_uuid'] = $email_log_uuid;
$prep_statement->execute(); $parameters['domain_uuid'] = $domain_uuid;
$email_logs = $prep_statement->fetchAll(PDO::FETCH_NAMED); $database = new database;
unset ($prep_statement, $sql); $row = $database->select($sql, $parameters, 'row');
if (is_array($row) && @sizeof($row) != 0) {
if (is_array($email_logs)) { $sent = $row['sent_date'];
foreach($email_logs as $row) { $type = $row['type'];
$sent = $row['sent_date']; $status = $row['status'];
$type = $row['type']; $email = $row['email'];
$status = $row['status'];
$email = $row['email'];
$msg_found = true;
}
} }
else {
message::add($text['message-invalid_email']);
header("Location: email_logs.php");
exit;
}
unset($sql, $parameters, $row);
} }
else {
if (!$msg_found) {
message::add($text['message-invalid_email']);
header("Location: email_logs.php"); header("Location: email_logs.php");
exit; exit;
} }
//includes //includes
require('resources/pop3/mime_parser.php'); require('resources/pop3/mime_parser.php');
require('resources/pop3/rfc822_addresses.php'); require('resources/pop3/rfc822_addresses.php');

View File

@@ -124,23 +124,19 @@
//prepare to page the results //prepare to page the results
require_once "resources/paging.php"; require_once "resources/paging.php";
$sql = "select count(*) as num_rows from v_log_emails "; $sql = "select count(*) from v_email_logs ";
if (permission_exists('email_log_all')) { if (permission_exists('email_log_all') && $_REQUEST['showall'] != 'true') {
if ($_REQUEST['showall'] != 'true') { $sql .= "where domain_uuid = :domain_uuid ";
$sql .= "where domain_uuid = '".$domain_uuid."' "; $parameters['domain_uuid'] = $domain_uuid;
}
}
$prep_statement = $db->prepare($sql);
if ($prep_statement) {
$prep_statement->execute();
$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
$num_rows = ($row['num_rows'] > 0) ? $row['num_rows'] : 0;
} }
$database = new database;
$num_rows = $database->select($sql, $parameters, 'column');
unset($sql, $parameters);
//prepare to page the results //prepare to page the results
$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50; $rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
if (permission_exists('email_log_all') && $_REQUEST['showall'] == 'true') { if (permission_exists('email_log_all') && $_REQUEST['showall'] == 'true') {
$param .= "&showall=true"; $param .= "&showall=true";
} else { } else {
$param = ""; $param = "";
} }
@@ -152,16 +148,17 @@
//get the list //get the list
$sql = "select * from v_email_logs "; $sql = "select * from v_email_logs ";
if (permission_exists('email_log_all') && $_REQUEST['showall'] == 'true') { if (permission_exists('email_log_all') && $_REQUEST['showall'] == 'true') {
$sql .= " join v_domains on v_email_logs.domain_uuid = v_domains.domain_uuid "; $sql .= "join v_domains on v_email_logs.domain_uuid = v_domains.domain_uuid ";
} else {
$sql .= "where domain_uuid = '".$domain_uuid."' ";
} }
if (strlen($order_by)> 0) { $sql .= "order by ".$order_by." ".$order." "; } else {
$sql .= "limit ".$rows_per_page." offset ".$offset." "; $sql .= "where domain_uuid = :domain_uuid ";
$prep_statement = $db->prepare(check_sql($sql)); $parameters['domain_uuid'] = $domain_uuid;
$prep_statement->execute(); }
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $sql .= order_by($order_by, $order, 'sent_date', 'desc');
unset ($prep_statement, $sql); $sql .= limit_offset($rows_per_page, $offset);
$database = new database;
$result = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);
//set the row style //set the row style
$c = 0; $c = 0;
@@ -257,23 +254,26 @@
echo "<td class='list_control_icons'>&nbsp;</td>\n"; echo "<td class='list_control_icons'>&nbsp;</td>\n";
echo "</tr>\n"; echo "</tr>\n";
if (is_array($result)) { if (is_array($result) && @sizeof($result) != 0) {
foreach($result as $row) { foreach($result as $row) {
//get call details //get call details
$sql = "select caller_id_name, caller_id_number, destination_number from v_xml_cdr "; $sql = "select caller_id_name, caller_id_number, destination_number ";
$sql .= "where domain_uuid = '".$domain_uuid."' "; $sql .= "from v_xml_cdr ";
$sql .= "and uuid = '".$row['call_uuid']."' "; $sql .= "where domain_uuid = :domain_uuid ";
//echo "<tr><td colspan='40'>".$sql."</td></tr>"; $sql .= "and uuid = :uuid ";
$prep_statement = $db->prepare(check_sql($sql)); $parameters['domain_uuid'] = $domain_uuid;
$prep_statement->execute(); $parameters['uuid'] = $row['call_uuid'];
$result2 = $prep_statement->fetchAll(PDO::FETCH_NAMED); $database = new database;
foreach($result2 as $row2) { $result2 = $database->select($sql, $parameters, 'all');
$caller_id_name = ($row2['caller_id_name'] != '') ? $row2['caller_id_name'] : null; if (is_array($result2) && @sizeof($result2) != 0) {
$caller_id_number = ($row2['caller_id_number'] != '') ? $row2['caller_id_number'] : null; foreach($result2 as $row2) {
$destination_number = ($row2['destination_number'] != '') ? $row2['destination_number'] : null; $caller_id_name = ($row2['caller_id_name'] != '') ? $row2['caller_id_name'] : null;
$caller_id_number = ($row2['caller_id_number'] != '') ? $row2['caller_id_number'] : null;
$destination_number = ($row2['destination_number'] != '') ? $row2['destination_number'] : null;
}
} }
unset($prep_statement, $sql); unset($sql, $parameters, $result2, $row2);
$tr_link = "href='email_log_view.php?id=".$row['email_log_uuid']."'"; $tr_link = "href='email_log_view.php?id=".$row['email_log_uuid']."'";
echo "<tr ".$tr_link.">\n"; echo "<tr ".$tr_link.">\n";
@@ -308,14 +308,15 @@
echo " <td class='list_control_icons'>"; echo " <td class='list_control_icons'>";
echo "<a href='email_log_view.php?id=".escape($row['email_log_uuid'])."' alt='".$text['label-message_view']."'>$v_link_label_view</a>"; echo "<a href='email_log_view.php?id=".escape($row['email_log_uuid'])."' alt='".$text['label-message_view']."'>$v_link_label_view</a>";
if (permission_exists('email_log_delete')) { if (permission_exists('email_log_delete')) {
echo "<a href='email_log_delete.php?id=".escape($row['email_log_uuid'])."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>"; echo "<a href='email_log_delete.php?id=".escape($row['email_log_uuid']).($_REQUEST['showall'] == true ? '&showall=true' : null)."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>";
} }
echo " </td>\n"; echo " </td>\n";
echo "</tr>\n"; echo "</tr>\n";
if ($c==0) { $c=1; } else { $c=0; } if ($c==0) { $c=1; } else { $c=0; }
} //end foreach
unset($sql, $result, $row_count); }
} //end if results unset($result, $row);
}
echo "<tr>\n"; echo "<tr>\n";
echo "<td colspan='21' align='left'>\n"; echo "<td colspan='21' align='left'>\n";