aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rwxr-xr-xconfig/openvpn-client-export/openvpn-client-export.inc4
-rwxr-xr-xconfig/openvpn-client-export/vpn_openvpn_export.php10
-rw-r--r--config/sudo/sudo.inc12
-rw-r--r--config/sudo/sudo.xml2
4 files changed, 14 insertions, 14 deletions
diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc
index 71a54814..963a2604 100755
--- a/config/openvpn-client-export/openvpn-client-export.inc
+++ b/config/openvpn-client-export/openvpn-client-export.inc
@@ -40,8 +40,8 @@ require_once("util.inc");
require_once("pfsense-utils.inc");
global $current_openvpn_version, $current_openvpn_version_rev;
-$current_openvpn_version = "2.3.6";
-$current_openvpn_version_rev = "03";
+$current_openvpn_version = "2.3.8";
+$current_openvpn_version_rev = "01";
function openvpn_client_export_install() {
global $current_openvpn_version;
diff --git a/config/openvpn-client-export/vpn_openvpn_export.php b/config/openvpn-client-export/vpn_openvpn_export.php
index 1618c45d..246e7421 100755
--- a/config/openvpn-client-export/vpn_openvpn_export.php
+++ b/config/openvpn-client-export/vpn_openvpn_export.php
@@ -485,7 +485,7 @@ function server_changed() {
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-win6\"," + i + ", -1)'>x86-win6<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-win6\"," + i + ", -1)'>x64-win6<\/a>";
- cell2.innerHTML += "<br\/>- Mac OSX:<br\/>";
+ cell2.innerHTML += "<br\/>- Mac OS X:<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"visc\"," + i + ", -1)'>Viscosity Bundle<\/a>";
}
@@ -524,7 +524,7 @@ function server_changed() {
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-win6\", -1," + j + ")'>x86-win6<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-win6\", -1," + j + ")'>x64-win6<\/a>";
- cell2.innerHTML += "<br\/>- Mac OSX:<br\/>";
+ cell2.innerHTML += "<br\/>- Mac OS X:<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"visc\", -1," + j + ")'>Viscosity Bundle<\/a>";
if (servers[index][2] == "server_tls") {
@@ -570,7 +570,7 @@ function server_changed() {
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-win6\"," + i + ")'>x86-win6<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-win6\"," + i + ")'>x64-win6<\/a>";
- cell2.innerHTML += "<br\/>- Mac OSX:<br\/>";
+ cell2.innerHTML += "<br\/>- Mac OS X:<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"visc\"," + i + ")'>Viscosity Bundle<\/a>";
}
@@ -939,8 +939,8 @@ function useproxy_changed(obj) {
<br/><a href="https://play.google.com/store/apps/details?id=de.blinkt.openvpn"><?= gettext("OpenVPN For Android") ?></a> - <?=gettext("Recommended client for Android")?>
<br/><a href="http://www.featvpn.com/"><?= gettext("FEAT VPN For Android") ?></a> - <?=gettext("For older versions of Android")?>
<br/><?= gettext("OpenVPN Connect") ?>: <a href="https://play.google.com/store/apps/details?id=net.openvpn.openvpn"><?=gettext("Android (Google Play)")?></a> or <a href="https://itunes.apple.com/us/app/openvpn-connect/id590379981"><?=gettext("iOS (App Store)")?></a> - <?= gettext("Recommended client for iOS") ?>
- <br/><a href="http://www.sparklabs.com/viscosity/"><?= gettext("Viscosity") ?></a> - <?= gettext("Recommended client for Mac OSX") ?>
- <br/><a href="http://code.google.com/p/tunnelblick/"><?= gettext("Tunnelblick") ?></a> - <?= gettext("Free client for OSX") ?>
+ <br/><a href="https://www.sparklabs.com/viscosity/"><?= gettext("Viscosity") ?></a> - <?= gettext("Recommended client for Mac OS X") ?>
+ <br/><a href="https://tunnelblick.net"><?= gettext("Tunnelblick") ?></a> - <?= gettext("Free client for OS X") ?>
</td>
</tr>
</table>
diff --git a/config/sudo/sudo.inc b/config/sudo/sudo.inc
index ed0feb9c..ccbda309 100644
--- a/config/sudo/sudo.inc
+++ b/config/sudo/sudo.inc
@@ -30,7 +30,7 @@
require_once("config.inc");
global $pfs_version;
-$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+$pfs_version = substr(trim(file_get_contents("/etc/version")), 0, 3);
switch ($pfs_version) {
case "2.1":
/* Hackish way to detect if someone manually did pkg_add rather than use pbi. */
@@ -38,7 +38,7 @@ switch ($pfs_version) {
define('SUDO_BASE', '/usr/pbi/sudo-' . php_uname("m"));
define('SUDO_LIBEXEC_DIR', '/usr/local/libexec/');
} else {
- define('SUDO_BASE','/usr/local');
+ define('SUDO_BASE', '/usr/local');
define('SUDO_LIBEXEC_DIR', '/usr/local/libexec/sudo');
}
break;
@@ -66,17 +66,17 @@ function sudo_install() {
if (!is_array($config['installedpackages']['sudo']['config'][0]['row'])) {
$config['installedpackages']['sudo']['config'][0]['row'] = array(
0 => array(
- "username" => "user:root",
+ "username" => "user:root",
"runas" => "user:root",
"cmdlist" => "ALL"
),
1 => array(
- "username" => "user:admin",
+ "username" => "user:admin",
"runas" => "user:root",
"cmdlist" => "ALL"
),
2 => array(
- "username" => "group:admins",
+ "username" => "group:admins",
"runas" => "user:root",
"cmdlist" => "ALL"
)
@@ -196,7 +196,7 @@ This also forces the user to give full paths to executables, which they should b
*/
function sudo_validate_commands(&$input_errors) {
$idx = 0;
- while(isset($_POST["cmdlist{$idx}"])) {
+ while (isset($_POST["cmdlist{$idx}"])) {
$commands = $_POST["cmdlist" . $idx++];
if (strtoupper($commands) == "ALL") {
continue;
diff --git a/config/sudo/sudo.xml b/config/sudo/sudo.xml
index e9b4dcbb..6124a641 100644
--- a/config/sudo/sudo.xml
+++ b/config/sudo/sudo.xml
@@ -42,7 +42,7 @@
<description>Sudo Command Control</description>
<requirements>None</requirements>
<name>sudo</name>
- <version>0.2.6</version>
+ <version>0.2.7</version>
<title>Sudo - Shell Command Privilege Delegation Utility</title>
<include_file>/usr/local/pkg/sudo.inc</include_file>
<menu>