FreeSWITCH package set order for dialplan, extension, gateway and public lists

4 files changed, 124 insertions, 49 deletions

diff --git a/config/freeswitch/freeswitch_dialplan_includes.tmp b/config/freeswitch/freeswitch_dialplan_includes.tmp
index 3fa02dbf..7a2b6b27 100644
--- a/config/freeswitch/freeswitch_dialplan_includes.tmp
+++ b/config/freeswitch/freeswitch_dialplan_includes.tmp
@@ -197,33 +197,53 @@ include("head.inc");
       </td>
 		</tr>
 
-		<?php
-      $i = 0;
-      if (count($a_dialplan_includes) > 0) {
-        foreach ($a_dialplan_includes as $ent) {
+	<?php
+	//create a temporary id for the array
+	$i = 0;
+	if (count($a_dialplan_includes) > 0) {
+		foreach ($a_dialplan_includes as $ent) {
+			$a_dialplan_includes[$i]['id'] = $i;
+			$i++;
+		}
+	}
+
+	//order the array
+	function cmp_number($a, $b) {
+		if ($a["order"] > $b["order"]) {
+			return 1;
+		}
+		else {
+			return 0;
+		}
+	}
+	usort($a_dialplan_includes, "cmp_number");
+		
+	$i = 0;
+	if (count($a_dialplan_includes) > 0) {
+	foreach ($a_dialplan_includes as $ent) {
     ?>
-    <tr>
-      <td class="listlr" ondblclick="document.location='freeswitch_dialplan_includes_edit.php?id=<?=$i;?>'">
-        <?=$ent['extensionname']?>
-      </td>
-      <td class="listlr" ondblclick="document.location='freeswitch_dialplan_includes_edit.php?id=<?=$i;?>'">
-        <?=$ent['order']?>
-      </td>
-      <td class="listr" ondblclick="document.location='freeswitch_dialplan_includes_edit.php?id=<?=$i;?>';">
-        <?=$ent['enabled'];?>&nbsp;
-      </td>
-      <td class="listbg" ondblclick="document.location='freeswitch_dialplan_includes_edit.php?id=<?=$i;?>';">
-        <font color="#FFFFFF"><?=htmlspecialchars($ent['descr']);?>&nbsp;
-      </td>
-      <td valign="middle" nowrap class="list">
-        <table border="0" cellspacing="0" cellpadding="1">
-          <tr>
-            <td valign="middle"><a href="freeswitch_dialplan_includes_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="freeswitch_dialplan_includes.php?type=dialplanincludes&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>
+		<tr>
+		  <td class="listlr" ondblclick="document.location='freeswitch_dialplan_includes_edit.php?id=<?=$ent['id'];?>'">
+			<?=$ent['extensionname']?>
+		  </td>
+		  <td class="listlr" ondblclick="document.location='freeswitch_dialplan_includes_edit.php?id=<?=$ent['id'];?>'">
+			<?=$ent['order']?>
+		  </td>
+		  <td class="listr" ondblclick="document.location='freeswitch_dialplan_includes_edit.php?id=<?=$ent['id'];?>';">
+			<?=$ent['enabled'];?>&nbsp;
+		  </td>
+		  <td class="listbg" ondblclick="document.location='freeswitch_dialplan_includes_edit.php?id=<?=$ent['id'];?>';">
+			<font color="#FFFFFF"><?=htmlspecialchars($ent['descr']);?>&nbsp;
+		  </td>
+		  <td valign="middle" nowrap class="list">
+			<table border="0" cellspacing="0" cellpadding="1">
+			  <tr>
+				<td valign="middle"><a href="freeswitch_dialplan_includes_edit.php?id=<?=$ent['id'];?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
+				<td><a href="freeswitch_dialplan_includes.php?type=dialplanincludes&act=del&id=<?=$ent['id'];?>" 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++;
         }
diff --git a/config/freeswitch/freeswitch_extensions.tmp b/config/freeswitch/freeswitch_extensions.tmp
index 5c0db6a3..0541950c 100644
--- a/config/freeswitch/freeswitch_extensions.tmp
+++ b/config/freeswitch/freeswitch_extensions.tmp
@@ -126,8 +126,28 @@ if ($config_change == 1) {
 		</tr>
 
 
-		<?php
-
+	<?php
+		
+	//create a temporary id for the array
+	$i = 0;
+	if (count($a_extensions) > 0) {
+		foreach ($a_extensions as $ent) {
+			$a_extensions[$i]['id'] = $i;
+			$i++;
+		}
+	}		
+
+	//order the array
+	function cmp_number($a, $b) {
+		if ($a["extension"] > $b["extension"]) {
+			return 1;
+		}
+		else {
+			return 0;
+		}
+	}
+	usort($a_extensions, "cmp_number");
+	
     $i = 0;
     if (count($a_extensions) > 0) {
 
@@ -135,23 +155,23 @@ if ($config_change == 1) {
 
     ?>
           <tr>
-            <td class="listr" ondblclick="document.location='freeswitch_extensions_edit.php?id=<?=$i;?>';">
+            <td class="listr" ondblclick="document.location='freeswitch_extensions_edit.php?id=<?=$ent['id'];?>';">
               <?=$ent['extension'];?>&nbsp;
             </td>
-            <td class="listr" ondblclick="document.location='freeswitch_extensions_edit.php?id=<?=$i;?>';">
+            <td class="listr" ondblclick="document.location='freeswitch_extensions_edit.php?id=<?=$ent['id'];?>';">
               <?=$ent['vm-mailto'];?>&nbsp;
             </td>
-            <td class="listr" ondblclick="document.location='freeswitch_extensions_edit.php?id=<?=$i;?>';">
+            <td class="listr" ondblclick="document.location='freeswitch_extensions_edit.php?id=<?=$ent['id'];?>';">
               <?=$ent['callgroup'];?>&nbsp;
             </td>
-            <td class="listbg" ondblclick="document.location='freeswitch_extensions_edit.php?id=<?=$i;?>';">
+            <td class="listbg" ondblclick="document.location='freeswitch_extensions_edit.php?id=<?=$ent['id'];?>';">
               <font color="#FFFFFF"><?=htmlspecialchars($ent['description']);?>&nbsp;
             </td>
             <td valign="middle" nowrap class="list">
               <table border="0" cellspacing="0" cellpadding="1">
                 <tr>
-                  <td valign="middle"><a href="freeswitch_extensions_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="freeswitch_extensions.php?type=extensions&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>
+                  <td valign="middle"><a href="freeswitch_extensions_edit.php?id=<?=$ent['id'];?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
+                  <td><a href="freeswitch_extensions.php?type=extensions&act=del&id=<?=$ent['id'];?>" 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>
diff --git a/config/freeswitch/freeswitch_gateways.tmp b/config/freeswitch/freeswitch_gateways.tmp
index 88be8fc4..6a0d6dd6 100644
--- a/config/freeswitch/freeswitch_gateways.tmp
+++ b/config/freeswitch/freeswitch_gateways.tmp
@@ -126,8 +126,22 @@ if ($config_change == 1) {
 		</tr>
 
 
-		<?php
-
+	<?php
+	//create a temporary id for the array
+	$i = 0;
+	if (count($a_gateways) > 0) {
+		foreach ($a_gateways as $ent) {
+			$a_gateways[$i]['id'] = $i;
+			$i++;
+		}
+	}
+
+	//order the array
+	function cmp_string($a, $b) { 
+		return strcmp($a["gateway"], $b["gateway"]); 
+	}
+	usort($a_gateways, "cmp_string");	
+	
     $i = 0;
     if (count($a_gateways) > 0) {
 
@@ -135,23 +149,23 @@ if ($config_change == 1) {
 
     ?>
           <tr>
-            <td class="listr" ondblclick="document.location='freeswitch_gateways_edit.php?id=<?=$i;?>';">
+            <td class="listr" ondblclick="document.location='freeswitch_gateways_edit.php?id=<?=$ent['id'];?>';">
               <?=$ent['gateway'];?>&nbsp;
             </td>
-            <td class="listr" ondblclick="document.location='freeswitch_gateways_edit.php?id=<?=$i;?>';">
+            <td class="listr" ondblclick="document.location='freeswitch_gateways_edit.php?id=<?=$ent['id'];?>';">
               <?=$ent['context'];?>&nbsp;
             </td>
-            <td class="listr" ondblclick="document.location='freeswitch_gateways_edit.php?id=<?=$i;?>';">
+            <td class="listr" ondblclick="document.location='freeswitch_gateways_edit.php?id=<?=$ent['id'];?>';">
               <?=$ent['enabled'];?>&nbsp;
             </td>
-            <td class="listbg" ondblclick="document.location='freeswitch_gateways_edit.php?id=<?=$i;?>';">
+            <td class="listbg" ondblclick="document.location='freeswitch_gateways_edit.php?id=<?=$ent['id'];?>';">
               <font color="#FFFFFF"><?=htmlspecialchars($ent['description']);?>&nbsp;
             </td>
             <td valign="middle" nowrap class="list">
               <table border="0" cellspacing="0" cellpadding="1">
                 <tr>
-                  <td valign="middle"><a href="freeswitch_gateways_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="freeswitch_gateways.php?type=gateways&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>
+                  <td valign="middle"><a href="freeswitch_gateways_edit.php?id=<?=$ent['id'];?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
+                  <td><a href="freeswitch_gateways.php?type=gateways&act=del&id=<?=$ent['id'];?>" 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>
diff --git a/config/freeswitch/freeswitch_public_includes.tmp b/config/freeswitch/freeswitch_public_includes.tmp
index 1947d8ff..74bbf3bf 100644
--- a/config/freeswitch/freeswitch_public_includes.tmp
+++ b/config/freeswitch/freeswitch_public_includes.tmp
@@ -199,30 +199,51 @@ include("head.inc");
       </td>
 		</tr>
 
-		<?php
+	<?php
+	//create a temporary id for the array
+	$i = 0;
+	if (count($a_public_includes) > 0) {
+		foreach ($a_public_includes as $ent) {
+			$a_public_includes[$i]['id'] = $i;
+			$i++;
+		}
+	}
+
+	//order the array
+	//order the array
+	function cmp_number($a, $b) {
+		if ($a["order"] > $b["order"]) {
+			return 1;
+		}
+		else {
+			return 0;
+		}
+	}
+	usort($a_public_includes, "cmp_number");
+	
       $i = 0;
       if (count($a_public_includes) > 0) {
         foreach ($a_public_includes as $ent) {
           if (strlen($ent['extensionname'].$ent['enabled']) > 0) {
     ?>
     <tr>
-      <td class="listlr" ondblclick="document.location='freeswitch_public_includes_edit.php?id=<?=$i;?>'">
+      <td class="listlr" ondblclick="document.location='freeswitch_public_includes_edit.php?id=<?=$ent['id'];?>'">
         <?=$ent['extensionname']?>
       </td>
-      <td class="listlr" ondblclick="document.location='freeswitch_public_includes_edit.php?id=<?=$i;?>'">
+      <td class="listlr" ondblclick="document.location='freeswitch_public_includes_edit.php?id=<?=$ent['id'];?>'">
         <?=$ent['order']?>
       </td>
-      <td class="listr" ondblclick="document.location='freeswitch_public_includes_edit.php?id=<?=$i;?>';">
+      <td class="listr" ondblclick="document.location='freeswitch_public_includes_edit.php?id=<?=$ent['id'];?>';">
         <?=$ent['enabled'];?>&nbsp;
       </td>
-      <td class="listbg" ondblclick="document.location='freeswitch_public_includes_edit.php?id=<?=$i;?>';">
+      <td class="listbg" ondblclick="document.location='freeswitch_public_includes_edit.php?id=<?=$ent['id'];?>';">
         <font color="#FFFFFF"><?=htmlspecialchars($ent['descr']);?>&nbsp;
       </td>
       <td valign="middle" nowrap class="list">
         <table border="0" cellspacing="0" cellpadding="1">
           <tr>
-            <td valign="middle"><a href="freeswitch_public_includes_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="freeswitch_public_includes.php?type=publicincludes&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>
+            <td valign="middle"><a href="freeswitch_public_includes_edit.php?id=<?=$ent['id'];?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
+            <td><a href="freeswitch_public_includes.php?type=publicincludes&act=del&id=<?=$ent['id'];?>" 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>