Changeset 87 for trunk/op_server.pl
- Timestamp:
- 09/08/08 13:55:57 (4 months ago)
- Files:
-
- trunk/op_server.pl (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/op_server.pl
r86 r87 2533 2533 if ( uc($key) eq "$server^$canalsinlocal" ) { 2534 2534 my $canalfin = $val; 2535 $canalfin =~ s/ \d+\^(.*)/$1/g;2535 $canalfin =~ s/-?\d+\^(.*)/$1/g; 2536 2536 push @multicanal, $canalfin; 2537 2537 } … … 3070 3070 3071 3071 my $ext_transf = $extension_transfer{"$server^$canal"}; 3072 $ext_transf =~ s/ \d+\^(.*)/$1/g;3072 $ext_transf =~ s/-?\d+\^(.*)/$1/g; 3073 3073 my @part_ext = split( /\@/, $ext_transf ); 3074 3074 … … 5448 5448 5449 5449 if ( defined( $extension_transfer_reverse{"$server^$local_channel"} ) ) { 5450 if ( $extension_transfer_reverse{"$server^$local_channel"} !~ / \d+\^CLID/ ) {5450 if ( $extension_transfer_reverse{"$server^$local_channel"} !~ /-?\d+\^CLID/ ) { 5451 5451 5452 5452 # We dont want to return CLID buttons … … 6620 6620 PeerPort => $port, 6621 6621 Proto => "tcp", 6622 Timeout => '2', 6622 6623 Type => SOCK_STREAM 6623 6624 ); … … 7412 7413 7413 7414 my $local_channel_for_clid_buttons = $extension_transfer{"$origin_server^$origin_channel$contexto"}; 7414 $local_channel_for_clid_buttons =~ s/ \d+\^(.*)/$1/g;7415 $local_channel_for_clid_buttons =~ s/-?\d+\^(.*)/$1/g; 7415 7416 $origin_channel = "Local/" . $local_channel_for_clid_buttons; 7416 7417 … … 7666 7667 if ( $contexto ne "" ) { $keyext .= "\&$contexto"; } 7667 7668 my $vclid = $extension_transfer{$keyext}; 7668 $vclid =~ s/ \d+\^(.*)/$1/g;7669 $vclid =~ s/-?\d+\^(.*)/$1/g; 7669 7670 $vclid =~ s/^Local\///g; 7670 7671 $vclid =~ s/(.*)\@(.*)/$1/g; … … 8135 8136 8136 8137 my $dclid = $extension_transfer{$keyext}; 8137 $dclid =~ s/ \d+\^(.*)/$1/g;8138 $dclid =~ s/-?\d+\^(.*)/$1/g; 8138 8139 $dclid =~ s/^Local\///g; 8139 8140 $dclid =~ s/(.*)\@(.*)/$1/g; … … 8304 8305 8305 8306 log_debug( "$heading canal_destino = $canal_destino", 32 ) if DEBUG; 8306 $canal_destino =~ s/ \d+\^(.*)/$1/g;8307 $canal_destino =~ s/-?\d+\^(.*)/$1/g; 8307 8308 $canal_destino =~ s/^-//g; 8308 8309 log_debug( "$heading La extension para $param es $canal_destino", 32 ) if DEBUG; … … 8405 8406 # If queue_hide is set, hide queue positions 8406 8407 for my $key ( keys %buttons ) { 8407 if ( $key =~ m/ \d+\^QUEUE\/[^=]*=\d/i ) {8408 if ( $key =~ m/-?\d+\^QUEUE\/[^=]*=\d/i ) { 8408 8409 $interno = $buttons{$key}; 8409 8410 send_status_to_flash( $socket, "$interno|setalpha|00", 0 ); … … 9050 9051 if ( $canal =~ m/^CLID/ ) { 9051 9052 my $extr = $extension_transfer{"$server^$canal"}; 9052 $extr =~ s/ \d+\^(.*)/$1/g;9053 $extr =~ s/-?\d+\^(.*)/$1/g; 9053 9054 $canal = "Local/$extr"; 9054 9055 }
