diff --git a/app/messages/app_config.php b/app/messages/app_config.php index 9e2d941f7d..c047988d51 100644 --- a/app/messages/app_config.php +++ b/app/messages/app_config.php @@ -96,7 +96,7 @@ $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the message direction.'; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'message_date'; - $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'timestamp'; + $apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'timestamptz'; $apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'date'; $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'timestamp'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the message date.'; diff --git a/app/messages/messages.php b/app/messages/messages.php index 9fd81312a2..7b2e3985c4 100644 --- a/app/messages/messages.php +++ b/app/messages/messages.php @@ -56,9 +56,31 @@ } unset ($prep_statement, $sql, $row, $record); +//get self (primary contact attachment) image, if any + if (!is_array($_SESSION['tmp']['messages']['contact_me'])) { + $sql = "select attachment_filename as filename, attachment_content as image from v_contact_attachments "; + $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; + $sql .= "and contact_uuid = :contact_uuid "; + $sql .= "and attachment_primary = 1 "; + $bind[':contact_uuid'] = $_SESSION['user']['contact_uuid']; + $prep_statement = $db->prepare(check_sql($sql)); + $prep_statement->execute(is_array($bind) ? $bind : null); + $_SESSION['tmp']['messages']['contact_me'] = $prep_statement->fetch(PDO::FETCH_NAMED); + unset ($sql, $bind, $prep_statement); + } + //additional includes require_once "resources/header.php"; +//resize thread window on window resize + echo "\n"; + //styles echo "\n"; if (!$refresh) { - echo "