complete change of configuration

1 files changed, 68 insertions, 80 deletions

diff --git a/config_sample.rb b/config_sample.rb
index d54ff24..53bbead 100644
--- a/config_sample.rb
+++ b/config_sample.rb
@@ -19,34 +19,23 @@
 ############################################################################
 
 # Choose your favorite version control system
-# bzr and git is implemented
+# bzr and git are implemented
 # Warning: bzr is slow!
 # Warning: git needs git >=1.6.5
-require "git"
+# $conf.vcs = "git"
 
-# Change the SITEURL if the url is not determined correctly
-case $cgi.server_port
-when 80
-	protocol = "http"
-	port = ""
-when 443
-	protocol = "https"
-	port = ""
-else
-	protocol = "http"
-	port = ":#{$cgi.server_port}"
-end
-SITEURL = "#{protocol}://#{$cgi.server_name}#{port}#{$cgi.script_name.gsub(/[^\/]*$/,"")}"
+# Change only if the url is not determined correctly (e.g. at the start page)
+# $conf.siteurl = "http://example.org:9999/exampledir"
 
 # You may insert some sites, which are under your site
 # A breadcrumb will be generated in the way:
 # TUD -> ... -> Fakultät Informatik -> Professur DuD -> dudle -> poll
-BREADCRUMBS = [
-	"<a href='http://tu-dresden.de'>TUD</a>",
-	"...",
-	"<a href='http://www.inf.tu-dresden.de'>Fakultät Informatik</a>",
-	"<a href='http://dud.inf.tu-dresden.de'>Professur Datenschutz und Datensicherheit</a>"
-]
+#$conf.breadcrumbs = [
+#	"<a href='http://tu-dresden.de'>TUD</a>",
+#	"...",
+#	"<a href='http://www.inf.tu-dresden.de'>Fakultät Informatik</a>",
+#	"<a href='http://dud.inf.tu-dresden.de'>Professur Datenschutz und Datensicherheit</a>"
+#]
 
 # If you want to encourage the user to send bug reports, state the errorlog,
 # which you have configured in your apache conf with the ErrorLog directive.
