FreeSWITCH dev change the way the menu is called to make it more flexible.

34 files changed, 35 insertions, 35 deletions

diff --git a/config/freeswitch_dev/freeswitch.xml b/config/freeswitch_dev/freeswitch.xml
index b80b9916..a9065982 100644
--- a/config/freeswitch_dev/freeswitch.xml
+++ b/config/freeswitch_dev/freeswitch.xml
@@ -44,7 +44,7 @@
 		<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>Settings</name>
-	<version>0.9.7.4</version>
+	<version>0.9.7.5</version>
 	<title>Settings</title>
 	<include_file>/usr/local/pkg/v_config.inc</include_file>
 	<menu>
diff --git a/config/freeswitch_dev/v_config.inc b/config/freeswitch_dev/v_config.inc
index 711eb1e3..19f709bd 100644
--- a/config/freeswitch_dev/v_config.inc
+++ b/config/freeswitch_dev/v_config.inc
@@ -105,7 +105,7 @@ function build_menu() {
 	$tab_array[] = array(gettext("Vars"), $menu_selected, "/packages/freeswitch/v_vars.php");
 	unset($menu_selected);
 	
-	return $tab_array;
+	display_top_tabs($tab_array);
 }
 
 
@@ -3000,7 +3000,7 @@ function v_php_install_command()
 
 	global $config;
 		
-	$v_package_version = "0.9.7.4";
+	$v_package_version = "0.9.7.5";
 	$v_build_version = "1.0.4";
 	$v_build_revision = "14306";
 
