[Freeswitch-svn] [commit] r5522 - in freeswitch/branches/greenlizard/scripts/contrib/trixter: . xml-curl/modules xml-curl/templates/switch1/dialplan

[Freeswitch SVN]

Author: greenlizard
Date: Sun Jul  8 22:44:38 2007
New Revision: 5522

Added:
   freeswitch/branches/greenlizard/scripts/contrib/trixter/calls.pl   (props changed)
      - copied unchanged from r5521, /freeswitch/trunk/scripts/contrib/trixter/calls.pl
Modified:
   freeswitch/branches/greenlizard/scripts/contrib/trixter/xml-curl/modules/dialplan.php
   freeswitch/branches/greenlizard/scripts/contrib/trixter/xml-curl/templates/switch1/dialplan/frompstn.tpl

Log:
merge trunk version 5515:5518

Modified: freeswitch/branches/greenlizard/scripts/contrib/trixter/xml-curl/modules/dialplan.php
==============================================================================
--- freeswitch/branches/greenlizard/scripts/contrib/trixter/xml-curl/modules/dialplan.php	(original)
+++ freeswitch/branches/greenlizard/scripts/contrib/trixter/xml-curl/modules/dialplan.php	Sun Jul  8 22:44:38 2007
@@ -15,13 +15,11 @@
         // we might check a database for  the route, but in this example we hardcode it
         $template = 'frompstn.tpl'; // one can exist for each profile or channel type or ...
 
-
-        $ACTION['answer']='';
-
-        $ACTION['phrase']='spell,abcdef';
-
-        $ACTION['javascript']="somethingcool.js";
-        $ACTION['bridge']="sofia/external/".$_POST['destination_number']."@myprovider.tld";
+        // simulate a database query for the dialplan
+        $ACTION[]=Array('answer','');
+        $ACTION[]=Array('phrase','spell,abcdef');
+        $ACTION[]=Array('javascript','somethingcool.js');
+        $ACTION[]=Array('bridge','sofia/external/$_POST[destination_number]@myprovider.tld');
         $smarty->assign('ACTION',$ACTION);
 
     } // end - they were logged in

Modified: freeswitch/branches/greenlizard/scripts/contrib/trixter/xml-curl/templates/switch1/dialplan/frompstn.tpl
==============================================================================
--- freeswitch/branches/greenlizard/scripts/contrib/trixter/xml-curl/templates/switch1/dialplan/frompstn.tpl	(original)
+++ freeswitch/branches/greenlizard/scripts/contrib/trixter/xml-curl/templates/switch1/dialplan/frompstn.tpl	Sun Jul  8 22:44:38 2007
@@ -5,7 +5,7 @@
       <extension name="myextension">
       <condition field="destination_number" expression="^.*$">
 {foreach key=k item=v from=$ACTION}
-          <action application="{$k}" data="{$v}"/>
+          <action application="{$v[0]}" data="{$v[1]}"/>
 {/foreach}
         </condition>
       </extension>