From afded4f6d219989650f089987c9f45dad6ca278d Mon Sep 17 00:00:00 2001
From: f0o <f0o@librenms.org>
Date: Tue, 9 Jun 2015 16:12:07 +0000
Subject: [PATCH] Minor fixes in html/install.php

---
 html/install.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/html/install.php b/html/install.php
index 1c625fc004..60107d1c3a 100644
--- a/html/install.php
+++ b/html/install.php
@@ -32,7 +32,9 @@ $config['db_name']=$dbname;
 include("../includes/defaults.inc.php");
 // Work out the install directory
 $cur_dir = explode('/',$_SERVER['DOCUMENT_ROOT']);
-$install_dir = array_pop($cur_dir);
+if( empty(end($cur_dir)) ) {
+  $install_dir = array_pop($cur_dir);
+}
 $install_dir = array_pop($cur_dir);
 $install_dir = implode('/',$cur_dir);
 $config['install_dir'] = $install_dir;
@@ -221,7 +223,7 @@ foreach ($modules as $extension)
 }
 
 // Check for pear install
-require_once 'System.php';
+include_once 'System.php';
 if(class_exists('System')===true)
 {
   $ext_loaded = 'yes';
@@ -229,7 +231,7 @@ if(class_exists('System')===true)
 }
 else
 {
-  $ext_loaded = 'yes';
+  $ext_loaded = 'no';
   $row_class = 'danger';
 }