Navigation

← Previous Changeset
Next Changeset →

Changeset 8275

Timestamp:

09/05/09 16:21:20 (2 years ago)

Author:

p_lindheimer

Message:

fixes #3864, fixes #3865, fixes #3866 - php notices from undefined and other minor declaration probs

Files:

modules/branches/2.6/core/functions.inc.php (modified) (2 diffs)
modules/branches/2.6/core/module.xml (modified) (1 diff)
modules/branches/2.6/iaxsettings/functions.inc.php (modified) (9 diffs)
modules/branches/2.6/iaxsettings/module.xml (modified) (2 diffs)
modules/branches/2.6/outroutemsg/functions.inc.php (modified) (1 diff)
modules/branches/2.6/outroutemsg/module.xml (modified) (2 diffs)
modules/branches/2.6/sipsettings/functions.inc.php (modified) (15 diffs)
modules/branches/2.6/sipsettings/module.xml (modified) (2 diffs)

Legend:

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

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

r8269	r8275
5253	5253
5254	5254	$tech_hardware = isset($_REQUEST['tech_hardware'])?$_REQUEST['tech_hardware']:null;
5255		if ($devinfo_tech == 'virtual') {
	5255	if (isset($devinfo_tech) && $devinfo_tech == 'virtual') {
5256	5256	return true;
5257	5257	}
…	…
5392	5392	extract($_REQUEST);
5393	5393
5394		if ($tech == "virtual") {
	5394	if (isset($tech) && $tech == "virtual") {
5395	5395	return true;
5396	5396	}

modules/branches/2.6/core/module.xml

r8269	r8275
10	10	<canuninstall>no</canuninstall>
11	11	<changelog>
12		2.6.0beta2.3 #3529
	12	2.6.0beta2.3 #3529, #3864
13	13	2.6.0beta2.2 #3722, #3848, #3841, #3700
14	14	2.6.0beta2.1 #3844 (revert #3423), #3846, #3849

modules/branches/2.6/iaxsettings/functions.inc.php

r8258	r8275
25	25
26	26	/* Field Values for type field */
27		define('NORMAL','0');
28		define('CODEC','1');
29		define('VIDEO_CODEC','2');
30		define('CUSTOM','9');
	27	define('IAX_NORMAL','0');
	28	define('IAX_CODEC','1');
	29	define('IAX_VIDEO_CODEC','2');
	30	define('IAX_CUSTOM','9');
31	31
32	32	class iaxsettings_validate {
…	…
122	122	foreach ($raw_settings as $var) {
123	123	switch ($var['type']) {
124		case NORMAL:
	124	case IAX_NORMAL:
125	125	$interim_settings[$var['keyword']] = $var['data'];
126	126	break;
127	127
128		case CODEC:
	128	case IAX_CODEC:
129	129	$codecs[$var['keyword']] = $var['data'];
130	130	break;
131	131
132		case VIDEO_CODEC:
	132	case IAX_VIDEO_CODEC:
133	133	$video_codecs[$var['keyword']] = $var['data'];
134	134	break;
135	135
136		case CUSTOM:
	136	case IAX_CUSTOM:
137	137	$iax_settings[] = array($var['keyword'], $var['data']);
138	138	break;
…	…
267	267	foreach ($raw_settings as $var) {
268	268	switch ($var['type']) {
269		case NORMAL:
	269	case IAX_NORMAL:
270	270	$iax_settings[$var['keyword']] = $var['data'];
271	271	break;
272	272
273		case CODEC:
	273	case IAX_CODEC:
274	274	$iax_settings['codecs'][$var['keyword']] = $var['data'];
275	275	break;
276	276
277		case VIDEO_CODEC:
	277	case IAX_VIDEO_CODEC:
278	278	$iax_settings['video_codecs'][$var['keyword']] = $var['data'];
279	279	break;
280	280
281		case CUSTOM:
	281	case IAX_CUSTOM:
282	282	$iax_settings['iax_custom_key_'.$var['seq']] = $var['keyword'];
283	283	$iax_settings['iax_custom_val_'.$var['seq']] = $var['data'];
…	…
311	311	case 'bindaddr':
312	312	$msg = _("Bind Address (bindaddr) must be an IP address.");
313		$save_settings[] = array($key,$db->escapeSimple($vd->is_ip($val,$key,$msg)),'2',NORMAL);
	313	$save_settings[] = array($key,$db->escapeSimple($vd->is_ip($val,$key,$msg)),'2',IAX_NORMAL);
314	314	break;
315	315
316	316	case 'bindport':
317	317	$msg = _("Bind Port (bindport) must be between 1024..65535, default 5060");
318		$save_settings[] = array($key,$db->escapeSimple($vd->is_ip_port($val, $key, $msg)),'1',NORMAL);
	318	$save_settings[] = array($key,$db->escapeSimple($vd->is_ip_port($val, $key, $msg)),'1',IAX_NORMAL);
319	319	break;
320	320
…	…
322	322	case 'maxregexpire':
323	323	$msg = sprintf($integer_msg,$key);
324		$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'10',NORMAL);
	324	$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'10',IAX_NORMAL);
325	325	break;
326	326
327	327	case 'iax_language':
328	328	$msg = ("Language must be alphanumeric and installed");
329		$save_settings[] = array($key,$db->escapeSimple($vd->is_alphanumeric($val,$key,$msg)),'0',NORMAL);
	329	$save_settings[] = array($key,$db->escapeSimple($vd->is_alphanumeric($val,$key,$msg)),'0',IAX_NORMAL);
330	330	break;
331	331
…	…
333	333	case 'delayreject':
334	334	case 'bandwidth':
335		$save_settings[] = array($key,$val,'0',NORMAL);
	335	$save_settings[] = array($key,$val,'0',IAX_NORMAL);
336	336	break;
337	337
338	338	case 'jitterbuffer':
339		$save_settings[] = array($key,$val,'4',NORMAL);
	339	$save_settings[] = array($key,$val,'4',IAX_NORMAL);
340	340	break;
341	341
342	342	case 'forcejitterbuffer':
343		$save_settings[] = array($key,$val,'5',NORMAL);
	343	$save_settings[] = array($key,$val,'5',IAX_NORMAL);
344	344	break;
345	345
…	…
347	347	case 'maxjitterinterps':
348	348	$msg = sprintf($integer_msg,$key);
349		$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'5',NORMAL);
	349	$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'5',IAX_NORMAL);
350	350	break;
351	351
352	352	case 'resyncthreshold':
353	353	$msg = _("resyncthreshold must be a non-negative integer or -1 to disable");
354		$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg,true)),'5',NORMAL);
	354	$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg,true)),'5',IAX_NORMAL);
