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

2012-02-14 Sancho Lerena <slerena@artica.es> 

* include/config_process.php: updated build & version.

	* operation/search_agents.php: Fixed bug: icon to manage agent

	* operation/search_results.php: Fixed bug: search with blank spaces,
	again another HTML entity problem :(



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5588 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2012-02-14 11:11:38 +00:00
parent 61ab4cafa4
commit 9f287deea8
4 changed files with 19 additions and 7 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 @@
2012-02-14 Sancho Lerena <slerena@artica.es>
* include/config_process.php: updated build & version.
* operation/search_agents.php: Fixed bug: icon to manage agent
* operation/search_results.php: Fixed bug: search with blank spaces,
again another HTML entity problem :(
2012-02-14 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_api.php: Added get_all_alert_templates

4
pandora_console/include/config_process.php
View File

@ -22,8 +22,8 @@
/**
* Pandora build version and version
*/
$build_version = 'PC120202';
$pandora_version = 'v4.0.1';
$build_version = 'PC120214';
$pandora_version = 'v5.0-dev';
date_default_timezone_set("Europe/Berlin");

3
pandora_console/operation/search_agents.php
View File

@ -2,7 +2,7 @@
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
// Copyright (c) 2005-2012 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
@ -277,6 +277,7 @@ else {
$time_style = '<b><span style="color: #ff0000">'.$time.'</span></b>';
$manage_agent = '';
if (check_acl ($config['id_user'], $agent['id_grupo'], "AW")) {
$manage_agent = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='. $agent["id_agente"] . '">' .
html_print_image("images/setup.png", true, array("title" => __('Manage'), "alt" => __('Manage'))) . '</a>';

10
pandora_console/operation/search_results.php
View File

@ -24,11 +24,13 @@ $searchAgents = $searchAlerts = $searchModules = check_acl($config['id_user'], 0
$searchUsers = check_acl($config['id_user'], 0, "UM");
$searchMaps = $searchReports = $searchGraphs = check_acl($config["id_user"], 0, "IR");
$arrayKeywords = explode(' ', $config['search_keywords']);
$arrayKeywords = explode('&#x20;', $config['search_keywords']);
$temp = array();
foreach ($arrayKeywords as $keyword)
array_push($temp, "%" . io_safe_input($keyword) . "%");
$stringSearchSQL = implode(" ",$temp);
foreach ($arrayKeywords as $keyword){
// Remember, $keyword is already pass a safeinput filter.
array_push($temp, "%" . $keyword . "%");
}
$stringSearchSQL = implode("&#x20;",$temp);
if ($config['search_category'] == "all")
$searchTab = "agents";