From 6766ed6aef575a2debb4d1d17db4c5adfb258f84 Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Sun, 16 Feb 2014 19:17:02 +0100
Subject: [PATCH] Bugfix for https connections

---
 lutim.conf.template               |  3 ++-
 templates/index.html.ep           | 13 +++++++------
 templates/layouts/default.html.ep | 11 ++++++-----
 templates/twitter.html.ep         |  5 +++--
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lutim.conf.template b/lutim.conf.template
index 7ba98b4..f430b0e 100644
--- a/lutim.conf.template
+++ b/lutim.conf.template
@@ -13,5 +13,6 @@
     provisionning  => 100, # optional
     hosted_by      => 'My super hoster <img src="http://hoster.example.com" alt="Hoster logo">', # optional
     tweet_card_via => '@framasky', # optional
-    max_file_size  =>  10485760  # optional, size in octets, you can write it 10*1024*1024
+    max_file_size  =>  10485760,  # optional, size in octets, you can write it 10*1024*1024
+    https          => 1, # optional, set to 1 if you use Lutim behind a secure web server
 };
diff --git a/templates/index.html.ep b/templates/index.html.ep
index 80eff59..1c12e1a 100644
--- a/templates/index.html.ep
+++ b/templates/index.html.ep
@@ -1,13 +1,14 @@
 % # vim:set sw=4 ts=4 sts=4 ft=html.epl expandtab:
+% my $scheme = (defined(config('https')) && config('https')) ? 'https' : 'http';
 <div class="messages">
 % if (defined(flash('short'))) {
     <div class="alert alert-success">
         <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
         <strong><%= flash('filename') %></strong>
         <ul>
-            <li><%=l 'view-link'%> <%= link_to url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs.'/'.flash('short') => begin %><%= url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs.'/'.flash('short') %><%= end %></li>
-            <li><%=l 'download-link' %> <%= link_to url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs.'/'.flash('short').'?dl' => begin %><%= url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs.'/'.flash('short').'?dl' %><%= end %></li>
-            <li><%=l 'twitter-link' %> <%= link_to url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs.'/'.flash('short').'?t' => begin %><%= url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs.'/'.flash('short').'?t' %><%= end %></li>
+            <li><%=l 'view-link'%> <%= link_to url_for('/')->base->scheme($scheme)->to_abs.'/'.flash('short') => begin %><%= url_for('/')->base->scheme($scheme)->to_abs.'/'.flash('short') %><%= end %></li>
+            <li><%=l 'download-link' %> <%= link_to url_for('/')->base->scheme($scheme)->to_abs.'/'.flash('short').'?dl' => begin %><%= url_for('/')->base->scheme($scheme)->to_abs.'/'.flash('short').'?dl' %><%= end %></li>
+            <li><%=l 'twitter-link' %> <%= link_to url_for('/')->base->scheme($scheme)->to_abs.'/'.flash('short').'?t' => begin %><%= url_for('/')->base->scheme($scheme)->to_abs.'/'.flash('short').'?t' %><%= end %></li>
         </ul>
     </div>
 % }
@@ -21,7 +22,7 @@
 </div>
 
 <noscript>
-    <form class="form" role="form" method="POST" action="<%== url_for('add')->base->scheme($self->req->url->base->scheme()) %>/" enctype="multipart/form-data">
+    <form class="form" role="form" method="POST" action="<%== url_for('add')->base->scheme($scheme) %>/" enctype="multipart/form-data">
     <div class="form-group form-inline">
         <span>
             <label>
@@ -87,7 +88,7 @@
         if (dl !== '') {
             url = url+'?'+dl;
         }
