From 35cc1dd3a2c881943cf5a36b7f53004e413eb841 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed, 18 Jun 2014 12:42:16 +0200
Subject: [PATCH] Add a deleteRoom action handler And adapt the goodbye page to
 allow empty room name

---
 public/vroom.pl | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/public/vroom.pl b/public/vroom.pl
index 063b240..fe43c78 100755
--- a/public/vroom.pl
+++ b/public/vroom.pl
@@ -384,7 +384,7 @@ helper delete_room => sub {
     $ec->delete_group($data->{etherpad_group});
   }
   foreach my $table (qw(participants notifications invitations rooms)){
-    $sth = eval {
+    my $sth = eval {
         $self->db->prepare("DELETE FROM `$table` WHERE `id`=?;");
     } || return undef;
     $sth->execute($data->{id}) || return undef;
@@ -713,14 +713,9 @@ get 'feedback_thanks' => 'feedback_thanks';
 get '/goodby/(:room)' => sub {
   my $self = shift;
   my $room = $self->stash('room');
-  if (!$self->get_room($room)){
-    return $self->render('error',
-      err  => 'ERROR_ROOM_s_DOESNT_EXIST',
-      msg  => sprintf ($self->l("ERROR_ROOM_s_DOESNT_EXIST"), $room),
-      room => $room
-    );
+  if ($self->get_room($room)){
+    $self->remove_participant($room,$self->session('name'));
   }
-  $self->remove_participant($room,$self->session('name'));
   $self->logout($room);
 } => 'goodby';
 
@@ -1317,6 +1312,24 @@ post '/action' => sub {
       }
     );
   }
+  # delete the room
+  elsif ($action eq 'deleteRoom'){
+    my $status = 'error';
+    my $msg    = $self->l('ERROR_OCCURRED');
+    if ($self->session($room)->{role} ne 'owner'){
+      $msg = $self->l('NOT_ALLOWED');
+    }
+    elsif ($self->delete_room($room)){
+      $msg = $self->l('ROOM_DELETED');
+      $status = 'success';
+    }
+    return $self->render(
+      json => {
+        msg    => $msg,
+        status => $status
+      }
+    );
+  }
 };
 
 # use the templates defined in the config