Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Yeehong civiproxy merge #4

Open
wants to merge 16 commits into
base: yeehong-civiproxy
Choose a base branch
from
Open

Yeehong civiproxy merge #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a6cf8db
Merge pull request #1 from PalanteJon/mosaico-support
Edzelopez May 26, 2017
21f9fe5
YEEHONG-15 Fixed social media icons
Edzelopez May 26, 2017
3297518
call mendurls to format the mail params too
monishdeb May 26, 2017
70c91c3
YEEHONG-15 Added support for optout
Edzelopez May 26, 2017
54d6a7a
YEEHONG-15 Bug fixes
Edzelopez May 26, 2017
9621d56
YEEHONG-15 Added support for optout
Edzelopez May 30, 2017
796bc4b
Yeehong specific changes
Jun 17, 2019
7cb0914
Changes to proxy
Jun 20, 2019
e2af618
Permit System.check API call to be made via rest and update error tex…
seamuslee001 Mar 4, 2020
c3c63ba
Prod changes
seamuslee001 Aug 25, 2020
e3d7aea
Made preference groups generic
Edzelopez Aug 25, 2020
ea71bec
Bug fixes
Edzelopez Aug 28, 2020
89c362e
Update Proxy to handle the normal civicrm mailing open and url routes
seamuslee001 Sep 3, 2020
91c9322
Update to how it is on yeehong production for some reason the social …
seamuslee001 Sep 4, 2020
1f6bdcc
Merge pull request #3 from JMAConsulting/fix_normal_routing
seamuslee001 Sep 4, 2020
bc9a972
Merge in yeehong branch
seamuslee001 Sep 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions de.systopia.civiproxy/CRM/Civiproxy/Mailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,13 @@ static function mendURLs(&$value) {

// General external functions
$value = preg_replace("#{$system_base}sites/all/modules/civicrm/extern/url.php#i", $proxy_base.'/url.php', $value);
$value = preg_replace("#{$system_base}civicrm/mailing/url#i", $proxy_base.'/url.php', $value);
$value = preg_replace("#{$system_base}sites/all/modules/civicrm/extern/open.php#i", $proxy_base.'/open.php', $value);
$value = preg_replace("#/sites/default/files/civicrm/persist/#i", $proxy_base.'/file.php?mosaico=0&id=', $value);
$value = preg_replace("#/civicrm/mosaico/img\?src=#i", $proxy_base.'/file.php?mosaico=1&id=', $value);
$value = preg_replace("#{$system_base}civicrm/mailing/open#i", $proxy_base.'/open.php', $value);
$value = preg_replace("#{$system_base}sites/default/files/civicrm/persist/#i", $proxy_base.'/file.php?mosaico=0&id=', $value);
$value = preg_replace("#{$system_base}civicrm/mosaico/img\?src=#i", $proxy_base.'/file.php?mosaico=1&id=', $value);
$value = preg_replace("#templates/versafix-1/img/social_def/#i", $proxy_base.'/file.php?social=1&id=', $value);

// Mailing related functions
$value = preg_replace("#{$system_base}civicrm/mailing/view#i", $proxy_base.'/mailing/mail.php', $value);
$custom_mailing_base = CRM_Core_BAO_Setting::getItem('CiviProxy Settings', 'custom_mailing_base');
Expand Down
24 changes: 24 additions & 0 deletions de.systopia.civiproxy/civiproxy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,30 @@ function civiproxy_civicrm_alterMailer(&$mailer, $driver, $params) {
$mailer = new CRM_Civiproxy_Mailer($mailer);
}

function civiproxy_civicrm_alterMailParams(&$params, $context) {
if (!empty($params)) {
$lookupParams = array(
'headers',
'subject',
'text',
'html',
);
foreach ($lookupParams as $name) {
if (empty($params[$name])) {
continue;
}
if ($name == 'headers' && is_array($params['headers']) && count($params['headers'])) {
foreach ($params['headers'] as &$header) {
CRM_CiviProxy_Mailer::mendURLs($header);
}
}
else {
CRM_CiviProxy_Mailer::mendURLs($params[$name]);
}
}
}
}

/**
* Implementation of hook_civicrm_config
*/
Expand Down
1 change: 1 addition & 0 deletions proxy/mailing/error.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Failed to connect to yhccivicrm.yeehong.com port 443: Connection refused
87 changes: 36 additions & 51 deletions proxy/profile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@
$gids = json_encode($ids);
}

