Changed my mind again about the array structure

git-svn-id: https://svn.alkaloid.net/gpl/shout/trunk@88 06cd67b6-e706-0410-b29e-9de616bca6e9

diff --git a/andrew.webprj b/andrew.webprj
index db980c5..49a77d6 100644 (file)
--- a/andrew.webprj
+++ b/andrew.webprj
@@ -84,7 +84,7 @@
         <uploadeditem upload_time="0" url="templates/dialplan/" />
         <uploadeditem upload_time="1131600075" url="templates/dialplan/contexttree.inc" />
         <uploadeditem upload_time="1131593241" url="templates/dialplan/dialplanlist.inc" />
-        <uploadeditem upload_time="1131605161" url="templates/dialplan/extensiondetail.inc" />
+        <uploadeditem upload_time="1131606281" url="templates/dialplan/extensiondetail.inc" />
         <uploadeditem upload_time="1121689030" url="templates/dialplan/priority-form-begin.inc" />
         <uploadeditem upload_time="1121689030" url="templates/dialplan/priority-form-end.inc" />
         <uploadeditem upload_time="1121689030" url="templates/dialplan/priority-form-line.inc" />
@@ -121,7 +121,7 @@
     <events/>
     <item modified_time="1131045729" url="lib/defines.php" uploadstatus="1" />
     <item modified_time="1131600075" url="templates/dialplan/contexttree.inc" uploadstatus="1" />
-    <item modified_time="1131605161" url="templates/dialplan/extensiondetail.inc" uploadstatus="1" />
+    <item modified_time="1131606281" url="templates/dialplan/extensiondetail.inc" uploadstatus="1" />
     <item modified_time="1131497712" url="security.php" uploadstatus="1" />
     <treestatus>
       <openfolder url="config" />

diff --git a/templates/dialplan/extensiondetail.inc b/templates/dialplan/extensiondetail.inc
index 8033539..9375eb9 100644 (file)
--- a/templates/dialplan/extensiondetail.inc
+++ b/templates/dialplan/extensiondetail.inc
@@ -10,13 +10,12 @@ if(!isset($dialplan['extensions'])) {
     <script language="JavaScript" type="text/javascript">
 
     var dialplan = Array();
-    var extensions = Array();
     <?php
     foreach($dialplan['extensions'] as $extension => $priorities) {
-        print "extensions['$extension'] = '".Shout::exten2name($extension)."'\n";
+        print "dialplan['$extension']['name'] = '".Shout::exten2name($extension)."'\n";
         foreach($priorities as $priority => $data) {
-            print "dialplan['$extension']['$priority']['application'] = '".$data['application']."'\n";
-            print "dialplan['$extension']['$priority']['args'] = '".$data['args']."'\n";
+            print "dialplan['$extension']['priorities']['$priority']['application'] = '".$data['application']."'\n";
+            print "dialplan['$extension']['priorities']['$priority']['args'] = '".$data['args']."'\n";
         }
     }
     ?>