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

2010-05-06 Miguel de Dios <miguel.dedios@artica.es> 

* include/config.inc.php: fixed the operation require when the php file to
	call config.php have a file with same name of "config_process.php" ...in
	rare cases.
	
	* include/config_process.php: fixed the operation require when the php file
	to call config.php have a file with same name of "functions.php",
	"functions_db.php", "functions_config.php" ...in rare cases. 
	
	* include/functions.php, include/functions_config.php: cleaned the source
	code.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2672 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2010-05-06 12:48:31 +00:00
parent 55695ac6b7
commit 19ffa76f46
5 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/ChangeLog
View File

@ -1,3 +1,16 @@
2010-05-06 Miguel de Dios <miguel.dedios@artica.es>
* include/config.inc.php: fixed the operation require when the php file to
call config.php have a file with same name of "config_process.php" ...in
rare cases.
* include/config_process.php: fixed the operation require when the php file
to call config.php have a file with same name of "functions.php",
"functions_db.php", "functions_config.php" ...in rare cases.
* include/functions.php, include/functions_config.php: cleaned the source
code.
2010-05-05 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/map_builder.php: added the height and width to save in

3
pandora_console/include/config.inc.php
View File

@ -113,5 +113,6 @@ error_reporting(E_ALL);
// This MUST be writtable by http server user, and should be in pandora root.
// By default, Pandora adds /attachment to this, so by default is the pandora console home dir
include ("config_process.php");
$ownDir = dirname(__FILE__) . '/';
include ($ownDir . "config_process.php");
?>

14
pandora_console/include/config_process.php
View File

@ -59,15 +59,17 @@ if (! $config['dbconnection']) {
exit;
}
$ownDir = dirname(__FILE__) . '/';
mysql_select_db ($config["dbname"]);
require_once ('functions.php');
require_once ('functions_db.php');
require_once ('functions_config.php');
require_once ($ownDir . 'functions.php');
require_once ($ownDir . 'functions_db.php');
require_once ($ownDir. 'functions_config.php');
process_config ();
require_once ('streams.php');
require_once ('gettext.php');
require_once ($ownDir . 'streams.php');
require_once ($ownDir . 'gettext.php');
$config["remote_addr"] = $_SERVER['REMOTE_ADDR'];
$config['user_language'] = $config["language"];
@ -107,7 +109,7 @@ if (! defined ('EXTENSIONS_DIR'))
if (! defined ('ENTERPRISE_DIR'))
define ('ENTERPRISE_DIR', 'enterprise');
require_once ('functions_extensions.php');
require_once ($ownDir . 'functions_extensions.php');
$config['extensions'] = get_extensions ();

5
pandora_console/include/functions.php
View File

@ -1,6 +1,4 @@
<?php
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
@ -20,7 +18,6 @@
* @subpackage Generic_Functions
*/
/**
* Include the html and ui functions.
*/
@ -1013,6 +1010,4 @@ function return_graphtype ($id_module_type){
return "sparse";
}
?>

1
pandora_console/include/functions_config.php
View File

@ -1,5 +1,4 @@
<?php
// Pandora FMS - http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas