--- cf.schmorp.de/server/lib/cf.pm 2007/08/26 15:31:02 1.342 +++ cf.schmorp.de/server/lib/cf.pm 2007/08/27 01:13:48 1.343 @@ -2560,11 +2560,9 @@ sub cf::client::ext_msg($$@) { my ($self, $type, @msg) = @_; - my $extcmd = $self->extcmd; - - if ($extcmd == 2) { + if ($self->extcmd == 2) { $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); - } elsif ($extcmd == 1) { # TODO: remove + } elsif ($self->extcmd == 1) { # TODO: remove push @msg, msgtype => "event_$type"; $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); } @@ -2581,7 +2579,7 @@ if ($self->extcmd == 2) { $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); - } elsif ($self->ns->extcmd == 1) { + } elsif ($self->extcmd == 1) { #TODO: version 1, remove unshift @msg, msgtype => "reply", msgid => $id; $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));