Small wording edits

- Ajax: Make link sharing text clearer/friendlier, include company name in subject and shared item description in body to help legitimise the message from spam
- Client doc details: Make edit summary text smaller
- Update: Enhance git fetch error wording, mention forum for support
This commit is contained in:
Marcus Hill
2023-09-30 13:41:41 +01:00
parent e5e549482c
commit ff161ab47b
3 changed files with 30 additions and 16 deletions

View File

@@ -234,6 +234,15 @@ if (isset($_GET['share_generate_link'])) {
$item_note = sanitizeInput($_GET['note']); $item_note = sanitizeInput($_GET['note']);
$item_view_limit = intval($_GET['views']); $item_view_limit = intval($_GET['views']);
$item_expires = sanitizeInput($_GET['expires']); $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); $item_key = randomString(156);
if ($item_type == "Document") { if ($item_type == "Document") {
@@ -281,8 +290,11 @@ if (isset($_GET['share_generate_link'])) {
// Send user e-mail, if specified // Send user e-mail, if specified
if(!empty($config_smtp_host) && filter_var($item_email, FILTER_VALIDATE_EMAIL)){ if(!empty($config_smtp_host) && filter_var($item_email, FILTER_VALIDATE_EMAIL)){
$subject = "Time sensitive encrypted link enclosed"; $subject = "Time sensitive - $session_company_name secure link enclosed";
$body = "Hello,<br><br>$session_name from $session_company_name sent you a time sensitive encrypted link which will expire in <strong>$item_expires</strong> and may only be viewed <strong>$item_view_limit</strong> 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<br><br><strong><a href='$url'>Click Here</a></strong><br><br>~<br>$session_company_name<br>Support Department<br>$config_ticket_from_email"; if ($item_expires_friendly == "never") {
$subject = "$session_company_name secure link enclosed";
}
$body = "Hello,<br><br>$session_name from $session_company_name sent you a time sensitive secure link regarding '$item_name'.<br><br>The link will expire in <strong>$item_expires_friendly</strong> and may only be viewed <strong>$item_view_limit</strong> times, before the link is destroyed. <br><br><strong><a href='$url'>Click here to access your secure content</a></strong><br><br>~<br>$session_company_name<br>Support Department<br>$config_ticket_from_email";
$mail = sendSingleEmail($config_smtp_host, $config_smtp_username, $config_smtp_password, $config_smtp_encryption, $config_smtp_port, $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, $config_mail_from_email, $config_mail_from_name,

View File

@@ -57,7 +57,7 @@ $document_parent = intval($row['document_parent']);
<div class="card"> <div class="card">
<div class="card-header bg-dark"> <div class="card-header bg-dark">
<h3><?php echo $document_name; ?> <small><?php echo $document_description; ?></small></h3> <h3><?php echo $document_name; ?> <?php if (!empty($document_description)) { ?><span class="h6 text-muted">(<?php echo $document_description; ?>)</span><?php } ?></h3>
<div class="row"> <div class="row">
<div class="col"><strong>Date:</strong> <?php echo date('Y-m-d', strtotime($document_created_at)); ?></div> <div class="col"><strong>Date:</strong> <?php echo date('Y-m-d', strtotime($document_created_at)); ?></div>

View File

@@ -27,7 +27,9 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
<!-- Check if git fetch result is zero (success) --> <!-- Check if git fetch result is zero (success) -->
<?php if ($result !== 0) { ?> <?php if ($result !== 0) { ?>
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger" role="alert">
<strong>Warning: Could not find execute 'git fetch'. Do you have git installed?</strong> <strong>WARNING: Could not find execute 'git fetch'.</strong>
<br>Things to check: Is Git installed? Is the Git origin/remote correct? Are web server file permissions too strict?
<br>Seek support on the <a href="https://forum.itflow.org">Forum</a> if required - include relevant PHP error logs & ITFlow debug output
</div> </div>
<?php } ?> <?php } ?>