Navigation

← Previous Change
Next Change →

Changeset 9659 for modules

Timestamp:

05/21/10 12:52:56 (3 years ago)

Author:

p_lindheimer

Message:

closes #3605 use Read() with concatenated files on Asterisk 1.6+ where it is finally supported, requires 1.6 to take advantage

Files:

modules/branches/2.8/callforward/functions.inc.php (modified) (12 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

modules/branches/2.8/callforward/functions.inc.php

r9619	r9659
80	80	global $amp_conf;
81	81	global $DEVSTATE;
	82	global $version;
	83	$ast_ge_16 = version_compare($version, "1.6", "ge");
82	84
83	85	$id = "app-cf-toggle"; // The context to be included
…	…
91	93	$ext->add($id, $c, '', new ext_gotoif('$["${DB(CF/${AMPUSER})}" = ""]', 'activate', 'deactivate'));
92	94
93		$ext->add($id, $c, 'activate', new ext_playback('ent-target-attendant'));
94		$ext->add($id, $c, '', new ext_read('toext', 'then-press-pound'));
	95	if ($ast_ge_16) {
	96	$ext->add($id, $c, 'activate', new ext_read('toext', 'ent-target-attendant&then-press-pound'));
	97	} else {
	98	$ext->add($id, $c, 'activate', new ext_playback('ent-target-attendant'));
	99	$ext->add($id, $c, '', new ext_read('toext', 'then-press-pound'));
	100	}
95	101	$ext->add($id, $c, '', new ext_gotoif('$["${toext}"=""]', 'activate'));
96	102	$ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
…	…
145	151	global $amp_conf;
146	152	global $DEVSTATE;
	153	global $version;
	154	$ast_ge_16 = version_compare($version, "1.6", "ge");
147	155
148	156	$id = "app-cf-on"; // The context to be included
…	…
153	161	$ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
154	162	$ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
155		$ext->add($id, $c, '', new ext_playback('call-fwd-unconditional'));
156		$ext->add($id, $c, '', new ext_playback('please-enter-your&extension'));
157		$ext->add($id, $c, '', new ext_read('fromext', 'then-press-pound'));
	163
	164	if ($ast_ge_16) {
	165	$ext->add($id, $c, '', new ext_read('fromext', 'call-fwd-unconditional&please-enter-your&extension&then-press-pound'));
	166	} else {
	167	$ext->add($id, $c, '', new ext_playback('call-fwd-unconditional'));
	168	$ext->add($id, $c, '', new ext_playback('please-enter-your&extension'));
	169	$ext->add($id, $c, '', new ext_read('fromext', 'then-press-pound'));
	170	}
158	171	$ext->add($id, $c, '', new ext_setvar('fromext', '${IF($["foo${fromext}"="foo"]?${AMPUSER}:${fromext})}'));
159	172	$ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
160		$ext->add($id, $c, 'startread', new ext_playback('ent-target-attendant'));
161		$ext->add($id, $c, '', new ext_read('toext', 'then-press-pound'));
	173
	174	if ($ast_ge_16) {
	175	$ext->add($id, $c, 'startread', new ext_read('toext', 'ent-target-attendant&then-press-pound'));
	176	} else {
	177	$ext->add($id, $c, 'startread', new ext_playback('ent-target-attendant'));
	178	$ext->add($id, $c, '', new ext_read('toext', 'then-press-pound'));
	179	}
162	180	$ext->add($id, $c, '', new ext_gotoif('$["foo${toext}"="foo"]', 'startread'));
163	181	$ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
…	…
215	233	global $amp_conf;
216	234	global $DEVSTATE;
	235	global $version;
	236	$ast_ge_16 = version_compare($version, "1.6", "ge");
217	237
218	238	$id = "app-cf-off-any"; // The context to be included
…	…
222	242	$ext->add($id, $c, '', new ext_answer('')); // $cmd,1,Answer
223	243	$ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
224		$ext->add($id, $c, '', new ext_playback('please-enter-your&extension'));
225		$ext->add($id, $c, '', new ext_read('fromext', 'then-press-pound'));
	244
	245	if ($ast_ge_16) {
	246	$ext->add($id, $c, '', new ext_read('fromext', 'please-enter-your&extension&then-press-pound'));
	247	} else {
	248	$ext->add($id, $c, '', new ext_playback('please-enter-your&extension'));
	249	$ext->add($id, $c, '', new ext_read('fromext', 'then-press-pound'));
	250	}
226	251	$ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
227	252	$ext->add($id, $c, '', new ext_dbdel('CF/${fromext}'));
…	…
311	336	function callforward_cfbon($c) {
312	337	global $ext;
	338	global $version;
	339	$ast_ge_16 = version_compare($version, "1.6", "ge");
313	340
314	341	$id = "app-cf-busy-on"; // The context to be included
…	…
319	346	$ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
320	347	$ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
321		$ext->add($id, $c, '', new ext_playback('call-fwd-on-busy'));
322		$ext->add($id, $c, '', new ext_playback('please-enter-your&extension'));
323		$ext->add($id, $c, '', new ext_read('fromext', 'then-press-pound'));
	348	if ($ast_ge_16) {
	349	$ext->add($id, $c, '', new ext_read('fromext', 'call-fwd-on-busy&please-enter-your&extension&then-press-pound'));
	350	} else {
	351	$ext->add($id, $c, '', new ext_playback('call-fwd-on-busy'));
	352	$ext->add($id, $c, '', new ext_playback('please-enter-your&extension'));
	353	$ext->add($id, $c, '', new ext_read('fromext', 'then-press-pound'));
	354	}
324	355	$ext->add($id, $c, '', new ext_setvar('fromext', '${IF($["foo${fromext}"="foo"]?${AMPUSER}:${fromext})}'));
325	356	$ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
326		$ext->add($id, $c, 'startread', new ext_playback('ent-target-attendant'));
327		$ext->add($id, $c, '', new ext_read('toext', 'then-press-pound'));
	357	if ($ast_ge_16) {
	358	$ext->add($id, $c, 'startread', new ext_read('toext', 'ent-target-attendant&then-press-pound'));
	359	} else {
	360	$ext->add($id, $c, 'startread', new ext_playback('ent-target-attendant'));
	361	$ext->add($id, $c, '', new ext_read('toext', 'then-press-pound'));
	362	}
328	363	$ext->add($id, $c, '', new ext_gotoif('$["foo${toext}"="foo"]', 'startread'));
329	364	$ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
…	…
350	385	function callforward_cfboff_any($c) {
351	386	global $ext;
	387	global $version;
	388	$ast_ge_16 = version_compare($version, "1.6", "ge");
352	389
353	390	$id = "app-cf-busy-off-any"; // The context to be included
…	…
357	394	$ext->add($id, $c, '', new ext_answer('')); // $cmd,1,Answer
358	395	$ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
359		$ext->add($id, $c, '', new ext_playback('please-enter-your&extension'));
360		$ext->add($id, $c, '', new ext_read('fromext', 'then-press-pound'));
	396	if ($ast_ge_16) {
	397	$ext->add($id, $c, '', new ext_read('fromext', 'please-enter-your&extension&then-press-pound'));
	398	} else {
	399	$ext->add($id, $c, '', new ext_playback('please-enter-your&extension'));
	400	$ext->add($id, $c, '', new ext_read('fromext', 'then-press-pound'));
	401	}
361	402	$ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
362	403	$ext->add($id, $c, '', new ext_dbdel('CFB/${fromext}'));
…	…
399	440	function callforward_cfuon($c) {
400	441	global $ext;
	442	global $version;
	443	$ast_ge_16 = version_compare($version, "1.6", "ge");
401	444
402	445	$id = "app-cf-unavailable-on"; // The context to be included
…	…
408	451	$ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
409	452	$ext->add($id, $c, '', new ext_macro('user-callerid')); // $cmd,n,Macro(user-callerid)
410		$ext->add($id, $c, '', new ext_playback('call-fwd-no-ans'));
411		$ext->add($id, $c, '', new ext_playback('please-enter-your&extension'));
412		$ext->add($id, $c, '', new ext_read('fromext', 'then-press-pound'));
	453	if ($ast_ge_16) {
	454	$ext->add($id, $c, '', new ext_read('fromext', 'call-fwd-no-ans&please-enter-your&extension&then-press-pound'));
	455	} else {
	456	$ext->add($id, $c, '', new ext_playback('call-fwd-no-ans'));
	457	$ext->add($id, $c, '', new ext_playback('please-enter-your&extension'));
	458	$ext->add($id, $c, '', new ext_read('fromext', 'then-press-pound'));
	459	}
413	460	$ext->add($id, $c, '', new ext_setvar('fromext', '${IF($["foo${fromext}"="foo"]?${AMPUSER}:${fromext})}'));
414	461	$ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)
415		$ext->add($id, $c, 'startread', new ext_playback('ent-target-attendant'));
416		$ext->add($id, $c, '', new ext_read('toext', 'then-press-pound'));
	462	if ($ast_ge_16) {
	463	$ext->add($id, $c, 'startread', new ext_read('toext', 'ent-target-attendant&then-press-pound'));
	464	} else {
	465	$ext->add($id, $c, 'startread', new ext_playback('ent-target-attendant'));
	466	$ext->add($id, $c, '', new ext_read('toext', 'then-press-pound'));
	467	}
417	468	$ext->add($id, $c, '', new ext_gotoif('$["foo${toext}"="foo"]', 'startread'));
418	469	$ext->add($id, $c, '', new ext_wait('1')); // $cmd,n,Wait(1)

Navigation

Changeset 9659 for modules

Legend:

modules/branches/2.8/callforward/functions.inc.php

Download in other formats:

Navigation

Downloads

Screenshots

Documentation

Training

Support

Store

Community

About