aboutsummaryrefslogtreecommitdiff
path: root/index.cgi
diff options
context:
space:
mode:
authorBenjamin Kellermann <Benjamin.Kellermann@gmx.de>2009-11-20 00:20:20 +0100
committerBenjamin Kellermann <Benjamin.Kellermann@gmx.de>2009-11-20 00:20:20 +0100
commitc827b6deaadb0c08c003cd8e6410fc02b49513fc (patch)
treebb162169740fa8a7c2946261a0f8d1c0b47a5413 /index.cgi
parent7d7098e07f24a59ce601eb6c510fbe807cffee68 (diff)
index.cgi an HTML-system angepasst
Diffstat (limited to 'index.cgi')
-rwxr-xr-xindex.cgi48
1 files changed, 14 insertions, 34 deletions
diff --git a/index.cgi b/index.cgi
index ecd96a3..eedba17 100755
--- a/index.cgi
+++ b/index.cgi
@@ -13,18 +13,7 @@ require "cgi"
if __FILE__ == $0
$cgi = CGI.new
-$header = {}
-$header["type"] = "text/html"
-#$header["type"] = "application/xhtml+xml"
-$header["charset"] = "utf-8"
-$htmlout = <<HEAD
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-HEAD
-
-load "charset.rb"
if File.exists?("config.rb")
load "config.rb"
else
@@ -33,18 +22,13 @@ else
end
require "poll"
+require "html"
+$html = HTML.new("dudle")
+load "charset.rb"
+$html.add_css("dudle.css")
+$htlm.add_atom("atom.cgi") if File.exists?("atom.cgi")
-$htmlout += <<HEAD
-<head>
- <title>dudle</title>
- <meta http-equiv="Content-Type" content="#{$header["type"]}; charset=#{$header["charset"]}" />
- <meta http-equiv="Content-Style-Type" content="text/css" />
- <link rel="stylesheet" type="text/css" href="dudle.css" title="default"/>
-HEAD
-
- $htmlout += '<link rel="alternate" type="application/atom+xml" href="atom.cgi" />' if File.exists?("atom.cgi")
-
- $htmlout += "</head><body id='main'><h1>dudle</h1>"
+ $html << "<body id='main'><h1>dudle</h1>"
if $cgi.include?("create_poll")
SITE=$cgi["create_poll"]
@@ -70,14 +54,14 @@ if $cgi.include?("create_poll")
Dir.chdir("..")
escapedsite = SITEURL + CGI.escapeHTML(CGI.escape(SITE)) + "/"
escapedsite.gsub!("+"," ")
- $header["status"] = "REDIRECT"
- $header["Location"] = escapedsite
- $htmlout = "The poll was created successfully. The link to your new poll is:<br /><a href=\"#{escapedsite}\">#{escapedsite}</a>"
+ $html.header["status"] = "REDIRECT"
+ $html.header["Location"] = escapedsite
+ $html << "The poll was created successfully. The link to your new poll is:<br /><a href=\"#{escapedsite}\">#{escapedsite}</a>"
end
end
-unless $header["status"] == "REDIRECT"
- $htmlout += <<CHARSET
+unless $html.header["status"] == "REDIRECT"
+ $html << <<CHARSET
<div id='config'>
<fieldset><legend>Config</legend>
#{UTFASCII}
@@ -85,7 +69,7 @@ unless $header["status"] == "REDIRECT"
</div>
CHARSET
- $htmlout += <<CREATE
+ $html << <<CREATE
<fieldset><legend>Create New Poll</legend>
<form method='post' action='.'>
<table>
@@ -112,13 +96,9 @@ CHARSET
</fieldset>
CREATE
- $htmlout += NOTICE
- $htmlout += "</body>"
-
- $htmlout += "</html>"
+ $html << NOTICE
end
-$header["Cache-Control"] = "no-cache"
-$cgi.out($header){$htmlout}
+$html.out($cgi)
end