Skip to content

Prevent display of ACL protected contents #9

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

Open
jmcclelland wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prevent display of ACL protected contents #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 17 additions & 7 deletions CRM/Smsinbox/SmsInbound.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,28 @@ public static function get($options) {
'record_type_id',
'Activity Source'
);
$query = "
SELECT DISTINCT contact.display_name, email.email, state.read_status, activity.id, activity.details, activity.activity_date_time, activity_contact.contact_id
FROM civicrm_activity activity
$select_clause = "SELECT DISTINCT
contact.display_name, email.email, state.read_status, activity.id, activity.details, activity.activity_date_time, activity_contact.contact_id";
$from_clause = "FROM civicrm_activity activity
JOIN civicrm_option_value ov ON activity.activity_type_id = ov.value AND name = 'Inbound SMS'
JOIN civicrm_option_group og ON ov.option_group_id = og.id AND og.name = 'activity_type'
LEFT JOIN civicrm_activity_contact activity_contact ON activity.id = activity_contact.activity_id AND record_type_id = %0
LEFT JOIN civicrm_smsinbox_state state ON activity.id = state.activity_id
LEFT JOIN civicrm_contact contact ON activity_contact.contact_id = contact.id
LEFT JOIN civicrm_email email ON email.contact_id = activity_contact.contact_id AND email.is_primary = 1
ORDER BY activity.activity_date_time DESC
LIMIT %1 OFFSET %2
";
LEFT JOIN civicrm_email email ON email.contact_id = activity_contact.contact_id AND email.is_primary = 1";
$order_clause = "ORDER BY activity.activity_date_time DESC";
$limit_clause = "LIMIT %1 OFFSET %2";

if (!CRM_Core_Permission::check('view all contacts')) {
$acl = CRM_Contact_BAO_Contact_Permission::cacheClause('contact');
$from_clause .= " " . $acl[0];
$where_clause = " WHERE " . $acl[1];
}
else {
$where_clause = NULL;
}

$query = "${select_clause} ${from_clause} ${where_clause} ${order_clause} ${limit_clause}";
$params = [ 0 => [ $source_record_type_id, 'Integer' ], 1 => [ $limit, 'Integer' ], 2 => [ $offset, 'Integer' ] ];
$dao = CRM_Core_DAO::executeQuery($query, $params);
while ($dao->fetch()) {
Expand Down