FreeSWITCH package add Features tab move Rec, Modules, and IVR to that tab.

27 files changed, 247 insertions, 161 deletions

diff --git a/config/freeswitch/freeswitch.inc b/config/freeswitch/freeswitch.inc
index 4222d27a..f53b0878 100755
--- a/config/freeswitch/freeswitch.inc
+++ b/config/freeswitch/freeswitch.inc
@@ -1672,7 +1672,7 @@ function sync_package_freeswitch()
 function freeswitch_php_install_command() 
 {
 	global $config;
-	$freeswitch_package_version = "0.8.3.5";
+	$freeswitch_package_version = "0.8.4";
 	$freeswitch_build_version = "1.0.3";
 	$freeswitch_build_revision = "12545";
 
diff --git a/config/freeswitch/freeswitch.xml b/config/freeswitch/freeswitch.xml
index 65acc4d8..5eb9949f 100755..100644
--- a/config/freeswitch/freeswitch.xml
+++ b/config/freeswitch/freeswitch.xml
@@ -44,7 +44,7 @@
 		<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>FreeSWITCH Settings</name>
-	<version>0.8.3.5</version>
+	<version>0.8.4</version>
 	<title>FreeSWITCH: Settings</title>
 	<include_file>/usr/local/pkg/freeswitch.inc</include_file>
 	<menu>
@@ -79,6 +79,10 @@
 			<url>/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0</url>
 		</tab>
 		<tab>
+			<text>Features</text>
+			<url>/freeswitch/freeswitch_features.php</url>
+		</tab>		
+		<tab>
 			<text>Gateways</text>
 			<url>/freeswitch/freeswitch_gateways.php</url>
 		</tab>
@@ -87,22 +91,10 @@
 			<url>/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>IVR</text>
-			<url>/freeswitch/freeswitch_ivr.php</url>
-		</tab>
-		<tab>
-			<text>Modules</text>
-			<url>/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0</url>
-		</tab>
-		<tab>
 			<text>Public</text>
 			<url>/freeswitch/freeswitch_public_includes.php</url>
 		</tab>
 		<tab>
-			<text>Rec</text>
-			<url>/freeswitch/freeswitch_recordings.php</url>
-		</tab>
-		<tab>
 			<text>Status</text>
 			<url>/freeswitch/freeswitch_status.php</url>
 		</tab>
diff --git a/config/freeswitch/freeswitch_dialplan.xml b/config/freeswitch/freeswitch_dialplan.xml
index 41ca32d4..d6d907d5 100755..100644
--- a/config/freeswitch/freeswitch_dialplan.xml
+++ b/config/freeswitch/freeswitch_dialplan.xml
@@ -75,6 +75,10 @@
 			<url>/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0</url>
 		</tab>
 		<tab>
+			<text>Features</text>
+			<url>/freeswitch/freeswitch_features.php</url>
+		</tab>		
+		<tab>
 			<text>Gateways</text>
 			<url>/freeswitch/freeswitch_gateways.php</url>
 		</tab>
@@ -83,22 +87,10 @@
 			<url>/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>IVR</text>
-			<url>/freeswitch/freeswitch_ivr.php</url>
-		</tab>
-		<tab>
-			<text>Modules</text>
-			<url>/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0</url>
-		</tab>
-		<tab>
 			<text>Public</text>
 			<url>/freeswitch/freeswitch_public_includes.php</url>
 		</tab>
 		<tab>
-			<text>Rec</text>
-			<url>/freeswitch/freeswitch_recordings.php</url>
-		</tab>
-		<tab>
 			<text>Status</text>
 			<url>/freeswitch/freeswitch_status.php</url>
 		</tab>
diff --git a/config/freeswitch/freeswitch_dialplan_includes.tmp b/config/freeswitch/freeswitch_dialplan_includes.tmp
index 4b7bacfa..7e315ecf 100755..100644
--- a/config/freeswitch/freeswitch_dialplan_includes.tmp
+++ b/config/freeswitch/freeswitch_dialplan_includes.tmp
@@ -116,13 +116,11 @@ include("head.inc");
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), true, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), false, "/freeswitch/freeswitch_features.php");
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");	
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_dialplan_includes_details_edit.tmp b/config/freeswitch/freeswitch_dialplan_includes_details_edit.tmp
index 391d46d7..23ce76e3 100755..100644
--- a/config/freeswitch/freeswitch_dialplan_includes_details_edit.tmp
+++ b/config/freeswitch/freeswitch_dialplan_includes_details_edit.tmp
@@ -134,13 +134,11 @@ include("head.inc");
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), true, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), false, "/freeswitch/freeswitch_features.php");
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_dialplan_includes_edit.tmp b/config/freeswitch/freeswitch_dialplan_includes_edit.tmp
index e838a277..b270103b 100755..100644
--- a/config/freeswitch/freeswitch_dialplan_includes_edit.tmp
+++ b/config/freeswitch/freeswitch_dialplan_includes_edit.tmp
@@ -186,13 +186,11 @@ include("head.inc");
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), true, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), false, "/freeswitch/freeswitch_features.php");
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_extensions.tmp b/config/freeswitch/freeswitch_extensions.tmp
index ca6f3d73..3b25e98e 100755..100644
--- a/config/freeswitch/freeswitch_extensions.tmp
+++ b/config/freeswitch/freeswitch_extensions.tmp
@@ -65,13 +65,11 @@ include("head.inc");
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), true, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), false, "/freeswitch/freeswitch_features.php");
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");	
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_extensions_edit.tmp b/config/freeswitch/freeswitch_extensions_edit.tmp
index aeaaf4bc..ca4535c3 100755..100644
--- a/config/freeswitch/freeswitch_extensions_edit.tmp
+++ b/config/freeswitch/freeswitch_extensions_edit.tmp
@@ -137,13 +137,11 @@ function show_advanced_config() {
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), true, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), false, "/freeswitch/freeswitch_features.php");
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_external.xml b/config/freeswitch/freeswitch_external.xml
index 7dd2d65b..59760fea 100755..100644
--- a/config/freeswitch/freeswitch_external.xml
+++ b/config/freeswitch/freeswitch_external.xml
@@ -75,6 +75,10 @@
 			<active/>
 		</tab>
 		<tab>