// Get list of groups for preferences.
$preferences = civicrm_api3('PreferenceGroup', 'getpreference', ['is_preference' => 1, 'sequential' => 1, 'api_key' => $mail_subscription_user_key])['values'];
foreach ($preferences as $options) {
$gtitle = civicrm_api3('Group', 'getvalue', ['return' => 'title', 'id' => $options['group_id'], 'api_key' => $mail_subscription_user_key]);
$preferenceGroups[$options['group_id']] = $gtitle;
}

if (!empty($_POST)) {
if (!empty($_POST['group'])) {
$g = $_POST['group'];
Expand Down Expand Up @@ -129,6 +136,17 @@
'api_key' => $mail_subscription_user_key,
'custom_' . CONSENT => 1,
]);
$displayName = civicrm_api3('Contact', 'getvalue', ['return' => 'display_name', 'id' => $parameters['cid']])['result'];
$consentActivity = array(
'activity_type_id' => 'Consent Given',
'subject' => "Contact $displayName has granted consent",
'status_id' => 'Completed',
'activity_date_time' => date('YmdHis'),
'source_contact_id' => $parameters['cid'],
'target_contact_id' => $parameters['cid'],
'api_key' => $mail_subscription_user_key,
);
civicrm_api3('Activity', 'create', $consentActivity);
}
}
if (!$isSent) {
Expand All @@ -145,13 +163,14 @@
<html>
<head>
<meta charset="UTF-8">
<title>Yee Hong Center for Geriatric Care</title>
<title>Yee Hong Centre for Geriatric Care</title>
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css">
<style type="text/css">
body {
margin: 0;
padding: 0;
font-family: Georgia, Helvetica, Arial, sans-serif;
background-color: #ddffcc;
}

.container {
Expand Down Expand Up @@ -184,18 +203,24 @@
}

#info {
padding-top: 20px;
padding-top: 25px;
vertical-align: top;
text-align: center;
width: 462px;
height: 50px;
padding-bottom: 25px;
}

h1 {
font-size: 2em;
line-height: 1;
font-size: 1.5em;
line-height: 1;
font-weight: normal;
font-family: Georgia, "Times New Roman", Times, serif;
padding-bottom: 10px;
}

label {
font-size: 1.2em;
}
</style>
<script type="text/javascript" src="sites/all/modules/civicrm/bower_components/jquery/dist/jquery.min.js?r=fyMo5">
Expand Down Expand Up @@ -267,7 +292,7 @@
<body>
<div id="container">
<div id="info" class="center" style="background-color: rgb(0, 128, 98);background-image: none;width:auto;color:#fff">
<a href="http://www.yeehong.com/"><!--<?php echo $civiproxy_logo;?>-->Yee Hong Center</a>
<h1><a href="http://www.yeehong.com/"><!--<?php echo $civiproxy_logo;?>-->Yee Hong Centre</a></h1>
</div>
<?php

