Merge OpenOLAT 12.2 to OpenOLAT default branch with 4be6d4a9182fd09a27176734ffc396bb5d8a4b10

796ee91a · srosse · 906c9097 · 5485e126 · 796ee91a · 796ee91a
Commit 796ee91a authored 7 years ago by srosse
--- a/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml
+++ b/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml
@@ -14,6 +14,9 @@
 				<entry key="/dmz/">
 					<ref bean="dmzbean" />
 				</entry>
+				<entry key="/robots.txt">
+					<ref bean="robotsdispatcher" />
+				</entry>
 				<entry key="/maintenance/">
 					<ref bean="maintenancebean" />
 				</entry>
@@ -70,6 +73,8 @@
 	<bean id="oauthcallback" class="org.olat.login.oauth.OAuthDispatcher" />
+	<bean id="robotsdispatcher" class="org.olat.dispatcher.RobotsDispatcher" />
 	<!-- send bug report dispatcher -->
 	<bean id="errorMailBean" class="org.olat.core.dispatcher.ErrorFeedbackMailer">
 		<property name="mailManager" ref="mailManager"/>

--- a/src/main/java/org/olat/core/util/mail/_content/mail_template.html
+++ b/src/main/java/org/olat/core/util/mail/_content/mail_template.html
-<body style="font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif">
+<body style="font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif">
 	<div style="margin: 1em 0 1em 0;">$content</div>
 	<div style="background: #FAFAFA; border: 1px solid #eee; border-radius: 5px; padding: 0 0.5em 0.5em 0.5em; margin: 1em 0 1em 0;">$footer</div>
 </body>
\ No newline at end of file
--- a/src/main/java/org/olat/dispatcher/RobotsDispatcher.java
+++ b/src/main/java/org/olat/dispatcher/RobotsDispatcher.java
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
+package org.olat.dispatcher;
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.olat.core.dispatcher.Dispatcher;
+/**
+ * 
+ * Initial date: 30.11.2015<br>
+ * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
+ *
+ */
+public class RobotsDispatcher implements Dispatcher {
+	@Override
+	public void execute(HttpServletRequest request, HttpServletResponse response)
+	throws ServletException, IOException {
+		try {
+			response.setCharacterEncoding("UTF-8");
+		} catch (Exception e) {
+			//we do our best
+		}
+		response.setContentType("text/plain");
+		PrintWriter writer = response.getWriter();
+		writer.write("User-agent: *\n");
+		writer.write("Disallow: /");
+	}
+}