pfSense FreeSWITCH package include additional files and one more array count

2 files changed, 95 insertions, 56 deletions

diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml
index 2046f863..c57b4394 100644
--- a/packages/freeswitch/freeswitch.xml
+++ b/packages/freeswitch/freeswitch.xml
@@ -118,60 +118,95 @@
 		<item>http://www.portableusbapps.com/packages/config/freeswitch/freeswitch.tgz</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_status.tmp</item>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>0755</chmod>
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch.inc</item>
+	</additional_files_needed>	
+	<additional_files_needed>
+		<prefix>/usr/local/lib/</prefix>
+		<chmod>0755</chmod>
+		<item>http://www.pfsense.com/packages/config/freeswitch/libtinfo.so.5.6</item>
+	</additional_files_needed>	
+	<additional_files_needed>
+		<prefix>/usr/local/lib/</prefix>
+		<chmod>0755</chmod>
+		<item>http://www.pfsense.com/packages/config/freeswitch/libncurses.so.5.6</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_cmd.tmp</item>
+		<item>http://www.pfsense.com/packages/config/freeswitch/please_enter_your_pin_number.wav</item>
 	</additional_files_needed>	
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_recordings_edit.tmp</item>
-	</additional_files_needed>	
+		<item>http://www.pfsense.com/packages/config/freeswitch/begin_recording.wav</item>
+	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_dialplan_includes_details.tmp</item>
-	</additional_files_needed>	
+		<item>http://www.pfsense.com/packages/config/freeswitch/your_pin_number_is_incorect_goodbye.wav</item>
+	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_recordings_play.tmp</item>
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_cmd.tmp</item>
 	</additional_files_needed>	
 	<additional_files_needed>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>0755</chmod>		
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_dialplan.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_time_conditions_edit.tmp</item>
-	</additional_files_needed>	
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_dialplan_includes.tmp</item>
+	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_ivr.tmp</item>
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_dialplan_includes_edit.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_time_conditions.tmp</item>
-	</additional_files_needed>	
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_dialplan_includes_details.tmp</item>
+	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_dialplan_includes_edit.tmp</item>
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_dialplan_includes_details_edit.tmp</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>0755</chmod>		
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_extensions.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>0755</chmod>		
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_external.xml</item>
 	</additional_files_needed>	
 	<additional_files_needed>
-		<prefix>/tmp/</prefix>
+		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_recordings.tmp</item>
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_gateways.tmp</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>0755</chmod>		
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_gateways_edit.tmp</item>
 	</additional_files_needed>	
 	<additional_files_needed>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>0755</chmod>		
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_internal.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_dialplan_includes.tmp</item>
-	</additional_files_needed>	
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_ivr.tmp</item>
+	</additional_files_needed>		
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>		
@@ -188,74 +223,69 @@
 		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_ivr_options.tmp</item>
 	</additional_files_needed>	
 	<additional_files_needed>
-		<prefix>/tmp/</prefix>
-		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_dialplan_includes_details_edit.tmp</item>
-	</additional_files_needed>	
-	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_dialplan.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_extensions.xml</item>
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_modules.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_external.xml</item>
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_public.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_internal.xml</item>
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_public_includes.php</item>
 	</additional_files_needed>	
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_modules.xml</item>
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_public_includes_edit.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_public.xml</item>
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_public_includes_details.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_vars.xml</item>
-	</additional_files_needed>
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_public_includes_details_edit.php</item>
+	</additional_files_needed>			
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch.inc</item>
-	</additional_files_needed>	
+		<prefix>/tmp/</prefix>
+		<chmod>0755</chmod>		
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_recordings.tmp</item>
+	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/lib/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/freeswitch/libtinfo.so.5.6</item>
-	</additional_files_needed>	
+		<prefix>/tmp/</prefix>
+		<chmod>0755</chmod>		
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_recordings_edit.tmp</item>
+	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/lib/</prefix>
-		<chmod>0755</chmod>
-		<item>http://www.pfsense.com/packages/config/freeswitch/libncurses.so.5.6</item>
+		<prefix>/tmp/</prefix>
+		<chmod>0755</chmod>		
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_recordings_play.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/please_enter_your_pin_number.wav</item>
-	</additional_files_needed>	
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_status.tmp</item>
+	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/begin_recording.wav</item>
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_time_conditions.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>		
-		<item>http://www.pfsense.com/packages/config/freeswitch/your_pin_number_is_incorect_goodbye.wav</item>
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_time_conditions_edit.tmp</item>
+	</additional_files_needed>	
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>0755</chmod>		
+		<item>http://www.pfsense.com/packages/config/freeswitch/freeswitch_vars.xml</item>
 	</additional_files_needed>
 	<fields>
 		<field>
diff --git a/packages/freeswitch/freeswitch_recordings.tmp b/packages/freeswitch/freeswitch_recordings.tmp
index 6d4dbbdd..9d51c715 100644
--- a/packages/freeswitch/freeswitch_recordings.tmp
+++ b/packages/freeswitch/freeswitch_recordings.tmp
@@ -250,7 +250,11 @@ if ($config_change == 1) {
       </td>
 		</tr>
 
-		<?php $i = 0; foreach ($a_recordings as $recordingent): ?>
+      <?php 
+      $i = 0;
+      if (count($a_recordings) > 0) { 
+      	foreach ($a_recordings as $recordingent) {
+      ?>
       <tr>
       <td class="listlr" ondblclick="document.location='freeswitch_recordings_edit.php?id=<?=$i;?>'">
           <a href="freeswitch_recordings.php?a=download&t=bin&filename=<?=$recordingent['filename'];?>">
@@ -273,10 +277,15 @@ if ($config_change == 1) {
           </tr>
        </table>
       </td>
-    </tr>
-		<?php $i++; endforeach; ?>
-		<!--
-    <tr>
+      </tr>
+      <?php 
+      	$i++;
+      	} //end for each 
+      } //end count
+      ?>
+      
+      <!--
+      <tr>
       <td class="list" colspan="3"></td>
       <td class="list">
         <table border="0" cellspacing="0" cellpadding="1">