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

2013-02-26 Miguel de Dios <miguel.dedios@artica.es> 

* general/login_page.php, include/javascript/jquery.pandora.js,
	include/constants.php, index.php: fixed the dialog for the password
	policies. And added constants.
	
	Fixes: #3605970




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7723 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-26 16:31:40 +00:00
parent b85a0b375a
commit 222088cbbc
5 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-02-26 Miguel de Dios <miguel.dedios@artica.es>
* general/login_page.php, include/javascript/jquery.pandora.js,
include/constants.php, index.php: fixed the dialog for the password
policies. And added constants.
Fixes: #3605970
2013-02-26 Ramon Novoa <rnovoa@artica.es> 2013-02-26 Ramon Novoa <rnovoa@artica.es>
* godmode/agentes/module_manager_editor_network.php: Always enable de * godmode/agentes/module_manager_editor_network.php: Always enable de
@ -20,7 +28,7 @@
include/functions_reporting.php: Improve the include/functions_reporting.php: Improve the
main page graphs and layout main page graphs and layout
2013-02-25 Miguel de Dios <miguel.dedios@artica.es> 2013-02-26 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_modules.php: fixed in function * include/functions_modules.php: fixed in function
"modules_update_agent_module" the check disabled value. "modules_update_agent_module" the check disabled value.

2
pandora_console/general/login_page.php
View File

@ -244,6 +244,6 @@ ui_require_jquery_file('jquery-ui-1.10.0.custom');
}); });
}); });
document.getElementById('nick').focus(); $('#nick').focus();
/* ]]> */ /* ]]> */
</script> </script>

5
pandora_console/include/constants.php
View File

@ -233,4 +233,9 @@ define ('MODULE_WEB', 7);
/* SNMP CONSTANTS */ /* SNMP CONSTANTS */
define ('SNMP_DIR_MIBS', "attachment/mibs"); define ('SNMP_DIR_MIBS', "attachment/mibs");
/* PASSWORD POLICIES */
define('PASSSWORD_POLICIES_OK', 0);
define('PASSSWORD_POLICIES_FIRST_CHANGE', 1);
define('PASSSWORD_POLICIES_EXPIRED', 2);
?> ?>

17
pandora_console/include/javascript/jquery.pandora.js
View File

@ -47,7 +47,6 @@ $(document).ready (function () {
opacity: 0.5, opacity: 0.5,
background: "black" background: "black"
}, },
bgiframe: jQuery.browser.msie,
width: 700, width: 700,
height: 300 height: 300
}) })
@ -96,8 +95,7 @@ $(document).ready (function () {
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,
background: "black" background: "black"
}, }
bgiframe: jQuery.browser.msie
}); });
$("#submit-hide-license-error-msg").click (function () { $("#submit-hide-license-error-msg").click (function () {
@ -123,13 +121,12 @@ $(document).ready (function () {
.dialog ({ .dialog ({
title: $("a#dialog_license_info").attr ("title"), title: $("a#dialog_license_info").attr ("title"),
resizable: false, resizable: false,
draggable: true, draggable: true,
modal: true, modal: true,
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,
background: "black" background: "black"
}, },
bgiframe: jQuery.browser.msie,
width: 500, width: 500,
height: 190 height: 190
}) })
@ -151,14 +148,13 @@ $(document).ready (function () {
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,
background: "black" background: "black"
}, }
bgiframe: jQuery.browser.msie
}); });
} }
if ($('#login_blocked').length) { if ($('#login_blocked').length) {
$( "#login_blocked" ).dialog({ $( "#login_blocked" ).dialog({
resizable: true, resizable: true,
draggable: true, draggable: true,
@ -168,10 +164,9 @@ $(document).ready (function () {
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,
background: "black" background: "black"
}, }
bgiframe: jQuery.browser.msie
}); });
} }
// Forced title code // Forced title code

4
pandora_console/index.php
View File

@ -211,8 +211,8 @@ elseif (! isset ($config['id_user']) && isset ($_GET["login"])) {
$check_status = check_pass_status($nick, $pass); $check_status = check_pass_status($nick, $pass);
switch ($check_status) { switch ($check_status) {
case 1: //first change case PASSSWORD_POLICIES_FIRST_CHANGE: //first change
case 2: //pass expired case PASSSWORD_POLICIES_EXPIRED: //pass expired
$expired_pass = true; $expired_pass = true;
login_change_password($nick); login_change_password($nick);
break; break;