tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-12-07 Junichi Satoh <junichi@rworks.jp> 

* index.php: Fixed undefined function error in case of login
	failures without enterprise.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7236 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2012-12-07 06:36:22 +00:00
parent a495c5e7b1
commit 0a816a4376
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-12-07 Junichi Satoh <junichi@rworks.jp>
* index.php: Fixed undefined function error in case of login
failures without enterprise.
2012-12-06 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_agents.php, include/functions_html.php,

8
pandora_console/index.php
View File

@ -21,7 +21,7 @@ if (function_exists ('mb_internal_encoding')) {
// Set to 1 to do not check for installer or config file (for development!).
// Activate gives more error information, not useful for production sites
$develop_bypass = 0;
$develop_bypass = 1;
if ($develop_bypass != 1) {
// If no config file, automatically try to install
@ -289,12 +289,14 @@ elseif (! isset ($config['id_user']) && isset ($_GET["login"])) {
else { //login wrong
$blocked = false;
if (!is_user_admin($nick) || $config['enable_pass_policy_admin']) {
if ((!is_user_admin($nick) || $config['enable_pass_policy_admin']) && defined('PANDORA_ENTERPRISE')) {
$blocked = login_check_blocked($nick);
}
if (!$blocked) {
login_check_failed($nick); //Checks failed attempts
if (defined('PANDORA_ENTERPRISE')) {
login_check_failed($nick); //Checks failed attempts
}
$login_failed = true;
require_once ('general/login_page.php');
db_pandora_audit("Logon Failed", "Invalid login: ".$nick, $nick);