whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sebastian Bazley <s...@apache.org>
Subject [whimsy.git] [1/1] Commit fefbfc2: Spilt into HTML and backend
Date Sun, 03 Apr 2016 12:22:07 GMT
Commit fefbfc2737963970b07e274a71e3cacd9e8c9d93:
    Spilt into HTML and backend
    Props to Sam


Branch: refs/heads/master
Author: Sebb <sebb@apache.org>
Committer: Sebb <sebb@apache.org>
Pusher: sebb <sebb@apache.org>

------------------------------------------------------------
tools/mirror_check.rb                                        | + -------------
www/members/mirror_check.cgi                                 | ++++++++++++ 
------------------------------------------------------------
100 changes: 48 additions, 52 deletions.
------------------------------------------------------------


diff --git a/tools/mirror_check.rb b/tools/mirror_check.rb
index 5fd443b..a4ff939 100755
--- a/tools/mirror_check.rb
+++ b/tools/mirror_check.rb
@@ -10,6 +10,8 @@
 
 Ideally the causes of some of the problems should be reported ...
 
+Note: the GUI interface is currently at www/members/mirror_check.cgi
+
 =end
 
 require 'wunderbar'
@@ -275,8 +277,7 @@ def display
   _h4_ 'F: fatal, E: Error, W: warning, I: info (success)'
 end
 
-# Are we really running under a shell?
-if __FILE__ == $0 and ENV['SHELL'] and ! ENV['REQUEST_METHOD']
+if __FILE__ == $0
   init
   url = ARGV[0] || DEFAULT
   url += '/' unless url.end_with? '/'
@@ -288,54 +289,4 @@ def display
   else
     puts "#{url} passed all the tests"
   end
-  exit # important; don't continue with the script
-end
-
-############################################################# Web Page ########################################################
-
-print "Status: 200 OK\r\n"
-
-_html do
-  _style %{
-    textarea, .mod, label {display: block}
-    input[type=submit] {display: block; margin-top: 1em}
-    input[name=podling], p, .mod, textarea {margin-left: 2em}
-    .subdomain, .domain {color: #000}
-    legend {background: #141; color: #DFD; padding: 0.4em}
-#    .name {width: 6em}
-    ._stdin {color: #C000C0; margin-top: 1em}
-    ._stdout {color: #000}
-    .error, ._stderr {color: #F00}
-    .request {background-color: #BDF}
-  }
-
-  _body? do
-    _h2 "Mirror Checker"
-    _p do
-      _ 'This page can be used to check that an Apache software mirror has been set up correctly'
-    end
-    _p do
-      _ 'Please see the'
-      _a 'Apache how-to mirror page', href: 'http://www.apache.org/info/how-to-mirror.html'
-      _ 'for details on setting up an ASF mirror.'
-    end
-
-    _form method: 'post' do
-      _fieldset do
-        _legend 'ASF Mirror Check Request'
-        _h3_ 'Mirror URL'
-        _input.name name: 'url', required: true, pattern: URLPAT,
-                    placeholder: 'mirror URL',
-                    size: 30, 
-                    value: DEFAULT
-        _input type: 'submit', value: 'Check Mirror'
-      end
-    end
-
-    if _.post?
-      init
-      checkHTTP(@url)
-      display
-    end
-  end
 end
diff --git a/www/members/mirror_check.cgi b/www/members/mirror_check.cgi
index b885c17..64e6f85 100755
--- a/www/members/mirror_check.cgi
+++ b/www/members/mirror_check.cgi
@@ -1,3 +1,48 @@
 #!/usr/bin/env ruby
 
 require "../../tools/mirror_check.rb"
+
+_html do
+  _style %{
+    textarea, .mod, label {display: block}
+    input[type=submit] {display: block; margin-top: 1em}
+    input[name=podling], p, .mod, textarea {margin-left: 2em}
+    .subdomain, .domain {color: #000}
+    legend {background: #141; color: #DFD; padding: 0.4em}
+#    .name {width: 6em}
+    ._stdin {color: #C000C0; margin-top: 1em}
+    ._stdout {color: #000}
+    .error, ._stderr {color: #F00}
+    .request {background-color: #BDF}
+  }
+
+  _body? do
+    _h2 "Mirror Checker"
+    _p do
+      _ 'This page can be used to check that an Apache software mirror has been set up correctly'
+    end
+    _p do
+      _ 'Please see the'
+      _a 'Apache how-to mirror page', href: 'http://www.apache.org/info/how-to-mirror.html'
+      _ 'for the full details on setting up an ASF mirror.'
+    end
+
+    _form method: 'post' do
+      _fieldset do
+        _legend 'ASF Mirror Check Request'
+        _ 'Mirror URL'
+        _input.name name: 'url', required: true, pattern: URLPAT,
+                    placeholder: 'mirror URL',
+                    size: 30, 
+                    value: DEFAULT
+        _input type: 'submit', value: 'Check Mirror'
+      end
+    end
+
+    if _.post?
+      init
+      checkHTTP(@url)
+      display
+    end
+  end
+end

Mime
View raw message