Replace URI with Mojo::URL

Plus some cleanups in URI handling
master
Daniel Berteaud 10 years ago
parent d38be16526
commit 63bccc1cb8
  1. 6
      templates/default/documentation.html.ep
  2. 3
      templates/default/invite.mail.ep
  3. 2
      templates/default/join.html.ep
  4. 3
      templates/default/notification.mail.ep
  5. 1
      vroom.pl

@ -103,7 +103,6 @@
<li>Session::Token</li>
<li>Config::Simple</li>
<li>Email::Valid</li>
<li>URI</li>
<li>Protocol::SocketIO::Handshake</li>
<li>Protocol::SocketIO::Message</li>
<li>Data::Dumper</li>
@ -169,8 +168,9 @@ yum install epel-release</pre>
yum install git tar wget httpd mod_ssl openssl mariadb-server \\
'perl(Mojolicious)' 'perl(Mojolicious::Plugin::I18N)' 'perl(Mojolicious::Plugin::Mail)' \\
'perl(Crypt::SaltedHash)' 'perl(Etherpad::API)' 'perl(LWP::Protocol::https)' \\
'perl(Sesion::Token)' 'perl(Mojolicious::Plugin::Database)' 'perl(Email::Valid)' \\
'perl(Config::Simple)' 'perl(Session::Token)' 'perl(URI)'</pre>
'perl(Sesion::Token)' 'perl(Mojolicious::Plugin::Database)' \\
'perl(Mojolicious::Plugin::StaticCompressor' 'perl(Email::Valid)' \\
'perl(Config::Simple)' 'perl(Session::Token)'</pre>
</p>
<h3 id="c7_clone_git">

@ -1,7 +1,6 @@
<%
my $url = $self->url_for('/')->to_abs;
my $url = Mojo::URL->new($self->url_for('/')->to_abs)->scheme('https');
$url .= ($url =~ m/\/$/) ? '' : '/';
$url =~ s/^http:/https:/;
%>
<p>
<%=l 'YOU_ARE_INVITED_TO_A_MEETING' %>

@ -360,7 +360,7 @@
etherpad = {
enabled: <%= $etherpad %>,
<%
my $ethuri = URI->new($config->{'etherpad.uri'});
my $ethuri = Mojo::URL->new($config->{'etherpad.uri'});
%>
host: "<%= $ethuri->scheme . '://' . $ethuri->authority %>",
path: "<%= $ethuri->path . '/p/' %>",

@ -1,7 +1,6 @@
<%
my $url = $self->url_for('/')->to_abs;
my $url = Mojo::URL->new($self->url_for('/')->to_abs)->scheme('https');
$url .= ($url =~ m/\/$/) ? '' : '/';
$url =~ s/^http:/https:/;
%>
<p>
<%=l 'SOMEONE_JOINED_A_ROOM' %>

@ -20,7 +20,6 @@ use Etherpad::API;
use Session::Token;
use Config::Simple;
use Email::Valid;
use URI;
use Protocol::SocketIO::Handshake;
use Protocol::SocketIO::Message;
use Data::Dumper;

Loading…
Cancel
Save