Merge remote-tracking branch 'origin/next' into fifteen

config/rootfiles/oldcore/68/filelists/files

@@ -5,6 +5,7 @@ srv/web/ipfire/cgi-bin/connections.cgi
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/services.cgi
+srv/web/ipfire/cgi-bin/urlfilter.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 srv/web/ipfire/html/themes/ipfire/include/functions.pl
 srv/web/ipfire/html/themes/ipfire/include/style.css

html/cgi-bin/wirelessclient.cgi

@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2012-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2012  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -446,7 +446,7 @@ sub showEditBox() {
 			<table width='100%'>
 				<tr>
 					<td class='base' width='20%'>$Lang::tr{'wlan client ssid'}:</td>
-					<td width='40%'><input type='text' name='SSID' value=$settings{'SSID'} size='25'/></td>
+					<td width='40%'><input type='text' name='SSID' value='$settings{'SSID'}' size='25'/></td>
 					<td class='base' width='10%'>$Lang::tr{'enabled'}</td>
 					<td width='30%'><input type='checkbox' name='ENABLED' $checked{'ENABLED'} /></td>
 				</tr>
@@ -464,7 +464,7 @@ sub showEditBox() {
 				</tr>
 				<tr>
 					<td class='base' width='20%'>$Lang::tr{'wlan client psk'}:&nbsp;</td>
-					<td width='40%'><input type='password' name='PSK' value=$settings{'PSK'} size='25'/></td>
+					<td width='40%'><input type='password' name='PSK' value='$settings{'PSK'}' size='25'/></td>
 					<td colspan="2" width='40%'></td>
 				</tr>
 			</table>

lfs/GeoIP

@@ -25,7 +25,7 @@
 include Config
 
 VER        = 1.17
-DATVER     = 02072013
+DATVER     = 01102013
 
 THISAPP    = Geo-IP-PurePerl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
 
 $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
-GeoIP.dat-$(DATVER).gz_MD5 = 25d59395b43d676fcbab05e7610a7b58
+GeoIP.dat-$(DATVER).gz_MD5 = 4aecef560aa6dacfe7e59dad8a12914b
 
 install : $(TARGET)