diff -Nur smeserver-freepbx-0.1.old/createlinks smeserver-freepbx-0.1/createlinks
--- smeserver-freepbx-0.1.old/createlinks	2016-05-15 12:24:17.702000000 -0400
+++ smeserver-freepbx-0.1/createlinks	2016-05-15 12:28:51.366000000 -0400
@@ -25,7 +25,7 @@
 # Panel links
 
 panel_link("freepbx", 'manager');
-panel_link("fop", 'manager');
+#panel_link("fop", 'manager');
 
 # Events links
 
@@ -40,7 +40,7 @@
 templates2events("/etc/e-smith/sql/init/30freepbx_mysql_create_database", qw(freepbx-update bootstrap-console-save));
 
 event_link("freepbx-checkinstall", $event, "10");
-event_link("freepbx-applypatch", $event, "20");
+#event_link("freepbx-applypatch", $event, "20");
 event_link("freepbx-clean-crontab", $event, "40");
 event_link("freepbx-dump-astdb", "pre-backup", "30");
 
diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/events/actions/freepbx-applypatch smeserver-freepbx-0.1/root/etc/e-smith/events/actions/freepbx-applypatch
--- smeserver-freepbx-0.1.old/root/etc/e-smith/events/actions/freepbx-applypatch	2008-08-13 07:17:17.000000000 -0400
+++ smeserver-freepbx-0.1/root/etc/e-smith/events/actions/freepbx-applypatch	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# This script will apply some patchs for freepbx on SME server
-
-# This patch remove the redirection in fop index so it can work with a proxypass directive
-if [ -e /usr/share/freepbx/patchs/fop_index_amp.proxypass.patch ]; then
-        patch -N /opt/freepbx/panel/index_amp.php /usr/share/freepbx/patchs/fop_index_amp.proxypass.patch
-fi
-
-# Same for index.php
-if [ -e /usr/share/freepbx/patchs/fop_index.proxypass.patch ]; then
-        patch -N /opt/freepbx/panel/index.php /usr/share/freepbx/patchs/fop_index.proxypass.patch
-fi
-
-
-# Patch to enable FOP Layout module
-if [ -e /usr/share/freepbx/patchs/retrieve_op_conf_from_mysql.layout.patch ]; then
-        patch -N /var/lib/asterisk/bin/retrieve_op_conf_from_mysql.pl /usr/share/freepbx/patchs/retrieve_op_conf_from_mysql.layout.patch
-fi
-
diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/web/functions/fop smeserver-freepbx-0.1/root/etc/e-smith/web/functions/fop
--- smeserver-freepbx-0.1.old/root/etc/e-smith/web/functions/fop	2008-08-04 09:17:11.000000000 -0400
+++ smeserver-freepbx-0.1/root/etc/e-smith/web/functions/fop	1969-12-31 19:00:00.000000000 -0500
@@ -1,31 +0,0 @@
-#!/usr/bin/perl
-#----------------------------------------------------------------------
-# heading     : Telephony
-# description : Flash Operator Panel
-# navigation  : 4000 4200
-#----------------------------------------------------------------------
-
-use strict;
-use CGI':all';
-use CGI::Carp qw(fatalsToBrowser);
-
-
-BEGIN
-{
-    $ENV {'PATH'} = '/bin:/usr/bin:/sbin';
-    $ENV {'SHELL'} = '/bin/bash';
-    delete $ENV {'ENV'};
-}
-
-
-my $q = new CGI;
-my $content="0; url=https://".$ENV {'HTTP_X_FORWARDED_HOST'}."/freepbx/panel";
-$q->default_dtd('-//W3C//DTD XHTML 1.0 Transitional//EN');
-
-print $q->header ('text/html');
-print $q->start_html (-head=>meta({-http_equiv=>'refresh', -content=>$content}));
-
-
-
-print $q->end_html;
-
diff -Nur smeserver-freepbx-0.1.old/root/usr/share/freepbx/patchs/fop_index_amp.proxypass.patch smeserver-freepbx-0.1/root/usr/share/freepbx/patchs/fop_index_amp.proxypass.patch
--- smeserver-freepbx-0.1.old/root/usr/share/freepbx/patchs/fop_index_amp.proxypass.patch	2008-08-04 09:17:11.000000000 -0400
+++ smeserver-freepbx-0.1/root/usr/share/freepbx/patchs/fop_index_amp.proxypass.patch	1969-12-31 19:00:00.000000000 -0500
@@ -1,19 +0,0 @@
---- /opt/freepbx/panel/index_amp.php.orig	2008-07-23 20:33:40.000000000 +0200
-+++ /opt/freepbx/panel/index_amp.php	2008-07-23 22:58:14.000000000 +0200
-@@ -16,11 +16,11 @@
- 	$amp_conf["AMPWEBADDRESS"] = $_SERVER["HTTP_HOST"];
- }
-  
--if ($_SERVER["HTTP_HOST"] != $amp_conf["AMPWEBADDRESS"]) {
--	$proto = ((isset($_SERVER["HTTPS"]) && ($_SERVER["HTTPS"] == "on")) ? "https" : "http");
--	header("Location: ".$proto."://".$amp_conf["AMPWEBADDRESS"].$_SERVER["REQUEST_URI"]);
--	exit;
--}
-+//if ($_SERVER["HTTP_HOST"] != $amp_conf["AMPWEBADDRESS"]) {
-+//	$proto = ((isset($_SERVER["HTTPS"]) && ($_SERVER["HTTPS"] == "on")) ? "https" : "http");
-+//	header("Location: ".$proto."://".$amp_conf["AMPWEBADDRESS"].$_SERVER["REQUEST_URI"]);
-+//	exit;
-+//}
- 
- ?>
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff -Nur smeserver-freepbx-0.1.old/root/usr/share/freepbx/patchs/fop_index.proxypass.patch smeserver-freepbx-0.1/root/usr/share/freepbx/patchs/fop_index.proxypass.patch
--- smeserver-freepbx-0.1.old/root/usr/share/freepbx/patchs/fop_index.proxypass.patch	2008-08-04 09:17:11.000000000 -0400
+++ smeserver-freepbx-0.1/root/usr/share/freepbx/patchs/fop_index.proxypass.patch	1969-12-31 19:00:00.000000000 -0500
@@ -1,19 +0,0 @@
---- /opt/freepbx/panel/index.php.orig	2008-07-23 20:33:40.000000000 +0200
-+++ /opt/freepbx/panel/index.php	2008-07-23 23:12:37.000000000 +0200
-@@ -15,11 +15,11 @@
- if ($amp_conf["AMPWEBADDRESS"] == "")
- 	{$amp_conf["AMPWEBADDRESS"] = $_SERVER["HTTP_HOST"];}
- 	
--if ($_SERVER["HTTP_HOST"] != $amp_conf["AMPWEBADDRESS"]) {
--	$proto = ((isset($_SERVER["HTTPS"]) && ($_SERVER["HTTPS"] == "on")) ? "https" : "http");
--	header("Location: ".$proto."://".$amp_conf["AMPWEBADDRESS"].$_SERVER["REQUEST_URI"]);
--	exit;
--}
-+//if ($_SERVER["HTTP_HOST"] != $amp_conf["AMPWEBADDRESS"]) {
-+//	$proto = ((isset($_SERVER["HTTPS"]) && ($_SERVER["HTTPS"] == "on")) ? "https" : "http");
-+//	header("Location: ".$proto."://".$amp_conf["AMPWEBADDRESS"].$_SERVER["REQUEST_URI"]);
-+//	exit;
-+//}
- 
- ?>
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff -Nur smeserver-freepbx-0.1.old/root/usr/share/freepbx/patchs/retrieve_op_conf_from_mysql.layout.patch smeserver-freepbx-0.1/root/usr/share/freepbx/patchs/retrieve_op_conf_from_mysql.layout.patch
--- smeserver-freepbx-0.1.old/root/usr/share/freepbx/patchs/retrieve_op_conf_from_mysql.layout.patch	2008-08-14 10:51:07.000000000 -0400
+++ smeserver-freepbx-0.1/root/usr/share/freepbx/patchs/retrieve_op_conf_from_mysql.layout.patch	1969-12-31 19:00:00.000000000 -0500
@@ -1,215 +0,0 @@
---- before/retrieve_op_conf_from_mysql.pl	2008-08-04 08:58:50.000000000 +0100
-+++ after/retrieve_op_conf_from_mysql.pl	2008-08-01 10:04:51.000000000 +0100
-@@ -28,24 +28,38 @@ if (scalar @ARGV == 2)
- 
- ######## 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"
- 
--# structure is - Legend, startpos, stoppos, color1, color2
--@rectangle1 = ("Trunks", 53, 80, "10ff10", "009900");
--@rectangle2 = ("Extensions", 1, 40, "1010ff", "099cccc");
--@rectangle3 = ("Parking lots", 49, 72, "ffff10", "cc9933");
--@rectangle4 = ("Conferences", 45, 68, "006666", "a01000");
--@rectangle5 = ("Queues", 41, 64, "ff1010", "a01000");
-+# structure is - ID, Legend, startpos, stoppos, color1, color2
-+@rectangle1 = ("trunk","Trunks", 53, 80, "10ff10", "009900");
-+@rectangle2 = ("extension","Extensions", 1, 40, "1010ff", "99cccc");
-+@rectangle3 = ("parking","Parking lots", 49, 72, "ffff10", "cc9933");
-+@rectangle4 = ("conference","Conferences", 45, 68, "006666", "00a010");
-+@rectangle5 = ("queue","Queues", 41, 64, "ff1010", "a01000");
- @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,13 +73,6 @@ $queuepos="42-44,61-64";
- 
- # 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,6 +240,34 @@ elsif ( $db_engine eq "sqlite3" ) {
- 	$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,35 +572,42 @@ foreach my $pcontext ( @ampusers ) {
- 
- 	foreach my $rect ( @rectangles ) {
- 		my $comment = @{$rect}[0];
--		my $color1 = @{$rect}[3];
--		my $color2 = @{$rect}[4];
--		my $start = @{$rect}[1];
--		my $stop = @{$rect}[2];
-+		my $color1 = @{$rect}[4];
-+		my $color2 = @{$rect}[5];
-+		my $start = @{$rect}[2];
-+		my $stop = @{$rect}[3];
- 		
--		my $xposition = $buttonsizex * int(($start-1)/$numbuttonsy);
--		my $yposition = $buttonsizey * (($start-1)%$numbuttonsy);
-+		my $xposition = $buttonsoriginx + $buttonsizex * int(($start-1)/$numbuttonsy);
-+		my $yposition = $buttonsoriginy + $buttonsizey * (($start-1)%$numbuttonsy);
- 		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;}
- 		
--		$xsize -= 2;
--		$ysize -= 2;
-+		$xposition += $rectmarginx;
-+		$yposition += $rectmarginy;
-+		$xsize -= 2 * $rectmarginx;
-+		$ysize -= 2 * $rectmarginy;
- 		
--		$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 ) {
--		my $text = @{$legend}[0];
--		my $start = @{$legend}[1];
-+		my $text = @{$legend}[1];
-+		my $start = @{$legend}[2];
-+		my $stop = @{$legend}[3];
- 		
--		my $xposition = $buttonsizex * int(($start-1)/$numbuttonsy);
--		my $yposition = $buttonsizey * (($start-1)%$numbuttonsy);
-+		my $xposition = $buttonsoriginx + $buttonsizex * int(($start-1)/$numbuttonsy);
-+		my $yposition = $buttonsoriginy + $buttonsizey * (($start-1)%$numbuttonsy);
-+		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;}
- 
--		$xposition += 3;
--		$yposition += 32;
-+		$xposition += $legendoffsetx;
-+		$yposition += $legendoffsety;
- 	
- 		print EXTEN "\n[LEGEND]\nx=$xposition\ny=$yposition\ntext=$text\nfont_size=18\nfont_family=Arial\nuse_embed_fonts=1\n";
- 	}
-@@ -581,7 +623,7 @@ sub get_next_btn {
- 	foreach $range (@rangelist) {
- 		@rangeval=split("-",$range);
- 		return $rangeval[0] if $last < $rangeval[0];
--		return $last+1 if $last < $rangeval[1];
-+		return $last+1 if defined($rangeval[1]) && ($last < $rangeval[1]);
- 		#Need to try another range def...
- 	}
- 	#If we get here, we ran out of positions :(
-@@ -625,36 +667,39 @@ sub by_lastname {
- 
- 
- sub styleinfo {
--	my $legend = shift;
-+	my $id = shift;
-+	my $retval;
- 	foreach my $rect ( @rectangles ) {
--		if ($legend  eq @{$rect}[0]) {
-+		if ($id  eq @{$rect}[0]) {
- 
--			my $start = @{$rect}[1];
--			my $stop = @{$rect}[2];
-+			my $start = @{$rect}[2];
-+			my $stop = @{$rect}[3];
- 			
- 			my $xposition = int(($start-1)/$numbuttonsy);
- 			my $yposition = (($start-1)%$numbuttonsy);
--			my $xsize = int(($stop-1)/$numbuttonsy) - int(($start-1)/$numbuttonsy);
--			my $ysize = (($stop-1)%$numbuttonsy) - (($start-1)%$numbuttonsy);
-+			my $xsize = 1 + int(($stop-1)/$numbuttonsy) - int(($start-1)/$numbuttonsy);
-+			my $ysize = 1 + (($stop-1)%$numbuttonsy) - (($start-1)%$numbuttonsy);
- 	
-+			if (($xsize <= 0) || ($ysize <= 0)) {print "Warning: rectange '$id' has negative area\n"; last;}
- 			$styleinfo = "";
- 			if ($ysize > 2) {
--				$styleinfo .= ($start + 1) . "-" . ($start + $ysize) . ",";
-+				$styleinfo .= ($start + 1) . "-" . ($start + $ysize - 1) . ",";
- 			} 
- 			elsif ($ysize == 2) {
- 				$styleinfo .= ($start + 1) . ",";
- 			}
- 			
--			for (my $i = 1 ; $i <= $xsize ; $i++ ) {
-+			for (my $i = 1 ; $i < $xsize ; $i++ ) {
- 				if ($ysize > 1) {
--					$styleinfo .= (($i + $xposition) * $numbuttonsy + $yposition + 1) . "-" . (($i + $xposition) * $numbuttonsy + $yposition + $ysize + 1) . ",";
-+					$styleinfo .= (($i + $xposition) * $numbuttonsy + $yposition + 1) . "-" . (($i + $xposition) * $numbuttonsy + $yposition + $ysize) . ",";
- 				} 
- 				else {
- 					$styleinfo .= (($i + $xposition) * $numbuttonsy + $yposition + 1) . ",";		
- 				}	
- 			}
-+			$retval = $styleinfo;
- 			last;
- 		}
- 	}
--	return $styleinfo;
-+	return $retval;
- }