Nmc/1008 content changes

COPYING

@@ -1,3 +1,10 @@
+Although the code for this Magentacloud custom web theme for Nextcloud is free and available under the GPL 3 license below, Deutsche Telekom (including T-Systems)  fully reserves all rights to the Telekom brand. To prevent users from getting confused about
+the source of a digital product or experience, there are stringent restrictions on using the Telekom brand and design,
+even when built into code that we provide. For any customization other than explicitly for Telekom or T-Systems, you must
+replace the Deutsche Telekom and T-Systems brand elements contained in the provided sources.
+
+
+
                     GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
@@ -658,4 +665,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.

lib/Jobs/SendNotificationsJob.php

@@ -78,7 +78,7 @@ public function __construct(
 	protected function run($argument): void {
 		$limit = (int)$this->config->getAppValue($this->appName, 'status-email-max-mail-sent', '1000');
 
-		$trackedNotifications = $this->service->findAllOlderThan(new \DateTime("-1 month"), $limit);
+		$trackedNotifications = $this->service->findAllOlderThan(new \DateTime("-1 day"), $limit);
 
 		// for debugging
 		// $trackedNotifications = $this->service->findAllOlderThan(new \DateTime('now'), $limit);

lib/Migration/Version23000Date2022022912000001.php

@@ -55,8 +55,6 @@ public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $
 		$rows = $result->fetchAll();
 		$result->closeCursor();
 
-		\OC::$server->getLogger()->critical(var_export($rows, true));
-
 		$delete = $this->connection->getQueryBuilder();
 		$delete->delete('notification_tracker')
 			->where($delete->expr()->eq('user_id', $delete->createParameter('user_id')))

lib/Service/ClientDetector.php

@@ -61,10 +61,11 @@ public function hasMobileConnection(IUser $user): bool {
 			->select('name')
 			->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
 			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('name', $qb->createNamedParameter('Nextcloud-iOS')),
-				$qb->expr()->like('name', $qb->createNamedParameter('%Nextcloud-android%')),
+				$qb->expr()->eq('name', $qb->createNamedParameter('%MagentaCLOUD iOS%')),
+				$qb->expr()->like('name', $qb->createNamedParameter('%Android%')),
+
 			))
 			->setMaxResults(1);
 		return $qb->executeQuery()->rowCount() === 1;
 	}
-}
+}

lib/Service/MailSender.php

@@ -27,6 +27,7 @@
 
 use OCP\Files\FileInfo;
 use OCA\MonthlyStatusEmail\Db\NotificationTracker;
+use OCA\MonthlyStatusEmail\Service\NotificationTrackerService;
 use OCP\DB\Exception;
 use OCP\IConfig;
 use OCP\IL10N;
@@ -158,16 +159,17 @@ 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;
+
 		}
 	}
 
@@ -176,17 +178,19 @@ private function handleStorage(IEMailTemplate $emailTemplate, IUser $user): bool
 	 * @return bool Whether a notification was sent
 	 */
 	public function sendMonthlyMailTo(NotificationTracker $trackedNotification): bool {
-		$message = $this->mailer->createMessage();
+		$message = $this->mailer->createMessage();			
 		$user = $this->userManager->get($trackedNotification->getUserId());
+
 		if ($user === null) {
 			$this->service->delete($trackedNotification);
 			return false;
 		}
+
 		if ($user->getLastLogin() === 0) {
 			$this->service->delete($trackedNotification);
 			return false;
 		}
-
+		
 		$emailTemplate = $this->setUpMail($message, $trackedNotification, $user);
 		if ($emailTemplate === null) {
 			return false;
@@ -205,6 +209,8 @@ public function sendMonthlyMailTo(NotificationTracker $trackedNotification): boo
 			// People opting-out of the monthly emails should still get the
 			// 'urgent' email about running out of storage, but the rest
 			// shouldn't be sent.
+			$trackedNotification->setLastSendNotification(time());
+			$this->service->update($trackedNotification);
 			return false;
 		}
 
@@ -248,12 +254,13 @@ 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 {
 		if ($trackedNotification !== null) {
+
 			$this->provider->writeOptOutMessage($template, $trackedNotification);
 		}
 		$message->useTemplate($template);

lib/Settings/PersonalSettings.php

@@ -64,7 +64,7 @@ public function getForm(): TemplateResponse {
 
 	/** {@inheritDoc} */
 	public function getSection(): string {
-		return 'activity';
+		return 'personal-info';
 	}
 
 	/** {@inheritDoc} */