From 63bccc1cb8f28dce69bd840ac590bde545a293fe Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 17 Mar 2015 22:34:30 +0100
Subject: [PATCH] Replace URI with Mojo::URL Plus some cleanups in URI handling

---
 templates/default/documentation.html.ep | 6 +++---
 templates/default/invite.mail.ep        | 3 +--
 templates/default/join.html.ep          | 2 +-
 templates/default/notification.mail.ep  | 3 +--
 vroom.pl                                | 1 -
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/templates/default/documentation.html.ep b/templates/default/documentation.html.ep
index 6a0d913..eb47a3f 100644
--- a/templates/default/documentation.html.ep
+++ b/templates/default/documentation.html.ep
@@ -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">
diff --git a/templates/default/invite.mail.ep b/templates/default/invite.mail.ep
index cc09c25..a304ad3 100644
--- a/templates/default/invite.mail.ep
+++ b/templates/default/invite.mail.ep
@@ -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' %>
diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep
index fc7d19e..edcb057 100644
--- a/templates/default/join.html.ep
+++ b/templates/default/join.html.ep
@@ -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/' %>",
diff --git a/templates/default/notification.mail.ep b/templates/default/notification.mail.ep
index 9e92f62..4bbd39c 100644
--- a/templates/default/notification.mail.ep
+++ b/templates/default/notification.mail.ep
@@ -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' %>
diff --git a/vroom.pl b/vroom.pl
index 301eb45..fd1da10 100755
--- a/vroom.pl
+++ b/vroom.pl
@@ -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;