#4340: limit available contexts by user

Author: bozana

classes/context/ContextDAO.inc.php

@@ -109,6 +109,9 @@ function getAll($enabledOnly = false, $rangeInfo = null) {
 
 	/**
 	 * Retrieve available contexts.
+	 * If user-based contexts, retrieve all contexts assigned by user group
+	 *   or all contexts for site admin
+	 * If not user-based, retrieve all enabled contexts.
 	 * @param $userId int Optional user ID to find available contexts for
 	 * @param $rangeInfo Object optional
 	 * @return DAOResultFactory containing matching Contexts
@@ -122,12 +125,12 @@ function getAvailable($userId = null, $rangeInfo = null) {
 
 		$result = $this->retrieveRange(
 			'SELECT c.* FROM ' . $this->tableName . ' c
-			WHERE	c.enabled = 1 ' .
+			WHERE	' .
 				($userId?
-					'OR c.' . $this->primaryKeyColumn . ' IN (SELECT DISTINCT ug.context_id FROM user_groups ug JOIN user_user_groups uug ON (ug.user_group_id = uug.user_group_id) WHERE uug.user_id = ?)
-					OR ? IN (SELECT user_id FROM user_groups ug JOIN user_user_groups uug ON (ug.user_group_id = uug.user_group_id) WHERE ug.role_id = ?) '
-				:'') .
-			'ORDER BY seq',
+					'c.' . $this->_getPrimaryKeyColumn() . ' IN (SELECT DISTINCT ug.context_id FROM user_groups ug JOIN user_user_groups uug ON (ug.user_group_id = uug.user_group_id) WHERE uug.user_id = ?)
+					OR ? IN (SELECT user_id FROM user_groups ug JOIN user_user_groups uug ON (ug.user_group_id = uug.user_group_id) WHERE ug.role_id = ?)'
+				:'c.enabled = 1') .
+			' ORDER BY seq',
 			$params,
 			$rangeInfo
 		);