Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6d160b0 authored by Akhil's avatar Akhil 🙂
Browse files

Added mail usage patch

parent e685669c
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -11,12 +11,12 @@ ARG CALENDAR_VERSION="3.1.0"
ARG USER_BACKEND_RAW_SQL_VERSION="1.1.1"
ARG EMAIL_RECOVERY_JOB_ID="199763"
ARG RAINLOOP_VERSION="7.1.2"
ARG RAINLOOP_COMMIT_SHA="e9da581c"
ARG EA_TAG="1.0.0"
ARG RAINLOOP_COMMIT_SHA="546794f5"
ARG EA_TAG="1.1.0" 
ARG ECLOUD_LAUNCHER_JOB_ID="222001"
ARG GOOGLE_INTEGRATION_VERSION="1.0.6"

RUN sed -i 's/21,0,9,1/21,0,9,6/' ${BASE_DIR}/version.php
RUN sed -i 's/21,0,9,1/21,0,9,9/' ${BASE_DIR}/version.php

# Install unzip for unzipping artifacts
RUN apt-get update && apt-get install unzip 
@@ -111,6 +111,7 @@ RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable
RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch
RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch
RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch
RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Helper.php -i ${TMP_PATCH_DIR}/014-add-mail-usage.patch
RUN rm -rf ${TMP_PATCH_DIR}

# autocomplete leak tweak apps frontend with sed, disable group suggestion
+23 −0
Original line number Diff line number Diff line
--- OC_Helper.php	2022-03-30 19:09:02.242478886 +0530
+++ OC_Helper-new.php	2022-03-30 19:11:16.877960366 +0530
@@ -530,6 +530,12 @@
 			$quota = $sourceStorage->getQuota();
 		}
 		$free = $sourceStorage->free_space($rootInfo->getInternalPath());
+                $ownerId = $storage->getOwner($path);
+                $mailQuotaUsage = (int) \OC::$server->getConfig()->getUserValue($ownerId, 'ecloud-accounts', 'mailQuotaUsage', 0);
+                $free = $free - $mailQuotaUsage;
+                if($path === '/') {
+                    $used = $used + $mailQuotaUsage;
+                }
 		if ($free >= 0) {
 			$total = $free + $used;
 		} else {
@@ -545,7 +551,6 @@
 			$relative = 0;
 		}
 
-		$ownerId = $storage->getOwner($path);
 		$ownerDisplayName = '';
 		$owner = \OC::$server->getUserManager()->get($ownerId);
 		if ($owner) {