Merged changes from stable branch up to 2.3.12

[fa-stable.git] / config.default.php

diff --git a/config.default.php b/config.default.php
index 5cd7fe20e010ba0807dda80c2d165990e60713d4..a932d258b149060ce871d21628f0176dd7b6d320 100644 (file)
--- a/config.default.php
+++ b/config.default.php
@@ -244,4 +244,23 @@ if (!defined('ICON_EDIT'))
        define("ICON_CLOSED", "closed.png");
 }
 
-?>
\ No newline at end of file
+/* 
+       Display a dropdown select box for choosing Company to login if false.
+       Show a blank editbox only if true where the Company NickName
+       will have to be manually entered. This is when privacy is needed.
+*/
+$text_company_selection  = false;
+
+/*  Should FA hide menu items (Applications, Modules, and Actions) from the user if they don't have access to them? 
+    0 for no       1 for yes
+*/
+
+       $hide_inaccessible_menu_items = 0;
+
+/*
+       Brute force prevention.
+       $login_delay seconds delay is required between login attempts after $login_max_attemps failed logins.
+       Set $login_delay to 0 to disable the feature (not recommended)
+*/
+$login_delay = 30;
+$login_max_attempts = 10;