Some fixes for multiple content assign to single user

src/administrator/includes/rbacl.php

@@ -129,7 +129,9 @@ public static function check($userId, $client, $action, $contentId = null)
 					$userModel = self::model("user");
 					$contentRoleId = $userModel->getAssociatedContentRole($userId, $client, $contentId);
 
-					if (in_array($contentRoleId, $allowedRoles))
+					$rolesAllowed = array_intersect($contentRoleId, $allowedRoles);
+
+					if (!empty($rolesAllowed))
 					{
 						return true;
 					}
@@ -199,4 +201,65 @@ public static function getRoleByUser($userId, $client = '', $clientContentIid =
 
 		return $roles;
 	}
+
+	/**
+	 * Method to Get roles of users again to selected agency.
+	 *
+	 * @param   integer  $agencyId  agency id
+	 * @param   integer  $userId    user id
+	 * @param   integer  $roleId    selected role id
+	 *
+	 * @return 	mixed
+	 *
+	 * @since 1.6
+	 */
+	public function getAuthorizedActions($agencyId = null, $userId = null, $roleId = null)
+	{
+		if ($agencyId == null)
+		{
+			$input = JFactory::getApplication()->input;
+			$agencyId = $input->get('aid', '0', 'INT');
+		}
+
+		if ($userId == null)
+		{
+			$userId = JFactory::getUser()->id;
+		}
+
+		// Get subusers actions mapp
+		$userRoleId = self::getRoleByUser($userId, 'com_multiagency', 0);
+
+		if (empty($userRoleId))
+		{
+			$userRoleId = self::getRoleByUser($userId, 'com_multiagency', $agencyId);
+		}
+
+		if (!empty($userRoleId))
+		{
+			$db = JFactory::getDBO();
+			$subInQuery = $db->getQuery(true);
+			$subInQuery->select('action_id')
+			->from($db->quoteName('#__tjsu_role_action_map'))
+			->where($db->quoteName('role_id') . 'IN(' . implode(',', $userRoleId) . ')');
+			$db->setQuery($subInQuery);
+
+			$roleActions = $db->loadColumn();
+
+			if ($roleActions && !empty($agencyId) && !empty($userRoleId))
+			{
+				$query = $db->getQuery(true);
+				$query->select('m.role_id,r.name, count( m.action_id) as actionCount, (select count(aa.action_id)
+				FROM #__tjsu_role_action_map aa WHERE aa.role_id = m.role_id) as roleCount');
+				$query->from($db->quoteName('#__tjsu_role_action_map', 'm'));
+				$query->join('INNER', $db->quoteName('#__tjsu_actions', 'a') . ' ON (' . $db->quoteName('a.id') . ' = ' . $db->quoteName('m.action_id') . ')');
+				$query->join('INNER', $db->quoteName('#__tjsu_roles', 'r') . ' ON (' . $db->quoteName('r.id') . ' = ' . $db->quoteName('m.role_id') . ')');
+				$query->where($db->quoteName('m.action_id') . ' IN (' . implode(',', $roleActions) . ')');
+				$query->group($db->quoteName('m.role_id'));
+				$query->having('roleCount <= actionCount');
+				$db->setQuery($query);
+
+				return $roles = $db->loadAssocList();
+			}
+		}
+	}
 }

src/administrator/models/user.php

@@ -106,7 +106,7 @@ protected function loadFormData()
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
-	public function getAssociatedContentRole($userId, $client, $contentId)
+	public function getAssociatedContentRole($userId, $client, $contentId = null)
 	{
 		$db = Factory::getDbo();
 		$query = $db->getQuery(true);
@@ -115,9 +115,14 @@ public function getAssociatedContentRole($userId, $client, $contentId)
 		$query->from($db->quoteName('#__tjsu_users'));
 		$query->where($db->quoteName('user_id') . " = " . (int) $userId);
 		$query->where($db->quoteName('client') . " = " . $db->q($client));
-		$query->where($db->quoteName('client_id') . " = " . (int) $contentId);
+
+		if (!is_null($contentId))
+		{
+			$query->where($db->quoteName('client_id') . " = " . $db->quote($contentId));
+		}
+
 		$db->setQuery($query);
 
-		return $db->loadResult();
+		return $db->loadColumn();
 	}
 }