From 6dd18b98b570a6b46d5a93e141fa3ad4e48beced Mon Sep 17 00:00:00 2001 From: Deepak Srivastava Date: Fri, 6 Sep 2013 19:37:57 +0530 Subject: [PATCH] CRM-10128 --- CRM/Contact/BAO/Contact/Permission.php | 4 ++++ CRM/Core/BAO/UFMatch.php | 6 ++++++ CRM/Core/Permission.php | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/CRM/Contact/BAO/Contact/Permission.php b/CRM/Contact/BAO/Contact/Permission.php index f25fa8bfdd..555678dba2 100644 --- a/CRM/Contact/BAO/Contact/Permission.php +++ b/CRM/Contact/BAO/Contact/Permission.php @@ -348,6 +348,10 @@ WHERE (( contact_id_a = %1 AND contact_id_b = %2 AND is_permission_a_b = 1 ) OR CRM_Core_DAO::executeQuery('SET @civicrm_user_id = %1', array(1 => array($contactID, 'Integer')) ); + + $session = CRM_Core_Session::singleton(); + $session->set('authSrc', CRM_Core_Permission::AUTH_SRC_CHECKSUM); + return TRUE; } diff --git a/CRM/Core/BAO/UFMatch.php b/CRM/Core/BAO/UFMatch.php index 18fe4dfdab..2b3433de9a 100644 --- a/CRM/Core/BAO/UFMatch.php +++ b/CRM/Core/BAO/UFMatch.php @@ -124,6 +124,9 @@ class CRM_Core_BAO_UFMatch extends CRM_Core_DAO_UFMatch { $session->set('ufID', CRM_Utils_Array::value('uf_id', $userIds, '')); $session->set('userID', CRM_Utils_Array::value('contact_id', $userIds, '')); $session->set('ufUniqID', CRM_Utils_Array::value('uf_name', $userIds, '')); + if (CRM_Utils_Array::value('contact_id', $userIds, FALSE)) { + $session->set('authSrc', CRM_Core_Permission::AUTH_SRC_LOGIN); + } } } @@ -160,6 +163,9 @@ class CRM_Core_BAO_UFMatch extends CRM_Core_DAO_UFMatch { $session->set('ufID', $ufID); $session->set('userID', $userID); $session->set('ufUniqID', $ufUniqID); + if ($userID) { + $session->set('authSrc', CRM_Core_Permission::AUTH_SRC_LOGIN); + } // add current contact to recently viewed if ($ufmatch->contact_id) { diff --git a/CRM/Core/Permission.php b/CRM/Core/Permission.php index e3f80f9c3a..0f60b9cec4 100644 --- a/CRM/Core/Permission.php +++ b/CRM/Core/Permission.php @@ -63,6 +63,13 @@ class CRM_Core_Permission { */ const ALWAYS_ALLOW_PERMISSION = "*always allow*"; + /** + * Various authentication sources + * + * @var int + */ + CONST AUTH_SRC_CHECKSUM = 1, AUTH_SRC_SITEKEY = 2, AUTH_SRC_LOGIN = 4, ; + /** * get the current permission of this user * -- 2.25.1