summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Bernloehr <Heiko.Bernloehr@FreeIT.de>2017-03-15 00:21:20 +0100
committerHeiko Bernloehr <Heiko.Bernloehr@FreeIT.de>2017-03-15 00:21:20 +0100
commitc1a1a813536f694203a6ed6a5186c40079c77ab2 (patch)
tree20ffacc17f53ebca53217a0865f97283423137ee
parent692068ba05d1c4c53b2cb1ba081f9c33fa358b9a (diff)
downloadecs-c1a1a813536f694203a6ed6a5186c40079c77ab2.tar.gz
ecs-c1a1a813536f694203a6ed6a5186c40079c77ab2.zip
Adjust controllers.
-rw-r--r--app/controllers/configs_controller.rb2
-rw-r--r--app/controllers/messages_controller.rb2
-rw-r--r--app/controllers/subparticipants_controller.rb4
3 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/configs_controller.rb b/app/controllers/configs_controller.rb
index 0b516e9..5a62379 100644
--- a/app/controllers/configs_controller.rb
+++ b/app/controllers/configs_controller.rb
@@ -1,7 +1,5 @@
class ConfigsController < ApplicationController
- require 'json/add/rails'
-
before_filter :authentication
before_filter :add_cookie_header # only for anonymous participants
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 5600db9..7eecc7b 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -256,7 +256,7 @@ protected
def update_render
location = request.protocol + request.host
- location += request.headers["SCRIPT_NAME"] if request.headers.has_key?("SCRIPT_NAME")
+ location += request.headers["SCRIPT_NAME"] if request.headers["SCRIPT_NAME"]
location += request.path.gsub(/\/*$/,'')
render :text => "", :layout => false, :status => 200,
:location => location
diff --git a/app/controllers/subparticipants_controller.rb b/app/controllers/subparticipants_controller.rb
index 6284536..3d585ae 100644
--- a/app/controllers/subparticipants_controller.rb
+++ b/app/controllers/subparticipants_controller.rb
@@ -17,8 +17,6 @@
class SubparticipantsController < ApplicationController
- require 'json/add/rails'
-
before_filter :authentication
before_filter :block_anonymous_participants
before_filter :block_subparticipants
@@ -114,7 +112,7 @@ private
def location(subparticipant)
location = request.protocol + request.host
location += ":" + request.port.to_s unless [80, 443].include?(request.port)
- location += request.headers["SCRIPT_NAME"] if request.headers.has_key?("SCRIPT_NAME")
+ location += request.headers["SCRIPT_NAME"] if request.headers["SCRIPT_NAME"]
location += request.path.gsub(/\/*$/,'') + "/" + subparticipant.id.to_s
location
end