Keep the list of different applications port numbers on a single file to easy its maintainance and sharing.

4 files changed, 14 insertions, 1262 deletions

diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc
index 47ce591..62c32cd 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard.inc
@@ -566,322 +566,9 @@ function step9_stepsubmitphpaction() {
 }
 
 function apply_all_choosen_items() {
-	global $config, $g, $altq_list_queues;
-
-$gamesplist = array();
-
-$gamesplist['battlefield2'] = array();
-	/* Battlefield 2 */
-	$gamesplist['battlefield2'][] = array('BF2-1500-4999', 'udp', '1500', '4999', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-4711', 'tcp', '4711', '4711', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-16567', 'udp', '16567', '16567', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-27900', 'udp', '27900', '27900', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-28910', 'tcp', '28910', '28910', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-29900-29901-UDP', 'udp', '29900', '29901', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-29900-29901-TCP', 'tcp', '29900', '29901', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-27900', 'udp', '27900', '27900', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-55123-55125', 'udp', '55123', '55125', 'both');
-
-$gamesplist['counterstrike'] = array();
-	/* counter strike */
-	$gamesplist['counterstrike'][] = array('Titan', 'udp', '6003', '6003', 'both');
-	$gamesplist['counterstrike'][] = array('Authentication', 'udp', '7002', '7002', 'both');
-	$gamesplist['counterstrike'][] = array('Client', 'udp', '6003', '6003', 'both');
-	$gamesplist['counterstrike'][] = array('Masterserver', 'udp', '27010', '27010', 'both');
-	$gamesplist['counterstrike'][] = array('Mod-Server', 'udp', '27011', '27011', 'both');
-	$gamesplist['counterstrike'][] = array('Chat', 'udp', '27012', '27012', 'both');
-	$gamesplist['counterstrike'][] = array('HL-Serverport1', 'udp', '27013', '27013', 'both');
-	$gamesplist['counterstrike'][] = array('HL-Serverport2', 'udp', '27014', '27014', 'both');
-	$gamesplist['counterstrike'][] = array('HL-Serverport', 'udp', '27015', '27015', 'both');
-
-$gamesplist['deltaforce'] = array();
-	/* delta force */
-	$gamesplist['deltaforce'][] = array('Delta1', 'udp', '17478', '17488', 'both');
-
-$gamesplist['quakeiii'] = array();
-	/* quake3 */
-	$gamesplist['quakeiii'][] = array('quakeiii', 'udp', '27910', '27919', 'both');
-
-$gamesplist['tigerwoods2004ps2'] = array();
-	/* tiger woods 2004 ps2 */
-	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2Player', 'udp', '3658', '3658', 'both');
-	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2Player2', 'udp', '6000', '6000', 'both');
-	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2EA', 'tcp', '10300', '10301', 'both');
-
-$gamesplist['callofduty'] = array();
-	$gamesplist['callofduty'][] = array('CallOfDuty1', 'tcp', '28960', '28960', 'both');
-	$gamesplist['callofduty'][] = array('CallOfDuty2', 'udp', '28960', '28960', 'both');
-
-$gamesplist['planetside'] = array();
-	/* PlanetSide */
-	$gamesplist['planetside'][] = array('PlanetSide', 'tcp', '7000', '7000', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide', 'tcp', '7080', '7080', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '3016', '3021', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '45000', '45010', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '30000', '30500', 'both');
-
-$gamesplist['halo2'] = array();
-	/* Halo2 + XBOX Live */
-	$gamesplist['halo2'][] = array('Halo2-1', 'udp', '88', '88', 'both');
-	$gamesplist['halo2'][] = array('Halo2-2', 'udp', '3074', '3074', 'both');
-	$gamesplist['halo2'][] = array('Halo2-3', 'tcp', '3074', '3074', 'both');
-
-$gamesplist['unrealtournament'] = array();
-	/* Unreal Tournament */
-	$gamesplist['unrealtournament'][] = array('ur1', 'udp', '7777', '7787', 'both');
-	$gamesplist['unrealtournament'][] = array('ur2', 'tcp', '7777', '7787', 'both');
-
-$gamesplist['doom3'] = array();
-	/* doom3 */
-	$gamesplist['doom3'][] = array('DOOM3-1', 'udp', '27650', '27650', 'both');
-	$gamesplist['doom3'][] = array('DOOM3-2', 'udp', '27666', '27666', 'both');
-
-$gamesplist['empireearth'] = array();
-	/* empire earth */
-	$gamesplist['empireearth'][] = array('EmpireEarth-1', 'tcp', '33335', '33336', 'both');
-	$gamesplist['empireearth'][] = array('EmpireEarth-2', 'udp', '33334', '33334', 'both');
-
-$gamesplist['everquest'] = array();
-	/* everquest */
-	$gamesplist['everquest'][] = array('Everquest-1', 'tcp', '1024', '6000', 'both');
-	$gamesplist['everquest'][] = array('Everquest-2', 'tcp', '7000', '7000', 'both');
-	$gamesplist['everquest'][] = array('Everquest-3', 'udp', '1024', '6000', 'both');
-	$gamesplist['everquest'][] = array('Everquest-4', 'udp', '7000', '7000', 'both');
-
-$gamesplist['everquest2'] = array();
-	/* everquest2 */
-	$gamesplist['everquest2'][] = array('Everquest2-1', 'tcp', '7000', '7000', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-2', 'udp', '3016', '3021', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-3', 'udp', '9100', '9100', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-4', 'udp', '9700', '9703', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-5', 'udp', '32800', '33000', 'both');
-
-$gamesplist['farcry'] = array();
-	/* far cry */
-	$gamesplist['farcry'][] = array('FarCry-1', 'tcp', '49001', '49002', 'both');
-	$gamesplist['farcry'][] = array('FarCry-2', 'udp', '49001', '49002', 'both');
-
-$gamesplist['halflife2'] = array();
-	/* halflife 2 */
-	$gamesplist['halflife2'][] = array('HL2-1', 'tcp', '27020', '27050', 'both');
-	$gamesplist['halflife2'][] = array('HL2-2', 'udp', '1200', '1200', 'both');
-	$gamesplist['halflife2'][] = array('HL2-3', 'udp', '27000', '27015', 'both');
-
-$gamesplist['halflife'] = array();
-	/* halflife */
-	$gamesplist['halflife'][] = array('HL-1', 'tcp', '27015', '27015', 'both');
-	$gamesplist['halflife'][] = array('HL-2', 'udp', '27650', '27650', 'both');
-	$gamesplist['halflife'][] = array('HL-3', 'udp', '27666', '27666', 'both');
-
-$gamesplist['wolfet'] = array();
-	/* wolfenstein enemy territory */
-	$gamesplist['wolfet'][] = array('WolfET-1', 'tcp', '27960', '27960', 'both');
-
-$gamesplist['lineage2'] = array();
-	/* Lineage II */
-	$gamesplist['lineage2'][] = array('Lineage2-2009', 'tcp', '2009', '2009', 'both');
-	$gamesplist['lineage2'][] = array('Lineage2-2106', 'tcp', '2106', '2106', 'both');
-	$gamesplist['lineage2'][] = array('Lineage2-7777', 'tcp', '7777', '7777', 'both');
-
-$gamesplist['battlenet'] = array();
-	/* Blizzard Publishing games */
-	$gamesplist['battlenet'][] = array('Battle.NET', 'tcp', '6112', '6119', 'both');
-	$gamesplist['battlenet'][] = array('Battle.NET-2', 'tcp', '1119', '1119', 'both');
-
-$gamesplist['worldofwarcraft'] = array();
-	$gamesplist[] = array('WoW', 'tcp', '3724', '3724', 'both');
-
-$gamesplist['battlenet'] = array();
-	/* Add battle.net only if WoW is selected and battle.net isn't */
-	$gamesplist[] = array('Battle.NET', 'tcp', '6112', '6119', 'both');
-
-$gamesplist['gunzonline'] = array();
-	/* GunZ Online */
-	$gamesplist['gunzonline'][] = array('GunZOnline', 'udp', '7700', '7700', 'both');
-
-$gamesplist['xbox360'] = array();
-	/* XBox360 */
-	$gamesplist['xbox360'][] = array('xbox360-1', 'udp', '88', '88', 'both');
-	$gamesplist['xbox360'][] = array('xbox360-2', 'udp', '3074', '3074', 'both');
-	$gamesplist['xbox360'][] = array('xbox360-3', 'tcp', '3074', '3074', 'both');
-
-
-$voiplist = array();
-
-   /* asterisk server / same as vonage */
-$voiplist['Asterisk'] = array();
-	$voiplist['Asterisk'][] = array($_POST['provider'], 'udp', '5060', '5069', 'both');
-	$voiplist['Asterisk'][] = array($_POST['provider'], 'udp', '10000', '20000', 'both');
-
-    /* VoicePulse server */	
-$voiplist['VoicePulse'] = array();
-	$voiplist['VoicePulse'][] = array('VoicePulse', 'udp', '16384', '16482', 'both');
-	$voiplist['VoicePulse'][] = array('VoicePulse', 'udp', '4569', '4569', 'both');
-
-    /* Panasonic Hybrid PBX */
-$voiplist['Panasonic'] = array();
-	$voiplist['Panasonic'][] = array('Panasonic1', 'udp', '8000', '8063', 'both');
-	$voiplist['Panasonic'][] = array('Panasonic2', 'udp', '9300', '9301', 'both');
-	$voiplist['Panasonic'][] = array('Panasonic3', 'udp', '2747', '2747', 'both');
-
-
-$p2plist = array();
-	/* To add p2p clients, push Descr,Protocol,Start,End,src/dest/both onto p2plist */
-	$p2plist['aimster'] = array();
-		$p2plist['aimster'][] = array('Aimster', 'tcp', '7668', '7668', 'both');
-	$p2plist['bittorrent'] = array(); 
-		$p2plist['bittorrent'][] = array('BitTorrent', 'tcp', '6881', '6999', 'both');
-		$p2plist['bittorrent'][] = array('BitTorrent', 'udp', '6881', '6999', 'both');
-	$p2plist['buddyshare'] = array();
-		$p2plist['buddyshare'][] = array('BuddyShare', 'tcp', '7788', '7788', 'both');
-	$p2plist['cutemx'] = array();
-		$p2plist['cutemx'][] = array('CuteMX', 'tcp', '2340', '2340', 'both');
-	$p2plist['dc++'] = array();
-		$p2plist['dc++'][] = array('DC++', 'tcp', '1412', '1412', 'both');
-	$p2plist['dcc'] = array();
-		$p2plist['dcc'][] = array('dcc', 'tcp', '6666', '6668', 'both');
-	$p2plist['directconnect'] = array();
-		$p2plist['directconnect'][] = array('DirectConnect', 'tcp', '412', '412', 'both');
-	$p2plist['directfileexpress'] = array();
-		$p2plist['directfileexpress'][] = array('DirectFileExpress', 'tcp', '1044', '1045', 'both');
-	$p2plist['edonkey2000'] = array();
-		$p2plist['edonkey2000'][] = array('EDonkey2000', 'tcp', '4661', '4665', 'both');
-	$p2plist['fastTrack'] = array();
-		$p2plist['fastTrack'][] = array('FastTrack', 'tcp', '1214', '1214', 'both');
-	$p2plist['gnutella'] = array(); 
-		$p2plist['gnutella'][] = array('Gnutella-TCP', 'tcp', '6346', '6346', 'both');
-		$p2plist['gnutella'][] = array('Gnutella-UDP', 'udp', '6346', '6346', 'both');
-	$p2plist['grouper'] = array();
-		$p2plist['grouper'][] = array('grouper', 'tcp', '8038', '8039', 'both');
-	$p2plist['hotcomm'] = array();
-		$p2plist['hotcomm'][] = array('hotComm', 'tcp', '28864', '28865', 'both');
-	$p2plist['hotlineconnect'] = array();
-		$p2plist['hotlineconnect'][] = array('HotlineConnect', 'tcp', '5500', '5503', 'both');
-	$p2plist['imesh'] = array();
-		$p2plist['imesh'][] = array('iMesh', 'tcp', '4329', '4329', 'both');
-	$p2plist['napster'] = array();
-		$p2plist['napster'][] = array('Napster', 'tcp', '6699', '6701', 'both');
-	$p2plist['opennap'] = array();
-		$p2plist['opennap'][] = array('OpenNap', 'tcp', '8888', '8889', 'both');
-	$p2plist['scour'] = array();
-		$p2plist['scour'][] = array('Scour', 'tcp', '8311', '8311', 'both');
-	$p2plist['shareaza'] = array();
-		$p2plist['shareaza'][] = array('Shareaza', 'tcp', '6346', '6346', 'both');
-	$p2plist['songspy'] = array();
-		$p2plist['songspy'][] = array('SongSpy', 'tcp', '5190', '5190', 'both');
-	$p2plist['winmx'] = array();
-		$p2plist['winmx'][] = array('WinMX', 'tcp', '6699', '6699', 'both');
-
-
-
-$othersplist = array();
-	/* Unlike other areas we are posting the queue H or L or BLANK */
-
-	$othersplist['msrdp'] = array();
-		/* MSRDP */
-		$othersplist['msrdp'][] = array('MSRDP', 'tcp', '3389', '3389', 'both');
-	$othersplist['pptp'] = array();
-		/* PPTP */
-		$othersplist['pptp'][] = array('PPTP', 'tcp', '1723', '1723', 'both');
-		$othersplist['pptp'][] = array('PPTPGRE', 'gre', '', '', 'both');
-	$othersplist['ipsec'] = array();
-		/* IPSEC */
-		$othersplist['ipsec'][] = array('IPSEC', 'udp', '500', '500', 'both');
-		$othersplist['ipsec'][] = array('IPSEC', 'ah', '', '', 'both');
-		$othersplist['ipsec'][] = array('IPSEC', 'esp', '', '', 'both');
-	$othersplist['streamingmp3'] = array();
-		/* streaming mp3 media aka shoutcast */
-		$othersplist['streamingmp3'][] = array('STREAMINGMP3', 'tcp', '8000', '8100', 'both');
-	$othersplist['irc'] = array();
-		/* internet relay chat */
-		$othersplist['irc'][] = array('IRC', 'tcp', '6667', '6670', 'both');
-	$othersplist['jabber'] = array();
-		/* jabber */
-		$othersplist['jabber'][] = array('IRC', 'tcp', '5222', '5222', 'both');
-		$othersplist['jabber'][] = array('IRC', 'tcp', '5223', '5223', 'both');
-		$othersplist['jabber'][] = array('IRC', 'tcp', '5269', '5269', 'both');
-	$othersplist['dns'] = array();
-		/* domain name system */
-		$othersplist['dns'][] = array('DNS1', 'tcp', '53', '53', 'both');
-		$othersplist['dns'][] = array('DNS2', 'udp', '53', '53', 'both');
-	$othersplist['http'] = array();
-		/* HTTP aka Web Traffic */
-		$othersplist['http'][] = array('HTTP', 'tcp', '80', '80', 'both');
-		$othersplist['http'][] = array('HTTPS', 'tcp', '443', '443', 'both');
-	$othersplist['smtp'] = array();
-		/* Secure shell traffic */
-		$othersplist['smtp'][] = array('SMTP', 'tcp', '25', '25', 'both');
-	$othersplist['pop3'] = array();
-		/* Post Office Protocol - POP3 */
-		$othersplist['pop3'][] = array('POP3', 'tcp', '110', '110', 'both');
-	$othersplist['icmp'] = array();
-		/* ICMP */
-		$othersplist['icmp'][] = array('ICMP', 'icmp', '', '', 'both');
-	$othersplist['imap'] = array();
-		/* IMAP */
-		$othersplist['imap'][] = array('IMAP', 'tcp', '143', '143', 'both');
-	$othersplist['smb'] = array();
-		/* Microsoft SMB and friends */
-		$othersplist['smb'][] = array('SMB1', 'tcp', '445', '445', 'both');
-		$othersplist['smb'][] = array('SMB2', 'tcp', '137-139', '137-139', 'both');
-	$othersplist['rtsp'] = array();
-		/* realtime streaming protocol */
-		$othersplist['rtsp'][] = array('RTSP1', 'tcp', '554', '554', 'both');
-	$othersplist['snmp'] = array();
-		/* Simple network management protocol */
-		$othersplist['snmp'][] = array('SNMP', 'tcp', '161', '161', 'both');
-		$othersplist['snmp'][] = array('SNMP2', 'udp', '161', '161', 'both');
-	$othersplist['vnc'] = array();
-		/* virtual network control */
-		$othersplist['vnc'][] = array('VNC', 'tcp', '5900', '5930', 'both');
-	$othersplist['appleremotedesktop'] = array();
-		/* apple remote desktop */
-		$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop1', 'tcp', '3283', '3283', 'both');
-		$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop2', 'tcp', '5900', '5900', 'both');
-		$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop3', 'udp', '3283', '3283', 'both');
-		$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop4', 'udp', '5900', '5900', 'both');
-	$othersplist['icq'] = array();
-		/* icq */
-		$othersplist['icq'][] = array('ICQ1', 'tcp', '5190', '5190', 'both');
-		$othersplist['icq'][] = array('ICQ2', 'udp', '5190', '5190', 'both');
-	$othersplist['lotusnotes'] = array();
-		/* lotus notes */
-		$othersplist['lotusnotes'][] = array('LotusNotes1', 'tcp', '1352', '1352', 'both');
-		$othersplist['lotusnotes'][] = array('LotusNotes2', 'udp', '1352', '1352', 'both');
-	$othersplist['aolinstantmessenger'] = array();
-		/* AIM */
-		$othersplist['aolinstantmessenger'][] = array('AIM', 'tcp', '5190', '5190', 'both');
-	$othersplist['msnmessenger'] = array();
-		/* msn messenger */
-		$othersplist['msnmessenger'][] = array('MSN1', 'tcp', '1863', '1863', 'both');
-		$othersplist['msnmessenger'][] = array('MSN2', 'tcp', '6891', '6900', 'both');
-		$othersplist['msnmessenger'][] = array('MSN3', 'tcp', '6901', '6901', 'both');
-		$othersplist['msnmessenger'][] = array('MSN4', 'udp', '6901', '6901', 'both');
-	$othersplist['mysqlserver'] = array();
-		/* mysql server */
-		$othersplist['mysqlserver'][] = array('MySQL1', 'tcp', '3306', '3306', 'both');
-	$othersplist['nntp'] = array();
-		/* nntp */
-		$othersplist['nntp'][] = array('NNTP1', 'tcp', '119', '119', 'both');
-		$othersplist['nntp'][] = array('NNTP2', 'udp', '119', '119', 'both');
-	$othersplist['pcanywhere'] = array();
-		/* symantec pc anywhere */
-		$othersplist['pcanywhere'][] = array('pcany1', 'tcp', '5631', '5631', 'both');
-		$othersplist['pcanywhere'][] = array('pcany2', 'udp', '5632', '5632', 'both');
-	$othersplist['teamspeak'] = array();
-		/* teamspeak  */
-		$othersplist['teamspeak'][] = array('teamspeak1', 'tcp', '14534', '14534', 'both');
-		$othersplist['teamspeak'][] = array('teamspeak2', 'tcp', '51234', '51234', 'both');
-		$othersplist['teamspeak'][] = array('teamspeak3', 'udp', '8767', '8768', 'both');
-	$othersplist['cvsup'] = array();
-		/* cvs  */
-		$othersplist['cvsup'][] = array('cvsup', 'tcp', '5999', '5999', 'both');
-	$othersplist['hbci'] = array();
-		/* HBCI  */
-		$othersplist['hbci'][] = array('HBCI', 'tcp', '3000', '3000', 'both');
-	$othersplist['slingbox'] = array();
-		$othersplist['slingbox'][] = array('Slingbox1', 'tcp', '5001', '5001', 'both');
-		$othersplist['slingbox'][] = array('Slingbox2', 'udp', '5001', '5001', 'both');
+	global $config, $g, $altq_list_queues, $gamesplist;
+
+	require_once("wizardapp.inc");
 
 	/* 
 	 * Wipe previous config.
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
index b264949..c50bff5 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
@@ -594,322 +594,9 @@ function step9_stepsubmitphpaction() {
 }
 
 function apply_all_choosen_items() {
-	global $config, $g, $altq_list_queues;
-
-$gamesplist = array();
-
-$gamesplist['battlefield2'] = array();
-	/* Battlefield 2 */
-	$gamesplist['battlefield2'][] = array('BF2-1500-4999', 'udp', '1500', '4999', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-4711', 'tcp', '4711', '4711', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-16567', 'udp', '16567', '16567', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-27900', 'udp', '27900', '27900', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-28910', 'tcp', '28910', '28910', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-29900-29901-UDP', 'udp', '29900', '29901', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-29900-29901-TCP', 'tcp', '29900', '29901', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-27900', 'udp', '27900', '27900', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-55123-55125', 'udp', '55123', '55125', 'both');
-
-$gamesplist['counterstrike'] = array();
-	/* counter strike */
-	$gamesplist['counterstrike'][] = array('Titan', 'udp', '6003', '6003', 'both');
-	$gamesplist['counterstrike'][] = array('Authentication', 'udp', '7002', '7002', 'both');
-	$gamesplist['counterstrike'][] = array('Client', 'udp', '6003', '6003', 'both');
-	$gamesplist['counterstrike'][] = array('Masterserver', 'udp', '27010', '27010', 'both');
-	$gamesplist['counterstrike'][] = array('Mod-Server', 'udp', '27011', '27011', 'both');
-	$gamesplist['counterstrike'][] = array('Chat', 'udp', '27012', '27012', 'both');
-	$gamesplist['counterstrike'][] = array('HL-Serverport1', 'udp', '27013', '27013', 'both');
-	$gamesplist['counterstrike'][] = array('HL-Serverport2', 'udp', '27014', '27014', 'both');
-	$gamesplist['counterstrike'][] = array('HL-Serverport', 'udp', '27015', '27015', 'both');
-
-$gamesplist['deltaforce'] = array();
-	/* delta force */
-	$gamesplist['deltaforce'][] = array('Delta1', 'udp', '17478', '17488', 'both');
-
-$gamesplist['quakeiii'] = array();
-	/* quake3 */
-	$gamesplist['quakeiii'][] = array('quakeiii', 'udp', '27910', '27919', 'both');
-
-$gamesplist['tigerwoods2004ps2'] = array();
-	/* tiger woods 2004 ps2 */
-	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2Player', 'udp', '3658', '3658', 'both');
-	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2Player2', 'udp', '6000', '6000', 'both');
-	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2EA', 'tcp', '10300', '10301', 'both');
-
-$gamesplist['callofduty'] = array();
-	$gamesplist['callofduty'][] = array('CallOfDuty1', 'tcp', '28960', '28960', 'both');
-	$gamesplist['callofduty'][] = array('CallOfDuty2', 'udp', '28960', '28960', 'both');
-
-$gamesplist['planetside'] = array();
-	/* PlanetSide */
-	$gamesplist['planetside'][] = array('PlanetSide', 'tcp', '7000', '7000', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide', 'tcp', '7080', '7080', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '3016', '3021', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '45000', '45010', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '30000', '30500', 'both');
-
-$gamesplist['halo2'] = array();
-	/* Halo2 + XBOX Live */
-	$gamesplist['halo2'][] = array('Halo2-1', 'udp', '88', '88', 'both');
-	$gamesplist['halo2'][] = array('Halo2-2', 'udp', '3074', '3074', 'both');
-	$gamesplist['halo2'][] = array('Halo2-3', 'tcp', '3074', '3074', 'both');
-
-$gamesplist['unrealtournament'] = array();
-	/* Unreal Tournament */
-	$gamesplist['unrealtournament'][] = array('ur1', 'udp', '7777', '7787', 'both');
-	$gamesplist['unrealtournament'][] = array('ur2', 'tcp', '7777', '7787', 'both');
-
-$gamesplist['doom3'] = array();
-	/* doom3 */
-	$gamesplist['doom3'][] = array('DOOM3-1', 'udp', '27650', '27650', 'both');
-	$gamesplist['doom3'][] = array('DOOM3-2', 'udp', '27666', '27666', 'both');
-
-$gamesplist['empireearth'] = array();
-	/* empire earth */
-	$gamesplist['empireearth'][] = array('EmpireEarth-1', 'tcp', '33335', '33336', 'both');
-	$gamesplist['empireearth'][] = array('EmpireEarth-2', 'udp', '33334', '33334', 'both');
-
-$gamesplist['everquest'] = array();
-	/* everquest */
-	$gamesplist['everquest'][] = array('Everquest-1', 'tcp', '1024', '6000', 'both');
-	$gamesplist['everquest'][] = array('Everquest-2', 'tcp', '7000', '7000', 'both');
-	$gamesplist['everquest'][] = array('Everquest-3', 'udp', '1024', '6000', 'both');
-	$gamesplist['everquest'][] = array('Everquest-4', 'udp', '7000', '7000', 'both');
-
-$gamesplist['everquest2'] = array();
-	/* everquest2 */
-	$gamesplist['everquest2'][] = array('Everquest2-1', 'tcp', '7000', '7000', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-2', 'udp', '3016', '3021', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-3', 'udp', '9100', '9100', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-4', 'udp', '9700', '9703', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-5', 'udp', '32800', '33000', 'both');
-
-$gamesplist['farcry'] = array();
-	/* far cry */
-	$gamesplist['farcry'][] = array('FarCry-1', 'tcp', '49001', '49002', 'both');
-	$gamesplist['farcry'][] = array('FarCry-2', 'udp', '49001', '49002', 'both');
-
-$gamesplist['halflife2'] = array();
-	/* halflife 2 */
-	$gamesplist['halflife2'][] = array('HL2-1', 'tcp', '27020', '27050', 'both');
-	$gamesplist['halflife2'][] = array('HL2-2', 'udp', '1200', '1200', 'both');
-	$gamesplist['halflife2'][] = array('HL2-3', 'udp', '27000', '27015', 'both');
-
-$gamesplist['halflife'] = array();
-	/* halflife */
-	$gamesplist['halflife'][] = array('HL-1', 'tcp', '27015', '27015', 'both');
-	$gamesplist['halflife'][] = array('HL-2', 'udp', '27650', '27650', 'both');
-	$gamesplist['halflife'][] = array('HL-3', 'udp', '27666', '27666', 'both');
-
-$gamesplist['wolfet'] = array();
-	/* wolfenstein enemy territory */
-	$gamesplist['wolfet'][] = array('WolfET-1', 'tcp', '27960', '27960', 'both');
-
-$gamesplist['lineage2'] = array();
-	/* Lineage II */
-	$gamesplist['lineage2'][] = array('Lineage2-2009', 'tcp', '2009', '2009', 'both');
-	$gamesplist['lineage2'][] = array('Lineage2-2106', 'tcp', '2106', '2106', 'both');
-	$gamesplist['lineage2'][] = array('Lineage2-7777', 'tcp', '7777', '7777', 'both');
-
-$gamesplist['battlenet'] = array();
-	/* Blizzard Publishing games */
-	$gamesplist['battlenet'][] = array('Battle.NET', 'tcp', '6112', '6119', 'both');
-	$gamesplist['battlenet'][] = array('Battle.NET-2', 'tcp', '1119', '1119', 'both');
-
-$gamesplist['worldofwarcraft'] = array();
-	$gamesplist[] = array('WoW', 'tcp', '3724', '3724', 'both');
-
-$gamesplist['battlenet'] = array();
-	/* Add battle.net only if WoW is selected and battle.net isn't */
-	$gamesplist[] = array('Battle.NET', 'tcp', '6112', '6119', 'both');
-
-$gamesplist['gunzonline'] = array();
-	/* GunZ Online */
-	$gamesplist['gunzonline'][] = array('GunZOnline', 'udp', '7700', '7700', 'both');
-
-$gamesplist['xbox360'] = array();
-	/* XBox360 */
-	$gamesplist['xbox360'][] = array('xbox360-1', 'udp', '88', '88', 'both');
-	$gamesplist['xbox360'][] = array('xbox360-2', 'udp', '3074', '3074', 'both');
-	$gamesplist['xbox360'][] = array('xbox360-3', 'tcp', '3074', '3074', 'both');
-
-
-$voiplist = array();
-
-   /* asterisk server / same as vonage */
-$voiplist['Asterisk'] = array();
-	$voiplist['Asterisk'][] = array($_POST['provider'], 'udp', '5060', '5069', 'both');
-	$voiplist['Asterisk'][] = array($_POST['provider'], 'udp', '10000', '20000', 'both');
-
-    /* VoicePulse server */	
-$voiplist['VoicePulse'] = array();
-	$voiplist['VoicePulse'][] = array('VoicePulse', 'udp', '16384', '16482', 'both');
-	$voiplist['VoicePulse'][] = array('VoicePulse', 'udp', '4569', '4569', 'both');
-
-    /* Panasonic Hybrid PBX */
-$voiplist['Panasonic'] = array();
-	$voiplist['Panasonic'][] = array('Panasonic1', 'udp', '8000', '8063', 'both');
-	$voiplist['Panasonic'][] = array('Panasonic2', 'udp', '9300', '9301', 'both');
-	$voiplist['Panasonic'][] = array('Panasonic3', 'udp', '2747', '2747', 'both');
-
-
-$p2plist = array();
-	/* To add p2p clients, push Descr,Protocol,Start,End,src/dest/both onto p2plist */
-	$p2plist['aimster'] = array();
-		$p2plist['aimster'][] = array('Aimster', 'tcp', '7668', '7668', 'both');
-	$p2plist['bittorrent'] = array(); 
-		$p2plist['bittorrent'][] = array('BitTorrent', 'tcp', '6881', '6999', 'both');
-		$p2plist['bittorrent'][] = array('BitTorrent', 'udp', '6881', '6999', 'both');
-	$p2plist['buddyshare'] = array();
-		$p2plist['buddyshare'][] = array('BuddyShare', 'tcp', '7788', '7788', 'both');
-	$p2plist['cutemx'] = array();
-		$p2plist['cutemx'][] = array('CuteMX', 'tcp', '2340', '2340', 'both');
-	$p2plist['dc++'] = array();
-		$p2plist['dc++'][] = array('DC++', 'tcp', '1412', '1412', 'both');
-	$p2plist['dcc'] = array();
-		$p2plist['dcc'][] = array('dcc', 'tcp', '6666', '6668', 'both');
-	$p2plist['directconnect'] = array();
-		$p2plist['directconnect'][] = array('DirectConnect', 'tcp', '412', '412', 'both');
-	$p2plist['directfileexpress'] = array();
-		$p2plist['directfileexpress'][] = array('DirectFileExpress', 'tcp', '1044', '1045', 'both');
-	$p2plist['edonkey2000'] = array();
-		$p2plist['edonkey2000'][] = array('EDonkey2000', 'tcp', '4661', '4665', 'both');
-	$p2plist['fastTrack'] = array();
-		$p2plist['fastTrack'][] = array('FastTrack', 'tcp', '1214', '1214', 'both');
-	$p2plist['gnutella'] = array(); 
-		$p2plist['gnutella'][] = array('Gnutella-TCP', 'tcp', '6346', '6346', 'both');
-		$p2plist['gnutella'][] = array('Gnutella-UDP', 'udp', '6346', '6346', 'both');
-	$p2plist['grouper'] = array();
-		$p2plist['grouper'][] = array('grouper', 'tcp', '8038', '8039', 'both');
-	$p2plist['hotcomm'] = array();
-		$p2plist['hotcomm'][] = array('hotComm', 'tcp', '28864', '28865', 'both');
-	$p2plist['hotlineconnect'] = array();
-		$p2plist['hotlineconnect'][] = array('HotlineConnect', 'tcp', '5500', '5503', 'both');
-	$p2plist['imesh'] = array();
-		$p2plist['imesh'][] = array('iMesh', 'tcp', '4329', '4329', 'both');
-	$p2plist['napster'] = array();
-		$p2plist['napster'][] = array('Napster', 'tcp', '6699', '6701', 'both');
-	$p2plist['opennap'] = array();
-		$p2plist['opennap'][] = array('OpenNap', 'tcp', '8888', '8889', 'both');
-	$p2plist['scour'] = array();
-		$p2plist['scour'][] = array('Scour', 'tcp', '8311', '8311', 'both');
-	$p2plist['shareaza'] = array();
-		$p2plist['shareaza'][] = array('Shareaza', 'tcp', '6346', '6346', 'both');
-	$p2plist['songspy'] = array();
-		$p2plist['songspy'][] = array('SongSpy', 'tcp', '5190', '5190', 'both');
-	$p2plist['winmx'] = array();
-		$p2plist['winmx'][] = array('WinMX', 'tcp', '6699', '6699', 'both');
-
-
-
-$othersplist = array();
-	/* Unlike other areas we are posting the queue H or L or BLANK */
-
-	$othersplist['msrdp'] = array();
-		/* MSRDP */
-		$othersplist['msrdp'][] = array('MSRDP', 'tcp', '3389', '3389', 'both');
-	$othersplist['pptp'] = array();
-		/* PPTP */
-		$othersplist['pptp'][] = array('PPTP', 'tcp', '1723', '1723', 'both');
-		$othersplist['pptp'][] = array('PPTPGRE', 'gre', '', '', 'both');
-	$othersplist['ipsec'] = array();
-		/* IPSEC */
-		$othersplist['ipsec'][] = array('IPSEC', 'udp', '500', '500', 'both');
-		$othersplist['ipsec'][] = array('IPSEC', 'ah', '', '', 'both');
-		$othersplist['ipsec'][] = array('IPSEC', 'esp', '', '', 'both');
-	$othersplist['streamingmp3'] = array();
-		/* streaming mp3 media aka shoutcast */
-		$othersplist['streamingmp3'][] = array('STREAMINGMP3', 'tcp', '8000', '8100', 'both');
-	$othersplist['irc'] = array();
-		/* internet relay chat */
-		$othersplist['irc'][] = array('IRC', 'tcp', '6667', '6670', 'both');
-	$othersplist['jabber'] = array();
-		/* jabber */
-		$othersplist['jabber'][] = array('IRC', 'tcp', '5222', '5222', 'both');
-		$othersplist['jabber'][] = array('IRC', 'tcp', '5223', '5223', 'both');
-		$othersplist['jabber'][] = array('IRC', 'tcp', '5269', '5269', 'both');
-	$othersplist['dns'] = array();
-		/* domain name system */
-		$othersplist['dns'][] = array('DNS1', 'tcp', '53', '53', 'both');
-		$othersplist['dns'][] = array('DNS2', 'udp', '53', '53', 'both');
-	$othersplist['http'] = array();
-		/* HTTP aka Web Traffic */
-		$othersplist['http'][] = array('HTTP', 'tcp', '80', '80', 'both');
-		$othersplist['http'][] = array('HTTPS', 'tcp', '443', '443', 'both');
-	$othersplist['smtp'] = array();
-		/* Secure shell traffic */
-		$othersplist['smtp'][] = array('SMTP', 'tcp', '25', '25', 'both');
-	$othersplist['pop3'] = array();
-		/* Post Office Protocol - POP3 */
-		$othersplist['pop3'][] = array('POP3', 'tcp', '110', '110', 'both');
-	$othersplist['icmp'] = array();
-		/* ICMP */
-		$othersplist['icmp'][] = array('ICMP', 'icmp', '', '', 'both');
-	$othersplist['imap'] = array();
-		/* IMAP */
-		$othersplist['imap'][] = array('IMAP', 'tcp', '143', '143', 'both');
-	$othersplist['smb'] = array();
-		/* Microsoft SMB and friends */
-		$othersplist['smb'][] = array('SMB1', 'tcp', '445', '445', 'both');
-		$othersplist['smb'][] = array('SMB2', 'tcp', '137-139', '137-139', 'both');
-	$othersplist['rtsp'] = array();
-		/* realtime streaming protocol */
-		$othersplist['rtsp'][] = array('RTSP1', 'tcp', '554', '554', 'both');
-	$othersplist['snmp'] = array();
-		/* Simple network management protocol */
-		$othersplist['snmp'][] = array('SNMP', 'tcp', '161', '161', 'both');
-		$othersplist['snmp'][] = array('SNMP2', 'udp', '161', '161', 'both');
-	$othersplist['vnc'] = array();
-		/* virtual network control */
-		$othersplist['vnc'][] = array('VNC', 'tcp', '5900', '5930', 'both');
-	$othersplist['appleremotedesktop'] = array();
-		/* apple remote desktop */
-		$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop1', 'tcp', '3283', '3283', 'both');
-		$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop2', 'tcp', '5900', '5900', 'both');
-		$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop3', 'udp', '3283', '3283', 'both');
-		$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop4', 'udp', '5900', '5900', 'both');
-	$othersplist['icq'] = array();
-		/* icq */
-		$othersplist['icq'][] = array('ICQ1', 'tcp', '5190', '5190', 'both');
-		$othersplist['icq'][] = array('ICQ2', 'udp', '5190', '5190', 'both');
-	$othersplist['lotusnotes'] = array();
-		/* lotus notes */
-		$othersplist['lotusnotes'][] = array('LotusNotes1', 'tcp', '1352', '1352', 'both');
-		$othersplist['lotusnotes'][] = array('LotusNotes2', 'udp', '1352', '1352', 'both');
-	$othersplist['aolinstantmessenger'] = array();
-		/* AIM */
-		$othersplist['aolinstantmessenger'][] = array('AIM', 'tcp', '5190', '5190', 'both');
-	$othersplist['msnmessenger'] = array();
-		/* msn messenger */
-		$othersplist['msnmessenger'][] = array('MSN1', 'tcp', '1863', '1863', 'both');
-		$othersplist['msnmessenger'][] = array('MSN2', 'tcp', '6891', '6900', 'both');
-		$othersplist['msnmessenger'][] = array('MSN3', 'tcp', '6901', '6901', 'both');
-		$othersplist['msnmessenger'][] = array('MSN4', 'udp', '6901', '6901', 'both');
-	$othersplist['mysqlserver'] = array();
-		/* mysql server */
-		$othersplist['mysqlserver'][] = array('MySQL1', 'tcp', '3306', '3306', 'both');
-	$othersplist['nntp'] = array();
-		/* nntp */
-		$othersplist['nntp'][] = array('NNTP1', 'tcp', '119', '119', 'both');
-		$othersplist['nntp'][] = array('NNTP2', 'udp', '119', '119', 'both');
-	$othersplist['pcanywhere'] = array();
-		/* symantec pc anywhere */
-		$othersplist['pcanywhere'][] = array('pcany1', 'tcp', '5631', '5631', 'both');
-		$othersplist['pcanywhere'][] = array('pcany2', 'udp', '5632', '5632', 'both');
-	$othersplist['teamspeak'] = array();
-		/* teamspeak  */
-		$othersplist['teamspeak'][] = array('teamspeak1', 'tcp', '14534', '14534', 'both');
-		$othersplist['teamspeak'][] = array('teamspeak2', 'tcp', '51234', '51234', 'both');
-		$othersplist['teamspeak'][] = array('teamspeak3', 'udp', '8767', '8768', 'both');
-	$othersplist['cvsup'] = array();
-		/* cvs  */
-		$othersplist['cvsup'][] = array('cvsup', 'tcp', '5999', '5999', 'both');
-	$othersplist['hbci'] = array();
-		/* HBCI  */
-		$othersplist['hbci'][] = array('HBCI', 'tcp', '3000', '3000', 'both');
-	$othersplist['slingbox'] = array();
-		$othersplist['slingbox'][] = array('Slingbox1', 'tcp', '5001', '5001', 'both');
-		$othersplist['slingbox'][] = array('Slingbox2', 'udp', '5001', '5001', 'both');
+	global $config, $g, $altq_list_queues, $gamesplist;
+
+	require_once("wizardapp.inc");
 
 	/* 
 	 * Wipe previous config.
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
index 8a2a74b..38b53e4 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
@@ -626,322 +626,9 @@ function step9_stepsubmitphpaction() {
 }
 
 function apply_all_choosen_items() {
-	global $config, $g, $altq_list_queues;
-
-$gamesplist = array();
-
-$gamesplist['battlefield2'] = array();
-	/* Battlefield 2 */
-	$gamesplist['battlefield2'][] = array('BF2-1500-4999', 'udp', '1500', '4999', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-4711', 'tcp', '4711', '4711', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-16567', 'udp', '16567', '16567', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-27900', 'udp', '27900', '27900', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-28910', 'tcp', '28910', '28910', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-29900-29901-UDP', 'udp', '29900', '29901', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-29900-29901-TCP', 'tcp', '29900', '29901', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-27900', 'udp', '27900', '27900', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-55123-55125', 'udp', '55123', '55125', 'both');
-
-$gamesplist['counterstrike'] = array();
-	/* counter strike */
-	$gamesplist['counterstrike'][] = array('Titan', 'udp', '6003', '6003', 'both');
-	$gamesplist['counterstrike'][] = array('Authentication', 'udp', '7002', '7002', 'both');
-	$gamesplist['counterstrike'][] = array('Client', 'udp', '6003', '6003', 'both');
-	$gamesplist['counterstrike'][] = array('Masterserver', 'udp', '27010', '27010', 'both');
-	$gamesplist['counterstrike'][] = array('Mod-Server', 'udp', '27011', '27011', 'both');
-	$gamesplist['counterstrike'][] = array('Chat', 'udp', '27012', '27012', 'both');
-	$gamesplist['counterstrike'][] = array('HL-Serverport1', 'udp', '27013', '27013', 'both');
-	$gamesplist['counterstrike'][] = array('HL-Serverport2', 'udp', '27014', '27014', 'both');
-	$gamesplist['counterstrike'][] = array('HL-Serverport', 'udp', '27015', '27015', 'both');
-
-$gamesplist['deltaforce'] = array();
-	/* delta force */
-	$gamesplist['deltaforce'][] = array('Delta1', 'udp', '17478', '17488', 'both');
-
-$gamesplist['quakeiii'] = array();
-	/* quake3 */
-	$gamesplist['quakeiii'][] = array('quakeiii', 'udp', '27910', '27919', 'both');
-
-$gamesplist['tigerwoods2004ps2'] = array();
-	/* tiger woods 2004 ps2 */
-	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2Player', 'udp', '3658', '3658', 'both');
-	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2Player2', 'udp', '6000', '6000', 'both');
-	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2EA', 'tcp', '10300', '10301', 'both');
-
-$gamesplist['callofduty'] = array();
-	$gamesplist['callofduty'][] = array('CallOfDuty1', 'tcp', '28960', '28960', 'both');
-	$gamesplist['callofduty'][] = array('CallOfDuty2', 'udp', '28960', '28960', 'both');
-
-$gamesplist['planetside'] = array();
-	/* PlanetSide */
-	$gamesplist['planetside'][] = array('PlanetSide', 'tcp', '7000', '7000', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide', 'tcp', '7080', '7080', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '3016', '3021', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '45000', '45010', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '30000', '30500', 'both');
-
-$gamesplist['halo2'] = array();
-	/* Halo2 + XBOX Live */
-	$gamesplist['halo2'][] = array('Halo2-1', 'udp', '88', '88', 'both');
-	$gamesplist['halo2'][] = array('Halo2-2', 'udp', '3074', '3074', 'both');
-	$gamesplist['halo2'][] = array('Halo2-3', 'tcp', '3074', '3074', 'both');
-
-$gamesplist['unrealtournament'] = array();
-	/* Unreal Tournament */
-	$gamesplist['unrealtournament'][] = array('ur1', 'udp', '7777', '7787', 'both');
-	$gamesplist['unrealtournament'][] = array('ur2', 'tcp', '7777', '7787', 'both');
-
-$gamesplist['doom3'] = array();
-	/* doom3 */
-	$gamesplist['doom3'][] = array('DOOM3-1', 'udp', '27650', '27650', 'both');
-	$gamesplist['doom3'][] = array('DOOM3-2', 'udp', '27666', '27666', 'both');
-
-$gamesplist['empireearth'] = array();
-	/* empire earth */
-	$gamesplist['empireearth'][] = array('EmpireEarth-1', 'tcp', '33335', '33336', 'both');
-	$gamesplist['empireearth'][] = array('EmpireEarth-2', 'udp', '33334', '33334', 'both');
-
-$gamesplist['everquest'] = array();
-	/* everquest */
-	$gamesplist['everquest'][] = array('Everquest-1', 'tcp', '1024', '6000', 'both');
-	$gamesplist['everquest'][] = array('Everquest-2', 'tcp', '7000', '7000', 'both');
-	$gamesplist['everquest'][] = array('Everquest-3', 'udp', '1024', '6000', 'both');
-	$gamesplist['everquest'][] = array('Everquest-4', 'udp', '7000', '7000', 'both');
-
-$gamesplist['everquest2'] = array();
-	/* everquest2 */
-	$gamesplist['everquest2'][] = array('Everquest2-1', 'tcp', '7000', '7000', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-2', 'udp', '3016', '3021', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-3', 'udp', '9100', '9100', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-4', 'udp', '9700', '9703', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-5', 'udp', '32800', '33000', 'both');
-
-$gamesplist['farcry'] = array();
-	/* far cry */
-	$gamesplist['farcry'][] = array('FarCry-1', 'tcp', '49001', '49002', 'both');
-	$gamesplist['farcry'][] = array('FarCry-2', 'udp', '49001', '49002', 'both');
-
-$gamesplist['halflife2'] = array();
-	/* halflife 2 */
-	$gamesplist['halflife2'][] = array('HL2-1', 'tcp', '27020', '27050', 'both');
-	$gamesplist['halflife2'][] = array('HL2-2', 'udp', '1200', '1200', 'both');
-	$gamesplist['halflife2'][] = array('HL2-3', 'udp', '27000', '27015', 'both');
-
-$gamesplist['halflife'] = array();
-	/* halflife */
-	$gamesplist['halflife'][] = array('HL-1', 'tcp', '27015', '27015', 'both');
-	$gamesplist['halflife'][] = array('HL-2', 'udp', '27650', '27650', 'both');
-	$gamesplist['halflife'][] = array('HL-3', 'udp', '27666', '27666', 'both');
-
-$gamesplist['wolfet'] = array();
-	/* wolfenstein enemy territory */
-	$gamesplist['wolfet'][] = array('WolfET-1', 'tcp', '27960', '27960', 'both');
-
-$gamesplist['lineage2'] = array();
-	/* Lineage II */
-	$gamesplist['lineage2'][] = array('Lineage2-2009', 'tcp', '2009', '2009', 'both');
-	$gamesplist['lineage2'][] = array('Lineage2-2106', 'tcp', '2106', '2106', 'both');
-	$gamesplist['lineage2'][] = array('Lineage2-7777', 'tcp', '7777', '7777', 'both');
-
-$gamesplist['battlenet'] = array();
-	/* Blizzard Publishing games */
-	$gamesplist['battlenet'][] = array('Battle.NET', 'tcp', '6112', '6119', 'both');
-	$gamesplist['battlenet'][] = array('Battle.NET-2', 'tcp', '1119', '1119', 'both');
-
-$gamesplist['worldofwarcraft'] = array();
-	$gamesplist[] = array('WoW', 'tcp', '3724', '3724', 'both');
-
-$gamesplist['battlenet'] = array();
-	/* Add battle.net only if WoW is selected and battle.net isn't */
-	$gamesplist[] = array('Battle.NET', 'tcp', '6112', '6119', 'both');
-
-$gamesplist['gunzonline'] = array();
-	/* GunZ Online */
-	$gamesplist['gunzonline'][] = array('GunZOnline', 'udp', '7700', '7700', 'both');
-
-$gamesplist['xbox360'] = array();
-	/* XBox360 */
-	$gamesplist['xbox360'][] = array('xbox360-1', 'udp', '88', '88', 'both');
-	$gamesplist['xbox360'][] = array('xbox360-2', 'udp', '3074', '3074', 'both');
-	$gamesplist['xbox360'][] = array('xbox360-3', 'tcp', '3074', '3074', 'both');
-
-
-$voiplist = array();
-
-   /* asterisk server / same as vonage */
-$voiplist['Asterisk'] = array();
-	$voiplist['Asterisk'][] = array($_POST['provider'], 'udp', '5060', '5069', 'both');
-	$voiplist['Asterisk'][] = array($_POST['provider'], 'udp', '10000', '20000', 'both');
-
-    /* VoicePulse server */	
-$voiplist['VoicePulse'] = array();
-	$voiplist['VoicePulse'][] = array('VoicePulse', 'udp', '16384', '16482', 'both');
-	$voiplist['VoicePulse'][] = array('VoicePulse', 'udp', '4569', '4569', 'both');
-
-    /* Panasonic Hybrid PBX */
-$voiplist['Panasonic'] = array();
-	$voiplist['Panasonic'][] = array('Panasonic1', 'udp', '8000', '8063', 'both');
-	$voiplist['Panasonic'][] = array('Panasonic2', 'udp', '9300', '9301', 'both');
-	$voiplist['Panasonic'][] = array('Panasonic3', 'udp', '2747', '2747', 'both');
-
-
-$p2plist = array();
-	/* To add p2p clients, push Descr,Protocol,Start,End,src/dest/both onto p2plist */
-	$p2plist['aimster'] = array();
-		$p2plist['aimster'][] = array('Aimster', 'tcp', '7668', '7668', 'both');
-	$p2plist['bittorrent'] = array(); 
-		$p2plist['bittorrent'][] = array('BitTorrent', 'tcp', '6881', '6999', 'both');
-		$p2plist['bittorrent'][] = array('BitTorrent', 'udp', '6881', '6999', 'both');
-	$p2plist['buddyshare'] = array();
-		$p2plist['buddyshare'][] = array('BuddyShare', 'tcp', '7788', '7788', 'both');
-	$p2plist['cutemx'] = array();
-		$p2plist['cutemx'][] = array('CuteMX', 'tcp', '2340', '2340', 'both');
-	$p2plist['dc++'] = array();
-		$p2plist['dc++'][] = array('DC++', 'tcp', '1412', '1412', 'both');
-	$p2plist['dcc'] = array();
-		$p2plist['dcc'][] = array('dcc', 'tcp', '6666', '6668', 'both');
-	$p2plist['directconnect'] = array();
-		$p2plist['directconnect'][] = array('DirectConnect', 'tcp', '412', '412', 'both');
-	$p2plist['directfileexpress'] = array();
-		$p2plist['directfileexpress'][] = array('DirectFileExpress', 'tcp', '1044', '1045', 'both');
-	$p2plist['edonkey2000'] = array();
-		$p2plist['edonkey2000'][] = array('EDonkey2000', 'tcp', '4661', '4665', 'both');
-	$p2plist['fastTrack'] = array();
-		$p2plist['fastTrack'][] = array('FastTrack', 'tcp', '1214', '1214', 'both');
-	$p2plist['gnutella'] = array(); 
-		$p2plist['gnutella'][] = array('Gnutella-TCP', 'tcp', '6346', '6346', 'both');
-		$p2plist['gnutella'][] = array('Gnutella-UDP', 'udp', '6346', '6346', 'both');
-	$p2plist['grouper'] = array();
-		$p2plist['grouper'][] = array('grouper', 'tcp', '8038', '8039', 'both');
-	$p2plist['hotcomm'] = array();
-		$p2plist['hotcomm'][] = array('hotComm', 'tcp', '28864', '28865', 'both');
-	$p2plist['hotlineconnect'] = array();
-		$p2plist['hotlineconnect'][] = array('HotlineConnect', 'tcp', '5500', '5503', 'both');
-	$p2plist['imesh'] = array();
-		$p2plist['imesh'][] = array('iMesh', 'tcp', '4329', '4329', 'both');
-	$p2plist['napster'] = array();
-		$p2plist['napster'][] = array('Napster', 'tcp', '6699', '6701', 'both');
-	$p2plist['opennap'] = array();
-		$p2plist['opennap'][] = array('OpenNap', 'tcp', '8888', '8889', 'both');
-	$p2plist['scour'] = array();
-		$p2plist['scour'][] = array('Scour', 'tcp', '8311', '8311', 'both');
-	$p2plist['shareaza'] = array();
-		$p2plist['shareaza'][] = array('Shareaza', 'tcp', '6346', '6346', 'both');
-	$p2plist['songspy'] = array();
-		$p2plist['songspy'][] = array('SongSpy', 'tcp', '5190', '5190', 'both');
-	$p2plist['winmx'] = array();
-		$p2plist['winmx'][] = array('WinMX', 'tcp', '6699', '6699', 'both');
-
-
-
-$othersplist = array();
-	/* Unlike other areas we are posting the queue H or L or BLANK */
-
-	$othersplist['msrdp'] = array();
-		/* MSRDP */
-		$othersplist['msrdp'][] = array('MSRDP', 'tcp', '3389', '3389', 'both');
-	$othersplist['pptp'] = array();
-		/* PPTP */
-		$othersplist['pptp'][] = array('PPTP', 'tcp', '1723', '1723', 'both');
-		$othersplist['pptp'][] = array('PPTPGRE', 'gre', '', '', 'both');
-	$othersplist['ipsec'] = array();
-		/* IPSEC */
-		$othersplist['ipsec'][] = array('IPSEC', 'udp', '500', '500', 'both');
-		$othersplist['ipsec'][] = array('IPSEC', 'ah', '', '', 'both');
-		$othersplist['ipsec'][] = array('IPSEC', 'esp', '', '', 'both');
-	$othersplist['streamingmp3'] = array();
-		/* streaming mp3 media aka shoutcast */
-		$othersplist['streamingmp3'][] = array('STREAMINGMP3', 'tcp', '8000', '8100', 'both');
-	$othersplist['irc'] = array();
-		/* internet relay chat */
-		$othersplist['irc'][] = array('IRC', 'tcp', '6667', '6670', 'both');
-	$othersplist['jabber'] = array();
-		/* jabber */
-		$othersplist['jabber'][] = array('IRC', 'tcp', '5222', '5222', 'both');
-		$othersplist['jabber'][] = array('IRC', 'tcp', '5223', '5223', 'both');
-		$othersplist['jabber'][] = array('IRC', 'tcp', '5269', '5269', 'both');
-	$othersplist['dns'] = array();
-		/* domain name system */
-		$othersplist['dns'][] = array('DNS1', 'tcp', '53', '53', 'both');
-		$othersplist['dns'][] = array('DNS2', 'udp', '53', '53', 'both');
-	$othersplist['http'] = array();
-		/* HTTP aka Web Traffic */
-		$othersplist['http'][] = array('HTTP', 'tcp', '80', '80', 'both');
-		$othersplist['http'][] = array('HTTPS', 'tcp', '443', '443', 'both');
-	$othersplist['smtp'] = array();
-		/* Secure shell traffic */
-		$othersplist['smtp'][] = array('SMTP', 'tcp', '25', '25', 'both');
-	$othersplist['pop3'] = array();
-		/* Post Office Protocol - POP3 */
-		$othersplist['pop3'][] = array('POP3', 'tcp', '110', '110', 'both');
-	$othersplist['icmp'] = array();
-		/* ICMP */
-		$othersplist['icmp'][] = array('ICMP', 'icmp', '', '', 'both');
-	$othersplist['imap'] = array();
-		/* IMAP */
-		$othersplist['imap'][] = array('IMAP', 'tcp', '143', '143', 'both');
-	$othersplist['smb'] = array();
-		/* Microsoft SMB and friends */
-		$othersplist['smb'][] = array('SMB1', 'tcp', '445', '445', 'both');
-		$othersplist['smb'][] = array('SMB2', 'tcp', '137-139', '137-139', 'both');
-	$othersplist['rtsp'] = array();
-		/* realtime streaming protocol */
-		$othersplist['rtsp'][] = array('RTSP1', 'tcp', '554', '554', 'both');
-	$othersplist['snmp'] = array();
-		/* Simple network management protocol */
-		$othersplist['snmp'][] = array('SNMP', 'tcp', '161', '161', 'both');
-		$othersplist['snmp'][] = array('SNMP2', 'udp', '161', '161', 'both');
-	$othersplist['vnc'] = array();
-		/* virtual network control */
-		$othersplist['vnc'][] = array('VNC', 'tcp', '5900', '5930', 'both');
-	$othersplist['appleremotedesktop'] = array();
-		/* apple remote desktop */
-		$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop1', 'tcp', '3283', '3283', 'both');
-		$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop2', 'tcp', '5900', '5900', 'both');
-		$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop3', 'udp', '3283', '3283', 'both');
-		$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop4', 'udp', '5900', '5900', 'both');
-	$othersplist['icq'] = array();
-		/* icq */
-		$othersplist['icq'][] = array('ICQ1', 'tcp', '5190', '5190', 'both');
-		$othersplist['icq'][] = array('ICQ2', 'udp', '5190', '5190', 'both');
-	$othersplist['lotusnotes'] = array();
-		/* lotus notes */
-		$othersplist['lotusnotes'][] = array('LotusNotes1', 'tcp', '1352', '1352', 'both');
-		$othersplist['lotusnotes'][] = array('LotusNotes2', 'udp', '1352', '1352', 'both');
-	$othersplist['aolinstantmessenger'] = array();
-		/* AIM */
-		$othersplist['aolinstantmessenger'][] = array('AIM', 'tcp', '5190', '5190', 'both');
-	$othersplist['msnmessenger'] = array();
-		/* msn messenger */
-		$othersplist['msnmessenger'][] = array('MSN1', 'tcp', '1863', '1863', 'both');
-		$othersplist['msnmessenger'][] = array('MSN2', 'tcp', '6891', '6900', 'both');
-		$othersplist['msnmessenger'][] = array('MSN3', 'tcp', '6901', '6901', 'both');
-		$othersplist['msnmessenger'][] = array('MSN4', 'udp', '6901', '6901', 'both');
-	$othersplist['mysqlserver'] = array();
-		/* mysql server */
-		$othersplist['mysqlserver'][] = array('MySQL1', 'tcp', '3306', '3306', 'both');
-	$othersplist['nntp'] = array();
-		/* nntp */
-		$othersplist['nntp'][] = array('NNTP1', 'tcp', '119', '119', 'both');
-		$othersplist['nntp'][] = array('NNTP2', 'udp', '119', '119', 'both');
-	$othersplist['pcanywhere'] = array();
-		/* symantec pc anywhere */
-		$othersplist['pcanywhere'][] = array('pcany1', 'tcp', '5631', '5631', 'both');
-		$othersplist['pcanywhere'][] = array('pcany2', 'udp', '5632', '5632', 'both');
-	$othersplist['teamspeak'] = array();
-		/* teamspeak  */
-		$othersplist['teamspeak'][] = array('teamspeak1', 'tcp', '14534', '14534', 'both');
-		$othersplist['teamspeak'][] = array('teamspeak2', 'tcp', '51234', '51234', 'both');
-		$othersplist['teamspeak'][] = array('teamspeak3', 'udp', '8767', '8768', 'both');
-	$othersplist['cvsup'] = array();
-		/* cvs  */
-		$othersplist['cvsup'][] = array('cvsup', 'tcp', '5999', '5999', 'both');
-	$othersplist['hbci'] = array();
-		/* HBCI  */
-		$othersplist['hbci'][] = array('HBCI', 'tcp', '3000', '3000', 'both');
-	$othersplist['slingbox'] = array();
-		$othersplist['slingbox'][] = array('Slingbox1', 'tcp', '5001', '5001', 'both');
-		$othersplist['slingbox'][] = array('Slingbox2', 'udp', '5001', '5001', 'both');
+	global $config, $g, $altq_list_queues, $gamesplist;
+
+	require_once("wizardapp.inc");
 
 	/* 
 	 * Wipe previous config.
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
index 5474011..2c7a284 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
@@ -54,6 +54,8 @@ function step2_stepbeforeformdisplay() {
         foreach ($iflisttmp as $if => $ifdesc) {
         	if (!is_altq_capable(get_real_interface($if)))
                 	continue;
+		if ($if == "wan")
+			continue;
                 $numberofinterfaces++;
                 $iflist[$if] = $ifdesc;
 	}
@@ -407,320 +409,9 @@ function step9_stepsubmitphpaction() {
 }
 
 function apply_all_choosen_items() {
-	global $config, $g, $altq_list_queues;
-
-	$gamesplist = array();
-
-	$gamesplist['battlefield2'] = array();
-	/* Battlefield 2 */
-	$gamesplist['battlefield2'][] = array('BF2-1500-4999', 'udp', '1500', '4999', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-4711', 'tcp', '4711', '4711', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-16567', 'udp', '16567', '16567', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-27900', 'udp', '27900', '27900', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-28910', 'tcp', '28910', '28910', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-29900-29901-UDP', 'udp', '29900', '29901', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-29900-29901-TCP', 'tcp', '29900', '29901', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-27900', 'udp', '27900', '27900', 'both');
-	$gamesplist['battlefield2'][] = array('BF2-55123-55125', 'udp', '55123', '55125', 'both');
-
-	$gamesplist['counterstrike'] = array();
-	/* counter strike */
-	$gamesplist['counterstrike'][] = array('Titan', 'udp', '6003', '6003', 'both');
-	$gamesplist['counterstrike'][] = array('Authentication', 'udp', '7002', '7002', 'both');
-	$gamesplist['counterstrike'][] = array('Client', 'udp', '6003', '6003', 'both');
-	$gamesplist['counterstrike'][] = array('Masterserver', 'udp', '27010', '27010', 'both');
-	$gamesplist['counterstrike'][] = array('Mod-Server', 'udp', '27011', '27011', 'both');
-	$gamesplist['counterstrike'][] = array('Chat', 'udp', '27012', '27012', 'both');
-	$gamesplist['counterstrike'][] = array('HL-Serverport1', 'udp', '27013', '27013', 'both');
-	$gamesplist['counterstrike'][] = array('HL-Serverport2', 'udp', '27014', '27014', 'both');
-	$gamesplist['counterstrike'][] = array('HL-Serverport', 'udp', '27015', '27015', 'both');
-
-	$gamesplist['deltaforce'] = array();
-	/* delta force */
-	$gamesplist['deltaforce'][] = array('Delta1', 'udp', '17478', '17488', 'both');
-
-	$gamesplist['quakeiii'] = array();
-	/* quake3 */
-	$gamesplist['quakeiii'][] = array('quakeiii', 'udp', '27910', '27919', 'both');
-
-	$gamesplist['tigerwoods2004ps2'] = array();
-	/* tiger woods 2004 ps2 */
-	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2Player', 'udp', '3658', '3658', 'both');
-	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2Player2', 'udp', '6000', '6000', 'both');
-	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2EA', 'tcp', '10300', '10301', 'both');
-
-	$gamesplist['callofduty'] = array();
-	$gamesplist['callofduty'][] = array('CallOfDuty1', 'tcp', '28960', '28960', 'both');
-	$gamesplist['callofduty'][] = array('CallOfDuty2', 'udp', '28960', '28960', 'both');
-
-	$gamesplist['planetside'] = array();
-	/* PlanetSide */
-	$gamesplist['planetside'][] = array('PlanetSide', 'tcp', '7000', '7000', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide', 'tcp', '7080', '7080', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '3016', '3021', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '45000', '45010', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '30000', '30500', 'both');
-
-	$gamesplist['halo2'] = array();
-	/* Halo2 + XBOX Live */
-	$gamesplist['halo2'][] = array('Halo2-1', 'udp', '88', '88', 'both');
-	$gamesplist['halo2'][] = array('Halo2-2', 'udp', '3074', '3074', 'both');
-	$gamesplist['halo2'][] = array('Halo2-3', 'tcp', '3074', '3074', 'both');
-
-	$gamesplist['unrealtournament'] = array();
-	/* Unreal Tournament */
-	$gamesplist['unrealtournament'][] = array('ur1', 'udp', '7777', '7787', 'both');
-	$gamesplist['unrealtournament'][] = array('ur2', 'tcp', '7777', '7787', 'both');
-
-	$gamesplist['doom3'] = array();
-	/* doom3 */
-	$gamesplist['doom3'][] = array('DOOM3-1', 'udp', '27650', '27650', 'both');
-	$gamesplist['doom3'][] = array('DOOM3-2', 'udp', '27666', '27666', 'both');
-
-	$gamesplist['empireearth'] = array();
-	/* empire earth */
-	$gamesplist['empireearth'][] = array('EmpireEarth-1', 'tcp', '33335', '33336', 'both');
-	$gamesplist['empireearth'][] = array('EmpireEarth-2', 'udp', '33334', '33334', 'both');
-
-	$gamesplist['everquest'] = array();
-	/* everquest */
-	$gamesplist['everquest'][] = array('Everquest-1', 'tcp', '1024', '6000', 'both');
-	$gamesplist['everquest'][] = array('Everquest-2', 'tcp', '7000', '7000', 'both');
-	$gamesplist['everquest'][] = array('Everquest-3', 'udp', '1024', '6000', 'both');
-	$gamesplist['everquest'][] = array('Everquest-4', 'udp', '7000', '7000', 'both');
-
-	$gamesplist['everquest2'] = array();
-	/* everquest2 */
-	$gamesplist['everquest2'][] = array('Everquest2-1', 'tcp', '7000', '7000', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-2', 'udp', '3016', '3021', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-3', 'udp', '9100', '9100', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-4', 'udp', '9700', '9703', 'both');
-	$gamesplist['everquest2'][] = array('Everquest2-5', 'udp', '32800', '33000', 'both');
-
-	$gamesplist['farcry'] = array();
-	/* far cry */
-	$gamesplist['farcry'][] = array('FarCry-1', 'tcp', '49001', '49002', 'both');
-	$gamesplist['farcry'][] = array('FarCry-2', 'udp', '49001', '49002', 'both');
-
-	$gamesplist['halflife2'] = array();
-	/* halflife 2 */
-	$gamesplist['halflife2'][] = array('HL2-1', 'tcp', '27020', '27050', 'both');
-	$gamesplist['halflife2'][] = array('HL2-2', 'udp', '1200', '1200', 'both');
-	$gamesplist['halflife2'][] = array('HL2-3', 'udp', '27000', '27015', 'both');
-
-	$gamesplist['halflife'] = array();
-	/* halflife */
-	$gamesplist['halflife'][] = array('HL-1', 'tcp', '27015', '27015', 'both');
-	$gamesplist['halflife'][] = array('HL-2', 'udp', '27650', '27650', 'both');
-	$gamesplist['halflife'][] = array('HL-3', 'udp', '27666', '27666', 'both');
-
-	$gamesplist['wolfet'] = array();
-	/* wolfenstein enemy territory */
-	$gamesplist['wolfet'][] = array('WolfET-1', 'tcp', '27960', '27960', 'both');
-
-	$gamesplist['lineage2'] = array();
-	/* Lineage II */
-	$gamesplist['lineage2'][] = array('Lineage2-2009', 'tcp', '2009', '2009', 'both');
-	$gamesplist['lineage2'][] = array('Lineage2-2106', 'tcp', '2106', '2106', 'both');
-	$gamesplist['lineage2'][] = array('Lineage2-7777', 'tcp', '7777', '7777', 'both');
-
-	$gamesplist['battlenet'] = array();
-	/* Blizzard Publishing games */
-	$gamesplist['battlenet'][] = array('Battle.NET', 'tcp', '6112', '6119', 'both');
-	$gamesplist['battlenet'][] = array('Battle.NET-2', 'tcp', '1119', '1119', 'both');
-
-	$gamesplist['worldofwarcraft'] = array();
-	$gamesplist[] = array('WoW', 'tcp', '3724', '3724', 'both');
-
-	$gamesplist['battlenet'] = array();
-	/* Add battle.net only if WoW is selected and battle.net isn't */
-	$gamesplist[] = array('Battle.NET', 'tcp', '6112', '6119', 'both');
-
-	$gamesplist['gunzonline'] = array();
-	/* GunZ Online */
-	$gamesplist['gunzonline'][] = array('GunZOnline', 'udp', '7700', '7700', 'both');
-
-	$gamesplist['xbox360'] = array();
-	/* XBox360 */
-	$gamesplist['xbox360'][] = array('xbox360-1', 'udp', '88', '88', 'both');
-	$gamesplist['xbox360'][] = array('xbox360-2', 'udp', '3074', '3074', 'both');
-	$gamesplist['xbox360'][] = array('xbox360-3', 'tcp', '3074', '3074', 'both');
-
-
-	$voiplist = array();
-
-   /* asterisk server / same as vonage */
-	$voiplist['Asterisk'] = array();
-	$voiplist['Asterisk'][] = array($_POST['provider'], 'udp', '5060', '5069', 'both');
-	$voiplist['Asterisk'][] = array($_POST['provider'], 'udp', '10000', '20000', 'both');
-
-    /* VoicePulse server */	
-	$voiplist['VoicePulse'] = array();
-	$voiplist['VoicePulse'][] = array('VoicePulse', 'udp', '16384', '16482', 'both');
-	$voiplist['VoicePulse'][] = array('VoicePulse', 'udp', '4569', '4569', 'both');
-
-    /* Panasonic Hybrid PBX */
-	$voiplist['Panasonic'] = array();
-	$voiplist['Panasonic'][] = array('Panasonic1', 'udp', '8000', '8063', 'both');
-	$voiplist['Panasonic'][] = array('Panasonic2', 'udp', '9300', '9301', 'both');
-	$voiplist['Panasonic'][] = array('Panasonic3', 'udp', '2747', '2747', 'both');
-
-
-	$p2plist = array();
-	/* To add p2p clients, push Descr,Protocol,Start,End,src/dest/both onto p2plist */
-	$p2plist['aimster'] = array();
-	$p2plist['aimster'][] = array('Aimster', 'tcp', '7668', '7668', 'both');
-	$p2plist['bittorrent'] = array(); 
-	$p2plist['bittorrent'][] = array('BitTorrent', 'tcp', '6881', '6999', 'both');
-	$p2plist['bittorrent'][] = array('BitTorrent', 'udp', '6881', '6999', 'both');
-	$p2plist['buddyshare'] = array();
-	$p2plist['buddyshare'][] = array('BuddyShare', 'tcp', '7788', '7788', 'both');
-	$p2plist['cutemx'] = array();
-	$p2plist['cutemx'][] = array('CuteMX', 'tcp', '2340', '2340', 'both');
-	$p2plist['dc++'] = array();
-	$p2plist['dc++'][] = array('DC++', 'tcp', '1412', '1412', 'both');
-	$p2plist['dcc'] = array();
-	$p2plist['dcc'][] = array('dcc', 'tcp', '6666', '6668', 'both');
-	$p2plist['directconnect'] = array();
-	$p2plist['directconnect'][] = array('DirectConnect', 'tcp', '412', '412', 'both');
-	$p2plist['directfileexpress'] = array();
-	$p2plist['directfileexpress'][] = array('DirectFileExpress', 'tcp', '1044', '1045', 'both');
-	$p2plist['edonkey2000'] = array();
-	$p2plist['edonkey2000'][] = array('EDonkey2000', 'tcp', '4661', '4665', 'both');
-	$p2plist['fastTrack'] = array();
-	$p2plist['fastTrack'][] = array('FastTrack', 'tcp', '1214', '1214', 'both');
-	$p2plist['gnutella'] = array(); 
-	$p2plist['gnutella'][] = array('Gnutella-TCP', 'tcp', '6346', '6346', 'both');
-	$p2plist['gnutella'][] = array('Gnutella-UDP', 'udp', '6346', '6346', 'both');
-	$p2plist['grouper'] = array();
-	$p2plist['grouper'][] = array('grouper', 'tcp', '8038', '8039', 'both');
-	$p2plist['hotcomm'] = array();
-	$p2plist['hotcomm'][] = array('hotComm', 'tcp', '28864', '28865', 'both');
-	$p2plist['hotlineconnect'] = array();
-	$p2plist['hotlineconnect'][] = array('HotlineConnect', 'tcp', '5500', '5503', 'both');
-	$p2plist['imesh'] = array();
-	$p2plist['imesh'][] = array('iMesh', 'tcp', '4329', '4329', 'both');
-	$p2plist['napster'] = array();
-	$p2plist['napster'][] = array('Napster', 'tcp', '6699', '6701', 'both');
-	$p2plist['opennap'] = array();
-	$p2plist['opennap'][] = array('OpenNap', 'tcp', '8888', '8889', 'both');
-	$p2plist['scour'] = array();
-	$p2plist['scour'][] = array('Scour', 'tcp', '8311', '8311', 'both');
-	$p2plist['shareaza'] = array();
-	$p2plist['shareaza'][] = array('Shareaza', 'tcp', '6346', '6346', 'both');
-	$p2plist['songspy'] = array();
-	$p2plist['songspy'][] = array('SongSpy', 'tcp', '5190', '5190', 'both');
-	$p2plist['winmx'] = array();
-	$p2plist['winmx'][] = array('WinMX', 'tcp', '6699', '6699', 'both');
-
-	$othersplist = array();
-	/* Unlike other areas we are posting the queue H or L or BLANK */
-
-	$othersplist['msrdp'] = array();
-	/* MSRDP */
-	$othersplist['msrdp'][] = array('MSRDP', 'tcp', '3389', '3389', 'both');
-	$othersplist['pptp'] = array();
-	/* PPTP */
-	$othersplist['pptp'][] = array('PPTP', 'tcp', '1723', '1723', 'both');
-	$othersplist['pptp'][] = array('PPTPGRE', 'gre', '', '', 'both');
-	$othersplist['ipsec'] = array();
-	/* IPSEC */
-	$othersplist['ipsec'][] = array('IPSEC', 'udp', '500', '500', 'both');
-	$othersplist['ipsec'][] = array('IPSEC', 'ah', '', '', 'both');
-	$othersplist['ipsec'][] = array('IPSEC', 'esp', '', '', 'both');
-	$othersplist['streamingmp3'] = array();
-	/* streaming mp3 media aka shoutcast */
-	$othersplist['streamingmp3'][] = array('STREAMINGMP3', 'tcp', '8000', '8100', 'both');
-	$othersplist['irc'] = array();
-	/* internet relay chat */
-	$othersplist['irc'][] = array('IRC', 'tcp', '6667', '6670', 'both');
-	$othersplist['jabber'] = array();
-	/* jabber */
-	$othersplist['jabber'][] = array('IRC', 'tcp', '5222', '5222', 'both');
-	$othersplist['jabber'][] = array('IRC', 'tcp', '5223', '5223', 'both');
-	$othersplist['jabber'][] = array('IRC', 'tcp', '5269', '5269', 'both');
-	$othersplist['dns'] = array();
-	/* domain name system */
-	$othersplist['dns'][] = array('DNS1', 'tcp', '53', '53', 'both');
-	$othersplist['dns'][] = array('DNS2', 'udp', '53', '53', 'both');
-	$othersplist['http'] = array();
-	/* HTTP aka Web Traffic */
-	$othersplist['http'][] = array('HTTP', 'tcp', '80', '80', 'both');
-	$othersplist['http'][] = array('HTTPS', 'tcp', '443', '443', 'both');
-	$othersplist['smtp'] = array();
-	/* Secure shell traffic */
-	$othersplist['smtp'][] = array('SMTP', 'tcp', '25', '25', 'both');
-	$othersplist['pop3'] = array();
-	/* Post Office Protocol - POP3 */
-	$othersplist['pop3'][] = array('POP3', 'tcp', '110', '110', 'both');
-	$othersplist['icmp'] = array();
-	/* ICMP */
-	$othersplist['icmp'][] = array('ICMP', 'icmp', '', '', 'both');
-	$othersplist['imap'] = array();
-	/* IMAP */
-	$othersplist['imap'][] = array('IMAP', 'tcp', '143', '143', 'both');
-	$othersplist['smb'] = array();
-	/* Microsoft SMB and friends */
-	$othersplist['smb'][] = array('SMB1', 'tcp', '445', '445', 'both');
-	$othersplist['smb'][] = array('SMB2', 'tcp', '137-139', '137-139', 'both');
-	$othersplist['rtsp'] = array();
-	/* realtime streaming protocol */
-	$othersplist['rtsp'][] = array('RTSP1', 'tcp', '554', '554', 'both');
-	$othersplist['snmp'] = array();
-	/* Simple network management protocol */
-	$othersplist['snmp'][] = array('SNMP', 'tcp', '161', '161', 'both');
-	$othersplist['snmp'][] = array('SNMP2', 'udp', '161', '161', 'both');
-	$othersplist['vnc'] = array();
-	/* virtual network control */
-	$othersplist['vnc'][] = array('VNC', 'tcp', '5900', '5930', 'both');
-	$othersplist['appleremotedesktop'] = array();
-	/* apple remote desktop */
-	$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop1', 'tcp', '3283', '3283', 'both');
-	$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop2', 'tcp', '5900', '5900', 'both');
-	$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop3', 'udp', '3283', '3283', 'both');
-	$othersplist['appleremotedesktop'][] = array('AppleRemoteDesktop4', 'udp', '5900', '5900', 'both');
-	$othersplist['icq'] = array();
-	/* icq */
-	$othersplist['icq'][] = array('ICQ1', 'tcp', '5190', '5190', 'both');
-	$othersplist['icq'][] = array('ICQ2', 'udp', '5190', '5190', 'both');
-	$othersplist['lotusnotes'] = array();
-	/* lotus notes */
-	$othersplist['lotusnotes'][] = array('LotusNotes1', 'tcp', '1352', '1352', 'both');
-	$othersplist['lotusnotes'][] = array('LotusNotes2', 'udp', '1352', '1352', 'both');
-	$othersplist['aolinstantmessenger'] = array();
-	/* AIM */
-	$othersplist['aolinstantmessenger'][] = array('AIM', 'tcp', '5190', '5190', 'both');
-	$othersplist['msnmessenger'] = array();
-	/* msn messenger */
-	$othersplist['msnmessenger'][] = array('MSN1', 'tcp', '1863', '1863', 'both');
-	$othersplist['msnmessenger'][] = array('MSN2', 'tcp', '6891', '6900', 'both');
-	$othersplist['msnmessenger'][] = array('MSN3', 'tcp', '6901', '6901', 'both');
-	$othersplist['msnmessenger'][] = array('MSN4', 'udp', '6901', '6901', 'both');
-	$othersplist['mysqlserver'] = array();
-	/* mysql server */
-	$othersplist['mysqlserver'][] = array('MySQL1', 'tcp', '3306', '3306', 'both');
-	$othersplist['nntp'] = array();
-	/* nntp */
-	$othersplist['nntp'][] = array('NNTP1', 'tcp', '119', '119', 'both');
-	$othersplist['nntp'][] = array('NNTP2', 'udp', '119', '119', 'both');
-	$othersplist['pcanywhere'] = array();
-	/* symantec pc anywhere */
-	$othersplist['pcanywhere'][] = array('pcany1', 'tcp', '5631', '5631', 'both');
-	$othersplist['pcanywhere'][] = array('pcany2', 'udp', '5632', '5632', 'both');
-	$othersplist['teamspeak'] = array();
-	/* teamspeak  */
-	$othersplist['teamspeak'][] = array('teamspeak1', 'tcp', '14534', '14534', 'both');
-	$othersplist['teamspeak'][] = array('teamspeak2', 'tcp', '51234', '51234', 'both');
-	$othersplist['teamspeak'][] = array('teamspeak3', 'udp', '8767', '8768', 'both');
-	$othersplist['cvsup'] = array();
-	/* cvs  */
-	$othersplist['cvsup'][] = array('cvsup', 'tcp', '5999', '5999', 'both');
-	$othersplist['hbci'] = array();
-	/* HBCI  */
-	$othersplist['hbci'][] = array('HBCI', 'tcp', '3000', '3000', 'both');
-	$othersplist['slingbox'] = array();
-	$othersplist['slingbox'][] = array('Slingbox1', 'tcp', '5001', '5001', 'both');
-	$othersplist['slingbox'][] = array('Slingbox2', 'udp', '5001', '5001', 'both');
+	global $config, $g, $altq_list_queues, $gamesplist;
+
+	require_once("wizardapp.inc");
 
 	/* 
 	 * Wipe previous config.