Redirect to proper HTTP root on state change

zisk · Nov 5, 2016 · 57f1af0 · 57f1af0
1 parent 254f41a
commit 57f1af0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/data/interfaces/default/shutdown.html b/data/interfaces/default/shutdown.html
@@ -47,7 +47,7 @@ <h4>Restart in <span class="countdown"></span></h4>
 
  // Redirect to home page after countdown.
  function reloadPage() {
- window.location.href = "index";
+ window.location.href = "${new_http_root}index";
  }
  </script>
 </%def>
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
@@ -3212,8 +3212,13 @@ def do_state_change(self, signal, title, timer, **kwargs):
  quote = self.random_arnold_quotes()
  plexpy.SIGNAL = signal
 
+ if plexpy.CONFIG.HTTP_ROOT:
+ new_http_root = '/' + plexpy.CONFIG.HTTP_ROOT.strip('/') + '/'
+ else:
+ new_http_root = '/'
+
  return serve_template(templatename="shutdown.html", title=title,
- message=message, timer=timer, quote=quote)
+ new_http_root=new_http_root, message=message, timer=timer, quote=quote)
 
  @cherrypy.expose
  @requireAuth(member_of("admin"))