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

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

* include/functions_modules.php: fixed in function
	"modules_update_agent_module" the check disabled value.
	
	Fixes: #3606060
	
	* general/login_page.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7720 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-26 15:36:37 +00:00
parent dfaf25215c
commit 8de21e7586
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2013-02-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_modules.php: fixed in function
"modules_update_agent_module" the check disabled value.
Fixes: #3606060
* general/login_page.php: cleaned source code style.
2013-02-25 Ramon Novoa <rnovoa@artica.es>
* godmode/groups/configure_group.php: Fixed the name of the group

2
pandora_console/general/login_page.php
View File

@ -42,7 +42,7 @@ if (defined ('PANDORA_ENTERPRISE')) {
html_print_image ("images/pandora_login_enterprise.png", false, array ("alt" => "logo", "border" => 0));
}
else {
html_print_image ("images/pandora_login.png", false, array ("alt" => "logo", "border" => 0));
html_print_image ("images/pandora_login.png", false, array ("alt" => "logo", "border" => 0));
}
echo '</a>';

12
pandora_console/include/functions_modules.php
View File

@ -293,7 +293,7 @@ function modules_update_agent_module ($id, $values, $onlyNoDeletePending = false
$return_tag = tags_update_module_tag ($id, $tags);
}
if ($return_tag === false){
if ($return_tag === false) {
return ERR_DB;
}
@ -304,8 +304,12 @@ function modules_update_agent_module ($id, $values, $onlyNoDeletePending = false
}
// Disable action requires a special function
if(isset($values['disabled'])) {
$result_disable = modules_change_disabled($id, $values['disabled']);
if (isset($values['disabled'])) {
$result_disable = NOERR;
if ($values['disabled'])
$result_disable = modules_change_disabled($id,
$values['disabled']);
unset($values['disabled']);
}
else {
@ -314,7 +318,7 @@ function modules_update_agent_module ($id, $values, $onlyNoDeletePending = false
$result = @db_process_sql_update ('tagente_modulo', $values, $where);
if($result === false || $result_disable === ERR_GENERIC) {
if (($result === false) || ($result_disable === ERR_GENERIC)) {
return ERR_DB;
}
else {