From d7079e788037153142f0735032f6a0834c8eb898 Mon Sep 17 00:00:00 2001
From: Ahmad Farhat <ahmad.af.farhat@gmail.com>
Date: Wed, 27 May 2020 14:46:33 -0400
Subject: [PATCH] Fixes for 2.6 (#1677)

---
 app/controllers/admins_controller.rb            |  1 +
 app/views/shared/_footer.html.erb               | 17 +++++++++++++++--
 .../shared/modals/_invite_user_modal.html.erb   |  2 +-
 config/puma.rb                                  |  3 ---
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb
index 63db04b5..577162b8 100644
--- a/app/controllers/admins_controller.rb
+++ b/app/controllers/admins_controller.rb
@@ -67,6 +67,7 @@ class AdminsController < ApplicationController
     @order_direction = params[:direction] && params[:direction] != "none" ? params[:direction] : "DESC"
 
     meetings = all_running_meetings[:meetings]
+    @order_column = "created_at" if meetings.empty?
     @running_room_bbb_ids = meetings.pluck(:meetingID)
 
     @participants_count = {}
diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
index 6a06287d..b200f3e1 100755
--- a/app/views/shared/_footer.html.erb
+++ b/app/views/shared/_footer.html.erb
@@ -14,8 +14,21 @@
 %>
 
 <footer class="footer pt-3">
-  <p class="text-center mb-1"><%= t("footer.powered_by", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank", rel: "noopener")).html_safe %> <%= Greenlight::Application::VERSION %>
-  <%= link_to( ' | ' + t("footer.legal"), legal_url ) if legal_url.present? %><%= link_to( ' | ' + t("footer.privpolicy"), privpolicy_url) if privpolicy_url.present? %></p>
+  <p class="text-center mb-1">
+    <%= t("footer.powered_by", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank", rel: "noopener")).html_safe %> <%= Greenlight::Application::VERSION %>
+    <% if legal_url.present? %>
+      <span>
+        |
+        <%= link_to(t("footer.legal"), legal_url) %>
+      </span> 
+    <% end %>
+    <% if privpolicy_url.present? %>
+      <span>
+        |
+        <%= link_to(t("footer.privpolicy"), privpolicy_url)  %>
+      </span>
+    <% end %>
+  </p>
 </footer>
 
 <%= render "shared/components/cookie_warning" %>
diff --git a/app/views/shared/modals/_invite_user_modal.html.erb b/app/views/shared/modals/_invite_user_modal.html.erb
index 1ffa665d..b7680877 100644
--- a/app/views/shared/modals/_invite_user_modal.html.erb
+++ b/app/views/shared/modals/_invite_user_modal.html.erb
@@ -27,7 +27,7 @@
               <span class="input-icon-addon">
                 <i class="fas fa-envelope"></i>
               </span>
-              <%= f.email_field :email, class: "form-control", value: "", placeholder: t("modal.invite_user.email_placeholder"), autocomplete: :off %>
+              <%= f.text_field :email, class: "form-control", value: "", placeholder: t("modal.invite_user.email_placeholder"), autocomplete: :off %>
               <div class="invalid-feedback text-left"><%= t("modal.invite_user.not_blank") %></div>
             </div>
           <div class="mt-4">
diff --git a/config/puma.rb b/config/puma.rb
index a1a9ed3f..fda772af 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -17,9 +17,6 @@ port        ENV.fetch("PORT") { 80 }
 #
 environment ENV.fetch("RAILS_ENV") { "development" }
 
-# Specifies the `pidfile` that Puma will use.
-pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
-
 # Specifies the number of `workers` to boot in clustered mode.
 # Workers are forked webserver processes. If using threads and workers together
 # the concurrency of the application would be max `threads` * `workers`.