Navigation

Changeset 3041

Timestamp:

11/09/06 10:54:22 (2 years ago)

Author:

gregmac

Message:

........

r3039 | gregmac | 2006-11-09 13:47:43 -0500 (Thu, 09 Nov 2006) | 2 lines

Only reload if we have $astman

........

r3040 | gregmac | 2006-11-09 13:48:17 -0500 (Thu, 09 Nov 2006) | 2 lines

Fixed #1314 - stupid IE javascript problem

........

Files:

freepbx/branches/2.2
- Property svnmerge-integrated changed from /freepbx/trunk:1-2993,2995-3033 to /freepbx/trunk:1-2993,2995-3033,3039-3040

r2891	r3041
140	140	function amp_apply_changes() {
141	141	if (confirm("About to reload backend configuration. This applies all outstanding changes to the live server.")) {
	142
	143	if (document.all) {
	144	// need this for IE : http://support.microsoft.com/kb/q190244/
	145	window.event.returnValue = false;
	146	// IE also uses window.location.href instead of location.href
	147	location = window.location.href;
	148	} else {
	149	location = location.href;
	150	}
	151
142	152	if (location.href.indexOf('?') == -1) {
143		location~~.href = location.href~~ + '?clk_reload=true';
	153	location = location + '?clk_reload=true';
144	154	} else {
145		location~~.href = location.href~~ + '&clk_reload=true';
	155	location = location + '&clk_reload=true';
146	156	}
147	157
148		~~//location.href = '<?php // echo $href; ?>';~~
149	158	}
150	159	}

r2884	r3041
56	56	}
57	57
58		//run retrieve script
59		$retrieve = $amp_conf['AMPBIN'].'/retrieve_conf';
60		exec($retrieve.'&>'.$asterisk_conf['astlogdir'].'/freepbx-retrieve.log');
	58	if ($astman) {
	59	//run retrieve script
	60	$retrieve = $amp_conf['AMPBIN'].'/retrieve_conf';
	61	exec($retrieve.'&>'.$asterisk_conf['astlogdir'].'/freepbx-retrieve.log');
61	62
62		~~if ($astman) {~~
63	63	/* Would be cool to do the following from here
64	64	(to avoid permission problems when running apache as nobody).