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

Commit 3386d1a9 authored by Akhil's avatar Akhil 🙂
Browse files

Added both patches to one file

parent 51db1509

Dockerfile

+1 −2
Original line number Diff line number Diff line
@@ -54,8 +54,7 @@ RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PAT 
RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch

RUN cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.patch

RUN patch -u ${BASE_DIR}/custom_apps/notes/lib/Service/NoteUtil.php -i ${TMP_PATCH_DIR}/006-notes-url-fix.patch

RUN patch -u ${BASE_DIR}/core/Controller/LostController.php -i ${TMP_PATCH_DIR}/007-recovery-email-field.patch

RUN patch -u ${BASE_DIR}/apps/settings/templates/settings/personal/personal.info.php -i {TMP_PATCH_DIR}/008-readonly-email-input.patch

RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/007-recovery-email-changes.patch

RUN rm -rf ${TMP_PATCH_DIR}



# autocomplete leak tweak apps frontend with sed, disable group suggestion

patches/007-recovery-email-field.patch→patches/007-recovery-email-changes.patch

+34 −0
Original line number Diff line number Diff line 
--- ../../LostControllerOriginal.php	2021-03-22 14:54:51.263702571 +0530

+++ ../../LostController.php	2021-03-22 14:56:32.148293370 +0530

--- ./core/Controller/LostController.php	2021-03-26 09:51:09.317785801 +0530

+++ ./core/Controller/LostController.new.php	2021-03-26 09:51:35.490073707 +0530

@@ -205,8 +205,9 @@

 		}
@@ -20,4 +20,15 @@ 
+		$email = $this->config->getUserValue($user->getUID(), 'email-recovery', 'recovery-email');

 

 		if (empty($email)) {

 			throw new ResetPasswordException('Could not send reset e-mail since there is no email for username ' . $input);
 
 			throw new ResetPasswordException('Could not send reset e-mail since there is no email for username ' . $input);--- ./personal.info.original.php	2021-03-26 11:34:48.659322845 +0530--- ./personal.info.original.php	2021-03-26 11:34:48.659322845 +0530

--- ./apps/settings/templates/settings/personal/personal.info.php	2021-03-26 11:34:48.659322845 +0530

+++ ./apps/settings/templates/settings/personal/personal.info.new.php	2021-03-26 11:42:51.729044400 +0530

@@ -113,7 +113,7 @@

 									print_unescaped('class="hidden"');

 								} ?>

 					   value="<?php p($_['displayName']) ?>"

-					   autocomplete="on" autocapitalize="none" autocorrect="off" />

+					   autocomplete="on" autocapitalize="none" autocorrect="off" readonly />

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

 					<span><?php if (isset($_['displayName']) && !empty($_['displayName'])) {

 									p($_['displayName']);

patches/008-readonly-email-input.patch

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
--- personal.info.original.php	2021-03-19 16:10:31.527079347 +0530

+++ personal.info.php	2021-03-19 16:12:12.689345081 +0530

@@ -150,7 +150,7 @@

                                 <input type="email" name="email" id="email" value="<?php p($_['email']); ?>"

                                         <?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>

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

-                                           autocomplete="on" autocapitalize="none" autocorrect="off" />

+                                           autocomplete="on" autocapitalize="none" autocorrect="off" readonly />

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

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

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