From 2ce660ad4d8195b250c738634f90bb9682c07c13 Mon Sep 17 00:00:00 2001 From: smos Date: Fri, 20 Jan 2012 12:16:46 +0100 Subject: Unbreak a number of explode() replacements which required preg_split() --- usr/local/www/firewall_virtual_ip_edit.php | 2 +- usr/local/www/widgets/widgets/picture.widget.php | 2 +- usr/local/www/wizards/setup_wizard.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php index a354475..a3fc7a2 100755 --- a/usr/local/www/firewall_virtual_ip_edit.php +++ b/usr/local/www/firewall_virtual_ip_edit.php @@ -64,7 +64,7 @@ else $id = $_GET['id']; function return_first_two_octets($ip) { - $ip_split = explode("\.", $ip); + $ip_split = explode(".", $ip); return $ip_split[0] . "." . $ip_split[1]; } diff --git a/usr/local/www/widgets/widgets/picture.widget.php b/usr/local/www/widgets/widgets/picture.widget.php index 0c47875..27b9df2 100644 --- a/usr/local/www/widgets/widgets/picture.widget.php +++ b/usr/local/www/widgets/widgets/picture.widget.php @@ -33,7 +33,7 @@ require_once("pfsense-utils.inc"); require_once("functions.inc"); if($_GET['getpic']=="true") { - $pic_type_s = explode("\.", $config['widgets']['picturewidget_filename']); + $pic_type_s = explode(".", $config['widgets']['picturewidget_filename']); $pic_type = $pic_type_s[1]; if($config['widgets']['picturewidget']) $data = base64_decode($config['widgets']['picturewidget']); diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml index cb6b334..70b54f6 100644 --- a/usr/local/www/wizards/setup_wizard.xml +++ b/usr/local/www/wizards/setup_wizard.xml @@ -502,11 +502,11 @@ print_info_box_np("Invalid LAN IP Address. Please press back in your browser window and correct."); die; } - $ft = explode("\.", $_POST['lanipaddress']); + $ft = explode(".", $_POST['lanipaddress']); $ft_ip = $ft[0] . "." . $ft[1] . "." . $ft[2] . "."; $config['dhcpd']['lan']['range']['from'] = $ft_ip . "10"; $highestip = gen_subnet_max($_POST['lanipaddress'], $config['interfaces']['lan']['subnet']); - $hi = explode("\.", $highestip); + $hi = explode(".", $highestip); $highestip = $hi[3]-10; $config['dhcpd']['lan']['range']['to'] = $ft_ip . $highestip; ]]> -- cgit v1.1