Brought patches up to date with new nc versionn

    rm news.tar.gz;

RUN curl -fsSL -o quota_warning.tar.gz \

    "https://github.com/nextcloud/quota_warning/releases/download/v${QUOTA_WARN_VERSION}/quota_warning-${QUOTA_WARN_VERSION}.tar.gz" && \

    "https://github.com/nextcloud-releases/quota_warning/releases/download/v${QUOTA_WARN_VERSION}/quota_warning-${QUOTA_WARN_VERSION}.tar.gz" && \

    tar -xf quota_warning.tar.gz -C ${BASE_DIR}/custom_apps/ && \

    rm quota_warning.tar.gz;

diff --git lib/private/Collaboration/Collaborators/MailPlugin.php lib/private/Collaboration/Collaborators/MailPlugin-new.php

--- lib/private/Collaboration/Collaborators/MailPlugin.php	2021-06-22 14:53:24.451402977 +0530

+++ lib/private/Collaboration/Collaborators/MailPlugin-new.php	2021-06-22 14:56:31.201379020 +0530

@@ -36,6 +36,7 @@

@@ -37,6 +37,7 @@

 use OCP\IConfig;

 use OCP\IGroupManager;

 use OCP\IUser;

 use OCP\IUserSession;

 use OCP\Share\IShare;

@@ -56,12 +57,13 @@

 	/** @var IUserSession */

 	private $userSession;

-	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IGroupManager $groupManager, IUserSession $userSession) {

+	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IGroupManager $groupManager, IUserSession $userSession, IUserManager $userManager) {

@@ -71,13 +72,15 @@

 								IConfig $config,

 								IGroupManager $groupManager,

 								KnownUserService $knownUserService,

-								IUserSession $userSession) {

+								IUserSession $userSession, 

+								IUserManager $userManager) {

 		$this->contactsManager = $contactsManager;

 		$this->cloudIdManager = $cloudIdManager;

 		$this->config = $config;

 		$this->groupManager = $groupManager;

 		$this->knownUserService = $knownUserService;

 		$this->userSession = $userSession;

+        $this->userManager = $userManager;

 		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';

 		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';

@@ -185,43 +187,78 @@

@@ -209,27 +212,62 @@

 						if ($exactEmailMatch) {

 							$searchResult->markExactIdMatch($emailType);

 						}

 					}

 				}

 			}

 		}

 		$reachedEnd = true;

-		if (!$this->shareeEnumeration) {

-			$result['wide'] = [];

-			$userResults['wide'] = [];

-		} else {

+//		if (!$this->shareeEnumeration) {

+//			$result['wide'] = [];

+//			$userResults['wide'] = [];

+//		} else {

 			$reachedEnd = (count($result['wide']) < $offset + $limit) &&

 				(count($userResults['wide']) < $offset + $limit);

 			$result['wide'] = array_slice($result['wide'], $offset, $limit);

 			$userResults['wide'] = array_slice($userResults['wide'], $offset, $limit);

-		}

+//		}

 		if (!$searchResult->hasExactIdMatch($emailType) && filter_var($search, FILTER_VALIDATE_EMAIL)) {

diff --git ./apps/settings/templates/settings/personal/personal.info.php ./apps/settings/templates/settings/personal/personal.info.new.php

--- ./apps/settings/templates/settings/personal/personal.info.php       2021-04-22 07:49:34.926418855 +0530

+++ ./apps/settings/templates/settings/personal/personal.info.new.php	2021-04-22 07:50:00.026660710 +0530

@@ -160,7 +160,7 @@

@@ -157,7 +157,7 @@

 						print_unescaped('class="hidden"');

 					} ?>

 					   placeholder="<?php p($l->t('Your email address')); ?>"

 				<span class="icon-checkmark hidden"></span>

 				<span class="icon-error hidden" ></span>

 				<?php if (!$_['displayNameChangeSupported']) { ?>