4 files changed, 6 insertions, 16 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 278df5a3b..090359f1f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -4,8 +4,7 @@
 #
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: application_helper.rb,v 1.22 2008-07-09 07:24:50 francis Exp $
+
 require 'languages'
 
 module ApplicationHelper
diff --git a/app/helpers/config_helper.rb b/app/helpers/config_helper.rb
index 543b60256..73e12172f 100644
--- a/app/helpers/config_helper.rb
+++ b/app/helpers/config_helper.rb
@@ -1,9 +1,5 @@
 module ConfigHelper
     def site_name
-        MySociety::Config.get('SITE_NAME', 'Alaveteli')
-    end
-
-    def force_registration_on_new_request
-        MySociety::Config.get('FORCE_REGISTRATION_ON_NEW_REQUEST', false)
+        Configuration::site_name
     end
 end
 \ No newline at end of file
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index cae17ebd3..994da0e87 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -4,8 +4,6 @@
 #
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
-#
-# $Id: link_to_helper.rb,v 1.52 2009-04-08 05:34:51 francis Exp $
 
 module LinkToHelper
 
@@ -221,9 +219,8 @@ module LinkToHelper
 
     # Admin pages
     def admin_url(relative_path)
-        admin_url_prefix = MySociety::Config.get("ADMIN_BASE_URL", "")
-        admin_url_prefix = admin_general_index_path+"/" if admin_url_prefix.empty?
-        return admin_url_prefix + relative_path
+        admin_url_prefix = Configuration::admin_base_url
+        (admin_url_prefix.empty? ? admin_general_index_url + '/' : admin_url_prefix) + relative_path
     end
 
     # About page URLs
@@ -241,7 +238,7 @@ module LinkToHelper
 
 
     def main_url(relative_path, append = nil)
-        url_prefix = "http://" + MySociety::Config.get("DOMAIN", '127.0.0.1:3000')
+        url_prefix = "http://" + Configuration::domain
         url = url_prefix + relative_path
         if !append.nil?
             begin
diff --git a/app/helpers/mailer_helper.rb b/app/helpers/mailer_helper.rb
index c0a950d47..be2ce47aa 100644
--- a/app/helpers/mailer_helper.rb
+++ b/app/helpers/mailer_helper.rb
@@ -1,7 +1,5 @@
 module MailerHelper
     def contact_from_name_and_email
-        contact_name = MySociety::Config.get("CONTACT_NAME", 'Alaveteli')
-        contact_email = MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost')
-        return "#{contact_name} <#{contact_email}>"
+        "#{Configuration::contact_name} <#{Configuration::contact_email}>"
     end
 end