diff options
| author | dartcafe <github@dartcafe.de> | 2020-06-11 22:00:05 +0300 |
|---|---|---|
| committer | dartcafe <github@dartcafe.de> | 2020-07-07 18:39:49 +0300 |
| commit | ff1b16124ef335074be901f1e1a021640932dbf2 (patch) | |
| tree | 3b7072b9d176a965f1d079713e5abca0fd14f16a /lib | |
| parent | 93ef72a14a9f6386effe34304882f3b015eecbb0 (diff) | |
minor fixes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Controller/ShareController.php | 2 | ||||
| -rw-r--r-- | lib/Controller/SystemController.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Controller/ShareController.php b/lib/Controller/ShareController.php index 15eee195..99746a78 100644 --- a/lib/Controller/ShareController.php +++ b/lib/Controller/ShareController.php @@ -222,7 +222,7 @@ class ShareController extends Controller { return new DataResponse($publicShare, Http::STATUS_OK); } else { - return new DataResponse(['message'=> 'Wrong share type: ' . $userShare->getType()], Http::STATUS_FORBIDDEN); + return new DataResponse(['message'=> 'Wrong share type: ' . $publicShare->getType()], Http::STATUS_FORBIDDEN); } } catch (DoesNotExistException $e) { diff --git a/lib/Controller/SystemController.php b/lib/Controller/SystemController.php index 894a7893..9c8326cf 100644 --- a/lib/Controller/SystemController.php +++ b/lib/Controller/SystemController.php @@ -85,7 +85,7 @@ class SystemController extends Controller { * 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; @@ -107,7 +107,7 @@ class SystemController extends Controller { public function getSiteUsersAndGroups($query = '', $getGroups = true, $getUsers = true, $getContacts = true, $getMail = false, $skipGroups = array(), $skipUsers = array()) { $list = array(); - if ($this->isValidEmail($query)) { + if ($getMail && $this->isValidEmail($query)) { $list[] = [ 'id' => '', 'user' => '', |