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

2009-01-22 Evi Vanoost <vanooste@rcbi.rochester.edu> 

* include/auth/ldap.php: Finally fixed (hopefully) the last major bug
	
	* godmode/extensions.php: Fixed something that prevented links from 
	generating
	
	* extensions/update_manager/lib/libupdate_manager.php: Fixed proxy not
	being filled in and giving error messages. Now the thing works.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1392 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
guruevi 2009-01-22 18:56:31 +00:00
parent de4a9dd6c8
commit 30f8018f84
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2009-01-22 Evi Vanoost <vanooste@rcbi.rochester.edu>
* include/auth/ldap.php: Finally fixed (hopefully) the last major bug
* godmode/extensions.php: Fixed something that prevented links from
generating
* extensions/update_manager/lib/libupdate_manager.php: Fixed proxy not
being filled in and giving error messages. Now the thing works.
2009-01-22 Evi Vanoost <vanooste@rcbi.rochester.edu>
* include/auth/mysql.php, include/auth/ldap.php,

4
pandora_console/extensions/update_manager/lib/libupdate_manager.php
View File

@ -37,6 +37,10 @@ function um_db_load_settings () {
return NULL;
}
$settings = new stdClass ();
$settings->proxy = '';
$settings->proxy_port = '';
$settings->proxy_user = '';
$settings->proxy_pass = '';
while ($result->fetchInto ($setting)) {
$key = $setting->key;
$settings->$key = $setting->value;

3
pandora_console/godmode/extensions.php
View File

@ -39,8 +39,9 @@ $table->data = array ();
foreach ($config['extensions'] as $extension) {
if ($extension['godmode_function'] == '')
continue;
$data = array ();
$data[0] = '<a href="index.php?sec=gextensions&sec2='.$menu['sec2'].'" class="mn">'.$menu['name'];
$data[0] = '<a href="index.php?sec=gextensions&sec2='.$extension['godmode_menu']['sec2'].'" class="mn">'.$extension['godmode_menu']['name'].'</a>';
array_push ($table->data, $data);
}

5
pandora_console/include/auth/ldap.php
View File

@ -20,12 +20,11 @@ if (!isset ($config)) {
die ('You cannot access this file directly!');
}
//TODO: Make the following 5 valid throughout Pandora FMS
$config["user_can_update_info"] = false;
$config["user_can_update_password"] = false;
$config["admin_can_add_user"] = false;
$config["admin_can_delete_user"] = false;
$config["admin_can_disable_user"] = false;
$config["admin_can_disable_user"] = false; //Not implemented
$config["admin_can_make_admin"] = false;
//Required and optional keys for this function to work
@ -46,7 +45,7 @@ function process_user_login ($login, $pass) {
}
global $config;
$profile = get_db_value ("id_user", "tusuario_perfil", "id_user", $login);
$profile = get_db_value ("id_usuario", "tusuario_perfil", "id_usuario", $login);
if ($profile === false && empty ($config["auth"]["create_user_undefined"])) {
$config["auth_error"] = "No profile"; //Error message, don't translate