From 8a33cd58b65972c918124ba3b557c889f2002eca Mon Sep 17 00:00:00 2001
From: Kevin Cristiano <kcristiano@tadpole.cc>
Date: Sun, 28 Feb 2016 21:39:24 -0500
Subject: [PATCH] PRERELEASE-CRM-17968 -- load users for joomla and WP
jitendrapurohit
---
civicrm/CRM/Utils/System/WordPress.php | 15 ++++++++++++---
civicrm/bin/cli.class.php | 2 +-
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/civicrm/CRM/Utils/System/WordPress.php b/civicrm/CRM/Utils/System/WordPress.php
index 446668e10f..a20be3e8d2 100644
--- a/civicrm/CRM/Utils/System/WordPress.php
+++ b/civicrm/CRM/Utils/System/WordPress.php
@@ -326,13 +326,22 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base {
}
/**
- * FIXME: Do something
- *
- * @param \obj $user
+ * @param \string $user
*
* @return bool
*/
public function loadUser($user) {
+ $userdata = get_user_by('login', $user);
+ if (!$userdata->data->ID) {
+ return FALSE;
+ }
+ $uid = $userdata->data->ID;
+ wp_set_current_user($uid);
+ $contactID = CRM_Core_BAO_UFMatch::getContactId($uid);
+ // lets store contact id and user id in session
+ $session = CRM_Core_Session::singleton();
+ $session->set('ufID', $uid);
+ $session->set('userID', $contactID);
return TRUE;
}
diff --git a/civicrm/bin/cli.class.php b/civicrm/bin/cli.class.php
index a051135620..dbcc5e9caf 100644
--- a/civicrm/bin/cli.class.php
+++ b/civicrm/bin/cli.class.php
@@ -269,7 +269,7 @@ class civicrm_cli {
$this->_log(ts("Failed to login as %1. Wrong username or password.", array('1' => $this->_user)));
return FALSE;
}
- if (!$cms->loadUser($this->_user)) {
+ if (($this->_config->userFramework == 'Joomla' && !$cms->loadUser($this->_user, $this->_password)) || !$cms->loadUser($this->_user)) {
$this->_log(ts("Failed to login as %1", array('1' => $this->_user)));
return FALSE;
}
--
GitLab