1.1 --- a/config/example.lua	Thu Jun 28 17:24:18 2012 +0200
     1.2 +++ b/config/example.lua	Thu Jun 28 17:32:48 2012 +0200
     1.3 @@ -2,10 +2,6 @@
     1.4  -- MANDATORY CONFIG OPTIONS (MUST BE SET!)
     1.5  -- ========================================================================
     1.6  
     1.7 --- Name of this instance, defaults to name of config file
     1.8 --- ------------------------------------------------------------------------
     1.9 -config.instance_name = "Instance name"
    1.10 -
    1.11  -- Information about service provider (HTML)
    1.12  -- ------------------------------------------------------------------------
    1.13  config.app_service_provider = "Snake Oil<br/>10000 Berlin<br/>Germany"
    1.14 @@ -21,7 +17,12 @@
    1.15      name = "terms_of_use_v1",
    1.16      html = "I accept the terms of use.",
    1.17      not_accepted_error = "You have to accept the terms of use to be able to register."
    1.18 -  }
    1.19 +  },
    1.20 +--  {
    1.21 +--    name = "extra_terms_of_use_v1",
    1.22 +--    html = "I accept the extra terms of use.",
    1.23 +--    not_accepted_error = "You have to accept the extra terms of use to be able to register."
    1.24 +--  }
    1.25  }
    1.26  
    1.27  -- ========================================================================
    1.28 @@ -29,6 +30,10 @@
    1.29  -- Remove leading -- to enable a option
    1.30  -- ========================================================================
    1.31  
    1.32 +-- Name of this instance, defaults to name of config file
    1.33 +-- ------------------------------------------------------------------------
    1.34 +-- config.instance_name = "Instance name"
    1.35 +
    1.36  -- Connection information for the LiquidFeedback database
    1.37  -- ------------------------------------------------------------------------
    1.38  -- config.database = { engine='postgresql', dbname='liquid_feedback' }
    1.39 @@ -45,14 +50,17 @@
    1.40  -- ------------------------------------------------------------------------
    1.41  -- config.default_lang = "en"
    1.42  
    1.43 --- after how long is a user considered inactive and the trustee will see warning
    1.44 --- notation is according to postgresql intervals
    1.45 +-- after how long is a user considered inactive and the trustee will see warning,
    1.46 +-- notation is according to postgresql intervals, default: no warning at all
    1.47  -- ------------------------------------------------------------------------
    1.48  -- config.delegation_warning_time = '6 months'
    1.49  
    1.50 --- Sender and prefix of all automatic mails, default to "[Liquid Feedback] "
    1.51 +-- Prefix of all automatic mails, defaults to "[Liquid Feedback] "
    1.52  -- ------------------------------------------------------------------------
    1.53  -- config.mail_subject_prefix = "[LiquidFeedback] "
    1.54 +
    1.55 +-- Sender of all automatic mails, defaults to system defaults
    1.56 +-- ------------------------------------------------------------------------
    1.57  -- config.mail_envelope_from = "liquid-support@example.com"
    1.58  -- config.mail_from = "LiquidFeedback"
    1.59  -- config.mail_reply_to = "liquid-support@example.com"
    1.60 @@ -71,10 +79,11 @@
    1.61  
    1.62  -- Set public access level
    1.63  -- Available options: false, "anonymous", "pseudonym", "full"
    1.64 +-- Defaults to "full"
    1.65  -- ------------------------------------------------------------------------
    1.66  -- config.public_access = "full"
    1.67  
    1.68 --- Use custom image conversion
    1.69 +-- Use custom image conversion, defaults to ImageMagick's convert
    1.70  -- ------------------------------------------------------------------------
    1.71  --config.member_image_content_type = "image/jpeg"
    1.72  --config.member_image_convert_func = {
    1.73 @@ -82,7 +91,7 @@
    1.74  --  photo =  function(data) return extos.pfilter(data, "convert", "jpeg:-", "-thumbnail", "240x240", "jpeg:-") end
    1.75  --}
    1.76  
    1.77 --- Integration of Etherpad
    1.78 +-- Integration of Etherpad, disabled by default
    1.79  -- ------------------------------------------------------------------------
    1.80  --config.etherpad = {
    1.81  --  base_url = "http://example.com:9001/",
    1.82 @@ -102,7 +111,7 @@
    1.83  
    1.84  
    1.85  -- ========================================================================
    1.86 --- Do main initialisation (DO NOT REMOVE THIS SECTION)
    1.87 +-- Do main initialisation (DO NOT REMOVE FOLLOWING SECTION)
    1.88  -- ========================================================================
    1.89  
    1.90  execute.config("init")

     2.1 --- a/config/init.lua	Thu Jun 28 17:24:18 2012 +0200
     2.2 +++ b/config/init.lua	Thu Jun 28 17:32:48 2012 +0200
     2.3 @@ -1,3 +1,9 @@
     2.4 +-- ========================================================================
     2.5 +-- DO NOT CHANGE ANYTHING IN THIS FILE
     2.6 +-- (except when you really know what you are doing!)
     2.7 +-- ========================================================================
     2.8 +
     2.9 +
    2.10  config.app_version = "2.beta12"
    2.11  
    2.12  if not config.instance_name then
    2.13 @@ -39,6 +45,10 @@
    2.14    }
    2.15  end
    2.16  
    2.17 +if config.public_access == nil then
    2.18 +  config.public_access = "full"
    2.19 +end
    2.20 +
    2.21  if not config.database then
    2.22    config.database = { engine='postgresql', dbname='liquid_feedback' }
    2.23  end
    2.24 @@ -46,7 +56,7 @@
    2.25  request.set_404_route{ module = 'index', view = '404' }
    2.26  
    2.27  -- open and set default database handle
    2.28 -db = assert(mondelefant.connect(config.database)
    2.29 +db = assert(mondelefant.connect(config.database))
    2.30  at_exit(function() 
    2.31    db:close()
    2.32  end)
    2.33 @@ -63,7 +73,6 @@
    2.34  request.set_absolute_baseurl(config.absolute_base_url)
    2.35  
    2.36  
    2.37 -
    2.38  -- TODO abstraction
    2.39  -- get record by id
    2.40  function mondelefant.class_prototype:by_id(id)