Navigation

← Previous Changeset
Next Changeset →

Changeset 4392

Timestamp:

07/13/07 10:24:11 (1 year ago)

Author:

p_lindheimer

Message:

Merged revisions 4390 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/modules/branches/2.3

........

r4390 | p_lindheimer | 2007-07-13 10:22:04 -0700 (Fri, 13 Jul 2007) | 1 line

#2061: added waitexten to fix Asterisk 1.4

........

Files:

modules/branches/2.2 (modified) (1 prop)
modules/branches/2.2/blacklist/functions.inc.php (modified) (3 diffs)
modules/branches/2.2/blacklist/module.xml (modified) (2 diffs)

Legend:

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

modules/branches/2.2
- Property svnmerge-integrated changed from /modules/branches/2.1:1-2166,2289,2414,2419,2424,2430,2449,2458,2462,2476 /modules/branches/2.3:1-3256,4102,4227,4232,4251,4312 to /modules/branches/2.1:1-2166,2289,2414,2419,2424,2430,2449,2458,2462,2476 /modules/branches/2.3:1-3256,4102,4227,4232,4251,4312,4390

modules/branches/2.2/blacklist/functions.inc.php

r4285	r4392
54	54	$id = "app-blacklist-add";
55	55	$c = "s";
56		$ext->add($id, $c, '', new ext_answer);
57		$ext->add($id, $c, '', new ext_wait(1));
58		$ext->add($id, $c, '', new ext_Playback('enter-num-blacklist'));
59		$ext->add($id, $c, '', new ext_digittimeout(5));
60		$ext->add($id, $c, '', new ext_responsetimeout(60));
61		$ext->add($id, $c, '', new ext_read('blacknr', 'then-press-pound'));
62		$ext->add($id, $c, '', new ext_saydigits('${blacknr}'));
63		$ext->add($id, $c, '', new ext_Playback('if-correct-press'));
64		$ext->add($id, $c, '', new ext_Playback('digits/1'));
65		$ext->add($id, $c, 'end', new ext_noop('Waiting for input'));
	56	$ext->add($id, $c, '', new ext_answer);
	57	$ext->add($id, $c, '', new ext_wait(1));
	58	$ext->add($id, $c, '', new ext_Playback('enter-num-blacklist'));
	59	$ext->add($id, $c, '', new ext_digittimeout(5));
	60	$ext->add($id, $c, '', new ext_responsetimeout(60));
	61	$ext->add($id, $c, '', new ext_read('blacknr', 'then-press-pound'));
	62	$ext->add($id, $c, '', new ext_saydigits('${blacknr}'));
	63	$ext->add($id, $c, '', new ext_Playback('if-correct-press&digits/1'));
	64	$ext->add($id, $c, '', new ext_noop('Waiting for input'));
	65	$ext->add($id, $c, 'end', new ext_waitexten(60));
	66	$ext->add($id, $c, '', new ext_Playback('sorry-youre-having-problems&goodbye'));
66	67	$c = "1";
67	68	$ext->add($id, $c, '', new ext_set('DB(blacklist/${blacknr})', 1));
68		$ext->add($id, $c, '', new ext_Playback('num-was-successfully'));
69		$ext->add($id, $c, '', new ext_Playback('added'));
70		$ext->add($id, $c, '', new ext_wait(1));
71		$ext->add($id, $c, '', new ext_hangup);
	69	$ext->add($id, $c, '', new ext_Playback('num-was-successfully&added'));
	70	$ext->add($id, $c, '', new ext_wait(1));
	71	$ext->add($id, $c, '', new ext_hangup);
72	72	}
73	73
…	…
79	79	$id = "app-blacklist-remove";
80	80	$c = "s";
81		$ext->add($id, $c, '', new ext_answer);
82		$ext->add($id, $c, '', new ext_wait(1));
83		$ext->add($id, $c, '', new ext_Playback('entr-num-rmv-blklist'));
84		$ext->add($id, $c, '', new ext_digittimeout(5));
85		$ext->add($id, $c, '', new ext_responsetimeout(60));
86		$ext->add($id, $c, '', new ext_read('blacknr', 'then-press-pound'));
87		$ext->add($id, $c, '', new ext_saydigits('${blacknr}'));
88		$ext->add($id, $c, '', new ext_Playback('if-correct-press'));
89		$ext->add($id, $c, '', new ext_Playback('digits/1'));
90		$ext->add($id, $c, 'end', new ext_noop('Waiting for input'));
	81	$ext->add($id, $c, '', new ext_answer);
	82	$ext->add($id, $c, '', new ext_wait(1));
	83	$ext->add($id, $c, '', new ext_Playback('entr-num-rmv-blklist'));
	84	$ext->add($id, $c, '', new ext_digittimeout(5));
	85	$ext->add($id, $c, '', new ext_responsetimeout(60));
	86	$ext->add($id, $c, '', new ext_read('blacknr', 'then-press-pound'));
	87	$ext->add($id, $c, '', new ext_saydigits('${blacknr}'));
	88	$ext->add($id, $c, '', new ext_Playback('if-correct-press&digits/1'));
	89	$ext->add($id, $c, '', new ext_noop('Waiting for input'));
	90	$ext->add($id, $c, 'end', new ext_waitexten(60));
	91	$ext->add($id, $c, '', new ext_Playback('sorry-youre-having-problems&goodbye'));
