diff --git a/README.md b/README.md
new file mode 100644
index 0000000000..489a1791f7
--- /dev/null
+++ b/README.md
@@ -0,0 +1,12 @@
+pfSense on bootstrap
+====================
+
+We are migrating pfSense to Bootstrap. You can help! Please respect these code-guidelines:
+
+* use tabs (tabstop=4) for indenting (except the license-header which contains 2 lines that are indented with '\t ')
+* limited echoing of HTML from php, please use proper templating syntax instead (eg. foreach/endforeach)
+* limited attributes on elements; *no style attributes*
+* no inline javascript
+* html attributes should be using double-quoted attribute-values. This means your php-code should use mostly single-quoted strings
+
+If you feel adventurous you can sometimes rewrite some PHP & javascript code as well; but try to keep this to a minimum.
\ No newline at end of file
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index 683d1e512e..6de76c1ee9 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -51,7 +51,7 @@ if(!$do_not_include_config_gui_inc)
// Will be changed to false if security checks fail
$security_passed = true;
-/* If this function doesn't exist, we're being called from Captive Portal or
+/* If this function doesn't exist, we're being called from Captive Portal or
another internal subsystem which does not include authgui.inc */
if (function_exists("display_error_form") && !isset($config['system']['webgui']['nodnsrebindcheck'])) {
/* DNS ReBinding attack prevention. https://redmine.pfsense.org/issues/708 */
@@ -117,8 +117,22 @@ if(function_exists("display_error_form") && !isset($config['system']['webgui']['
if($_SERVER['HTTP_REFERER'] == file_get_contents("{$g['tmp_path']}/setupwizard_lastreferrer")) {
unlink("{$g['tmp_path']}/setupwizard_lastreferrer");
header("Refresh: 1; url=index.php");
- echo "";
- echo "" . gettext("Redirecting...") . "" . gettext("Redirecting to the dashboard...") . "";
+?>
+
+
+
+
+ <?=gettext("Redirecting..."); ?>
+
+
+
+
+
+
+
+
+
+ User Manager."));
@@ -1076,7 +1090,7 @@ function ldap_backed($username, $passwd, $authcfg) {
return false;
}
-
+
/* Setup CA environment if needed. */
ldap_setup_caenv($authcfg);
@@ -1109,10 +1123,10 @@ function ldap_backed($username, $passwd, $authcfg) {
log_error(sprintf(gettext("ERROR! Could not bind to server %s."), $ldapname));
return false;
}
-
+
/* Get LDAP Authcontainers and split em up. */
$ldac_splits = explode(";", $ldapauthcont);
-
+
/* setup the usercount so we think we havn't found anyone yet */
$usercount = 0;
@@ -1160,7 +1174,7 @@ function ldap_backed($username, $passwd, $authcfg) {
if ($usercount != 1){
@ldap_unbind($ldap);
log_error(gettext("ERROR! Either LDAP search failed, or multiple users were found."));
- return false;
+ return false;
}
/* Now lets bind as the user we found */
@@ -1241,7 +1255,7 @@ function radius_backed($username, $passwd, $authcfg, &$attributes = array()) {
function get_user_expiration_date($username) {
$user = getUserEntry($username);
- if ($user['expires'])
+ if ($user['expires'])
return $user['expires'];
}
@@ -1368,7 +1382,7 @@ function session_auth() {
/* Validate incoming login request */
if (isset($_POST['login']) && !empty($_POST['usernamefld']) && !empty($_POST['passwordfld'])) {
$authcfg = auth_get_authserver($config['system']['webgui']['authmode']);
- if (authenticate_user($_POST['usernamefld'], $_POST['passwordfld'], $authcfg) ||
+ if (authenticate_user($_POST['usernamefld'], $_POST['passwordfld'], $authcfg) ||
authenticate_user($_POST['usernamefld'], $_POST['passwordfld'])) {
// Generate a new id to avoid session fixation
session_regenerate_id();
@@ -1409,7 +1423,7 @@ function session_auth() {
$_GET['logout'] = true;
$_SESSION['Logout'] = true;
} else
- $_SESSION['last_access'] = time();
+ $_SESSION['last_access'] = time();
} else if (intval($config['system']['webgui']['session_timeout']) == 0) {
/* only update if it wasn't ajax */
if (!isAjax())
diff --git a/etc/inc/authgui.inc b/etc/inc/authgui.inc
index e9dc8ad42d..61dcd42d79 100644
--- a/etc/inc/authgui.inc
+++ b/etc/inc/authgui.inc
@@ -75,7 +75,7 @@ if (!isAllowedPage($_SERVER['REQUEST_URI'])) {
display_error_form("201", gettext("No page assigned to this user! Click here to logout."));
exit;
}
-} else
+} else
$_SESSION['Post_Login'] = true;
/*
@@ -89,7 +89,7 @@ if (!$_SESSION['Post_Login']) {
exit;
}
-/*
+/*
* Close session data to allow other scripts from same host to come in.
* A session can be reactivated from calling session_start again
*/
@@ -107,49 +107,21 @@ function display_error_form($http_code, $desc) {
}
?>
-
-
-
-
-
-
- <?=$http_code?>
-
-
-
-
-
-
-
-
-
-
-
-
- If you did not setup this forwarding, you may be the target of a man-in-the-middle attack."));
- }
- $loginautocomplete = isset($config['system']['webgui']['loginautocomplete']) ? '' : 'autocomplete="off"';
- ?>
-
+ $loginautocomplete = isset($config['system']['webgui']['loginautocomplete']) ? '' : 'autocomplete="off"';
+ ?>
+
+
-
+
+
+?>
\ No newline at end of file
diff --git a/etc/inc/functions.inc b/etc/inc/functions.inc
index a89aeff4a4..d40be18593 100644
--- a/etc/inc/functions.inc
+++ b/etc/inc/functions.inc
@@ -57,7 +57,7 @@ if(!function_exists("pfSenseHeader")) {
$protocol = "https";
else
$protocol = "http";
-
+
$port = ":{$_SERVER['SERVER_PORT']}";
if ($_SERVER['SERVER_PORT'] == "80" && $protocol == "http")
$port = "";
@@ -72,60 +72,6 @@ if(!function_exists("pfSenseHeader")) {
}
/* END compatibility goo with HEAD */
-/*fetch menu notices function*/
-if(!function_exists("get_menu_messages")) {
- function get_menu_messages(){
- global $g,$config;
- if (are_notices_pending()) {
- $notices = get_notices();
- $requests=array();
-
- ## Get Query Arguments from URL ###
- foreach ($_REQUEST as $key => $value) {
- if ($key != "PHPSESSID")
- $requests[] = $key.'='.$value;
- }
- if(is_array($requests))
- $request_string = implode("&", $requests);
-
- if(is_array($notices)) {
- $notice_msgs = "