From 74030b9fd322a23ba9e9272542d231daac2b90af Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Fri, 17 Aug 2007 22:56:13 -0400
Subject: [PATCH] Janitor
---
install/install.php | 3 ++-
install/lib/install.lib.php | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/install/install.php b/install/install.php
index ed260a0..0696cde 100644
--- a/install/install.php
+++ b/install/install.php
@@ -43,7 +43,7 @@
| | ___| | | | | |___ | |_| | | | \ | | | | | | |_| |
|_| /_____/ |_| \_____| \_____/ |_| \_| |_| |_| \_____/ ';
-echo "# Setup routine started...\n";
+echo "\n# Setup routine started...\n";
//** Include the library with the basic installer functions
require_once('lib/install.lib.php');
@@ -58,6 +58,7 @@
include_once('dist/lib/'.$conf['distname'].'.lib.php');
include_once('dist/conf/'.$conf['distname'].'.conf.php');
+//TODO: this is not there ????
$conf['dist'] = $dist;
//** Lets go !
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 326067f..bd0a242 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -57,14 +57,15 @@
$FILE = realpath('../install.php');
function get_distname() {
+ global $conf; // TODO wtf ?
$distname = $conf['distname'];
return $distname;
}
function sread() {
- $fp=fopen('/dev/stdin', 'r');
- $input=fgets($fp, 255);
- fclose($fp);
+ $f = fopen('/dev/stdin', 'r');
+ $input = fgets($f, 255);
+ fclose($f);
return rtrim($input);
}
--
Gitblit v1.9.1