@@ -360,11 +360,11 @@ abstract class visa_Abstract extends Database
...
@@ -360,11 +360,11 @@ abstract class visa_Abstract extends Database
if($group_id<>null){
if($group_id<>null){
$stmt=$db->query("SELECT users.user_id, users.firstname, users.lastname, usergroup_content.group_id,entities.entity_id from users, usergroup_content, users_entities,entities WHERE users_entities.user_id = users.user_id and
$stmt=$db->query("SELECT users.user_id, users.firstname, users.lastname, usergroup_content.group_id,entities.entity_id from users, usergroup_content, users_entities,entities WHERE users_entities.user_id = users.user_id and
users_entities.primary_entity <> 'Y' and users.user_id = usergroup_content.user_id AND entities.entity_id = users_entities.entity_id AND group_id IN
users_entities.primary_entity == 'Y' and users.user_id = usergroup_content.user_id AND entities.entity_id = users_entities.entity_id AND group_id IN
(SELECT group_id FROM usergroups_services WHERE service_id = ? AND group_id = ?) order by users.lastname",array('visa_documents',$group_id));
(SELECT group_id FROM usergroups_services WHERE service_id = ? AND group_id = ?) order by users.lastname",array('visa_documents',$group_id));
}else{
}else{
$stmt=$db->query("SELECT users.user_id, users.firstname, users.lastname, usergroup_content.group_id,entities.entity_id from users, usergroup_content, users_entities,entities WHERE users_entities.user_id = users.user_id and
$stmt=$db->query("SELECT users.user_id, users.firstname, users.lastname, usergroup_content.group_id,entities.entity_id from users, usergroup_content, users_entities,entities WHERE users_entities.user_id = users.user_id and
users_entities.primary_entity <> 'Y' and users.user_id = usergroup_content.user_id AND entities.entity_id = users_entities.entity_id AND group_id IN
users_entities.primary_entity == 'Y' and users.user_id = usergroup_content.user_id AND entities.entity_id = users_entities.entity_id AND group_id IN
(SELECT group_id FROM usergroups_services WHERE service_id = ?)
(SELECT group_id FROM usergroups_services WHERE service_id = ?)
order by users.lastname",array('visa_documents'));
order by users.lastname",array('visa_documents'));
}
}
...
@@ -397,7 +397,7 @@ abstract class visa_Abstract extends Database
...
@@ -397,7 +397,7 @@ abstract class visa_Abstract extends Database
$db=newDatabase();
$db=newDatabase();
$stmt=$db->query("SELECT distinct(entities.entity_id) from users, usergroup_content, users_entities,entities WHERE users_entities.user_id = users.user_id and
$stmt=$db->query("SELECT distinct(entities.entity_id) from users, usergroup_content, users_entities,entities WHERE users_entities.user_id = users.user_id and
users_entities.primary_entity <> 'Y' and users.user_id = usergroup_content.user_id AND entities.entity_id = users_entities.entity_id AND group_id IN
users_entities.primary_entity == 'Y' and users.user_id = usergroup_content.user_id AND entities.entity_id = users_entities.entity_id AND group_id IN
(SELECT group_id FROM usergroups_services WHERE service_id = ?)
(SELECT group_id FROM usergroups_services WHERE service_id = ?)
order by entities.entity_id",array('visa_documents'));
order by entities.entity_id",array('visa_documents'));