355	355	break;
356	356
357	357	case 'videosupport':
358		$save_settings[] = array($key,$val,'10',NORMAL);
	358	$save_settings[] = array($key,$val,'10',IAX_NORMAL);
359	359	break;
360	360
…	…
362	362	if (substr($key,0,15) == "iax_custom_key_") {
363	363	$seq = substr($key,15);
364		$save_settings[] = array($db->escapeSimple($val),$db->escapeSimple($iax_settings["iax_custom_val_$seq"]),($seq),CUSTOM);
	364	$save_settings[] = array($db->escapeSimple($val),$db->escapeSimple($iax_settings["iax_custom_val_$seq"]),($seq),IAX_CUSTOM);
365	365	} else if (substr($key,0,15) == "iax_custom_val_") {
366	366	// skip it, we will seek it out when we see the iax_custom_key
367	367	} else {
368		$save_settings[] = array($key,$val,'0',NORMAL);
	368	$save_settings[] = array($key,$val,'0',IAX_NORMAL);
369	369	}
370	370	}
…	…
377	377	$seq = 0;
378	378	foreach ($codecs as $key => $val) {
379		$save_settings[] = array($db->escapeSimple($key),$db->escapeSimple($val),$seq++,CODEC);
	379	$save_settings[] = array($db->escapeSimple($key),$db->escapeSimple($val),$seq++,IAX_CODEC);
380	380	}
381	381	$seq = 0;
382	382	foreach ($video_codecs as $key => $val) {
383		$save_settings[] = array($db->escapeSimple($key),$db->escapeSimple($val),$seq++,VIDEO_CODEC);
	383	$save_settings[] = array($db->escapeSimple($key),$db->escapeSimple($val),$seq++,IAX_VIDEO_CODEC);
384	384	}
385	385

