Merge branch 'appng-manager-1.18.x'

appNG · Jan 13, 2022 · 05cf0e7 · 05cf0e7
2 parents 3b371a4 + 8907593
commit 05cf0e7
Show file tree

Hide file tree

Showing 37 changed files with 1,428 additions and 206 deletions.
diff --git a/application-home/application.xml b/application-home/application.xml
@@ -15,6 +15,7 @@
 			<description>Administrator with all permissions</description>
 			<permission id="output-format.html" />
 			<permission id="output-type.webgui" />
+			<permission id="mail.send" />
 			<!-- site -->
 			<permission id="site.list" />
 			<permission id="site.create" />
@@ -218,6 +219,7 @@
 		<permission id="debug">debug view</permission>
 		<permission id="output-format.html">HTML Format</permission>
 		<permission id="output-type.webgui">Web-GUI type</permission>
+		<permission id="mail.send">Send a test E-mail</permission>
 		<!-- site -->
 		<permission id="site.list">List all sites</permission>
 		<permission id="site.create">Create a new site</permission>
@@ -337,8 +339,7 @@
 		<property id="eventReportSender" description="the sender for the event report email">report@example.com</property>
 		<property id="eventReportSubject" description="the subject for the event report email">appNG event report</property>
 		<property id="eventReportText" description="the text for the event report email">See attached file for a report of the recent appNG platform events.</property>
-		<property id="eventReportTypes"
-			description="the event types to be included in the even report email (CREATE, UPDATE, DELETE, INFO, ERROR, WARN)">CREATE UPDATE DELETE INFO ERROR WARN</property>
+		<property id="eventReportTypes" description="the event types to be included in the even report email (CREATE, UPDATE, DELETE, INFO, ERROR, WARN)">CREATE UPDATE DELETE INFO ERROR WARN</property>
 		<property id="databaseReportReceivers"
 			description="a semicolon separted list of receviers for DatabaseReportJob, additional to all users with role 'Database report receiver'"></property>
 		<property id="databaseReportSender" description="the sender for the database report email">report@example.com</property>

diff --git a/application-home/conf/config.xml b/application-home/conf/config.xml
@@ -38,6 +38,10 @@
 				<session-param name="eU" />
 				<session-param name="eH" />
 				<session-param name="eN" />
+				<!-- site filtering -->
+				<session-param name="f_sn" />
+				<session-param name="f_sd" />
+				<session-param name="f_sa" />
 			</session-params>
 		</session>
 	</config>

diff --git a/application-home/conf/datasources/ds-cache.xml b/application-home/conf/datasources/ds-cache.xml
@@ -9,6 +9,7 @@
 			</permissions>
 			<params>
 				<param name="siteid" />
+				<param name="clearLink" />
 			</params>
 			<meta-data bindClass="java.util.Map$Entry">
 				<field name="key" type="longtext">
@@ -18,6 +19,15 @@
 					<label>value</label>
 				</field>
 			</meta-data>
+			<linkpanel location="bottom" id="other">
+				<link target="${clearLink}" mode="intern">
+					<icon>delete</icon>
+					<label id="cache.clear" />
+					<permissions>
+						<permission ref="cache.clear" mode="set" />
+					</permissions>
+				</link>
+			</linkpanel>
 		</config>
 		<bean id="cache">
 			<option name="mode" id="statistics" />

diff --git a/application-home/conf/datasources/ds-mail.xml b/application-home/conf/datasources/ds-mail.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datasources xmlns="http://www.appng.org/schema/platform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.appng.org/schema/platform http://www.appng.org/schema/platform/appng-platform.xsd">
+
+	<datasource id="mailForm">
+		<config>
+			<title>mailer</title>
+			<params>
+				<param name="siteid" />
+			</params>
+			<meta-data bindClass="org.appng.application.manager.form.MailForm">
+				<field name="mailHostAndPort" type="text" readonly="true">
+					<label id="mail.host" />
+				</field>
+				<field name="senderName" type="text">
+					<label id="mail.sender.name"/>
+				</field>
+				<field name="senderAddress" type="text">
+					<label id="mail.sender.email"/>
+				</field>
+				<field name="receiverName" type="text">
+					<label id="mail.receiver.name"/>
+				</field>
+				<field name="receiverAddress" type="text">
+					<label id="mail.receiver.email"/>
+				</field>
+				<field name="subject" type="text">
+					<label id="mail.subject"/>
+				</field>
+				<field name="textContent" type="longtext">
+					<label id="mail.content.text"/>
+				</field>
+				<field name="htmlContent" type="richtext">
+					<label id="mail.content.html"/>
+				</field>
+				<field name="attachment" type="file">
+					<label id="mail.attachment"/>
+				</field>
+			</meta-data>
+		</config>
+		<bean id="mailer" />
+	</datasource>
+
+</datasources>
diff --git a/application-home/conf/datasources/ds-sites.xml b/application-home/conf/datasources/ds-sites.xml
@@ -12,6 +12,7 @@
 			<params>
 				<param name="name" />
 				<param name="domain" />
+				<param name="active" />
 			</params>
 			<meta-data bindClass="org.appng.api.model.Site">
 				<field name="name" type="text">
@@ -110,7 +111,7 @@
 			</linkpanel>
 		</config>
 		<bean id="sites">
-			<option name="site" siteName="${name}" siteDomain="${domain}" />
+			<option name="site" siteName="${name}" siteDomain="${domain}" siteActive="${active}"/>
 		</bean>
 	</datasource>
 

