tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

2011-03-22 Raul Mateos <raulofpandora@gmail.com>

Browse Source 
* extensions/resource_registration.php,
	extensions/resource_exporation.php, extensions/agent_modules.php:
	Cleaned code and updated page disclaimers.

	* include/functions_reporting.php: Removed SVN errors in code.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4119 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2011-03-22 21:41:52 +00:00
parent c46f12da72
commit cece9d121c
5 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2011-03-22 Raul Mateos <raulofpandora@gmail.com>
* extensions/resource_registration.php,
extensions/resource_exporation.php, extensions/agent_modules.php:
Cleaned code and updated page disclaimers.
* include/functions_reporting.php: Removed SVN errors in code.
2011-03-22 Miguel de Dios <miguel.dedios@artica.es> 2011-03-22 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php: fixed the update "collection_max_size" * include/functions_config.php: fixed the update "collection_max_size"

8
pandora_console/extensions/resource_exportation.php
View File

@ -2,11 +2,13 @@
// Pandora FMS - http://pandorafms.com // Pandora FMS - http://pandorafms.com
// ================================================== // ==================================================
// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU Lesser General Public License
// as published by the Free Software Foundation for version 2. // as published by the Free Software Foundation; version 2
// This program is distributed in the hope that it will be useful, // This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

8
pandora_console/extensions/resource_registration.php
View File

@ -2,11 +2,13 @@
// Pandora FMS - http://pandorafms.com // Pandora FMS - http://pandorafms.com
// ================================================== // ==================================================
// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License // modify it under the terms of the GNU Lesser General Public License
// as published by the Free Software Foundation for version 2. // as published by the Free Software Foundation; version 2
// This program is distributed in the hope that it will be useful, // This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

10
pandora_console/include/functions_reporting.php
View File

@ -1828,12 +1828,9 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
array_push ($table->data, $data); array_push ($table->data, $data);
// Put description at the end of the module (if exists) // Put description at the end of the module (if exists)
<<<<<<< .mine
if ($content["description"] != "") {
=======
$table->colspan[2][0] = 3; $table->colspan[2][0] = 3;
if ($content["description"] != ""){ if ($content["description"] != ""){
>>>>>>> .r4112
$data_desc = array(); $data_desc = array();
$data_desc[0] = $content["description"]; $data_desc[0] = $content["description"];
array_push ($table->data, $data_desc); array_push ($table->data, $data_desc);
@ -1870,12 +1867,9 @@ function render_report_html_item ($content, $table, $report, $mini = false) {
$n = array_push ($table->data, $data); $n = array_push ($table->data, $data);
// Put description at the end of the module (if exists) // Put description at the end of the module (if exists)
<<<<<<< .mine
if ($content["description"] != "") {
=======
$table->colspan[1][0] = 3; $table->colspan[1][0] = 3;
if ($content["description"] != ""){ if ($content["description"] != ""){
>>>>>>> .r4112
$data_desc = array(); $data_desc = array();
$data_desc[0] = $content["description"]; $data_desc[0] = $content["description"];
array_push ($table->data, $data_desc); array_push ($table->data, $data_desc);