OPTIONS=	SIP_QUEUES	"In queues register users as SIP, not Agents" off \

		SAMPLE_CONFIG   "Install sample configuration files" off

.if defined(WITH_SIP_QUEUES)

EXTRA_PATCHES+=	${FILESDIR}/extra-config-queues.html

.endif

--- config/queues.html.orig	Thu Jun 28 14:58:19 2007

+++ config/queues.html	Thu Jun 28 14:59:20 2007

@@ -171,7 +171,7 @@

 	for(k=0; k<$('agents').length; k++){

 		selectedagent = "selectedagent" + k;

 		if( $(selectedagent).checked ){

-			uri += build_action('append', p, $('name').value,"member", "Agent/"+$(selectedagent).value);

+			uri += build_action('append', p, $('name').value,"member", "SIP/"+$(selectedagent).value);

 			p = p+1;

 		}

 	}

@@ -338,7 +338,7 @@

 		queuenames[j] = t.name;

 			return t.name + " -- Queue '" + t.fieldbyname['fullname'] + "'";

 	}else if(InArray(extensions_conf_qs, t.name)) {  // if is a subcategory 

-		tmp = t.fields[x].split ('Agent/');

+		tmp = t.fields[x].split ('SIP/');

 		if(t.names[x] == 'member' && tmp.length > 1){

 			queueagents [j] [k] = tmp[1];

 			k = k+1;

@@ -435,7 +435,7 @@

 							</select>

 						</td>

 					</tr>

-					<tr>	<td valign='top' class="field_text" tip="en,queues,3">Agents:</td>

+					<tr>	<td valign='top' class="field_text" tip="en,queues,3">Users:</td>

 						<td><select multiple='true' id='agents' style='display:none;'></select>

 							<div id="testmulti" style='border:1px solid; font-size: 8pt; height:75px; width: 200px;overflow :auto;'></div>

 						</td>

--- config/backup.html.orig	Thu Apr 26 21:57:18 2007

+++ config/backup.html	Thu Apr 26 21:57:54 2007

@@ -116,7 +116,7 @@

 function restore_bkp(filename){

-	//parent.astmanEngine.run_tool("rm /etc/asterisk/* -rf ", callback=function(){ restore_bkp_step2(filename);} );

+	//parent.astmanEngine.run_tool("rm %%PREFIX%%/etc/asterisk/* -rf ", callback=function(){ restore_bkp_step2(filename);} );

 	restore_bkp_step2(filename);

 }

@@ -131,7 +131,7 @@

 function delete_bkp( filename ){

 	if(!confirm("Delete selected Backup Configuration ?")){ return ; }

-	parent.astmanEngine.run_tool("/bin/rm -f "+ asterisk_ConfigBkpPath + filename , callback=function(){

+	parent.astmanEngine.run_tool("rm -f "+ asterisk_ConfigBkpPath + filename , callback=function(){

 		gui_feedback('Delete Request Successfull !','default');

 		window.location.href = window.location.href ;

 	});

@@ -177,7 +177,7 @@

 	//var seconds =addzero(today.getSeconds());

 	var bkpfile =  _nn.value +"__" + year + month + day +".tar";

-	parent.astmanEngine.run_tool("/bin/tar -cf "+ asterisk_ConfigBkpPath + bkpfile + " " + asterisk_configfolder, callback=function(){

+	parent.astmanEngine.run_tool("tar -cf "+ asterisk_ConfigBkpPath + bkpfile + " " + asterisk_configfolder, callback=function(){

 			gui_feedback('Backup Successfull!','blue');

 			window.location.href = window.location.href ;

 		}

--- config/scripts/astman.js.orig	Tue May  1 16:01:00 2007

+++ config/scripts/astman.js	Tue May  1 16:12:08 2007

@@ -25,16 +25,18 @@

 var asterisk_guitoolsversion = "0.7";

 var asterisk_guiversion = "$Revision: 817 $";

 var asterisk_guifbt = 3000; // Feedback msg time

-var asterisk_scriptsFolder = "/var/lib/asterisk/scripts/" ; /* Directory for gui scripts (graphs.sh, for example) */

-var asterisk_ConfigBkpPath = "/var/lib/asterisk/gui_configbackups/" ;

-var asterisk_Sounds_path = "/var/lib/asterisk/sounds/";

+var asterisk_prefix = "%%PREFIX%%/"  // "/" for typical linux instalation

+var asterisk_varlib = asterisk_prefix + "share/asterisk/" // /var/lib/astersik/ for linux

+var asterisk_scriptsFolder = asterisk_varlib + "scripts/" ; /* Directory for gui scripts (graphs.sh, for example) */

+var asterisk_ConfigBkpPath = asterisk_varlib + "gui_configbackups/" ;

+var asterisk_Sounds_path = asterisk_varlib + "sounds/";

 var asterisk_menusRecord_path = asterisk_Sounds_path + "record/";

 var asterisk_guiSysInfo = "sh " + asterisk_scriptsFolder + "gui_sysinfo" ;

 var asterisk_guiSysInfo_output = "./sysinfo_output.html";

-var asterisk_guiZapscan = "/sbin/zapscan.bin" ;

+var asterisk_guiZapscan = asterisk_prefix + "sbin/zapscan.bin" ;

 var asterisk_rawmanPath = "../../rawman" ;

 var asterisk_guiConfigFile = "guipreferences.conf"; // will be created in asterisk_configfolder, if the file does not exist 

-var asterisk_configfolder = "/etc/asterisk/";

+var asterisk_configfolder = asterisk_prefix + "etc/asterisk/";

 var asterisk_guiListFiles = "sh " + asterisk_scriptsFolder + "listfiles" ;

 var sortbynames = false;

@@ -1521,7 +1523,7 @@

 	this.doConfig = function(t, box) {

 		if( t[0].headers['message'] && t[0].headers['message'] == "Config file not found" ){

 			if( box.config_file == "zapscan.conf" || box.config_file == "contactinfo.conf" || box.config_file == "jingle.conf" || box.config_file == "providers.conf" ){

-				parent.astmanEngine.run_tool("/bin/touch /etc/asterisk/"+box.config_file, function(){ window.location.href = window.location.href ; } );

+				parent.astmanEngine.run_tool("touch "+ asterisk_configfolder + box.config_file, function(){ window.location.href = window.location.href ; } );

 				return ;

 			} else {

 				alert( "Asterisk says it cannot find a required config file (" + box.config_file + ") \n You will be now redirected to the main page !" );

--- config/syslog.html.orig	Mon May 14 19:21:38 2007

+++ config/syslog.html	Mon May 14 19:27:37 2007

@@ -31,8 +31,8 @@

 	 _$('status_message').style.display = "" ;

 	var _ld = _$('log_day').value; 

 	if(  _ld < 10 ){ var space = "  "; }else{ var space = " ";  }

-	var tmp_command = "/bin/grep /var/log/asterisk/messages -e '" + _$('log_month').value + space + _ld 

-						+ " ' > /var/lib/asterisk/static-http/config/today_log.html" ;

+	var tmp_command = "grep /var/log/asterisk/messages -e '" + _$('log_month').value + space + _ld 

+						+ " ' >  %%PREFIX%%/share/asterisk/static-http/config/today_log.html" ;

 	parent.astmanEngine.run_tool( tmp_command , onSuccess = function() { _$('status_message').style.display='none'; load_todayslog(); } );

 }

--- scripts/gui_sysinfo.orig	Fri Apr 27 18:08:53 2007

+++ scripts/gui_sysinfo	Tue May  1 17:01:25 2007

@@ -1,5 +1,5 @@

 #!/bin/sh

-SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"

+SYSINFO_OUTPUT="%%PREFIX%%/share/asterisk/static-http/config/sysinfo_output.html"

 #SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"

@@ -9,13 +9,13 @@

 UPTIME="`uptime`"

 /bin/echo "<div id=si_uptime>$UPTIME</div>" >> $SYSINFO_OUTPUT 

-ASTERISK="`/usr/sbin/asterisk -V`"

+ASTERISK="`%%PREFIX%%/sbin/asterisk -V`"

 /bin/echo "<div id=si_astver>$ASTERISK</div>" >> $SYSINFO_OUTPUT 

 TODAY="`date`"

 /bin/echo "<div id=si_date>$TODAY</div>" >> $SYSINFO_OUTPUT 

-HOSTNAME="`hostname -f`"

+HOSTNAME="`hostname`"

 /bin/echo "<div id=si_hostname>$HOSTNAME</div>" >> $SYSINFO_OUTPUT 

 IFCONFIG=`ifconfig`

@@ -24,14 +24,14 @@

 DISKUSAGE=`df -h`

 /bin/echo "<div id=si_du><pre>$DISKUSAGE</pre></div>" >> $SYSINFO_OUTPUT 

-MEMORYUSAGE=`free`

+MEMORYUSAGE=`vmstat`

 /bin/echo "<div id=si_free><pre>$MEMORYUSAGE</pre></div>" >> $SYSINFO_OUTPUT 

 THISMONTH=`/bin/date +%b`

 THISDAY=`/bin/date +%d`

 THIS_DAY=`/bin/date +%_d`

-/bin/grep /var/log/asterisk/messages -e "$THISMONTH\( $THISDAY\| $THIS_DAY\)" > /var/lib/asterisk/static-http/config/today_log.html

+grep /var/log/asterisk/messages -e "$THISMONTH\( $THISDAY\| $THIS_DAY\)" > %%PREFIX%%/share/asterisk/static-http/config/today_log.html

 #/bin/echo "<div id=bkp_files>" >> $SYSINFO_OUTPUT 

 #/bin/mkdir -p /var/lib/asterisk/gui_configbackups

--- scripts/listfiles.orig	Tue May  1 16:16:13 2007

+++ scripts/listfiles	Tue May  1 16:19:27 2007

@@ -1,5 +1,5 @@

 #!/bin/sh

-SYSINFO_OUTPUT="/var/lib/asterisk/static-http/config/sysinfo_output.html"

+SYSINFO_OUTPUT="%%PREFIX%%/share/asterisk/static-http/config/sysinfo_output.html"

 #/bin/echo "<div id=list_files>" > $SYSINFO_OUTPUT

 /bin/mkdir -p $1

--- tools/Makefile.orig	Wed May  9 21:32:43 2007

+++ tools/Makefile	Wed May  9 21:33:17 2007

@@ -25,9 +25,9 @@

 ifeq ($(PBX_ZAPTEL),1)

 	mkdir -p $(ASTSBINDIR)

 	$(INSTALL) -m 755 zapscan.bin $(ASTSBINDIR)

-	$(INSTALL) -m 755 zapscan.bin /sbin

+	$(INSTALL) -m 755 zapscan.bin $(ASTSBINDIR)/../sbin

 	$(INSTALL) -m 755 zapscan $(ASTSBINDIR)

-	$(INSTALL) -m 755 zapscan /sbin	

+	$(INSTALL) -m 755 zapscan $(ASTSBINDIR)/../sbin	

 endif

 clean: 

--- ./tools/zapscan.orig	Thu Dec 21 18:25:26 2006

+++ ./tools/zapscan	Sat Mar 31 17:54:39 2007

@@ -1,12 +1,12 @@

 #!/bin/sh

-if [ -f /etc/zaptel.conf.zapscan ] && [ -f /etc/asterisk/zapata.conf.zapscan ]; then

-	rm -f /etc/zaptel.conf

-	rm -f /etc/asterisk/zapata.conf

-	( echo "# Created by zapscan -- edit zaptel.conf.zapscan instead" ; cat /etc/zaptel.conf.zapscan ) > /etc/zaptel.conf

-	( echo "; Created by zapscan -- edit zapata.conf.zapscan instead" ; cat /etc/asterisk/zapata.conf.zapscan ) > /etc/asterisk/zapata.conf

-	rm -f /etc/asterisk/zapscan.conf

+if [ -f %%PREFIX%%/etc/zaptel.conf.zapscan ] && [ -f %%PREFIX%%/etc/asterisk/zapata.conf.zapscan ]; then

+	rm -f %%PREFIX%%/etc/zaptel.conf

+	rm -f %%PREFIX%%/etc/asterisk/zapata.conf

+	( echo "# Created by zapscan -- edit zaptel.conf.zapscan instead" ; cat %%PREFIX%%/etc/zaptel.conf.zapscan ) > %%PREFIX%%/etc/zaptel.conf

+	( echo "; Created by zapscan -- edit zapata.conf.zapscan instead" ; cat %%PREFIX%%/etc/asterisk/zapata.conf.zapscan ) > %%PREFIX%%/etc/asterisk/zapata.conf

+	rm -f %%PREFIX%%/etc/asterisk/zapscan.conf

 	echo -n "Scanning for zaptel devices..."

-	if /sbin/zapscan.bin; then

+	if %%PREFIX%%/sbin/zapscan.bin; then

 		echo "OK"

 	else

 		echo "Failed!"

--- ./tools/zapscan.c.orig	Fri Nov  3 01:48:08 2006

+++ ./tools/zapscan.c	Sat Mar 31 17:54:39 2007

@@ -37,9 +37,9 @@

 	int oldsig=-1;

 	int fd = open("/dev/zap/ctl", O_RDWR);

 	struct zt_params ztp;

-	FILE *zdc = fopen("/etc/zaptel.conf", "a");

-	FILE *zsc = fopen("/etc/asterisk/zapscan.conf", "w");

-	FILE *zap = fopen("/etc/asterisk/zapata.conf", "a");

+	FILE *zdc = fopen("%%PREFIX%%/etc/zaptel.conf", "a");

+	FILE *zsc = fopen("%%PREFIX%%/etc/asterisk/zapscan.conf", "w");

+	FILE *zap = fopen("%%PREFIX%%/etc/asterisk/zapata.conf", "a");

 	if (fd < 0) {

 		fprintf(stderr, "Failed to open /dev/zap/ctl: %s\n", strerror(errno));

 		exit(1);