Merge pull request #40 from techjoomla/master

Merge `master` into `release-1.1.0`

Author: manojLondhe

plugins/api/tjactivity/tjactivity.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="3.0" type="plugin" group="api" method="upgrade">
 	<name>com_api_tjactivity</name>
-	<version>1.0.0</version>
-	<creationDate>16th Nov 2018</creationDate>
+	<version>1.0.1</version>
+	<creationDate>8th Feb 2019</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<copyright>Copyright (C) 2016 - 2018 Techjoomla. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<description>PLG_API_TJACTIVITY_DESCRIPTION</description>
 	<languages>

src/activitystream.xml

@@ -2,11 +2,11 @@
 <extension type="component" version="3.0" method="upgrade">
 	<name>com_activitystream</name>
 	<!-- The following elements are optional and free of formatting constraints -->
-	<creationDate>16th Nov 2018</creationDate>
+	<creationDate>8th Feb 2019</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<copyright>Copyright (C) 2016 - 2018 Techjoomla. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<!--  The version string is recorded in the components table -->
 	<version>1.0.1</version>

src/media/scripts/activities.jQuery.js

@@ -33,6 +33,7 @@
 		let object_id = techjoomla.jQuery(ele).attr("tj-activitystream-object-id");
 		let target_id = techjoomla.jQuery(ele).attr("tj-activitystream-target-id");
 		let from_date = techjoomla.jQuery(ele).attr("tj-activitystream-from-date");
+		let filter_condition = techjoomla.jQuery(ele).attr("tj-activitystream-filter-condition");		
 		let limit = techjoomla.jQuery(ele).attr("tj-activitystream-limit");
 		let start = techjoomla.jQuery(ele).attr("start");
 		let url = root_url+"index.php?option=com_activitystream&task=activities.getActivities";
@@ -61,6 +62,10 @@
 		{
 			url += "&limit="+limit;
 		}
+		if (typeof filter_condition != 'undefined')
+		{
+			url += "&filter_condition="+filter_condition;
+		}
 
 		techjoomla.jQuery.ajax({
 			url: url+"&start="+start,

src/plugins/privacy/activitystream/activitystream.xml

@@ -2,11 +2,11 @@
 <extension version="3.9" type="plugin" group="privacy" method="upgrade">
 	<name>plg_privacy_activitystream</name>
 	<version>1.0.1</version>
-	<creationDate>16th Nov 2018</creationDate>
+	<creationDate>8th Feb 2019</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<copyright>Copyright (C) 2016 - 2018 Techjoomla. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2016 - 2019 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<description>PLG_PRIVACY_ACTIVITYSTREAM_XML_DESCRIPTION</description>
 	<files>

src/site/controllers/activities.php

@@ -74,6 +74,7 @@ public function getActivities()
 		$from_date = $jinput->get('from_date', '');
 		$start = $jinput->get('start', '0');
 		$limit = $jinput->get('limit');
+		$filter_condition = $jinput->get('filter_condition', '', 'STRING');
 
 		// Set model state
 		$ActivityStreamModelActivities->setState("type", $type);
@@ -85,6 +86,7 @@ public function getActivities()
 		$ActivityStreamModelActivities->setState("access", "1");
 		$ActivityStreamModelActivities->setState("state", '1');
 		$ActivityStreamModelActivities->setState("list.start", $start);
+		$ActivityStreamModelActivities->setState("filter_condition", $filter_condition);
 
 		$result['results'] = $ActivityStreamModelActivities->getItems();
 

src/site/models/activities.php

@@ -86,6 +86,7 @@ protected function getListQuery()
 		$from_date = $this->getState('from_date');
 		$limit = $this->getState('list.limit');
 		$start = $this->getState('list.start');
+		$filter_condition = $this->getState('filter_condition');
 
 		$result_arr = array();
 
@@ -99,15 +100,51 @@ protected function getListQuery()
 		// Get all filters
 		$filters = $this->get('filter_fields');
 
-		foreach ($filters as $filter)
+		// Default filter condition AND support
+		if ($filter_condition != 'any')
 		{
-			$filterValue = $this->getState($filter);
+			foreach ($filters as $filter)
+			{
+				$filterValue = $this->getState($filter);
+
+				if (!empty($filterValue) && $filter != 'type')
+				{
+					$filterValue = $this->activityStreamActivitiesHelper->buildActivityFilterQuery($filterValue);
+					$query->where($db->quoteName($filter) . ' IN (' . $filterValue . ')');
+				}
+			}
+		}
+		else
+		{
+			// Filter condition OR support
+			$whereClause = array();
 
-			if (!empty($filterValue) && $filter != 'type')
+			foreach ($filters as $filter)
 			{
-				$filterValue = $this->activityStreamActivitiesHelper->buildActivityFilterQuery($filterValue);
-				$query->where($db->quoteName($filter) . ' IN (' . $filterValue . ')');
+				$filterValue = $this->getState($filter);
+
+				if (!empty($filterValue) && $filter != 'type')
+				{
+					$filterValue = $this->activityStreamActivitiesHelper->buildActivityFilterQuery($filterValue);
+					$conditionFilters = array('target_id', 'object_id', 'actor_id');
+
+					if (!in_array($filter, $conditionFilters))
+					{
+						$query->where($db->quoteName($filter) . ' IN (' . $filterValue . ')');
+					}
+					else
+					{
+						$whereClause[] = $db->quoteName($filter) . " IN (" . $filterValue . ")";
+					}
+				}
 			}
+
+			if (!empty($whereClause))
+			{
+				$whereClause = '(' . implode(' OR ', $whereClause) . ')';
+			}
+
+			$query->where($whereClause);
 		}
 
 		// Return results from specified date