FreeSWITCH package bug fix pointed out by tusc fixes xml for multiple condidtions in the dialplan for both 'Public' and 'Dialplan'.

3 files changed, 73 insertions, 38 deletions

diff --git a/packages/freeswitch/freeswitch.inc b/packages/freeswitch/freeswitch.inc
index 049ede80..569c6790 100644
--- a/packages/freeswitch/freeswitch.inc
+++ b/packages/freeswitch/freeswitch.inc
@@ -1342,24 +1342,40 @@ function sync_package_freeswitch_dialplan_includes()
           //$rowhelper['enabled'];
          
         $tmp = "<extension name=\"".$rowhelper['extensionname']."\">\n";
-    
-        if (count($a_dialplan_include_details) > 0) {     
-          $conditioncount = 0;
-          $i = 0;
-          foreach ($a_dialplan_include_details as $ent) {
-            if ($ent['tag'] == "condition" && $rowhelper['dialplanincludeid'] == $ent['dialplanincludeid']) {
-                if ($i == 0) {
-                    $tmp .= "   <condition field=\"".$ent['fieldtype']."\" expression=\"".$ent['fielddata']."\">\n";
-                }
-                else {
-                    $tmp .= "   <condition field=\"".$ent['fieldtype']."\" expression=\"".$ent['fielddata']."\"/>\n";
-                }
-                $conditioncount++;
-                $i++;
-            }     
-     
-          }
-        }
+        
+        if (count($a_dialplan_include_details) > 0) {    
+		  
+			$conditioncount = 0;
+			$i = 0;
+          	foreach ($a_dialplan_include_details as $ent) {
+			  if ($ent['tag'] == "condition" && $rowhelper['dialplanincludeid'] == $ent['dialplanincludeid']) {
+			      $conditioncount++;
+			      $i++;
+			  }      
+			}
+			  
+			$i = 1;
+          	foreach ($a_dialplan_include_details as $ent) {
+			  if ($ent['tag'] == "condition" && $rowhelper['dialplanincludeid'] == $ent['dialplanincludeid']) {
+				    if ($conditioncount == 1) { //single condition                  
+				    	//start tag
+				    	$tmp .= "   <condition field=\"".$ent['fieldtype']."\" expression=\"".$ent['fielddata']."\">\n";              
+				    }
+				    else { //more than one condition                  
+						if ($i < $conditioncount) {                      
+				              //all tags should be self-closing except the last one
+				              $tmp .= "   <condition field=\"".$ent['fieldtype']."\" expression=\"".$ent['fielddata']."\"/>\n";
+						}
+						else {
+				            //for the last tag use the start tag                  
+				              $tmp .= "   <condition field=\"".$ent['fieldtype']."\" expression=\"".$ent['fielddata']."\">\n";
+						}
+				    }
+				    $i++;
+			  }
+			} //end for each
+		             
+		} //end if count
         
         if (count($a_dialplan_include_details) > 0) {
           $i = 0;
@@ -1396,6 +1412,7 @@ function sync_package_freeswitch_dialplan_includes()
         if ($conditioncount > 0) {
             $tmp .= "   </condition>\n";
         }
+        unset ($conditioncount);        
         $tmp .= "</extension>\n";
      
         
@@ -1440,23 +1457,40 @@ function sync_package_freeswitch_public_includes()
 	     
 	    $tmp = "<extension name=\"".$rowhelper['extensionname']."\">\n";
 	
-	    if (count($a_public_include_details) > 0) {     
-	      $conditioncount = 0;
-	      $i = 0;
-	      foreach ($a_public_include_details as $ent) {
-	        if ($ent['tag'] == "condition" && $rowhelper['publicincludeid'] == $ent['publicincludeid']) {
-	            if ($i == 0) {
-	                $tmp .= "   <condition field=\"".$ent['fieldtype']."\" expression=\"".$ent['fielddata']."\">\n";
-	            }
-	            else {
-	                $tmp .= "   <condition field=\"".$ent['fieldtype']."\" expression=\"".$ent['fielddata']."\"/>\n";
-	            }
-	            $conditioncount++;
-	            $i++;
-	        }     
-	 
-	      }
-	    }
+		if (count($a_public_include_details) > 0) {     
+		  
+			$conditioncount = 0;
+			$i = 0;
+			foreach ($a_public_include_details as $ent) {
+			  if ($ent['tag'] == "condition" && $rowhelper['publicincludeid'] == $ent['publicincludeid']) {
+			      $conditioncount++;
+			      $i++;
+			  }      
+			}
+			  
+			$i = 1;
+			foreach ($a_public_include_details as $ent) {
+			  if ($ent['tag'] == "condition" && $rowhelper['publicincludeid'] == $ent['publicincludeid']) {
+				    if ($conditioncount == 1) { //single condition                  
+				    	//start tag
+				    	$tmp .= "   <condition field=\"".$ent['fieldtype']."\" expression=\"".$ent['fielddata']."\">\n";              
+				    }
+				    else { //more than one condition                  
+						if ($i < $conditioncount) {                      
+				              //all tags should be self-closing except the last one
+				              $tmp .= "   <condition field=\"".$ent['fieldtype']."\" expression=\"".$ent['fielddata']."\"/>\n";
+						}
+						else {
+				            //for the last tag use the start tag                  
+				              $tmp .= "   <condition field=\"".$ent['fieldtype']."\" expression=\"".$ent['fielddata']."\">\n";
+						}
+				    }
+				    $i++;
+			  }
+			} //end for each
+		             
+		} //end if count
+
 	    
 	    if (count($a_public_include_details) > 0) {
 	      $i = 0;
@@ -1493,6 +1527,7 @@ function sync_package_freeswitch_public_includes()
 	    if ($conditioncount > 0) {
 	        $tmp .= "   </condition>\n";
 	    }
+	    unset ($conditioncount);
 	    $tmp .= "</extension>\n";
 	 
 	    
@@ -1932,7 +1967,7 @@ function freeswitch_php_install_command()
 	}
 
 	$config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_version'] = "1.0.1 revision 10638.";
-	$config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.4.4";
+	$config['installedpackages']['freeswitchsettings']['config'][0]['freeswitch_package_version'] = "0.4.5";
 	
 	       
 	conf_mount_ro();
diff --git a/packages/freeswitch/freeswitch.xml b/packages/freeswitch/freeswitch.xml
index e1739529..f3520c0a 100644
--- a/packages/freeswitch/freeswitch.xml
+++ b/packages/freeswitch/freeswitch.xml
@@ -44,7 +44,7 @@
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
 	<name>FreeSWITCH Settings</name>
-	<version>0.4.4</version>
+	<version>0.4.5</version>
 	<title>FreeSWITCH: Settings</title>
 	<include_file>/usr/local/pkg/freeswitch.inc</include_file>
 	<menu>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 182c09dc..25922de7 100644
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -65,7 +65,7 @@
       <category>Services</category>
       <config_file>http://www.pfsense.com/packages/config/freeswitch/freeswitch.xml</config_file>
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-      <version>0.4.4</version>
+      <version>0.4.5</version>
       <status>Beta</status>
       <required_version>1.2.1</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>