mirror of
https://github.com/librenms/librenms.git
synced 2024-09-29 06:16:43 +00:00
Merge branch 'master' of https://github.com/librenms/librenms into fixifaliasparse
This commit is contained in:
commit
9098e81835
@ -24,7 +24,6 @@ Contributors to LibreNMS:
|
||||
- Filippo Giunchedi <filippo@esaurito.net> (filippog)
|
||||
- Lasse Leegaard <lasse@brandbil.dk> (lasseleegaard)
|
||||
- Mickael Marchand <mmarchand@corp.free.fr> (mmarchand)
|
||||
- Mohammad Al-Shami <mohammad@al-shami.net> (mohshami)
|
||||
|
||||
[1]: http://observium.org/ "Observium web site"
|
||||
|
||||
|
||||
|
@ -409,9 +409,9 @@ EOD;
|
||||
if(!file_exists("../config.php"))
|
||||
{
|
||||
$conf = fopen("../config.php", 'w');
|
||||
if ($conf === false)
|
||||
if ($conf != false)
|
||||
{
|
||||
if(fwrite($handle, '<?php') === FALSE)
|
||||
if(fwrite($conf, "<?php\n") === FALSE)
|
||||
{
|
||||
echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /opt/librenms/)</div>");
|
||||
echo("<pre><?php\n".stripslashes($config_file)."</pre>");
|
||||
@ -419,9 +419,12 @@ EOD;
|
||||
else
|
||||
{
|
||||
$config_file = stripslashes($config_file);
|
||||
fwrite($handle,$config_file);
|
||||
fwrite($conf,$config_file);
|
||||
echo("<div class='alert alert-success'>The config file has been created</div>");
|
||||
}
|
||||
} else {
|
||||
echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /opt/librenms/)</div>");
|
||||
echo("<pre><?php\n".stripslashes($config_file)."</pre>");
|
||||
}
|
||||
}
|
||||
?>
|
||||
@ -549,3 +552,4 @@ elseif($stage == "6")
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
@ -60,7 +60,7 @@ function rrdtool_pipe_open(&$rrd_process, &$rrd_pipes)
|
||||
* @param array rrd_pipes
|
||||
*/
|
||||
|
||||
function rrdtool_pipe_close(&$rrd_process, &$rrd_pipes)
|
||||
function rrdtool_pipe_close($rrd_process, &$rrd_pipes)
|
||||
{
|
||||
global $debug;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user