Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions lib/Controller/SystemController.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function __construct(
* Validate string as email address
* @NoAdminRequired
* @param string $query
* @return Boolval
* @return Boolean
*/
private function isValidEmail($email) {
return (!preg_match('/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/', $email)) ? false : true;
Expand All @@ -94,6 +94,7 @@ private function isValidEmail($email) {
/**
* Get a list of NC users, groups and contacts
* @NoAdminRequired
* @PublicPage
* @NoCSRFRequired
* @param string $query
* @param bool $getGroups - search in groups
Expand All @@ -105,8 +106,8 @@ private function isValidEmail($email) {
*/
public function getSiteUsersAndGroups($query = '', $getGroups = true, $getUsers = true, $getContacts = true, $getMail = false, $skipGroups = array(), $skipUsers = array()) {
$list = array();
// if (filter_var($query, FILTER_VALIDATE_EMAIL)) {
if ($this->isValidEmail($query)) {

if ($getMail && $this->isValidEmail($query)) {
$list[] = [
'id' => '',
'user' => '',
Expand All @@ -124,10 +125,8 @@ public function getSiteUsersAndGroups($query = '', $getGroups = true, $getUsers
];
}


if ($getGroups) {
$groups = $this->groupManager->search($query);
foreach ($groups as $group) {
foreach ($this->groupManager->search($query) as $group) {
if (!in_array($group->getGID(), $skipGroups)) {
$list[] = [
'id' => $group->getGID(),
Expand Down Expand Up @@ -170,13 +169,9 @@ public function getSiteUsersAndGroups($query = '', $getGroups = true, $getUsers
}
}

$contactsManager = \OC::$server->getContactsManager();


if ($getContacts && $contactsManager->isEnabled()) {
$contacts = $contactsManager->search($query, array('FN', 'EMAIL', 'ORG', 'CATEGORIES'));
if ($getContacts && \OC::$server->getContactsManager()->isEnabled()) {

foreach ($contacts as $contact) {
foreach (\OC::$server->getContactsManager()->search($query, array('FN', 'EMAIL', 'ORG', 'CATEGORIES')) as $contact) {
if (!array_key_exists('isLocalSystemBook', $contact) && array_key_exists('EMAIL', $contact)) {

$emailAdresses = $contact['EMAIL'];
Expand All @@ -199,9 +194,9 @@ public function getSiteUsersAndGroups($query = '', $getGroups = true, $getUsers
'type' => 'contact',
'icon' => 'icon-mail',
'avatarURL' => '',
'avatar' => isset($contact['PHOTO']) ? $contact['PHOTO'] : '',
'avatar' => '',
'lastLogin' => '',
'cloudId' => ''
'cloudId' => '',
];
}

Expand Down