fixing up the "is setup" check in the installer

[gwvp.git] / www / index.php

diff --git a/www/index.php b/www/index.php
index aef8e3d..6864c2c 100644 (file)
--- a/www/index.php
+++ b/www/index.php
@@ -1,18 +1,41 @@
 <?php
 
 // get config
-require_once("config.php");
+if(file_exists("config.php")) require_once("config.php");
 
 // initial http file
 $WEB_ROOT_FS = realpath(dirname(__FILE__));
 $BASE_URL = dirname($_SERVER["PHP_SELF"]);
 
-global $WEB_ROOT_FS, $BASE_URL, $repo_base, $data_directory, $db_type, $db_name, $db_username, $db_password;
-
-// add gwvplib as if it were a path in ../gwvplib
-if(file_exists($lib_base)) {
-       $path = realpath($lib_base);
-       set_include_path(get_include_path().PATH_SEPARATOR.$path);
+global $WEB_ROOT_FS, $BASE_URL, $data_directory, $db_type, $db_name, $db_username, $db_password;
+
+// the index will search for the base library depending on:
+// if lib_base is set in config.php, it'll go there and nowhere else
+// if lib_base is not set, it'll look for ../gwvplib, /usr/share/php/gwbplib and /usr/share/gwvp/gwvplib
+if(isset($lib_base)) {
+       if(file_exists($lib_base."/gwvplib.php")) {
+               $path = realpath($lib_base);
+               set_include_path(get_include_path().PATH_SEPARATOR.$path);
+       } else {
+               echo "Problem: lib_base is set in the config.php file, but I cant find the actual library<br>";
+               echo "I have to bail";
+               return;
+       }
+} else {
+       if(file_exists("../gwvplib/gwvplib.php")) {
+               $path = realpath("../gwvplib/");
+               set_include_path(get_include_path().PATH_SEPARATOR.$path);
+       } else if(file_exists("/usr/share/php/gwvplib/gwvplib.php")) {
+               $path = realpath("/usr/share/php/gwvplib/");
+               set_include_path(get_include_path().PATH_SEPARATOR.$path);
+       } else if(file_exists("/usr/share/gwvp/gwvplib/gwvplib.php")) {
+               $path = realpath("/usr/share/gwvp/gwvplib/");
+               set_include_path(get_include_path().PATH_SEPARATOR.$path);
+       } else {
+               echo "Problem: lib_base is set in the config.php file, but I cant find the actual library<br>";
+               echo "I have to bail";
+               return;
+       }
 }
 
 require_once("gwvplib.php");
@@ -31,14 +54,9 @@ gwvp_goWebBegin();
 //goWebGitBackEnd();
 
 
-echo "<pre>";
-echo "BASEURL: $BASE_URL\n";
-echo "CUSTOM\n";
-print_r($_SERVER);
-print_r($_REQUEST);
-
-
-echo "</pre>";
+if(function_exists("gwvp_DebugEnabled")) {
+       gwvp_DebugEnabled();
+}
 
 
 ?>