]> git.treefish.org Git - wirbrennen/flipacoin.git/commitdiff
projects / wirbrennen / flipacoin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b290042)
Creating correct rooturl. dev master
authorAlexander Schmidt <alex@treefish.org>
Mon, 10 Mar 2014 23:18:59 +0000 (00:18 +0100)
committerAlexander Schmidt <alex@treefish.org>
Mon, 10 Mar 2014 23:18:59 +0000 (00:18 +0100)
flipacoin.cgi patch | blob | history
templates/_head.html patch | blob | history
templates/_header.html patch | blob | history
templates/created.html patch | blob | history
templates/usecoin.html patch | blob | history

diff --git a/flipacoin.cgi b/flipacoin.cgi
index 15ac6a46ea8c7c667aef4fcfb8cd4fa79a605401..cba07b1e87a45d519c25b15dd67d56691cc990ca 100755 (executable)
--- a/flipacoin.cgi
+++ b/flipacoin.cgi
@@ -15,11 +15,28 @@ my $flippedcoinsindb=0;
 
 my $template;
 
+sub setprotocolparam {
+    {
+       no warnings 'uninitialized';
+       if( length $ENV{HTTPS} ) {
+           $template->param(PROTOCOL => "https");
+       }
+       else {
+           $template->param(PROTOCOL => "http");
+       }
+    }
+}
+
 sub printpage {
     $template->param(COINLIFETIME => $COINLIFETIME);
     $template->param(FLIPPEDCOINSINDB => $flippedcoinsindb);
     $template->param(COINSINDB => $coinsindb);
-    $template->param(HTTP_HOST => $ENV{HTTP_HOST});
+    
+    my $rootloc = $ENV{SCRIPT_FILENAME};
+    $rootloc =~ s/$ENV{DOCUMENT_ROOT}//g;
+    $rootloc =~ s/\/[^\/]*$//g;
+    $template->param( ROOTURL => $ENV{HTTP_HOST} . $rootloc );
+
     print "Content-type: text/html\n\n", $template->output;
 }
 
@@ -86,6 +103,7 @@ elsif ( length($requestedcoinid) == 0 && $requestedaction eq "create" ) {
 
     $template = HTML::Template->new(filename => 'created.html');
     $template->param(NEWCOINID => $newcoinid);
+    setprotocolparam();
 }
 elsif ( length($requestedcoinid) > 0 ) {
     if ( ! exists $coins_db{$requestedcoinid} ) {
@@ -99,6 +117,7 @@ elsif ( length($requestedcoinid) > 0 ) {
 
     $template->param(REQUESTEDCOINID => $requestedcoinid);
     $template->param(COINCREATIONTIME => localtime($coininfo[0])."");
+    setprotocolparam();
 
     if ( $coininfosize == 1 && $requestedaction eq "" ) {
        $template->param(STATUS_NOTYETFLIPPED => 1);
diff --git a/templates/_head.html b/templates/_head.html
index 9e423cdbbd8d205f49d15fc8216ec55c840fc5d7..d6663039102fdf58d3166175279e9c201fbddf86 100644 (file)
--- a/templates/_head.html
+++ b/templates/_head.html
@@ -1,3 +1,3 @@
 <head>
-  <title><!-- TMPL_VAR NAME=HTTP_HOST --></title>
+  <title><!-- TMPL_VAR NAME=ROOTURL --></title>
 </head>
diff --git a/templates/_header.html b/templates/_header.html
index f3fa6acc164c4c07d1074f51072850e997f682b3..0f7e46013873f3ef37f77584e83e928c2f2256b5 100644 (file)
--- a/templates/_header.html
+++ b/templates/_header.html
@@ -9,4 +9,4 @@
     patchme@flipacoin.org</a>.
 </font>
 <hr>
-<h3><a href=/><font color=black><!-- TMPL_VAR NAME=HTTP_HOST --></font></a> - The Internet's first two-party coinflipping service.</h3>
+<h3><a href=/><font color=black><!-- TMPL_VAR NAME=ROOTURL --></font></a> - The Internet's first two-party coinflipping service.</h3>
diff --git a/templates/created.html b/templates/created.html
index a62533034195d852e12aedada8e36bc01171fd52..f755a87801a9def60d6a3a11d2c5986b57aba1cc 100644 (file)
--- a/templates/created.html
+++ b/templates/created.html
@@ -7,7 +7,7 @@
 
     <a href=/<!-- TMPL_VAR NAME=NEWCOINID -->>
       <font style="BACKGROUND-COLOR: yellow" color=blue>
-       <b>http://<!-- TMPL_VAR NAME=HTTP_HOST -->/<!-- TMPL_VAR NAME=NEWCOINID --></b></font></a>
+       <b><!-- TMPL_VAR NAME=PROTOCOL -->://<!-- TMPL_VAR NAME=ROOTURL -->/<!-- TMPL_VAR NAME=NEWCOINID --></b></font></a>
     
     for you.<br><br>
     Send the coin to the other party and tell them to flip it to make a decision.
diff --git a/templates/usecoin.html b/templates/usecoin.html
index 3f3202e5eb5f22cc4272a5f004b9c98879593426..469154256d9efda3fa1495fa49d7138f436fcfdc 100644 (file)
--- a/templates/usecoin.html
+++ b/templates/usecoin.html
@@ -5,7 +5,7 @@
 
     <a href=/<!-- TMPL_VAR NAME=REQUESTEDCOINID -->>
       <font style="BACKGROUND-COLOR: yellow" color=blue>
-       <b>http://<!-- TMPL_VAR NAME=HTTP_HOST -->/<!-- TMPL_VAR NAME=REQUESTEDCOINID --></b></font></a>
+       <b><!-- TMPL_VAR NAME=PROTOCOL -->://<!-- TMPL_VAR NAME=ROOTURL -->/<!-- TMPL_VAR NAME=REQUESTEDCOINID --></b></font></a>
     
     <br>
      
The Internet's first coinflipping service.