mirror of https://github.com/itflow-org/itflow
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
parent
e5e549482c
commit
ff161ab47b
16
ajax.php
16
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,<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";
|
||||
$subject = "Time sensitive - $session_company_name secure link enclosed";
|
||||
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,
|
||||
$config_mail_from_email, $config_mail_from_name,
|
||||
|
|
|
|||
|
|
@ -56,9 +56,9 @@ $document_parent = intval($row['document_parent']);
|
|||
<div class="col-md-9">
|
||||
<div class="card">
|
||||
<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="col"><strong>Date:</strong> <?php echo date('Y-m-d', strtotime($document_created_at)); ?></div>
|
||||
<?php if(!empty($document_created_by_name)){ ?>
|
||||
|
|
@ -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']);
|
|||
|
||||
?>
|
||||
<li>
|
||||
<?php echo $file_name; ?>
|
||||
<?php echo $file_name; ?>
|
||||
<a href="post.php?unlink_file_from_document&file_id=<?php echo $file_id; ?>&document_id=<?php echo $document_id; ?>">
|
||||
<i class="fas fa-fw fa-times text-secondary ml-2"></i>
|
||||
</a>
|
||||
|
|
@ -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']);
|
|||
|
||||
?>
|
||||
<li>
|
||||
<?php echo $contact_name; ?>
|
||||
<?php echo $contact_name; ?>
|
||||
<a href="post.php?unlink_contact_from_document&contact_id=<?php echo $contact_id; ?>&document_id=<?php echo $document_id; ?>">
|
||||
<i class="fas fa-fw fa-times text-secondary ml-2"></i>
|
||||
</a>
|
||||
|
|
@ -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']);
|
|||
|
||||
?>
|
||||
<li>
|
||||
<?php echo $asset_name; ?>
|
||||
<?php echo $asset_name; ?>
|
||||
<a href="post.php?unlink_asset_from_document&asset_id=<?php echo $asset_id; ?>&document_id=<?php echo $document_id; ?>">
|
||||
<i class="fas fa-fw fa-times text-secondary ml-2"></i>
|
||||
</a>
|
||||
|
|
@ -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']);
|
|||
|
||||
?>
|
||||
<li>
|
||||
<?php echo $software_name; ?>
|
||||
<?php echo $software_name; ?>
|
||||
<a href="post.php?unlink_software_from_document&software_id=<?php echo $software_id; ?>&document_id=<?php echo $document_id; ?>">
|
||||
<i class="fas fa-fw fa-times text-secondary ml-2"></i>
|
||||
</a>
|
||||
|
|
@ -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']);
|
|||
|
||||
?>
|
||||
<li>
|
||||
<?php echo $vendor_name; ?>
|
||||
<?php echo $vendor_name; ?>
|
||||
<a href="post.php?unlink_vendor_from_document&vendor_id=<?php echo $vendor_id; ?>&document_id=<?php echo $document_id; ?>">
|
||||
<i class="fas fa-fw fa-times text-secondary ml-2"></i>
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -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) -->
|
||||
<?php if ($result !== 0) { ?>
|
||||
<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>
|
||||
<?php } ?>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue