Navigation

← Previous Changeset
Next Changeset →

Changeset 6913

Timestamp:

10/04/08 18:44:03 (5 years ago)

Author:

p_lindheimer

Message:

re #3215 used DEVICE_STATE for Asterisk 1.6+, fixes all but ARI

Files:

modules/branches/2.5/core/agi-bin/user_login_out.agi (modified) (5 diffs)
modules/branches/2.5/daynight/functions.inc.php (modified) (3 diffs)
modules/branches/2.5/donotdisturb/functions.inc.php (modified) (7 diffs)
modules/branches/2.5/findmefollow/functions.inc.php (modified) (5 diffs)

Legend:

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

modules/branches/2.5/core/agi-bin/user_login_out.agi

r6326	r6913
35	35	$intercom_code = get_var( "INTERCOMCODE" );
36	36
37		$ast_version14 = version_compare($ast_vversion, "1.4", "ge");
	37	$ast_version14 = version_compare($ast_version, "1.4", "ge");
	38
	39	$DEVSTATE = version_compare($ast_version, "1.6", "ge") ? "DEVICE_STATE" : "DEVSTATE";
38	40
39	41	/*
…	…
143	145	global $fm_devstate;
144	146	global $dnd_devstate;
	147	global $DEVSTATE;
145	148
146	149	set_device_user($device, $user);
…	…
154	157	if ($fm_devstate) {
155	158	debug("insert_user: Setting FollowMe DEVSTATES for device $device",5);
156		$agi->set_variable(~~'DEVSTATE~~(Custom:FOLLOWME'.$device.')',get_followme_state($user));
	159	$agi->set_variable($DEVSTATE.'(Custom:FOLLOWME'.$device.')',get_followme_state($user));
157	160	}
158	161	if ($dnd_devstate) {
159	162	debug("insert_user: Setting DND DEVSTATES for device $device",5);
160		$agi->set_variable(~~'DEVSTATE~~(Custom:DEVDND'.$device.')',get_dnd_state($user));
	163	$agi->set_variable($DEVSTATE.'(Custom:DEVDND'.$device.')',get_dnd_state($user));
161	164	}
162	165
…	…
179	182	global $fm_devstate;
180	183	global $dnd_devstate;
	184	global $DEVSTATE;
181	185
182	186	$current_user = get_user($device);
…	…
193	197	if ($fm_devstate) {
194	198	debug("Setting device $device FollowMe state to INVALID before deleting",5);
195		$agi->set_variable(~~'DEVSTATE~~(Custom:FOLLOWME'.$device.')','INVALID');
	199	$agi->set_variable($DEVSTATE.'(Custom:FOLLOWME'.$device.')','INVALID');
196	200	}
197	201	if ($dnd_devstate) {
198	202	debug("Setting device $device DND state to INVALID before deleting",5);
199		$agi->set_variable(~~'DEVSTATE~~(Custom:DEVDND'.$device.')','INVALID');
	203	$agi->set_variable($DEVSTATE.'(Custom:DEVDND'.$device.')','INVALID');
200	204	}
201	205	// I thought they should then be deleted, but they still end up there probably because setting them to invalid re-creates them

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

r6802	r6913
166	166	global $ext;
167	167	global $amp_conf;
	168	global $version;
	169	global $DEVSTATE;
	170
	171	$DEVSTATE = version_compare($version, "1.6", "ge") ? "DEVICE_STATE" : "DEVSTATE";
168	172
169	173	$list = daynight_list();
…	…
202	206	$ext->add($id, $c, 'day', new ext_setvar('DB(DAYNIGHT/C${INDEX})', 'DAY'));
203	207	if ($amp_conf['USEDEVSTATE']) {
204		$ext->add($id, $c, '', new ext_setvar(~~'DEVSTATE~~(Custom:DAYNIGHT${INDEX})', 'NOT_INUSE'));
	208	$ext->add($id, $c, '', new ext_setvar($DEVSTATE.'(Custom:DAYNIGHT${INDEX})', 'NOT_INUSE'));
205	209	}
206	210	$ext->add($id, $c, '', new ext_playback('beep&silence/1&day&reception&digits/${INDEX}&enabled'));
…	…
209	213	$ext->add($id, $c, 'night', new ext_setvar('DB(DAYNIGHT/C${INDEX})', 'NIGHT'));
210	214	if ($amp_conf['USEDEVSTATE']) {
211		$ext->add($id, $c, '', new ext_setvar(~~'DEVSTATE~~(Custom:DAYNIGHT${INDEX})', 'INUSE'));
	215	$ext->add($id, $c, '', new ext_setvar($DEVSTATE.'(Custom:DAYNIGHT${INDEX})', 'INUSE'));
212	216	}
213	217	$ext->add($id, $c, '', new ext_playback('beep&silence/1&beep&silence/1&day&reception&digits/${INDEX}&disabled'));

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

r6025	r6913
58	58	global $ext;
59	59	global $amp_conf;
	60	global $version;
	61
	62	$DEVSTATE = version_compare($version, "1.6", "ge") ? "DEVICE_STATE" : "DEVSTATE";
60	63
61	64	$id = "app-dnd-on"; // The context to be included
…	…
75	78	if ($amp_conf['USEDEVSTATE']) {
76	79	$c = 'sstate';
77		$ext->add($id, $c, '', new ext_setvar(~~'DEVSTATE~~(Custom:DND${AMPUSER})', '${STATE}'));
	80	$ext->add($id, $c, '', new ext_setvar($DEVSTATE.'(Custom:DND${AMPUSER})', '${STATE}'));
78	81	$ext->add($id, $c, '', new ext_dbget('DEVICES','AMPUSER/${AMPUSER}/device'));
79	82	$ext->add($id, $c, '', new ext_gotoif('$["${DEVICES}" = "" ]', 'return'));
80	83	$ext->add($id, $c, '', new ext_setvar('LOOPCNT', '${FIELDQTY(DEVICES,&)}'));
81	84	$ext->add($id, $c, '', new ext_setvar('ITER', '1'));
82		$ext->add($id, $c, 'begin', new ext_setvar(~~'DEVSTATE~~(Custom:DEVDND${CUT(DEVICES,&,${ITER})})','${STATE}'));
	85	$ext->add($id, $c, 'begin', new ext_setvar($DEVSTATE.'(Custom:DEVDND${CUT(DEVICES,&,${ITER})})','${STATE}'));
83	86	$ext->add($id, $c, '', new ext_setvar('ITER', '$[${ITER} + 1]'));
84	87	$ext->add($id, $c, '', new ext_gotoif('$[${ITER} <= ${LOOPCNT}]', 'begin'));
…	…
90	93	global $ext;
91	94	global $amp_conf;
	95	global $version;
	96
	97	$DEVSTATE = version_compare($version, "1.6", "ge") ? "DEVICE_STATE" : "DEVSTATE";
92	98
93	99	$id = "app-dnd-off"; // The context to be included
…	…
107	113	if ($amp_conf['USEDEVSTATE']) {
108	114	$c = 'sstate';
109		$ext->add($id, $c, '', new ext_setvar(~~'DEVSTATE~~(Custom:DND${AMPUSER})', '${STATE}'));
	115	$ext->add($id, $c, '', new ext_setvar($DEVSTATE.'(Custom:DND${AMPUSER})', '${STATE}'));
110	116	$ext->add($id, $c, '', new ext_dbget('DEVICES','AMPUSER/${AMPUSER}/device'));
111	117	$ext->add($id, $c, '', new ext_gotoif('$["${DEVICES}" = "" ]', 'return'));
112	118	$ext->add($id, $c, '', new ext_setvar('LOOPCNT', '${FIELDQTY(DEVICES,&)}'));
113	119	$ext->add($id, $c, '', new ext_setvar('ITER', '1'));
114		$ext->add($id, $c, 'begin', new ext_setvar(~~'DEVSTATE~~(Custom:DEVDND${CUT(DEVICES,&,${ITER})})','${STATE}'));
	120	$ext->add($id, $c, 'begin', new ext_setvar($DEVSTATE.'(Custom:DEVDND${CUT(DEVICES,&,${ITER})})','${STATE}'));
115	121	$ext->add($id, $c, '', new ext_setvar('ITER', '$[${ITER} + 1]'));
116	122	$ext->add($id, $c, '', new ext_gotoif('$[${ITER} <= ${LOOPCNT}]', 'begin'));
…	…
122	128	global $ext;
123	129	global $amp_conf;
	130	global $version;
	131
	132	$DEVSTATE = version_compare($version, "1.6", "ge") ? "DEVICE_STATE" : "DEVSTATE";
124	133
125	134	$id = "app-dnd-toggle"; // The context to be included
…	…
144	153	$ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE'));
145	154	$ext->add($id, $c, '', new ext_gosub('1', 'sstate'));
146		~~//$ext->add($id, $c, '', new ext_setvar('DEVSTATE(Custom:DND${AMPUSER})', 'NOT_INUSE'));~~
147	155	}
148	156	$ext->add($id, $c, '', new ext_playback('do-not-disturb&de-activated'));
…	…
150	158	if ($amp_conf['USEDEVSTATE']) {
151	159	$c = 'sstate';
152		$ext->add($id, $c, '', new ext_setvar(~~'DEVSTATE~~(Custom:DND${AMPUSER})', '${STATE}'));
	160	$ext->add($id, $c, '', new ext_setvar($DEVSTATE.'(Custom:DND${AMPUSER})', '${STATE}'));
153	161	$ext->add($id, $c, '', new ext_dbget('DEVICES','AMPUSER/${AMPUSER}/device'));
154	162	$ext->add($id, $c, '', new ext_gotoif('$["${DEVICES}" = "" ]', 'return'));
155	163	$ext->add($id, $c, '', new ext_setvar('LOOPCNT', '${FIELDQTY(DEVICES,&)}'));
156	164	$ext->add($id, $c, '', new ext_setvar('ITER', '1'));
157		$ext->add($id, $c, 'begin', new ext_setvar(~~'DEVSTATE~~(Custom:DEVDND${CUT(DEVICES,&,${ITER})})','${STATE}'));
	165	$ext->add($id, $c, 'begin', new ext_setvar($DEVSTATE.'(Custom:DEVDND${CUT(DEVICES,&,${ITER})})','${STATE}'));
158	166	$ext->add($id, $c, '', new ext_setvar('ITER', '$[${ITER} + 1]'));
159	167	$ext->add($id, $c, '', new ext_gotoif('$[${ITER} <= ${LOOPCNT}]', 'begin'));

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

r6670	r6913
419	419	'dest' => $thisdest,
420	420	'description' => 'Follow-Me: '.$thisid.' ('.$result['name'].')',
	421
421	422	'edit_url' => 'config.php?display=findmefollow&extdisplay=GRP-'.urlencode($thisid),
422	423	);
…	…
446	447	global $ext;
447	448	global $amp_conf;
	449	global $version;
	450
	451	$DEVSTATE = version_compare($version, "1.6", "ge") ? "DEVICE_STATE" : "DEVSTATE";
448	452
449	453	$id = "app-fmf-toggle"; // The context to be included
…	…
464	468	$ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE'));
465	469	$ext->add($id, $c, '', new ext_gosub('1', 'sstate'));
466		~~//$ext->add($id, $c, '', new ext_setvar('DEVSTATE(Custom:FOLLOWME${AMPUSER})', 'NOT_INUSE'));~~
467	470	}
468	471	$ext->add($id, $c, '', new ext_playback('followme&de-activated'));
…	…
473	476	$ext->add($id, $c, '', new ext_setvar('STATE', 'INUSE'));
474	477	$ext->add($id, $c, '', new ext_gosub('1', 'sstate'));
475		~~//$ext->add($id, $c, '', new ext_setvar('DEVSTATE(Custom:FOLLOWME${AMPUSER})', 'INUSE'));~~
476	478	}
477	479	$ext->add($id, $c, '', new ext_playback('followme&activated'));
…	…
484	486	$ext->add($id, $c, '', new ext_setvar('LOOPCNT', '${FIELDQTY(DEVICES,&)}'));
485	487	$ext->add($id, $c, '', new ext_setvar('ITER', '1'));
486		$ext->add($id, $c, 'begin', new ext_setvar(~~'DEVSTATE~~(Custom:FOLLOWME${CUT(DEVICES,&,${ITER})})','${STATE}'));
	488	$ext->add($id, $c, 'begin', new ext_setvar($DEVSTATE.'(Custom:FOLLOWME${CUT(DEVICES,&,${ITER})})','${STATE}'));
487	489	$ext->add($id, $c, '', new ext_setvar('ITER', '$[${ITER} + 1]'));
488	490	$ext->add($id, $c, '', new ext_gotoif('$[${ITER} <= ${LOOPCNT}]', 'begin'));

Navigation

Changeset 6913

Legend:

modules/branches/2.5/core/agi-bin/user_login_out.agi

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

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

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

Download in other formats:

Navigation

Downloads

Screenshots

Documentation

Training

Support

Store

Community

About