Changeset 51

Timestamp:

08/02/07 16:04:07 (1 year ago)

Author:

root

Message:

no_label_counter in op_buttons.cfg (prevents counting on multiple position labels). Fixes on groupcount. Added count to op_buttons.cfg to set number of sessions for group_count buttons

Files:

• trunk/op_server.pl (modified) (19 diffs)

trunk/op_server.pl

@@ -35 +35 @@
-use POSIX qw(setsid EWOULDBLOCK);
-
-SVNVERSION
+027.001
-my %datos          = ();
-my %chanvar        = ();
@@ -192 +192 @@
-my $queue_hide;
-my $enable_restart;
-
+ = ""
-my $change_led;
-my $cdial_nosecure;
@@ -675 +675 @@
-    }
-
+    if ( !defined $passvars ) {
+        $passvars = "";
+    }
+
-    if ( !defined $debuglevel ) {
-        $debuglevel = 0;
@@ -1185 +1189 @@
-            my $pos = $tmphash{position};
-            $pos =~ s/(\d+),(\d+)/$1/g;
-
+
+
+
+
+
+
+
+
+
+
-            $no_counter = 1;
-        }
@@ -1250 +1263 @@
-                $buttons{ uc("$tmphash{server}^$chan_trunk") } = $pos;
-                $textos{$indice_contexto} = $tmphash{label};
-
+
+
-                    $textos{$indice_contexto} .= " " . $count;
-                }
@@ -1944 +1958 @@
-    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/;
@@ -3234 +3248 @@
-        $estado_final = "ringing";
-        $canal        = $hash_temporal{"AgentCalled"};
-
+
+
+
-        $canalid  = $canal . "-XXXX";
-        $clidnum  = $hash_temporal{"CallerID"};
@@ -3241 +3257 @@
-        my $base64_clidnum  = encode_base64( $clidnum . " " );
-        my $base64_clidname = encode_base64( $clidname . " " );
+
+        foreach my $var ( split( /\|/, $passvars ) ) {
+            if ( defined( $chanvar{$unique}{$var} ) ) {
+                my $base64_var = encode_base64( $chanvar{$unique}{$var} );
+                push @return, "$canal|setvar|$var=$base64_var|$canalid-$server|$canalid";
+            }
+        }
-        push @return, "$canal|clidnum|$base64_clidnum|$canalid-$server|$canalid";
-        push @return, "$canal|clidname|$base64_clidname|$canalid-$server|$canalid";
@@ -4754 +4777 @@
-            my $hay_activos = 0;
-
-
+each my $dkey
-                my $ignorame = 0;
-$current_server) = split( /-/, $_
+undef, $current_server) = split( /-/, $dkey
-                if ( "$server" ne "$current_server" ) {
-                    next;
-                }
-
-_
-_
+dkey
+dkey
-                my $myevent = "Newexten";
-_
+dkey
-                    log_debug( "$heading STATUSCOMPLETE datos { $key } = $val", 128 ) if DEBUG;
-
-                    if ( defined($val) ) {
-                        $hay_activos = 1;
@@ -5872 +5894 @@
-                                    }
-                                }
-
-                                if ( $quehace eq "ringing" ) {
-                                    if ( $laststatus{$interno} ne "ringing|${buttontext}" ) {
@@ -5894 +5915 @@
-
-                                }
-
+|| $quehace eq 'ring' 
-
-                                    if ( defined( $group_count{$interno} ) ) {
-                                        my $plural = "";
-                                        if ( $group_count{$interno} == 1 ) {
-
-
-
-
-
-
-
-
-
-
+
+
-                                        }
-                                    }
@@ -6064 +6076 @@
-                            $calleridpop =~ s/\s+//g;
-                            push @mensajefinal, "$canalsincontexto\@$canalsincontexto|$quehace|$calleridpop";
+                            if ( defined( $group_count{$interno} ) && $group_count{$interno} == 1 ) {
+                                # Ignore ringing because of groupcount
+                                $quehace = "";
+                            }
-                        }
-
@@ -6086 +6102 @@
-
-                        if ( @{ $sesbot{$interno} } > 0 && $quehace eq 'corto' ) {
-
-
+
+
+
+
+
+
+
-                        }
-                        else {
@@ -6095 +6116 @@
-                                $canalsincontexto =~ s/(.*)&(.*)/$1/g;
-                                push @mensajefinal, "$canalsincontexto\@$canalsincontexto|$quehace|corto!";
+                                if ( defined( $group_count{$interno} ) ) {
+                                    if ( $group_count{$interno} == 1 ) {
+                                                                                $buttontext = group_count($interno,$canal);
+                                            push @respuestas, $buttontext;
+                                    }
+                                }
-                            }
-
@@ -6160 +6187 @@
-                                    else {
-                                        if ( $quehace2 ne "" ) {
-
-
+
+
+
+
+
+
+
-                                        }
-                                    }
@@ -6168 +6200 @@
-
-                            if ( $quehace2 =~ /ocupado/ ) {
-
-
-
+
+
+
+
-                                }
-
-
-
+
+
+
+
+
+
+
+
+
-                            }
-                            if ( $quehace2 eq "settimer" ) {
-
+defined 
-                                my $timer_type = "";
-                                if ( $tiempo =~ /\@/ ) {
-                                    ( $tiempo, $timer_type ) = split( /\@/, $tiempo );
-                                }
+
+                                if ( $tiempo eq "" ) { $tiempo = 0; }
+
-                                if ( $timer_type ne "" ) {
-                                    $botontimertype{$interno} = $timer_type;
@@ -6343 +6385 @@
-    $tab = substr( $tab, 0, -1 ) if DEBUG;
-    return @respuestas;
+}
+
+sub group_count {
+        my $interno = shift;
+        my $canal   = shift;
+    my $plural = "";
+        my $return = "";
+    if ( @{ $sesbot{$interno} } > 1 ) {
+             $plural = "s";
+    }
+    if ( @{ $sesbot{$interno} } > 0 ) {
+          my $cuantos = @{ $sesbot{$interno} };
+          my ( $text, $textriginal, $buttontext ) = translate( $canal, "&channels,$cuantos,$plural", "", "" );
+          $return = "$interno|settext|$text";
+          $botonpermanenttext{$interno} = $text;
+    } else {
+          $botonpermanenttext{$interno} = "";
+          $return ="$interno|corto|";
+        }
+        return $return;
-}
-
@@ -7255 +7317 @@
-        if ( defined( $buttons{$indice} ) ) {
-            $btn_num = $buttons{$indice};
+
-            # $btn_num =~ s/(.*)\@(.*)/$1/g;
-        }
@@ -9106 +9169 @@
-
-    my $numero       = shift;
-
-
+defined 
+defined 
-    my @chars_number = ();
-    my @chars_format = ();