modules/branches/2.6/iaxsettings/module.xml

r8267	r8275
2	2	<rawname>iaxsettings</rawname>
3	3	<name>Asterisk IAX Settings</name>
4		<version>2.6.0.4</version>
	4	<version>2.6.0.5</version>
5	5	<publisher>Bandwidth.com</publisher>
6	6	<license>AGPLv3</license>
…	…
14	14	</description>
15	15	<changelog>
	16	2.6.0.5 #3866
16	17	2.6.0.4 localizations, misc
17	18	2.6.0.3 #3832

modules/branches/2.6/outroutemsg/functions.inc.php

r8059	r8275
13	13	//GNU General Public License for more details.
14	14
15		define (~~DEFAULT_MSG~~, -1);
16		define (~~CONGESTION_TONE~~, -2);
	15	define ('DEFAULT_MSG', -1);
	16	define ('CONGESTION_TONE', -2);
17	17
18	18	function outroutemsg_get_config($engine) {

modules/branches/2.6/outroutemsg/module.xml

r8060	r8275
2	2	<rawname>outroutemsg</rawname>
3	3	<name>Route Congestion Messages</name>
4		<version>2.6.0.2</version>
	4	<version>2.6.0.3</version>
5	5	<publisher>Bandwidth.com</publisher>
6	6	<license>GPLv2</license>
…	…
13	13	</menuitems>
14	14	<changelog>
	15	2.6.0.3 #3865
15	16	2.6.0.2 minor tootlip tweaks
16	17	2.6.0.1 init tabindex

modules/branches/2.6/sipsettings/functions.inc.php

r8259	r8275
25	25
26	26	/* Field Values for type field */
27		define('NORMAL','0');
28		define('CODEC','1');
29		define('VIDEO_CODEC','2');
30		define('CUSTOM','9');
	27	define('SIP_NORMAL','0');
	28	define('SIP_CODEC','1');
	29	define('SIP_VIDEO_CODEC','2');
	30	define('SIP_CUSTOM','9');
31	31
32	32	class sipsettings_validate {
…	…
123	123	foreach ($raw_settings as $var) {
124	124	switch ($var['type']) {
125		case NORMAL:
	125	case SIP_NORMAL:
126	126	$interim_settings[$var['keyword']] = $var['data'];
127	127	break;
128	128
129		case CODEC:
	129	case SIP_CODEC:
130	130	$codecs[$var['keyword']] = $var['data'];
131	131	break;
132	132
133		case VIDEO_CODEC:
	133	case SIP_VIDEO_CODEC:
134	134	$video_codecs[$var['keyword']] = $var['data'];
135	135	break;
136	136
137		case CUSTOM:
	137	case SIP_CUSTOM:
138	138	$sip_settings[] = array($var['keyword'], $var['data']);
139	139	break;
…	…
318	318	foreach ($raw_settings as $var) {
319	319	switch ($var['type']) {
320		case NORMAL:
	320	case SIP_NORMAL:
321	321	$sip_settings[$var['keyword']] = $var['data'];
322	322	break;
323	323
324		case CODEC:
	324	case SIP_CODEC:
325	325	$sip_settings['codecs'][$var['keyword']] = $var['data'];
326	326	break;
327	327
328		case VIDEO_CODEC:
	328	case SIP_VIDEO_CODEC:
329	329	$sip_settings['video_codecs'][$var['keyword']] = $var['data'];
330	330	break;
331	331
332		case CUSTOM:
	332	case SIP_CUSTOM:
333	333	$sip_settings['sip_custom_key_'.$var['seq']] = $var['keyword'];
334	334	$sip_settings['sip_custom_val_'.$var['seq']] = $var['data'];
…	…
362	362	case 'bindaddr':
363	363	$msg = _("Bind Address (bindaddr) must be an IP address.");
364		$save_settings[] = array($key,$db->escapeSimple($vd->is_ip($val,$key,$msg)),'2',NORMAL);
	364	$save_settings[] = array($key,$db->escapeSimple($vd->is_ip($val,$key,$msg)),'2',SIP_NORMAL);
365	365	break;
366	366
367	367	case 'bindport':
368	368	$msg = _("Bind Port (bindport) must be between 1024..65535, default 5060");
369		$save_settings[] = array($key,$db->escapeSimple($vd->is_ip_port($val, $key, $msg)),'1',NORMAL);
	369	$save_settings[] = array($key,$db->escapeSimple($vd->is_ip_port($val, $key, $msg)),'1',SIP_NORMAL);
370	370	break;
371	371
…	…
378	378	}
379	379	$msg = sprintf($integer_msg,$key);
380		$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val, $key, $msg)),'10',NORMAL);
	380	$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val, $key, $msg)),'10',SIP_NORMAL);
