Installer Fixes and small corrections

classes/FaucetRPC.class.php

@@ -88,7 +88,7 @@ public function setFunds($amount = 0){
 	* Gets the current available funds
 	*
 	*/
-	public function getFunds($amount = 0){
+	public function getFunds(){
 		return $this->COLD_WALLET->getbalance();
 	}
 }

includes/bootstrap.inc.php

@@ -2,8 +2,8 @@
  error_reporting(E_ALL);
  ini_set("display_errors", 0);
 
-@include_once("includes/multisite.inc.php"); //Enables Multisite Capabilites
-require_once("system/app.conf.php");
+@include_once("system/multisite.inc.php"); //Enables Multisite Capabilites
+require_once("system/app.conf.php"); //Application Constants
 @include_once("config/local.conf.php"); //User Made Application Options
 require_once("libraries/template.lib.php"); //Load Template Engine
 require_once("classes/db.class.php");

includes/database.inc.php

@@ -2,7 +2,7 @@
 //Connects to the database
 
 //Load database config
-include(APPLICATION_CONFDIR . 'db.conf.php');		
+include(APPLICATION_CONFDIR . 'db.conf.php');
 
 //Verify database connectivity
 $DB = AppDB::GetInstance();

install.php

@@ -2,7 +2,7 @@
  error_reporting(E_ALL);
  ini_set("display_errors", 0);
 ?>
-<?php @include_once("includes/multisite.inc.php"); //Enables Multisite Capabilites ?>
+<?php @include_once("system/multisite.inc.php"); //Enables Multisite Capabilites ?>
 <?php include("system/app.conf.php"); ?>
 <?php include('modules/install/install.lib.php'); ?>
 <?php
@@ -16,7 +16,7 @@
 //Check if already installed
 if(is_file(APPLICATION_CONFDIR . '.install_complete')) {
 	//Prevents distructive behavors if already installed
-	$vars['clean_install'] = true;
+	$vars['clean_install'] = false;
 }
 
 //Process any GET requests

modules/install/install.lib.php

@@ -296,8 +296,9 @@ function install_process_post_request($step, &$vars = array()){
 	try{
 		switch($step){
 			case 2:
-				//Create Config directory
-				if(!mkdir(APPLICATION_CONFDIR, 0755, true)){throw new Exception("Can't create configuration directory", 2);}
+				//Check if Config directory is writable
+				if(!@touch(APPLICATION_CONFDIR)){throw new Exception("Configuration directory is not writable", 2);}
+				break;
 			case 3:
 				//Database Setup
 				write_db_config($_POST['baseserver'], 

modules/install/install.php

@@ -1,5 +1,5 @@
 <form action='?step=2' method='post'>
-						<?php if($error == "2") { ?>
+						<?php if(@$error == "2") { ?>
 						<p class='error-message config-error'>Configuration directory not writable, check file permissions</p>
 						<?php }	?>
 						<p>Welcome to the <strong><?php echo APPLICATION_NAME; ?></strong>, loosely derived from <em id="original">Simple Faucet script by Dogenes</em>.  To continue please read and accept the following license agreement.</p><br />

system/app.conf.php

@@ -1,7 +1,6 @@
 <?php
-
 define('APPLICATION_NAME', 'MultiFaucet');
 define('APPLICATION_WEBSITE', 'http://www.unibia.net/crypto-faucet');
 define('APPLICATION_VERSION', 'Beta v. 0.1.0');
-define('APPLICATION_CONFDIR', (@$MULTISITE_CONFDIR ?: 'config/'));
+define('APPLICATION_CONFDIR', (@$MULTISITE_CONFDIR ?: 'config/')); //Must have trailing '/'
 ?>