From c1d8584e633b5a5a0d246e0b1f7e2f97c736e717 Mon Sep 17 00:00:00 2001 From: Benjamin Kellermann Date: Sun, 29 Mar 2009 20:13:16 +0200 Subject: charset in own file --- charset.rb | 38 ++++++++++++++++++++++++++++++++++++++ index.cgi | 37 +++---------------------------------- 2 files changed, 41 insertions(+), 34 deletions(-) create mode 100644 charset.rb diff --git a/charset.rb b/charset.rb new file mode 100644 index 0000000..be6509c --- /dev/null +++ b/charset.rb @@ -0,0 +1,38 @@ +################################ +# Author: Benjamin Kellermann # +# Licence: CC-by-sa 3.0 # +# see Licence # +################################ + +$utfcookie = CGI::Cookie.new("utf", "true") +$utfcookie.path = "/" +if ($cgi.include?("utf") || $cgi.cookies["utf"][0]) && !$cgi.include?("ascii") + $utfcookie.expires = Time.now+1*60*60*24*365 + UTFASCII = "ASCII" + BACK = CGI.escapeHTML("↩") + + YES = CGI.escapeHTML('✔') + NO = CGI.escapeHTML('✘') + MAYBE = CGI.escapeHTML('?') + UNKNOWN = CGI.escapeHTML("–") + + YEARBACK = CGI.escapeHTML("↞") + MONTHBACK = CGI.escapeHTML("←") + MONTHFORWARD = CGI.escapeHTML("→") + YEARFORWARD = CGI.escapeHTML("↠") +else + $utfcookie.expires = Time.now-1*60*60*24*36 + UTFASCII = "#{CGI.escapeHTML('↩✔✘?–↞←→↠')}" + BACK = CGI.escapeHTML("<-") + + YES = CGI.escapeHTML('OK') + NO = CGI.escapeHTML('NO') + MAYBE = CGI.escapeHTML('?') + UNKNOWN = CGI.escapeHTML("-") + + YEARBACK = CGI.escapeHTML("<<") + MONTHBACK = CGI.escapeHTML("<") + MONTHFORWARD = CGI.escapeHTML(">") + YEARFORWARD = CGI.escapeHTML(">>") +end + diff --git a/index.cgi b/index.cgi index 04dcd57..bef752d 100755 --- a/index.cgi +++ b/index.cgi @@ -14,39 +14,6 @@ if __FILE__ == $0 $cgi = CGI.new - -utfcookie = CGI::Cookie.new("utf", "true") -utfcookie.path = "/" -if ($cgi.include?("utf") || $cgi.cookies["utf"][0]) && !$cgi.include?("ascii") - utfcookie.expires = Time.now+1*60*60*24*365 - UTFASCII = "ASCII" - BACK = CGI.escapeHTML("↩") - - YES = CGI.escapeHTML('✔') - NO = CGI.escapeHTML('✘') - MAYBE = CGI.escapeHTML('?') - UNKNOWN = CGI.escapeHTML("–") - - YEARBACK = CGI.escapeHTML("↞") - MONTHBACK = CGI.escapeHTML("←") - MONTHFORWARD = CGI.escapeHTML("→") - YEARFORWARD = CGI.escapeHTML("↠") -else - utfcookie.expires = Time.now-1*60*60*24*36 - UTFASCII = "#{CGI.escapeHTML('↩✔✘?–↞←→↠')}" - BACK = CGI.escapeHTML("<-") - - YES = CGI.escapeHTML('OK') - NO = CGI.escapeHTML('NO') - MAYBE = CGI.escapeHTML('?') - UNKNOWN = CGI.escapeHTML("-") - - YEARBACK = CGI.escapeHTML("<<") - MONTHBACK = CGI.escapeHTML("<") - MONTHFORWARD = CGI.escapeHTML(">") - YEARFORWARD = CGI.escapeHTML(">>") -end - TYPE = "text/html" #TYPE = "application/xhtml+xml" CHARSET = "utf-8" @@ -60,15 +27,17 @@ HEAD if File.exist?("data.yaml") olddir = File.expand_path(".") Dir.chdir("..") + load "charset.rb" load "config.rb" Dir.chdir(olddir) load "../participate.rb" else + load "charset.rb" load "config.rb" load "overview.rb" end -$cgi.out("type" => TYPE ,"charset" => CHARSET,"cookie" => utfcookie, "Cache-Control" => "no-cache"){$htmlout} +$cgi.out("type" => TYPE ,"charset" => CHARSET,"cookie" => $utfcookie, "Cache-Control" => "no-cache"){$htmlout} end -- cgit v1.2.3