diff --git a/ajax.php b/ajax.php index 2d6dc6a0..10b39daa 100644 --- a/ajax.php +++ b/ajax.php @@ -234,6 +234,15 @@ if (isset($_GET['share_generate_link'])) { $item_note = sanitizeInput($_GET['note']); $item_view_limit = intval($_GET['views']); $item_expires = sanitizeInput($_GET['expires']); + $item_expires_friendly = "never"; // default never + if ($item_expires == "30 MINUTE") { + $item_expires_friendly = "30 minutes"; + } elseif ($item_expires == "24 HOUR") { + $item_expires_friendly = "24 hours"; + } elseif ($item_expires == "72 HOUR") { + $item_expires_friendly = "72 hours (3 days)"; + } + $item_key = randomString(156); if ($item_type == "Document") { @@ -281,8 +290,11 @@ if (isset($_GET['share_generate_link'])) { // Send user e-mail, if specified if(!empty($config_smtp_host) && filter_var($item_email, FILTER_VALIDATE_EMAIL)){ - $subject = "Time sensitive encrypted link enclosed"; - $body = "Hello,

$session_name from $session_company_name sent you a time sensitive encrypted link which will expire in $item_expires and may only be viewed $item_view_limit times, before the link is destroyed. The sender will receive a notification when the link is viewed. Please click the link below to view your shared secret

Click Here

~
$session_company_name
Support Department
$config_ticket_from_email"; + $subject = "Time sensitive - $session_company_name secure link enclosed"; + if ($item_expires_friendly == "never") { + $subject = "$session_company_name secure link enclosed"; + } + $body = "Hello,

$session_name from $session_company_name sent you a time sensitive secure link regarding '$item_name'.

The link will expire in $item_expires_friendly and may only be viewed $item_view_limit times, before the link is destroyed.

Click here to access your secure content

~
$session_company_name
Support Department
$config_ticket_from_email"; $mail = sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_password, $config_smtp_encryption, $config_smtp_port, $config_mail_from_email, $config_mail_from_name, diff --git a/client_document_details.php b/client_document_details.php index 35ab27a3..d75fe8fe 100644 --- a/client_document_details.php +++ b/client_document_details.php @@ -56,9 +56,9 @@ $document_parent = intval($row['document_parent']);
- -

- + +

()

+
Date:
@@ -97,7 +97,7 @@ $document_parent = intval($row['document_parent']); AND document_files.document_id = $document_id ORDER BY file_name ASC" ); - + $linked_files = array(); while ($row = mysqli_fetch_array($sql_files)) { @@ -108,7 +108,7 @@ $document_parent = intval($row['document_parent']); ?>
  • - + @@ -130,7 +130,7 @@ $document_parent = intval($row['document_parent']); AND contact_documents.document_id = $document_id ORDER BY contact_name ASC" ); - + $linked_contacts = array(); while ($row = mysqli_fetch_array($sql_contacts)) { @@ -141,7 +141,7 @@ $document_parent = intval($row['document_parent']); ?>
  • - + @@ -163,7 +163,7 @@ $document_parent = intval($row['document_parent']); AND asset_documents.document_id = $document_id ORDER BY asset_name ASC" ); - + $linked_assets = array(); while ($row = mysqli_fetch_array($sql_assets)) { @@ -174,7 +174,7 @@ $document_parent = intval($row['document_parent']); ?>
  • - + @@ -196,7 +196,7 @@ $document_parent = intval($row['document_parent']); AND software_documents.document_id = $document_id ORDER BY software_name ASC" ); - + $linked_software = array(); while ($row = mysqli_fetch_array($sql_software)) { @@ -207,7 +207,7 @@ $document_parent = intval($row['document_parent']); ?>
  • - + @@ -229,7 +229,7 @@ $document_parent = intval($row['document_parent']); AND vendor_documents.document_id = $document_id ORDER BY vendor_name ASC" ); - + $associated_vendors = array(); while ($row = mysqli_fetch_array($sql_vendors)) { @@ -240,7 +240,7 @@ $document_parent = intval($row['document_parent']); ?>
  • - + diff --git a/settings_update.php b/settings_update.php index d4ecf7d3..48bf6e55 100644 --- a/settings_update.php +++ b/settings_update.php @@ -27,7 +27,9 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format