381	381	break;
382	382
…	…
389	389	case 'defaultexpiry':
390	390	$msg = sprintf($integer_msg,$key);
391		$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'10',NORMAL);
	391	$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'10',SIP_NORMAL);
392	392	break;
393	393
…	…
395	395	case 'registerattempts':
396	396	$msg = sprintf($integer_msg,$key);
397		$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'10',NORMAL);
	397	$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'10',SIP_NORMAL);
398	398	break;
399	399
…	…
401	401	case 'sip_language':
402	402	$msg = ("Language must be alphanumeric and installed");
403		$save_settings[] = array($key,$db->escapeSimple($vd->is_alphanumeric($val,$key,$msg)),'0',NORMAL);
	403	$save_settings[] = array($key,$db->escapeSimple($vd->is_alphanumeric($val,$key,$msg)),'0',SIP_NORMAL);
404	404	break;
405	405
406	406	case 'context':
407	407	$msg = sprintf(_("%s must be alphanumeric"),$key);
408		$save_settings[] = array($key,$db->escapeSimple($vd->is_alphanumeric($val,$key,$msg)),'0',NORMAL);
	408	$save_settings[] = array($key,$db->escapeSimple($vd->is_alphanumeric($val,$key,$msg)),'0',SIP_NORMAL);
409	409	break;
410	410
411	411	case 'externrefresh':
412	412	$msg = sprintf($integer_msg,$key);
413		$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'41',NORMAL);
	413	$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'41',SIP_NORMAL);
414	414	break;
415	415
416	416	case 'nat':
417		$save_settings[] = array($key,$val,'39',NORMAL);
	417	$save_settings[] = array($key,$val,'39',SIP_NORMAL);
418	418	break;
419	419
…	…
423	423	$vd->log_error($val, $key, $msg);
424	424	}
425		$save_settings[] = array($key,$val,'40',NORMAL);
	425	$save_settings[] = array($key,$val,'40',SIP_NORMAL);
426	426	break;
427	427
…	…
431	431	$vd->log_error($val, $key, $msg);
432	432	}
433		$save_settings[] = array($key,$val,'40',NORMAL);
	433	$save_settings[] = array($key,$val,'40',SIP_NORMAL);
434	434	break;
435	435
436	436	case 'jbenable':
437		$save_settings[] = array($key,$val,'4',NORMAL);
	437	$save_settings[] = array($key,$val,'4',SIP_NORMAL);
438	438	break;
439	439
…	…
441	441	case 'jbimpl':
442	442	case 'jblog':
443		$save_settings[] = array($key,$val,'5',NORMAL);
	443	$save_settings[] = array($key,$val,'5',SIP_NORMAL);
