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

2008-07-07 Evi Vanoost <vanooste@rcbi.rochester.edu> 

* pandora/console/install.php:  Added mysql_error debugging that can be uncommented when something goes wrong for clearer troubleshooting

        * pandora_console/pandoradb_data.sql: Fixed a line that had an extra semicolon (;) which caused the installer to fail

        * pandora_console/index.php: Fixed the code that displays the custom CSS code. Now the Console looks good.

        * pandora_console/general/header.php: Fixed the Autorefresh code. Now the Autorefresh link switches correctly between grey and white instead of staying white. Also fixed the autorefresh in case that there is no correct $_SERVER['REQUEST_URI'] so that it doesn't go 404.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@938 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
guruevi 2008-07-07 17:33:31 +00:00
parent 0daf8ebf1d
commit 00451a0cbd
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/general/header.php
View File

@ -45,10 +45,10 @@ if (isset ($_SESSION["id_usuario"])){
// Third column
echo "<td>";
// Autorefresh
if ((isset($_GET["refr"])) OR (isset($_POST["refr"]))) {
echo "<a class='white_grey_bold' href='".$_SERVER['REQUEST_URI']."&refr=0'><img src='images/page_lightning.png' class='bot'> ". lang_string("Autorefresh")."</a>";
if ((isset($_GET["refr"]) AND $_GET["refr"] != 0) OR (isset($_POST["refr"]) AND $_POST["refr"] != 0)) {
echo "<a class='white_grey_bold' href='".((substr($_SERVER['REQUEST_URI'],-1) != "/") ? $_SERVER['REQUEST_URI'] : "index.php?" )."&refr=0'><img src='images/page_lightning.png' class='bot'> ". lang_string("Autorefresh")."</a>";
} else {
echo "<a class='white_bold' href='".$_SERVER['REQUEST_URI']."&refr=5'><img src='images/page_lightning.png' class='bot'> ". lang_string("Autorefresh")."</a>";
echo "<a class='white_bold' href='".((substr($_SERVER['REQUEST_URI'],-1) != "/") ? $_SERVER['REQUEST_URI'] : "index.php?" )."&refr=5'><img src='images/page_lightning.png' class='bot'> ". lang_string("Autorefresh")."</a>";
}

2
pandora_console/index.php
View File

@ -114,7 +114,7 @@ if ($intervalo > 0){
<meta name="keywords" content="pandora, monitoring, system, GPL, software">
<meta name="robots" content="index, follow">
<link rel="icon" href="images/pandora.ico" type="image/ico">
<link rel="stylesheet" href="include/styles/<?=$config['style']?>.css" type="text/css">
<link rel="stylesheet" href="include/styles/<?php echo $config['style']; ?>.css" type="text/css">
<script type="text/javascript" src="include/javascript/wz_jsgraphics.js"></script>
<script type="text/javascript" src="include/javascript/pandora.js"></script>

6
pandora_console/install.php
View File

@ -128,9 +128,11 @@ function parse_mysql_dump($url){
if(trim($sql_line) != "" && strpos($sql_line, "--") === false){
$query .= $sql_line;
if(preg_match("/;[\040]*\$/", $sql_line)){
// echo "DEBUG $query <br>";
if (!$result = mysql_query($query))
//echo "DEBUG $query <br>"; //Uncomment for debug
if (!$result = mysql_query($query)) {
// echo mysql_errno() . ": " . mysql_error(); //Uncomment for debug
return 0;
}
$query = "";
}
}

1
pandora_console/pandoradb_data.sql
View File

@ -62,7 +62,6 @@ INSERT INTO `tconfig` VALUES
(18, 'graph_color2', '#42D100'),
(19, 'graph_color3', '#89FF09'),
(20, 'sla_period', '604800');
;
UNLOCK TABLES;
/*!40000 ALTER TABLE `tconfig` ENABLE KEYS */;