Ticket #2686: retrieve_op_conf_from_mysql.patch

after/retrieve_op_conf_from_mysql.pl

@@ -359 +359 @@
-                $zapdef=@{$row}[0];
-                $zapdesc=@{$row}[1];
-                $icon='3';
+                # zaplines and trunklist share the trunk positions so need to store previous btn on overflow from zaplines
+                my $previousbtn = $btn;
-                $btn=get_next_btn($trunkpos,$btn);
+                if ($btn eq 0) {$btn = $previousbtn; last;}
-                if ($zapdef eq "Zap/*") {
-                        $numbuttons=@{$row}[2]-1;
-                        print EXTEN "[$zapdef]\nLabel=\"$zapdesc\"\nExtension=-1\nIcon=$icon\nPanel_Context=$panelcontext\nPosition=".$btn;
@@ -381 +384 @@
-                my $table = @{ $row }[2];
-                next if ($account eq "");
-                $btn=get_next_btn($trunkpos,$btn);
+                if ($btn eq 0) {last;}
-                $statement = "SELECT keyword,data from $table where id=$id and keyword <> 'account' and flags <> 1 order by keyword";
-                my $result = $dbh->selectall_arrayref($statement);
-                unless ($result) {
@@ -418 +422 @@
-                
-        ### Write Parkings lots
-        $btn=0;
-
+=""
-        my $extpark ;
-        my $parkcontext ;
-        my $numberlots ;
-        my $maxparkingslots ;
-        
-        $maxparkingslots = 0 ;
-        do
-        {
-                $btn=get_next_btn($parkingpos,$btn);
-                $maxparkingslots = $maxparkingslots - 1 ;
-        }
-        while ($btn != 0);
-        $maxparkingslots = $maxparkingslots + 1 ;
-
-        foreach my $row ( @parkings ) {
-                if (@{$row}[0] eq "parkingenabled") {
-                        $parken = @{$row}[1] ;
@@ -448 +443 @@
-                }
-        }
-        if ($parken eq "s") {
-&& $i <= 5 
+
-                        $btn=get_next_btn($parkingpos,$btn);
+                        if ($btn eq 0) {last;}
-                        $parknum = $extpark + $i ;
-                        $icon='1';
-                        print EXTEN "[PARK$parknum]\nPosition=$btn\nLabel=\"Parked ($parknum)\"\nExtension=$parknum\nContext=$parkcontext\nIcon=$icon\nPanel_Context=$panelcontext\n";
@@ -467 +463 @@
-        }
-        foreach my $row ( @confrange ) {
-                $btn=get_next_btn($confepos,$btn);
+                if ($btn eq 0) {last;}
-                $confenum=@{$row}[0];
-                $confedesc=@{$row}[1];
-                $icon='6';
@@ -483 +480 @@
-        }
-        foreach my $row ( @queuerange ) {
-                $btn=get_next_btn($queuepos,$btn);
+                if ($btn eq 0) {last;}
-                $queuename=@{$row}[0];
-                $queuedesc=@{$row}[1];
-                $icon='5';