FreeSWITCH dev dump the majority of hard coded paths and add a few preferences.

1 files changed, 50 insertions, 49 deletions

diff --git a/config/freeswitch_dev/v_status.tmp b/config/freeswitch_dev/v_status.tmp
index 78d54466..a778cb8a 100644
--- a/config/freeswitch_dev/v_status.tmp
+++ b/config/freeswitch_dev/v_status.tmp
@@ -33,20 +33,20 @@ require("/usr/local/pkg/v_config.inc");
 
 if ($_GET['a'] == "download") {
   if ($_GET['t'] == "logs") {
-    $tmp = '/usr/local/freeswitch/log/';
-    $filename = 'freeswitch.log';
+    $tmp = $v_log_dir.'/';
+    $filename = $v_name.'.log';
   }
   if ($_GET['t'] == "cdrcsv") {
-    $tmp = '/usr/local/freeswitch/log/cdr-csv/';
+    $tmp = $v_log_dir.'/cdr-csv/';
     $filename = 'Master.csv';
   }
   if ($_GET['t'] == "backup") {
-    $tmp = '/root/backup/';
-    $filename = 'freeswitch.bak.tgz';
-	if (!is_dir('/root/backup/')) {
-	   exec("mkdir /root/backup/");
+    $tmp = $v_backup_dir.'/';
+    $filename = $v_name.'.bak.tgz';
+	if (!is_dir($v_backup_dir.'/')) {
+	   exec("mkdir ".$v_backup_dir."/");
 	}
-    system('cd /usr/local/;tar cvzf /root/backup/freeswitch.bak.tgz freeswitch');
+    system('cd /usr/local/;tar cvzf '.$v_backup_dir.'/'.$v_name.'.bak.tgz '.$v_name);
   }
 	session_cache_limiter('public');
 	$fd = fopen($tmp.$filename, "rb");
@@ -60,30 +60,30 @@ if ($_GET['a'] == "download") {
 if ($_GET['a'] == "other") {
   if ($_GET['t'] == "restore") {
     $tmp = '/root/backup/';
-    $filename = 'freeswitch.bak.tgz';
+    $filename = $v_name.'.bak.tgz';
 
-    //extract a specific directory to /usr/local/freeswitch
-    if (file_exists('/root/backup/'.$filename)) {
+    //extract a specific directory
+    if (file_exists($v_backup_dir.'/'.$filename)) {
       //echo "The file $filename exists";
 
 	  //Recommended
-		system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/db/');
-		system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/log/');
-		system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/recordings/');
-		system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/scripts/');
-		system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/storage/');
-		system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/sounds/custom/8000/');
-		system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/sounds/music/8000/');
-		system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/conf/ssl');
-		system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/conf/sip_profiles/');
-		system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/conf/vars.xml');
-		system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/conf/dialplan/default.xml');
-		system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/conf/dialplan/public.xml');		
+		system('cd /usr/local; tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/db/');
+		system('cd /usr/local; tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/log/');
+		system('cd /usr/local; tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/recordings/');
+		system('cd /usr/local; tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/scripts/');
+		system('cd /usr/local; tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/storage/');
+		system('cd /usr/local; tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/sounds/custom/8000/');
+		system('cd /usr/local; tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/sounds/music/8000/');
+		system('cd /usr/local; tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/conf/ssl');
+		system('cd /usr/local; tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/conf/sip_profiles/');
+		system('cd /usr/local; tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/conf/vars.xml');
+		system('cd /usr/local; tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/conf/dialplan/default.xml');
+		system('cd /usr/local; tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/conf/dialplan/public.xml');		
 
 	  //Optional
-		//system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/conf/');
-		//system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/grammar/');
-		//system('cd /usr/local; tar xvpfz /root/backup/'.$filename.' freeswitch/htdocs/');
+		//system('cd /usr/local; tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/conf/');
+		//system('cd /usr/local; tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/grammar/');
+		//system('cd /usr/local; tar xvpfz '.$v_backup_dir.'/'.$filename.' '.$v_name.'/htdocs/');
 
 		header( 'Location: v_status.php?savemsg=Backup+has+been+restored.' ) ;
     }
@@ -104,10 +104,10 @@ $host = $config['interfaces']['lan']['ipaddr'];
 $savemsg = $_GET["savemsg"];
 
 //if service is not running then start it
-if (!pkg_is_service_running('freeswitch')) {
-	$handle = popen("/usr/local/etc/rc.d/freeswitch.sh start", "r");
+if (!pkg_is_service_running($v_name)) {
+	$handle = popen("/usr/local/etc/rc.d/".$v_name.".sh start", "r");
 	pclose($handle);
-	//give freeswitch time to load
+	//give time for the service to load
 	sleep(7);
 }
 ?>
@@ -132,8 +132,9 @@ if (!pkg_is_service_running('freeswitch')) {
 
 <?php
 include("fbegin.inc");
-echo "<p class=\"pgtitle\">$v_project_label: Status</p>\n";
-
+if ($v_label_show) {
+	echo "<p class=\"pgtitle\">$v_label: Status</p>\n";
+}
 
 if ($savemsg) {
   print_info_box($savemsg);
@@ -168,7 +169,7 @@ echo "<td width='50%'>\n";
 echo "  <b>sofia status</b> \n";
 echo "</td>\n";
 echo "<td width='50%' align='right'>\n";
-echo "  <input type='button' value='reloadxml' onclick=\"document.location.href='/packages/freeswitch/v_cmd.php?cmd=api+reloadxml';\" />\n";
+echo "  <input type='button' value='reloadxml' onclick=\"document.location.href='v_cmd.php?cmd=api+reloadxml';\" />\n";
 echo "</td>\n";
 echo "</tr>\n";
 echo "</table>\n";
@@ -178,7 +179,7 @@ echo "</pre>\n";
 fclose($fp);
 echo "<br /><br />\n\n";
 
-foreach (ListFiles('/usr/local/freeswitch/conf/sip_profiles') as $key=>$sip_profile_file){
+foreach (ListFiles($v_conf_dir.'/sip_profiles') as $key=>$sip_profile_file){
 	
 	$sip_profile_name = str_replace(".xml", "", $sip_profile_file);
 	$fp = event_socket_create($host, $port, $password);
@@ -190,14 +191,14 @@ foreach (ListFiles('/usr/local/freeswitch/conf/sip_profiles') as $key=>$sip_prof
 	echo "  <b>sofia status profile $sip_profile_name</b> \n";
 	echo "</td>\n";
 	echo "<td width='50%' align='right'>\n";
-	echo "  <input type='button' value='start' onclick=\"document.location.href='/packages/freeswitch/v_cmd.php?cmd=api+sofia+profile+".$sip_profile_name."+start';\" />\n";
-	echo "  <input type='button' value='stop' onclick=\"document.location.href='/packages/freeswitch/v_cmd.php?cmd=api+sofia+profile+".$sip_profile_name."+stop';\" />\n";
-	echo "  <input type='button' value='restart' onclick=\"document.location.href='/packages/freeswitch/v_cmd.php?cmd=api+sofia+profile+".$sip_profile_name."+restart';\" />\n";
+	echo "  <input type='button' value='start' onclick=\"document.location.href='v_cmd.php?cmd=api+sofia+profile+".$sip_profile_name."+start';\" />\n";
+	echo "  <input type='button' value='stop' onclick=\"document.location.href='v_cmd.php?cmd=api+sofia+profile+".$sip_profile_name."+stop';\" />\n";
+	echo "  <input type='button' value='restart' onclick=\"document.location.href='v_cmd.php?cmd=api+sofia+profile+".$sip_profile_name."+restart';\" />\n";
 	if ($sip_profile_name == "external") {
-		echo "  <input type='button' value='rescan' onclick=\"document.location.href='/packages/freeswitch/v_cmd.php?cmd=api+sofia+profile+".$sip_profile_name."+rescan';\" />\n";
+		echo "  <input type='button' value='rescan' onclick=\"document.location.href='v_cmd.php?cmd=api+sofia+profile+".$sip_profile_name."+rescan';\" />\n";
 	}
 	else {
-		echo "  <input type='button' value='flush_inbound_reg' onclick=\"document.location.href='/packages/freeswitch/v_cmd.php?cmd=api+sofia+profile+".$sip_profile_name."+flush_inbound_reg';\" />\n";
+		echo "  <input type='button' value='flush_inbound_reg' onclick=\"document.location.href='v_cmd.php?cmd=api+sofia+profile+".$sip_profile_name."+flush_inbound_reg';\" />\n";
 	}
 	echo "</td>\n";
 	echo "</tr>\n";
@@ -264,15 +265,15 @@ echo "<table width='690' cellpadding='0' cellspacing='0' border='0'>\n";
 echo "<tr>\n";
 echo "<td width='80%'>\n";
 echo "<b>Backup / Restore</b><br />\n";
-echo "The 'backup' button will tar gzip /usr/local/freeswitch/ to /root/backup/freeswitch.bak.tgz it then presents a file to download. \n";
-echo "If the backup file does not exist in /root/backup/freeswitch.bak.tgz then the 'restore' button will be hidden. \n";
+echo "The 'backup' button will tar gzip ".$v_dir." to ".$v_backup_dir."/".$v_name.".bak.tgz it then presents a file to download. \n";
+echo "If the backup file does not exist in ".$v_backup_dir."/".$v_name.".bak.tgz then the 'restore' button will be hidden. \n";
 echo "Use Diagnostics->Command->File to upload: to browse to the file and then click on upload it now ready to be restored. \n";
 echo "<br /><br />\n";
 echo "</td>\n";
 echo "<td width='20%' valign='middle' align='right'>\n";
-echo "  <input type='button' value='backup' onclick=\"document.location.href='/packages/freeswitch/v_status.php?a=download&t=backup';\" />\n";
-if (file_exists('/root/backup/freeswitch.bak.tgz')) {
-  echo "  <input type='button' value='restore' onclick=\"document.location.href='/packages/freeswitch/v_status.php?a=other&t=restore';\" />\n";
+echo "  <input type='button' value='backup' onclick=\"document.location.href='v_status.php?a=download&t=backup';\" />\n";
+if (file_exists($v_backup_dir.'/'.$v_name.'.bak.tgz')) {
+  echo "  <input type='button' value='restore' onclick=\"document.location.href='v_status.php?a=other&t=restore';\" />\n";
 }
 echo "</td>\n";
 echo "</tr>\n";
@@ -284,10 +285,10 @@ echo "<table width='690' cellpadding='0' cellspacing='0' border='0'>\n";
 echo "<tr>\n";
 echo "<td width='50%'>\n";
 echo "<b>Call Detail Records</b><br />\n";
-echo "/usr/local/freeswitch/log/cdr-csv/Master.csv<br /><br />\n";
+echo $v_log_dir."/cdr-csv/Master.csv<br /><br />\n";
 echo "</td>\n";
 echo "<td width='50%' align='right'>\n";
-echo "  <input type='button' value='download cdr csv' onclick=\"document.location.href='/packages/freeswitch/v_status.php?a=download&t=cdrcsv';\" />\n";echo "</td>\n";
+echo "  <input type='button' value='download cdr csv' onclick=\"document.location.href='v_status.php?a=download&t=cdrcsv';\" />\n";echo "</td>\n";
 echo "</tr>\n";
 echo "</table>\n";
 echo "<br /><br />\n\n";
@@ -297,18 +298,18 @@ echo "<table width='690' cellpadding='0' cellspacing='0' border='0'>\n";
 echo "<tr>\n";
 echo "<td width='50%'>\n";
 echo "<b>Logs</b><br />\n";
-echo "/usr/local/freeswitch/log/cdr-csv/freeswitch.log<br /><br />\n";
+echo $v_log_dir."/cdr-csv/".$v_name.".log<br /><br />\n";
 echo "</td>\n";
 echo "<td width='50%' align='right'>\n";
-echo "  <input type='button' value='download logs' onclick=\"document.location.href='/packages/freeswitch/v_status.php?a=download&t=logs';\" />\n";
+echo "  <input type='button' value='download logs' onclick=\"document.location.href='v_status.php?a=download&t=logs';\" />\n";
 echo "</tr>\n";
 echo "</table>\n";
 echo "<br /><br />\n\n";
 
 
-echo "<b>tail -n 500 /usr/local/freeswitch/log/freeswitch.log</b><br />\n";
+echo "<b>tail -n 500 ".$v_log_dir."/".$v_name.".log</b><br />\n";
 echo "<textarea id='log' name='log' cols='93' rows='30' wrap='off'>\n";
-echo system("tail -n 500 /usr/local/freeswitch/log/freeswitch.log");
+echo system("tail -n 500 ".$v_log_dir."/".$v_name.".log");
 echo "</textarea>\n";
 echo "<br /><br />\n\n";