adam/lutim
1
0
Fork 0
mirror of https://framagit.org/fiat-tux/hat-softwares/lutim.git synced 2026-06-28 22:11:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix for https connections

Browse Source
This commit is contained in:
Luc Didry
2014-02-16 19:17:02 +01:00
parent dbd68796e8
commit 6766ed6aef
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lutim.conf.template
+2 -1
View File
@@ -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
};
templates/index.html.ep
+7 -6
View File
@@ -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 %>,
templates/layouts/default.html.ep
+6 -5
View File
@@ -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>
templates/twitter.html.ep
+3 -2
View File
@@ -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 %>">