diff --git a/application-home/conf/datasources/ds-subjects.xml b/application-home/conf/datasources/ds-subjects.xml
@@ -21,14 +21,16 @@
 					<sort ignore-case="true" />
 					<label>realname</label>
 				</field>
-				<field name="description" type="text">
-					<label>description</label>
+				<field name="email" type="text">
+					<sort ignore-case="true" />
+					<label>email</label>
 				</field>
 				<field name="typeName" type="text">
 					<label>userType</label>
 				</field>
-				<field name="language" type="text">
-					<label>language</label>
+				<field name="description" type="text" displayLength="40">
+					<sort ignore-case="true" />
+					<label>description</label>
 				</field>
 				<field name="locked" type="image">
 					<label>locked</label>
@@ -67,7 +69,7 @@
 			</linkpanel>
 		</config>
 		<bean id="subjects">
-			<option name="subject" groupId="${groupId}"/>
+			<option name="subject" groupId="${groupId}" />
 		</bean>
 	</datasource>
 

diff --git a/application-home/conf/events/ev-mail.xml b/application-home/conf/events/ev-mail.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<event id="mailEvent" xmlns="http://www.appng.org/schema/platform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.appng.org/schema/platform http://www.appng.org/schema/platform/appng-platform.xsd">
+
+	<config />
+
+	<action id="sendMail">
+		<config>
+			<title id="mail.test" />
+			<permissions>
+				<permission ref="mail.send" mode="set" />
+			</permissions>
+			<params>
+				<param name="form_action" />
+			</params>
+		</config>
+		<condition expression="${form_action eq 'sendMail'}" />
+		<datasource id="mailForm" />
+		<bean id="mailer" />
+	</action>
+
+</event>
diff --git a/application-home/conf/pages/pg-sites.xml b/application-home/conf/pages/pg-sites.xml
@@ -39,6 +39,7 @@
 					<get-param name="fCtpe" />
 					<get-param name="f_sn" />
 					<get-param name="f_sd" />
+					<get-param name="f_sa" />
 				</get-params>
 				<post-params>
 					<post-param name="form_action" />
@@ -55,6 +56,7 @@
 						<params>
 							<param name="name">${f_sn}</param>
 							<param name="domain">${f_sd}</param>
+							<param name="active">${f_sa}</param>
 						</params>
 					</datasource>
 				</element>
@@ -275,6 +277,7 @@
 					<datasource id="cacheStatistics">
 						<params>
 							<param name="siteid">${siteid}</param>
+							<param name="clearLink">/sites/update/${siteid}&#63;act=clearCache</param>
 						</params>
 						<condition expression="${not empty siteid}" />
 					</datasource>

diff --git a/application-home/conf/pages/pg-system.xml b/application-home/conf/pages/pg-system.xml
@@ -145,6 +145,11 @@
 					</datasource>
 				</element>
 			</section>
+			<section>
+				<element>
+					<action id="sendMail" onSuccess="/system#tab_sendMail" eventId="mailEvent" />
+				</element>
+			</section>
 
 			<!-- hidden inline actions -->
 			<section hidden="true">

diff --git a/application-home/dictionary/manager-messages.properties b/application-home/dictionary/manager-messages.properties
@@ -149,6 +149,19 @@ logconfig.reloaded=Log4j Configuration has been reloaded!
 logconfig.spreadClusterWide=Apply to all cluster nodes
 logfile=Logfile
 longDescription=Long Description
+mail.disabled=Sending E-Mails is disabled by site-property 'mailDisabled'!
+mail.success=E-Mail has been sent to {0}
+mail.error=Sending E-mail to {0} failed!
+mail.test=Send E-mail
+mail.host=Host
+mail.sender.name=Sender name
+mail.sender.email=Sender address
+mail.receiver.name=Receiver name
+mail.receiver.email=Receiver address
+mail.subject=Subject
+mail.content.text=Text content
+mail.content.html=HTML content
+mail.attachment=Attachment
 managed=managed
 maxConnections=Max. number of connections
 memory=Memory

diff --git a/application-home/dictionary/manager-messages_de.properties b/application-home/dictionary/manager-messages_de.properties
@@ -113,6 +113,19 @@ logconfig.reloaded=Log4j Konfiguration wurde neu geladen!
 logconfig.spreadClusterWide=Auf alle Cluster-Nodes anwenden
 logfile=Log-Datei
 longDescription=Langbeschreibung
+mail.disabled=Versand von E-Mails ist durch Site-Property 'mailDisabled' deaktiviert!
+mail.success=E-Mail wurde versand an {0}
+mail.error=Senden der E-Mail an {0} schlug fehl!
+mail.test=Sende E-mail
+mail.host=Mail-Server
+mail.sender.name=Absender Name
+mail.sender.email=Absender Adresse
+mail.receiver.name=Empfänger Name
+mail.receiver.email=Empfänger Adresse
+mail.subject=Betreff
+mail.content.text=Text Nachricht
+mail.content.html=HTML Nachricht
+mail.attachment=Anhang
 managed=verwaltet
 maxConnections=Max. Anzahl Verbindungen
 memory=Speicher

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>appng-manager</artifactId>
 	<packaging>jar</packaging>
 	<name>appNG Manager</name>
-	<version>1.17.2</version>
+	<version>1.19.0</version>
 	<description><![CDATA[Global appNG administration]]></description>
 	<url>https://appng.org</url>