-        return '<a href="<%== url_for('index')->base->scheme($self->req->url->base->scheme())->to_abs() %>/'+url+'"><%== url_for('index')->base->scheme($self->req->url->base->scheme())->to_abs() %>/'+url+'</a>';
+        return '<a href="<%== url_for('index')->base->scheme($scheme)->to_abs() %>/'+url+'"><%== url_for('index')->base->scheme($scheme)->to_abs() %>/'+url+'</a>';
     }
     function message(success, msg) {
         if(success) {
@@ -110,7 +111,7 @@
     }
     function bindddz(firstview, deleteday) {
         $('#drag-and-drop-zone').dmUploader({
-            url: '<%== url_for('add')->base->scheme($self->req->url->base->scheme()) %>/',
+            url: '<%== url_for('add')->base->scheme($scheme) %>/',
             dataType: 'json',
             allowedTypes: 'image/*',
             maxFileSize: <%= $max_file_size %>,
diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep
index b173842..86a0993 100644
--- a/templates/layouts/default.html.ep
+++ b/templates/layouts/default.html.ep
@@ -1,7 +1,8 @@
 % # vim:set sw=4 ts=4 sts=4 ft=html.epl expandtab:
 % use Mojo::Util qw(url_escape);
 % my $twitter_url = 'https://twitter.com/share';
-% my $url    = url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs().'/';
+% my $scheme = (defined(config('https')) && config('https')) ? 'https' : 'http';
+% my $url    = url_for('/')->base->scheme($scheme)->to_abs().'/';
 % $twitter_url .= '?url='.url_escape("$url")
 %              .'&via=framasky'
 %              .'&text=Check out this %23LUTIm instance! ';
@@ -11,7 +12,7 @@
         <title>LUTIm</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta charset="utf-8" />
-        <link rel="icon" type="image/png" href="<%= url_for('/')->base->scheme($self->req->url->base->scheme()) %>/img/favicon.png">
+        <link rel="icon" type="image/png" href="<%= url_for('/')->base->scheme($scheme) %>/img/favicon.png">
         %= stylesheet 'css/bootstrap.min.css', media => 'screen'
         %= stylesheet 'css/fontello.css'
         %= stylesheet 'css/uploader.css'
@@ -45,7 +46,7 @@
 % }
                 <div>
                     <div class="pull-left hidden-xs">
-                        <img src="<%= url_for('/')->base->scheme($self->req->url->base->scheme()) %>/img/LUTIm_small.png">
+                        <img src="<%= url_for('/')->base->scheme($scheme) %>/img/LUTIm_small.png">
                     </div>
                     <h1>Let's Upload That Image!</h1>
                     <p>
@@ -68,7 +69,7 @@
                             <h3 class="modal-title">LUTIm</h3>
                         </div>
                         <div class="modal-body">
-                            <%==l 'informations-body', url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs().'/', config('contact') %>
+                            <%==l 'informations-body', url_for('/')->base->scheme($scheme)->to_abs().'/', config('contact') %>
                         </div>
                         <div class="modal-footer">
                             <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
@@ -81,7 +82,7 @@
                     <h3 class="modal-title">LUTIm</h3>
                 </div>
                 <div class="modal-body">
-                    <%==l 'informations-body', url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs().'/', config('contact') %>
+                    <%==l 'informations-body', url_for('/')->base->scheme($scheme)->to_abs().'/', config('contact') %>
                 </div>
             </noscript>
         </div>
diff --git a/templates/twitter.html.ep b/templates/twitter.html.ep
index f6fb981..c8c5340 100644
--- a/templates/twitter.html.ep
+++ b/templates/twitter.html.ep
@@ -1,16 +1,17 @@
 % # vim:set sw=4 ts=4 sts=4 ft=html.epl expandtab:
+% my $scheme = (defined(config('https')) && config('https')) ? 'https' : 'http';
 <!DOCTYPE html>
 <html>
     <head>
         <title>LUTIm</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta charset="utf-8" />
-        <link rel="icon" type="image/png" href="<%= url_for('/')->base->scheme($self->req->url->base->scheme()) %>/img/favicon.png">
+        <link rel="icon" type="image/png" href="<%= url_for('/')->base->scheme($scheme) %>/img/favicon.png">
         <meta name="twitter:card" content="photo">
 % if (defined(config('tweet_card_via'))) {
         <meta name="twitter:site" content="<%= config('tweet_card_via') %>">
 % }
-        <meta name="twitter:image:src" content="<%= url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs().'/'.$short %>">
+        <meta name="twitter:image:src" content="<%= url_for('/')->base->scheme($scheme)->to_abs().'/'.$short %>">
     </head>
     <body>
         <img src="<%= url_for('/').$short %>" alt="<%= $filename %>">