Changeset 5779

Timestamp:

06/17/08 13:18:37 (4 months ago)

Author:

asternic

Message:

#2782: FOP update to make flash player 9.0.124.0 and newer happy

Files:

• freepbx/trunk/amp_conf/htdocs_panel/op_server.cfg (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs_panel/op_server.pl (modified) (212 diffs)
• freepbx/trunk/amp_conf/htdocs_panel/operator_panel.swf (modified) (previous)

freepbx/trunk/amp_conf/htdocs_panel/op_server.cfg

@@ -8 +8 @@
-
-[general]
+use_amportal_conf=1
-; host or ip address of asterisk
-manager_host=127.0.0.1      

freepbx/trunk/amp_conf/htdocs_panel/op_server.pl

@@ -1 @@
- -w
+
-
-#  Flash Operator Panel.    http://www.asternic.org
@@ -22 +22 @@
-
-use strict;
+use warnings;
-use integer;
-
-1
+0
-use constant BYTES_TO_READ => 256;
-
@@ -34 +35 @@
-use POSIX qw(setsid EWOULDBLOCK);
-
-0.27
+SVNVERSION
-my %datos          = ();
+my %chanvar        = ();
+my %monitoring     = ();
+my %passvar        = ();
-my %sesbot         = ();
-my %linkbot        = ();
@@ -143 +147 @@
-my %mailbox;
-my %tovoicemail;
+my %tospy;
-my %instancias;
-my %agent_to_channel;
@@ -167 +172 @@
-my $web_hostname;
-my $listen_port;
+my $park_exten;
+my $parktimeout;
-my $listen_addr;
-my $security_code;
@@ -188 +195 @@
-my $queue_hide;
-my $enable_restart;
+my $passvars = "";
-my $change_led;
-my $cdial_nosecure;
@@ -213 +221 @@
-my %total_legends;
-my %total_images;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-my $PADDING = join(
@@ -393 +402 @@
-}
-
-($)
-$_[0]
+
+shift
-    my %ampconf;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    close(AMPCONF);
@@ -412 +420 @@
-sub read_server_config() {
-    my $context = "";
+    my @distinct_files;
-    $counter_servers = -1;
-
-    $/ = "\n";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    $web_hostname     = $config->{GENERAL}{web_hostname};
@@ -513 +530 @@
-    $enable_restart   = $config->{GENERAL}{enable_restart};
-    $defaultlanguage  = $config->{GENERAL}{language};
+    $passvars         = $config->{GENERAL}{passvars};
+    $park_exten       = $config->{GENERAL}{parkexten};
+    $parktimeout      = $config->{GENERAL}{parktimeout};
-
-    if ( $debuglevel == -1 ) {
@@ -539 +559 @@
-
-    $clid_format = $config->{GENERAL}{clid_format};
-
+
-    $flash_file = $flash_dir . "/variables.txt";
-    push @all_flash_files, $flash_file;
@@ -588 +608 @@
-    }
-
+    if ( !defined $config->{GENERAL}{monitor_filename} ) {
+        $config->{GENERAL}{monitor_filename} = "\${UNIQUEID}";
+    }
+
+    if ( !defined $config->{GENERAL}{monitor_format} ) {
+        $config->{GENERAL}{monitor_format} = "wav";
+    }
+
-    if ( !defined $clid_privacy ) {
-        $clid_privacy = 0;
@@ -650 +678 @@
-    if ( !defined $clid_format ) {
-        $clid_format = "(xxx) xxx-xxxx";
+    }
+
+    if ( !defined $passvars ) {
+        $passvars = "";
+    }
+
+    if ( !defined $park_exten ) {
+        $park_exten = "700";
+    }
+
+    if ( !defined $parktimeout ) {
+        $parktimeout = 45000;
+    }
+    else {
+        $parktimeout = $parktimeout * 1000;
-    }
-
@@ -674 +717 @@
-
-    if ( $tipo eq "buttons" ) {
-inArray( $filename, @btninclude )
+grep { $filename eq $_ } @btninclude
-            push( @btninclude, $filename );
-        }
@@ -683 +726 @@
-    }
-    if ( $tipo eq "style" ) {
-inArray( $filename, @styleinclude )
+grep { $filename eq $_ } @styleinclude
-            push( @styleinclude, $filename );
+        }
+        else {
+            log_debug( "** $filename already included", 16 ) if DEBUG;
+            return;
+        }
+    }
+    if ( $tipo eq "server" ) {
+        if ( !grep { $filename eq $_ } @serverinclude ) {
+            push( @serverinclude, $filename );
-        }
-        else {
@@ -1153 +1205 @@
-            my $pos = $tmphash{position};
-            $pos =~ s/(\d+),(\d+)/$1/g;
-
+
+
+
+
+
+
+
+
+
+
-            $no_counter = 1;
-        }
@@ -1218 +1279 @@
-                $buttons{ uc("$tmphash{server}^$chan_trunk") } = $pos;
-                $textos{$indice_contexto} = $tmphash{label};
-
+
+
-                    $textos{$indice_contexto} .= " " . $count;
-                }
@@ -1376 +1438 @@
-            $tovoicemail{$indicevm} = $tmphash{voicemailext};
-        }
+        if ( defined( $tmphash{spyext} ) ) {
+            my $indicespy = $lastposition{ $tmphash{panel_context} };
+            if ( $tmphash{panel_context} ne "" ) {
+                $indicespy .= "\@$tmphash{panel_context}";
+            }
+            $tospy{$indicespy} = $tmphash{spyext};
+        }
+
-        $/ = "\0";
-    }
@@ -1536 +1606 @@
-            my $contextoboton = $key;
-            if ( $contextoboton =~ m/\@/ ) {
-
-
+
-                $contextoboton =~ tr/a-z/A-Z/;
-            }
@@ -1555 +1624 @@
-            my $contextoboton = $key;
-            if ( $contextoboton =~ m/\@/ ) {
-
-
+
-                $contextoboton =~ tr/a-z/A-Z/;
-            }
@@ -1574 +1642 @@
-                my $contextoboton = $key;
-                if ( $contextoboton =~ m/\@/ ) {
-
-
+
-                    $contextoboton =~ tr/a-z/A-Z/;
-                }
@@ -1594 +1661 @@
-                my $contextoboton = $key;
-                if ( $contextoboton =~ m/\@/ ) {
-
-
+
-                    $contextoboton =~ tr/a-z/A-Z/;
-                }
@@ -1614 +1680 @@
-                my $contextoboton = $key;
-                if ( $contextoboton =~ m/\@/ ) {
-
-
+
-                    $contextoboton =~ tr/a-z/A-Z/;
-                }
@@ -1782 +1847 @@
-    # a trunk button.
-
-
+
+
-
-    if ( $canalid eq "" ) {
@@ -1831 +1897 @@
-        }
-        log_debug( "$heading contexto $contexto", 32 ) if DEBUG;
-$nada
+undef
-        $sesion = $ses;
-    }
@@ -1853 +1919 @@
-    }
-
-    my $canalconcontextosinserver = $canalconcontexto;
-    $canalconcontextosinserver =~ s/(\d+)\^(.*)/$2/g;
-    if ( $canalconcontexto !~ /\^/ ) {
-        $canalconcontexto = $server . "^" . $canalconcontexto;
@@ -1904 +1968 @@
-        }
-    }
-
-
-
-
-
-
+
+
-    }
-    elsif ( $elemento =~ /^SRX/i ) {
@@ -1915 +1975 @@
-    }
-    elsif ( $elemento =~ /^CAPI\//i ) {
-
-
-
+
+
+
+
-    $elemento =~ s/(.*)[-\/](.*)/$1\t$2/g;
-    log_debug( "$heading elemento2 $elemento", 32 ) if DEBUG;
-    my $canal  = $1;
-    my $sesion = $2;
-    log_debug( "$heading canal $canal sesion $sesion", 32 ) if DEBUG;
-
-    if ( defined($canal) && defined($sesion) ) {
-        $canal =~ tr/a-z/A-Z/;
-        $elemento = $canal . "\t" . $sesion;
+        log_debug( "$heading canal $canal sesion $sesion", 32 ) if DEBUG;
-    }
-    $elemento =~ s/IAX2\[(.*)@(.*)\]\t(.*)/IAX2\[$1\]\t$3/;
-    $elemento =~ s/IAX2\/(.*)@(.*)\t(.*)/IAX2\/$1\t$3/;
-
-
-
+
-}
-
@@ -1957 +2017 @@
-sub erase_instances_for_trunk_buttons {
-
-
-
-
-
+
+
+
-    my $canalglobal;
-    my $valor;
-    my @new     = ();
-    my $heading = "** ERASE_INSTANCE_TRUNK";
-
-
-
+
+
+
+
-    $canalid =~ s/(.*)<(.*)>/$1/g;    #discards ZOMBIE or MASQ
-
@@ -1977 +2036 @@
-    $canalglobal =~ s/IAX2\[(.*)@(.*)\]/IAX2\[$1\]/g;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    my $sesiontemp = $canalid;
@@ -1994 +2043 @@
-    log_debug( "$heading looking for $canalid on instancias to erase it", 128 ) if DEBUG;
-
-foreach my $key1 ( sort ( keys(%instancias) )
-foreach my $key2 ( sort ( keys( %{ $instancias{$key1} } ) ) ) {
-    if ( $key2 eq $canalid ) {
-            delete $instancias{$key1}{$key2};
-            log_debug( "$heading Erasing $canalid from instanacias!", 128 ) if DEBUG;
-    }
-}
+if ( $canal =~ m/^DID|^CLID/
+$canal =~ s/(.*)=.*/$1/g;
+$canalid = $server . "^" . $canal . "-" . $solocanal;
+}
+foreach my $key1 ( keys(%instancias) ) {
+delete $instancias{$key1}{$canalid};
+log_debug( "$heading Erasing $canalid from instanacias!", 128 ) if DEBUG;
-    }
-}
@@ -2017 +2066 @@
-    }
-
-$nada1
+undef
-    if ( !defined($contexto1) ) { $contexto1 = ""; }
-
@@ -2033 +2082 @@
-            my @linkbotones = find_panel_buttons( $canal1, $canalsesion, $server );
-            foreach my $cual (@linkbotones) {
-$nada2
+undef
-                if ( !defined($contexto2) ) { $contexto2 = ""; }
-                if ( $contexto1 eq $contexto2 ) {
@@ -2101 +2150 @@
-    log_debug( "$heading borro cache_hit($indice_cache)", 128 ) if DEBUG;
-    delete $cache_hit{$indice_cache};
+    delete $monitoring{$canalsesion};
-    if ( keys(%cache_hit) ) {
-        for ( keys %cache_hit ) {
@@ -2176 +2226 @@
-                        log_debug( "** Found a match $canalid=$val ($quehay) - Cleared!", 16 ) if DEBUG;
-                        delete $datos{$quehay};
+                        delete $chanvar{$quehay};
+                        delete $passvar{$quehay};
-                    }
-                }
@@ -2201 +2253 @@
-    # Removes the context if its set
-
-
-
+
-
-    # Checks if the channel name has an equal sign
@@ -2253 +2304 @@
-    my $server  = "";
-
-
-
+
-
-    if ( $canal =~ /\^/ ) {
-
-
-
+
-    }
-
@@ -2296 +2344 @@
-    print_datos(1);
-
-
-
+
-
-    if ( $canal =~ /\^/ ) {
-
-
-
+
-    }
-
@@ -2323 +2368 @@
-                $canalaqui = 1;
-            }
-$val eq $server
+( $val eq $server || $server eq "-1" )
-                $serveraqui = 1;
-                log_debug( "$heading server coincide $server = $val\n", 16 ) if DEBUG;
@@ -2364 +2409 @@
-    my $heading       = "** FIND_PANEL_BUT";
-    my $calleridnum   = "noexiste";
+    my $didnum        = "noexiste";
-    my %trunk_matched = ();
-
@@ -2375 +2421 @@
-
-    my $uniqueid = find_uniqueid( $canalsesion, $server );
-
-
-
+
+
+
+
+
+
+
+
+
-        }
-    }
@@ -2495 +2547 @@
-        # Attemp to match a button from cache
-        $indice_cache = $canalsesion . "-" . $canal . "-" . $server;
-
+|| $didnum ne "noexiste" 
-            log_debug( "$heading CACHE MISS $indice_cache", 32 ) if DEBUG;
-            for ( keys %buttons ) {
-                $server     = $server_original;
-                $canalfinal = "";
-$nada
+undef
-                if ( !defined($contexto) ) { $contexto = ""; }
-                if ( $contexto ne "" ) { $contexto = "&" . $contexto; }
@@ -2528 +2580 @@
-                    }
-                }
+                elsif ( $_ =~ /^$server\^CLID\/\Q$calleridnum\E=/ ) {
+                    my $solocanal = $canalsesion;
+                    $solocanal =~ s/[^\w]//g;
+                    my $tcanal = "CLID/" . $calleridnum . "-" . $solocanal;
+                    if ( !exists( $trunk_matched{"$server^CLID/$calleridnum"} ) ) {
+                        $canalfinal = get_next_trunk_button( $tcanal, $contexto, $server, $tcanal );
+                        if ( $canalfinal ne "" ) {
+                            log_debug( "$heading clid match trunk ( $_ )  $canal $contexto", 32 ) if DEBUG;
+                            $trunk_matched{"$server^CLID/$calleridnum"} = 1;
+                            $canalfinal =~ s/(.*)\^(.*)/$2/g;
+                        }
+                    }
+                }
-                elsif ( $_ =~ /^$server\^CLID\/\Q$calleridnum\E\&?/ ) {
-
-                    log_debug( "$heading clid match ( $_ )  $canal $contexto", 32 ) if DEBUG;
-                    $canalfinal = "CLID/$calleridnum";
+                }
+                elsif ( $_ =~ /^$server\^DID\/\Q$didnum\E=/ ) {
+                    my $solocanal = $canalsesion;
+                    $solocanal =~ s/[^\w]//g;
+                    my $tcanal = "DID/" . $didnum . "-" . $solocanal;
+                    if ( !exists( $trunk_matched{"$server^DID/$didnum"} ) ) {
+                        $canalfinal = get_next_trunk_button( $tcanal, $contexto, $server, $tcanal );
+                        if ( $canalfinal ne "" ) {
+                            log_debug( "$heading did match trunk ( $_ )  $canal $contexto", 32 ) if DEBUG;
+                            $trunk_matched{"$server^DID/$didnum"} = 1;
+                            $canalfinal =~ s/(.*)\^(.*)/$2/g;
+                        }
+                    }
+                }
+                elsif ( $_ =~ /^$server\^DID\/\Q$didnum\E\&?/ ) {
+                    log_debug( "$heading did match ( $_ )  $canal $contexto", 32 ) if DEBUG;
+                    $canalfinal = "DID/$didnum";
-                }
-
@@ -2559 +2640 @@
-            $canalfinal = "";
-
-            my $nada1      = "";
-            my $contextemp = "";
-            my %contextosencontrados;
-            for my $val (@canales) {
-$nada1
+undef
-                if ( !defined($contextemp) ) { $contextemp = ""; }
-                $contextosencontrados{"&$contextemp"} = 1;
@@ -2677 +2757 @@
-    while ( my ( $key, $val ) = each(%bloque) ) {
-        if ( defined($val) ) {
-(.*)\s+$/$1/g
+\s+$//
-        }
-        else {
@@ -2685 +2765 @@
-    }
-
+    if ( defined( $hash_temporal{Application} ) ) {
+
+        # Chanvar hash stores the complete list of channel variables
+        # that are "SET" in the dialplan for a given Uniqueid
+        if ( $hash_temporal{Application} eq "Set" ) {
+            my @vardata = split( /\|/, $hash_temporal{AppData} );
+            foreach my $vara (@vardata) {
+                my ( $vari, $valu ) = split( /=/, $vara );
+                $vari =~ s/^_.?//g;
+                $chanvar{ $hash_temporal{Uniqueid} }{$vari} = $valu;
+            }
+        }
+    }
-    if ( defined( $hash_temporal{Channel} ) ) {
-        if ( $hash_temporal{Channel} =~ /^Agent/ ) {
@@ -2724 +2817 @@
-        while ( my ( $key, $val ) = each(%hash_temporal) ) {
-            if ( defined($val) && $val =~ /\^/ ) {
-
-
-
-
+
+
+
+
+
+
-                foreach my $value (@partes) {
-                    my @partes2 = split( /: /, $value );
@@ -2787 +2882 @@
-    if ( defined( $hash_temporal{"ActionID"} ) ) {
-        if ( $hash_temporal{"ActionID"} =~ /^timeout/i ) {
-
-
-
+
-            $evento   = "Timeout";
-            $unico_id = "YYYY-$server";
@@ -2825 +2918 @@
-    }
-
+    # Convert Asterisk 1.4 Originate responses to 1.2 format so attendant transfers work
+    if ( $evento eq "OriginateResponse" ) {
+        if ( $hash_temporal{Response} eq "Success" ) {
+            $evento = "OriginateSuccess";
+        }
+        else {
+            $evento = "OriginateFailure";
+        }
+    }
+
+    # Convert Asterisk 1.4 ParkedCalltimeout to UnParkedCall
+    if ( $evento eq "ParkedCallTimeOut" ) {
+        $evento = "UnParkedCall";
+    }
+
-    $evento =~ s/UserEvent//g;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    else { log_debug( "$heading No event match ($evento)", 32 ); }
-
@@ -2895 +3007 @@
-    }
-
-
+
+
+
+
+
+
+
+
-
-        # Event: ChannelReload
@@ -2917 +3036 @@
-                my $indice = $hash_temporal{Uniqueid} . "-" . $hash_temporal{Server};
-                if ( exists( $datos{"$indice"} ) ) {
-
+
+
-                    if ( defined( $datos{$indice}{Extension} ) ) {
-
@@ -2930 +3050 @@
-                }
-                else {
-
+