dani
/
vroom
mirror of https://github.com/dani/vroom.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Fix JSON bool comparison"

Browse Source 
This reverts commit f08a17495c.
master
Daniel Berteaud 8 years ago
parent c39bdc8fd2
commit 4bda07f8d8
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      vroom

10
vroom
Unescape View File

@ -1356,9 +1356,9 @@ websocket '/socket.io/:ver/websocket/:id' => sub {
next if $peer eq $id; next if $peer eq $id;
next if !$peers->{$peer}->{room}; next if !$peers->{$peer}->{room};
next if $peers->{$peer}->{room} ne $room; next if $peers->{$peer}->{room} ne $room;
$others->{$peer}->{screen} = ($peers->{$peer}->{details}->{screen} eq "\1") ? \1 : \0; $others->{$peer}->{screen} = ($peers->{$peer}->{details}->{screen} eq Mojo::JSON::true) ? \1 : \0;
$others->{$peer}->{video} = ($peers->{$peer}->{details}->{video} eq "\1") ? \1 : \0; $others->{$peer}->{video} = ($peers->{$peer}->{details}->{video} eq Mojo::JSON::true) ? \1 : \0;
$others->{$peer}->{audio} = ($peers->{$peer}->{details}->{audio} eq "\1") ? \1 : \0; $others->{$peer}->{audio} = ($peers->{$peer}->{details}->{audio} eq Mojo::JSON::true) ? \1 : \0;
} }
$peer->{details} = { $peer->{details} = {
screen => \0, screen => \0,
@ -1966,10 +1966,10 @@ any '/api' => sub {
# Room persistence can only be set by admins # Room persistence can only be set by admins
if ($req->{param}->{persistent} ne '' && if ($req->{param}->{persistent} ne '' &&
$self->key_can_do_this({token => $token, action => 'set_persistent'})){ $self->key_can_do_this({token => $token, action => 'set_persistent'})){
$room->{persistent} = ($req->{param}->{persistent} eq "\1") ? '1' : '0'; $room->{persistent} = ($req->{param}->{persistent} eq Mojo::JSON::true) ? '1' : '0';
} }
foreach my $pass (qw/join_password owner_password/){ foreach my $pass (qw/join_password owner_password/){
if ($req->{param}->{$pass} eq "\0"){ if ($req->{param}->{$pass} eq Mojo::JSON::false){
$room->{$pass} = undef; $room->{$pass} = undef;
} }
elsif ($req->{param}->{$pass} ne ''){ elsif ($req->{param}->{$pass} ne ''){

Write Preview
Loading…
Cancel
Save