diff --git a/CRM/Contact/Page/View/UserDashBoard.php b/CRM/Contact/Page/View/UserDashBoard.php
index 9ecf6863b622..2cc99577e1cc 100644
--- a/CRM/Contact/Page/View/UserDashBoard.php
+++ b/CRM/Contact/Page/View/UserDashBoard.php
@@ -72,7 +72,9 @@ public function __construct() {
$userChecksum = CRM_Utils_Request::retrieve('cs', 'String', $this);
$validUser = FALSE;
if (empty($userID) && $this->_contactId && $userChecksum) {
+ $this->assign('userChecksum', $userChecksum);
$validUser = CRM_Contact_BAO_Contact_Utils::validChecksum($this->_contactId, $userChecksum);
+ $this->_isChecksumUser = $validUser;
}
if (!$this->_contactId) {
@@ -168,7 +170,7 @@ public function buildUserDashBoard() {
$this->assign('pcpInfo', $pcpInfo);
}
- if (!empty($this->_userOptions['Assigned Activities'])) {
+ if (!empty($this->_userOptions['Assigned Activities']) && empty($this->_isChecksumUser)) {
// Assigned Activities section
$dashboardElements[] = array(
'class' => 'crm-dashboard-assignedActivities',
diff --git a/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl b/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl
index 30db0fee691f..e03173988b42 100644
--- a/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl
+++ b/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl
@@ -23,6 +23,9 @@
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
*}
+{if $userChecksum}
+ {assign var=edit value='0'}
+{/if}
{crmRegion name="crm-contact-userdashboard-groupcontact-pre"}
{/crmRegion}
diff --git a/templates/CRM/Contribute/Page/PcpUserDashboard.tpl b/templates/CRM/Contribute/Page/PcpUserDashboard.tpl
index 7cb4577645ec..3170776c6302 100644
--- a/templates/CRM/Contribute/Page/PcpUserDashboard.tpl
+++ b/templates/CRM/Contribute/Page/PcpUserDashboard.tpl
@@ -37,7 +37,7 @@
{ts}In Support of{/ts} |
{ts}Campaign Ends{/ts} |
{ts}Status{/ts} |
- |
+ {if !$userChecksum} | {/if}
{foreach from=$pcpInfo item=row}
@@ -46,7 +46,9 @@
{$row.pageTitle} |
{if $row.end_date}{$row.end_date|truncate:10:''|crmDate}{else}({ts}ongoing{/ts}){/if} |
{$row.pcpStatus} |
- {$row.action|replace:'xx':$row.pcpId} |
+ {if !$userChecksum}
+ {$row.action|replace:'xx':$row.pcpId} |
+ {/if}
{/foreach}
@@ -59,7 +61,6 @@
{/if}
-
{if $pcpBlock}
{strip}
{if $pcpInfo} {* Change layout and text if they already have a PCP. *}
diff --git a/templates/CRM/Contribute/Page/UserDashboard.tpl b/templates/CRM/Contribute/Page/UserDashboard.tpl
index d4c7323cd385..086db9f3bb85 100644
--- a/templates/CRM/Contribute/Page/UserDashboard.tpl
+++ b/templates/CRM/Contribute/Page/UserDashboard.tpl
@@ -76,8 +76,12 @@
{/if}
{if $defaultInvoicePage && $row.contribution_status_name == 'Pending' }
+ {assign var='checksum_url' value=""}
+ {if $userChecksum}
+ {assign var='checksum_url' value="&cid=$contactId&cs=$userChecksum"}
+ {/if}
{assign var='id' value=$row.contribution_id}
- {capture assign=payNowLink}{crmURL p='civicrm/contribute/transact' q="reset=1&id=`$defaultInvoicePage`&ccid=`$id`"}{/capture}
+ {capture assign=payNowLink}{crmURL p='civicrm/contribute/transact' q="reset=1&id=`$defaultInvoicePage`&ccid=`$id`$checksum_url"}{/capture}
{ts}Pay Now{/ts}
|
{/if}
diff --git a/templates/CRM/Pledge/Page/UserDashboard.tpl b/templates/CRM/Pledge/Page/UserDashboard.tpl
index f0cab011a01b..59dfbb4aaeb2 100644
--- a/templates/CRM/Pledge/Page/UserDashboard.tpl
+++ b/templates/CRM/Pledge/Page/UserDashboard.tpl
@@ -46,12 +46,14 @@
{$row.pledge_next_pay_date|truncate:10:''|crmDate} |
{$row.pledge_next_pay_amount|crmMoney:$row.pledge_currency} |
{$row.pledge_status} |
-
- {if $row.pledge_contribution_page_id and ($row.pledge_status_name neq 'Completed') and ( $row.contact_id eq $loggedUserID ) }
- {ts}Make Payment{/ts}
- {/if}
- {ts}Payments{/ts}
- |
+ {if !$userChecksum}
+
+ {if $row.pledge_contribution_page_id and ($row.pledge_status_name neq 'Completed') and ( $row.contact_id eq $loggedUserID ) }
+ {ts}Make Payment{/ts}
+ {/if}
+ {ts}Payments{/ts}
+ |
+ {/if}
{/foreach}