Expand Down Expand Up @@ -296,53 +321,13 @@
</label></div><div class="edit-value content">'; print $email; echo '<input maxlength="254" size="30" name="email-Primary" type="hidden" id="email-Primary" class="big crm-form-text required" value="'; print $email; echo '" /></div><div class="clear"></div></div><div id="editrow-group" class="crm-section editrow_group-section form-item"><div class="label"><label>Campaign(s)</label></div><div class="edit-value content"> <table class="form-layout-compressed crm-profile-tagsandgroups">
<tr>
<td>
<div class="group-wrapper">
<input type="hidden" name="group[42]" value="" /><input skiplabel="1" id="group_42" name="group[42]" type="checkbox" value="1" class="crm-form-checkbox" />Yee Hong Care Ambassador
</div>
<div class="group-wrapper">
<input type="hidden" name="group[45]" value="" /><input skiplabel="1" id="group_45" name="group[45]" type="checkbox" value="1" class="crm-form-checkbox" />Yee Hong Caregiver Support Services
</div>
<div class="group-wrapper">
<input type="hidden" name="group[3]" value="" /><input skiplabel="1" id="group_3" name="group[3]" type="checkbox" value="1" class="crm-form-checkbox" />Yee Hong Finch Active Senior Program
</div>
<div class="group-wrapper">
<input type="hidden" name="group[9]" value="" /><input skiplabel="1" id="group_9" name="group[9]" type="checkbox" value="1" class="crm-form-checkbox" />Yee Hong Finch Centre Mailing
</div>
<div class="group-wrapper">
<input type="hidden" name="group[51]" value="" /><input skiplabel="1" id="group_51" name="group[51]" type="checkbox" value="1" class="crm-form-checkbox" />Yee Hong Garden Terrace Mailing
</div>
<div class="group-wrapper">
<input type="hidden" name="group[2]" value="" /><input skiplabel="1" id="group_2" name="group[2]" type="checkbox" value="1" class="crm-form-checkbox" />Yee Hong Macrobian Club
</div>
<div class="group-wrapper">
<input type="hidden" name="group[31]" value="" /><input skiplabel="1" id="group_31" name="group[31]" type="checkbox" value="1" class="crm-form-checkbox" />Yee Hong Markham Centre Mailing
</div>
<div class="group-wrapper">
<input type="hidden" name="group[32]" value="" /><input skiplabel="1" id="group_32" name="group[32]" type="checkbox" value="1" class="crm-form-checkbox" />Yee Hong Markham Family Contacts
</div>
<div class="group-wrapper">
<input type="hidden" name="group[7]" value="" /><input skiplabel="1" id="group_7" name="group[7]" type="checkbox" value="1" class="crm-form-checkbox" />Yee Hong Markham Infection Control Notice
</div>
<div class="group-wrapper">
<input type="hidden" name="group[4]" value="" /><input skiplabel="1" id="group_4" name="group[4]" type="checkbox" value="1" class="crm-form-checkbox" />Yee Hong McNicoll Centre Mailing
</div>
<div class="group-wrapper">
<input type="hidden" name="group[8]" value="" /><input skiplabel="1" id="group_8" name="group[8]" type="checkbox" value="1" class="crm-form-checkbox" />Yee Hong Mississauga Active Senior & Outreach Program
</div>
<div class="group-wrapper">
<input type="hidden" name="group[5]" value="" /><input skiplabel="1" id="group_5" name="group[5]" type="checkbox" value="1" class="crm-form-checkbox" />Yee Hong Mississauga Centre Mailing
</div>
<div class="group-wrapper">
<input type="hidden" name="group[23]" value="" /><input skiplabel="1" id="group_23" name="group[23]" type="checkbox" value="1" class="crm-form-checkbox" />Yee Hong Retirement Home Mailing
</div>
<div class="group-wrapper">
<input type="hidden" name="group[49]" value="" /><input skiplabel="1" id="group_49" name="group[49]" type="checkbox" value="1" class="crm-form-checkbox" />Yee Hong Volunteer & Advocacy
</div>
<div class="group-wrapper">
<input type="hidden" name="group[6]" value="" /><input skiplabel="1" id="group_6" name="group[6]" type="checkbox" value="1" class="crm-form-checkbox" />Yee Hong York Region Services Development
</div>
';

foreach ($preferenceGroups as $id => $groupTitle) {
echo '<div class="group-wrapper"><input type="hidden" name="group[' . $id . ']" value="" /><input skiplabel="1" id="group_' . $id . '" name="group[' . $id . ']" type="checkbox" value="1" class="crm-form-checkbox" />' . $groupTitle['result'] . '</div>';
}

</div><div class="clear"></div></div><div class="crm-submit-buttons">
echo '</div><div class="clear"></div></div><div class="crm-submit-buttons">

<span class="crm-button crm-button-type-next crm-button_qf_Edit_next crm-i-button">
<i class="crm-i fa-check"></i>
Expand Down