- Use URL builder

- Use Curly braces in templates

Author: Abyss777

src/org/traccar/Context.java

@@ -21,6 +21,7 @@
 import java.util.Properties;
 
 import org.apache.velocity.app.VelocityEngine;
+import org.eclipse.jetty.util.URIUtil;
 import org.traccar.database.AliasesManager;
 import org.traccar.database.ConnectionManager;
 import org.traccar.database.DataManager;
@@ -259,8 +260,8 @@ public static void init(String[] arguments) throws Exception {
                     "org.apache.velocity.runtime.log.NullLogChute");
 
             String address = config.getString("web.address", InetAddress.getLocalHost().getHostAddress());
-            String port = config.getString("web.port", "8082");
-            String webUrl = "http://" + address + ":" + port + "/";
+            int port = config.getInteger("web.port", 8082);
+            String webUrl = URIUtil.newURI("http", address, port, "", "");
             webUrl = Context.getConfig().getString("web.url", webUrl);
             velocityProperties.setProperty("web.url", webUrl);
 

templates/mail/alarm.vm

@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Alarm:  $position.getString("alarm")<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#if($position.address)$position.address#{else}$position.latitude°, $position.longitude°#end</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
 </body>
 </html>  

templates/mail/deviceMoving.vm

@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Moving<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#if($position.address)$position.address#{else}$position.latitude°, $position.longitude°#end</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
 </body>
 </html>  

templates/mail/deviceOverspeed.vm

@@ -12,6 +12,6 @@
 Device: $device.name<br>
 Exceeds the speed: $speedString<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#if($position.address)$position.address#{else}$position.latitude°, $position.longitude°#end</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
 </body>
 </html>  

templates/mail/deviceStopped.vm

@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Stopped<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#if($position.address)$position.address#{else}$position.latitude°, $position.longitude°#end</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
 </body>
 </html>  

templates/mail/geofenceEnter.vm

@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Has entered geofence: $geofence.name<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#if($position.address)$position.address#{else}$position.latitude°, $position.longitude°#end</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
 </body>
 </html>  

templates/mail/geofenceExit.vm

@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Has exited geofence: $geofence.name<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#if($position.address)$position.address#{else}$position.latitude°, $position.longitude°#end</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
 </body>
 </html>  

templates/mail/ignitionOff.vm

@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Ignition OFF<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#if($position.address)$position.address#{else}$position.latitude°, $position.longitude°#end</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
 </body>
 </html>  

templates/mail/ignitionOn.vm

@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Ignition ON<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#if($position.address)$position.address#{else}$position.latitude°, $position.longitude°#end</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
 </body>
 </html>  

templates/mail/maintenance.vm

@@ -5,6 +5,6 @@
 Device: $device.name<br>
 Maintenance is required<br>
 Time: $event.serverTime<br>
-Point: <a href="$webUrl?eventId=$event.id">#if($position.address)$position.address#{else}$position.latitude°, $position.longitude°#end</a><br>
+Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br>
 </body>
 </html>