Merge OpenOLAT 10 to OpenOLAT default branch with acce43cb2f65824567ed99abeccfc7bc08c1b1c3

src/main/java/org/olat/core/util/mail/MailToolExtension.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.core.util.mail;
+
+import org.olat.core.extensions.action.GenericActionExtension;
+
+/**
+ * 
+ * Initial date: 20.10.2014<br>
+ * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
+ *
+ */
+public class MailToolExtension extends GenericActionExtension {
+	
+	private MailModule module;
+	
+	/**
+	 * [used by Spring]
+	 * @param module
+	 */
+	public void setMailModule(MailModule module) {
+		this.module = module;
+	}
+	
+	@Override
+	public boolean isEnabled() {
+		return module.isInternSystem() && super.isEnabled();
+	}
+
+}

src/main/java/org/olat/core/util/mail/_spring/mailContext.xml

@@ -72,8 +72,9 @@
 	</bean>
 	
 	<!--  the email-parent-menu  -->
-	<bean class="org.olat.core.extensions.action.GenericActionExtension" name="mailBox" init-method="initExtensionPoints" >
+	<bean class="org.olat.core.util.mail.MailToolExtension" name="mailBox" init-method="initExtensionPoints" >
 		<property name="order" value="404" />
+		<property name="mailModule" ref="mailModule" />
 		<property name="navigationKey" value="Mail" />
 		<property name="alternativeNavigationKeys" value="Inbox,Outbox" />
 		<property name="iconCssClass" value="o_icon o_icon-fw o_icon_mail" />