diff options
author | Erik Fonnesbeck <efonnes@gmail.com> | 2010-08-12 15:47:45 -0600 |
---|---|---|
committer | Erik Fonnesbeck <efonnes@gmail.com> | 2010-08-12 15:51:13 -0600 |
commit | 0153a0b81968512ee1998a741b5ea37f49161d79 (patch) | |
tree | ce2840bdb3e1fdc174159fe2c3a7111b6b4e046b | |
parent | c0948c6c129f8ce6386545ef80147007bf96e8c9 (diff) | |
parent | a62ad19344a608b37efc403e075b58f1620c082a (diff) | |
download | pfsense-0153a0b81968512ee1998a741b5ea37f49161d79.zip pfsense-0153a0b81968512ee1998a741b5ea37f49161d79.tar.gz |
Merge branch 'master' from http://gitweb.pfsense.org/pfsense/pfsense-gettext.git
-rwxr-xr-x | etc/rc.bootup | 4 | ||||
-rw-r--r-- | usr/local/www/pkg_mgr_settings.php | 2 | ||||
-rwxr-xr-x | usr/local/www/vpn_ipsec.php | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/etc/rc.bootup b/etc/rc.bootup index 6d4c3a5..0cd201a 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -107,9 +107,9 @@ require_once("/etc/inc/auth.inc"); echo "."; require_once("/etc/inc/functions.inc"); echo "."; -require("/etc/inc/filter.inc"); +require_once("/etc/inc/filter.inc"); echo "."; -require("/etc/inc/shaper.inc"); +require_once("/etc/inc/shaper.inc"); echo "."; require_once("/etc/inc/ipsec.inc"); echo "."; diff --git a/usr/local/www/pkg_mgr_settings.php b/usr/local/www/pkg_mgr_settings.php index c3d0ce5..27c19da 100644 --- a/usr/local/www/pkg_mgr_settings.php +++ b/usr/local/www/pkg_mgr_settings.php @@ -109,7 +109,7 @@ function enable_altpkgrepourl(enable_over) { <tr><td><?=gettext("Base URL:");?></td><td><input name="pkgrepourl" type="input" class="formfld url" id="pkgrepourl" size="64" value="<?php if($curcfg['xmlrpcbaseurl']) echo $curcfg['xmlrpcbaseurl']; else echo $g['']; ?>"></td></tr> </table> <span class="vexpl"> - <?=printf(gettext("This is where %s will check for packages when the"),$g['product_name']);?>, <a href="pkg_mgr.php"><?=gettext("System: Packages");?></a> <?=gettext("page is viewed");?>. + <?php printf(gettext("This is where %s will check for packages when the"),$g['product_name']);?>, <a href="pkg_mgr.php"><?=gettext("System: Packages");?></a> <?=gettext("page is viewed.");?> </span> </td> </tr> diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php index 9f2e97e..ee3e13c 100755 --- a/usr/local/www/vpn_ipsec.php +++ b/usr/local/www/vpn_ipsec.php @@ -74,8 +74,9 @@ if ($_POST) { $config['ipsec']['enable'] = $_POST['enable'] ? true : false; - $retval = vpn_ipsec_configure(); write_config(); + + $retval = vpn_ipsec_configure(); } } |