@@ -54,44 +43,44 @@ BREADCRUMBS = [
 # receive the mails instead of me (the developer).
 # You would do me a favor, if you configure this with my address, however,
 # if you do not want people to read parts of your error log, leave the 
-# ERRORLOG variable unset!
+# $conf.errorlog unset!
 # Make sure, that your apache can read this file 
 # (which usually is not the case for /var/log/apache2/*)
 # You have 2 Options: 
 #   1. change logrotate to allow /var/log/apache2/* to be read by apache
 #      (=> change the line »create 640 root adm«)
-#   2. change ERRORLOG to another file and creat a new rule for logrotate.
+#   2. change $conf.errorlog to another file and creat a new rule for logrotate.
 #      DO NOT FORGET TO ADD THE ERROR LOG TO LOGROTATE IF YOU CHANGE THE PATH
 #      TO OTHER THAN /var/log/apache2/* !
 # If you do not know what to do what I am speaking about, just do not uncomment
 # the next line
-#ERRORLOG = "/var/log/dudle_error.log"
-BUGREPORTMAIL = "Benjamin.Kellermann@tu-dresden.de"
+#$conf.errorlog = "/var/log/dudle_error.log"
+#$conf.bugreportmail = "Benjamin.Kellermann@tu-dresden.de"
 
 # Send bug reports automatically with the programm “mail”
-AUTO_SEND_REPORT = false
+#$conf.auto_send_report = false
 
 # add the htmlcode in the Variable INDEXNOTICE to the startpage
 # Example: displays all available Polls
-indexnotice = <<INDEXNOTICE
-<h2>Available Polls</h2>
-<table>
-	<tr>
-		<th>Poll</th><th>Last change</th>
-	</tr>
-INDEXNOTICE
-Dir.glob("*/data.yaml").sort_by{|f|
-	File.new(f).mtime
-}.reverse.collect{|f| f.gsub(/\/data\.yaml$/,'') }.each{|site|
-	indexnotice += <<INDEXNOTICE
-<tr class='participantrow'>
-	<td class='polls'><a href='./#{CGI.escapeHTML(site).gsub("'","%27")}/'>#{CGI.escapeHTML(site)}</a></td>
-	<td class='mtime'>#{File.new(site + "/data.yaml").mtime.strftime('%d.%m, %H:%M')}</td>
-</tr>
-INDEXNOTICE
-}
-indexnotice += "</table>"
-INDEXNOTICE = indexnotice
+#$conf.indexnotice = <<INDEXNOTICE
+#<h2>Available Polls</h2>
+#<table>
+#	<tr>
+#		<th>Poll</th><th>Last change</th>
+#	</tr>
+#INDEXNOTICE
+#Dir.glob("*/data.yaml").sort_by{|f|
+#	File.new(f).mtime
+#}.reverse.collect{|f| f.gsub(/\/data\.yaml$/,'') }.each{|site|
+#	$conf.indexnotice += <<INDEXNOTICE
+#<tr class='participantrow'>
+#	<td class='polls'><a href='./#{CGI.escapeHTML(site).gsub("'","%27")}/'>#{CGI.escapeHTML(site)}</a></td>
+#	<td class='mtime'>#{File.new(site + "/data.yaml").mtime.strftime('%d.%m, %H:%M')}</td>
+#</tr>
+#INDEXNOTICE
+#}
+#$conf.indexnotice += "</table>"
+
 
 # Add some Example Polls to the example page
 # you may create those using the normal interface
@@ -99,45 +88,44 @@ INDEXNOTICE = indexnotice
 # .htaccess and .htdigest are deleted after 
 # example creation (defining password protected 
 # examples is not possible therefore)
-EXAMPLES = [
-	{
-		:url => "coffeebreak",
-		:description => _("Event Schedule Poll"),
-		:new_environment => true,
-	},{
-		:url => "coffee",
-		:description => _("Normal Poll"),
-		:revno => 34
-	},{
-		:url => "Cheater",
-		:description => "Cheater",
-		:hidden => true
-	}
-]
+#$conf.examples = [
+#	{
+#		:url => "coffeebreak",
+#		:description => _("Event Schedule Poll"),
+#		:new_environment => true,
+#	},{
+#		:url => "coffee",
+#		:description => _("Normal Poll"),
+#		:revno => 34
+#	},{
+#		:url => "Cheater",
+#		:description => "Cheater",
+#		:hidden => true
+#	}
+#]
 
 # add the htmlcode in the Variable EXAMPLENOTICE to the example page
-examplenotice = <<EXAMPLENOTICE
-	<h2>Screencasts</h2>
-	<ol>
-		<li><a href="0-register.ogv">Register a new user</a></li>
-		<li><a href="1-setup.ogv">Setup a new poll</a></li>
-		<li><a href="2-participate.ogv">Participate in a poll</a></li>
-	</ol>
-EXAMPLENOTICE
-EXAMPLENOTICE = examplenotice
+#$conf.examplenotice = <<EXAMPLENOTICE
+#	<h2>Screencasts</h2>
+#	<ol>
+#		<li><a href="0-register.ogv">Register a new user</a></li>
+#		<li><a href="1-setup.ogv">Setup a new poll</a></li>
+#		<li><a href="2-participate.ogv">Participate in a poll</a></li>
+#	</ol>
+#EXAMPLENOTICE
 
 # add the htmlcode in the Variable ABOUTNOTICE to the about page
-aboutnotice = <<ABOUTNOTICE
-<div class='textcolumn'>
-	<h2>Bugs/Features</h2>
-	<ul>
-		<li><a href="Bugs">Report a Bug</a></li>
-		<li><a href="Features">Request a Feature</a></li>
-	</ul>
-</div>
-ABOUTNOTICE
-ABOUTNOTICE = aboutnotice
+#$conf.aboutnotice = <<ABOUTNOTICE
+#<div class='textcolumn'>
+#	<h2>Bugs/Features</h2>
+#	<ul>
+#		<li><a href="Bugs">Report a Bug</a></li>
+#		<li><a href="Features">Request a Feature</a></li>
+#	</ul>
+#</div>
+#ABOUTNOTICE
+
 
 # choose a default stylesheet
 # e.g., "classic.css", "css/foobar.css", ...
-DEFAULT_CSS = "default.css"
+#$conf.default_css = "default.css"