mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/librenms/librenms into fixifaliasparse

Browse Source
This commit is contained in:
Mickael Marchand
2015-05-11 12:33:18 +02:00
parent 8705dfa033 828834b985
commit 9098e81835
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS.md
View File

@@ -24,7 +24,6 @@ Contributors to LibreNMS:
- Filippo Giunchedi <filippo@esaurito.net> (filippog) - Filippo Giunchedi <filippo@esaurito.net> (filippog)
- Lasse Leegaard <lasse@brandbil.dk> (lasseleegaard) - Lasse Leegaard <lasse@brandbil.dk> (lasseleegaard)
- Mickael Marchand <mmarchand@corp.free.fr> (mmarchand) - Mickael Marchand <mmarchand@corp.free.fr> (mmarchand)
- Mohammad Al-Shami <mohammad@al-shami.net> (mohshami)
[1]: http://observium.org/ "Observium web site" [1]: http://observium.org/ "Observium web site"

12
html/install.php
View File

@@ -344,7 +344,7 @@ require('../build-base.php');
<input type="hidden" name="dbpass" value="<?php echo $dbpass; ?>"> <input type="hidden" name="dbpass" value="<?php echo $dbpass; ?>">
<input type="hidden" name="dbname" value="<?php echo $dbname; ?>"> <input type="hidden" name="dbname" value="<?php echo $dbname; ?>">
<button type="submit" class="btn btn-success">Goto Add User</button> <button type="submit" class="btn btn-success">Goto Add User</button>
</form> </form>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
</div> </div>
@@ -409,9 +409,9 @@ EOD;
if(!file_exists("../config.php")) if(!file_exists("../config.php"))
{ {
$conf = fopen("../config.php", 'w'); $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("<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>&lt;?php\n".stripslashes($config_file)."</pre>"); echo("<pre>&lt;?php\n".stripslashes($config_file)."</pre>");
@@ -419,9 +419,12 @@ EOD;
else else
{ {
$config_file = stripslashes($config_file); $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>"); 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>&lt;?php\n".stripslashes($config_file)."</pre>");
} }
} }
?> ?>
@@ -549,3 +552,4 @@ elseif($stage == "6")
</div> </div>
</body> </body>
</html> </html>

2
includes/rrdtool.inc.php
View File

@@ -60,7 +60,7 @@ function rrdtool_pipe_open(&$rrd_process, &$rrd_pipes)
* @param array rrd_pipes * @param array rrd_pipes
*/ */
function rrdtool_pipe_close(&$rrd_process, &$rrd_pipes) function rrdtool_pipe_close($rrd_process, &$rrd_pipes)
{ {
global $debug; global $debug;