+			<text>Features</text>
+			<url>/freeswitch/freeswitch_features.php</url>
+		</tab>
+		<tab>
 			<text>Gateways</text>
 			<url>/freeswitch/freeswitch_gateways.php</url>
 		</tab>
@@ -83,22 +87,10 @@
 			<url>/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>IVR</text>
-			<url>/freeswitch/freeswitch_ivr.php</url>
-		</tab>
-		<tab>
-			<text>Modules</text>
-			<url>/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0</url>
-		</tab>
-		<tab>
 			<text>Public</text>
 			<url>/freeswitch/freeswitch_public_includes.php</url>
 		</tab>
 		<tab>
-			<text>Rec</text>
-			<url>/freeswitch/freeswitch_recordings.php</url>
-		</tab>
-		<tab>
 			<text>Status</text>
 			<url>/freeswitch/freeswitch_status.php</url>
 		</tab>
diff --git a/config/freeswitch/freeswitch_features.php b/config/freeswitch/freeswitch_features.php
new file mode 100644
index 00000000..e122e39d
--- /dev/null
+++ b/config/freeswitch/freeswitch_features.php
@@ -0,0 +1,179 @@
+<?php
+/* $Id$ */
+/*
+	freeswitch_extensions.php
+  Copyright (C) 2008 Mark J Crane
+  All rights reserved.
+  
+  FreeSWITCH (TM)
+  http://www.freeswitch.org/
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require("guiconfig.inc");
+require("/usr/local/pkg/freeswitch.inc");
+
+$a_extensions 	   = &$config['installedpackages']['freeswitchextensions']['config'];
+
+
+if ($_GET['act'] == "del") {
+    if ($_GET['type'] == 'extensions') {
+        if ($a_extensions[$_GET['id']]) {
+            unset($a_extensions[$_GET['id']]);
+            write_config();
+            header("Location: freeswitch_extensions.php");
+            exit;
+        }
+    }
+}
+
+include("head.inc");
+
+?>
+
+
+<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<?php include("fbegin.inc"); ?>
+<p class="pgtitle">FreeSWITCH: Extensions</p>
+
+<div id="mainlevel">
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr><td class="tabnavtbl">
+<?php
+			
+	$tab_array = array();
+	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
+	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
+	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), true, "/freeswitch/freeswitch_features.php");	
+	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
+	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
+	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");	
+	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
+	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
+ 	display_top_tabs($tab_array);
+ 	
+?>
+</td></tr>
+</table>
+
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+   <tr>
+     <td class="tabcont" >
+
+  	<table width="100%" border="0" cellpadding="6" cellspacing="0">              
+      <tr>
+        <td><p><span class="vexpl"><span class="red"><strong>Features<br>
+            </strong></span>
+            List of a few of the features.
+            </p></td>
+      </tr>
+    </table>
+    <br />
+		
+    <table width="100%" border="0" cellpadding="6" cellspacing="0">
+    <tr>
+      <td class="listtopic" colspan='2'>Auto Attendant</td>
+	</tr>
+    <tr>
+		<td width='10%' class="vncell"><a href='/freeswitch/freeswitch_ivr.php'>Open</a></td>
+		<td class="vtable">          
+			An interactive voice response (IVR) often refered to as an Auto Attendant. 
+			It associates a recording to multiple options that can be used to direct 
+			calls to extensions, voicemail, queues, other IVR applications, and external 
+			phone numbers. 
+		</td>
+     </tr>
+     </table>
+
+    <br />
+    <br />
+
+    <table width="100%" border="0" cellpadding="6" cellspacing="0">
+    <tr>
+      <td class="listtopic" colspan='2'>Modules</td>
+	</tr>
+    <tr>
+		<td width='10%' class="vncell"><a href='/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0'>Open</a></td>
+		<td class="vtable">          
+			Modules add additional features and can be enabled or disabled to provide the desired features.
+		</td>
+     </tr>
+     </table>
+	 
+    <br />
+    <br />
+	
+    <table width="100%" border="0" cellpadding="6" cellspacing="0">
+    <tr>
+      <td class="listtopic" colspan='2'>Music on Hold</td>
+	</tr>
+    <tr>
+		<td width='10%' class="vncell"><a href='/freeswitch/freeswitch_recordings.php'>Open</a></td>
+		<td class="vtable">          
+			Music on hold can be in WAV or MP3 format. To play MP3 you must have mod_shout enabled 
+			on the 'Modules' tab. For best performance upload 16bit 8khz/16khz Mono WAV files. 
+		</td>
+     </tr>
+     </table>
+	 
+    <br />
+    <br />
+	
+	<table width="100%" border="0" cellpadding="6" cellspacing="0">
+	<tr>
+	  <td class="listtopic" colspan='2'>Recordings</td>
+	</tr>
+	<tr>
+		<td width='10%' class="vncell"><a href='/freeswitch/freeswitch_recordings.php'>Open</a></td>
+		<td class="vtable">          
+			To make a recording dial extension 732673 (record) or you can make a 16bit 8khz/16khz 
+			Mono WAV file then copy it to the following directory then refresh the page to play 
+			it back. Click on the 'Filename' to download it or the 'Recording Name' to play the audio. 
+		</td>
+	 </tr>
+	 </table>	 
+	 
+    <br />
+    <br />
+
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+
+</td>
+</tr>
+</table>
+
+</div>
+
+
+<?php include("fend.inc"); ?>
+</body>
+</html>
diff --git a/config/freeswitch/freeswitch_gateways.tmp b/config/freeswitch/freeswitch_gateways.tmp
index 75718a7c..240aa926 100755..100644
--- a/config/freeswitch/freeswitch_gateways.tmp
+++ b/config/freeswitch/freeswitch_gateways.tmp
@@ -65,13 +65,11 @@ include("head.inc");
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), false, "/freeswitch/freeswitch_features.php");	
 	$tab_array[] = array(gettext("Gateways"), true, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
-	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");	
+	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");	
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_gateways_edit.tmp b/config/freeswitch/freeswitch_gateways_edit.tmp
index 030f88cf..7730a774 100755..100644
--- a/config/freeswitch/freeswitch_gateways_edit.tmp
+++ b/config/freeswitch/freeswitch_gateways_edit.tmp
@@ -278,13 +278,11 @@ function show_advanced_config() {
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), false, "/freeswitch/freeswitch_features.php");	
 	$tab_array[] = array(gettext("Gateways"), true, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_internal.xml b/config/freeswitch/freeswitch_internal.xml
index db43b707..72f6ec56 100755..100644
--- a/config/freeswitch/freeswitch_internal.xml
+++ b/config/freeswitch/freeswitch_internal.xml
@@ -74,6 +74,10 @@
 			<url>/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0</url>
 		</tab>
 		<tab>
+			<text>Features</text>
+			<url>/freeswitch/freeswitch_features.php</url>
+		</tab>
+		<tab>
 			<text>Gateways</text>
 			<url>/freeswitch/freeswitch_gateways.php</url>
 		</tab>
@@ -83,22 +87,10 @@
 			<active/>
 		</tab>
 		<tab>
-			<text>IVR</text>
-			<url>/freeswitch/freeswitch_ivr.php</url>
-		</tab>
-		<tab>
-			<text>Modules</text>
-			<url>/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0</url>
-		</tab>
-		<tab>
 			<text>Public</text>
 			<url>/freeswitch/freeswitch_public_includes.php</url>
 		</tab>
 		<tab>
-			<text>Rec</text>
-			<url>/freeswitch/freeswitch_recordings.php</url>
-		</tab>
-		<tab>
 			<text>Status</text>
 			<url>/freeswitch/freeswitch_status.php</url>
 		</tab>
diff --git a/config/freeswitch/freeswitch_ivr.tmp b/config/freeswitch/freeswitch_ivr.tmp
index d05337ce..55f64a79 100755..100644
--- a/config/freeswitch/freeswitch_ivr.tmp
+++ b/config/freeswitch/freeswitch_ivr.tmp
@@ -66,13 +66,11 @@ include("head.inc");
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), true, "/freeswitch/freeswitch_features.php");	
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), true, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");	
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_ivr_edit.tmp b/config/freeswitch/freeswitch_ivr_edit.tmp
index f9d4652d..047e1a63 100755..100644
--- a/config/freeswitch/freeswitch_ivr_edit.tmp
+++ b/config/freeswitch/freeswitch_ivr_edit.tmp
@@ -212,13 +212,11 @@ include("head.inc");
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), true, "/freeswitch/freeswitch_features.php");
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), true, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_ivr_options_edit.tmp b/config/freeswitch/freeswitch_ivr_options_edit.tmp
index 78975a7f..987f3575 100755..100644
--- a/config/freeswitch/freeswitch_ivr_options_edit.tmp
+++ b/config/freeswitch/freeswitch_ivr_options_edit.tmp
@@ -120,13 +120,11 @@ include("head.inc");
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), true, "/freeswitch/freeswitch_features.php");	
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), true, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_modules.xml b/config/freeswitch/freeswitch_modules.xml
index fd962aa3..cca48f9f 100755..100644
--- a/config/freeswitch/freeswitch_modules.xml
+++ b/config/freeswitch/freeswitch_modules.xml
@@ -85,6 +85,10 @@
 			<url>/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0</url>
 		</tab>
 		<tab>
+			<text>Features</text>
+			<url>/freeswitch/freeswitch_features.php</url>
+		</tab>
+		<tab>
 			<text>Gateways</text>
 			<url>/freeswitch/freeswitch_gateways.php</url>
 		</tab>
@@ -93,23 +97,10 @@
 			<url>/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>IVR</text>
-			<url>/freeswitch/freeswitch_ivr.php</url>
-		</tab>
-		<tab>
-			<text>Modules</text>
-			<url>/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0</url>
-			<active/>
-		</tab>
-		<tab>
 			<text>Public</text>
 			<url>/freeswitch/freeswitch_public_includes.php</url>
 		</tab>
 		<tab>
-			<text>Rec</text>
-			<url>/freeswitch/freeswitch_recordings.php</url>
-		</tab>
-		<tab>
 			<text>Status</text>
 			<url>/freeswitch/freeswitch_status.php</url>
 		</tab>
diff --git a/config/freeswitch/freeswitch_public.xml b/config/freeswitch/freeswitch_public.xml
index ed633a4e..94ae409b 100755..100644
--- a/config/freeswitch/freeswitch_public.xml
+++ b/config/freeswitch/freeswitch_public.xml
@@ -73,6 +73,10 @@
 			<url>/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0</url>
 		</tab>
 		<tab>
+			<text>Features</text>
+			<url>/freeswitch/freeswitch_features.php</url>
+		</tab>
+		<tab>
 			<text>Gateways</text>
 			<url>/freeswitch/freeswitch_gateways.php</url>
 		</tab>
@@ -81,23 +85,11 @@
 			<url>/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>IVR</text>
-			<url>/freeswitch/freeswitch_ivr.php</url>
-		</tab>
-		<tab>
-			<text>Modules</text>
-			<url>/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0</url>
-		</tab>
-		<tab>
 			<text>Public</text>
 			<url>/freeswitch/freeswitch_public_includes.php</url>
 			<active/>
 		</tab>
 		<tab>
-			<text>Rec</text>
-			<url>/freeswitch/freeswitch_recordings.php</url>
-		</tab>
-		<tab>
 			<text>Status</text>
 			<url>/freeswitch/freeswitch_status.php</url>
 		</tab>
diff --git a/config/freeswitch/freeswitch_public_includes.tmp b/config/freeswitch/freeswitch_public_includes.tmp
index 66f733b3..c1ef5086 100755..100644
--- a/config/freeswitch/freeswitch_public_includes.tmp
+++ b/config/freeswitch/freeswitch_public_includes.tmp
@@ -118,13 +118,11 @@ include("head.inc");
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), false, "/freeswitch/freeswitch_features.php");	
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), true, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");	
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_public_includes_details_edit.tmp b/config/freeswitch/freeswitch_public_includes_details_edit.tmp
index 821d9097..dd332d14 100755..100644
--- a/config/freeswitch/freeswitch_public_includes_details_edit.tmp
+++ b/config/freeswitch/freeswitch_public_includes_details_edit.tmp
@@ -135,13 +135,11 @@ include("head.inc");
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), false, "/freeswitch/freeswitch_features.php");	
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), true, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_public_includes_edit.tmp b/config/freeswitch/freeswitch_public_includes_edit.tmp
index 94454fd3..7ccbaeec 100755..100644
--- a/config/freeswitch/freeswitch_public_includes_edit.tmp
+++ b/config/freeswitch/freeswitch_public_includes_edit.tmp
@@ -188,13 +188,11 @@ include("head.inc");
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), false, "/freeswitch/freeswitch_features.php");	
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), true, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_recordings.tmp b/config/freeswitch/freeswitch_recordings.tmp
index 7d9b539d..6683bd15 100755..100644
--- a/config/freeswitch/freeswitch_recordings.tmp
+++ b/config/freeswitch/freeswitch_recordings.tmp
@@ -163,13 +163,11 @@ function EvalSound(soundobj) {
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), true, "/freeswitch/freeswitch_features.php");
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), true, "/freeswitch/freeswitch_recordings.php");	
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_recordings_edit.tmp b/config/freeswitch/freeswitch_recordings_edit.tmp
index 18612b93..72604dbd 100755..100644
--- a/config/freeswitch/freeswitch_recordings_edit.tmp
+++ b/config/freeswitch/freeswitch_recordings_edit.tmp
@@ -113,13 +113,11 @@ include("head.inc");
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), true, "/freeswitch/freeswitch_features.php");
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), true, "/freeswitch/freeswitch_recordings.php");
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_status.tmp b/config/freeswitch/freeswitch_status.tmp
index 2d84a6ec..986ef7db 100755..100644
--- a/config/freeswitch/freeswitch_status.tmp
+++ b/config/freeswitch/freeswitch_status.tmp
@@ -124,13 +124,11 @@ if ($savemsg) {
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), false, "/freeswitch/freeswitch_features.php");	
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), false, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");
 	$tab_array[] = array(gettext("Status"), true, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_time_conditions.tmp b/config/freeswitch/freeswitch_time_conditions.tmp
index 617bb5cf..aae0bd20 100755..100644
--- a/config/freeswitch/freeswitch_time_conditions.tmp
+++ b/config/freeswitch/freeswitch_time_conditions.tmp
@@ -67,13 +67,11 @@ include("head.inc");
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), false, "/freeswitch/freeswitch_features.php");	
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), true, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
-	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");	
+	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");	
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_time_conditions_edit.tmp b/config/freeswitch/freeswitch_time_conditions_edit.tmp
index c40b84f8..5f1a37ba 100755..100644
--- a/config/freeswitch/freeswitch_time_conditions_edit.tmp
+++ b/config/freeswitch/freeswitch_time_conditions_edit.tmp
@@ -120,13 +120,11 @@ include("head.inc");
 	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=freeswitch.xml&amp;id=0");
 	$tab_array[] = array(gettext("Dialplan"), false, "/freeswitch/freeswitch_dialplan_includes.php");
 	$tab_array[] = array(gettext("Extensions"), false, "/freeswitch/freeswitch_extensions.php");
-	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");	
+	$tab_array[] = array(gettext("External"), false, "/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0");
+	$tab_array[] = array(gettext("Features"), false, "/freeswitch/freeswitch_features.php");
 	$tab_array[] = array(gettext("Gateways"), false, "/freeswitch/freeswitch_gateways.php");
 	$tab_array[] = array(gettext("Internal"), false, "/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0");
-	$tab_array[] = array(gettext("IVR"), true, "/freeswitch/freeswitch_ivr.php");
-	$tab_array[] = array(gettext("Modules"), false, "/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0");
 	$tab_array[] = array(gettext("Public"), false, "/freeswitch/freeswitch_public_includes.php");
-	$tab_array[] = array(gettext("Rec"), false, "/freeswitch/freeswitch_recordings.php");
 	$tab_array[] = array(gettext("Status"), false, "/freeswitch/freeswitch_status.php");
 	$tab_array[] = array(gettext("Vars"), false, "/pkg_edit.php?xml=freeswitch_vars.xml&amp;id=0");
  	display_top_tabs($tab_array);
diff --git a/config/freeswitch/freeswitch_vars.xml b/config/freeswitch/freeswitch_vars.xml
index 9a4e172c..44b29837 100755..100644
--- a/config/freeswitch/freeswitch_vars.xml
+++ b/config/freeswitch/freeswitch_vars.xml
@@ -74,6 +74,10 @@
 			<url>/pkg_edit.php?xml=freeswitch_external.xml&amp;id=0</url>
 		</tab>
 		<tab>
+			<text>Features</text>
+			<url>/freeswitch/freeswitch_features.php</url>
+		</tab>		
+		<tab>
 			<text>Gateways</text>
 			<url>/freeswitch/freeswitch_gateways.php</url>
 		</tab>
@@ -82,22 +86,10 @@
 			<url>/pkg_edit.php?xml=freeswitch_internal.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>IVR</text>
-			<url>/freeswitch/freeswitch_ivr.php</url>
-		</tab>
-		<tab>
-			<text>Modules</text>
-			<url>/pkg_edit.php?xml=freeswitch_modules.xml&amp;id=0</url>
-		</tab>
-		<tab>
 			<text>Public</text>
 			<url>/freeswitch/freeswitch_public_includes.php</url>
 		</tab>
 		<tab>
-			<text>Rec</text>
-			<url>/freeswitch/freeswitch_recordings.php</url>
-		</tab>
-		<tab>
 			<text>Status</text>
 			<url>/freeswitch/freeswitch_status.php</url>
 		</tab>