Changeset 5981

Timestamp:

07/10/08 17:15:06 (6 months ago)

Author:

p_lindheimer

Message:

validation for new directdids, modify macro-systemrecording to support #2899 and allow files to be recorded in place

Files:

• modules/branches/2.5/core/functions.inc.php (modified) (5 diffs)

modules/branches/2.5/core/functions.inc.php

@@ -1492 +1492 @@
-                        $context = 'macro-systemrecording';
-                        
+                        //exten => s,1,Set(RECFILE=${IF($["${ARG2}" = ""]?/tmp/${AMPUSER}-ivrrecording:${ARG2})})
+                        $ext->add($context, 's', '', new ext_setvar('RECFILE','${IF($["${ARG2}" = ""]?/tmp/${AMPUSER}-ivrrecording:${ARG2})}'));
+                        $ext->add($context, 's', '', new ext_execif('$["${ARG3}" != ""]','Authenticate','${ARG3}'));
-                        $ext->add($context, 's', '', new ext_goto(1, '${ARG1}'));
-                        
-                        $exten = 'dorecord';
-                        
-/tmp/${AMPUSER}-ivrrecording
+${RECFILE}
-                        $ext->add($context, $exten, '', new ext_wait(1));
-                        $ext->add($context, $exten, '', new ext_goto(1, 'confmenu'));
@@ -1502 +1505 @@
-                        $exten = 'docheck';
-                        
-
+
+
-                        $ext->add($context, $exten, '', new ext_wait(1));
-                        $ext->add($context, $exten, '', new ext_goto(1, 'confmenu'));
@@ -1508 +1512 @@
-                        $exten = 'confmenu';
-                        if (version_compare($version, "1.4", "ge")) { 
-
+&astcc-followed-by-pound
-                        } else {
-
+&astcc-followed-by-pound
-                        }
-                        $ext->add($context, $exten, '', new ext_read('RECRESULT', '', 1, '', '', 4));
-                        $ext->add($context, $exten, '', new ext_gotoif('$["x${RECRESULT}"="x*"]', 'dorecord,1'));
-1
+2
-                        $ext->add($context, $exten, '', new ext_goto(1));
-                        
-1
+'dc_start'
-                        $ext->add($context, '*', '', new ext_goto(1, 'dorecord'));
-                        
@@ -3943 +3947 @@
-                $msgInvalidOutboundCID = _("Please enter a valid Outbound CID");
-                $msgInvalidPause = _("Please enter a valid pause time in seconds, using digits only");
+                $msgInvalidDIDNum = _("You have entered a non-standard dialpattern for your DID. You can only enter standard dialpatterns. You must use the inbound routing form  to enter non-standard patterns");
+                $msgInvalidCIDNum = _("Please enter a valid Caller ID Number or leave it blank for your Assigned DID/CID pair");
-
-                // This is the actual gui stuff
@@ -4010 +4016 @@
-                $section = _("Assigned DID/CID");
-                $currentcomponent->addguielem($section, new gui_textbox('newdid_name', $newdid_name, 'DID Description', _("A description for this DID, such as \"Fax\"")), 4);
-
-DID must be specified in the above Add DID box")
+,'!isDialpattern()',$msgInvalidDIDNum,true
+CID must be specified in the above Add DID box"),'!isDialpattern()',$msgInvalidCIDNum,true
-
-                $dids = core_did_list('extension');