91	92	$c = "1";
92		$ext->add($id, $c, '', new ext_dbdel('blacklist/${blacknr}'));
93		$ext->add($id, $c, '', new ext_Playback('num-was-successfully'));
94		$ext->add($id, $c, '', new ext_Playback('removed'));
95		$ext->add($id, $c, '', new ext_wait(1));
96		$ext->add($id, $c, '', new ext_hangup);
	93	$ext->add($id, $c, '', new ext_dbdel('blacklist/${blacknr}'));
	94	$ext->add($id, $c, '', new ext_Playback('num-was-successfully&removed'));
	95	$ext->add($id, $c, '', new ext_wait(1));
	96	$ext->add($id, $c, '', new ext_hangup);
97	97	}
98	98
…	…
104	104	$id = "app-blacklist-last";
105	105	$c = "s";
106		$ext->add($id, $c, '', new ext_answer);
107		$ext->add($id, $c, '', new ext_wait(1));
108		$ext->add($id, $c, '', new ext_setvar('lastcaller', '${DB(CALLTRACE/${CALLERID(number)})}'));
109		$ext->add($id, $c, '', new ext_gotoif('$[ $[ "${lastcaller}" = "" ] \| $[ "${lastcaller}" = "unknown" ] ]', 'noinfo'));
110		~~$ext->add($id, $c, '', new ext_playback('privacy-to-blacklist-last-call~~er'));
111		~~$ext->add($id, $c, '', new ext_playback('telephone-number~~'));
112		~~$ext->add($id, $c, '', new ext_saydigits('${lastcaller}~~'));
113		~~$ext->add($id, $c, '', new ext_setvar('TIMEOUT(digit)', '3~~'));
114		~~$ext->add($id, $c, '', new ext_setvar('TIMEOUT(response)', '7~~'));
115		~~$ext->add($id, $c, '', new ext_playback('if-correct-press~~'));
116		~~$ext->add($id, $c, '', new ext_playback('digits/1~~'));
117		~~$ext->add($id, $c, '', new ext_goto('end')~~);
118		~~$ext->add($id, $c, 'noinfo', new ext_playback('unidentified-no-callback~~'));
119		~~$ext->add($id, $c, '', new ext_hangup~~);
120		~~$ext->add($id, $c, 'end', new ext_noop('Waiting for input~~'));
	106	$ext->add($id, $c, '', new ext_answer);
	107	$ext->add($id, $c, '', new ext_wait(1));
	108	$ext->add($id, $c, '', new ext_setvar('lastcaller', '${DB(CALLTRACE/${CALLERID(number)})}'));
	109	$ext->add($id, $c, '', new ext_gotoif('$[ $[ "${lastcaller}" = "" ] \| $[ "${lastcaller}" = "unknown" ] ]', 'noinfo'));
	110	$ext->add($id, $c, '', new ext_playback('privacy-to-blacklist-last-caller&telephone-number'));
	111	$ext->add($id, $c, '', new ext_saydigits('${lastcaller}'));
	112	$ext->add($id, $c, '', new ext_setvar('TIMEOUT(digit)', '3'));
	113	$ext->add($id, $c, '', new ext_setvar('TIMEOUT(response)', '7'));
	114	$ext->add($id, $c, '', new ext_Playback('if-correct-press&digits/1'));
	115	$ext->add($id, $c, '', new ext_goto('end'));
	116	$ext->add($id, $c, 'noinfo', new ext_playback('unidentified-no-callback'));
	117	$ext->add($id, $c, '', new ext_hangup);
	118	$ext->add($id, $c, '', new ext_noop('Waiting for input'));
	119	$ext->add($id, $c, 'end', new ext_waitexten(60));
	120	$ext->add($id, $c, '', new ext_Playback('sorry-youre-having-problems&goodbye'));
121	121	$c = "1";
122		$ext->add($id, $c, '', new ext_set('DB(blacklist/${lastcaller})', 1));
123		$ext->add($id, $c, '', new ext_Playback('num-was-successfully'));
124		$ext->add($id, $c, '', new ext_Playback('added'));
125		$ext->add($id, $c, '', new ext_wait(1));
126		$ext->add($id, $c, '', new ext_hangup);
	122	$ext->add($id, $c, '', new ext_set('DB(blacklist/${lastcaller})', 1));
	123	$ext->add($id, $c, '', new ext_Playback('num-was-successfully'));
	124	$ext->add($id, $c, '', new ext_Playback('added'));
	125	$ext->add($id, $c, '', new ext_wait(1));
	126	$ext->add($id, $c, '', new ext_hangup);
127	127	}
128	128

modules/branches/2.2/blacklist/module.xml

r4287	r4392
2	2	<rawname>blacklist</rawname>
3	3	<name>Blacklist</name>
4		<version>1.1.2</version>
	4	<version>1.1.3</version>
5	5	<type>setup</type>
6	6	<category>CID & Number Management</category>
…	…
9	9	</menuitems>
10	10	<changelog>
	11	1.1.3 #2061 fixed to work with Asterisk 1.4 (wait for confirmation of 1)
11	12	1.1.2 #1638 remove duplicate of zapateller instruction
12	13	1.1.1 Add he_IL translation

Navigation

Changeset 4392

Legend:

modules/branches/2.2

modules/branches/2.2/blacklist/functions.inc.php

modules/branches/2.2/blacklist/module.xml

Download in other formats:

Navigation

Downloads

Screenshots

Documentation

Training

Support

Community

About