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

Commit 4013f85f authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

added hyphen to app id and version bump

parent 57c7c6a1
Loading
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ ARG USER_MIGRATION_JOB_ID="1313296"
ARG MEMORIES_VERSION="7.5.2"
ARG DROP_ACCOUNT_VERSION="2.7.1"

RUN sed -i 's/31,0,9,1/31,0,9,2/' ${BASE_DIR}/version.php
RUN sed -i 's/31,0,9,1/31,0,9,3/' ${BASE_DIR}/version.php
COPY custom_entrypoint.sh /
RUN chmod +x /custom_entrypoint.sh
RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
@@ -230,6 +230,8 @@ RUN patch -u ${BASE_DIR}/apps/provisioning_api/lib/Controller/UsersController.ph
RUN patch -u ${BASE_DIR}/lib/private/Security/VerificationToken/VerificationToken.php -i ${TMP_PATCH_DIR}/033-verification-token-private.patch
RUN patch -u ${BASE_DIR}/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php -i ${TMP_PATCH_DIR}/034-oidc-bearer-token-auth.patch
RUN patch -u ${BASE_DIR}/custom_apps/snappymail/app/snappymail/v/2.38.2/app/libraries/RainLoop/Actions/Contacts.php -i ${TMP_PATCH_DIR}/037-snappymail-contact.patch
#Below patch will be removed after NC 31
RUN patch -u ${BASE_DIR}/lib/private/App/AppManager.php -i ${TMP_PATCH_DIR}/038-add-hyphen-to-appid.patch
RUN rm -rf ${TMP_PATCH_DIR}


+17 −0
Original line number Diff line number Diff line
From: Avinash <avinashg@e.email>
Date: Mon, 13 Oct 2025 17:30 +0530
Subject: [PATCH] Added Hyphen to AppId NC31

Add Hyphen to App id for NC 31 and In NC 32 - this patch will be deleted.

--- AppManager.php	2025-10-13 18:34:14
+++ AppManager-new.php	2025-10-13 18:34:56
@@ -945,6 +945,6 @@
 	 */
 	public function cleanAppId(string $app): string {
 		/* Only lowercase alphanumeric is allowed */
-		return preg_replace('/(^[0-9_]|[^a-z0-9_]+|_$)/', '', $app);
+		return preg_replace('/(^[0-9_-]+|[^a-z0-9_-]+|[_-]+$)/', '', $app);
 	}
 }
\ No newline at end of file