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

Commit 7d7f83f7 authored by Alexandre Roux's avatar Alexandre Roux
Browse files

atomic patch files + apply patches

parent 4ac0c42d

Dockerfile

+2 −0
Original line number Diff line number Diff line
@@ -220,6 +220,8 @@ RUN patch -u ${BASE_DIR}/apps/dav/lib/Connector/Sabre/Principal.php -i ${TMP_PAT 
RUN patch -u ${BASE_DIR}/apps/dav/lib/HookManager.php -i ${TMP_PATCH_DIR}/028-default-task-calendar.patch

RUN patch -u ${BASE_DIR}/apps/provisioning_api/lib/Controller/UsersController.php -i ${TMP_PATCH_DIR}/029-restrict-user-to-change-primary-email.patch

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}/core/templates/error.php -i ${TMP_PATCH_DIR}/034-display-back-to-login-error-page.patch

RUN patch -u ${BASE_DIR}/lib/private/legacy/OC_Template.php -i ${TMP_PATCH_DIR}/035-display-back-to-login-oc_template.patch

RUN rm -rf ${TMP_PATCH_DIR}



RUN curl -fsSL -o ldap_write_support.tar.gz \

patches/034-display-back-to-login-error-page.patch

0 → 100644
+21 −0
Original line number Diff line number Diff line 
diff --git a/core/templates/error.php b/core/templates/error.php

index 2e5488ae8d..d39dc8580b 100644

--- a/core/templates/error.php

+++ b/core/templates/error.php

@@ -1,4 +1,5 @@

 <div class="guest-box">

+	<?php $displayBackToLogin = false; ?>

 	<h2><?php p($l->t('Error')) ?></h2>

 	<ul>

 	<?php foreach ($_["errors"] as $error):?>

@@ -8,6 +9,10 @@

 				<p class='hint'><?php p($error['hint']) ?></p>

 			<?php endif;?>

 		</li>

+		<?php if ($error['statusCode'] == 401) $displayBackToLogin = true; ?>

 	<?php endforeach ?>

 	</ul>

+	<?php if ($displayBackToLogin): ?>

+		<a  href="<?php print_unescaped($_['logout_url']); ?>"><?php p($l->t('Back to login')) ?></a>

+	<?php endif; ?>

 </div>

patches/034-display-back-to-login.patch→patches/035-display-back-to-login-oc_template.patch

+0 −21
Original line number Diff line number Diff line 
diff --git a/core/templates/error.php b/core/templates/error.php

index 2e5488ae8d..d39dc8580b 100644

--- a/core/templates/error.php

+++ b/core/templates/error.php

@@ -1,4 +1,5 @@

 <div class="guest-box">

+	<?php $displayBackToLogin = false; ?>

 	<h2><?php p($l->t('Error')) ?></h2>

 	<ul>

 	<?php foreach ($_["errors"] as $error):?>

@@ -8,6 +9,10 @@

 				<p class='hint'><?php p($error['hint']) ?></p>

 			<?php endif;?>

 		</li>

+		<?php if ($error['statusCode'] == 401) $displayBackToLogin = true; ?>

 	<?php endforeach ?>

 	</ul>

+	<?php if ($displayBackToLogin): ?>

+		<a  href="<?php print_unescaped($_['logout_url']); ?>"><?php p($l->t('Back to login')) ?></a>

+	<?php endif; ?>

 </div>

diff --git a/lib/private/legacy/OC_Template.php b/lib/private/legacy/OC_Template.php

index 0c9fa1ccc0..7f58c6d007 100644

--- a/lib/private/legacy/OC_Template.php