From 67377a256157a9a42c09577b75eeadfd4d015bc9 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <Jonny.Wong.16@gmail.com>
Date: Wed, 27 Jan 2016 23:32:21 -0800
Subject: [PATCH] Fix server verification in settings

---
 plexpy/webserve.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index f3f18dfc..a70b8252 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1382,9 +1382,16 @@ class WebInterface(object):
 
     @cherrypy.expose
     def get_server_id(self, hostname=None, port=None, identifier=None, ssl=0, remote=0, **kwargs):
-        from plexpy import http_handler
+        if not identifier:
+            plex_tv = plextv.PlexTV()
+            servers = plex_tv.discover()
 
-        if hostname and port:
+            for server in servers:
+                if server['ip'] == hostname and server['port'] == port:
+                    identifier = server['clientIdentifier']
+                    break
+
+        if identifier and hostname and port:
             # Set PMS attributes to get the real PMS url
             plexpy.CONFIG.__setattr__('PMS_IP', hostname)
             plexpy.CONFIG.__setattr__('PMS_PORT', port)