Ticket #2989: retrieve_op_conf_from_mysql.patch

after/retrieve_op_conf_from_mysql.pl

@@ -28 +28 @@
-
-######## LAYOUT INFO #########
-
-This layout info should really be in a "panel" table in the freepbx database
+NOTE - These values may be overwritten by values in a table in the freepbx database named "panel"
-
-
-
-Extensions", 1, 40, "1010ff", "0
-
-Conferences", 45, 68, "006666", "a0100
-
+ID, 
+trunk","
+extension","Extensions", 1, 40, "1010ff", "
+parking","
+conference","Conferences", 45, 68, "006666", "00a01
+queue","
-@rectangles = (\@rectangle1,\@rectangle2,\@rectangle3,\@rectangle4,\@rectangle5);
-
+$rectmarginx = 1;
+$rectmarginy = 1;
+$legendoffsetx = 3;
+$legendoffsety = 1;     
+
+# $layoutbuttonsonly = 0 : allow display of buttons even if no corresponding layout info
+# $layoutbuttonsonly = 1 : suppress display of buttons if no corresponding layout info
+$layoutbuttonsonly = 1;
+
-######## BUTTON INFO #########
-$buttonsizex = 246; # 1+244+1 from information in op_style.cfg
-$buttonsizey = 28; # 1+26+1 from information in op_style.cfg
-$numbuttonsx = 4;
-$numbuttonsy = 20;
+$buttonsoriginx = -1;
+$buttonsoriginy = 32;
-
-
-######## STYLE INFO #########
+
+# NOTE - These values may be overwritten by the syleinfo function with values generated from the layout info
+
-$extenpos="2-40";
-#$trunkpos="52-60,71-80";
-#$confepos="";
@@ -59 +73 @@
-
-# End of changes
-
-#automated generation of style-info
-$extenpos=styleinfo("Extensions");
-$trunkpos=styleinfo("Trunks");
-$parkingpos=styleinfo("Parking lots");
-$confepos=styleinfo("Conferences");
-$queuepos=styleinfo("Queues");
-
-
-# Remove or add Zap trunks as needed
-# Note: ZAP/* will match any ZAP channel that *is not referenced* in another button (ie: extensions)
@@ -233 +240 @@
-        $dbh = DBI->connect("dbi:SQLite:dbname=$db_file","","");
-}
-
+# Get layout-info from a "panel" table in the freepbx database
+if (table_exists($dbh,"panel")) {
+        $statement = "SELECT id, legend, startpos, stoppos, color1, color2 from panel";
+        $result = $dbh->selectall_arrayref($statement);
+        @resultSet = @{$result};
+        if ( $#resultSet == -1 ) {
+                print "Notice: no panel defined\n";
+        }
+        push(@panellist, @{ $result });
+        @rectangles = @panellist;
+}
+
+# Automated generation of style-info from layout-info
+$autoextenpos=styleinfo("extension");
+$autotrunkpos=styleinfo("trunk");
+$autoparkingpos=styleinfo("parking");
+$autoconfepos=styleinfo("conference");
+$autoqueuepos=styleinfo("queue");
+
+if ($layoutbuttonsonly == 1) {$extenpos = $trunkpos = $parkingpos = $confepos = $queuepos = ""}
+
+if (defined($autoextenpos)) {$extenpos = $autoextenpos;}
+if (defined($autotrunkpos)) {$trunkpos = $autotrunkpos;}
+if (defined($autoparkingpos)) {$parkingpos = $autoparkingpos;}
+if (defined($autoconfepos)) {$confepos = $autoconfepos;}
+if (defined($autoqueuepos)) {$queuepos = $autoqueuepos;}
+
+
-open( EXTEN, ">$op_conf" ) or die "Cannot create/overwrite config file: $op_conf ($!)\n";
-print EXTEN $warning_banner;
-
@@ -537 +572 @@
-
-        foreach my $rect ( @rectangles ) {
-                my $comment = @{$rect}[0];
-3
-4
-1
-2
+4
+5
+2
+3
-                
-
-
+originx + $buttons
+originy + $buttons
-                my $xsize = $buttonsizex * (1 + int(($stop-1)/$numbuttonsy) - int(($start-1)/$numbuttonsy));
-                my $ysize = $buttonsizey * (1 + (($stop-1)%$numbuttonsy) - (($start-1)%$numbuttonsy));
+
+                if (($xsize <= 0) || ($ysize <= 0)) {next;}
-                
-
-
+
+
+
+
-                
-                $yposition += 32;
-        
-                print EXTEN "\n; $comment\n[rectangle]\nx=$xposition\ny=$yposition\nwidth=$xsize\nheight=$ysize\nline_width=0\nline_color=$color1\nfade_color1=$color1\nfade_color2=$color2\nrnd_border=2\nalpha=20\nlayer=bottom\n";
-        }
-
-        ### Write legends
-
-        foreach my $legend ( @rectangles ) {
-
-
+
+
+
-                
-
-
+
+
+
+
+
+
-
-3
-32
+$legendoffsetx
+$legendoffsety
-        
-                print EXTEN "\n[LEGEND]\nx=$xposition\ny=$yposition\ntext=$text\nfont_size=18\nfont_family=Arial\nuse_embed_fonts=1\n";
-        }
@@ -581 +623 @@
-        foreach $range (@rangelist) {
-                @rangeval=split("-",$range);
-                return $rangeval[0] if $last < $rangeval[0];
-$last < $rangeval[1]
+defined($rangeval[1]) && ($last < $rangeval[1])
-                #Need to try another range def...
-        }
-        #If we get here, we ran out of positions :(
@@ -625 +667 @@
-
-
-sub styleinfo {
-
+
+
-        foreach my $rect ( @rectangles ) {
-legen
+i
-
-1
-2
+2
+3
-                        
-                        my $xposition = int(($start-1)/$numbuttonsy);
-                        my $yposition = (($start-1)%$numbuttonsy);
-
-
+1 + 
+1 + 
-        
+                        if (($xsize <= 0) || ($ysize <= 0)) {print "Warning: rectange '$id' has negative area\n"; last;}
-                        $styleinfo = "";
-                        if ($ysize > 2) {
-
+ - 1
-                        } 
-                        elsif ($ysize == 2) {
-                                $styleinfo .= ($start + 1) . ",";
-                        }
-                        
-=
+
-                                if ($ysize > 1) {
- + 1
+
-                                } 
-                                else {
-                                        $styleinfo .= (($i + $xposition) * $numbuttonsy + $yposition + 1) . ",";                
-                                }       
-                        }
+                        $retval = $styleinfo;
-                        last;
-                }
-        }
-styleinfo
+retval
-}