Changeset 43

Timestamp:

05/14/07 20:21:22 (2 years ago)

Author:

root

Message:

Add passvars parameter to op_server.cfg to pass extra values to popups

Files:

• trunk/ming-source/operator_panel.pl (modified) (4 diffs)
• trunk/op_server.cfg (modified) (1 diff)
• trunk/op_server.pl (modified) (9 diffs)

trunk/ming-source/operator_panel.pl

@@ -7412 +7412 @@
-                        } 
-
-// 
+
-
-                        var botonparte = numeroboton.split("@");
@@ -7767 +7767 @@
-                                        //var clidname = base64_decode(textofinal);
-                                        _global.clidname[boton_numero]=textofinal;
-
+
+
+
+
+
+
+
-                                }
-        
@@ -7798 +7804 @@
-                                                                c.clid      = _global.clidnumber[boton_numero];
-                                                                c.clidname  = _global.clidname[boton_numero];
+
+                                                                var a=-1;
+                                                                while (++a < chanvars[boton_numero].length) {
+                                                                        var datossplit = chanvars[boton_numero][a].split("=");
+                                                                        var mivar = datossplit[0];
+                                                                        var mival = datossplit[1];
+                                                                        c[mivar]=mival;
+                                                                }
+                                                                chanvars[boton_numero]="";
-                                                                c.send(url, target, 'GET');
-lidnumber
+.clid
-                                                        }
-                                                } else {
@@ -8689 +8704 @@
-        _global.logwindow = 1;
-        _global.margenbar = 2;
+        _global.chanvars = new Array();
-        _global.loglines = new Array();
-        _global.texto_tip = new Array();

trunk/op_server.cfg

@@ -191 +191 @@
-voicemail_extension = 3000@features
-
+
+; Channel variables to be passed from origin channels to Ringing channels 
+; Those variables will appear in the popup base64 encoded. A new event
+; will be generated to clients in the form: 
+; "setvar" and data VARNAME=BASE64(value)
+passvars=FROM_DID
+
+
-; Attendant transfers. If this parameters are uncomented, then
-; barge in functionality will be replaced with attendant transfers

trunk/op_server.pl

@@ -37 +37 @@
-my $FOP_VERSION    = "SVNVERSION";
-my %datos          = ();
+my %chanvar        = ();
+my %passvar        = ();
-my %sesbot         = ();
-my %linkbot        = ();
@@ -189 +191 @@
-my $queue_hide;
-my $enable_restart;
+my $passvars;
-my $change_led;
-my $cdial_nosecure;
@@ -484 +487 @@
-    $enable_restart   = $config->{GENERAL}{enable_restart};
-    $defaultlanguage  = $config->{GENERAL}{language};
+    $passvars         = $config->{GENERAL}{passvars};
-
-    if ( $debuglevel == -1 ) {
@@ -2125 +2129 @@
-                        log_debug( "** Found a match $canalid=$val ($quehay) - Cleared!", 16 ) if DEBUG;
-                        delete $datos{$quehay};
+                        delete $chanvar{$quehay};
+                        delete $passvar{$quehay};
-                    }
-                }
@@ -2662 +2668 @@
-    }
-
+    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/ ) {
@@ -3190 +3209 @@
-        $remote_callerid_name{$key} = $hash_temporal{"CallerIDName"};
-
+        foreach my $var ( split( /\|/, $passvars ) ) {
+            if ( defined( $chanvar{ $hash_temporal{"SrcUniqueID"} }{$var} ) ) {
+                $passvar{ $hash_temporal{"DestUniqueID"} }{$var} = $chanvar{ $hash_temporal{"SrcUniqueID"} }{$var};
+            }
+        }
+
-        if ( $hash_temporal{'Source'} =~ m/^Local/i ) {
-
@@ -5022 +5047 @@
-            if ( $clidnum ne "" ) {
-                my $base64_clidnum = encode_base64( $clidnum . " " );
-'Channel'
+Channel
-                push @return, $ret;
-            }
-            if ( defined($clidname) ) {
-                my $base64_clidname = encode_base64( $clidname . " " );
-'Channel'
+Channel
-                push @return, $ret;
-            }
+            foreach my $var ( keys %{ $passvar{ $hash_temporal{Uniqueid} } } ) {
+                my $base64_var = encode_base64( $passvar{ $hash_temporal{Uniqueid} }{$var} );
+                $ret = "$canal|setvar|$var=$base64_var|$unico_id|$hash_temporal{Channel}";
+                push @return, $ret;
+            }
+            delete $passvar{ $hash_temporal{Uniqueid} };
-        }
-
@@ -5391 +5422 @@
-                        log_debug( "$heading erasing datos{$uniqueid}", 256 ) if DEBUG;
-                        delete $datos{$uniqueid};
+                        delete $chanvar{$uniqueid};
+                        delete $passvar{$uniqueid};
-
-                        if ( $cuantos == 0 ) {
@@ -5555 +5588 @@
-
-                            delete $datos{$uniqueid};
+                            delete $chanvar{$uniqueid};
+                            delete $passvar{$uniqueid};
-                            log_debug( "$heading REMOVING datos { $uniqueid }", 256 ) if DEBUG;
-