FreeSWITCH dev package replace the rest of the hard coded paths, update wording, fix labels on a few pages, fix wav and mp3 download and play tools.

27 files changed, 275 insertions, 587 deletions

diff --git a/config/freeswitch_dev/v_ivr.tmp b/config/freeswitch_dev/v_auto_attendant.tmp
index 5ac793a5..ee769819 100644
--- a/config/freeswitch_dev/v_ivr.tmp
+++ b/config/freeswitch_dev/v_auto_attendant.tmp
@@ -1,7 +1,7 @@
 <?php
 /* $Id$ */
 /*
-	v_ivr.php
+	v_auto_attendant.php
 	Copyright (C) 2008 Mark J Crane
 	All rights reserved.
 
@@ -41,7 +41,7 @@ if ($_GET['act'] == "del") {
             unset($a_ivr[$_GET['id']]);
             write_config();
             sync_package_v_ivr();
-            header("Location: v_ivr.php");
+            header("Location: v_auto_attendant.php");
             exit;
         }
     }
@@ -75,7 +75,7 @@ build_menu();
    <tr>
      <td class="tabcont" >
 
-<form action="v_ivr.php" method="post" name="iform" id="iform">
+<form action="v_auto_attendant.php" method="post" name="iform" id="iform">
 
   	<table width="100%" border="0" cellpadding="6" cellspacing="0">
       <tr>
@@ -99,7 +99,7 @@ build_menu();
         <table border="0" cellspacing="0" cellpadding="1">
           <tr>
             <td width="17"></td>
-            <td valign="middle"><a href="v_ivr_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
+            <td valign="middle"><a href="v_auto_attendant_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
           </tr>
         </table>
       </td>
@@ -115,20 +115,20 @@ build_menu();
 
     ?>
     <tr>
-      <td class="listlr" ondblclick="document.location='v_ivr_edit.php?id=<?=$i;?>'">
+      <td class="listlr" ondblclick="document.location='v_auto_attendant_edit.php?id=<?=$i;?>'">
         <?=$ent['ivrextension']?>
       </td>
-      <td class="listr" ondblclick="document.location='v_ivr_edit.php?id=<?=$i;?>';">
+      <td class="listr" ondblclick="document.location='v_auto_attendant_edit.php?id=<?=$i;?>';">
         <?=$ent['ivrname'];?>&nbsp;
       </td>
-      <td class="listbg" ondblclick="document.location='v_ivr_edit.php?id=<?=$i;?>';">
+      <td class="listbg" ondblclick="document.location='v_auto_attendant_edit.php?id=<?=$i;?>';">
         <font color="#FFFFFF"><?=htmlspecialchars($ent['ivrdescr']);?>&nbsp;
       </td>
       <td valign="middle" nowrap class="list">
         <table border="0" cellspacing="0" cellpadding="1">
           <tr>
-            <td valign="middle"><a href="v_ivr_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
-            <td><a href="v_ivr.php?type=ivr&act=del&id=<?=$i;?>&ivrid=<?php echo $ivrid; ?>" onclick="return confirm('Do you really want to delete this?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
+            <td valign="middle"><a href="v_auto_attendant_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
+            <td><a href="v_auto_attendant.php?type=ivr&act=del&id=<?=$i;?>&ivrid=<?php echo $ivrid; ?>" onclick="return confirm('Do you really want to delete this?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
           </tr>
        </table>
       </td>
@@ -145,7 +145,7 @@ build_menu();
         <table border="0" cellspacing="0" cellpadding="1">
           <tr>
             <td width="17"></td>
-            <td valign="middle"><a href="v_ivr_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
+            <td valign="middle"><a href="v_auto_attendant_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
           </tr>
         </table>
 		  </td>
diff --git a/config/freeswitch_dev/v_ivr_edit.tmp b/config/freeswitch_dev/v_auto_attendant_edit.tmp
index 024fcc72..6826a896 100644
--- a/config/freeswitch_dev/v_ivr_edit.tmp
+++ b/config/freeswitch_dev/v_auto_attendant_edit.tmp
@@ -2,7 +2,7 @@
 /* $Id$ */
 /*
 
-  v_ivr_edit.php
+  v_auto_attendant_edit.php
   Copyright (C) 2008 Mark J Crane
   All rights reserved.
 	
@@ -150,7 +150,7 @@ if ($_POST) {
             unset($a_ivr_options[$_GET['optionid']]);
             write_config();
             sync_package_v_ivr();
-            header("Location: v_ivr_edit.php?id=".$_GET['id']);
+            header("Location: v_auto_attendant_edit.php?id=".$_GET['id']);
             exit;
         }
     }
@@ -192,7 +192,7 @@ if ($_POST) {
 		write_config();
 		sync_package_v_ivr();
 		
-		header("Location: v_ivr.php");
+		header("Location: v_auto_attendant.php");
 		exit;
 	}
 }
@@ -255,7 +255,7 @@ build_menu();
         </table>
         <br />
     		
-        <form action="v_ivr_edit.php" method="post" name="iform" id="iform">
+        <form action="v_auto_attendant_edit.php" method="post" name="iform" id="iform">
             <table width="100%" border="0" cellpadding="6" cellspacing="0">
             <tr>
               <td width="22%" valign="top" class="vncellreq">Extension</td>
@@ -456,7 +456,7 @@ build_menu();
       <br>
       <br>
 
-      <form action="v_ivr_edit.php" method="post" name="iform2" id="iform2">
+      <form action="v_auto_attendant_edit.php" method="post" name="iform2" id="iform2">
       <?php
 
 
@@ -507,7 +507,7 @@ build_menu();
             <td width="17"></td>
             <td valign="middle">
 			<?php if (strlen($ivrid) > 1) { ?>
-				<a href="v_ivr_options_edit.php?parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>&a=action"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a>
+				<a href="v_auto_attendant_options_edit.php?parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>&a=action"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a>
 			<?php } ?>
 			</td>
           </tr>
@@ -522,26 +522,26 @@ build_menu();
           if ($ent['optionaction'] == "action" && $ivrid == $ent['ivrid']) {
     ?>
             <tr>
-              <td class="listlr" ondblclick="document.location='v_ivr_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>'">
+              <td class="listlr" ondblclick="document.location='v_auto_attendant_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>'">
                 <?=$ent['optionnumber']?>
               </td>
-              <td class="listr" ondblclick="document.location='v_ivr_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
+              <td class="listr" ondblclick="document.location='v_auto_attendant_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
                 <?=$ent['optiontype'];?>&nbsp;
               </td>
-              <td class="listr" ondblclick="document.location='v_ivr_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
+              <td class="listr" ondblclick="document.location='v_auto_attendant_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
                 <?=$ent['optionprofile'];?>&nbsp;
               </td>			  
-              <td class="listr" ondblclick="document.location='v_ivr_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
+              <td class="listr" ondblclick="document.location='v_auto_attendant_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
                 <?=$ent['optiondest'];?>&nbsp;
               </td>
-              <td class="listbg" ondblclick="document.location='v_ivr_options_edit.php?id=<?=$id;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
+              <td class="listbg" ondblclick="document.location='v_auto_attendant_options_edit.php?id=<?=$id;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
                 <font color="#FFFFFF"><?=htmlspecialchars($ent['optiondescr']);?>&nbsp;
               </td>
               <td valign="middle" nowrap class="list">
                 <table border="0" cellspacing="0" cellpadding="1">
                   <tr>
-                    <td valign="middle"><a href="v_ivr_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
-                    <td><a href="v_ivr_options.php?type=ivroptions&act=del&id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>" onclick="return confirm('Do you really want to delete this recording?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
+                    <td valign="middle"><a href="v_auto_attendant_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
+                    <td><a href="v_auto_attendant_options.php?type=ivroptions&act=del&id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>" onclick="return confirm('Do you really want to delete this recording?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
                   </tr>
                </table>
               </td>
@@ -560,7 +560,7 @@ build_menu();
             <td width="17"></td>
             <td valign="middle">
 			<?php if (strlen($ivrid) > 1) { ?>
-				<a href="v_ivr_options_edit.php?parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>&a=action"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a>
+				<a href="v_auto_attendant_options_edit.php?parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>&a=action"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a>
 			<?php } ?>
 			</td>
           </tr>
@@ -579,7 +579,7 @@ build_menu();
 
 
 
-      <form action="v_ivr_edit.php" method="post" name="iform2" id="iform2">
+      <form action="v_auto_attendant_edit.php" method="post" name="iform2" id="iform2">
       <?php
 
 
@@ -617,7 +617,7 @@ build_menu();
             <td width="17"></td>
             <td valign="middle">
 			<?php if (strlen($ivrid) > 1) { ?>
-				<a href="v_ivr_options_edit.php?parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>&a=antiaction"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a>
+				<a href="v_auto_attendant_options_edit.php?parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>&a=antiaction"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a>
 			<?php } ?>
 			</td>
           </tr>
@@ -632,26 +632,26 @@ build_menu();
           if ($ent['optionaction'] == "anti-action" && $ivrid == $ent['ivrid']) {
     ?>
             <tr>
-              <td class="listlr" ondblclick="document.location='v_ivr_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>'">
+              <td class="listlr" ondblclick="document.location='v_auto_attendant_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>'">
                 <?=$ent['optionnumber']?>
               </td>
-              <td class="listr" ondblclick="document.location='v_ivr_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
+              <td class="listr" ondblclick="document.location='v_auto_attendant_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
                 <?=$ent['optiontype'];?>&nbsp;
               </td>
-              <td class="listr" ondblclick="document.location='v_ivr_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
+              <td class="listr" ondblclick="document.location='v_auto_attendant_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
                 <?=$ent['optionprofile'];?>&nbsp;
               </td>			  
-              <td class="listr" ondblclick="document.location='v_ivr_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
+              <td class="listr" ondblclick="document.location='v_auto_attendant_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
                 <?=$ent['optiondest'];?>&nbsp;
               </td>
-              <td class="listbg" ondblclick="document.location='v_ivr_options_edit.php?id=<?=$id;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
+              <td class="listbg" ondblclick="document.location='v_auto_attendant_options_edit.php?id=<?=$id;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>';">
                 <font color="#FFFFFF"><?=htmlspecialchars($ent['optiondescr']);?>&nbsp;
               </td>
               <td valign="middle" nowrap class="list">
                 <table border="0" cellspacing="0" cellpadding="1">
                   <tr>
-                    <td valign="middle"><a href="v_ivr_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
-                    <td><a href="v_ivr_options.php?type=ivroptions&act=del&id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>" onclick="return confirm('Do you really want to delete this recording?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
+                    <td valign="middle"><a href="v_auto_attendant_options_edit.php?id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
+                    <td><a href="v_auto_attendant_options.php?type=ivroptions&act=del&id=<?=$i;?>&parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>" onclick="return confirm('Do you really want to delete this recording?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
                   </tr>
                </table>
               </td>
@@ -670,7 +670,7 @@ build_menu();
             <td width="17"></td>
             <td valign="middle">
 			<?php if (strlen($ivrid) > 1) { ?>
-				<a href="v_ivr_options_edit.php?parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>&a=antiaction"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a>
+				<a href="v_auto_attendant_options_edit.php?parentid=<?=$parentid;?>&ivrid=<?=$ivrid;?>&a=antiaction"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a>
 			<? } ?>
 			</td>
           </tr>
diff --git a/config/freeswitch_dev/v_ivr_options.tmp b/config/freeswitch_dev/v_auto_attendant_options.tmp
index 4dbff8a2..f92a59d5 100755
--- a/config/freeswitch_dev/v_ivr_options.tmp
+++ b/config/freeswitch_dev/v_auto_attendant_options.tmp
@@ -1,7 +1,7 @@
 <?php
 /* $Id$ */
 /*
-	v_ivr_options.php
+	v_auto_attendant_options.php
 	Copyright (C) 2008 Mark J Crane
 	All rights reserved.
 
@@ -40,7 +40,7 @@ if ($_GET['act'] == "del") {
             unset($a_ivr_options[$_GET['id']]);
             write_config();
             sync_package_v_ivr();
-            header("Location: v_ivr_edit.php?id=".$_GET['parentid']);
+            header("Location: v_auto_attendant_edit.php?id=".$_GET['parentid']);
             exit;
         }
     }
diff --git a/config/freeswitch_dev/v_ivr_options_edit.tmp b/config/freeswitch_dev/v_auto_attendant_options_edit.tmp
index 06b69681..7be21e6b 100644
--- a/config/freeswitch_dev/v_ivr_options_edit.tmp
+++ b/config/freeswitch_dev/v_auto_attendant_options_edit.tmp
@@ -2,7 +2,7 @@
 /* $Id$ */
 /*
 
-	v_recordings_edit.php
+	v_auto_attendant_options_edit.php
 	Copyright (C) 2008 Mark J Crane
 	All rights reserved.
 
@@ -96,7 +96,7 @@ if ($_POST) {
 		write_config();
 		sync_package_v_ivr();
 		
-		header("Location: v_ivr_edit.php?id=".$parentid);
+		header("Location: v_auto_attendant_edit.php?id=".$parentid);
 		exit;
 	}
 }
@@ -129,7 +129,7 @@ build_menu();
    <tr>
      <td class="tabcont" >
 		<br />
-        <form action="v_ivr_options_edit.php" method="post" name="iform" id="iform">
+        <form action="v_auto_attendant_options_edit.php" method="post" name="iform" id="iform">
             <table width="100%" border="0" cellpadding="6" cellspacing="0">
             <tr>
               <td width="22%" valign="top" class="vncellreq">Option Number</td>
diff --git a/config/freeswitch_dev/v_config.inc b/config/freeswitch_dev/v_config.inc
index 69350a9e..9ae25dec 100644
--- a/config/freeswitch_dev/v_config.inc
+++ b/config/freeswitch_dev/v_config.inc
@@ -49,15 +49,20 @@ function v_settings()
 {
 	global $config;
 	$config['installedpackages']['freeswitchsettings']['config'][0]['php_dir'] = '/usr/local/bin/php';
-	$config['installedpackages']['freeswitchsettings']['config'][0]['tmp_dir'] = '/tmp/';
+	$config['installedpackages']['freeswitchsettings']['config'][0]['tmp_dir'] = '/tmp';
+	$config['installedpackages']['freeswitchsettings']['config'][0]['bin_dir'] = '/usr/local/bin';
+	$config['installedpackages']['freeswitchsettings']['config'][0]['v_startup_script_dir'] = '/usr/local/etc/rc.d';
 	$config['installedpackages']['freeswitchsettings']['config'][0]['v_package_version'] = "0.9.7.13";
 	$config['installedpackages']['freeswitchsettings']['config'][0]['v_build_version'] = "1.0.4";
-	$config['installedpackages']['freeswitchsettings']['config'][0]['v_build_revision'] = "";
+	$config['installedpackages']['freeswitchsettings']['config'][0]['v_build_revision'] = "Release";
 	$config['installedpackages']['freeswitchsettings']['config'][0]['v_label'] = 'FreeSWITCH'; //FreeSWITCH (TM) http://www.freeswitch.org/
 	$config['installedpackages']['freeswitchsettings']['config'][0]['v_name'] = 'freeswitch';
 	$config['installedpackages']['freeswitchsettings']['config'][0]['v_dir'] = '/usr/local/freeswitch';
+	$config['installedpackages']['freeswitchsettings']['config'][0]['v_parent_dir'] = '/usr/local/';
 	$config['installedpackages']['freeswitchsettings']['config'][0]['v_backup_dir'] = '/root/backup';
 	$config['installedpackages']['freeswitchsettings']['config'][0]['v_web_dir'] = '/usr/local/www/packages/freeswitch';
+	$config['installedpackages']['freeswitchsettings']['config'][0]['v_web_root'] = '/usr/local/www/';	
+	$config['installedpackages']['freeswitchsettings']['config'][0]['v_relative_url'] = '/packages/freeswitch';
 	$config['installedpackages']['freeswitchsettings']['config'][0]['v_conf_dir'] = '/usr/local/freeswitch/conf';
 	$config['installedpackages']['freeswitchsettings']['config'][0]['v_db_dir'] = '/usr/local/freeswitch/db';
 	$config['installedpackages']['freeswitchsettings']['config'][0]['v_htdocs_dir'] = '/usr/local/freeswitch/htdocs';
@@ -79,69 +84,69 @@ function build_menu() {
 	
 	$tab_array = array();
 	$menu_selected = false;
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_settings.php") { $menu_selected = true; }
-	$tab_array[] = array(gettext("Settings"), $menu_selected, "/packages/freeswitch/v_settings.php");
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_settings.php") { $menu_selected = true; }
+	$tab_array[] = array(gettext("Settings"), $menu_selected, $v_relative_url."/v_settings.php");
 	unset($menu_selected);
 
 	$menu_selected = false;
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_dialplan_includes.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_dialplan.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_dialplan_includes_edit.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_dialplan_includes_details_edit.php") { $menu_selected = true; }
-	$tab_array[] = array(gettext("Dialplan"), $menu_selected, "/packages/freeswitch/v_dialplan_includes.php");
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_dialplan_includes.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_dialplan.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_dialplan_includes_edit.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_dialplan_includes_details_edit.php") { $menu_selected = true; }
+	$tab_array[] = array(gettext("Dialplan"), $menu_selected, $v_relative_url."/v_dialplan_includes.php");
 	unset($menu_selected);
 
 	$menu_selected = false;
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_extensions.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_extensions_edit.php") { $menu_selected = true; }
-	$tab_array[] = array(gettext("Extensions"), $menu_selected, "/packages/freeswitch/v_extensions.php");
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_extensions.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_extensions_edit.php") { $menu_selected = true; }
+	$tab_array[] = array(gettext("Extensions"), $menu_selected, $v_relative_url."/v_extensions.php");
 	unset($menu_selected);
 
 	$menu_selected = false;
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_features.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_fax.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_fax_edit.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_hunt_group.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_hunt_group_edit.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_hunt_group_destinations.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_hunt_group_destinations_edit.php") { $menu_selected = true; }	
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_ivr.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_ivr_edit.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_ivr_options_edit.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_modules.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_recordings.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_recordings_edit.php") { $menu_selected = true; }
-	$tab_array[] = array(gettext("Features"), $menu_selected, "/packages/freeswitch/v_features.php");
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_features.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_fax.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_fax_edit.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_hunt_group.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_hunt_group_edit.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_hunt_group_destinations.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_hunt_group_destinations_edit.php") { $menu_selected = true; }	
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_auto_attendant.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_auto_attendant_edit.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_auto_attendant_options_edit.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_modules.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_recordings.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_recordings_edit.php") { $menu_selected = true; }
+	$tab_array[] = array(gettext("Features"), $menu_selected, $v_relative_url."/v_features.php");
 	unset($menu_selected);
 
 	$menu_selected = false;
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_gateways.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_gateways_edit.php") { $menu_selected = true; }
-	$tab_array[] = array(gettext("Gateways"), $menu_selected, "/packages/freeswitch/v_gateways.php");
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_gateways.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_gateways_edit.php") { $menu_selected = true; }
+	$tab_array[] = array(gettext("Gateways"), $menu_selected, $v_relative_url."/v_gateways.php");
 	unset($menu_selected);
 
 	$menu_selected = false;
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_profiles.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_profile_edit.php") { $menu_selected = true; }
-	$tab_array[] = array(gettext("Profiles"), $menu_selected, "/packages/freeswitch/v_profiles.php");
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_profiles.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_profile_edit.php") { $menu_selected = true; }
+	$tab_array[] = array(gettext("Profiles"), $menu_selected, $v_relative_url."/v_profiles.php");
 	unset($menu_selected);
 
 	$menu_selected = false;
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_public.php") { $menu_selected = true; }	
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_public_includes.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_public_includes_edit.php") { $menu_selected = true; }
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_public_includes_details_edit.php") { $menu_selected = true; }	
-	$tab_array[] = array(gettext("Public"), $menu_selected, "/packages/freeswitch/v_public_includes.php");
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_public.php") { $menu_selected = true; }	
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_public_includes.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_public_includes_edit.php") { $menu_selected = true; }
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_public_includes_details_edit.php") { $menu_selected = true; }	
+	$tab_array[] = array(gettext("Public"), $menu_selected, $v_relative_url."/v_public_includes.php");
 	unset($menu_selected);
 
 	$menu_selected = false;
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_status.php") { $menu_selected = true; }
-	$tab_array[] = array(gettext("Status"), $menu_selected, "/packages/freeswitch/v_status.php");
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_status.php") { $menu_selected = true; }
+	$tab_array[] = array(gettext("Status"), $menu_selected, $v_relative_url."/v_status.php");
 	unset($menu_selected);
 
 	$menu_selected = false;
-	if ($_SERVER["SCRIPT_NAME"] == "/packages/freeswitch/v_vars.php") { $menu_selected = true; }
-	$tab_array[] = array(gettext("Vars"), $menu_selected, "/packages/freeswitch/v_vars.php");
+	if ($_SERVER["SCRIPT_NAME"] == $v_relative_url."/v_vars.php") { $menu_selected = true; }
+	$tab_array[] = array(gettext("Vars"), $menu_selected, $v_relative_url."/v_vars.php");
 	unset($menu_selected);
 	
 	display_top_tabs($tab_array);
@@ -1542,7 +1547,7 @@ function sync_package_v_hunt_group()
 							$tmp .=	"session.streamFile( \"".$v_dir."/sounds/custom/8000/please_say_your_name_and_reason_for_calling.wav\");\n";
 							$tmp .=	"session.execute(\"gentones\", \"%(1000, 0, 640)\");\n";
 							$tmp .=	"session.execute(\"set\", \"playback_terminators=#\");\n";
-							$tmp .=	"session.execute(\"record\", \"/tmp/\"+caller_announce+\" 180 200\");\n";
+							$tmp .=	"session.execute(\"record\", \"".$tmp_dir."/\"+caller_announce+\" 180 200\");\n";
 							$tmp .=	"\n";
 							$tmp .=	"result = session.setAutoHangup(false);\n";
 							$tmp .=	"session.execute(\"transfer\", \"*\"+extension+\" XML default\");\n";
@@ -3112,8 +3117,8 @@ function v_install_phase_2() {
 
 	clearstatcache(); //clear file status cache
 	
-	if (!is_dir('/usr/local/www/packages/')) {
-	   exec("mkdir /usr/local/www/packages/");
+	if (!is_dir($v_web_root.'/packages/')) {
+	   exec("mkdir ".$v_web_root."/packages/");
 	}
 
 	if (!is_dir($v_web_dir)) {
@@ -3150,11 +3155,12 @@ function v_install_phase_2() {
 	
 	
 	//misc files
-	if (!is_dir('/usr/local/www/edit_area/')) {
-		chdir('/tmp/');
-		exec("cd /tmp/;fetch ".$v_download_path."edit_area.tgz");
-		system('cd /usr/local/www; tar xvpfz /tmp/edit_area.tgz edit_area');
-		unlink_if_exists("/tmp/edit_area.tgz");
+	if (!is_dir($v_web_root.'/edit_area/')) {
+		chdir($tmp_dir);
+		exec("fetch ".$v_download_path."edit_area.tgz");
+		chdir($v_web_root);
+		system('tar xvpfz ".tmp_dir."/edit_area.tgz edit_area');
+		unlink_if_exists($tmp_dir."/edit_area.tgz");
 	}
 
 	
@@ -3210,7 +3216,7 @@ function v_install_phase_2() {
 
 	exec("fetch ".$v_download_path."v_fax_edit.tmp");
 	exec("cp ".$tmp_dir."/v_fax_edit.tmp ".$v_web_dir."/v_fax_edit.php");
-	unlink_if_exists("/tmp/v_fax_edit.tmp");
+	unlink_if_exists($tmp_dir."/v_fax_edit.tmp");
 
 	exec("fetch ".$v_download_path."fax_to_email.tmp");
 	exec("cp ".$tmp_dir."/fax_to_email.tmp ".$v_web_dir."/fax_to_email.php");
@@ -3244,21 +3250,21 @@ function v_install_phase_2() {
 	exec("cp ".$tmp_dir."/v_hunt_group_destinations_edit.tmp ".$v_web_dir."/v_hunt_group_destinations_edit.php");
 	unlink_if_exists($tmp_dir."/v_hunt_group_destinations_edit.tmp");
 
-	exec("fetch ".$v_download_path."v_ivr.tmp");	
-	exec("cp ".$tmp_dir."/v_ivr.tmp ".$v_web_dir."/v_ivr.php");
-	unlink_if_exists($tmp_dir."/v_ivr.tmp");
+	exec("fetch ".$v_download_path."v_auto_attendant.tmp");	
+	exec("cp ".$tmp_dir."/v_auto_attendant.tmp ".$v_web_dir."/v_auto_attendant.php");
+	unlink_if_exists($tmp_dir."/v_auto_attendant.tmp");
 
-	exec("fetch ".$v_download_path."v_ivr_edit.tmp");
-	exec("cp ".$tmp_dir."/v_ivr_edit.tmp ".$v_web_dir."/v_ivr_edit.php");
-	unlink_if_exists($tmp_dir."/v_ivr_edit.tmp");
+	exec("fetch ".$v_download_path."v_auto_attendant_edit.tmp");
+	exec("cp ".$tmp_dir."/v_auto_attendant_edit.tmp ".$v_web_dir."/v_auto_attendant_edit.php");
+	unlink_if_exists($tmp_dir."/v_auto_attendant_edit.tmp");
 
-	exec("fetch ".$v_download_path."v_ivr_options.tmp");
-	exec("cp ".$tmp_dir."/v_ivr_options.tmp ".$v_web_dir."/v_ivr_options.php");
-	unlink_if_exists($tmp_dir."/v_ivr_options.tmp");
+	exec("fetch ".$v_download_path."v_auto_attendant_options.tmp");
+	exec("cp ".$tmp_dir."/v_auto_attendant_options.tmp ".$v_web_dir."/v_auto_attendant_options.php");
+	unlink_if_exists($tmp_dir."/v_auto_attendant_options.tmp");
 
-	exec("fetch ".$v_download_path."v_ivr_options_edit.tmp");
-	exec("cp ".$tmp_dir."/v_ivr_options_edit.tmp ".$v_web_dir."/v_ivr_options_edit.php");
-	unlink_if_exists($tmp_dir."/v_ivr_options_edit.tmp");
+	exec("fetch ".$v_download_path."v_auto_attendant_options_edit.tmp");
+	exec("cp ".$tmp_dir."/v_auto_attendant_options_edit.tmp ".$v_web_dir."/v_auto_attendant_options_edit.php");
+	unlink_if_exists($tmp_dir."/v_auto_attendant_options_edit.tmp");
 
 	exec("fetch ".$v_download_path."v_profiles.tmp");
 	exec("cp ".$tmp_dir."/v_profiles.tmp ".$v_web_dir."/v_profiles.php");
@@ -3316,18 +3322,9 @@ function v_install_phase_2() {
 	exec("cp ".$tmp_dir."/v_status.tmp ".$v_web_dir."/v_status.php");
 	unlink_if_exists($tmp_dir."/v_status.tmp");
 
-	exec("fetch ".$v_download_path."v_time_conditions.tmp");
-	exec("cp ".$tmp_dir."/v_time_conditions.tmp ".$v_web_dir."/v_time_conditions.php");
-	unlink_if_exists($tmp_dir."/v_time_conditions.tmp");
-
-	exec("fetch ".$v_download_path."v_time_conditions_edit.tmp");
-	exec("cp ".$tmp_dir."/v_time_conditions_edit.tmp ".$v_web_dir."/v_time_conditions_edit.php");
-	unlink_if_exists($tmp_dir."/v_time_conditions_edit.tmp");
-
 	exec("fetch ".$v_download_path."v_vars.tmp");
 	exec("cp ".$tmp_dir."/v_vars.tmp ".$v_web_dir."/v_vars.php");
 	unlink_if_exists($tmp_dir."/v_vars.tmp");
-
 	
 	chdir($v_scripts_dir);
 	exec("fetch ".$v_download_path."disa.js");
@@ -3369,9 +3366,9 @@ function v_install_phase_1()
 //	update_output_window($static_output);
 	
 	
-	//exec("cd /tmp/;fetch ".$download_path."freeswitch.tgz"); //handled by freeswitch.xml
-	//exec("tar zxvf /tmp/freeswitch.tgz -C /usr/local/");
-	//unlink_if_exists("/tmp/freeswitch.tgz");
+	//exec("fetch ".$download_path."freeswitch.tgz"); //handled by freeswitch.xml
+	//exec("tar zxvf ".$tmp_dir."/freeswitch.tgz -C /usr/local/");
+	//unlink_if_exists($tmp_dir."/freeswitch.tgz");
 
 	
 //	$static_output = 'Downloading Files';
diff --git a/config/freeswitch_dev/v_dialplan.tmp b/config/freeswitch_dev/v_dialplan.tmp
index 034f60f9..e15108e3 100644
--- a/config/freeswitch_dev/v_dialplan.tmp
+++ b/config/freeswitch_dev/v_dialplan.tmp
@@ -112,7 +112,7 @@ build_menu();
         <td width='90%'><p><span class="vexpl"><span class="red"><strong>Default Dialplan<br>
             </strong></span>
             The default dialplan is used to setup call destinations based on conditions and context. 
-			You can use the dialplan to send calls to gateways, IVRs, external numbers, to scripts, or any destination.
+			You can use the dialplan to send calls to gateways, auto attendants, external numbers, to scripts, or any destination.
             </p>
 		</td>
 		<td width='10%' align='right' valign='middle'><input type="submit" value="save" /></td>
@@ -138,7 +138,7 @@ build_menu();
 			<input type="hidden" name="f" value="<?php echo $_GET['f']; ?>" />
 			<input type="hidden" name="a" value="save" />
 			<?php
-			echo "<input type='button' value='Restore Default' onclick=\"document.location.href='/packages/freeswitch/v_dialplan.php?a=default&f=default.xml';\" />";
+			echo "<input type='button' value='Restore Default' onclick=\"document.location.href='v_dialplan.php?a=default&f=default.xml';\" />";
 			?>
 		</td>
       </tr>
diff --git a/config/freeswitch_dev/v_dialplan_includes.tmp b/config/freeswitch_dev/v_dialplan_includes.tmp
index 6ce4a3f6..0377d148 100644
--- a/config/freeswitch_dev/v_dialplan_includes.tmp
+++ b/config/freeswitch_dev/v_dialplan_includes.tmp
@@ -155,13 +155,15 @@ build_menu();
             </strong></span></span>
         </td>
         <td align='right'>
-          <input type='button' value='default.xml' onclick="document.location.href='/packages/freeswitch/v_dialplan.php';">
+          <input type='button' value='default.xml' onclick="document.location.href='v_dialplan.php';">
         </td>
       </tr>
       <tr>
         <td colspan='2'>
           <span class="vexpl">
-              The dialplan is used to setup call destinations based on conditions and context. You can use the dialplan to send calls to gateways, IVRs, external numbers, to scripts, or any destination.
+              The dialplan is used to setup call destinations based on conditions and context. 
+			  You can use the dialplan to send calls to gateways, auto attendants, external numbers, 
+			  to scripts, or any destination.
           </span>
         </td>
 
diff --git a/config/freeswitch_dev/v_dialplan_includes_details_edit.tmp b/config/freeswitch_dev/v_dialplan_includes_details_edit.tmp
index 789f3d1f..d3c3aeba 100644
--- a/config/freeswitch_dev/v_dialplan_includes_details_edit.tmp
+++ b/config/freeswitch_dev/v_dialplan_includes_details_edit.tmp
@@ -96,16 +96,16 @@ if ($_POST) {
 
 
 		if (isset($id) && $a_dialplan_includes_details[$id]) {
-		  //update
-      $a_dialplan_includes_details[$id] = $ent;
+			//update
+			$a_dialplan_includes_details[$id] = $ent;
 		}
 		else {
-		  //add
+			//add
 			$a_dialplan_includes_details[] = $ent;
 		}
 				
 		write_config();
-    sync_package_v_dialplan_includes();
+		sync_package_v_dialplan_includes();
 		
 		header("Location: v_dialplan_includes_edit.php?id=".$parentid);
 		exit;
@@ -275,13 +275,17 @@ build_menu();
             </table>
         </form>
 
-      <br />
-      <br />
-      <b>Additional Information</b>
-      <br />
-      <br />
-      <a href='http://wiki.freeswitch.org/wiki/Dialplan_XML' target='_blank'>http://wiki.freeswitch.org/wiki/Dialplan_XML</a>
 
+	  <?php
+	  if ($v_path_show) {
+		echo "<br />\n";
+		echo "<br />\n";
+		echo "<b>Additional Information</b>\n";
+		echo "<br />\n";
+		echo "<br />\n";
+		echo "<a href='http://wiki.freeswitch.org/wiki/Dialplan_XML' target='_blank'>http://wiki.freeswitch.org/wiki/Dialplan_XML</a>";
+	  }
+	  ?>
       <br />
       <br />
       <br />
@@ -290,7 +294,7 @@ build_menu();
       <b>Conditions</b>
       <br />
       <br />
-      Conditions are pattern matching tags that help FreeSwitch decide if the current call should be processed in this extension or not. When matching conditions against the current call you have several <b>fields</b> that you can compare against.
+      Conditions are pattern matching tags that help decide if the current call should be processed in this extension or not. When matching conditions against the current call you have several <b>fields</b> that you can compare against.
       <ul>
           <li><b>context</b></li>
           <li><b>rdnis</b> Redirected Number, the directory number to which the call was last presented.</li>
@@ -301,7 +305,7 @@ build_menu();
           <li><b>ani</b> Automatic Number Identification, the number of the calling party (callee) -- cannot be masked</li>
           <li><b>ani2</b> The type of device placing the call [1]</li>
           <li><b>uuid</b> Unique identifier of the current call? (looks like a GUID)</li>
-          <li><b>source</b> Name of the FreeSwitch module that received the call (e.g. PortAudio)</li>
+          <li><b>source</b> Name of the module that received the call (e.g. PortAudio)</li>
           <li><b>chan_name</b> Name of the current channel (Example: PortAudio/1234). Give us examples when this one can be used.</li>
           <li><b>network_addr</b> IP address of the signalling source for a VoIP call.</li>
       </ul>
@@ -319,10 +323,14 @@ build_menu();
       <br />
       <br />
       Actions are executed when the <b>condition matches</b>. Anti-Actions are executed when the <b>condition does NOT match</b>.
-      Additional information on applications for Actions and Anti-Actions.<br />
-      <a href='http://wiki.freeswitch.org/wiki/Modules#Applications' target='_blank'>http://wiki.freeswitch.org/wiki/Modules#Applications</a>
-      <br />
-      <a href='http://wiki.freeswitch.org/wiki/Dialplan_Functions' target='_blank'>http://wiki.freeswitch.org/wiki/Dialplan_Functions</a>
+	  <?php
+	  if ($v_path_show) {
+		  echo "Additional information on applications for Actions and Anti-Actions.<br />\n";
+		  echo "<a href='http://wiki.freeswitch.org/wiki/Modules#Applications' target='_blank'>http://wiki.freeswitch.org/wiki/Modules#Applications</a>\n";
+		  echo "<br />\n";
+		  echo "<a href='http://wiki.freeswitch.org/wiki/Dialplan_Functions' target='_blank'>http://wiki.freeswitch.org/wiki/Dialplan_Functions</a>\n";
+	  }
+	  ?>
       <br />
       <br />
       <br />
@@ -358,8 +366,12 @@ build_menu();
       <b>Param</b>
       Example parameters by name and value
       <br />
-      <a href='http://wiki.freeswitch.org/wiki/Special:Search?search=param&go=Go' target='_blank'>http://wiki.freeswitch.org/wiki/Special:Search?search=param&go=Go</a>
-      <ul>
+	  <?php
+	  if ($v_path_show) {
+		echo "<a href='http://wiki.freeswitch.org/wiki/Special:Search?search=param&go=Go' target='_blank'>http://wiki.freeswitch.org/wiki/Special:Search?search=param&go=Go</a>\n";
+      }
+	  ?>
+	  <ul>
       <li><b>codec-ms</b> 20</li>
       <li><b>codec-prefs</b> PCMU@20i</li>
       <li><b>debug</b> 1</li>
diff --git a/config/freeswitch_dev/v_fax.tmp b/config/freeswitch_dev/v_fax.tmp
index 40beb598..5085614f 100644
--- a/config/freeswitch_dev/v_fax.tmp
+++ b/config/freeswitch_dev/v_fax.tmp
@@ -180,7 +180,16 @@ if ($config_change == 1) {
       <tr>
         <td><p><span class="vexpl"><span class="red"><strong>FAX<br>
             </strong></span>
-			To receive a FAX setup a fax extension and then direct the incoming FAX with a dedicated number or you can detect the FAX tone by using <a href='http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_tone_detect' target='_blank'>tone detection</a> on the Public tab.
+			To receive a FAX setup a fax extension and then direct the incoming FAX with a dedicated number or you can detect the FAX tone by using 
+			<?php
+			if ($v_path_show) {
+				echo "<a href='http://wiki.freeswitch.org/wiki/Misc._Dialplan_Tools_tone_detect' target='_blank'>tone detection</a>\n";
+			}
+			else {
+				echo "tone detection\n";
+			}
+			?>
+			on the Public tab.
             </p></td>
       </tr>
     </table>
diff --git a/config/freeswitch_dev/v_fax_edit.tmp b/config/freeswitch_dev/v_fax_edit.tmp
index 76a0449d..1548f3fb 100644
--- a/config/freeswitch_dev/v_fax_edit.tmp
+++ b/config/freeswitch_dev/v_fax_edit.tmp
@@ -152,8 +152,8 @@ if (($_POST['type'] == "fax_send") && is_uploaded_file($_FILES['fax_file']['tmp_
 		//exec("rm ".$dir_fax_temp.$fax_name.".tif");
 	
 	//convert the tif to pdf and png
-		exec("cd $dir_fax_sent; /usr/local/bin/tiff2png ".$dir_fax_sent.$fax_name.".tif");
-		exec("cd $dir_fax_sent; /usr/local/bin/tiff2pdf -f -o ".$fax_name.".pdf ".$dir_fax_sent.$fax_name.".tif");
+		exec("cd $dir_fax_sent; ".bin_dir."/tiff2png ".$dir_fax_sent.$fax_name.".tif");
+		exec("cd $dir_fax_sent; ".bin_dir."/tiff2pdf -f -o ".$fax_name.".pdf ".$dir_fax_sent.$fax_name.".tif");
 
 	header("Location: v_fax_edit.php?id=".$id."&msg=".$response);
 	exit;
diff --git a/config/freeswitch_dev/v_features.tmp b/config/freeswitch_dev/v_features.tmp
index 781e0bc8..590791c5 100644
--- a/config/freeswitch_dev/v_features.tmp
+++ b/config/freeswitch_dev/v_features.tmp
@@ -93,12 +93,10 @@ build_menu();
       <td class="listtopic" colspan='2'>Auto Attendant</td>
 	</tr>
     <tr>
-		<td width='10%' class="vncell"><a href='v_ivr.php'>Open</a></td>
+		<td width='10%' class="vncell"><a href='v_auto_attendant.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.
+			Auto Attendant provides callers the ability to choose between multiple options that direct calls to extensions, 
+			voicemail, conferences, queues, other auto attendants, and external phone numbers.
 		</td>
 	</tr>
 	</table>
@@ -113,8 +111,8 @@ build_menu();
     <tr>
 		<td width='10%' class="vncell"></td>
 		<td class="vtable">
-			Direct Inward System Access (DISA) allows inbound callers to make internal or external calls. For security reasons it is disabled by default.  
-			To enable it first set a secure pin number from the Settings->Admin PIN Number.
+			Direct Inward System Access (DISA) allows inbound callers to make internal or external calls. For security reasons 
+			it is disabled by default. To enable it first set a secure pin number from the Settings->Admin PIN Number.
 			Then go to Dialplan tab and find the DISA entry and edit it to set 'Enabled' to 'true'. 
 			To use DISA dial *3472 (disa) enter the admin pin code and the extension or phone number you wish to call.
 		</td>
diff --git a/config/freeswitch_dev/v_gateways.tmp b/config/freeswitch_dev/v_gateways.tmp
index 3ccac677..0dc14ba3 100644
--- a/config/freeswitch_dev/v_gateways.tmp
+++ b/config/freeswitch_dev/v_gateways.tmp
@@ -30,7 +30,7 @@
 require("guiconfig.inc");
 require("/usr/local/pkg/v_config.inc");
 
-$a_gateways 	   = &$config['installedpackages']['freeswitchgateways']['config'];
+$a_gateways = $config['installedpackages']['freeswitchgateways']['config'];
 
 
 if ($_GET['act'] == "del") {
@@ -87,7 +87,7 @@ if ($config_change == 1) {
 
 //if ($savemsg) print_info_box($savemsg);
 //if (file_exists($d_hostsdirty_path)): echo"<p>";
-//print_info_box_np("The FreeSWITCH gateways have been changed.<br>You must apply the changes in order for them to take effect.");
+//print_info_box_np("The gateways have been changed.<br>You must apply the changes in order for them to take effect.");
 //echo"<br />";
 //endif;
 
diff --git a/config/freeswitch_dev/v_gateways_edit.tmp b/config/freeswitch_dev/v_gateways_edit.tmp
index 10c68e93..649c6f90 100644
--- a/config/freeswitch_dev/v_gateways_edit.tmp
+++ b/config/freeswitch_dev/v_gateways_edit.tmp
@@ -352,9 +352,14 @@ build_menu();
       <tr>
         <td><p><span class="vexpl"><span class="red"><strong>Gateway Setup<br>
             </strong></span>
-            The 'SIP Provider Examples' from the FreeSWITCH wiki can be used as reference to get started. <br />
-            <a href='http://wiki.freeswitch.org/wiki/SIP_Provider_Examples' target='_blank'>http://wiki.freeswitch.org/wiki/SIP_Provider_Examples</a>
-            </p></td>
+			Gateways provide access into other voice networks. These can be voice providers or other systems that require SIP registration. 
+			<?php
+			if ($v_path_show) {
+				echo "The 'SIP Provider Examples' from the FreeSWITCH wiki can be used as reference to get started. <br />\n";
+				echo "<a href='http://wiki.freeswitch.org/wiki/SIP_Provider_Examples' target='_blank'>http://wiki.freeswitch.org/wiki/SIP_Provider_Examples</a>\n";
+            }
+			?>
+			</p></td>
       </tr>
     </table>
     <br />
diff --git a/config/freeswitch_dev/v_hunt_group.tmp b/config/freeswitch_dev/v_hunt_group.tmp
index fe0dbc26..6441ea12 100644
--- a/config/freeswitch_dev/v_hunt_group.tmp
+++ b/config/freeswitch_dev/v_hunt_group.tmp
@@ -38,8 +38,8 @@ $a_dialplan_include_details 	= &$config['installedpackages']['freeswitchdialplan
 if ($_GET['act'] == "del") {
     if ($_GET['type'] == 'huntgroup') {
         if ($a_hunt_group[$_GET['id']]) {
-			if (file_exists("/usr/local/freeswitch/scripts/huntgroup_".$_GET['huntgroupid'].".js")) {
-				unlink("/usr/local/freeswitch/scripts/huntgroup_".$_GET['huntgroupid'].".js");
+			if (file_exists($v_scripts_dir."/huntgroup_".$_GET['huntgroupid'].".js")) {
+				unlink($v_scripts_dir."/huntgroup_".$_GET['huntgroupid'].".js");
 			}
 			/*
 			//delete dialplan include details
diff --git a/config/freeswitch_dev/v_mailto.tmp b/config/freeswitch_dev/v_mailto.tmp
index deee4900..407123aa 100644
--- a/config/freeswitch_dev/v_mailto.tmp
+++ b/config/freeswitch_dev/v_mailto.tmp
@@ -50,7 +50,7 @@ $email = file_get_contents ("php://stdin");
 fclose($fd);
 
 if($fd){
-    $fp = fopen("/tmp/voicemailtoemail.txt", "w");
+    $fp = fopen($tmp_dir."/voicemailtoemail.txt", "w");
 }
 
 
@@ -180,8 +180,8 @@ ob_start();
 
 //send the email
 
-      include "/usr/local/www/packages/freeswitch/class.phpmailer.php";
-      include "/usr/local/www/packages/freeswitch/class.smtp.php"; // optional, gets called from within class.phpmailer.php if not already loaded
+      include $v_web_dir."/class.phpmailer.php";
+      include $v_web_dir."/class.smtp.php"; // optional, gets called from within class.phpmailer.php if not already loaded
 
       $mail = new PHPMailer();
 
diff --git a/config/freeswitch_dev/v_modules.tmp b/config/freeswitch_dev/v_modules.tmp
index 281d4d8b..57ff51fc 100644
--- a/config/freeswitch_dev/v_modules.tmp
+++ b/config/freeswitch_dev/v_modules.tmp
@@ -334,7 +334,11 @@ build_menu();
       <tr>
         <td><p><span class="vexpl"><span class="red"><strong>Modules<br />
             </strong></span>
-            /usr/local/freeswitch/mod/
+			<?php
+			if ($v_path_show) {
+				echo $v_mod_dir."\n";
+			}
+			?>
             </p></td>
       </tr>
     </table>
diff --git a/config/freeswitch_dev/v_profile_edit.tmp b/config/freeswitch_dev/v_profile_edit.tmp
index 23e4dd7b..f8f187c2 100644
--- a/config/freeswitch_dev/v_profile_edit.tmp
+++ b/config/freeswitch_dev/v_profile_edit.tmp
@@ -32,8 +32,8 @@ require("/usr/local/pkg/v_config.inc");
 
 //$a_extensions 	   = &$config['installedpackages']['freeswitchprofiles']['config'];
 
-$fd = fopen("/usr/local/freeswitch/conf/sip_profiles/".$_GET['f'], "r");
-$content = fread($fd, filesize("/usr/local/freeswitch/conf/sip_profiles/".$_GET['f']));
+$fd = fopen($v_conf_dir."/sip_profiles/".$_GET['f'], "r");
+$content = fread($fd, filesize($v_conf_dir."/sip_profiles/".$_GET['f']));
 fclose($fd);
 	
 include("head.inc");
@@ -107,11 +107,15 @@ build_menu();
 
   	<table width="98%" border="0" cellpadding="6" cellspacing="0">
       <tr>
-        <td>/usr/local/freeswitch/conf/sip_profiles/<?php echo $_GET['f']; ?></td>
+        <td>
+		<?php
+		if ($v_path_show) {
+			echo $v_conf_dir."/sip_profiles/".$_GET['f']."</td>";
+		}
 		<td align='right'>
 			<input type="hidden" name="a" value="save" />
 			<?php
-			echo "<input type='button' value='Restore Default' onclick=\"document.location.href='/packages/freeswitch/v_profiles.php?a=default&f=".$_GET['f']."';\" />";
+			echo "<input type='button' value='Restore Default' onclick=\"document.location.href='v_profiles.php?a=default&f=".$_GET['f']."';\" />";
 			?>
 		</td>
       </tr>
diff --git a/config/freeswitch_dev/v_profiles.tmp b/config/freeswitch_dev/v_profiles.tmp
index a8e12e9c..f3bdc873 100644
--- a/config/freeswitch_dev/v_profiles.tmp
+++ b/config/freeswitch_dev/v_profiles.tmp
@@ -35,7 +35,7 @@ require("/usr/local/pkg/v_config.inc");
 
 if ($_GET['a'] == "default") {
 	conf_mount_rw();
-	exec("cp /usr/local/freeswitch/conf.orig/sip_profiles/".$_GET['f']." /usr/local/freeswitch/conf/sip_profiles/".$_GET['f']);
+	exec("cp ".$v_conf_dir.".orig/sip_profiles/".$_GET['f']." ".$v_conf_dir."/sip_profiles/".$_GET['f']);
 	$savemsg = "Restore Default";
 	conf_mount_ro();
 }
@@ -43,7 +43,7 @@ if ($_GET['a'] == "default") {
 if ($_POST['a'] == "save") {
 	conf_mount_rw();
 	$content = ereg_replace("\r","",$_POST['code']);
-	$fd = fopen("/usr/local/freeswitch/conf/sip_profiles/".$_POST['f'], "w");
+	$fd = fopen($v_conf_dir."/sip_profiles/".$_POST['f'], "w");
 	fwrite($fd, $content);
 	fclose($fd);
 	$savemsg = "Saved";
@@ -57,7 +57,7 @@ if ($_GET['a'] == "del") {
             //unset($a_extensions[$_GET['id']]);
             //write_config();
 
-			exec("rm /usr/local/freeswitch/conf/sip_profiles/".$_GET['f']);			
+			exec("rm ".$v_conf_dir."/sip_profiles/".$_GET['f']);			
             header("Location: v_profiles.php");
             exit;
         //}
@@ -118,7 +118,7 @@ build_menu();
 
 	<?php
 
-	foreach (ListFiles('/usr/local/freeswitch/conf/sip_profiles') as $key=>$file){
+	foreach (ListFiles($v_conf_dir.'/sip_profiles') as $key=>$file){
     ?>
           <tr>
             <td class="listr" ondblclick="document.location='v_profile_edit.php?f=<?=$file;?>';" valign="middle">
@@ -194,7 +194,11 @@ build_menu();
 
 <br>
 <br>
-/usr/local/freeswitch/conf/sip_profiles
+<?php
+if ($v_path_show) {
+	echo $v_conf_dir."/sip_profiles\n";
+}
+?>
 <br>
 <br>
 <br>
diff --git a/config/freeswitch_dev/v_public.tmp b/config/freeswitch_dev/v_public.tmp
index 5a629f58..e704ea10 100644
--- a/config/freeswitch_dev/v_public.tmp
+++ b/config/freeswitch_dev/v_public.tmp
@@ -30,11 +30,11 @@
 require("guiconfig.inc");
 require("/usr/local/pkg/v_config.inc");
 
-//$a_extensions 	   = &$config['installedpackages']['freeswitchprofiles']['config'];
+//$a_extensions = $config['installedpackages']['freeswitchprofiles']['config'];
 
 if ($_GET['a'] == "default") {
 	conf_mount_rw();
-	exec("cp /usr/local/freeswitch/conf.orig/dialplan/public.xml /usr/local/freeswitch/conf/dialplan/public.xml");
+	exec("cp "$v_conf_dir.".orig/dialplan/public.xml ".$v_conf_dir."/dialplan/public.xml");
 	$savemsg = "Default Restored";
 	conf_mount_ro();
 }
@@ -42,7 +42,7 @@ if ($_GET['a'] == "default") {
 if ($_POST['a'] == "save") {
 	conf_mount_rw();
 	$content = ereg_replace("\r","",$_POST['code']);
-	$fd = fopen("/usr/local/freeswitch/conf/dialplan/public.xml", "w");
+	$fd = fopen($v_conf_dir."/dialplan/public.xml", "w");
 	fwrite($fd, $content);
 	fclose($fd);
 	$savemsg = "Saved";
@@ -50,8 +50,8 @@ if ($_POST['a'] == "save") {
 }
 
 
-$fd = fopen("/usr/local/freeswitch/conf/dialplan/public.xml", "r");
-$content = fread($fd, filesize("/usr/local/freeswitch/conf/dialplan/public.xml"));
+$fd = fopen($v_conf_dir."/dialplan/public.xml", "r");
+$content = fread($fd, filesize($v_conf_dir."/dialplan/public.xml"));
 fclose($fd);
 	
 include("head.inc");
@@ -83,7 +83,7 @@ function sf() { document.forms[0].savetopath.focus(); }
 <?php
 include("fbegin.inc");
 if ($v_label_show) {
-	echo "<p class=\"pgtitle\">$v_project_label: Public</p>\n";
+	echo "<p class=\"pgtitle\">$v_label: Public</p>\n";
 }
 ?>
 
@@ -111,7 +111,7 @@ build_menu();
       <tr>
         <td width='90%'><p><span class="vexpl"><span class="red"><strong>Public<br>
             </strong></span>
-            Directs inbound calls to extensions, IVRs, external numbers, and scripts. 
+            Directs inbound calls to extensions, auto attendants, hunt groups, external numbers, voicemail, and scripts. 
             </p>
 		</td>
 		<td width='10%' align='right' valign='middle'><input type="submit" value="save" /></td>
@@ -126,12 +126,16 @@ build_menu();
 
   	<table width="98%" border="0" cellpadding="6" cellspacing="0">
       <tr>
-        <td>/usr/local/freeswitch/conf/dialplan/public.xml</td>
+        <td>
+		if ($v_path_show) {
+			echo $v_conf_dir."/dialplan/public.xml</td>";
+		}
+		</td> 
 		<td align='right'>
 			<input type="hidden" name="f" value="<?php echo $_GET['f']; ?>" />
 			<input type="hidden" name="a" value="save" />
 			<?php
-			echo "<input type='button' value='Restore Default' onclick=\"document.location.href='/packages/freeswitch/v_public.php?a=default&f=public.xml';\" />";
+			echo "<input type='button' value='Restore Default' onclick=\"document.location.href='v_public.php?a=default&f=public.xml';\" />";
 			?>
 		</td>
       </tr>
diff --git a/config/freeswitch_dev/v_public_includes.tmp b/config/freeswitch_dev/v_public_includes.tmp
index 413926b9..27297186 100644
--- a/config/freeswitch_dev/v_public_includes.tmp
+++ b/config/freeswitch_dev/v_public_includes.tmp
@@ -31,7 +31,7 @@ require("guiconfig.inc");
 require("/usr/local/pkg/v_config.inc");
 
 
-//freeswitchpublicincludes
+//v_public_includes
   //publicincludeid
   //extensionname
   //context
@@ -39,7 +39,7 @@ require("/usr/local/pkg/v_config.inc");
   //enabled
   //descr
 
-//freeswitchpublicincludedetails
+//v_public_include_details
 
   //publicincludeid
   //tag
@@ -84,8 +84,8 @@ if ($_GET['act'] == "del") {
             }
 
             //if the public include xml file exists then delete it
-            if (file_exists("/usr/local/freeswitch/conf/dialplan/public/".$publicincludefilename)) {
-				unlink("/usr/local/freeswitch/conf/dialplan/public/".$publicincludefilename);
+            if (file_exists($v_conf_dir."/dialplan/public/".$publicincludefilename)) {
+				unlink($v_conf_dir."/dialplan/public/".$publicincludefilename);
             }
 
             unset($publicincludefilename);
@@ -107,7 +107,7 @@ include("head.inc");
 <?php
 include("fbegin.inc");
 if ($v_label_show) {
-	echo "<p class=\"pgtitle\">$v_project_label: Public</p>\n";
+	echo "<p class=\"pgtitle\">$v_label: Public</p>\n";
 }
 ?>
 
@@ -142,7 +142,7 @@ build_menu();
 
 //if ($savemsg) print_info_box($savemsg);
 //if (file_exists($d_hostsdirty_path)): echo"<p>";
-//print_info_box_np("The FreeSWITCH recordings have been changed.<br>You must apply the changes in order for them to take effect.");
+//print_info_box_np("The recordings have been changed.<br>You must apply the changes in order for them to take effect.");
 //echo"<br />";
 //endif;
 
@@ -157,7 +157,7 @@ build_menu();
             </strong></span></span>
         </td>
         <td align='right'>
-          <input type='button' value='public.xml' alt='' onclick="document.location.href='/packages/freeswitch/v_public.php';">
+          <input type='button' value='public.xml' alt='' onclick="document.location.href='/v_public.php';">
         </td>
       </tr>
       <tr>
@@ -263,14 +263,17 @@ build_menu();
      </table>
 
 </form>
-
-/usr/local/freeswitch/conf/dialplan/public/
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
+<?php
+if ($v_path_show) {
+	echo $v_conf_dir."/dialplan/public/";
+}
+?>
+<br />
+<br />
+<br />
+<br />
+<br />
+<br />
 
 </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 4e93e932..af5d723f 100644
--- a/config/freeswitch_dev/v_public_includes_details_edit.tmp
+++ b/config/freeswitch_dev/v_public_includes_details_edit.tmp
@@ -291,7 +291,7 @@ build_menu();
       <br />
       <br />
 
-      Transfer the inbound call to an IVR with extension of 5000.
+      Transfer the inbound call to an auto attendant with extension of 5000.
       <br />
       <br />
       <table cellpadding='3'>
@@ -372,10 +372,16 @@ build_menu();
       <br />
       <br />
       Actions are executed when the <b>condition matches</b>. Anti-Actions are executed when the <b>condition does NOT match</b>.
-      Additional information on applications for Actions and Anti-Actions.<br />
-      <a href='http://wiki.freeswitch.org/wiki/Modules#Applications' target='_blank'>http://wiki.freeswitch.org/wiki/Modules#Applications</a>
-      <br />
-      <a href='http://wiki.freeswitch.org/wiki/public_Functions' target='_blank'>http://wiki.freeswitch.org/wiki/public_Functions</a>
+	  <?php
+	  if ($v_path_show) {
+		echo "Additional information on applications for Actions and Anti-Actions.<br />\n";
+		echo "<a href='http://wiki.freeswitch.org/wiki/Modules#Applications' target='_blank'>http://wiki.freeswitch.org/wiki/Modules#Applications</a>\n";
+		echo "<br />\n";
+		echo "<a href='http://wiki.freeswitch.org/wiki/public_Functions' target='_blank'>http://wiki.freeswitch.org/wiki/public_Functions</a>\n";
+	  }
+	  ?>
+	  
+
       <br />
       <br />
       <br />
@@ -409,10 +415,14 @@ build_menu();
 
       <!--
       <b>Param</b>
-      Example parameters by name and value
-      <br />
-      <a href='http://wiki.freeswitch.org/wiki/Special:Search?search=param&go=Go' target='_blank'>http://wiki.freeswitch.org/wiki/Special:Search?search=param&go=Go</a>
-      <ul>
+      Example parameters by name and value<br />
+      
+	  <?php
+	  if ($v_path_show) {
+		echo "<a href='http://wiki.freeswitch.org/wiki/Special:Search?search=param&go=Go' target='_blank'>http://wiki.freeswitch.org/wiki/Special:Search?search=param&go=Go</a>\n";
+      }
+	  ?>
+	  <ul>
       <li><b>codec-ms</b> 20</li>
       <li><b>codec-prefs</b> PCMU@20i</li>
       <li><b>debug</b> 1</li>
diff --git a/config/freeswitch_dev/v_recordings.tmp b/config/freeswitch_dev/v_recordings.tmp
index 8cfff7d9..23075d79 100644
--- a/config/freeswitch_dev/v_recordings.tmp
+++ b/config/freeswitch_dev/v_recordings.tmp
@@ -30,8 +30,8 @@
 require("guiconfig.inc");
 require("/usr/local/pkg/v_config.inc");
 
-$a_recordings 	   = &$config['installedpackages']['freeswitchrecordings']['config'];
-$dir_recordings = $v_recordings_dir.'/recordings/';
+$a_recordings = $config['installedpackages']['freeswitchrecordings']['config'];
+$dir_recordings = $v_recordings_dir.'/';
 $dir_music_on_hold_8000 = $v_dir.'/sounds/music/8000/';
 
 if ($_GET['a'] == "download") {
@@ -286,7 +286,14 @@ if ($config_change == 1) {
 	<form action="" method="POST" enctype="multipart/form-data" name="frmUpload" onSubmit="">
 	  <table border='0'>
 	    <tr>
-	      <td width='50%'><b>location:</b> <?php echo $dir_recordings; ?></td>
+	      <td width='50%'>
+		  <?php
+		  if ($v_path_show) {
+			  echo "<b>location:</b>";
+			  echo $dir_recordings;
+		  }
+		  ?>
+		  </td>
 	      <td valign="top" class="label">
 	        <input name="type" type="hidden" value="rec">     	
         </td>
@@ -404,7 +411,14 @@ if ($config_change == 1) {
   	<form action="" method="POST" enctype="multipart/form-data" name="frmUpload" onSubmit="">
   	  <table border='0'>
   	    <tr>
-  	      <td width='50%'><b>location:</b> <?php echo $dir_music_on_hold_8000; ?></td>
+  	      <td width='50%'>
+		  <?php
+		  if ($v_path_show) {
+			  echo "<b>location:</b>";
+			  echo $dir_music_on_hold_8000;
+		  }
+		  ?>
+		  </td>
   	      <td valign="top" class="label">
   	        <input name="type" type="hidden" value="moh">     	
           </td>
diff --git a/config/freeswitch_dev/v_recordings_play.tmp b/config/freeswitch_dev/v_recordings_play.tmp
index 2f5224a0..e2072e1d 100755..100644
--- a/config/freeswitch_dev/v_recordings_play.tmp
+++ b/config/freeswitch_dev/v_recordings_play.tmp
@@ -51,8 +51,8 @@ $type = $_GET['type']; //moh //rec
         echo "<embed src=\"v_recordings.php?a=download&type=".$type."&filename=".$filename."\" autostart=true width=200 height=40 name=\"sound".$$filename."\" enablejavascript=\"true\">\n";
       }
       if ($file_ext == "mp3") {
-        echo "<object type=\"application/x-shockwave-flash\" width=\"400\" height=\"17\" data=\"slim.swf?autoplay=true&song_title=".urlencode($filename)."&song_url=".urlencode("/freeswitch/v_recordings.php?a=download&type=".$type."&filename=".$filename)."\">\n";
-        echo "<param name=\"movie\" value=\"slim.swf?autoplay=true&song_url=".urlencode("/freeswitch/v_recordings.php?a=download&type=".$type."&filename=".$filename)."\" />\n";
+        echo "<object type=\"application/x-shockwave-flash\" width=\"400\" height=\"17\" data=\"slim.swf?autoplay=true&song_title=".urlencode($filename)."&song_url=".urlencode($v_relative_url."/v_recordings.php?a=download&type=".$type."&filename=".$filename)."\">\n";
+        echo "<param name=\"movie\" value=\"slim.swf?autoplay=true&song_url=".urlencode($v_relative_url."/v_recordings.php?a=download&type=".$type."&filename=".$filename)."\" />\n";
         echo "<param name=\"quality\" value=\"high\"/>\n";
         echo "<param name=\"bgcolor\" value=\"#E6E6E6\"/>\n";
         echo "</object>\n";
diff --git a/config/freeswitch_dev/v_status.tmp b/config/freeswitch_dev/v_status.tmp
index a778cb8a..c16cae7a 100644
--- a/config/freeswitch_dev/v_status.tmp
+++ b/config/freeswitch_dev/v_status.tmp
@@ -46,7 +46,8 @@ if ($_GET['a'] == "download") {
 	if (!is_dir($v_backup_dir.'/')) {
 	   exec("mkdir ".$v_backup_dir."/");
 	}
-    system('cd /usr/local/;tar cvzf '.$v_backup_dir.'/'.$v_name.'.bak.tgz '.$v_name);
+	chdir($v_parent_dir);
+    system(tar cvzf '.$v_backup_dir.'/'.$v_name.'.bak.tgz '.$v_name);
   }
 	session_cache_limiter('public');
 	$fd = fopen($tmp.$filename, "rb");
@@ -105,7 +106,7 @@ $savemsg = $_GET["savemsg"];
 
 //if service is not running then start it
 if (!pkg_is_service_running($v_name)) {
-	$handle = popen("/usr/local/etc/rc.d/".$v_name.".sh start", "r");
+	$handle = popen($v_startup_script_dir."/".$v_name.".sh start", "r");
 	pclose($handle);
 	//give time for the service to load
 	sleep(7);
diff --git a/config/freeswitch_dev/v_time_conditions.tmp b/config/freeswitch_dev/v_time_conditions.tmp
deleted file mode 100644
index 676b19c7..00000000
--- a/config/freeswitch_dev/v_time_conditions.tmp
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-/* $Id$ */
-/*
-	v_time_conditions.php
-	Copyright (C) 2008 Mark J Crane
-	All rights reserved.
-
-	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/v_config.inc");
-
-
-$a_ivr_options 	   = &$config['installedpackages']['freeswitchivroptions']['config'];
-
-
-if ($_GET['act'] == "del") {
-    if ($_GET['type'] == 'ivroptions') {
-        if ($a_ivr_options[$_GET['id']]) {
-            unset($a_ivr_options[$_GET['id']]);
-            write_config();
-            //touch($d_hostsdirty_path);
-            header("Location: v_ivr_edit.php?id=".$_GET['parentid']);
-            exit;
-        }
-    }
-}
-
-
-include("head.inc");
-
-?>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php
-//include("fbegin.inc");
-if ($v_label_show) {
-	echo "<p class=\"pgtitle\">$v_label: IVR Options</p>\n";
-}
-?>
-
-<div id="mainlevel">
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr><td class="tabnavtbl">
-<?php
-
-build_menu();
- 	
-?>
-</td></tr>
-</table>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-   <tr>
-     <td class="tabcont" >
-
-<form action="v_ivr_options.php" method="post" name="iform" id="iform">
-<?php
-
-
-//echo "<pre>";
-//print_r ($a_ivr);
-//echo "</pre>";
-
-//if ($savemsg) print_info_box($savemsg);
-//if (file_exists($d_hostsdirty_path)): echo"<p>";
-//print_info_box_np("The FreeSWITCH recordings have been changed.<br>You must apply the changes in order for them to take effect.");
-//echo"<br />";
-//endif;
-
-?>
-  	<table width="100%" border="0" cellpadding="6" cellspacing="0">
-      <tr>
-        <td><p><span class="vexpl"><span class="red"><strong>Note:<br>
-            </strong></span>
-            To make a recording dial extension 700 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.
-            </span></p></td>
-      </tr>
-    </table>
-    <br />
-
-    <table width="100%" border="0" cellpadding="0" cellspacing="0">
-    <tr>
-      <td width="20%" class="listhdrr">Filename</td>
-      <td width="25%" class="listhdrr">Name</td>
-      <td width="25%" class="listhdr">Description</td>
-      <td width="10%" class="list">
-        <table border="0" cellspacing="0" cellpadding="1">
-          <tr>
-            <td width="17"></td>
-            <td valign="middle"><a href="v_ivr_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
-          </tr>
-        </table>
-      </td>
-		</tr>
-
-		<?php $i = 0; foreach ($a_ivr as $ivrent): ?>
-    <tr>
-      <td class="listlr" ondblclick="document.location='v_ivr_edit.php?id=<?=$i;?>'">
-            <a href="javascript:void(0)" onclick="window.open('v_recordings_play.php?a=download&filename=<?=$recordingent['filename'];?>', 'play',' width=300,height=40,menubar=no,status=no,toolbar=no')">
-              <?=$ivrent['filename']?>
-            </a>
-      </td>
-      <td class="listr" ondblclick="document.location='v_ivr_edit.php?id=<?=$i;?>';">
-        <?=$ivrent['recordingname'];?>&nbsp;
-      </td>
-      <td class="listbg" ondblclick="document.location='v_ivr_edit.php?id=<?=$i;?>';">
-        <font color="#FFFFFF"><?=htmlspecialchars($recordingent['descr']);?>&nbsp;
-      </td>
-      <td valign="middle" nowrap class="list">
-        <table border="0" cellspacing="0" cellpadding="1">
-          <tr>
-            <td valign="middle"><a href="v_ivr_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
-            <td><a href="v_ivr_options.php?type=ivroption&act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
-          </tr>
-       </table>
-      </td>
-    </tr>
-		<?php $i++; endforeach; ?>
-    <tr>
-      <td class="list" colspan="3"></td>
-      <td class="list">
-        <table border="0" cellspacing="0" cellpadding="1">
-          <tr>
-            <td width="17"></td>
-            <td valign="middle"><a href="v_ivr_options_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
-          </tr>
-        </table>
-		  </td>
-     </tr>
-
-
-     <tr>
-       <td class="list" colspan="3"></td>
-       <td class="list"></td>
-     </tr>
-     </table>
-
-</form>
-
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-
-</td>
-</tr>
-</table>
-
-</div>
-
-
-<?php include("fend.inc"); ?>
-</body>
-</html>
diff --git a/config/freeswitch_dev/v_time_conditions_edit.tmp b/config/freeswitch_dev/v_time_conditions_edit.tmp
deleted file mode 100644
index 3083b0af..00000000
--- a/config/freeswitch_dev/v_time_conditions_edit.tmp
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/* $Id$ */
-/*
-	v_time_conditions_edit.php
-	Copyright (C) 2008 Mark J Crane
-	All rights reserved.
-
-	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/v_config.inc");
-
-
-$a_ivr_options = &$config['installedpackages']['freeswitchtimeconditions']['config'];
-
-$id = $_GET['id'];
-if (isset($_POST['id'])) {
-	$id = $_POST['id'];
-}
-
-//$parentid = $_GET['parentid'];
-//if (isset($_POST['parentid'])) {
-//	$parentid = $_POST['parentid'];
-//}
-
-//$ivrid = $_GET['ivrid'];
-//if (isset($_POST['ivrid'])) {
-//	$ivrid = $_POST['ivrid'];
-//}
-
-if (isset($id) && $a_ivr_options[$id]) {
-	$pconfig['conditionname'] = $a_ivr_options[$id]['conditionname'];
-	$pconfig['conditionstartday'] = $a_ivr_options[$id]['conditionstartday'];
-	$pconfig['conditionstarthrs'] = $a_ivr_options[$id]['conditionstarthrs'];
-	$pconfig['conditionstartmin'] = $a_ivr_options[$id]['conditionstartmin'];
-
-	$pconfig['conditionendday'] = $a_ivr_options[$id]['conditionendday'];
-	$pconfig['conditionendhrs'] = $a_ivr_options[$id]['conditionstarthrs'];
-	$pconfig['conditionendmin'] = $a_ivr_options[$id]['conditionendmin'];
-
-	$pconfig['conditionaction'] = $a_ivr_options[$id]['conditionaction'];
-	$pconfig['conditionantiaction'] = $a_ivr_options[$id]['conditionantiaction'];
-	$pconfig['conditionjavascript'] = $a_ivr_options[$id]['conditionjavascript'];    	
-	$pconfig['conditiondescr'] = $a_ivr_options[$id]['conditiondescr'];	
-}
-
-
-
-if ($_POST) {
-
-	unset($input_errors);
-	$pconfig = $_POST;
-
-	if (!$input_errors) {
-	
-		$ivroptionent = array();		
-		$ivroptionent['ivrid'] = $_POST['ivrid'];
-		$ivroptionent['optionnumber'] = $_POST['optionnumber'];
-		$ivroptionent['optiontype'] = $_POST['optiontype'];
-		$ivroptionent['optiondest'] = $_POST['optiondest'];
-		$ivroptionent['optiondescr'] = $_POST['optiondescr'];
-
-		if (isset($id) && $a_ivr_options[$id]) {
-			//update
-      		$a_ivr_options[$id] = $ivroptionent;
-		}
-		else {
-			//add
-			$a_ivr_options[] = $ivroptionent;
-		}
-		
-		//touch($d_hostsdirty_path);		
-		write_config();
-		
-		header("Location: v_ivr_edit.php?id=".$parentid);
-		exit;
-	}
-}
-
-?>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php
-include("head.inc");
-//include("fbegin.inc");
-echo "<p class=\"pgtitle\">$v_project_labels: IVR Options: Edit</p>\n";
-
-if ($input_errors) print_input_errors($input_errors); 
-
-?>
-
-<div id="mainlevel">
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr><td class="tabnavtbl">
-<?php
-
-build_menu();
- 	
-?>
-</td></tr>
-</table>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-   <tr>
-     <td class="tabcont" >
-
-        <form action="v_ivr_options_edit.php" method="post" name="iform" id="iform">
-            <table width="100%" border="0" cellpadding="6" cellspacing="0">
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">Option Number</td>
-              <td width="78%" class="vtable">
-                <input name="optionnumber" type="text" class="formfld" id="optionnumber" size="40" value="<?=htmlspecialchars($pconfig['optionnumber']);?>">
-                <br> <span class="vexpl">Option Number<br>
-                e.g. <em>1</em></span></td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">Type</td>
-              <td width="78%" class="vtable">
-                <?php
-                echo "                <select name='optiontype' class='formfld'>\n";
-                echo "                <option></option>\n";
-                if (htmlspecialchars($pconfig['optiontype']) == "extension") {
-                    echo "                <option selected='yes'>extension</option>\n";
-                }
-                else {
-                    echo "                <option>extension</option>\n";
-                }
-                if (htmlspecialchars($pconfig['optiontype']) == "voicemail") {
-                    echo "                <option selected='yes'>voicemail</option>\n";
-                }
-                else {
-                    echo "                <option>voicemail</option>\n";
-                }
-                echo "                </select>\n";
-                ?>
-              </td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top" class="vncellreq">Destination</td>
-              <td width="78%" class="vtable">
-                <input name="optiondest" type="text" class="formfld" id="optiondest" size="40" value="<?=htmlspecialchars($pconfig['optiondest']);?>">
-                <br> <span class="vexpl">Destination<br>
-                e.g. <em>1001</em></span></td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top" class="vncell">Description</td>
-              <td width="78%" class="vtable">
-                <input name="optiondescr" type="text" class="formfld" id="optiondescr" size="40" value="<?=htmlspecialchars($pconfig['optiondescr']);?>">
-                <br> <span class="vexpl">You may enter a description here
-                for your reference (not parsed).</span></td>
-            </tr>
-            <tr>
-              <td width="22%" valign="top">&nbsp;</td>
-              <td width="78%">
-                <input name="ivrid" type="hidden" value="<?=$ivrid;?>">
-                <input name="parentid" type="hidden" value="<?=$parentid;?>">
-                <?php if (isset($id) && $a_ivr_options[$id]): ?>
-                  <input name="id" type="hidden" value="<?=$id;?>">
-                <?php endif; ?>
-                <input name="Submit" type="submit" class="formbtn" value="Save"> <input class="formbtn" type="button" value="Cancel" onclick="history.back()">
-              </td>
-            </tr>
-            </table>
-        </form>
-
-      <br>
-      <br>
-      <br>
-      <br>
-      <br>
-      <br>
-
-     </td>
-   </tr>
-</table>
-
-</div>
-
-<?php include("fend.inc"); ?>
-</body>
-</html>
diff --git a/config/freeswitch_dev/v_vars.tmp b/config/freeswitch_dev/v_vars.tmp
index afa7afa3..1608252d 100644
--- a/config/freeswitch_dev/v_vars.tmp
+++ b/config/freeswitch_dev/v_vars.tmp
@@ -81,7 +81,7 @@ function sf() { document.forms[0].savetopath.focus(); }
 
 <?php
 include("fbegin.inc");
-echo "<p class=\"pgtitle\">$v_project_label: Variables</p>\n";
+echo "<p class=\"pgtitle\">$v_label: Variables</p>\n";
 ?>
 
 <div id="mainlevel">
@@ -134,7 +134,7 @@ build_menu();
 			<input type="hidden" name="f" value="<?php echo $_GET['f']; ?>" />
 			<input type="hidden" name="a" value="save" />
 			<?php
-			echo "<input type='button' value='Restore Default' onclick=\"document.location.href='/packages/freeswitch/v_vars.php?a=default&f=vars.xml';\" />";
+			echo "<input type='button' value='Restore Default' onclick=\"document.location.href='v_vars.php?a=default&f=vars.xml';\" />";
 			?>
 		</td>
       </tr>