diff --git a/config/freeswitch_dev/v_dialplan.tmp b/config/freeswitch_dev/v_dialplan.tmp
index 762e1bbf..5779a063 100644
--- a/config/freeswitch_dev/v_dialplan.tmp
+++ b/config/freeswitch_dev/v_dialplan.tmp
@@ -89,7 +89,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Dialplan</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_dialplan_includes.tmp b/config/freeswitch_dev/v_dialplan_includes.tmp
index 9e622bfc..3fd9e15e 100644
--- a/config/freeswitch_dev/v_dialplan_includes.tmp
+++ b/config/freeswitch_dev/v_dialplan_includes.tmp
@@ -112,7 +112,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Dialplan</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_dialplan_includes_details_edit.tmp b/config/freeswitch_dev/v_dialplan_includes_details_edit.tmp
index 5588be4e..e5a8adf2 100644
--- a/config/freeswitch_dev/v_dialplan_includes_details_edit.tmp
+++ b/config/freeswitch_dev/v_dialplan_includes_details_edit.tmp
@@ -130,7 +130,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Dialplan: Details: Edit</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
 
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_dialplan_includes_edit.tmp b/config/freeswitch_dev/v_dialplan_includes_edit.tmp
index 42fefc89..168b0567 100644
--- a/config/freeswitch_dev/v_dialplan_includes_edit.tmp
+++ b/config/freeswitch_dev/v_dialplan_includes_edit.tmp
@@ -181,7 +181,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Dialplan: Edit</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_extensions.tmp b/config/freeswitch_dev/v_extensions.tmp
index 0adc5d4c..4550ea55 100644
--- a/config/freeswitch_dev/v_extensions.tmp
+++ b/config/freeswitch_dev/v_extensions.tmp
@@ -65,7 +65,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Extensions</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_extensions_edit.tmp b/config/freeswitch_dev/v_extensions_edit.tmp
index e8bb341d..79e3d860 100644
--- a/config/freeswitch_dev/v_extensions_edit.tmp
+++ b/config/freeswitch_dev/v_extensions_edit.tmp
@@ -144,7 +144,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Extensions: Edit</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_fax.tmp b/config/freeswitch_dev/v_fax.tmp
index dac3f209..15914ce8 100644
--- a/config/freeswitch_dev/v_fax.tmp
+++ b/config/freeswitch_dev/v_fax.tmp
@@ -149,7 +149,7 @@ echo "<p class=\"pgtitle\">$v_project_label: FAX</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_fax_edit.tmp b/config/freeswitch_dev/v_fax_edit.tmp
index a9471840..ea5a1f7d 100644
--- a/config/freeswitch_dev/v_fax_edit.tmp
+++ b/config/freeswitch_dev/v_fax_edit.tmp
@@ -351,7 +351,7 @@ if ($input_errors) print_input_errors($input_errors);
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_features.tmp b/config/freeswitch_dev/v_features.tmp
index ae4dee7e..c0d93630 100644
--- a/config/freeswitch_dev/v_features.tmp
+++ b/config/freeswitch_dev/v_features.tmp
@@ -63,7 +63,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Features</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
 
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_gateways.tmp b/config/freeswitch_dev/v_gateways.tmp
index 89391a72..fb01feae 100644
--- a/config/freeswitch_dev/v_gateways.tmp
+++ b/config/freeswitch_dev/v_gateways.tmp
@@ -65,7 +65,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Gateways</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_gateways_edit.tmp b/config/freeswitch_dev/v_gateways_edit.tmp
index 2cb51d96..fe609954 100644
--- a/config/freeswitch_dev/v_gateways_edit.tmp
+++ b/config/freeswitch_dev/v_gateways_edit.tmp
@@ -336,7 +336,7 @@ if ($input_errors) print_input_errors($input_errors);
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_hunt_group.tmp b/config/freeswitch_dev/v_hunt_group.tmp
index 619b3ec7..99eae163 100644
--- a/config/freeswitch_dev/v_hunt_group.tmp
+++ b/config/freeswitch_dev/v_hunt_group.tmp
@@ -95,7 +95,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Hunt Group</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_hunt_group_destinations_edit.tmp b/config/freeswitch_dev/v_hunt_group_destinations_edit.tmp
index 751071c8..a30b76be 100644
--- a/config/freeswitch_dev/v_hunt_group_destinations_edit.tmp
+++ b/config/freeswitch_dev/v_hunt_group_destinations_edit.tmp
@@ -118,7 +118,7 @@ if ($input_errors) print_input_errors($input_errors);
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_hunt_group_edit.tmp b/config/freeswitch_dev/v_hunt_group_edit.tmp
index 179ee6ea..45197ada 100644
--- a/config/freeswitch_dev/v_hunt_group_edit.tmp
+++ b/config/freeswitch_dev/v_hunt_group_edit.tmp
@@ -139,7 +139,7 @@ if ($input_errors) print_input_errors($input_errors);
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_ivr.tmp b/config/freeswitch_dev/v_ivr.tmp
index fd2dc0bf..06eb4f42 100644
--- a/config/freeswitch_dev/v_ivr.tmp
+++ b/config/freeswitch_dev/v_ivr.tmp
@@ -63,7 +63,7 @@ echo "<p class=\"pgtitle\">$v_project_label: IVR</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_ivr_edit.tmp b/config/freeswitch_dev/v_ivr_edit.tmp
index 0786a0fc..48ec077f 100644
--- a/config/freeswitch_dev/v_ivr_edit.tmp
+++ b/config/freeswitch_dev/v_ivr_edit.tmp
@@ -234,7 +234,7 @@ if ($input_errors) print_input_errors($input_errors);
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_ivr_options_edit.tmp b/config/freeswitch_dev/v_ivr_options_edit.tmp
index 03967764..90683ac6 100644
--- a/config/freeswitch_dev/v_ivr_options_edit.tmp
+++ b/config/freeswitch_dev/v_ivr_options_edit.tmp
@@ -119,7 +119,7 @@ if ($input_errors) print_input_errors($input_errors);
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_modules.tmp b/config/freeswitch_dev/v_modules.tmp
index 2ecdf9bd..f10830bc 100644
--- a/config/freeswitch_dev/v_modules.tmp
+++ b/config/freeswitch_dev/v_modules.tmp
@@ -320,7 +320,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Modules</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_profile_edit.tmp b/config/freeswitch_dev/v_profile_edit.tmp
index d3caab52..2f9c7116 100644
--- a/config/freeswitch_dev/v_profile_edit.tmp
+++ b/config/freeswitch_dev/v_profile_edit.tmp
@@ -71,7 +71,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Edit Profile</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_profiles.tmp b/config/freeswitch_dev/v_profiles.tmp
index b5ebd91d..21883f25 100644
--- a/config/freeswitch_dev/v_profiles.tmp
+++ b/config/freeswitch_dev/v_profiles.tmp
@@ -82,7 +82,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Profiles</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 			
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_public.tmp b/config/freeswitch_dev/v_public.tmp
index 2b001378..4bcadc50 100644
--- a/config/freeswitch_dev/v_public.tmp
+++ b/config/freeswitch_dev/v_public.tmp
@@ -90,7 +90,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Public</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_public_includes.tmp b/config/freeswitch_dev/v_public_includes.tmp
index bfef3e50..8a4c8238 100644
--- a/config/freeswitch_dev/v_public_includes.tmp
+++ b/config/freeswitch_dev/v_public_includes.tmp
@@ -114,7 +114,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Public</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_public_includes_details_edit.tmp b/config/freeswitch_dev/v_public_includes_details_edit.tmp
index e8c27481..7910f1a4 100644
--- a/config/freeswitch_dev/v_public_includes_details_edit.tmp
+++ b/config/freeswitch_dev/v_public_includes_details_edit.tmp
@@ -128,7 +128,7 @@ if ($input_errors) { print_input_errors($input_errors); }
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
 
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_public_includes_edit.tmp b/config/freeswitch_dev/v_public_includes_edit.tmp
index 1d86ad1c..8e9da445 100644
--- a/config/freeswitch_dev/v_public_includes_edit.tmp
+++ b/config/freeswitch_dev/v_public_includes_edit.tmp
@@ -184,7 +184,7 @@ if ($input_errors) print_input_errors($input_errors);
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_recordings.tmp b/config/freeswitch_dev/v_recordings.tmp
index a8b0d362..f4632831 100644
--- a/config/freeswitch_dev/v_recordings.tmp
+++ b/config/freeswitch_dev/v_recordings.tmp
@@ -158,7 +158,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Recordings</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_recordings_edit.tmp b/config/freeswitch_dev/v_recordings_edit.tmp
index 6f93a4a1..bdb0f3ad 100644
--- a/config/freeswitch_dev/v_recordings_edit.tmp
+++ b/config/freeswitch_dev/v_recordings_edit.tmp
@@ -108,7 +108,7 @@ echo "<p class=\"pgtitle\">$v_project_labels: Recordings: Edit</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_settings.tmp b/config/freeswitch_dev/v_settings.tmp
index ab4bc7e7..bd37086c 100644
--- a/config/freeswitch_dev/v_settings.tmp
+++ b/config/freeswitch_dev/v_settings.tmp
@@ -137,7 +137,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Settings</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_status.tmp b/config/freeswitch_dev/v_status.tmp
index 7c23c762..78d54466 100644
--- a/config/freeswitch_dev/v_status.tmp
+++ b/config/freeswitch_dev/v_status.tmp
@@ -145,7 +145,7 @@ if ($savemsg) {
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_time_conditions.tmp b/config/freeswitch_dev/v_time_conditions.tmp
index 2b72e49d..2f6d096a 100644
--- a/config/freeswitch_dev/v_time_conditions.tmp
+++ b/config/freeswitch_dev/v_time_conditions.tmp
@@ -62,7 +62,7 @@ echo "<p class=\"pgtitle\">$v_project_labels: IVR Options</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_time_conditions_edit.tmp b/config/freeswitch_dev/v_time_conditions_edit.tmp
index 4a626982..3083b0af 100644
--- a/config/freeswitch_dev/v_time_conditions_edit.tmp
+++ b/config/freeswitch_dev/v_time_conditions_edit.tmp
@@ -114,7 +114,7 @@ if ($input_errors) print_input_errors($input_errors);
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
  	
 ?>
 </td></tr>
diff --git a/config/freeswitch_dev/v_vars.tmp b/config/freeswitch_dev/v_vars.tmp
index ad3657b0..2b6787ac 100644
--- a/config/freeswitch_dev/v_vars.tmp
+++ b/config/freeswitch_dev/v_vars.tmp
@@ -89,7 +89,7 @@ echo "<p class=\"pgtitle\">$v_project_label: Variables</p>\n";
 <tr><td class="tabnavtbl">
 <?php
 
-display_top_tabs(build_menu());
+build_menu();
 
 ?>
 </td></tr>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index e66dc46e..56ceea59 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -126,7 +126,7 @@
       <pkginfolink>http://doc.pfsense.org/index.php/FreeSWITCH</pkginfolink>
       <config_file>http://www.pfsense.com/packages/config/freeswitch_dev/freeswitch.xml</config_file>
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-      <version>0.9.7.4</version>
+      <version>0.9.7.5</version>
       <status>Beta</status>
       <required_version>1.2.3</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>