Modify conditions and comment code for welcome message

Author: TSI-ashishsharma

lib/Service/MailSender.php

@@ -158,16 +158,16 @@ private function handleStorage(IEMailTemplate $emailTemplate, IUser $user): bool
 			// Message no quota
 			$this->provider->writeStorageNoQuota($emailTemplate, $storageInfo);
 			return false;
-		} elseif ($storageInfo['usage_relative'] < 90) {
+		} elseif ($storageInfo['relative'] < 90) {
 			// Message quota but less than 90% used
 			$this->provider->writeStorageSpaceLeft($emailTemplate, $storageInfo);
 			return false;
-		} elseif ($storageInfo['usage_relative'] < 99) {
+		} elseif ($storageInfo['relative'] < 99) {
 			$this->provider->writeStorageWarning($emailTemplate, $storageInfo);
-			return true;
+			return false;
 		} else {
 			$this->provider->writeStorageFull($emailTemplate, $storageInfo);
-			return true;
+			return false;
 		}
 	}
 
@@ -191,7 +191,7 @@ public function sendMonthlyMailTo(NotificationTracker $trackedNotification): boo
 		if ($emailTemplate === null) {
 			return false;
 		}
-
+		
 		// Handle storage specific events
 		$stop = $this->handleStorage($emailTemplate, $user);
 
@@ -200,7 +200,7 @@ public function sendMonthlyMailTo(NotificationTracker $trackedNotification): boo
 			$this->sendEmail($emailTemplate, $user, $message);
 			return true;
 		}
-
+		
 		if ($trackedNotification->getOptedOut()) {
 			// People opting-out of the monthly emails should still get the
 			// 'urgent' email about running out of storage, but the rest
@@ -231,7 +231,7 @@ public function sendMonthlyMailTo(NotificationTracker $trackedNotification): boo
 
 		// Handle desktop/mobile client connection detection
 		$availableGenericMessages = array_merge($availableGenericMessages, $this->handleClientCondition($user));
-
+		
 		// Choose one of the less urgent message randomly
 		$this->provider->writeGenericMessage($emailTemplate, $user, $availableGenericMessages[array_rand($availableGenericMessages)]);
 		$this->sendEmail($emailTemplate, $user, $message, $trackedNotification);
@@ -250,8 +250,8 @@ public function sendStatusEmailActivation(IUser $user, NotificationTracker $trac
 			return;
 		}
 
-		$this->provider->writeWelcomeMail($emailTemplate, $user->getDisplayName());
-		$this->sendEmail($emailTemplate, $user, $message, $trackedNotification);
+		// $this->provider->writeWelcomeMail($emailTemplate, $user->getDisplayName());
+		// $this->sendEmail($emailTemplate, $user, $message, $trackedNotification);
 	}
 
 	private function sendEmail(IEMailTemplate $template, IUser $user, IMessage $message, ?NotificationTracker $trackedNotification = null): void {
@@ -286,13 +286,16 @@ private function handleShare(IUser $user): int {
 		];
 		$shareCount = 0;
 		foreach ($requestedShareTypes as $requestedShareType) {
-			$shares = $this->shareManager->getSharesBy(
+			$shares  = $this->shareManager->getSharesBy(
 				$user->getUID(),
 				$requestedShareType,
 				null,
 				false,
 				100
 			);
+			if($shares==null){
+				$shares=array();
+			}
 			$shareCount += count($shares);
 			if ($shareCount > 100) {
 				break; // don't

lib/Settings/PersonalSettings.php

@@ -78,9 +78,9 @@ public function getForm(): TemplateResponse {
 	 */
 	public function getSection(): string {
 		if (version_compare($this->ncVersion, '23.0.0', '<')) {
-			return 'activity';
+			return 'personal-info';
 		}
-		return 'notifications';
+		return 'personal-info';
 	}
 
 	/**