introduce experimental baseuri support

Snorby · May 30, 2014 · adc316e · adc316e
1 parent 7bc97f3
commit adc316e
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 60 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -48,10 +48,12 @@ def user_setup
       else
 
         current_uri = request.env['PATH_INFO']
-        routes = ["", "/", "/users/login"]
-
+        rails_root = request.env['RAILS_ROOT']
+	baseuri = Snorby::CONFIG[:baseuri]
+        routes = ["", "/", baseuri + "/users/login"]
+
         if current_uri && routes.include?(current_uri)
-          redirect_to '/users/login' unless current_uri == "/users/login"
+          redirect_to baseuri + '/users/login' unless current_uri == baseuri + "/users/login"
         else
           authenticate_user!
         end

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -243,14 +243,14 @@ def clippy(text, bgcolor='#FFFFFF', id=0)
                 height="14" 
                 class="clippy" 
                 id="clippy">
-        <param name="movie" value="/flash/clippy.swf">
+        <param name="movie" value="#{Snorby::CONFIG[:baseuri]}/flash/clippy.swf">
         <param name="allowScriptAccess" value="always">
         <param name="quality" value="high">
         <param name="scale" value="noscale">
         <param name="FlashVars" value="id=clippy_#{id}&amp;copied=&amp;copyto=">
         <param name="bgcolor" value="#{bgcolor}">
         <param name="wmode" value="opaque">
-        <embed src="/flash/clippy.swf" 
+        <embed src="#{Snorby::CONFIG[:baseuri]}/flash/clippy.swf" 
                width="14" 
                height="14" 
                name="clippy" 

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -18,6 +18,7 @@
 				var sev<%= sev.sig_id %>_bg_color = '<%= sev.bg_color %>';
       <% end %>
 
+      var baseuri = "<%= Snorby::CONFIG[:baseuri] %>"; 
       var current_user = <%= @current_user.to_json(
         :only => [
           :email,

diff --git a/config/application.rb b/config/application.rb
@@ -43,6 +43,11 @@ module Snorby
     CONFIG[:authentication_mode] = "database"
   end
 
+  # default base uri is none...
+  unless CONFIG.has_key?(:baseuri)
+    CONFIG[:baseuri] = ""
+  end
+
   class Application < Rails::Application
 
     config.threadsafe!