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

2011-11-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_config.php: Login hash pass can be left blank.
	
	Fixes: #3410190



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5221 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-11-30 16:58:46 +00:00
parent a59bdce0ad
commit 8d883f2e79
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2011-11-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_config.php: Login hash pass can be left blank.
Fixes: #3410190
2011-11-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2011-11-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/massive/massive_operations.php: Cleaned code. * godmode/massive/massive_operations.php: Cleaned code.

12
pandora_console/include/functions_config.php
View File

@ -153,7 +153,15 @@ function config_update_config () {
config_update_value ('prominent_time', (string) get_parameter ('prominent_time', $config["prominent_time"])); config_update_value ('prominent_time', (string) get_parameter ('prominent_time', $config["prominent_time"]));
config_update_value ('timesource', (string) get_parameter ('timesource', $config["timesource"])); config_update_value ('timesource', (string) get_parameter ('timesource', $config["timesource"]));
config_update_value ('event_view_hr', (int) get_parameter ('event_view_hr', $config["event_view_hr"])); config_update_value ('event_view_hr', (int) get_parameter ('event_view_hr', $config["event_view_hr"]));
config_update_value ('loginhash_pwd', (string) get_parameter ('loginhash_pwd', $config["loginhash_pwd"])); if (isset($_POST['loginhash_pwd'])){
// Reinitialization of login hash pass
if (empty($_POST['loginhash_pwd'])){
config_update_value ('loginhash_pwd', $_POST['loginhash_pwd']);
}
else{
config_update_value ('loginhash_pwd', (string) get_parameter ('loginhash_pwd', $config["loginhash_pwd"]));
}
}
config_update_value ('https', (bool) get_parameter ('https', $config["https"])); config_update_value ('https', (bool) get_parameter ('https', $config["https"]));
config_update_value ('compact_header', (bool) get_parameter ('compact_header', $config["compact_header"])); config_update_value ('compact_header', (bool) get_parameter ('compact_header', $config["compact_header"]));
config_update_value ('fontpath', (string) get_parameter ('fontpath', $config["fontpath"])); config_update_value ('fontpath', (string) get_parameter ('fontpath', $config["fontpath"]));
@ -251,7 +259,7 @@ function config_update_config () {
*/ */
function config_process_config () { function config_process_config () {
global $config; global $config;
$configs = db_get_all_rows_in_table ('tconfig'); $configs = db_get_all_rows_in_table ('tconfig');
if (empty ($configs)) { if (empty ($configs)) {