- Filter events on server side

- Use common path for templates
- Filter events about geofences that user do not have access (minor security fix)
- Removed unused function
- Visual templates improvements

1 files changed, 3 insertions, 3 deletions

diff --git a/src/org/traccar/reports/Trips.java b/src/org/traccar/reports/Trips.java
index c912dc651..27863d877 100644
--- a/src/org/traccar/reports/Trips.java
+++ b/src/org/traccar/reports/Trips.java
@@ -202,9 +202,9 @@ public final class Trips {
                 devicesTrips.add(deviceTrips);
             }
         }
-        String templatePath = Context.getConfig().getString("report.trips.template.excel",
-                "templates/export/trips.xlsx");
-        try (InputStream inputStream = new FileInputStream(templatePath)) {
+        String templatePath = Context.getConfig().getString("report.templatesPath",
+                "templates/export/");
+        try (InputStream inputStream = new FileInputStream(templatePath + "/trips.xlsx")) {
             org.jxls.common.Context jxlsContext = PoiTransformer.createInitialContext();
             jxlsContext.putVar("devices", devicesTrips);
             jxlsContext.putVar("sheetNames", sheetNames);