444	444	break;
445	445
…	…
447	447	case 'jbresyncthreshold':
448	448	$msg = sprintf($integer_msg,$key);
449		$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'5',NORMAL);
	449	$save_settings[] = array($key,$db->escapeSimple($vd->is_int($val,$key,$msg)),'5',SIP_NORMAL);
450	450	break;
451	451
…	…
459	459	case 'allowguest':
460	460	case 'srvlookup':
461		$save_settings[] = array($key,$val,'10',NORMAL);
	461	$save_settings[] = array($key,$val,'10',SIP_NORMAL);
462	462	break;
463	463
…	…
467	467	$seq = substr($key,9);
468	468	$msg = _("Localnet setting must be an IP address");
469		$save_settings[] = array($key,$db->escapeSimple($vd->is_ip($val,$key,$msg)),(42+$seq),NORMAL);
	469	$save_settings[] = array($key,$db->escapeSimple($vd->is_ip($val,$key,$msg)),(42+$seq),SIP_NORMAL);
470	470	} else if (substr($key,0,8) == "netmask_") {
471	471	// ip validate this and store
472	472	$seq = substr($key,8);
473	473	$msg = _("Localnet netmask must be formated properly (e.g. 255.255.255.0 or 24)");
474		$save_settings[] = array($key,$db->escapeSimple($vd->is_netmask($val,$key,$msg)),$seq,NORMAL);
	474	$save_settings[] = array($key,$db->escapeSimple($vd->is_netmask($val,$key,$msg)),$seq,SIP_NORMAL);
475	475	} else if (substr($key,0,15) == "sip_custom_key_") {
476	476	$seq = substr($key,15);
477		$save_settings[] = array($db->escapeSimple($val),$db->escapeSimple($sip_settings["sip_custom_val_$seq"]),($seq),CUSTOM);
	477	$save_settings[] = array($db->escapeSimple($val),$db->escapeSimple($sip_settings["sip_custom_val_$seq"]),($seq),SIP_CUSTOM);
478	478	} else if (substr($key,0,15) == "sip_custom_val_") {
479	479	// skip it, we will seek it out when we see the sip_custom_key
480	480	} else {
481		$save_settings[] = array($key,$val,'0',NORMAL);
	481	$save_settings[] = array($key,$val,'0',SIP_NORMAL);
482	482	}
483	483	}
…	…
490	490	$seq = 0;
491	491	foreach ($codecs as $key => $val) {
492		$save_settings[] = array($db->escapeSimple($key),$db->escapeSimple($val),$seq++,CODEC);
	492	$save_settings[] = array($db->escapeSimple($key),$db->escapeSimple($val),$seq++,SIP_CODEC);
493	493	}
494	494	$seq = 0;
495	495	foreach ($video_codecs as $key => $val) {
496		$save_settings[] = array($db->escapeSimple($key),$db->escapeSimple($val),$seq++,VIDEO_CODEC);
	496	$save_settings[] = array($db->escapeSimple($key),$db->escapeSimple($val),$seq++,SIP_VIDEO_CODEC);
497	497	}
498	498

modules/branches/2.6/sipsettings/module.xml

r8265	r8275
2	2	<rawname>sipsettings</rawname>
3	3	<name>Asterisk SIP Settings</name>
4		<version>2.6.0.6</version>
	4	<version>2.6.0.7</version>
5	5	<publisher>Bandwidth.com</publisher>
6	6	<license>AGPLv3</license>
…	…
14	14	</description>
15	15	<changelog>
	16	2.6.0.7 #3866
16	17	2.6.0.6 #3722, localizations
17	18	2.6.0.5 #3831, #3722

Navigation

Changeset 8275

Legend:

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

modules/branches/2.6/core/module.xml

modules/branches/2.6/iaxsettings/functions.inc.php

modules/branches/2.6/iaxsettings/module.xml

modules/branches/2.6/outroutemsg/functions.inc.php

modules/branches/2.6/outroutemsg/module.xml

modules/branches/2.6/sipsettings/functions.inc.php

modules/branches/2.6/sipsettings/module.xml

Download in other formats:

Navigation

Downloads

Screenshots

Documentation

Training

Support

Store

Community

About