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

2009-12-22 Miguel de Dios <miguel.dedios@artica.es> 

* include/config_process.php, include/functions_db.php: fix alert message
	when the history DB is'nt setup.
	
	* general/header.php: fix alert message when the custom logo didn't exit.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2231 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2009-12-22 15:46:54 +00:00
parent f413f1a1c3
commit de5ee31aa4
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2009-12-22 Miguel de Dios <miguel.dedios@artica.es>
* include/config_process.php, include/functions_db.php: fix alert message
when the history DB is'nt setup.
* general/header.php: fix alert message when the custom logo didn't exit.
2009-12-22 Miguel de Dios <miguel.dedios@artica.es>
* include/fgraph.php: clean source code, fix when try show boolean without

3
pandora_console/general/header.php
View File

@ -104,7 +104,8 @@ require_once ("include/functions_messages.php");
echo "</td>";
echo "<td width='20%' rowspan=2>";
echo "<a href='index.php?sec=main'>";
echo "<img height=60 width=139 src='images/custom_logo/".$config["custom_logo"]."'>";
if (isset($config["custom_logo"]))
echo "<img height=60 width=139 src='images/custom_logo/" . $config["custom_logo"] . "'>";
?>
</td>
</tr>

8
pandora_console/include/config_process.php
View File

@ -98,9 +98,11 @@ require_once ('functions_extensions.php');
$config['extensions'] = get_extensions ();
// Connect to the history DB
if ($config['history_db_enabled']) {
$config['history_db_connection'] = mysql_connect ($config['history_db_host'] . ':' . $config['history_db_port'], $config['history_db_user'], $config['history_db_pass']);
mysql_select_db ($config['history_db_name'], $config['history_db_connection']);
if (isset($config['history_db_enabled'])) {
if ($config['history_db_enabled']) {
$config['history_db_connection'] = mysql_connect ($config['history_db_host'] . ':' . $config['history_db_port'], $config['history_db_user'], $config['history_db_pass']);
mysql_select_db ($config['history_db_name'], $config['history_db_connection']);
}
}
// Make dbconnection the default connection again (the link identifier of the already opened link will be returned)

6
pandora_console/include/functions_db.php
View File

@ -1820,7 +1820,11 @@ function get_db_all_rows_sql ($sql, $search_history_db = false) {
// Read from the history DB if necessary
if ($search_history_db) {
$cache = false;
$history = process_sql ($sql, 'affected_rows', $config['history_db_connection'], false);
$history = false;
if (isset($config['history_db_connection']))
$history = process_sql ($sql, 'affected_rows', $config['history_db_connection'], false);
if ($history === false) {
$history = array ();
}