Properly handle when zm installed on root directory (openhab#12348)

Signed-off-by: Mark Hilbush <mark@hilbush.com>
andan67 · Nov 5, 2022 · 4c32010 · 4c32010
1 parent 0720661
commit 4c32010
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bundles/org.openhab.binding.zoneminder/README.md b/bundles/org.openhab.binding.zoneminder/README.md
@@ -48,7 +48,7 @@ The following configuration parameters are available on the Server thing:
 | Host                           | host                        | Required  | Host name or IP address of the ZoneMinder server. |
 | Use secure connection          | useSSL                      | Required  | Use http or https for connection to ZoneMinder. Default is http. |
 | Port Number                    | portNumber                  | Optional  | Port number if not on ZoneMinder default port 80. |
-| Url Path                       | urlPath                     | Required  | Path where Zoneminder is installed. Default is /zm. |
+| Url Path                       | urlPath                     | Required  | Path where Zoneminder is installed. Default is /zm. Enter / if Zoneminder is installed under root directory. |
 | Refresh Interval               | refreshInterval             | Required  | Frequency in seconds at which monitor status will be updated. |
 | Default Alarm Duration         | defaultAlarmDuration        | Required  | Can be used to set the default alarm duration on discovered monitors. |
 | Default Image Refresh Interval | defaultImageRefreshInterval | Optional  | Can be used to set the image refresh interval in seconds on discovered monitors. Leave empty to not set an image refresh interval. |

diff --git a/...minder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZmBridgeHandler.java b/...minder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZmBridgeHandler.java
@@ -146,7 +146,7 @@ public void initialize() {
         host = config.host;
         useSSL = config.useSSL.booleanValue();
         portNumber = config.portNumber != null ? Integer.toString(config.portNumber) : null;
-        urlPath = config.urlPath;
+        urlPath = "/".equals(config.urlPath) ? "" : config.urlPath;
 
         // If user and password are configured, then use Zoneminder authentication
         if (config.user != null && config.pass != null) {